[sword-svn] r3504 - in trunk/utilities: . diatheke

[scribe at crosswire.org]

Author: scribe
Date: 2017-11-01 03:36:18 -0700 (Wed, 01 Nov 2017)
New Revision: 3504

Modified:
   trunk/utilities/diatheke/diathekemgr.cpp
   trunk/utilities/diatheke/diathekemgr.h
   trunk/utilities/installmgr.cpp
Log:
Updated utilities to no longer use newly deprecated methods

Modified: trunk/utilities/diatheke/diathekemgr.cpp
===================================================================
--- trunk/utilities/diatheke/diathekemgr.cpp	2017-11-01 10:36:13 UTC (rev 3503)
+++ trunk/utilities/diatheke/diathekemgr.cpp	2017-11-01 10:36:18 UTC (rev 3504)
@@ -47,7 +47,7 @@
 	bidireorder = new UTF8BiDiReorder();
 	transliterator = new UTF8Transliterator();
 #endif
-	Load();
+	load();
 
 #ifdef WIN32
 	OSVERSIONINFO osvi;
@@ -73,7 +73,7 @@
 }
 
 
-void DiathekeMgr::AddRenderFilters(SWModule *module, ConfigEntMap &section)
+void DiathekeMgr::addRenderFilters(SWModule *module, ConfigEntMap &section)
 {
 	SWBuf lang;
 	ConfigEntMap::iterator entry;
@@ -91,11 +91,11 @@
 		module->addRenderFilter(bidireorder);
 	}
 #endif
-	SWMgr::AddRenderFilters(module, section);
+	SWMgr::addRenderFilters(module, section);
 }
 
-signed char DiathekeMgr::Load () {
-	signed char retval =  SWMgr::Load();
+signed char DiathekeMgr::load() {
+	signed char retval =  SWMgr::load();
 #ifdef _ICU_
 	optionFilters["UTF8Transliterator"] = transliterator;
 	options.push_back(transliterator->getOptionName());
@@ -103,11 +103,9 @@
 	return retval;
 };
 
-void DiathekeMgr::AddGlobalOptions (SWModule * module, ConfigEntMap & section,
-                                   ConfigEntMap::iterator start,
-                                   ConfigEntMap::iterator end) {
+void DiathekeMgr::addGlobalOptionFilters(SWModule *module, ConfigEntMap &section) {
 
-        SWMgr::AddGlobalOptions(module, section, start, end);
+        SWMgr::addGlobalOptionFilters(module, section);
 #ifdef _ICU_
         module->addOptionFilter(transliterator);
 #endif

Modified: trunk/utilities/diatheke/diathekemgr.h
===================================================================
--- trunk/utilities/diatheke/diathekemgr.h	2017-11-01 10:36:13 UTC (rev 3503)
+++ trunk/utilities/diatheke/diathekemgr.h	2017-11-01 10:36:18 UTC (rev 3504)
@@ -38,9 +38,9 @@
 #endif
 
 protected:
-	virtual void AddRenderFilters(SWModule *module, ConfigEntMap &section);
-	virtual signed char Load ();
-	virtual void AddGlobalOptions (SWModule * module, ConfigEntMap & section, ConfigEntMap::iterator start, ConfigEntMap::iterator end);
+	virtual void addRenderFilters(SWModule *module, ConfigEntMap &section);
+	virtual signed char load();
+	virtual void addGlobalOptionFilters(SWModule * module, ConfigEntMap & section);
 
 public:
 	bool shape;

Modified: trunk/utilities/installmgr.cpp
===================================================================
--- trunk/utilities/installmgr.cpp	2017-11-01 10:36:13 UTC (rev 3503)
+++ trunk/utilities/installmgr.cpp	2017-11-01 10:36:18 UTC (rev 3504)
@@ -152,7 +152,7 @@
 		if (!mgr->config)
 			usage(0, "ERROR: SWORD configuration not found.  Please configure SWORD before using this program.");
 
-		SWBuf baseDir = mgr->getHomeDir();
+		SWBuf baseDir = FileMgr::getSystemFileMgr()->getHomeDir();
 		if (baseDir.length() < 1) baseDir = ".";
 		baseDir += "/.sword/InstallMgr";
 		confPath = baseDir + "/InstallMgr.conf";