[sword-svn] r2208 - trunk/include

[mgruner at www.crosswire.org]

Author: mgruner
Date: 2008-11-05 13:25:56 -0700 (Wed, 05 Nov 2008)
New Revision: 2208

Modified:
   trunk/include/swmodule.h
Log:
Removed obsolete const modifier on function return value which causes compiler warnings on GCC 4.3.2 that cannot be suppressed

Modified: trunk/include/swmodule.h
===================================================================
--- trunk/include/swmodule.h	2008-10-28 13:59:56 UTC (rev 2207)
+++ trunk/include/swmodule.h	2008-11-05 20:25:56 UTC (rev 2208)
@@ -103,7 +103,7 @@
 	char *modname;
 	char *moddesc;
 	char *modtype;
-	char *modlang;  
+	char *modlang;
 
 	char direction;
 	char markup;
@@ -170,7 +170,7 @@
 	/**
 	 * @return  True if this module is encoded in Unicode, otherwise returns false.
 	 */
-	virtual const bool isUnicode() const { return (encoding == (char)ENC_UTF8 || encoding == (char)ENC_SCSU); }
+	virtual bool isUnicode() const { return (encoding == (char)ENC_UTF8 || encoding == (char)ENC_SCSU); }
 
 	// These methods are useful for modules that come from a standard SWORD install (most do).
 	// SWMgr will call setConfig.  The user may use getConfig and getConfigEntry (if they
@@ -182,7 +182,7 @@
 	/**
 	 * @return The size of the text entry for the module's current key position.
 	 */
-	virtual const int getEntrySize() const { return entrySize; }
+	virtual int getEntrySize() const { return entrySize; }
 
 	/**
 	 * Sets a key to this module for position to a particular record
@@ -206,7 +206,7 @@
 	 * @deprecated Use setKey() instead.
 	 */
 	char SetKey(const SWKey &ikey) { return setKey(ikey); }
-	/** 
+	/**
 	 * @deprecated Use setKey() instead.
 	 */
 	char Key(const SWKey & ikey) { return setKey(ikey); }
@@ -235,12 +235,12 @@
 	 * gets the key text for the module.
 	 * do we really need this?
 	 */
-	 
+
 	virtual const char *getKeyText() const {
 		return *getKey();
 	}
 
-	
+
 	virtual long Index() const { return entryIndex; }
 	virtual long Index(long iindex) { entryIndex = iindex; return entryIndex; }
 
@@ -262,7 +262,7 @@
 	 */
 	virtual void setDisplay(SWDisplay * idisp);
 
-	/** 
+	/**
 	 * @deprecated Use get/setDisplay() instead.
 	 */
 	SWDisplay *Disp(SWDisplay * idisp = 0) {
@@ -659,7 +659,7 @@
 	 */
 	virtual bool isProcessEntryAttributes() const { return procEntAttr; }
 
-	
+
 	// SWSearchable Interface Impl -----------------------------------------------
 	virtual signed char createSearchFramework(
 			void (*percent) (char, void *) = &nullPercent,