[sword-svn] r3799 - in trunk: include src/mgr

[scribe at crosswire.org]

Author: scribe
Date: 2020-09-17 14:04:24 -0400 (Thu, 17 Sep 2020)
New Revision: 3799

Modified:
   trunk/include/installmgr.h
   trunk/src/mgr/installmgr.cpp
   trunk/src/mgr/swmgr.cpp
Log:
updated types to better match usage


Modified: trunk/include/installmgr.h
===================================================================
--- trunk/include/installmgr.h	2020-09-17 18:02:54 UTC (rev 3798)
+++ trunk/include/installmgr.h	2020-09-17 18:04:24 UTC (rev 3799)
@@ -96,12 +96,12 @@
 public:
 
 	static bool userDisclaimerConfirmed;
-	static const int MODSTAT_OLDER;
-	static const int MODSTAT_SAMEVERSION;
-	static const int MODSTAT_UPDATED;
-	static const int MODSTAT_NEW;
-	static const int MODSTAT_CIPHERED;
-	static const int MODSTAT_CIPHERKEYPRESENT;
+	static const unsigned int MODSTAT_OLDER;
+	static const unsigned int MODSTAT_SAMEVERSION;
+	static const unsigned int MODSTAT_UPDATED;
+	static const unsigned int MODSTAT_NEW;
+	static const unsigned int MODSTAT_CIPHERED;
+	static const unsigned int MODSTAT_CIPHERKEYPRESENT;
 
 	SWConfig *installConf;
 

Modified: trunk/src/mgr/installmgr.cpp
===================================================================
--- trunk/src/mgr/installmgr.cpp	2020-09-17 18:02:54 UTC (rev 3798)
+++ trunk/src/mgr/installmgr.cpp	2020-09-17 18:04:24 UTC (rev 3799)
@@ -66,12 +66,12 @@
 }
 
 
-const int InstallMgr::MODSTAT_OLDER            = 0x001;
-const int InstallMgr::MODSTAT_SAMEVERSION      = 0x002;
-const int InstallMgr::MODSTAT_UPDATED          = 0x004;
-const int InstallMgr::MODSTAT_NEW              = 0x008;
-const int InstallMgr::MODSTAT_CIPHERED         = 0x010;
-const int InstallMgr::MODSTAT_CIPHERKEYPRESENT = 0x020;
+const unsigned int InstallMgr::MODSTAT_OLDER            = 0x001;
+const unsigned int InstallMgr::MODSTAT_SAMEVERSION      = 0x002;
+const unsigned int InstallMgr::MODSTAT_UPDATED          = 0x004;
+const unsigned int InstallMgr::MODSTAT_NEW              = 0x008;
+const unsigned int InstallMgr::MODSTAT_CIPHERED         = 0x010;
+const unsigned int InstallMgr::MODSTAT_CIPHERKEYPRESENT = 0x020;
 bool      InstallMgr::userDisclaimerConfirmed  = false;
 
 

Modified: trunk/src/mgr/swmgr.cpp
===================================================================
--- trunk/src/mgr/swmgr.cpp	2020-09-17 18:02:54 UTC (rev 3798)
+++ trunk/src/mgr/swmgr.cpp	2020-09-17 18:04:24 UTC (rev 3799)
@@ -1182,7 +1182,7 @@
 
 
 char SWMgr::filterText(const char *filterName, SWBuf &text, const SWKey *key, const SWModule *module) {
-	char retVal = -1;
+	signed char retVal = -1;
 	// why didn't we use find here?
 	for (OptionFilterMap::iterator it = optionFilters.begin(); it != optionFilters.end(); it++) {
 		if ((*it).second->getOptionName()) {