[Scummvm-cvs-logs] SF.net SVN: scummvm:[33500] residual/trunk/common

[aquadran at users.sourceforge.net]

Revision: 33500
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33500&view=rev
Author:   aquadran
Date:     2008-08-01 18:25:27 +0000 (Fri, 01 Aug 2008)

Log Message:
-----------
cleanup

Modified Paths:
--------------
    residual/trunk/common/config-file.cpp
    residual/trunk/common/config-manager.cpp

Modified: residual/trunk/common/config-file.cpp
===================================================================
--- residual/trunk/common/config-file.cpp	2008-08-01 18:24:17 UTC (rev 33499)
+++ residual/trunk/common/config-file.cpp	2008-08-01 18:25:27 UTC (rev 33500)
@@ -204,8 +204,8 @@
 		stream.writeString(i->name);
 		stream.writeByte(']');
 #ifdef _WIN32
-		stream.writeByte(0x0d);
-		stream.writeByte(0x0a);
+		stream.writeByte('\r');
+		stream.writeByte('\n');
 #else
 		stream.writeByte('\n');
 #endif
@@ -221,8 +221,8 @@
 			stream.writeByte('=');
 			stream.writeString(kv->value);
 #ifdef _WIN32
-			stream.writeByte(0x0d);
-			stream.writeByte(0x0a);
+			stream.writeByte('\r');
+			stream.writeByte('\n');
 #else
 			stream.writeByte('\n');
 #endif

Modified: residual/trunk/common/config-manager.cpp
===================================================================
--- residual/trunk/common/config-manager.cpp	2008-08-01 18:24:17 UTC (rev 33499)
+++ residual/trunk/common/config-manager.cpp	2008-08-01 18:25:27 UTC (rev 33500)
@@ -173,7 +173,7 @@
 			// Read a line
 			String line;
 #ifdef _WIN32
-			while (line.lastChar() != 0x0a) {
+			while (line.lastChar() != '\r' && line.lastChar() != '\n') {
 #else
 			while (line.lastChar() != '\n') {
 #endif
@@ -328,8 +328,8 @@
 	stream.writeString(name);
 	stream.writeByte(']');
 #ifdef _WIN32
-	stream.writeByte(0x0d);
-	stream.writeByte(0x0a);
+	stream.writeByte('\r');
+	stream.writeByte('\n');
 #else
 	stream.writeByte('\n');
 #endif
@@ -348,16 +348,16 @@
 			stream.writeByte('=');
 			stream.writeString(x->_value);
 #ifdef _WIN32
-			stream.writeByte(0x0d);
-			stream.writeByte(0x0a);
+			stream.writeByte('\r');
+			stream.writeByte('\n');
 #else
 			stream.writeByte('\n');
 #endif
 		}
 	}
 #ifdef _WIN32
-	stream.writeByte(0x0d);
-	stream.writeByte(0x0a);
+	stream.writeByte('\r');
+	stream.writeByte('\n');
 #else
 	stream.writeByte('\n');
 #endif


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