[Scummvm-cvs-logs] CVS: residual objectstate.h,1.11,1.12 font.h,1.6,1.7 textsplit.h,1.6,1.7

[Erich Edgar Hoover]

Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7812

Modified Files:
	objectstate.h font.h textsplit.h 
Log Message:
Updated header files to be GCC 4.1 compatible

Index: objectstate.h
===================================================================
RCS file: /cvsroot/scummvm/residual/objectstate.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- objectstate.h	17 Jul 2005 23:40:21 -0000	1.11
+++ objectstate.h	24 Dec 2005 18:19:53 -0000	1.12
@@ -37,7 +37,7 @@
 	};
 
 	ObjectState(int setupID, ObjectState::Position pos, const char *bitmap, const char *zbitmap, bool visible);
-	ObjectState::~ObjectState();
+	~ObjectState();
 
 	int setupID() const { return _setupID; }
 	Position pos() const { return _pos; }

Index: font.h
===================================================================
RCS file: /cvsroot/scummvm/residual/font.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- font.h	17 Jul 2005 23:40:21 -0000	1.6
+++ font.h	24 Dec 2005 18:19:53 -0000	1.7
@@ -35,7 +35,7 @@
 	int32 getCharStartingLine(unsigned char c) { return _charHeaders[getCharIndex(c)].startingLine; }
 	const byte *getCharData(unsigned char c) { return _fontData + (_charHeaders[getCharIndex(c)].offset); }
 
-	static const uint8 Font::emerFont[][13];
+	static const uint8 emerFont[][13];
 private:
 
 	uint16 getCharIndex(unsigned char c);

Index: textsplit.h
===================================================================
RCS file: /cvsroot/scummvm/residual/textsplit.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- textsplit.h	1 Jan 2005 10:23:16 -0000	1.6
+++ textsplit.h	24 Dec 2005 18:19:53 -0000	1.7
@@ -39,7 +39,7 @@
 	bool eof() const { return _currLine == NULL; }
 
 	// Check if the current line contains 'needle'
-	bool TextSplitter::checkString(const char *needle);
+	bool checkString(const char *needle);
 
 	// Expect a certain fixed string; bail out with an error if not
 	// found.  Advance to the next line.