[sword-svn] r1808 - trunk/src/mgr

[scribe at crosswire.org]

Author: scribe
Date: 2005-05-12 18:04:48 -0700 (Thu, 12 May 2005)
New Revision: 1808

Modified:
   trunk/src/mgr/swmgr.cpp
Log:
Conform code to coding standards
Change make_pair to container::value_type syntax


Modified: trunk/src/mgr/swmgr.cpp
===================================================================
--- trunk/src/mgr/swmgr.cpp	2005-05-13 00:44:17 UTC (rev 1807)
+++ trunk/src/mgr/swmgr.cpp	2005-05-13 01:04:48 UTC (rev 1808)
@@ -560,7 +560,7 @@
 			// inserting all configs first is not good because that overwrites old keys and new modules would share the same config
 			for (SectionMap::iterator it = config->Sections.begin(); it != config->Sections.end(); ++it) {
 				if (saveConfig->Sections.find( (*it).first ) != saveConfig->Sections.end()) { //if the new section is already present rename it
-					ConfigEntMap entMap( (*it).second );
+					ConfigEntMap entMap((*it).second);
 					
 					SWBuf name;
 					int i = 1;
@@ -569,8 +569,8 @@
 						i++;
 					} while (config->Sections.find(name) != config->Sections.end());
 					
-					config->Sections.insert( make_pair(name, entMap) );
-					config->Sections.erase( it );
+					config->Sections.insert(SectionMap::value_type(name, entMap) );
+					config->Sections.erase(it);
 				}
 			}
 		}
@@ -768,7 +768,7 @@
 		newmod = new HREFCom(datapath.c_str(), misc1.c_str(), name, description.c_str());
 	}
 
-        int pos;  //used for position of final / in AbsoluteDataPath, but also set to 1 for modules types that need to strip module name
+        int pos = 0;  //used for position of final / in AbsoluteDataPath, but also set to 1 for modules types that need to strip module name
 	if (!stricmp(driver, "RawLD")) {
 		newmod = new RawLD(datapath.c_str(), name, description.c_str(), 0, enc, direction, markup, lang.c_str());
                 pos = 1;