[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[netPanzer-CVS] netpanzer/src/Editor TileSet.cpp TileSetList.cp...
From: |
Matthias Braun |
Subject: |
[netPanzer-CVS] netpanzer/src/Editor TileSet.cpp TileSetList.cp... |
Date: |
Mon, 24 Nov 2003 04:12:36 -0500 |
CVSROOT: /cvsroot/netpanzer
Module name: netpanzer
Branch:
Changes by: Matthias Braun <address@hidden> 03/11/24 04:12:36
Modified files:
src/Editor : TileSet.cpp TileSetList.cpp TileTemplate.cpp
Log message:
removed .c_str() again after commiting my new FileSystem changes
Patches:
Index: netpanzer/src/Editor/TileSet.cpp
diff -u netpanzer/src/Editor/TileSet.cpp:1.7
netpanzer/src/Editor/TileSet.cpp:1.8
--- netpanzer/src/Editor/TileSet.cpp:1.7 Sun Nov 23 21:39:34 2003
+++ netpanzer/src/Editor/TileSet.cpp Mon Nov 24 04:12:36 2003
@@ -101,7 +101,7 @@
std::string filename = dir;
filename += "/tiles.dat";
- std::auto_ptr<ReadFile> file (FileSystem::openRead(filename.c_str()));
+ std::auto_ptr<ReadFile> file (FileSystem::openRead(filename));
// read the header
std::auto_ptr<TileSetHeader> fileheader (new TileSetHeader(*file));
@@ -157,7 +157,7 @@
std::string filename = dir;
filename += "/tiles.dat";
- std::auto_ptr<WriteFile> file (FileSystem::openWrite(filename.c_str()));
+ std::auto_ptr<WriteFile> file (FileSystem::openWrite(filename));
header->write(*file);
if(tilesize * header->tilecount != 0)
Index: netpanzer/src/Editor/TileSetList.cpp
diff -u netpanzer/src/Editor/TileSetList.cpp:1.3
netpanzer/src/Editor/TileSetList.cpp:1.4
--- netpanzer/src/Editor/TileSetList.cpp:1.3 Sat Nov 22 17:50:44 2003
+++ netpanzer/src/Editor/TileSetList.cpp Mon Nov 24 04:12:36 2003
@@ -119,9 +119,9 @@
CopyDirs(file, dfile);
} else {
std::auto_ptr<ReadFile> readfile
- (FileSystem::openRead(file.c_str()));
+ (FileSystem::openRead(file));
std::auto_ptr<WriteFile> writefile
- (FileSystem::openWrite(dfile.c_str()));
+ (FileSystem::openWrite(dfile));
std::cout << "Copy: " << file << " - " << dfile << std::endl;
size_t p;
Index: netpanzer/src/Editor/TileTemplate.cpp
diff -u netpanzer/src/Editor/TileTemplate.cpp:1.3
netpanzer/src/Editor/TileTemplate.cpp:1.4
--- netpanzer/src/Editor/TileTemplate.cpp:1.3 Sun Nov 23 21:39:34 2003
+++ netpanzer/src/Editor/TileTemplate.cpp Mon Nov 24 04:12:36 2003
@@ -26,7 +26,7 @@
filename += "/";
filename += name;
- std::auto_ptr<ReadFile> file (FileSystem::openRead(filename.c_str()));
+ std::auto_ptr<ReadFile> file (FileSystem::openRead(filename));
try {
sizex = file->readULE32();
@@ -49,7 +49,7 @@
filename += "/";
filename += name;
- std::auto_ptr<WriteFile> file(FileSystem::openWrite(filename.c_str()));
+ std::auto_ptr<WriteFile> file(FileSystem::openWrite(filename));
try {
file->writeULE32(sizex);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [netPanzer-CVS] netpanzer/src/Editor TileSet.cpp TileSetList.cp...,
Matthias Braun <=