[sword-cvs] sword/src/modules/texts/ztext ztext.cpp,1.46,1.47

[sword@www.crosswire.org]

Update of /cvs/core/sword/src/modules/texts/ztext
In directory www:/tmp/cvs-serv22315/src/modules/texts/ztext

Modified Files:
	ztext.cpp 
Log Message:
WINCE fixes

Index: ztext.cpp
===================================================================
RCS file: /cvs/core/sword/src/modules/texts/ztext/ztext.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- ztext.cpp	31 Aug 2003 04:46:32 -0000	1.46
+++ ztext.cpp	16 Jan 2004 03:42:42 -0000	1.47
@@ -147,10 +147,10 @@
 	const VerseKey *srckey = 0;
 
 	// see if we have a VerseKey * or decendant
-	try {
+	SWTRY {
 		srckey = (const VerseKey *) SWDYNAMIC_CAST(VerseKey, inkey);
 	}
-	catch ( ... ) {
+	SWCATCH ( ... ) {
 	}
 	// if we don't have a VerseKey * decendant, create our own
 	if (!srckey)
@@ -222,21 +222,21 @@
 	static VerseKey tmpVK;
 	VerseKey *key;
 	// see if we have a VerseKey * or decendant
-	try {
+	SWTRY {
 		key = SWDYNAMIC_CAST(VerseKey, this->key);
 	}
-	catch ( ... ) {	}
+	SWCATCH ( ... ) {	}
 	if (!key) {
 		ListKey *lkTest = 0;
-		try {
+		SWTRY {
 			lkTest = SWDYNAMIC_CAST(ListKey, this->key);
 		}
-		catch ( ... ) {	}
+		SWCATCH ( ... ) {	}
 		if (lkTest) {
-			try {
+			SWTRY {
 				key = SWDYNAMIC_CAST(VerseKey, lkTest->GetElement());
 			}
-			catch ( ... ) {	}
+			SWCATCH ( ... ) {	}
 		}
 	}
 	if (!key) {
@@ -362,10 +362,10 @@
 			// test to see if our scope for this search is bounded by a
 			// VerseKey
 			VerseKey *testKeyType = 0, vk;
-			try {
+			SWTRY {
 				testKeyType = SWDYNAMIC_CAST(VerseKey, ((scope)?scope:key));
 			}
-			catch ( ... ) {}
+			SWCATCH ( ... ) {}
 			// if we don't have a VerseKey * decendant we can't handle
 			// because of scope.
 			// In the future, add bool SWKey::isValid(const char *tryString);