[sword-svn] r2453 - in trunk/bindings/corba: omniorbcpp orbitcpp

[scribe at crosswire.org]

Author: scribe
Date: 2009-09-15 08:36:58 -0700 (Tue, 15 Sep 2009)
New Revision: 2453

Modified:
   trunk/bindings/corba/omniorbcpp/swordorb-impl.cpp
   trunk/bindings/corba/orbitcpp/swordorb-impl.cpp
Log:
fixed an obvious -+ bug, and changed others getters in context to use non-deprecated methods


Modified: trunk/bindings/corba/omniorbcpp/swordorb-impl.cpp
===================================================================
--- trunk/bindings/corba/omniorbcpp/swordorb-impl.cpp	2009-09-15 15:31:09 UTC (rev 2452)
+++ trunk/bindings/corba/omniorbcpp/swordorb-impl.cpp	2009-09-15 15:36:58 UTC (rev 2453)
@@ -194,11 +194,11 @@
 	sword::VerseKey *vkey = SWDYNAMIC_CAST(VerseKey, key);
 	if (vkey && (*keyText=='+' ||*keyText=='-')) {
 		if (!stricmp(keyText+1, "book")) {
-			vkey->setBook(vkey->getBook() + ((*keyText=='-')?1:-1));
+			vkey->setBook(vkey->getBook() + ((*keyText=='+')?1:-1));
 			return;
 		}
 		else if (!stricmp(keyText+1, "chapter")) {
-			vkey->setChapter(vkey->getChapter() + ((*keyText=='-')?1:-1));
+			vkey->setChapter(vkey->getChapter() + ((*keyText=='+')?1:-1));
 			return;
 		}
 	}
@@ -231,16 +231,16 @@
 	if (vkey) {
 		retVal->length(7);
 		SWBuf num;
-		num.appendFormatted("%d", vkey->Testament());
+		num.appendFormatted("%d", vkey->getTestament());
 		(*retVal)[0] = CORBA::string_dup(num.c_str());
 		num = "";
 		num.appendFormatted("%d", vkey->getBook());
 		(*retVal)[1] = CORBA::string_dup(num.c_str());
 		num = "";
-		num.appendFormatted("%d", vkey->Chapter());
+		num.appendFormatted("%d", vkey->getChapter());
 		(*retVal)[2] = CORBA::string_dup(num.c_str());
 		num = "";
-		num.appendFormatted("%d", vkey->Verse());
+		num.appendFormatted("%d", vkey->getVerse());
 		(*retVal)[3] = CORBA::string_dup(num.c_str());
 		num = "";
 		num.appendFormatted("%d", vkey->getChapterMax());

Modified: trunk/bindings/corba/orbitcpp/swordorb-impl.cpp
===================================================================
--- trunk/bindings/corba/orbitcpp/swordorb-impl.cpp	2009-09-15 15:31:09 UTC (rev 2452)
+++ trunk/bindings/corba/orbitcpp/swordorb-impl.cpp	2009-09-15 15:36:58 UTC (rev 2453)
@@ -293,11 +293,11 @@
 	sword::VerseKey *vkey = SWDYNAMIC_CAST(VerseKey, key);
 	if (vkey && (*keyText=='+' ||*keyText=='-')) {
 		if (!stricmp(keyText+1, "book")) {
-			vkey->setBook(vkey->getBook() + ((*keyText=='-')?1:-1));
+			vkey->setBook(vkey->getBook() + ((*keyText=='+')?1:-1));
 			return;
 		}
 		else if (!stricmp(keyText+1, "chapter")) {
-			vkey->setChapter(vkey->getChapter() + ((*keyText=='-')?1:-1));
+			vkey->setChapter(vkey->getChapter() + ((*keyText=='+')?1:-1));
 			return;
 		}
 	}
@@ -314,16 +314,16 @@
 	if (vkey) {
 		retVal->length(7);
 		SWBuf num;
-		num.appendFormatted("%d", vkey->Testament());
+		num.appendFormatted("%d", vkey->getTestament());
 		(*retVal)[0] = CORBA::string_dup(num.c_str());
 		num = "";
-		num.appendFormatted("%d", vkey->Book());
+		num.appendFormatted("%d", vkey->getBook());
 		(*retVal)[1] = CORBA::string_dup(num.c_str());
 		num = "";
-		num.appendFormatted("%d", vkey->Chapter());
+		num.appendFormatted("%d", vkey->getChapter());
 		(*retVal)[2] = CORBA::string_dup(num.c_str());
 		num = "";
-		num.appendFormatted("%d", vkey->Verse());
+		num.appendFormatted("%d", vkey->getVerse());
 		(*retVal)[3] = CORBA::string_dup(num.c_str());
 		num = "";
 		num.appendFormatted("%d", vkey->getChapterMax());