[sword-cvs] sword/src/modules/comments/rawfiles rawfiles.cpp,1.29,1.30

sword@www.crosswire.org sword@www.crosswire.org
Thu, 15 Jan 2004 20:42:44 -0700


Update of /cvs/core/sword/src/modules/comments/rawfiles
In directory www:/tmp/cvs-serv22315/src/modules/comments/rawfiles

Modified Files:
	rawfiles.cpp 
Log Message:
WINCE fixes

Index: rawfiles.cpp
===================================================================
RCS file: /cvs/core/sword/src/modules/comments/rawfiles/rawfiles.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- rawfiles.cpp	27 Jun 2003 01:41:07 -0000	1.29
+++ rawfiles.cpp	16 Jan 2004 03:42:41 -0000	1.30
@@ -62,14 +62,10 @@
 	char *tmpbuf;
 	VerseKey *key = 0;
 
-#ifndef _WIN32_WCE
-	try {
-#endif
+	SWTRY {
 		key = SWDYNAMIC_CAST(VerseKey, this->key);
-#ifndef _WIN32_WCE
 	}
-	catch ( ... ) {}
-#endif
+	SWCATCH ( ... ) {}
 	if (!key)
 		key = new VerseKey(this->key);
 
@@ -115,10 +111,10 @@
 	VerseKey *key = 0;
 
 	len = (len<0)?strlen(inbuf):len;
-	try {
+	SWTRY {
 		key = SWDYNAMIC_CAST(VerseKey, this->key);
 	}
-	catch ( ... ) {}
+	SWCATCH ( ... ) {}
 	if (!key)
 		key = new VerseKey(this->key);
 
@@ -164,10 +160,10 @@
 	char *tmpbuf;
 	const VerseKey *key = 0;
 
-	try {
+	SWTRY {
 		key = SWDYNAMIC_CAST(VerseKey, inkey);
 	}
-	catch ( ... ) {}
+	SWCATCH ( ... ) {}
 	if (!key)
 		key = new VerseKey(this->key);
 
@@ -181,10 +177,10 @@
 			delete key;
 		key = 0;
 
-		try {
+		SWTRY {
 			key = SWDYNAMIC_CAST(VerseKey, inkey);
 		}
-		catch ( ... ) {}
+		SWCATCH ( ... ) {}
 		if (!key)
 			key = new VerseKey(this->key);
 		doSetText(key->Testament(), key->Index(), tmpbuf.c_str());
@@ -205,14 +201,10 @@
 
 	VerseKey *key = 0;
 
-#ifndef _WIN32_WCE
-	try {
-#endif
+	SWTRY {
 		key = SWDYNAMIC_CAST(VerseKey, this->key);
-#ifndef _WIN32_WCE
 	}
-	catch ( ... ) {}
-#endif
+	SWCATCH ( ... ) {}
 	if (!key)
 		key = new VerseKey(this->key);