Imported Upstream version 1.7.2+dfsg

1 files changed, 15 insertions, 15 deletions

diff --git a/src/modules/comments/swcom.cpp b/src/modules/comments/swcom.cpp
index e82751b..52bd61b 100644
--- a/src/modules/comments/swcom.cpp
+++ b/src/modules/comments/swcom.cpp
@@ -1,9 +1,11 @@
 /******************************************************************************
- *  swcom.cpp  - code for base class 'SWCom'- The basis for all commentary
- *			modules
  *
+ *  swcom.cpp -	code for base class 'SWCom'- The basis for all commentary
+ *		modules
  *
- * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+ * $Id: swcom.cpp 2893 2013-07-16 03:07:02Z scribe $
+ *
+ * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
@@ -41,9 +43,9 @@ SWCom::SWCom(const char *imodname, const char *imoddesc, SWDisplay *idisp, SWTex
 	this->versification = 0;
 	stdstr(&(this->versification), versification);
 	delete key;
-	key = (VerseKey *)CreateKey();
-	tmpVK1 = (VerseKey *)CreateKey();
-	tmpVK2 = (VerseKey *)CreateKey();
+	key = (VerseKey *)createKey();
+	tmpVK1 = (VerseKey *)createKey();
+	tmpVK2 = (VerseKey *)createKey();
         tmpSecond = false;
 }
 
@@ -59,7 +61,7 @@ SWCom::~SWCom() {
 }
 
 
-SWKey *SWCom::CreateKey() const {
+SWKey *SWCom::createKey() const {
 	VerseKey *vk = new VerseKey();
 
 	vk->setVersificationSystem(versification);
@@ -68,22 +70,20 @@ SWKey *SWCom::CreateKey() const {
 }
 
 
-long SWCom::Index() const {
+long SWCom::getIndex() const {
 	VerseKey *key = &getVerseKey();
-	entryIndex = key->Index();
+	entryIndex = key->getIndex();
 	return entryIndex;
 }
 
-long SWCom::Index(long iindex) {
+void SWCom::setIndex(long iindex) {
 	VerseKey *key = &getVerseKey();
-	key->Testament(1);
-	key->Index(iindex);
+	key->setTestament(1);
+	key->setIndex(iindex);
 
 	if (key != this->key) {
 		this->key->copyFrom(*key);
 	}
-
-	return Index();
 }
 
 
@@ -104,7 +104,7 @@ VerseKey &SWCom::getVerseKey(const SWKey *keyToConvert) const {
 		SWCATCH ( ... ) {	}
 		if (lkTest) {
 			SWTRY {
-				key = SWDYNAMIC_CAST(VerseKey, lkTest->GetElement());
+				key = SWDYNAMIC_CAST(VerseKey, lkTest->getElement());
 			}
 			SWCATCH ( ... ) {	}
 		}