[sword-svn] r3176 - in branches/sword-1-7-x: . include

[greg.hellings at crosswire.org]

Author: greg.hellings
Date: 2014-04-16 21:22:36 -0700 (Wed, 16 Apr 2014)
New Revision: 3176

Modified:
   branches/sword-1-7-x/
   branches/sword-1-7-x/include/ztext.h
Log:
Merging r3126 - spaces/tabs



Property changes on: branches/sword-1-7-x
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:2989-2991,2997,3001-3004,3006,3010-3013,3015-3020,3026-3039,3045-3046,3048,3056,3058-3062,3067,3073,3077-3081,3085-3086,3091,3094,3097-3099,3102,3104,3106-3108,3110,3115,3118-3121
   + /trunk:2989-2991,2997,3001-3004,3006,3010-3013,3015-3020,3026-3039,3045-3046,3048,3056,3058-3062,3067,3073,3077-3081,3085-3086,3091,3094,3097-3099,3102,3104,3106-3108,3110,3115,3118-3121,3126

Modified: branches/sword-1-7-x/include/ztext.h
===================================================================
--- branches/sword-1-7-x/include/ztext.h	2014-04-17 04:21:31 UTC (rev 3175)
+++ branches/sword-1-7-x/include/ztext.h	2014-04-17 04:22:36 UTC (rev 3176)
@@ -49,9 +49,7 @@
 	bool sameBlock(VerseKey * lastWriteKey, VerseKey * key);
 	int blockType;
 
-
 public:
-    
 	zText(const char *ipath, const char *iname = 0, const char *idesc = 0,
 			int blockType = CHAPTERBLOCKS, SWCompress *icomp = 0,
 			SWDisplay *idisp = 0, SWTextEncoding encoding = ENC_UNKNOWN,
@@ -65,16 +63,16 @@
 	virtual void increment(int steps = 1);
 	virtual void decrement(int steps = 1) { increment(-steps); }
 
-  // write interface ----------------------------
+	// write interface ----------------------------
 	virtual bool isWritable() const;
 	static char createModule(const char *path, int blockBound, const char *v11n = "KJV") {
 		return zVerse::createModule(path, blockBound, v11n);
 	}
 
-     virtual void setEntry(const char *inbuf, long len = -1);	// Modify current module entry
-     virtual void linkEntry(const SWKey *linkKey);	// Link current module entry to other module entry
+	virtual void setEntry(const char *inbuf, long len = -1);	// Modify current module entry
+	virtual void linkEntry(const SWKey *linkKey);	// Link current module entry to other module entry
 	virtual void deleteEntry();	// Delete current module entry
-  // end write interface ------------------------
+	// end write interface ------------------------
   
 	virtual void rawZFilter(SWBuf &buf, char direction = 0) const { rawFilter(buf, (SWKey *)(long)direction); }// hack, use key as direction for enciphering
 
@@ -86,7 +84,6 @@
 	virtual bool hasEntry(const SWKey *k) const;
 	
 	SWMODULE_OPERATORS
-
 };
 
 SWORD_NAMESPACE_END