[sword-svn] r414 - trunk

scribe at crosswire.org scribe at crosswire.org
Tue May 3 03:23:16 MST 2005 

Author: scribe
Date: 2005-05-03 03:23:16 -0700 (Tue, 03 May 2005)
New Revision: 414

Modified:
   trunk/RxRichEditX.cpp
   trunk/biblecsmgr.cpp
   trunk/biblecsmgr.h
   trunk/editentryfrm.cpp
   trunk/editentryfrm.h
   trunk/mainfrm.cpp
   trunk/paraldisp.h
   trunk/rtfhintfrm.cpp
   trunk/sword.bpr
Log:


Modified: trunk/RxRichEditX.cpp
===================================================================
--- trunk/RxRichEditX.cpp	2005-04-10 20:57:21 UTC (rev 413)
+++ trunk/RxRichEditX.cpp	2005-05-03 10:23:16 UTC (rev 414)
@@ -6,12 +6,13 @@
 #include "RxRichEditX.h"
 #include "PrintFrm.h"
 #include <clipbrd.hpp>
-#include <swdisprtf.h>
-#include <swdisprtfchap.h>
+#include "swdisprtf.h"
+#include "swdisprtfchap.h"
 #include "mainfrm.h"
 #include <localemgr.h>
 #include <unicodertf.h>
 #include <utilxml.h>
+#include <utilstr.h>
 
 char TRxRichEditX::platformID = 0;
 

Modified: trunk/biblecsmgr.cpp
===================================================================
--- trunk/biblecsmgr.cpp	2005-04-10 20:57:21 UTC (rev 413)
+++ trunk/biblecsmgr.cpp	2005-05-03 10:23:16 UTC (rev 414)
@@ -67,7 +67,7 @@
 }
 
 
