[sword-svn] r2782 - in trunk: bindings/swig cmake

[greg.hellings at crosswire.org]

Author: greg.hellings
Date: 2013-02-18 07:48:51 -0700 (Mon, 18 Feb 2013)
New Revision: 2782

Modified:
   trunk/bindings/swig/versekey.i
   trunk/cmake/sources.cmake
Log:
Reflect VerseMgr->VersificationMgr changes in CMake and the
SWIG bindings.


Modified: trunk/bindings/swig/versekey.i
===================================================================
--- trunk/bindings/swig/versekey.i	2013-02-16 15:03:08 UTC (rev 2781)
+++ trunk/bindings/swig/versekey.i	2013-02-18 14:48:51 UTC (rev 2782)
@@ -1,6 +1,6 @@
 %{
 #include "versekey.h"
-#include "versemgr.h"
+#include "versificationmgr.h"
 %}
 
 
@@ -20,7 +20,7 @@
 %immutable sword::abbrev::ab;
 
 %include "versekey.h"
-%include "versemgr.h"
+%include "versificationmgr.h"
 
 %extend sword::abbrev {
 	int getAbbrevCount() {
@@ -67,7 +67,7 @@
 
 
     const int getBookCount(){
-        const sword::VerseMgr::System* system = sword::VerseMgr::getSystemVerseMgr()->getVersificationSystem(
+        const sword::VersificationMgr::System* system = sword::VersificationMgr::getSystemVersificationMgr()->getVersificationSystem(
             self->getVersificationSystem()
         );
         return system->getBookCount();
@@ -87,7 +87,7 @@
 			return 0;
 		}
 
-        const sword::VerseMgr::System* system = sword::VerseMgr::getSystemVerseMgr()->getVersificationSystem(
+        const sword::VersificationMgr::System* system = sword::VersificationMgr::getSystemVersificationMgr()->getVersificationSystem(
             self->getVersificationSystem()
         );
         
@@ -95,7 +95,7 @@
             (testament == 2) ? self->BMAX[0] : 0
         );
 
-        const sword::VerseMgr::Book* b = system->getBook(book_num);
+        const sword::VersificationMgr::Book* b = system->getBook(book_num);
         if(!b) {
             fprintf(stderr, "b is null for %d?!?\n", book_num);
             return 0;
@@ -106,14 +106,14 @@
 	};
 
     int getBookNumberByOSISName( const char* bookname ) {
-        const sword::VerseMgr::System* system = sword::VerseMgr::getSystemVerseMgr()->getVersificationSystem(
+        const sword::VersificationMgr::System* system = sword::VersificationMgr::getSystemVersificationMgr()->getVersificationSystem(
             self->getVersificationSystem()
         );
         return system->getBookNumberByOSISName(bookname);
    }
     
     const char* getOSISBookName( const int book ) {
-        const sword::VerseMgr::System* system = sword::VerseMgr::getSystemVerseMgr()->getVersificationSystem(
+        const sword::VersificationMgr::System* system = sword::VersificationMgr::getSystemVersificationMgr()->getVersificationSystem(
             self->getVersificationSystem()
         );
    		if ( (book < 0) || (book >= system->getBookCount()))
@@ -136,7 +136,7 @@
 			return 0;
 		}
 
-        const sword::VerseMgr::System* system = sword::VerseMgr::getSystemVerseMgr()->getVersificationSystem(
+        const sword::VersificationMgr::System* system = sword::VersificationMgr::getSystemVersificationMgr()->getVersificationSystem(
             self->getVersificationSystem()
         );
         
@@ -144,7 +144,7 @@
             (testament == 2) ? self->BMAX[0] : 0
         );
 
-        const sword::VerseMgr::Book* b = system->getBook(book_num);
+        const sword::VersificationMgr::Book* b = system->getBook(book_num);
         if(!b) {
             fprintf(stderr, "b is null for %d?!?\n", book_num);
             return 0;
@@ -165,7 +165,7 @@
 			return 0;
 		}
 
-        const sword::VerseMgr::System* system = sword::VerseMgr::getSystemVerseMgr()->getVersificationSystem(
+        const sword::VersificationMgr::System* system = sword::VersificationMgr::getSystemVersificationMgr()->getVersificationSystem(
             self->getVersificationSystem()
         );
         
@@ -173,7 +173,7 @@
             (testament == 2) ? self->BMAX[0] : 0
         );
 
-        const sword::VerseMgr::Book* b = system->getBook(book_num);
+        const sword::VersificationMgr::Book* b = system->getBook(book_num);
         if(!b) {
             fprintf(stderr, "b is null for %d?!?\n", book_num);
             return 0;

Modified: trunk/cmake/sources.cmake
===================================================================
--- trunk/cmake/sources.cmake	2013-02-16 15:03:08 UTC (rev 2781)
+++ trunk/cmake/sources.cmake	2013-02-18 14:48:51 UTC (rev 2782)
@@ -29,7 +29,7 @@
 	src/mgr/encfiltmgr.cpp
 	src/mgr/markupfiltmgr.cpp
 	src/mgr/filemgr.cpp
-	src/mgr/versemgr.cpp
+	src/mgr/versificationmgr.cpp
 	src/mgr/ftptrans.cpp
 	src/mgr/swlocale.cpp
 	src/mgr/localemgr.cpp
@@ -248,7 +248,7 @@
 	include/entriesblk.h
 	include/femain.h
 	include/filemgr.h
-	include/versemgr.h
+	include/versificationmgr.h
 	include/flatapi.h
 	include/ftpparse.h
 	include/ftptrans.h