sync with crosswire 20020814-1047

4 files changed, 10 insertions, 10 deletions

diff --git a/apps/X11/InstallMgr/src/cipherfrm.cpp b/apps/X11/InstallMgr/src/cipherfrm.cpp
index 5b77797..1e6dd90 100644
--- a/apps/X11/InstallMgr/src/cipherfrm.cpp
+++ b/apps/X11/InstallMgr/src/cipherfrm.cpp
@@ -32,9 +32,9 @@ void __fastcall TCipherForm::Button2Click(TObject *Sender)
 			modconf = 0;
 			SWMgr *mgr = new SWMgr();
 			SWModule *mod = mgr->Modules[modName];
-			mod->SetKey("Ipet 2:12");
+			mod->setKey("Ipet 2:12");
 			tmpBuf = mod->StripText();
-			mod->SetKey("gen 1:10");
+			mod->setKey("gen 1:10");
 			tmpBuf += "\r\n\r\n";
 			tmpBuf += mod->StripText();
 			Memo1->Text = tmpBuf.c_str();
diff --git a/apps/X11/cheatah/cheatah.cpp b/apps/X11/cheatah/cheatah.cpp
index 0cb5778..38554f3 100644
--- a/apps/X11/cheatah/cheatah.cpp
+++ b/apps/X11/cheatah/cheatah.cpp
@@ -515,7 +515,7 @@ void MainWindow::lookupTextChanged() {
 	keyText = entryText;
 
 	if (curMod) {
-		curMod->SetKey(keyText.c_str());
+		curMod->setKey(keyText.c_str());
 		curMod->Display();
 		sprintf(tmpBuf, "%s (%s)", curMod->KeyText(), curMod->Name());
 		gtk_label_set(GTK_LABEL(statusbar1), tmpBuf);
diff --git a/apps/X11/micros/micros.cpp b/apps/X11/micros/micros.cpp
index 0321b92..f5af756 100644
--- a/apps/X11/micros/micros.cpp
+++ b/apps/X11/micros/micros.cpp
@@ -542,7 +542,7 @@ void MainWindow::lookupTextChanged() {
 		keyText += entryText;
 
 		if (curMod) {
-			curMod->SetKey(keyText.c_str());
+			curMod->setKey(keyText.c_str());
 			curMod->Display();
 			sprintf(tmpBuf, "%s (%s)", curMod->KeyText(), curMod->Name());
 			gtk_label_set(GTK_LABEL(statusbar1), tmpBuf);
diff --git a/apps/X11/wxSword/gui_sword.cpp b/apps/X11/wxSword/gui_sword.cpp
index 33d50ca..1a64105 100644
--- a/apps/X11/wxSword/gui_sword.cpp
+++ b/apps/X11/wxSword/gui_sword.cpp
@@ -196,7 +196,7 @@ public:
 		   iWalk != m_vBookList.end();
 		   iWalk ++ )
 		{
-		  (*iWalk) -> SetKey( oKey );
+		  (*iWalk) -> setKey( oKey );
 		}
 	  
 	  ttextVec::iterator	iText;
@@ -228,7 +228,7 @@ public:
 	  // set this verse
 	  for( iWalk = m_vBookList.begin(); iWalk != m_vBookList.end(); iWalk ++ )
 		{
-		  (*iWalk) -> SetKey( oKey );
+		  (*iWalk) -> setKey( oKey );
 		}
 	  
 	  ttextVec::iterator	iText;
@@ -290,7 +290,7 @@ public:
 		for( iText = m_vpTextCtrl.begin(); iText != m_vpTextCtrl.end(); iText ++, iBooks ++ ) {
 			ostrstream oOut;
 
-			(*iBooks)->SetKey( sWord.c_str() );
+			(*iBooks)->setKey( sWord.c_str() );
 
 			// Clear Previous Text
 			(*iText) -> SetValue("");
@@ -299,7 +299,7 @@ public:
 			// This 'if' checks to make sure we have an entry
 			// It also forces the module to retrieve its text which forces KeyText to closest
 			//  match.  Without it, the call to KeyText would get exactly what we set with
-			//  SetKey, above.
+			//  setKey, above.
 			if (strlen(* ((*iBooks).ptr())) > 0) {
 				oOut << "[ " << ((*iBooks).ptr()) -> KeyText() << " ]" << endl;
 				oOut << * ((*iBooks).ptr()) << endl;
@@ -326,7 +326,7 @@ public:
 		  // Get the search results and start a key here.
 		  SWListKey& oSearchResults = (*iBooks)->Search( sWord );
 		  oSearchResults.Persist( true );
-		  (*iBooks)->SetKey( oSearchResults );
+		  (*iBooks)->setKey( oSearchResults );
  
 		  // Clear Previous Text
 	  	  (*iText) -> SetValue("");
@@ -651,7 +651,7 @@ bool MyApp::OnInit(void)
   InitToolbar(pFrame->GetToolBar());
   
   // Text Message
-  pFrame->SetStatusText("Alpha $Revision: 1.1.1.1 $:Linux Version:Sword Development Team.");
+  pFrame->SetStatusText("Alpha $Revision: 1.2 $:Linux Version:Sword Development Team.");
   
   // Add Panel Info ==============================================