[sword-svn] r3753 - in trunk: include src/mgr utilities/diatheke
scribe at crosswire.org
scribe at crosswire.org
Fri Jul 10 05:32:46 EDT 2020
Author: scribe
Date: 2020-07-10 05:32:46 -0400 (Fri, 10 Jul 2020)
New Revision: 3753
Modified:
trunk/include/encfiltmgr.h
trunk/include/markupfiltmgr.h
trunk/include/swfiltermgr.h
trunk/include/swmgr.h
trunk/src/mgr/encfiltmgr.cpp
trunk/src/mgr/markupfiltmgr.cpp
trunk/src/mgr/swfiltermgr.cpp
trunk/src/mgr/swmgr.cpp
trunk/utilities/diatheke/diafiltmgr.cpp
trunk/utilities/diatheke/diafiltmgr.h
Log:
More refactoring work, 'Add'
Modified: trunk/include/encfiltmgr.h
===================================================================
--- trunk/include/encfiltmgr.h 2020-07-10 09:31:40 UTC (rev 3752)
+++ trunk/include/encfiltmgr.h 2020-07-10 09:32:46 UTC (rev 3753)
@@ -76,14 +76,14 @@
* @param module To this module the raw filter(s) are added
* @param section We use this section to get a list of filters we should apply to the module
*/
- virtual void AddRawFilters(SWModule *module, ConfigEntMap §ion);
+ virtual void addRawFilters(SWModule *module, ConfigEntMap §ion);
/**
* Adds the encoding filters which are defined in "section" to the SWModule object "module".
* @param module To this module the encoding filter(s) are added
* @param section We use this section to get a list of filters we should apply to the module
*/
- virtual void AddEncodingFilters(SWModule *module, ConfigEntMap §ion);
+ virtual void addEncodingFilters(SWModule *module, ConfigEntMap §ion);
};
SWORD_NAMESPACE_END
Modified: trunk/include/markupfiltmgr.h
===================================================================
--- trunk/include/markupfiltmgr.h 2020-07-10 09:31:40 UTC (rev 3752)
+++ trunk/include/markupfiltmgr.h 2020-07-10 09:32:46 UTC (rev 3753)
@@ -70,7 +70,7 @@
* @param module To this module the render filter(s) are added
* @param section We use this section to get a list of filters we should apply to the module
*/
- virtual void AddRenderFilters(SWModule *module, ConfigEntMap §ion);
+ virtual void addRenderFilters(SWModule *module, ConfigEntMap §ion);
};
SWORD_NAMESPACE_END
Modified: trunk/include/swfiltermgr.h
===================================================================
--- trunk/include/swfiltermgr.h 2020-07-10 09:31:40 UTC (rev 3752)
+++ trunk/include/swfiltermgr.h 2020-07-10 09:32:46 UTC (rev 3753)
@@ -46,9 +46,9 @@
virtual void setParentMgr(SWMgr *parentMgr);
virtual SWMgr *getParentMgr();
- virtual void AddGlobalOptions(SWModule *module, ConfigEntMap §ion, ConfigEntMap::iterator start,
+ virtual void addGlobalOptions(SWModule *module, ConfigEntMap §ion, ConfigEntMap::iterator start,
ConfigEntMap::iterator end);
- virtual void AddLocalOptions(SWModule *module, ConfigEntMap §ion, ConfigEntMap::iterator start,
+ virtual void addLocalOptions(SWModule *module, ConfigEntMap §ion, ConfigEntMap::iterator start,
ConfigEntMap::iterator end);
@@ -57,7 +57,7 @@
* @param module To this module the encoding filter(s) are added
* @param section We use this section to get a list of filters we should apply to the module
*/
- virtual void AddEncodingFilters(SWModule *module, ConfigEntMap §ion);
+ virtual void addEncodingFilters(SWModule *module, ConfigEntMap §ion);
/**
@@ -65,7 +65,7 @@
* @param module To this module the render filter(s) are added
* @param section We use this section to get a list of filters we should apply to the module
*/
- virtual void AddRenderFilters(SWModule *module, ConfigEntMap §ion);
+ virtual void addRenderFilters(SWModule *module, ConfigEntMap §ion);
/**
@@ -73,7 +73,7 @@
* @param module To this module the strip filter(s) are added
* @param section We use this section to get a list of filters we should apply to the module
*/
- virtual void AddStripFilters(SWModule *module, ConfigEntMap §ion);
+ virtual void addStripFilters(SWModule *module, ConfigEntMap §ion);
/**
@@ -81,7 +81,7 @@
* @param module To this module the raw filter(s) are added
* @param section We use this section to get a list of filters we should apply to the module
*/
- virtual void AddRawFilters(SWModule *module, ConfigEntMap §ion);
+ virtual void addRawFilters(SWModule *module, ConfigEntMap §ion);
};
SWORD_NAMESPACE_END
Modified: trunk/include/swmgr.h
===================================================================
--- trunk/include/swmgr.h 2020-07-10 09:31:40 UTC (rev 3752)
+++ trunk/include/swmgr.h 2020-07-10 09:32:46 UTC (rev 3753)
@@ -260,7 +260,7 @@
// still to be normalized below ...
//
StringList augPaths;
- virtual char AddModToConfig(FileDesc *conffd, const char *fname);
+ virtual char addModToConfig(FileDesc *conffd, const char *fname);
virtual void loadConfigDir(const char *ipath);
public:
Modified: trunk/src/mgr/encfiltmgr.cpp
===================================================================
--- trunk/src/mgr/encfiltmgr.cpp 2020-07-10 09:31:40 UTC (rev 3752)
+++ trunk/src/mgr/encfiltmgr.cpp 2020-07-10 09:32:46 UTC (rev 3753)
@@ -86,7 +86,7 @@
}
-void EncodingFilterMgr::AddRawFilters(SWModule *module, ConfigEntMap §ion) {
+void EncodingFilterMgr::addRawFilters(SWModule *module, ConfigEntMap §ion) {
ConfigEntMap::iterator entry;
@@ -103,7 +103,7 @@
}
-void EncodingFilterMgr::AddEncodingFilters(SWModule *module, ConfigEntMap §ion) {
+void EncodingFilterMgr::addEncodingFilters(SWModule *module, ConfigEntMap §ion) {
if (targetenc)
module->addEncodingFilter(targetenc);
}
Modified: trunk/src/mgr/markupfiltmgr.cpp
===================================================================
--- trunk/src/mgr/markupfiltmgr.cpp 2020-07-10 09:31:40 UTC (rev 3752)
+++ trunk/src/mgr/markupfiltmgr.cpp 2020-07-10 09:32:46 UTC (rev 3753)
@@ -206,7 +206,7 @@
}
-void MarkupFilterMgr::AddRenderFilters(SWModule *module, ConfigEntMap §ion) {
+void MarkupFilterMgr::addRenderFilters(SWModule *module, ConfigEntMap §ion) {
switch (module->getMarkup()) {
case FMT_THML:
if (fromthml)
Modified: trunk/src/mgr/swfiltermgr.cpp
===================================================================
--- trunk/src/mgr/swfiltermgr.cpp 2020-07-10 09:31:40 UTC (rev 3752)
+++ trunk/src/mgr/swfiltermgr.cpp 2020-07-10 09:32:46 UTC (rev 3753)
@@ -45,11 +45,11 @@
}
-void SWFilterMgr::AddGlobalOptions(SWModule * module, ConfigEntMap & section, ConfigEntMap::iterator start, ConfigEntMap::iterator end) {
+void SWFilterMgr::addGlobalOptions(SWModule * module, ConfigEntMap & section, ConfigEntMap::iterator start, ConfigEntMap::iterator end) {
}
-void SWFilterMgr::AddLocalOptions(SWModule * module, ConfigEntMap & section, ConfigEntMap::iterator start, ConfigEntMap::iterator end) {
+void SWFilterMgr::addLocalOptions(SWModule * module, ConfigEntMap & section, ConfigEntMap::iterator start, ConfigEntMap::iterator end) {
}
@@ -59,7 +59,7 @@
* @param section We use this section to get a list of filters we should apply to the module
*/
-void SWFilterMgr::AddEncodingFilters(SWModule * module, ConfigEntMap & section) {
+void SWFilterMgr::addEncodingFilters(SWModule * module, ConfigEntMap & section) {
}
@@ -69,7 +69,7 @@
* @param section We use this section to get a list of filters we should apply to the module
*/
-void SWFilterMgr::AddRenderFilters(SWModule * module, ConfigEntMap & section) {
+void SWFilterMgr::addRenderFilters(SWModule * module, ConfigEntMap & section) {
}
@@ -79,7 +79,7 @@
* @param section We use this section to get a list of filters we should apply to the module
*/
-void SWFilterMgr::AddStripFilters(SWModule * module, ConfigEntMap & section) {
+void SWFilterMgr::addStripFilters(SWModule * module, ConfigEntMap & section) {
}
@@ -89,7 +89,7 @@
* @param section We use this section to get a list of filters we should apply to the module
*/
-void SWFilterMgr::AddRawFilters(SWModule * module, ConfigEntMap & section) {
+void SWFilterMgr::addRawFilters(SWModule * module, ConfigEntMap & section) {
}
Modified: trunk/src/mgr/swmgr.cpp
===================================================================
--- trunk/src/mgr/swmgr.cpp 2020-07-10 09:31:40 UTC (rev 3752)
+++ trunk/src/mgr/swmgr.cpp 2020-07-10 09:32:46 UTC (rev 3753)
@@ -1182,7 +1182,7 @@
}
}
if (filterMgr)
- filterMgr->AddGlobalOptions(module, section, start, end);
+ filterMgr->addGlobalOptions(module, section, start, end);
#ifdef _ICU_
module->addOptionFilter(transliterator);
#endif
@@ -1226,7 +1226,7 @@
}
if (filterMgr)
- filterMgr->AddLocalOptions(module, section, start, end);
+ filterMgr->addLocalOptions(module, section, start, end);
}
@@ -1259,13 +1259,13 @@
}
if (filterMgr)
- filterMgr->AddRawFilters(module, section);
+ filterMgr->addRawFilters(module, section);
}
void SWMgr::addEncodingFilters(SWModule *module, ConfigEntMap §ion) {
if (filterMgr)
- filterMgr->AddEncodingFilters(module, section);
+ filterMgr->addEncodingFilters(module, section);
}
@@ -1290,7 +1290,7 @@
// }
if (filterMgr)
- filterMgr->AddRenderFilters(module, section);
+ filterMgr->addRenderFilters(module, section);
}
@@ -1323,7 +1323,7 @@
}
if (filterMgr)
- filterMgr->AddStripFilters(module, section);
+ filterMgr->addStripFilters(module, section);
}
@@ -1369,7 +1369,7 @@
}
}
}
- AddModToConfig(conffd, newmodfile.c_str());
+ addModToConfig(conffd, newmodfile.c_str());
FileMgr::removeFile(newmodfile.c_str());
}
}
@@ -1381,7 +1381,7 @@
}
-char SWMgr::AddModToConfig(FileDesc *conffd, const char *fname)
+char SWMgr::addModToConfig(FileDesc *conffd, const char *fname)
{
FileDesc *modfd;
char ch;
Modified: trunk/utilities/diatheke/diafiltmgr.cpp
===================================================================
--- trunk/utilities/diatheke/diafiltmgr.cpp 2020-07-10 09:31:40 UTC (rev 3752)
+++ trunk/utilities/diatheke/diafiltmgr.cpp 2020-07-10 09:32:46 UTC (rev 3753)
@@ -83,7 +83,7 @@
delete (fromtei);
}
-void DiathekeFilterMgr::AddRenderFilters(SWModule *module, ConfigEntMap §ion) {
+void DiathekeFilterMgr::addRenderFilters(SWModule *module, ConfigEntMap §ion) {
switch (module->getMarkup()) {
case FMT_THML:
if (fromthml)
@@ -106,7 +106,7 @@
module->addRenderFilter(fromtei);
break;
}
- EncodingFilterMgr::AddRenderFilters(module, section);
+ EncodingFilterMgr::addRenderFilters(module, section);
}
Modified: trunk/utilities/diatheke/diafiltmgr.h
===================================================================
--- trunk/utilities/diatheke/diafiltmgr.h 2020-07-10 09:31:40 UTC (rev 3752)
+++ trunk/utilities/diatheke/diafiltmgr.h 2020-07-10 09:32:46 UTC (rev 3753)
@@ -47,7 +47,7 @@
DiathekeFilterMgr(char markup = FMT_THML, char encoding = ENC_UTF8);
~DiathekeFilterMgr();
char Markup(char m = FMT_UNKNOWN);
- virtual void AddRenderFilters(SWModule *module, ConfigEntMap §ion);
+ virtual void addRenderFilters(SWModule *module, ConfigEntMap §ion);
};
#endif
More information about the sword-cvs
mailing list