-char BibleCSMGR::AddModToConfig(int conffd, const char *fname)
+char BibleCSMGR::AddModToConfig(FileDesc *conffd, const char *fname)
 {
 	SWConfig modconf(fname);
 	SectionMap::iterator section;

Modified: trunk/biblecsmgr.h
===================================================================
--- trunk/biblecsmgr.h	2005-04-10 20:57:21 UTC (rev 413)
+++ trunk/biblecsmgr.h	2005-05-03 10:23:16 UTC (rev 414)
@@ -19,7 +19,7 @@
 	SWConfig *userPrefs;
 
 protected:
-	virtual char AddModToConfig(int conffd, const char *fname);
+	virtual char AddModToConfig(FileDesc *conffd, const char *fname);
 	virtual void AddRenderFilters(SWModule *module, ConfigEntMap &section);
 	   virtual signed char Load ();
 	   virtual void AddGlobalOptions (SWModule * module, ConfigEntMap & section,

Modified: trunk/editentryfrm.cpp
===================================================================
--- trunk/editentryfrm.cpp	2005-04-10 20:57:21 UTC (rev 413)
+++ trunk/editentryfrm.cpp	2005-05-03 10:23:16 UTC (rev 414)
@@ -4,7 +4,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include "editentryfrm.h"
-#include <swdisprtf.h>
+#include "swdisprtf.h"
 #include "rxricheditx.h"
 
 const float RulerAdj = 4.0/3.0;

Modified: trunk/editentryfrm.h
===================================================================
--- trunk/editentryfrm.h	2005-04-10 20:57:21 UTC (rev 413)
+++ trunk/editentryfrm.h	2005-05-03 10:23:16 UTC (rev 414)
@@ -23,7 +23,7 @@
 #include <Windows.hpp>
 #include <System.hpp>
 #include <swmodule.h>
-#include <swdisprtf.h>
+#include "swdisprtf.h"
 #include "rxricheditx.h"
 //----------------------------------------------------------------------------
 class TEditEntryForm : public TForm

Modified: trunk/mainfrm.cpp
===================================================================
--- trunk/mainfrm.cpp	2005-04-10 20:57:21 UTC (rev 413)
+++ trunk/mainfrm.cpp	2005-05-03 10:23:16 UTC (rev 414)
@@ -627,7 +627,7 @@
 		if (!hasFeature(mainmgr, curLex.c_str(), feature.c_str())) {
 			SWBuf tmpval = optionsconf->Sections["ModDefaults"][feature.c_str()];
 			for (int i = 0; i < LexDictPageControl->PageCount; i++) {
-				if (!stricmp(LexDictPageControl->Pages[i]->Caption.c_str(), tmpval.c_str())) {
+				if (!::stricmp(LexDictPageControl->Pages[i]->Caption.c_str(), tmpval.c_str())) {
 					LexDictPageControl->ActivePageIndex = i;
 					break;
 				}
@@ -1018,10 +1018,10 @@
 	}
 
 	tmpval = optionsconf->Sections["General"]["DevsAsDicts"];
-	showDevos = (stricmp(tmpval.c_str(), "false"));
+	showDevos = (::stricmp(tmpval.c_str(), "false"));
 
 	tmpval = optionsconf->Sections["General"]["GlosAsDicts"];
-	showGlos = (stricmp(tmpval.c_str(), "false"));
+	showGlos = (::stricmp(tmpval.c_str(), "false"));
 	
 	DefaultVSKey = new VerseKey();
 	DefaultStrKey = new StrKey();
@@ -1080,38 +1080,38 @@
 
 			for (eit = (*sit).second.lower_bound("Feature"), eitend = (*sit).second.upper_bound("Feature"); eit != eitend; eit++) {
 				const char *feature = eit->second.c_str();
-				if (!stricmp(feature, "StrongsNumbers")) {
+				if (!::stricmp(feature, "StrongsNumbers")) {
 					Optionsfrm->strongsNumsCB->Items->AddObject(it->second->Description(), (TObject *)it->second->Name());
 					if (optionsconf->Sections["ModDefaults"].find("StrongsNumbers") == optionsconf->Sections["ModDefaults"].end())
 						(*optionsconf)["ModDefaults"]["StrongsNumbers"] = it->second->Name();
 				}
-				if (!stricmp(feature, "GreekDef")) {
+				if (!::stricmp(feature, "GreekDef")) {
 					Optionsfrm->greekDefCB->Items->AddObject(it->second->Description(), (TObject *)it->second->Name());
 					if (optionsconf->Sections["ModDefaults"].find("GreekDef") == optionsconf->Sections["ModDefaults"].end())
 						(*optionsconf)["ModDefaults"]["GreekDef"] = it->second->Name();
 				}
-				if (!stricmp(feature, "GreekParse")) {
+				if (!::stricmp(feature, "GreekParse")) {
 					Optionsfrm->greekParseCB->Items->AddObject(it->second->Description(), (TObject *)it->second->Name());
 					if (optionsconf->Sections["ModDefaults"].find("GreekParse") == optionsconf->Sections["ModDefaults"].end())
 						(*optionsconf)["ModDefaults"]["GreekParse"] = it->second->Name();
 				}
-				if (!stricmp(feature, "HebrewDef")) {
+				if (!::stricmp(feature, "HebrewDef")) {
 					Optionsfrm->hebrewDefCB->Items->AddObject(it->second->Description(), (TObject *)it->second->Name());
 					if (optionsconf->Sections["ModDefaults"].find("HebrewDef") == optionsconf->Sections["ModDefaults"].end())
 						(*optionsconf)["ModDefaults"]["HebrewDef"] = it->second->Name();
 				}
-				if (!stricmp(feature, "HebrewParse")) {
+				if (!::stricmp(feature, "HebrewParse")) {
 					Optionsfrm->hebrewParseCB->Items->AddObject(it->second->Description(), (TObject *)it->second->Name());
 					if (optionsconf->Sections["ModDefaults"].find("HebrewParse") == optionsconf->Sections["ModDefaults"].end())
 						(*optionsconf)["ModDefaults"]["HebrewParse"] = it->second->Name();
 				}
-				if (!stricmp(feature, "DailyDevotion")) {
+				if (!::stricmp(feature, "DailyDevotion")) {
 					Optionsfrm->dailyDefaultCB->Items->AddObject(it->second->Description(), (TObject *)it->second->Name());
 					devotional = true;
 					if (optionsconf->Sections["ModDefaults"].find("DailyDevotion") == optionsconf->Sections["ModDefaults"].end())
 						(*optionsconf)["ModDefaults"]["DailyDevotion"] = it->second->Name();
 				}
-				if (!stricmp(feature, "Glossary")) {
+				if (!::stricmp(feature, "Glossary")) {
 					glossary = true;
 				}
 			}
@@ -1277,7 +1277,7 @@
 	SplashPg->Hide();
 
 	tmpval = optionsconf->Sections["General"]["TipOfTheDay"];
-	if(!stricmp(tmpval.c_str(), "Devotional")) {
+	if(!::stricmp(tmpval.c_str(), "Devotional")) {
 		DevOfTheDay2->Show();
 	}
 
@@ -1305,7 +1305,7 @@
 	if ((sit = mgr->config->Sections.find(modName)) != mgr->config->Sections.end()) {
 		for (eit = (*sit).second.lower_bound("Feature"), eitend = (*sit).second.upper_bound("Feature"); eit != eitend; eit++) {
 			const char *tfeature = eit->second.c_str();
-			if (!stricmp(tfeature, feature))
+			if (!::stricmp(tfeature, feature))
 				return true;
 		}
 	}
@@ -1934,12 +1934,12 @@
 	option[k] = 0;
 	mainmgr->setGlobalOption(option, value);
 	
-	if ((!stricmp(option, "Strong's Numbers")) && (!stricmp(value, "On"))) {
+	if ((!::stricmp(option, "Strong's Numbers")) && (!::stricmp(value, "On"))) {
 		SWBuf curText = TextPageControl->ActivePage->Caption.c_str();
 		if (!hasFeature(mainmgr, curText.c_str(), "StrongsNumbers")) {
 			SWBuf tmpval = optionsconf->Sections["ModDefaults"]["StrongsNumbers"];
 			for (int i = 0; i < TextPageControl->PageCount; i++) {
-				if (!stricmp(TextPageControl->Pages[i]->Caption.c_str(), tmpval.c_str())) {
+				if (!::stricmp(TextPageControl->Pages[i]->Caption.c_str(), tmpval.c_str())) {
 					TextPageControl->ActivePageIndex = i;
 					break;
 				}
@@ -1981,7 +1981,7 @@
 				caption[k++] = source[j];
 		}
 		caption[k] = 0;
-		if (!stricmp(caption, value.c_str()))
+		if (!::stricmp(caption, value.c_str()))
 			menuChoice->Items[i]->Checked = true;
 		else	menuChoice->Items[i]->Checked = false;    
 		delete [] caption;

Modified: trunk/paraldisp.h
===================================================================
--- trunk/paraldisp.h	2005-04-10 20:57:21 UTC (rev 413)
+++ trunk/paraldisp.h	2005-05-03 10:23:16 UTC (rev 414)
@@ -31,7 +31,7 @@
 #include <vcl\ComCtrls.hpp>
 #include <vcl\StdCtrls.hpp>
 #include <swmgr.h>
-#include <swdisprtfchap.h>
+#include "swdisprtfchap.h"
 //---------------------------------------------------------------------------
 class ParallelDisp : public SWDispRTFChap {
 	SWModule **mods;

Modified: trunk/rtfhintfrm.cpp
===================================================================
--- trunk/rtfhintfrm.cpp	2005-04-10 20:57:21 UTC (rev 413)
+++ trunk/rtfhintfrm.cpp	2005-05-03 10:23:16 UTC (rev 414)
@@ -5,8 +5,8 @@
 
 #include "rtfhintfrm.h"
 #include <clipbrd.hpp>
-#include <swdisprtf.h>
-#include <swdisprtfchap.h>
+#include "swdisprtf.h"
+#include "swdisprtfchap.h"
 #include "mainfrm.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)

Modified: trunk/sword.bpr
===================================================================
--- trunk/sword.bpr	2005-04-10 20:57:21 UTC (rev 413)
+++ trunk/sword.bpr	2005-05-03 10:23:16 UTC (rev 414)
@@ -74,7 +74,7 @@
 MajorVer=1
 MinorVer=5
 Release=6
-Build=24
+Build=25
 Debug=0
 PreRelease=0
 Special=0
@@ -86,7 +86,7 @@
 [Version Info Keys]
 CompanyName=CrossWire Software &amp; Bible Society
 FileDescription=Windows 32bit User Interface to The SWORD Project
-FileVersion=1.5.6.24
+FileVersion=1.5.6.25
 InternalName=biblecs
 LegalCopyright=(c) 1990-2005 CrossWire Bible Society under the terms of the GNU General Public License
 LegalTrademarks=

More information about the sword-cvs mailing list