[Scummvm-cvs-logs] SF.net SVN: scummvm:[46779] scummvm/trunk

[fingolfin at users.sourceforge.net]

Revision: 46779
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46779&view=rev
Author:   fingolfin
Date:     2009-12-30 23:00:55 +0000 (Wed, 30 Dec 2009)

Log Message:
-----------
Rename Common::Stream::readLine_NEW to readLine

Modified Paths:
--------------
    scummvm/trunk/common/stream.cpp
    scummvm/trunk/common/stream.h
    scummvm/trunk/engines/sci/engine/kfile.cpp
    scummvm/trunk/engines/sword2/resman.cpp
    scummvm/trunk/engines/sword2/screen.cpp
    scummvm/trunk/graphics/font.cpp
    scummvm/trunk/test/common/stream.h

Modified: scummvm/trunk/common/stream.cpp
===================================================================
--- scummvm/trunk/common/stream.cpp	2009-12-30 23:00:22 UTC (rev 46778)
+++ scummvm/trunk/common/stream.cpp	2009-12-30 23:00:55 UTC (rev 46779)
@@ -94,7 +94,7 @@
 	CR = 0x0D
 };
 
-char *SeekableReadStream::readLine_NEW(char *buf, size_t bufSize) {
+char *SeekableReadStream::readLine(char *buf, size_t bufSize) {
 	assert(buf != 0 && bufSize > 1);
 	char *p = buf;
 	size_t len = 0;
@@ -162,7 +162,7 @@
 	String line;
 	while (line.lastChar() != '\n') {
 		char buf[256];
-		if (!readLine_NEW(buf, 256))
+		if (!readLine(buf, 256))
 			break;
 		line += buf;
 	}

Modified: scummvm/trunk/common/stream.h
===================================================================
--- scummvm/trunk/common/stream.h	2009-12-30 23:00:22 UTC (rev 46778)
+++ scummvm/trunk/common/stream.h	2009-12-30 23:00:55 UTC (rev 46779)
@@ -374,7 +374,7 @@
 	 * @param bufSize	the size of the buffer
 	 * @return a pointer to the read string, or NULL if an error occurred
 	 */
-	virtual char *readLine_NEW(char *s, size_t bufSize);
+	virtual char *readLine(char *s, size_t bufSize);
 
 
 	/**

Modified: scummvm/trunk/engines/sci/engine/kfile.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kfile.cpp	2009-12-30 23:00:22 UTC (rev 46778)
+++ scummvm/trunk/engines/sci/engine/kfile.cpp	2009-12-30 23:00:55 UTC (rev 46779)
@@ -224,7 +224,7 @@
 		error("fgets_wrapper: Trying to read from file '%s' opened for writing", f->_name.c_str());
 		return;
 	}
-	f->_in->readLine_NEW(dest, maxsize);
+	f->_in->readLine(dest, maxsize);
 	// The returned string must not have an ending LF
 	int strSize = strlen(dest);
 	if (strSize > 0) {

Modified: scummvm/trunk/engines/sword2/resman.cpp
===================================================================
--- scummvm/trunk/engines/sword2/resman.cpp	2009-12-30 23:00:22 UTC (rev 46778)
+++ scummvm/trunk/engines/sword2/resman.cpp	2009-12-30 23:00:55 UTC (rev 46779)
@@ -117,7 +117,7 @@
 		char *buf = _resFiles[_totalClusters].fileName;
 		uint len = sizeof(_resFiles[_totalClusters].fileName);
 
-		if (!file.readLine_NEW(buf, len))
+		if (!file.readLine(buf, len))
 			break;
 
 		int pos = strlen(buf);

Modified: scummvm/trunk/engines/sword2/screen.cpp
===================================================================
--- scummvm/trunk/engines/sword2/screen.cpp	2009-12-30 23:00:22 UTC (rev 46778)
+++ scummvm/trunk/engines/sword2/screen.cpp	2009-12-30 23:00:55 UTC (rev 46779)
@@ -977,7 +977,7 @@
 
 	while (1) {
 		char buffer[80];
-		char *line = f.readLine_NEW(buffer, sizeof(buffer));
+		char *line = f.readLine(buffer, sizeof(buffer));
 
 		if (line) {
 			// Replace invalid character codes prevent the 'dud'

Modified: scummvm/trunk/graphics/font.cpp
===================================================================
--- scummvm/trunk/graphics/font.cpp	2009-12-30 23:00:22 UTC (rev 46778)
+++ scummvm/trunk/graphics/font.cpp	2009-12-30 23:00:55 UTC (rev 46779)
@@ -524,7 +524,7 @@
 }
 
 /* read the next non-comment line, returns buf or NULL if EOF*/
-// TODO: Can we use SeekableReadStream::readLine resp. readLine_NEW instead?
+// TODO: Can we use SeekableReadStream::readLine instead?
 char *bdf_getline(Common::SeekableReadStream &fp, char *buf, int len) {
 	int c;
 	char *b;

Modified: scummvm/trunk/test/common/stream.h
===================================================================
--- scummvm/trunk/test/common/stream.h	2009-12-30 23:00:22 UTC (rev 46778)
+++ scummvm/trunk/test/common/stream.h	2009-12-30 23:00:55 UTC (rev 46779)
@@ -10,18 +10,18 @@
 
 		char buffer[100];
 
-		TS_ASSERT_DIFFERS((char *)0, ms.readLine_NEW(buffer, sizeof(buffer)));
+		TS_ASSERT_DIFFERS((char *)0, ms.readLine(buffer, sizeof(buffer)));
 		TS_ASSERT_EQUALS(0, strcmp(buffer, "ab\n"));
 
-		TS_ASSERT_DIFFERS((char *)0, ms.readLine_NEW(buffer, sizeof(buffer)));
+		TS_ASSERT_DIFFERS((char *)0, ms.readLine(buffer, sizeof(buffer)));
 		TS_ASSERT_EQUALS(0, strcmp(buffer, "\n"));
 
-		TS_ASSERT_DIFFERS((char *)0, ms.readLine_NEW(buffer, sizeof(buffer)));
+		TS_ASSERT_DIFFERS((char *)0, ms.readLine(buffer, sizeof(buffer)));
 		TS_ASSERT_EQUALS(0, strcmp(buffer, "c\n"));
 
 		TS_ASSERT(!ms.eos());
 
-		TS_ASSERT_EQUALS((char *)0, ms.readLine_NEW(buffer, sizeof(buffer)));
+		TS_ASSERT_EQUALS((char *)0, ms.readLine(buffer, sizeof(buffer)));
 
 		TS_ASSERT(ms.eos());
 	}
@@ -32,13 +32,13 @@
 
 		char buffer[100];
 
-		TS_ASSERT_DIFFERS((char *)0, ms.readLine_NEW(buffer, sizeof(buffer)));
+		TS_ASSERT_DIFFERS((char *)0, ms.readLine(buffer, sizeof(buffer)));
 		TS_ASSERT_EQUALS(0, strcmp(buffer, "ab\n"));
 
-		TS_ASSERT_DIFFERS((char *)0, ms.readLine_NEW(buffer, sizeof(buffer)));
+		TS_ASSERT_DIFFERS((char *)0, ms.readLine(buffer, sizeof(buffer)));
 		TS_ASSERT_EQUALS(0, strcmp(buffer, "\n"));
 
-		TS_ASSERT_DIFFERS((char *)0, ms.readLine_NEW(buffer, sizeof(buffer)));
+		TS_ASSERT_DIFFERS((char *)0, ms.readLine(buffer, sizeof(buffer)));
 		TS_ASSERT_EQUALS(0, strcmp(buffer, "c"));
 
 		TS_ASSERT(ms.eos());


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.