[sword-cvs] sword/include filemgr.h,1.17,1.18 gbfosis.h,1.8,1.9 gbfwebif.h,1.1,1.2 installmgr.h,1.5,1.6 localemgr.h,1.14,1.15 osishtmlhref.h,1.2,1.3 osisplain.h,1.2,1.3 osisrtf.h,1.2,1.3 swbasicfilter.h,1.13,1.14 swbuf.h,1.14,1.15 swconfig.h,1.21,1.22 swlocale.h,1.10,1.11 swmgr.h,1.53,1.54 swmodule.h,1.65,1.66 swobject.h,1.11,1.12 thmlwebif.h,1.1,1.2 unixstr.h,1.3,1.4 utilweb.h,1.1,1.2
sword@www.crosswire.org
sword@www.crosswire.org
Thu, 26 Jun 2003 18:41:09 -0700
- Previous message: [sword-cvs] sword/lib/bcppmake libsword.bpf,1.14,1.15 libsword.bpr,1.16,1.17
- Next message: [sword-cvs] sword/src/keys listkey.cpp,1.17,1.18 strkey.cpp,1.6,1.7 swkey.cpp,1.15,1.16 treekeyidx.cpp,1.13,1.14 versekey.cpp,1.57,1.58
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /usr/local/cvsroot/sword/include
In directory www:/tmp/cvs-serv19920/include
Modified Files:
filemgr.h gbfosis.h gbfwebif.h installmgr.h localemgr.h
osishtmlhref.h osisplain.h osisrtf.h swbasicfilter.h swbuf.h
swconfig.h swlocale.h swmgr.h swmodule.h swobject.h
thmlwebif.h unixstr.h utilweb.h
Log Message:
no message
Index: filemgr.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/filemgr.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** filemgr.h 3 Mar 2003 17:02:46 -0000 1.17
--- filemgr.h 27 Jun 2003 01:41:06 -0000 1.18
***************
*** 1,22 ****
/******************************************************************************
! * filemgr.h - definition of class FileMgr used for pooling file handles
! *
! * $Id$
! *
! * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
! * CrossWire Bible Society
! * P. O. Box 2528
! * Tempe, AZ 85280-2528
! *
! * This program is free software; you can redistribute it and/or modify it
! * under the terms of the GNU General Public License as published by the
! * Free Software Foundation version 2.
! *
! * This program is distributed in the hope that it will be useful, but
! * WITHOUT ANY WARRANTY; without even the implied warranty of
! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
! * General Public License for more details.
! *
! */
#ifndef FILEMGR_H
--- 1,22 ----
/******************************************************************************
! * filemgr.h - definition of class FileMgr used for pooling file handles
! *
! * $Id$
! *
! * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
! * CrossWire Bible Society
! * P. O. Box 2528
! * Tempe, AZ 85280-2528
! *
! * This program is free software; you can redistribute it and/or modify it
! * under the terms of the GNU General Public License as published by the
! * Free Software Foundation version 2.
! *
! * This program is distributed in the hope that it will be useful, but
! * WITHOUT ANY WARRANTY; without even the implied warranty of
! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
! * General Public License for more details.
! *
! */
#ifndef FILEMGR_H
***************
*** 35,67 ****
* This class represents one file. It works with the FileMgr object.
*/
! class SWDLLEXPORT FileDesc
! {
! friend class FileMgr;
! long offset;
! int fd; // -77 closed;
! FileMgr *parent;
! FileDesc *next;
! FileDesc (FileMgr * parent, const char *path, int mode, int perms, bool tryDowngrade);
! virtual ~FileDesc ();
public:
/** @return File handle.
*/
! int getFd ();
/** Path to file.
*/
! char *path;
/** File access mode.
*/
! int mode;
/** File permissions.
*/
! int perms;
/**
*/
! bool tryDowngrade;
};
--- 35,66 ----
* This class represents one file. It works with the FileMgr object.
*/
! class SWDLLEXPORT FileDesc {
! friend class FileMgr;
! long offset;
! int fd; // -77 closed;
! FileMgr *parent;
! FileDesc *next;
! FileDesc(FileMgr * parent, const char *path, int mode, int perms, bool tryDowngrade);
! virtual ~FileDesc();
public:
/** @return File handle.
*/
! int getFd();
/** Path to file.
*/
! char *path;
/** File access mode.
*/
! int mode;
/** File permissions.
*/
! int perms;
/**
*/
! bool tryDowngrade;
};
***************
*** 71,91 ****
* when the destructor is called.
*/
! class FileMgr
! {
! friend class FileDesc;
! FileDesc *files;
! int sysOpen (FileDesc * file);
public:
/** Constructor.
* @param maxFiles The number of files that this FileMgr may open in parallel, if necessary.
*/
! FileMgr (int maxFiles = 35);
! /**
* Destructor. Clean things up. Will close all files opened by this FileMgr object.
*/
! ~FileMgr ();
/** Open a file and return a FileDesc for it.
--- 70,98 ----
* when the destructor is called.
*/
! class FileMgr {
! friend class FileDesc;
! FileDesc *files;
! int sysOpen(FileDesc * file);
public:
+ /** Maximum number of open files set in the constructor.
+ * determines the max number of real system files that
+ * filemgr will open. Adjust for tuning.
+ */
+ int maxFiles;
+
+ static FileMgr systemFileMgr;
+
/** Constructor.
* @param maxFiles The number of files that this FileMgr may open in parallel, if necessary.
*/
! FileMgr(int maxFiles = 35);
!
! /**
* Destructor. Clean things up. Will close all files opened by this FileMgr object.
*/
! ~FileMgr();
/** Open a file and return a FileDesc for it.
***************
*** 96,100 ****
* @return FileDesc object for the requested file.
*/
! FileDesc *open (const char *path, int mode, bool tryDowngrade);
/** Open a file and return a FileDesc for it.
* The file itself will only be opened when FileDesc::getFd() is called.
--- 103,108 ----
* @return FileDesc object for the requested file.
*/
! FileDesc *open(const char *path, int mode, bool tryDowngrade);
!
/** Open a file and return a FileDesc for it.
* The file itself will only be opened when FileDesc::getFd() is called.
***************
*** 105,115 ****
* @return FileDesc object for the requested file.
*/
! FileDesc *open (const char *path, int mode, int perms = S_IREAD | S_IWRITE, bool tryDowngrade = false);
! /** Close a given file and delete its FileDesc object.
* Will only close the file if it was created by this FileMgr object.
* @param file The file to close.
*/
! void close (FileDesc * file);
/** Checks for the existence of a file.
--- 113,123 ----
* @return FileDesc object for the requested file.
*/
! FileDesc *open(const char *path, int mode, int perms = S_IREAD | S_IWRITE, bool tryDowngrade = false);
! /** Close a given file and delete its FileDesc object.
* Will only close the file if it was created by this FileMgr object.
* @param file The file to close.
*/
! void close(FileDesc * file);
/** Checks for the existence of a file.
***************
*** 117,121 ****
* @param ifileName Name of file to check for.
*/
! static signed char existsFile (const char *ipath, const char *ifileName = 0);
/** Checks for the existence of a directory.
--- 125,129 ----
* @param ifileName Name of file to check for.
*/
! static signed char existsFile(const char *ipath, const char *ifileName = 0);
/** Checks for the existence of a directory.
***************
*** 123,140 ****
* @param idirName Name of directory to check for.
*/
! static signed char existsDir (const char *ipath, const char *idirName = 0);
! /** Truncate a file at its current position
! * leaving byte at current possition intact deleting everything afterward.
* @param file The file to operate on.
*/
! signed char trunc (FileDesc * file);
- /** Maximum number of open files set in the constructor.
- * Change this if you need to open more files.
- */
- int maxFiles;
-
- static FileMgr systemFileMgr;
};
--- 131,146 ----
* @param idirName Name of directory to check for.
*/
! static signed char existsDir(const char *ipath, const char *idirName = 0);
! /** Truncate a file at its current position
! * leaving byte at current possition intact deleting everything afterward.
* @param file The file to operate on.
*/
! signed char trunc(FileDesc *file);
!
! static int createParent(const char *pName);
! static int createPathAndFile(const char *fName);
! static int copyFile(const char *sourceFile, const char *targetFile);
};
Index: gbfosis.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/gbfosis.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** gbfosis.h 28 Feb 2003 13:31:37 -0000 1.8
--- gbfosis.h 27 Jun 2003 01:41:06 -0000 1.9
***************
*** 23,32 ****
#include <swfilter.h>
- #include <string>
#include <stack>
- using std::string;
- using std::stack;
-
SWORD_NAMESPACE_START
--- 23,28 ----
***************
*** 37,43 ****
char startChar;
char level;
! string uniqueID;
char continueCount;
! QuoteInstance(char startChar = '\"', char level = 1, string uniqueID = "", char continueCount = 0) {
this->startChar = startChar;
this->level = level;
--- 33,39 ----
char startChar;
char level;
! SWBuf uniqueID;
char continueCount;
! QuoteInstance(char startChar = '\"', char level = 1, SWBuf uniqueID = "", char continueCount = 0) {
this->startChar = startChar;
this->level = level;
***************
*** 48,52 ****
};
! stack<QuoteInstance> quotes;
public:
QuoteStack();
--- 44,48 ----
};
! std::stack<QuoteInstance> quotes;
public:
QuoteStack();
Index: gbfwebif.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/gbfwebif.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** gbfwebif.h 1 Jun 2003 14:32:09 -0000 1.1
--- gbfwebif.h 27 Jun 2003 01:41:06 -0000 1.2
***************
*** 23,27 ****
#include <gbfhtmlhref.h>
- #include <string>
SWORD_NAMESPACE_START
--- 23,26 ----
***************
*** 30,35 ****
*/
class SWDLLEXPORT GBFWEBIF : public GBFHTMLHREF {
! const std::string baseURL;
! const std::string passageStudyURL;
protected:
--- 29,34 ----
*/
class SWDLLEXPORT GBFWEBIF : public GBFHTMLHREF {
! const SWBuf baseURL;
! const SWBuf passageStudyURL;
protected:
Index: installmgr.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/installmgr.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** installmgr.h 30 May 2003 19:22:32 -0000 1.5
--- installmgr.h 27 Jun 2003 01:41:06 -0000 1.6
***************
*** 5,8 ****
--- 5,9 ----
#include <vector>
#include <defs.h>
+ #include <swbuf.h>
SWORD_NAMESPACE_START
***************
*** 29,32 ****
--- 30,51 ----
};
+
+ class InstallSource {
+ public:
+ InstallSource(const char *confEnt, const char *type);
+ virtual ~InstallSource();
+ SWBuf getConfEnt() {
+ return caption +"|" + source + "|" + directory;
+ }
+ SWBuf type;
+ SWBuf source;
+ SWBuf directory;
+ SWBuf caption;
+ SWMgr *mgr;
+ };
+
+
+
+
int my_fwrite(void *buffer, size_t size, size_t nmemb, void *stream);
int my_fprogress(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow);
***************
*** 48,51 ****
--- 67,73 ----
std::vector<struct ftpparse> FTPURLGetDir(void *session, const char *dirurl, bool passive = true);
int removeModule(SWMgr *manager, const char *modName);
+ int installModule(const char *fromLocation, const char *modName, InstallSource *is);
+ int copyFileToSWORDInstall(const char *sourceDir, const char *fName);
+
SWORD_NAMESPACE_END
Index: localemgr.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/localemgr.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** localemgr.h 28 Feb 2003 13:12:43 -0000 1.14
--- localemgr.h 27 Jun 2003 01:41:06 -0000 1.15
***************
*** 24,28 ****
#define LOCALEMGR_H
- #include <string>
#include <map>
#include <list>
--- 24,27 ----
***************
*** 34,38 ****
SWORD_NAMESPACE_START
! typedef std::map < std::string, SWLocale *, std::less < std::string > >LocaleMap;
/**
--- 33,37 ----
SWORD_NAMESPACE_START
! typedef std::map < SWBuf, SWLocale *, std::less < SWBuf > >LocaleMap;
/**
***************
*** 79,83 ****
* @return Returns a list of strings, which contains the names of the available locales.
*/
! virtual std::list < std::string > getAvailableLocales ();
/** Returns translated text.
--- 78,82 ----
* @return Returns a list of strings, which contains the names of the available locales.
*/
! virtual std::list < SWBuf > getAvailableLocales ();
/** Returns translated text.
Index: osishtmlhref.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/osishtmlhref.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** osishtmlhref.h 24 Jun 2003 12:19:56 -0000 1.2
--- osishtmlhref.h 27 Jun 2003 01:41:06 -0000 1.3
***************
*** 24,31 ****
#include <swbasicfilter.h>
- #include <string>
-
- using std::string;
-
SWORD_NAMESPACE_START
--- 24,27 ----
***************
*** 34,41 ****
class SWDLLEXPORT OSISHTMLHref : public SWBasicFilter {
private:
- string tagData;
- string::size_type pos1;
- string::size_type pos2;
-
protected:
virtual bool handleToken(SWBuf &buf, const char *token, DualStringMap &userData);
--- 30,33 ----
Index: osisplain.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/osisplain.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** osisplain.h 20 Feb 2003 07:25:19 -0000 1.2
--- osisplain.h 27 Jun 2003 01:41:06 -0000 1.3
***************
*** 24,31 ****
#include <swbasicfilter.h>
- #include <string>
-
- using std::string;
-
SWORD_NAMESPACE_START
--- 24,27 ----
***************
*** 34,41 ****
class SWDLLEXPORT OSISPlain : public SWBasicFilter {
public:
- string tagData;
- string::size_type pos1;
- string::size_type pos2;
-
protected:
virtual bool handleToken(SWBuf &buf, const char *token, DualStringMap &userData);
--- 30,33 ----
Index: osisrtf.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/osisrtf.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** osisrtf.h 20 Feb 2003 07:25:19 -0000 1.2
--- osisrtf.h 27 Jun 2003 01:41:06 -0000 1.3
***************
*** 24,31 ****
#include <swbasicfilter.h>
- #include <string>
-
- using std::string;
-
SWORD_NAMESPACE_START
--- 24,27 ----
***************
*** 34,40 ****
class SWDLLEXPORT OSISRTF : public SWBasicFilter {
private:
- string tagData;
- string::size_type pos1;
- string::size_type pos2;
protected:
--- 30,33 ----
Index: swbasicfilter.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/swbasicfilter.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** swbasicfilter.h 20 Feb 2003 07:25:20 -0000 1.13
--- swbasicfilter.h 27 Jun 2003 01:41:06 -0000 1.14
***************
*** 28,32 ****
#include <swfilter.h>
#include <map>
- #include <string>
SWORD_NAMESPACE_START
--- 28,31 ----
***************
*** 62,66 ****
const SWModule *module;
const SWKey *key;
! typedef std::map<std::string, std::string> DualStringMap;
DualStringMap tokenSubMap;
DualStringMap escSubMap;
--- 61,65 ----
const SWModule *module;
const SWKey *key;
! typedef std::map<SWBuf, SWBuf> DualStringMap;
DualStringMap tokenSubMap;
DualStringMap escSubMap;
Index: swbuf.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/swbuf.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** swbuf.h 26 Jun 2003 04:33:31 -0000 1.14
--- swbuf.h 27 Jun 2003 01:41:06 -0000 1.15
***************
*** 131,148 ****
* @param str Append this.
*/
! void append(const char *str);
/**
! * SWBuf::append - appends a value to the current value of this SWBuf
* If the allocated memory is not enough, it will be resized accordingly.
* @param str Append this.
! */
! void append(const SWBuf &str);
/**
! * SWBuf::append - appends a value to the current value of this SWBuf
* If the allocated memory is not enough, it will be resized accordingly.
* @param ch Append this.
! */
inline void append(char ch) {
assureSize((end-buf) + 2);
--- 131,148 ----
* @param str Append this.
*/
! void append(const char *str, int max = -1);
/**
! * SWBuf::append - appends a value to the current value of this SWBuf
* If the allocated memory is not enough, it will be resized accordingly.
* @param str Append this.
! */
! inline void append(const SWBuf &str, int max = -1) { append(str.c_str(), max); }
/**
! * SWBuf::append - appends a value to the current value of this SWBuf
* If the allocated memory is not enough, it will be resized accordingly.
* @param ch Append this.
! */
inline void append(char ch) {
assureSize((end-buf) + 2);
***************
*** 153,157 ****
/**
! * SWBuf::appendFormatted - appends formatted strings to the current value of this SWBuf
* WARNING: This function can only write at most
* JUNKBUFSIZE to the string per call.
--- 153,157 ----
/**
! * SWBuf::appendFormatted - appends formatted strings to the current value of this SWBuf
* WARNING: This function can only write at most
* JUNKBUFSIZE to the string per call.
Index: swconfig.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/swconfig.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** swconfig.h 28 Feb 2003 13:12:43 -0000 1.21
--- swconfig.h 27 Jun 2003 01:41:06 -0000 1.22
***************
*** 26,40 ****
#include <stdio.h>
- #include <string>
#include <map>
#include <defs.h>
#include <multimapwdef.h>
!
SWORD_NAMESPACE_START
! typedef multimapwithdefault < std::string, std::string, std::less < std::string > >ConfigEntMap;
! typedef std::map < std::string, ConfigEntMap, std::less < std::string > >SectionMap;
/** The class to read and save settings using a file on disk.
--- 26,39 ----
#include <stdio.h>
#include <map>
#include <defs.h>
#include <multimapwdef.h>
! #include <swbuf.h>
SWORD_NAMESPACE_START
! typedef multimapwithdefault < SWBuf, SWBuf, std::less < SWBuf > >ConfigEntMap;
! typedef std::map < SWBuf, ConfigEntMap, std::less < SWBuf > >SectionMap;
/** The class to read and save settings using a file on disk.
***************
*** 43,52 ****
class SWDLLEXPORT SWConfig {
private:
! char getline(FILE * fp, std::string & line);
public:
/** The filename used by this SWConfig object
*
*/
! std::string filename;
/** Map of available sections
* The map of available sections.
--- 42,51 ----
class SWDLLEXPORT SWConfig {
private:
! char getline(FILE * fp, SWBuf & line);
public:
/** The filename used by this SWConfig object
*
*/
! SWBuf filename;
/** Map of available sections
* The map of available sections.
Index: swlocale.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/swlocale.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** swlocale.h 1 Oct 2002 22:04:58 -0000 1.10
--- swlocale.h 27 Jun 2003 01:41:06 -0000 1.11
***************
*** 24,28 ****
#define SWLOCALE_H
- #include <string>
#include <map>
--- 24,27 ----
***************
*** 34,38 ****
SWORD_NAMESPACE_START
! typedef std::map < std::string, std::string, std::less < std::string > >LookupMap;
/** SWLocale is used for the localisation of the booknames
--- 33,37 ----
SWORD_NAMESPACE_START
! typedef std::map < SWBuf, SWBuf, std::less < SWBuf > >LookupMap;
/** SWLocale is used for the localisation of the booknames
Index: swmgr.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/swmgr.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** swmgr.h 28 Feb 2003 13:12:43 -0000 1.53
--- swmgr.h 27 Jun 2003 01:41:06 -0000 1.54
***************
*** 41,45 ****
#include <sys/types.h>
- #include <string>
#include <map>
#include <list>
--- 41,44 ----
***************
*** 53,58 ****
SWORD_NAMESPACE_START
! typedef std::map < std::string, SWModule *, std::less < std::string > >ModMap;
! typedef std::map < std::string, SWFilter * >FilterMap;
/** SWMgr is the main class of the Sword library.
--- 52,57 ----
SWORD_NAMESPACE_START
! typedef std::map < SWBuf, SWModule *, std::less < SWBuf > >ModMap;
! typedef std::map < SWBuf, SWFilter * >FilterMap;
/** SWMgr is the main class of the Sword library.
***************
*** 77,81 ****
SWConfig *homeConfig;
void CreateMods();
! SWModule *CreateMod(std::string name, std::string driver, ConfigEntMap & section);
void DeleteMods();
char configType; // 0 = file; 1 = directory
--- 76,80 ----
SWConfig *homeConfig;
void CreateMods();
! SWModule *CreateMod(const char *name, const char *driver, ConfigEntMap & section);
void DeleteMods();
char configType; // 0 = file; 1 = directory
***************
*** 97,101 ****
ConfigEntMap::iterator start,
ConfigEntMap::iterator end);
! std::list<std::string> augPaths;
/**
--- 96,100 ----
ConfigEntMap::iterator start,
ConfigEntMap::iterator end);
! std::list<SWBuf> augPaths;
/**
***************
*** 138,142 ****
*
*/
! static void findConfig(char *configType, char **prefixPath, char **configPath, std::list<std::string> *augPaths = 0);
/** The global config object.
* This is the global config object. It contains all items of all modules,
--- 137,141 ----
*
*/
! static void findConfig(char *configType, char **prefixPath, char **configPath, std::list<SWBuf> *augPaths = 0);
/** The global config object.
* This is the global config object. It contains all items of all modules,
Index: swmodule.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/swmodule.h,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** swmodule.h 18 Jun 2003 23:37:21 -0000 1.65
--- swmodule.h 27 Jun 2003 01:41:07 -0000 1.66
***************
*** 54,60 ****
typedef std::list < SWFilter * >FilterList;
! typedef std::map < std::string, std::string, std::less < std::string > > AttributeValue;
! typedef std::map < std::string, AttributeValue, std::less < std::string > > AttributeList;
! typedef std::map < std::string, AttributeList, std::less < std::string > > AttributeTypeList;
#define SWTextDirection char
--- 54,60 ----
typedef std::list < SWFilter * >FilterList;
! typedef std::map < SWBuf, SWBuf, std::less < SWBuf > > AttributeValue;
! typedef std::map < SWBuf, AttributeValue, std::less < SWBuf > > AttributeList;
! typedef std::map < SWBuf, AttributeList, std::less < SWBuf > > AttributeTypeList;
#define SWTextDirection char
Index: swobject.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/swobject.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** swobject.h 1 Oct 2002 19:52:40 -0000 1.11
--- swobject.h 27 Jun 2003 01:41:07 -0000 1.12
***************
*** 9,13 ****
#include <defs.h>
- #include <string.h>
SWORD_NAMESPACE_START
--- 9,12 ----
Index: thmlwebif.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/thmlwebif.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** thmlwebif.h 1 Jun 2003 14:32:09 -0000 1.1
--- thmlwebif.h 27 Jun 2003 01:41:07 -0000 1.2
***************
*** 23,27 ****
#include <thmlhtmlhref.h>
- #include <string>
SWORD_NAMESPACE_START
--- 23,26 ----
***************
*** 30,35 ****
*/
class SWDLLEXPORT ThMLWEBIF : public ThMLHTMLHREF {
! const std::string baseURL;
! const std::string passageStudyURL;
protected:
--- 29,34 ----
*/
class SWDLLEXPORT ThMLWEBIF : public ThMLHTMLHREF {
! const SWBuf baseURL;
! const SWBuf passageStudyURL;
protected:
Index: unixstr.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/unixstr.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** unixstr.h 1 Oct 2002 19:52:40 -0000 1.3
--- unixstr.h 27 Jun 2003 01:41:07 -0000 1.4
***************
*** 22,26 ****
#ifndef UNIXSTR_H
#define UNIXSTR_H
- #include <string.h>
#include <defs.h>
--- 22,25 ----
Index: utilweb.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/utilweb.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** utilweb.h 1 Jun 2003 14:32:09 -0000 1.1
--- utilweb.h 27 Jun 2003 01:41:07 -0000 1.2
***************
*** 24,28 ****
#include <defs.h>
! #include <string>
SWORD_NAMESPACE_START
--- 24,28 ----
#include <defs.h>
! #include <swbuf.h>
SWORD_NAMESPACE_START
***************
*** 33,37 ****
* This function works on the data of the buf parameter.
*/
! const std::string encodeURL( const std::string& buf );
SWORD_NAMESPACE_END
--- 33,37 ----
* This function works on the data of the buf parameter.
*/
! const SWBuf encodeURL( const SWBuf& buf );
SWORD_NAMESPACE_END
- Previous message: [sword-cvs] sword/lib/bcppmake libsword.bpf,1.14,1.15 libsword.bpr,1.16,1.17
- Next message: [sword-cvs] sword/src/keys listkey.cpp,1.17,1.18 strkey.cpp,1.6,1.7 swkey.cpp,1.15,1.16 treekeyidx.cpp,1.13,1.14 versekey.cpp,1.57,1.58
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]