[sword-svn] r2812 - trunk/include

[chrislit at crosswire.org]

Author: chrislit
Date: 2013-06-10 00:22:42 -0700 (Mon, 10 Jun 2013)
New Revision: 2812

Modified:
   trunk/include/swkey.h
   trunk/include/versekey.h
Log:
fixes for MSVC warning C4800

Modified: trunk/include/swkey.h
===================================================================
--- trunk/include/swkey.h	2013-06-10 06:59:18 UTC (rev 2811)
+++ trunk/include/swkey.h	2013-06-10 07:22:42 UTC (rev 2812)
@@ -150,7 +150,7 @@
 	 * @param ipersist value which to set persist;
 	 * @return 1 - persists in module; 0 - a copy is attempted
 	 */
-	SWDEPRECATED char Persist(signed char ipersist) { setPersist(ipersist); return isPersist(); }
+	SWDEPRECATED char Persist(signed char ipersist) { setPersist(ipersist!=0); return isPersist(); }
 	void setPersist(bool ipersist);
 
 	/** Gets and clears error status

Modified: trunk/include/versekey.h
===================================================================
--- trunk/include/versekey.h	2013-06-10 06:59:18 UTC (rev 2811)
+++ trunk/include/versekey.h	2013-06-10 07:22:42 UTC (rev 2812)
@@ -349,7 +349,7 @@
 	* @return *this
 	*/
 	virtual void normalize(bool autocheck = false);
-	SWDEPRECATED void Normalize(char autocheck = 0) { normalize(autocheck); }
+	SWDEPRECATED void Normalize(char autocheck = 0) { normalize(autocheck!=0); }
 
 	/** Sets flag that tells VerseKey to
 	* automatically normalize itself when modified
@@ -365,7 +365,7 @@
 	/**
 	* @deprecated Use setAutoNormalize() instead.
 	*/
-	SWDEPRECATED char AutoNormalize(char iautonorm) { char retVal = isAutoNormalize()?1:0; setAutoNormalize(iautonorm); return retVal; }	// deprecated
+	SWDEPRECATED char AutoNormalize(char iautonorm) { char retVal = isAutoNormalize()?1:0; setAutoNormalize(iautonorm!=0); return retVal; }	// deprecated
 	/**
 	* @deprecated Use isAutoNormalize() instead.
 	*/
@@ -381,7 +381,7 @@
 	* @return if unchanged -> value of intros,
 	* if changed -> previous value of intros
 	*/
-	SWDEPRECATED char Headings(char iheadings = MAXPOS(char)) { char retVal = isIntros(); if (iheadings != MAXPOS(char)) setIntros(iheadings); return retVal; }
+	SWDEPRECATED char Headings(char iheadings = MAXPOS(char)) { char retVal = isIntros(); if (iheadings != MAXPOS(char)) setIntros(iheadings!=0); return retVal; }
 
 	/** The Intros property determine whether or not to include
 	* chapter/book/testament/module intros