[sword-svn] r518 - branches/BCB5/apps/InstallMgr

[scribe at crosswire.org]

Author: scribe
Date: 2020-07-25 12:35:05 -0400 (Sat, 25 Jul 2020)
New Revision: 518

Modified:
   branches/BCB5/apps/InstallMgr/cipherfrm.cpp
Log:
Updated cipherfrm.cpp to work with new class overloads for SWMgr

Modified: branches/BCB5/apps/InstallMgr/cipherfrm.cpp
===================================================================
--- branches/BCB5/apps/InstallMgr/cipherfrm.cpp	2020-07-24 07:30:17 UTC (rev 517)
+++ branches/BCB5/apps/InstallMgr/cipherfrm.cpp	2020-07-25 16:35:05 UTC (rev 518)
@@ -8,6 +8,7 @@
 #include <swmodule.h>
 #include <filemgr.h>
 #include "MainFrm.h"
+#include <swlog.h>
 
 using namespace std;
 using namespace sword;
@@ -21,26 +22,22 @@
 class SWDLLEXPORT MyMgr : public SWMgr {
 
 public:
-	MyMgr(){
+	MyMgr() : SWMgr(0, 0, false) {
+     	load();
 	}
 protected:
-	virtual void createAllModules(bool multiMod = false);
-	virtual signed char load() {
-     	SWMgr::load();
-     }
+	virtual void createAllModules(bool multiMod = false) {
+		SWBuf extraConf = MainForm->getDataRootPath()+"/BibleCS/userprefs.conf";
+		bool exists = FileMgr::existsFile(extraConf);
+		if (exists) {
+			SWConfig addConfig(extraConf);
+			this->config->augment(addConfig);
+		}
+		SWMgr::createAllModules(multiMod);
+	}
 };
 
-void MyMgr::createAllModules(bool multiMod) {
-	SWBuf extraConf = MainForm->getDataRootPath()+"/BibleCS/userprefs.conf";
-	bool exists = FileMgr::existsFile(extraConf);
-	if (exists) {
-		SWConfig addConfig(extraConf);
-		this->config->augment(addConfig);
-	}
-	SWMgr::createAllModules(multiMod);
-}
 
-
 //---------------------------------------------------------------------------
 __fastcall TCipherForm::TCipherForm(TComponent* Owner)
 	: TForm(Owner)