[sword-cvs] sword/tests keytest.cpp,1.8,1.9 localetest.cpp,1.10,1.11 parsekey.cpp,1.12,1.13 rawldidxtest.cpp,1.5,1.6

[sword@www.crosswire.org]

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

Modified Files:
	keytest.cpp localetest.cpp parsekey.cpp rawldidxtest.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: keytest.cpp
===================================================================
RCS file: /cvs/core/sword/tests/keytest.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- keytest.cpp	5 Feb 2004 10:24:36 -0000	1.8
+++ keytest.cpp	6 Feb 2004 21:01:02 -0000	1.9
@@ -18,7 +18,7 @@
 	int max;
 
 	if (argc > 1)
-		LocaleMgr::systemLocaleMgr().setDefaultLocaleName(argv[1]);
+		LocaleMgr::getSystemLocaleMgr()->setDefaultLocaleName(argv[1]);
 
 	VerseKey	bla;
 	long index;

Index: localetest.cpp
===================================================================
RCS file: /cvs/core/sword/tests/localetest.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- localetest.cpp	5 Feb 2004 10:24:36 -0000	1.10
+++ localetest.cpp	6 Feb 2004 21:01:02 -0000	1.11
@@ -23,7 +23,7 @@
 	bla = "Johannes 1:1";
 	std::cout << bla << std::endl;
 
-	LocaleMgr::systemLocaleMgr().setDefaultLocaleName("de");
+	LocaleMgr::getSystemLocaleMgr()->setDefaultLocaleName("de");
 	VerseKey key2;
 	key2.setLocale("en");
 	ListKey list = key2.ParseVerseList("Luke 3:23-28",key2, true);

Index: parsekey.cpp
===================================================================
RCS file: /cvs/core/sword/tests/parsekey.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- parsekey.cpp	5 Feb 2004 10:24:36 -0000	1.12
+++ parsekey.cpp	6 Feb 2004 21:01:02 -0000	1.13
@@ -15,7 +15,7 @@
 	}
 
 	if (argc > 2)
-		LocaleMgr::systemLocaleMgr().setDefaultLocaleName(argv[2]);
+		LocaleMgr::getSystemLocaleMgr()->setDefaultLocaleName(argv[2]);
 
 	VerseKey DefaultVSKey;
 

Index: rawldidxtest.cpp
===================================================================
RCS file: /cvs/core/sword/tests/rawldidxtest.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- rawldidxtest.cpp	4 Jul 2003 21:45:24 -0000	1.5
+++ rawldidxtest.cpp	6 Feb 2004 21:01:02 -0000	1.6
@@ -27,9 +27,9 @@
      char buf[127];
 
 	sprintf(buf, "%s.idx", argv[1]);
-	FileDesc *idxfd = FileMgr::systemFileMgr.open(buf, O_RDONLY|O_BINARY, true);
+	FileDesc *idxfd = FileMgr::getSystemFileMgr()->open(buf, O_RDONLY|O_BINARY, true);
 	long maxoff = lseek(idxfd->getFd(), 0, SEEK_END) - 6;
-	FileMgr::systemFileMgr.close(idxfd);
+	FileMgr::getSystemFileMgr()->close(idxfd);
 
 	SWBuf last = "";
 	bool first = true;