[sword-cvs] sword/utilities/diatheke corediatheke.cpp,1.33,1.34

sword@www.crosswire.org sword@www.crosswire.org
Fri, 6 Feb 2004 14:01:05 -0700


Update of /cvs/core/sword/utilities/diatheke
In directory www:/tmp/cvs-serv27118/utilities/diatheke

Modified Files:
	corediatheke.cpp 
Log Message:
	Changed system[Log|File|Locale]Mgr to
		*Mgr *[get|set]System*Mgr() per Daniel Glassey's
		discovery of potential problems from order of
		initializing statics.

	Added new prefix recognition for OSIS lemma prefix
		"strong:"



Index: corediatheke.cpp
===================================================================
RCS file: /cvs/core/sword/utilities/diatheke/corediatheke.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- corediatheke.cpp	5 Feb 2004 10:24:36 -0000	1.33
+++ corediatheke.cpp	6 Feb 2004 21:01:03 -0000	1.34
@@ -23,7 +23,7 @@
 	bool types = false, descriptions = false, names = false;
 
 	if (!stricmp(key, "localelist")) {		
-		LocaleMgr *lm = &LocaleMgr::systemLocaleMgr();
+		LocaleMgr *lm = LocaleMgr::getSystemLocaleMgr();
 		list<SWBuf> loclist =	lm->getAvailableLocales();
 		list<SWBuf>::iterator li = loclist.begin();
 		for (;li != loclist.end(); li++) {
@@ -92,7 +92,7 @@
 	char querytype = 0;	
 
 	if (locale) {
-		LocaleMgr::systemLocaleMgr().setDefaultLocaleName(locale);
+		LocaleMgr::getSystemLocaleMgr()->setDefaultLocaleName(locale);
 	}
 	VerseKey vk;