[Scummvm-cvs-logs] SF.net SVN: scummvm: [27932] scummex/branches/gsoc2007-gameresbrowser
zbychs at users.sourceforge.net
zbychs at users.sourceforge.net
Fri Jul 6 01:26:35 CEST 2007
Revision: 27932
http://scummvm.svn.sourceforge.net/scummvm/?rev=27932&view=rev
Author: zbychs
Date: 2007-07-05 16:26:35 -0700 (Thu, 05 Jul 2007)
Log Message:
-----------
Added full unicode support. Unified strings to use wxString.
Modified Paths:
--------------
scummex/branches/gsoc2007-gameresbrowser/src/core/CoreFileTypes.cpp
scummex/branches/gsoc2007-gameresbrowser/src/core/CoreIntf.cpp
scummex/branches/gsoc2007-gameresbrowser/src/core/CoreIntf.h
scummex/branches/gsoc2007-gameresbrowser/src/core/FileTypeRecognizer.h
scummex/branches/gsoc2007-gameresbrowser/src/core/common/scummsys.h
scummex/branches/gsoc2007-gameresbrowser/src/core/common/simplefile.cpp
scummex/branches/gsoc2007-gameresbrowser/src/core/common/simplefile.h
scummex/branches/gsoc2007-gameresbrowser/src/core/common/stream.cpp
scummex/branches/gsoc2007-gameresbrowser/src/core/common/stream.h
scummex/branches/gsoc2007-gameresbrowser/src/core/functionalex.h
scummex/branches/gsoc2007-gameresbrowser/src/core/guid.cpp
scummex/branches/gsoc2007-gameresbrowser/src/core/guid.h
scummex/branches/gsoc2007-gameresbrowser/src/core/ochain.cpp
scummex/branches/gsoc2007-gameresbrowser/src/core/ochain.h
scummex/branches/gsoc2007-gameresbrowser/src/core/oregistry.cpp
scummex/branches/gsoc2007-gameresbrowser/src/core/pinslot.cpp
scummex/branches/gsoc2007-gameresbrowser/src/core/pinslot.h
scummex/branches/gsoc2007-gameresbrowser/src/core/pinslot_detail.h
scummex/branches/gsoc2007-gameresbrowser/src/core/plugin.h
scummex/branches/gsoc2007-gameresbrowser/src/core/rcobject.cpp
scummex/branches/gsoc2007-gameresbrowser/src/core/rcobject.h
scummex/branches/gsoc2007-gameresbrowser/src/core/safe_static.cpp
scummex/branches/gsoc2007-gameresbrowser/src/core/tostring.h
scummex/branches/gsoc2007-gameresbrowser/src/gui/BitmapPanel.cpp
scummex/branches/gsoc2007-gameresbrowser/src/gui/BitmapPanel.h
scummex/branches/gsoc2007-gameresbrowser/src/gui/BrowserApp.cpp
scummex/branches/gsoc2007-gameresbrowser/src/gui/BrowserApp.h
scummex/branches/gsoc2007-gameresbrowser/src/gui/DirectoryPresenter.cpp
scummex/branches/gsoc2007-gameresbrowser/src/gui/DirectoryPresenter.h
scummex/branches/gsoc2007-gameresbrowser/src/gui/ExplorationTree.cpp
scummex/branches/gsoc2007-gameresbrowser/src/gui/ExplorationTree.h
scummex/branches/gsoc2007-gameresbrowser/src/gui/FilePresenter.cpp
scummex/branches/gsoc2007-gameresbrowser/src/gui/FilePresenter.h
scummex/branches/gsoc2007-gameresbrowser/src/gui/ImagePresenter.cpp
scummex/branches/gsoc2007-gameresbrowser/src/gui/ImagePresenter.h
scummex/branches/gsoc2007-gameresbrowser/src/gui/MainForm.cpp
scummex/branches/gsoc2007-gameresbrowser/src/gui/MainForm.h
scummex/branches/gsoc2007-gameresbrowser/src/gui/PanelProvider.cpp
scummex/branches/gsoc2007-gameresbrowser/src/gui/PanelProvider.h
scummex/branches/gsoc2007-gameresbrowser/src/gui/Test1.cpp
scummex/branches/gsoc2007-gameresbrowser/src/gui/VirtualNode.cpp
scummex/branches/gsoc2007-gameresbrowser/src/gui/guicon.cpp
scummex/branches/gsoc2007-gameresbrowser/src/plugins/BMPParser.cpp
scummex/branches/gsoc2007-gameresbrowser/src/plugins/BMPParser.h
scummex/branches/gsoc2007-gameresbrowser/src/plugins/Directories.cpp
scummex/branches/gsoc2007-gameresbrowser/src/plugins/Directories.h
scummex/branches/gsoc2007-gameresbrowser/src/plugins/DiskFileProvider.cpp
scummex/branches/gsoc2007-gameresbrowser/src/plugins/DiskFileProvider.h
scummex/branches/gsoc2007-gameresbrowser/src/plugins/FileTypeRecognizer.cpp
scummex/branches/gsoc2007-gameresbrowser/src/plugins/GUIIntf.cpp
scummex/branches/gsoc2007-gameresbrowser/src/plugins/GUIIntf.h
scummex/branches/gsoc2007-gameresbrowser/src/plugins/VirtualNode.h
scummex/branches/gsoc2007-gameresbrowser/src/plugins/ftregistry.cpp
scummex/branches/gsoc2007-gameresbrowser/src/plugins/wx2scstream.cpp
scummex/branches/gsoc2007-gameresbrowser/src/samples/pinslot_plugins.cpp
scummex/branches/gsoc2007-gameresbrowser/vc8/Browser/Browser.vcproj
scummex/branches/gsoc2007-gameresbrowser/vc8/core/core.vcproj
scummex/branches/gsoc2007-gameresbrowser/vc8/plugin_sample1/plugin_sample1.vcproj
scummex/branches/gsoc2007-gameresbrowser/vc8/plugins/plugins.vcproj
scummex/branches/gsoc2007-gameresbrowser/vc8/vc8.sln
Added Paths:
-----------
scummex/branches/gsoc2007-gameresbrowser/src/core/common/common_stdafx.h
scummex/branches/gsoc2007-gameresbrowser/src/core/core_stdafx.cpp
scummex/branches/gsoc2007-gameresbrowser/src/core/core_stdafx.h
scummex/branches/gsoc2007-gameresbrowser/src/gui/gui_stdafx.cpp
scummex/branches/gsoc2007-gameresbrowser/src/gui/gui_stdafx.h
scummex/branches/gsoc2007-gameresbrowser/src/plugins/plugins_stdafx.cpp
scummex/branches/gsoc2007-gameresbrowser/src/plugins/plugins_stdafx.h
Removed Paths:
-------------
scummex/branches/gsoc2007-gameresbrowser/src/core/common/common-stdafx.h
scummex/branches/gsoc2007-gameresbrowser/src/core/core-stdafx.cpp
scummex/branches/gsoc2007-gameresbrowser/src/core/core-stdafx.h
scummex/branches/gsoc2007-gameresbrowser/src/gui/gui-stdafx.cpp
scummex/branches/gsoc2007-gameresbrowser/src/gui/gui-stdafx.h
scummex/branches/gsoc2007-gameresbrowser/src/plugins/plugins-stdafx.cpp
scummex/branches/gsoc2007-gameresbrowser/src/plugins/plugins-stdafx.h
Property Changed:
----------------
scummex/branches/gsoc2007-gameresbrowser/vc8/
Modified: scummex/branches/gsoc2007-gameresbrowser/src/core/CoreFileTypes.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/core/CoreFileTypes.cpp 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/core/CoreFileTypes.cpp 2007-07-05 23:26:35 UTC (rev 27932)
@@ -1,7 +1,7 @@
/////////////////////////////////////////////////////////////////////////////
// CoreFileTypes.cpp
-#include "core-stdafx.h"
+#include "core_stdafx.h"
#include "CoreFileTypes.h"
@@ -13,9 +13,9 @@
/////////////////////////////////////////////////////////////////////////////
// FileTypes
-SAFE_STATIC(binaryFileType, BGUID, ("CoreFileTypes", "Binary File", 1) )
+SAFE_STATIC(binaryFileType, BGUID, (wxT("CoreFileTypes"), wxT("Binary File"), 1) )
-SAFE_STATIC(bmpFileType, BGUID, ("CoreFileTypes", "Windows Bitmap File (BMP)", 1) )
+SAFE_STATIC(bmpFileType, BGUID, (wxT("CoreFileTypes"), wxT("Windows Bitmap File (BMP)"), 1) )
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
Modified: scummex/branches/gsoc2007-gameresbrowser/src/core/CoreIntf.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/core/CoreIntf.cpp 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/core/CoreIntf.cpp 2007-07-05 23:26:35 UTC (rev 27932)
@@ -1,7 +1,7 @@
/////////////////////////////////////////////////////////////////////////////
// CoreIntf.cpp
-#include "core-stdafx.h"
+#include "core_stdafx.h"
#include "CoreIntf.h"
#include "common/simplefile.h"
@@ -29,10 +29,10 @@
}
-IFileImpl::IFileImpl(std::string name, Common::SeekableReadStream* stream, bool ownStream /*= false*/)
+IFileImpl::IFileImpl(coreString name, Common::SeekableReadStream* stream, bool ownStream /*= false*/)
: _streamImpl(stream, ownStream), _name(name) {}
-const std::string& IFileImpl::getName() {
+const coreString& IFileImpl::getName() {
return _name;
}
@@ -43,7 +43,7 @@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-IDiskFileImpl::IDiskFileImpl(std::string name, std::string fullpath)
+IDiskFileImpl::IDiskFileImpl(coreString name, coreString fullpath)
: _name(name), _fullpath(fullpath), _stream(NULL) {}
IDiskFileImpl::~IDiskFileImpl() {
@@ -56,16 +56,16 @@
_stream = NULL;
}
-const std::string& IDiskFileImpl::getName() {
+const coreString& IDiskFileImpl::getName() {
return _name;
}
Common::SeekableReadStream* IDiskFileImpl::getStream() {
if (!_stream) {
Common::SimpleFile* file = new Common::SimpleFile();
- bool res = file->open( _fullpath.c_str() );
+ bool res = file->open(_fullpath);
if (!res) {
- std::cout << "ERROR: IDiskFileImpl::getStream(): could not open file" << std::endl;
+ errout << wxT("ERROR: IDiskFileImpl::getStream(): could not open file") << std::endl;
delete file;
return NULL;
}
Modified: scummex/branches/gsoc2007-gameresbrowser/src/core/CoreIntf.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/core/CoreIntf.h 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/core/CoreIntf.h 2007-07-05 23:26:35 UTC (rev 27932)
@@ -4,6 +4,8 @@
#ifndef _CORE_INTERFACES_H_
#define _CORE_INTERFACES_H_
+#include "core_stdafx.h"
+
#include "pinslot.h"
#include <list>
@@ -17,14 +19,14 @@
class IStream : public IInterface {
public:
- GUID_FOR(IStream, "CoreInterfaces", 1);
+ GUID_FOR(IStream, wxT("CoreInterfaces"), 1);
virtual Common::SeekableReadStream* getStream() = 0;
};
class IFile : public IStream {
public:
- GUID_FOR(IFile, "CoreInterfaces", 1);
- virtual const std::string& getName() = 0;
+ GUID_FOR(IFile, wxT("CoreInterfaces"), 1);
+ virtual const coreString& getName() = 0;
};
//TODO: IDirectory should support get/release semantics for IFiles
@@ -33,8 +35,8 @@
// Do it via dynamic dummy Slots?
class IDirectory : public IInterface {
public:
- GUID_FOR(IDirectory, "CoreInterfaces", 1);
- virtual const std::string& getName() = 0;
+ GUID_FOR(IDirectory, wxT("CoreInterfaces"), 1);
+ virtual const coreString& getName() = 0;
virtual const std::list<IFile*>& getFiles() = 0;
virtual const std::list<IDirectory*>& getSubDirs() = 0;
};
@@ -61,26 +63,26 @@
// Instead of multiple inheritance - I use encapsulation: _streamImpl member.
class IFileImpl : public IFile {
protected:
- std::string _name;
+ coreString _name;
IStreamImpl _streamImpl;
public:
//inherit guid - it's a concrete implementation of an abstract interface
- IFileImpl(std::string name, Common::SeekableReadStream* stream, bool ownStream = false);
- virtual const std::string& getName();
+ IFileImpl(coreString name, Common::SeekableReadStream* stream, bool ownStream = false);
+ virtual const coreString& getName();
virtual Common::SeekableReadStream* getStream();
};
class IDiskFileImpl : public IFile {
protected:
- std::string _name;
- std::string _fullpath;
+ coreString _name;
+ coreString _fullpath;
Common::SeekableReadStream* _stream;
public:
//inherit guid - it's a concrete implementation of an abstract interface
- IDiskFileImpl(std::string name, std::string fullpath);
+ IDiskFileImpl(coreString name, coreString fullpath);
virtual ~IDiskFileImpl();
virtual void diet();
- virtual const std::string& getName();
+ virtual const coreString& getName();
virtual Common::SeekableReadStream* getStream();
};
Modified: scummex/branches/gsoc2007-gameresbrowser/src/core/FileTypeRecognizer.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/core/FileTypeRecognizer.h 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/core/FileTypeRecognizer.h 2007-07-05 23:26:35 UTC (rev 27932)
@@ -115,7 +115,7 @@
DECLARE_BOBJECT_CLASS(BinaryFileTypeRecognizer, BObject)
public:
- ASSIGN_DESC(IS_FILE_TYPE_RECOGNIZER, "CoreObjects", 1)
+ ASSIGN_DESC(IS_FILE_TYPE_RECOGNIZER, wxT("CoreObjects"), 1)
virtual RecognizedFileType recognize(VirtualFile* file);
};
@@ -130,7 +130,7 @@
DECLARE_BOBJECT_CLASS(BinaryFileTypeParserResolver, BObject)
public:
- ASSIGN_DESC(IS_FILE_TYPE_RESOLVER, "CoreObjects", 1)
+ ASSIGN_DESC(IS_FILE_TYPE_RESOLVER, wxT("CoreObjects"), 1)
virtual ResolvedFileTypeParsers resolve(const BGUID& fileType);
};
@@ -146,7 +146,7 @@
Slot<IFile>* _fileSlot;
public:
- ASSIGN_DESC(IS_FILE_TYPE_RECOGNIZER, "CoreObjects", 1)
+ ASSIGN_DESC(IS_FILE_TYPE_RECOGNIZER, wxT("CoreObjects"), 1)
SLOT_DESCS
SLOT_DESC(_fileSlot, SLOT_DEFAULT)
@@ -165,7 +165,7 @@
DECLARE_BOBJECT_CLASS(BMPFileTypeRecognizer, BObject)
public:
- ASSIGN_DESC(IS_FILE_TYPE_RECOGNIZER, "CoreObjects", 1)
+ ASSIGN_DESC(IS_FILE_TYPE_RECOGNIZER, wxT("CoreObjects"), 1)
virtual RecognizedFileType doRecognize(VirtualFile* file, IFile* ifile);
};
@@ -177,7 +177,7 @@
DECLARE_BOBJECT_CLASS(BMPFileTypeParserResolver, BObject)
public:
- ASSIGN_DESC(IS_FILE_TYPE_RESOLVER, "CoreObjects", 1)
+ ASSIGN_DESC(IS_FILE_TYPE_RESOLVER, wxT("CoreObjects"), 1)
virtual ResolvedFileTypeParsers resolve(const BGUID& fileType);
};
Deleted: scummex/branches/gsoc2007-gameresbrowser/src/core/common/common-stdafx.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/core/common/common-stdafx.h 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/core/common/common-stdafx.h 2007-07-05 23:26:35 UTC (rev 27932)
@@ -1,120 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2001 Ludvig Strigeus
- * Copyright (C) 2001-2006 The ScummVM project
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/common/stdafx.h $
- * $Id: stdafx.h 26061 2007-03-10 15:00:56Z sev $
- *
- */
-
-#ifndef COMMON_STDAFX_H
-#define COMMON_STDAFX_H
-
-#if defined(_WIN32_WCE) && _WIN32_WCE < 300
- #define NONSTANDARD_PORT
-#endif
-
-#if defined(NONSTANDARD_PORT)
-
- // Ports which need to perform #includes and #defines visible in
- // virtually all the source of ScummVM should do so by providing a
- // "portdefs.h" header file (and not by directly modifying this
- // header file).
- #include <portdefs.h>
-
-#else // defined(NONSTANDARD_PORT)
-
- #if defined(WIN32)
-
- #ifdef _MSC_VER
- #pragma once
- #pragma warning( disable : 4068 ) // turn off "unknown pragma" warning
- #pragma warning( disable : 4100 ) // turn off "unreferenced formal parameter" warning
- #pragma warning( disable : 4127 ) // turn off "conditional expression is constant" warning
- #pragma warning( disable : 4201 ) // turn off "nonstandard extension used : nameless struct/union" warning
- #pragma warning( disable : 4244 ) // turn off "conversion type" warning
- #pragma warning( disable : 4310 ) // turn off "cast truncates constant value" warning
- #pragma warning( disable : 4355 ) // turn off "base member init" warning
- #pragma warning( disable : 4390 ) // turn off "empty statement" warning for BS2 code
- #pragma warning( disable : 4250 ) // turn off "inherits via dominance" warning
- #pragma warning( disable : 4103 ) // turn off "alignement changed after including header" warning. We use pack-start.h file
- #pragma warning( disable : 4121 ) // turn off "alignment of a member was sensitive to packing" warning
- #pragma warning( disable : 4511 ) // turn off "copy constructor could not be generated" warning
- #pragma warning( disable : 4512 ) // turn off "assignment operator could not be generated" warning
- #pragma warning( disable : 4351 ) // turn off "new behavior ... will be default initialized" warning
- #pragma warning( disable : 4505 ) // turn off "unreferenced local function has been removed"
- #pragma warning( disable : 4510 ) // turn off "default constructor could not be generated"
- #pragma warning( disable : 4610 ) // turn off "struct can never be instantiated - user defined constructor required"
-
- // FIXME: 4702 & 4706 - may be enabled
- #pragma warning( disable : 4702 ) // turn off "unreachable code" warning
- #pragma warning( disable : 4706 ) // turn off "assignment within conditional expression" warning
-
- #define vsnprintf _vsnprintf
- #endif
-
- #if !defined(_WIN32_WCE)
-
- #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
- #define NOGDICAPMASKS
- #define OEMRESOURCE
- #define NONLS
- #define NOICONS
- #define NOMCX
- #define NOPROFILER
- #define NOKANJI
- #define NOSERVICE
- #define NOMETAFILE
- #define NOCOMM
- #define NOCRYPT
- #define NOIME
- #define NOATOM
- #define NOCTLMGR
- #define NOCLIPBOARD
- #define NOMEMMGR
- #define NOSYSMETRICS
- #define NOMENUS
- #define NOOPENFILE
- #define NOWH
- #define NOSOUND
- #define NODRAWTEXT
-
- #endif
-
- #if defined(ARRAYSIZE)
- // VS2005beta2 introduces new stuff in winnt.h
- #undef ARRAYSIZE
- #endif
-
- #endif
-
- #if defined(__QNXNTO__)
- #include <strings.h> /* For strcasecmp */
- #endif
-
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
- #include <stdarg.h>
- #include <assert.h>
- #include <ctype.h>
- #include <time.h>
- #include <math.h>
-
-#endif
-
-#endif
Copied: scummex/branches/gsoc2007-gameresbrowser/src/core/common/common_stdafx.h (from rev 27925, scummex/branches/gsoc2007-gameresbrowser/src/core/common/common-stdafx.h)
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/core/common/common_stdafx.h (rev 0)
+++ scummex/branches/gsoc2007-gameresbrowser/src/core/common/common_stdafx.h 2007-07-05 23:26:35 UTC (rev 27932)
@@ -0,0 +1,120 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2001 Ludvig Strigeus
+ * Copyright (C) 2001-2006 The ScummVM project
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/common/stdafx.h $
+ * $Id: stdafx.h 26061 2007-03-10 15:00:56Z sev $
+ *
+ */
+
+#ifndef COMMON_STDAFX_H
+#define COMMON_STDAFX_H
+
+#if defined(_WIN32_WCE) && _WIN32_WCE < 300
+ #define NONSTANDARD_PORT
+#endif
+
+#if defined(NONSTANDARD_PORT)
+
+ // Ports which need to perform #includes and #defines visible in
+ // virtually all the source of ScummVM should do so by providing a
+ // wxT("portdefs.h") header file (and not by directly modifying this
+ // header file).
+ #include <portdefs.h>
+
+#else // defined(NONSTANDARD_PORT)
+
+ #if defined(WIN32)
+
+ #ifdef _MSC_VER
+ #pragma once
+ #pragma warning( disable : 4068 ) // turn off wxT("unknown pragma") warning
+ #pragma warning( disable : 4100 ) // turn off wxT("unreferenced formal parameter") warning
+ #pragma warning( disable : 4127 ) // turn off wxT("conditional expression is constant") warning
+ #pragma warning( disable : 4201 ) // turn off wxT("nonstandard extension used : nameless struct/union") warning
+ #pragma warning( disable : 4244 ) // turn off wxT("conversion type") warning
+ #pragma warning( disable : 4310 ) // turn off wxT("cast truncates constant value") warning
+ #pragma warning( disable : 4355 ) // turn off wxT("base member init") warning
+ #pragma warning( disable : 4390 ) // turn off wxT("empty statement") warning for BS2 code
+ #pragma warning( disable : 4250 ) // turn off wxT("inherits via dominance") warning
+ #pragma warning( disable : 4103 ) // turn off wxT("alignement changed after including header") warning. We use pack-start.h file
+ #pragma warning( disable : 4121 ) // turn off wxT("alignment of a member was sensitive to packing") warning
+ #pragma warning( disable : 4511 ) // turn off wxT("copy constructor could not be generated") warning
+ #pragma warning( disable : 4512 ) // turn off wxT("assignment operator could not be generated") warning
+ #pragma warning( disable : 4351 ) // turn off wxT("new behavior ... will be default initialized") warning
+ #pragma warning( disable : 4505 ) // turn off wxT("unreferenced local function has been removed")
+ #pragma warning( disable : 4510 ) // turn off wxT("default constructor could not be generated")
+ #pragma warning( disable : 4610 ) // turn off wxT("struct can never be instantiated - user defined constructor required")
+
+ // FIXME: 4702 & 4706 - may be enabled
+ #pragma warning( disable : 4702 ) // turn off wxT("unreachable code") warning
+ #pragma warning( disable : 4706 ) // turn off wxT("assignment within conditional expression") warning
+
+ #define vsnprintf _vsnprintf
+ #endif
+
+ #if !defined(_WIN32_WCE)
+
+ #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
+ #define NOGDICAPMASKS
+ #define OEMRESOURCE
+ #define NONLS
+ #define NOICONS
+ #define NOMCX
+ #define NOPROFILER
+ #define NOKANJI
+ #define NOSERVICE
+ #define NOMETAFILE
+ #define NOCOMM
+ #define NOCRYPT
+ #define NOIME
+ #define NOATOM
+ #define NOCTLMGR
+ #define NOCLIPBOARD
+ #define NOMEMMGR
+ #define NOSYSMETRICS
+ #define NOMENUS
+ #define NOOPENFILE
+ #define NOWH
+ #define NOSOUND
+ #define NODRAWTEXT
+
+ #endif
+
+ #if defined(ARRAYSIZE)
+ // VS2005beta2 introduces new stuff in winnt.h
+ #undef ARRAYSIZE
+ #endif
+
+ #endif
+
+ #if defined(__QNXNTO__)
+ #include <strings.h> /* For strcasecmp */
+ #endif
+
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <stdarg.h>
+ #include <assert.h>
+ #include <ctype.h>
+ #include <time.h>
+ #include <math.h>
+
+#endif
+
+#endif
Modified: scummex/branches/gsoc2007-gameresbrowser/src/core/common/scummsys.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/core/common/scummsys.h 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/core/common/scummsys.h 2007-07-05 23:26:35 UTC (rev 27932)
@@ -42,7 +42,7 @@
// In the following we configure various targets, in particular those
-// which can't use our "configure" tool and hence don't use config.h.
+// which can't use our wxT("configure") tool and hence don't use config.h.
//
// Some #defines that occur here frequently:
// SCUMM_LITTLE_ENDIAN
@@ -71,7 +71,7 @@
//
// By default we try to use pragma push/pop to ensure various structs we use
-// are "packed". If your compiler doesn't support this pragma, you are in for
+// are wxT("packed"). If your compiler doesn't support this pragma, you are in for
// a problem. If you are lucky, there is a compiler switch, or another pragma,
// doing the same thing -- in that case, try to modify common/pack-begin.h and
// common/pack-end.h accordingly. Or maybe your port simply *always* packs
@@ -96,7 +96,7 @@
// Enable Symbians own datatypes
// This is done for two reasons
// a) uint is already defined by Symbians libc component
- // b) Symbian is using its "own" datatyping, and the Scummvm port
+ // b) Symbian is using its wxT("own") datatyping, and the Scummvm port
// should follow this to ensure the best compability possible.
#define SCUMMVM_DONT_DEFINE_TYPES
typedef unsigned char byte;
Modified: scummex/branches/gsoc2007-gameresbrowser/src/core/common/simplefile.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/core/common/simplefile.cpp 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/core/common/simplefile.cpp 2007-07-05 23:26:35 UTC (rev 27932)
@@ -20,15 +20,14 @@
*
*/
-#include "core-stdafx.h"
-#include "common/common-stdafx.h"
+#include "core_stdafx.h"
+#include "common/common_stdafx.h"
#include "common/simplefile.h"
#include <iostream>
-#define error std::cerr <<
-#define debug std::cout <<
+#define error wxMessageOutputStderr().Printf
namespace Common {
@@ -43,30 +42,30 @@
}
-bool SimpleFile::open(const std::string &filename, AccessMode mode) {
+bool SimpleFile::open(const coreString &filename, AccessMode mode) {
assert(mode == kFileReadMode || mode == kFileWriteMode);
if (filename.empty()) {
- error("File::open: No filename was specified");
+ error(wxT("File::open: No filename was specified"));
}
if (_handle) {
- error("File::open: This file object already is opened (%s), won't open '%s'", _name.c_str(), filename.c_str());
+ error(wxT("File::open: This file object already is opened (%s), won't open '%s'"), _name.c_str(), filename.c_str());
}
_name.clear();
clearIOFailed();
- std::string fname(filename);
+ coreString fname(filename);
const char *modeStr = (mode == kFileReadMode) ? "rb" : "wb";
- _handle = fopen(fname.c_str(), modeStr);
+ _handle = fopen(fname.mb_str(), modeStr);
if (_handle == NULL) {
if (mode == kFileReadMode)
- debug(2, "File %s not found", filename.c_str());
+ error(wxT("File %s not found"), filename.c_str());
else
- debug(2, "File %s not opened", filename.c_str());
+ error(wxT("File %s not opened"), filename.c_str());
return false;
}
@@ -96,7 +95,7 @@
bool SimpleFile::eof() const {
if (_handle == NULL) {
- error("File::eof: File is not open!");
+ error(wxT("File::eof: File is not open!"));
return false;
}
@@ -105,7 +104,7 @@
uint32 SimpleFile::pos() const {
if (_handle == NULL) {
- error("File::pos: File is not open!");
+ error(wxT("File::pos: File is not open!"));
return 0;
}
@@ -114,7 +113,7 @@
uint32 SimpleFile::size() const {
if (_handle == NULL) {
- error("File::size: File is not open!");
+ error(wxT("File::size: File is not open!"));
return 0;
}
@@ -128,7 +127,7 @@
void SimpleFile::seek(int32 offs, int whence) {
if (_handle == NULL) {
- error("File::seek: File is not open!");
+ error(wxT("File::seek: File is not open!"));
return;
}
@@ -141,7 +140,7 @@
uint32 real_len;
if (_handle == NULL) {
- error("File::read: File is not open!");
+ error(wxT("File::read: File is not open!"));
return 0;
}
@@ -158,7 +157,7 @@
uint32 SimpleFile::write(const void *ptr, uint32 len) {
if (_handle == NULL) {
- error("File::write: File is not open!");
+ error(wxT("File::write: File is not open!"));
return 0;
}
Modified: scummex/branches/gsoc2007-gameresbrowser/src/core/common/simplefile.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/core/common/simplefile.h 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/core/common/simplefile.h 2007-07-05 23:26:35 UTC (rev 27932)
@@ -23,7 +23,7 @@
#ifndef COMMON_SIMPLEFILE_H
#define COMMON_SIMPLEFILE_H
-#include <string>
+#include "common/common_stdafx.h"
#include "common/stream.h"
namespace Common {
@@ -37,7 +37,7 @@
bool _ioFailed;
/** The name of this file, for debugging. */
- std::string _name;
+ coreString _name;
private:
// Disallow copying File objects. There is not strict reason for this,
@@ -66,7 +66,7 @@
*/
//static bool exists(const String &filename);
- virtual bool open(const std::string &filename, AccessMode mode = kFileReadMode);
+ virtual bool open(const coreString &filename, AccessMode mode = kFileReadMode);
virtual void close();
@@ -82,7 +82,7 @@
*
* @return: the filename
*/
- const char *name() const { return _name.c_str(); }
+ const wxChar *name() const { return _name.c_str(); }
bool ioFailed() const;
void clearIOFailed();
Modified: scummex/branches/gsoc2007-gameresbrowser/src/core/common/stream.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/core/common/stream.cpp 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/core/common/stream.cpp 2007-07-05 23:26:35 UTC (rev 27932)
@@ -20,8 +20,8 @@
*
*/
-#include "core-stdafx.h"
-#include "common/common-stdafx.h"
+#include "core_stdafx.h"
+#include "common/common_stdafx.h"
//#include "common/stdafx.h"
#include "common/stream.h"
Modified: scummex/branches/gsoc2007-gameresbrowser/src/core/common/stream.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/core/common/stream.h 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/core/common/stream.h 2007-07-05 23:26:35 UTC (rev 27932)
@@ -25,7 +25,7 @@
#ifndef COMMON_STREAM_H
#define COMMON_STREAM_H
-#include "common/common-stdafx.h"
+#include "common/common_stdafx.h"
#include "common/scummsys.h"
namespace Common {
Deleted: scummex/branches/gsoc2007-gameresbrowser/src/core/core-stdafx.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/core/core-stdafx.cpp 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/core/core-stdafx.cpp 2007-07-05 23:26:35 UTC (rev 27932)
@@ -1,8 +0,0 @@
-// stdafx.cpp : source file that includes just the standard includes
-// PinSlot.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-
-#include "core-stdafx.h"
-
-// TODO: reference any additional headers you need in STDAFX.H
-// and not in this file
Deleted: scummex/branches/gsoc2007-gameresbrowser/src/core/core-stdafx.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/core/core-stdafx.h 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/core/core-stdafx.h 2007-07-05 23:26:35 UTC (rev 27932)
@@ -1,15 +0,0 @@
-// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently, but
-// are changed infrequently
-//
-
-#pragma once
-
-
-//#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-//#include <stdio.h>
-//#include <tchar.h>
-
-#define ARRAY_SIZE(x) ((int)(sizeof(x) / sizeof(x[0])))
-
-// TODO: reference additional headers your program requires here
Copied: scummex/branches/gsoc2007-gameresbrowser/src/core/core_stdafx.cpp (from rev 27925, scummex/branches/gsoc2007-gameresbrowser/src/core/core-stdafx.cpp)
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/core/core_stdafx.cpp (rev 0)
+++ scummex/branches/gsoc2007-gameresbrowser/src/core/core_stdafx.cpp 2007-07-05 23:26:35 UTC (rev 27932)
@@ -0,0 +1,8 @@
+// stdafx.cpp : source file that includes just the standard includes
+// PinSlot.pch will be the pre-compiled header
+// stdafx.obj will contain the pre-compiled type information
+
+#include "core_stdafx.h"
+
+// TODO: reference any additional headers you need in STDAFX.H
+// and not in this file
Copied: scummex/branches/gsoc2007-gameresbrowser/src/core/core_stdafx.h (from rev 27925, scummex/branches/gsoc2007-gameresbrowser/src/core/core-stdafx.h)
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/core/core_stdafx.h (rev 0)
+++ scummex/branches/gsoc2007-gameresbrowser/src/core/core_stdafx.h 2007-07-05 23:26:35 UTC (rev 27932)
@@ -0,0 +1,46 @@
+// stdafx.h : include file for standard system include files,
+// or project specific include files that are used frequently, but
+// are changed infrequently
+//
+
+#pragma once
+
+#ifndef _CORE_STDAFX_H_
+#define _CORE_STDAFX_H_
+
+#ifdef _UNICODE
+ #define errout std::wcerr
+ #define infoout std::wcout
+ #define streamout std::wostream
+#else
+ #define errout std::cerr
+ #define infoout std::cout
+ #define streamout std::ostream
+#endif
+
+//core uses only wxString
+#include <wx/wxprec.h>
+
+#include <wx/string.h>
+
+#ifndef WX_PRECOMP
+#include <wx/wx.h>
+#endif
+
+#define ARRAY_SIZE(x) ((int)(sizeof(x) / sizeof(x[0])))
+#define coreString wxString
+
+
+#ifdef WX_PRECOMP
+#include "pinslot.h"
+#endif
+
+#include "tostring.h"
+
+#if (wxUSE_UNICODE && !defined(_UNICODE)) || (!wxUSE_UNICODE && defined(_UNICODE))
+ #error wxUSE_UNICODE and _UNICODE are inconsistent
+#endif
+
+// TODO: reference additional headers your program requires here
+
+#endif //_CORE_STDAFX_H_
Modified: scummex/branches/gsoc2007-gameresbrowser/src/core/functionalex.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/core/functionalex.h 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/core/functionalex.h 2007-07-05 23:26:35 UTC (rev 27932)
@@ -298,5 +298,5 @@
* this permission notice appear in supporting documentation.
* Hewlett-Packard Company makes no representations about the
* suitability of this software for any purpose. It is provided
-* "as is" without express or implied warranty.
+* wxT("as is") without express or implied warranty.
V4.05:0009 */
Modified: scummex/branches/gsoc2007-gameresbrowser/src/core/guid.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/core/guid.cpp 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/core/guid.cpp 2007-07-05 23:26:35 UTC (rev 27932)
@@ -4,7 +4,7 @@
// Declares GUID, GUIDObject and some helpers
//
-#include "core-stdafx.h"
+#include "core_stdafx.h"
#include "guid.h"
@@ -22,9 +22,9 @@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-SAFE_CLASS_STATIC(BGUID, Unknown, BGUID, ("Unknown Facility", "Unknown GUID", 1))
+SAFE_CLASS_STATIC(BGUID, Unknown, BGUID, (wxT("Unknown Facility"), wxT("Unknown GUID"), 1))
-BGUID::BGUID(std::string _facility, std::string _identifier, int _version)
+BGUID::BGUID(coreString _facility, coreString _identifier, int _version)
: facility(_facility), identifier(_identifier), version(_version) {}
bool BGUID::operator==(const BGUID& other) const {
@@ -61,9 +61,9 @@
this->version = other.version;
}*/
-std::ostream& operator<<(std::ostream& os, const BGUID& guid) {
- return os << "BGUID(" << guid.facility << ", " << guid.identifier << ", "
- << guid.version << ")";
+streamout& operator<<(streamout& os, const BGUID& guid) {
+ return os << wxT("BGUID(") << guid.facility << wxT(", ") << guid.identifier << wxT(", ")
+ << guid.version << wxT(")");
}
/////////////////////////////////////////////////////////////////////////////
Modified: scummex/branches/gsoc2007-gameresbrowser/src/core/guid.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/core/guid.h 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/core/guid.h 2007-07-05 23:26:35 UTC (rev 27932)
@@ -8,7 +8,7 @@
#ifndef ZZ_GUID_H
#define ZZ_GUID_H
-#include <string>
+#include "core_stdafx.h"
#include <ostream>
#include "safe_static.h"
@@ -28,10 +28,10 @@
struct BGUID {
static const BGUID& Unknown();
- std::string facility;
- std::string identifier;
+ coreString facility;
+ coreString identifier;
int version;
- BGUID(std::string _facility, std::string _identifier, int _version);
+ BGUID(coreString _facility, coreString _identifier, int _version);
bool operator==(const BGUID& other) const;
bool operator!=(const BGUID& other) const;
@@ -42,7 +42,7 @@
//BGUID& operator=(const BGUID& other); //don't assign
};
-std::ostream& operator<<(std::ostream& os, const BGUID& guid);
+streamout& operator<<(streamout& os, const BGUID& guid);
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
@@ -63,7 +63,7 @@
}
#define GUID_FOR(clazz, facility, version) \
- ASSIGN_GUID_VERBOSE(#clazz, facility, version)
+ ASSIGN_GUID_VERBOSE( wxT(#clazz), facility, version)
//#define ASSIGN_GUID(facility, version) \
// ASSIGN_GUID_VERBOSE(typeid(this_class).name(), facility, version)
Modified: scummex/branches/gsoc2007-gameresbrowser/src/core/ochain.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/core/ochain.cpp 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/core/ochain.cpp 2007-07-05 23:26:35 UTC (rev 27932)
@@ -4,7 +4,7 @@
// Declares an ObjectChain
//
-#include "core-stdafx.h"
+#include "core_stdafx.h"
#include "ochain.h"
#include "oregistry.h"
@@ -316,8 +316,8 @@
//ordered_objs::const_reverse_iterator i;
ordered_objs::reverse_iterator i;
- std::cout << "--- ObjectChain::complete() ---" << std::endl;
- std::cout << "--- PINS ---" << std::endl;
+ infoout << wxT("--- ObjectChain::complete() ---") << std::endl;
+ infoout << wxT("--- PINS ---") << std::endl;
//connecting pins with new objects
next_pin:
@@ -343,14 +343,14 @@
bool res = connect(RCPtr<BObject>(obj0), RCPtr<BObject>(obj1), desc->interfaceGUID);
if (res) {
- std::cout << " CONNECTED: " << obj1->get_GUID().identifier
- << " --> " << desc->interfaceGUID.identifier
- << " --> " << obj0->get_GUID().identifier << std::endl;
+ infoout << wxT(" CONNECTED: ") << obj1->get_GUID().identifier
+ << wxT(" --> ") << desc->interfaceGUID.identifier
+ << wxT(" --> ") << obj0->get_GUID().identifier << std::endl;
goto next_pin; //connected
} else {
- std::cout << " CYCLE?: " << obj1->get_GUID().identifier
- << " --> " << desc->interfaceGUID.identifier
- << " --> " << obj0->get_GUID().identifier << std::endl;
+ infoout << wxT(" CYCLE?: ") << obj1->get_GUID().identifier
+ << wxT(" --> ") << desc->interfaceGUID.identifier
+ << wxT(" --> ") << obj0->get_GUID().identifier << std::endl;
}
}
@@ -363,20 +363,20 @@
this->addObject(obj);
bool res = connect(RCPtr<BObject>(obj0), obj, desc->interfaceGUID);
if (res) {
- std::cout << " CONNECTED: " << obj0->get_GUID().identifier
- << " --> " << desc->interfaceGUID.identifier
- << " --> " << obj->get_GUID().identifier << std::endl;
+ infoout << wxT(" CONNECTED: ") << obj0->get_GUID().identifier
+ << wxT(" --> ") << desc->interfaceGUID.identifier
+ << wxT(" --> ") << obj->get_GUID().identifier << std::endl;
goto next_pin; //connected
} else {
- std::cout << " CYCLE?: " << obj0->get_GUID().identifier
- << " --> " << desc->interfaceGUID.identifier
- << " --> " << obj->get_GUID().identifier << std::endl;
+ infoout << wxT(" CYCLE?: ") << obj0->get_GUID().identifier
+ << wxT(" --> ") << desc->interfaceGUID.identifier
+ << wxT(" --> ") << obj->get_GUID().identifier << std::endl;
}
this->removeObject(obj);
}
- std::cout << "--- SLOTS ---" << std::endl;
+ infoout << wxT("--- SLOTS ---") << std::endl;
//connecting slots with existing objects
next_slot:
@@ -402,19 +402,19 @@
bool res = connect(RCPtr<BObject>(obj1), RCPtr<BObject>(obj0), desc->interfaceGUID);
if (res) {
- std::cout << " CONNECTED: " << obj1->get_GUID().identifier
- << " --> " << desc->interfaceGUID.identifier
- << " --> " << obj0->get_GUID().identifier << std::endl;
+ infoout << wxT(" CONNECTED: ") << obj1->get_GUID().identifier
+ << wxT(" --> ") << desc->interfaceGUID.identifier
+ << wxT(" --> ") << obj0->get_GUID().identifier << std::endl;
goto next_slot; //connected
} else {
- std::cout << " CYCLE?: " << obj1->get_GUID().identifier
- << " --> " << desc->interfaceGUID.identifier
- << " --> " << obj0->get_GUID().identifier << std::endl;
+ infoout << wxT(" CYCLE?: ") << obj1->get_GUID().identifier
+ << wxT(" --> ") << desc->interfaceGUID.identifier
+ << wxT(" --> ") << obj0->get_GUID().identifier << std::endl;
}
}
}
- std::cout << "--- DONE ---" << std::endl;
+ infoout << wxT("--- DONE ---") << std::endl;
}
/////////////////////////////////////////////////////////////////////////////
@@ -505,7 +505,7 @@
}
};
-//Order objects in "destruction" order
+//Order objects in wxT("destruction") order
//it stores the result in objs
void ObjectChain::order_back_to_front(ordered_objs& objs) {
//for each object in the list, bfs:
@@ -543,50 +543,50 @@
int _dump_ochain_indent = 0;
-std::string _doi() {
+coreString _doi() {
ASSERT_STATICS_ALLOWED();
ASSERT(_dump_ochain_indent >= 0);
int indent = _dump_ochain_indent;
- std::string out("");
+ coreString out(wxT(""));
while (indent-- > 0)
- out += " ";
+ out += wxT(" ");
return out;
}
-void ObjectChain::dumpObjectChainStart(std::string ochainname, std::ostream& os) {
+void ObjectChain::dumpObjectChainStart(coreString ochainname, streamout& os) {
ASSERT_STATICS_ALLOWED();
static int graph_count = -1;
graph_count++;
_dump_ochain_indent = 0;
- os << _doi() << "digraph G" << graph_count << " {" << std::endl;
- os << _doi() << " compound=true;" << std::endl;
- os << _doi() << " style=\"\";" << std::endl;
- os << _doi() << " node [style=\"filled, invis\"];" << std::endl;
- os << _doi() << "" << std::endl;
+ os << _doi() << wxT("digraph G") << graph_count << wxT(" {") << std::endl;
+ os << _doi() << wxT(" compound=true;") << std::endl;
+ os << _doi() << wxT(" style=\"\";") << std::endl;
+ os << _doi() << wxT(" node [style=\"filled, invis\"];") << std::endl;
+ os << _doi() << wxT("") << std::endl;
dumpObjectChain(ochainname, os);
- os << _doi() << "}" << std::endl;
+ os << _doi() << wxT("}") << std::endl;
}
-std::string objectNodeName(BObject* obj) {
- return obj->dumpName() + "\\n" + toString(obj);
+coreString objectNodeName(BObject* obj) {
+ return obj->dumpName() + wxT("\\n") + toString(obj);
}
-void ObjectChain::dumpObjectChain(std::string ochainname, std::ostream& os) {
+void ObjectChain::dumpObjectChain(coreString ochainname, streamout& os) {
ASSERT_STATICS_ALLOWED();
- ochainname = ochainname + "\\n" + toString(this);
+ ochainname = ochainname + wxT("\\n") + toString(this);
_dump_ochain_indent++;
- os << _doi() << "subgraph \"cluster_" << ochainname << "\" {" << std::endl;
- os << _doi() << " label = \"" << ochainname << "\";" << std::endl;
- os << _doi() << " color=lightgrey;" << std::endl;
- os << _doi() << " style=\"\";" << std::endl;
- os << _doi() << "" << std::endl;
+ os << _doi() << wxT("subgraph \"cluster_") << ochainname << wxT("\" {") << std::endl;
+ os << _doi() << wxT(" label = \"") << ochainname << wxT("\";") << std::endl;
+ os << _doi() << wxT(" color=lightgrey;") << std::endl;
+ os << _doi() << wxT(" style=\"\";") << std::endl;
+ os << _doi() << wxT("") << std::endl;
//DUMP THE OBJECTS
@@ -594,26 +594,26 @@
for (i = objects.begin(); i != objects.end(); ++i) {
BObject* obj = (*i).get();
bool is_realized = obj->isRealized(this);
- std::string objname = objectNodeName(obj);
+ coreString objname = objectNodeName(obj);
_dump_ochain_indent++;
- os << _doi() << "subgraph \"cluster_" << objname << "\" {" << std::endl;
- os << _doi() << " label = \"" << objname <<"\";" << std::endl;
- os << _doi() << " color=\"" << (is_realized ? "blue" : "red") << "\";" << std::endl;
- os << _doi() << " style=\"rounded\";" << std::endl;
- os << _doi() << "" << std::endl;
- os << _doi() << " \"" << objname << "\";" << std::endl;
- os << _doi() << "" << std::endl;
+ os << _doi() << wxT("subgraph \"cluster_") << objname << wxT("\" {") << std::endl;
+ os << _doi() << wxT(" label = \"") << objname << wxT("\";") << std::endl;
+ os << _doi() << wxT(" color=\"") << (is_realized ? wxT("blue") : wxT("red")) << wxT("\";") << std::endl;
+ os << _doi() << wxT(" style=\"rounded\";") << std::endl;
+ os << _doi() << wxT("") << std::endl;
+ os << _doi() << wxT(" \"") << objname << wxT("\";") << std::endl;
+ os << _doi() << wxT("") << std::endl;
obj->dumpObjectChains(os);
- os << _doi() << "}" << std::endl << std::endl;
+ os << _doi() << wxT("}") << std::endl << std::endl;
_dump_ochain_indent--;
}
- os << _doi() << "" << std::endl;
+ os << _doi() << wxT("") << std::endl;
//DUMP THE CONNECTIONS
@@ -626,20 +626,20 @@
BObject* pobj = _match_that(pin);
ASSERT(slot && pin && sobj && pobj);
- std::string sobjname = objectNodeName(sobj);
- std::string pobjname = objectNodeName(pobj);
+ coreString sobjname = objectNodeName(sobj);
+ coreString pobjname = objectNodeName(pobj);
os << _doi();
- os << "\"" << pobjname << "\"";
- os << " -> ";
- os << "\"" << sobjname << "\"";
- os << " [label = \"" << slot->get_desc().interfaceGUID.identifier << "\", ";
- os << "lhead=\"cluster_" << sobjname << "\" , ltail=\"cluster_" << pobjname << "\" ]";
- os << ";" << std::endl;
+ os << wxT("\"") << pobjname << wxT("\"");
+ os << wxT(" -> ");
+ os << wxT("\"") << sobjname << wxT("\"");
+ os << wxT(" [label = \"") << slot->get_desc().interfaceGUID.identifier << wxT("\", ");
+ os << wxT("lhead=\"cluster_") << sobjname << wxT("\" , ltail=\"cluster_") << pobjname << wxT("\" ]");
+ os << wxT(";") << std::endl;
}
_dump_ochain_indent--;
- os << _doi() << "}" << std::endl << std::endl;
+ os << _doi() << wxT("}") << std::endl << std::endl;
_dump_ochain_indent--;
}
Modified: scummex/branches/gsoc2007-gameresbrowser/src/core/ochain.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/core/ochain.h 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/core/ochain.h 2007-07-05 23:26:35 UTC (rev 27932)
@@ -45,8 +45,8 @@
public:
- void dumpObjectChainStart(std::string ochainname, std::ostream& os);
- void dumpObjectChain(std::string ochainname, std::ostream& os);
+ void dumpObjectChainStart(coreString ochainname, streamout& os);
+ void dumpObjectChain(coreString ochainname, streamout& os);
//returns true if the insertion was made
//returns false if the object was already there
@@ -114,7 +114,7 @@
private:
- //Order objects in "destruction" order
+ //Order objects in wxT("destruction") order
//it stores the result in objs
void order_back_to_front(ordered_objs& objs);
Modified: scummex/branches/gsoc2007-gameresbrowser/src/core/oregistry.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/core/oregistry.cpp 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/core/oregistry.cpp 2007-07-05 23:26:35 UTC (rev 27932)
@@ -4,7 +4,7 @@
// ObjectRegistry implementation.
//
-#include "core-stdafx.h"
+#include "core_stdafx.h"
#include "oregistry.h"
#include "ftregistry.h"
Modified: scummex/branches/gsoc2007-gameresbrowser/src/core/pinslot.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/core/pinslot.cpp 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/core/pinslot.cpp 2007-07-05 23:26:35 UTC (rev 27932)
@@ -5,7 +5,7 @@
// (plus factories, templates and macros for them)
//
-#include "core-stdafx.h"
+#include "core_stdafx.h"
#include "pinslot.h"
@@ -24,13 +24,13 @@
// name - a human readable name
// flags - flags of a pin/slot (default/multicast/pin/slot...)
-_PinSlotDesc::_PinSlotDesc(std::string _name, const BGUID& _interfaceGUID, int _flags)
+_PinSlotDesc::_PinSlotDesc(coreString _name, const BGUID& _interfaceGUID, int _flags)
: name(_name), interfaceGUID(_interfaceGUID),
flags(_flags) {}
-std::ostream& operator<<(std::ostream& os, const _PinSlotDesc& desc) {
- return os << "PinSlotDesc(" << desc.name << ", " << desc.interfaceGUID << ", "
- << desc.flags << ")";
+streamout& operator<<(streamout& os, const _PinSlotDesc& desc) {
+ return os << wxT("PinSlotDesc(") << desc.name << wxT(", ") << desc.interfaceGUID << wxT(", ")
+ << desc.flags << wxT(")");
}
/////////////////////////////////////////////////////////////////////////////
@@ -42,7 +42,7 @@
// an object
// (see Makers and Accesors in pinslot_detail.h for more details)
-PinSlotDesc::PinSlotDesc(std::string _name, const BGUID& _interfaceGUID, int _flags)
+PinSlotDesc::PinSlotDesc(coreString _name, const BGUID& _interfaceGUID, int _flags)
: _PinSlotDesc(_name, _interfaceGUID, _flags) {}
PinSlotDesc::PinSlotDesc(const _PinSlotDesc& desc)
@@ -171,16 +171,16 @@
}
void InitializedObjects::report() {
- std::cout << "------------ DUMPING INITIALIZED OBJECTS -------------" << std::endl;
- std::cout << "OBJECTS COUNT: " << _initializedObjects.size() << std::endl;
+ infoout << wxT("------------ DUMPING INITIALIZED OBJECTS -------------") << std::endl;
+ infoout << wxT("OBJECTS COUNT: ") << _initializedObjects.size() << std::endl;
std::set<BObject*>::const_iterator i;
for (i = _initializedObjects.begin(); i != _initializedObjects.end(); ++i) {
BObject* obj = *i;
- std::cout << obj->get_GUID().identifier << ":\t\t" << obj << std::endl;
+ infoout << obj->dumpName() << wxT(":\t\t") << obj << std::endl;
}
- std::cout << "---------- DONE DUMPING INITIALIZED OBJECTS ----------" << std::endl;
+ infoout << wxT("---------- DONE DUMPING INITIALIZED OBJECTS ----------") << std::endl;
}
/////////////////////////////////////////////////////////////////////////////
@@ -194,13 +194,13 @@
ASSERT(_dump_realize_indent >= 0);
int indent = _dump_realize_indent;
while (indent-- > 0)
- std::cout << " ";
+ infoout << wxT(" ");
}
void BObject::dumpRealizing(ObjectChain* ochain) {
dump_realize_indent();
- std::cout << "REALIZING:\t";
- std::cout << this->get_GUID().identifier << "\t\t" << this << " oc: " << ochain << std::endl;
+ infoout << wxT("REALIZING:");
+ infoout << this->dumpName() << wxT("\t\t") << this << wxT(" oc: ") << ochain << std::endl;
ASSERT_STATICS_ALLOWED();
_dump_realize_indent++;
}
@@ -209,14 +209,14 @@
ASSERT_STATICS_ALLOWED();
_dump_realize_indent--;
dump_realize_indent();
- std::cout << (result ? "REALIZED:\t" : "R-FAILED:\t ");
- std::cout << this->get_GUID().identifier << "\t\t" << this << " oc: " << ochain << std::endl;
+ infoout << (result ? wxT("REALIZED: ") : wxT("R-FAILED: "));
+ infoout << this->dumpName() << wxT("\t\t") << this << wxT(" oc: ") << ochain << std::endl;
}
void BObject::dumpUnrealizing(ObjectChain* ochain) {
dump_realize_indent();
- std::cout << "UNREALIZING:\t";
- std::cout << this->get_GUID().identifier << "\t\t" << this << " oc: " << ochain << std::endl;
+ infoout << wxT("UNREALIZING: ");
+ infoout << this->dumpName() << wxT("\t\t") << this << wxT(" oc: ") << ochain << std::endl;
ASSERT_STATICS_ALLOWED();
_dump_realize_indent++;
}
@@ -225,8 +225,8 @@
ASSERT_STATICS_ALLOWED();
_dump_realize_indent--;
dump_realize_indent();
- std::cout << "UNREALIZED:\t";
- std::cout << this->get_GUID().identifier << "\t\t" << this << " oc: " << ochain << std::endl;
+ infoout << wxT("UNREALIZED: ");
+ infoout << this->dumpName() << wxT("\t\t") << this << wxT(" oc: ") << ochain << std::endl;
}
//do not call manually!
Modified: scummex/branches/gsoc2007-gameresbrowser/src/core/pinslot.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/core/pinslot.h 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/core/pinslot.h 2007-07-05 23:26:35 UTC (rev 27932)
@@ -116,12 +116,12 @@
struct _PinSlotDesc {
const BGUID interfaceGUID;
int flags;
- std::string name;
+ coreString name;
- _PinSlotDesc(std::string _name, const BGUID& _interfaceGUID, int _flags);
+ _PinSlotDesc(coreString _name, const BGUID& _interfaceGUID, int _flags);
};
-std::ostream& operator<<(std::ostream& os, const _PinSlotDesc& desc);
+streamout& operator<<(streamout& os, const _PinSlotDesc& desc);
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
@@ -135,7 +135,7 @@
class BObject;
struct PinSlotDesc : _PinSlotDesc {
- PinSlotDesc(std::string _name, const BGUID& _interfaceGUID, int _flags);
+ PinSlotDesc(coreString _name, const BGUID& _interfaceGUID, int _flags);
PinSlotDesc(const _PinSlotDesc& desc);
virtual void makePinSlot(BObject* that) const = 0; //do not use manually
@@ -169,7 +169,7 @@
struct PinSlotDescImpl : PinSlotDesc {
GD pinSlotGet;
FD pinSlotFactory;
- PinSlotDescImpl(std::string _name, const BGUID& _interfaceGUID, int _flags,
+ PinSlotDescImpl(coreString _name, const BGUID& _interfaceGUID, int _flags,
const GD& _pinSlotGet, const FD& _pinSlotFactory)
: PinSlotDesc(_name, _interfaceGUID, _flags),
pinSlotGet(_pinSlotGet), pinSlotFactory(_pinSlotFactory) {}
@@ -187,7 +187,7 @@
};
template<typename GD, typename FD>
-PinSlotDesc* makePinSlotDesc(std::string _name, const BGUID& _interfaceGUID, int _flags,
+PinSlotDesc* makePinSlotDesc(coreString _name, const BGUID& _interfaceGUID, int _flags,
const GD& gd, const FD& fd) {
//GD gd, FD fd) {
return new PinSlotDescImpl<GD, FD>(_name, _interfaceGUID, _flags, gd, fd);
@@ -220,7 +220,7 @@
}
static const _PinSlotDesc& static_desc() {
ASSERT_STATICS_ALLOWED();
- static _PinSlotDesc DESC(toString(I::static_GUID().identifier) + "-Pin",
+ static _PinSlotDesc DESC(toString(I::static_GUID().identifier) + wxT("-Pin"),
I::static_GUID(), flags);
return DESC;
}
@@ -279,7 +279,7 @@
}
static const _PinSlotDesc& static_desc() {
ASSERT_STATICS_ALLOWED();
- static _PinSlotDesc DESC(toString(I::static_GUID().identifier) + "-Slot",
+ static _PinSlotDesc DESC(toString(I::static_GUID().identifier) + wxT("-Slot"),
I::static_GUID(), flags);
return DESC;
}
@@ -316,11 +316,11 @@
struct BObjectDesc {
const BGUID _objectGUID;
int _flags;
- std::string _name;
+ coreString _name;
const PinSlotDescs& _pinDescs;
const PinSlotDescs& _slotDescs;
- BObjectDesc(std::string name, const BGUID& objectGUID, int flags,
+ BObjectDesc(coreString name, const BGUID& objectGUID, int flags,
const PinSlotDescs& pinDescs, const PinSlotDescs& slotDescs)
: _name(name), _objectGUID(objectGUID), _flags(flags),
_pinDescs(pinDescs), _slotDescs(slotDescs) {}
@@ -328,7 +328,7 @@
int get_flags() const {
return _flags;
}
- const std::string& get_name() const {
+ const coreString& get_name() const {
return _name;
}
const BGUID& get_GUID() const {
@@ -460,11 +460,11 @@
_realized = false;
}
- virtual void dumpObjectChains(std::ostream& os) {
+ virtual void dumpObjectChains(streamout& os) {
}
//a name used for debugging
- virtual std::string dumpName() {
+ virtual coreString dumpName() {
return this->get_GUID().identifier;
}
@@ -475,12 +475,12 @@
public:
virtual const BObjectDesc& get_desc() const = 0;
- /*GUID_FOR(BObject, "CoreObjects", 1)
+ /*GUID_FOR(BObject, wxT("CoreObjects"), 1)
virtual const BObjectDesc& get_desc() const {
return BObject::static_desc();
}
static const BObjectDesc& static_desc() {
- static BObjectDesc desc("BObject", BObject::static_GUID(), 0,
+ static BObjectDesc desc(wxT("BObject"), BObject::static_GUID(), 0,
BObject::static_pins(), BObject::static_slots());
return desc;
}*/
Modified: scummex/branches/gsoc2007-gameresbrowser/src/core/pinslot_detail.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/core/pinslot_detail.h 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/core/pinslot_detail.h 2007-07-05 23:26:35 UTC (rev 27932)
@@ -20,11 +20,11 @@
private: \
typedef clazz this_class; \
typedef super super_class; \
- static const char* _this_class_name() { \
- return #clazz; \
+ static const wxChar* _this_class_name() { \
+ return wxT(#clazz); \
} \
- static const char* _super_class_name() { \
- return #super; \
+ static const wxChar* _super_class_name() { \
+ return wxT(#super); \
}
#define THIS_CLASS_NAME (_this_class_name())
@@ -93,7 +93,7 @@
#define PIN_DESC(pin, flags, getFun, relFun) \
.insert( \
makePinDesc<flags | IS_PIN>( \
- #pin, \
+ wxT(#pin), \
&this_class::pin, \
&this_class::getFun, \
&this_class::relFun \
@@ -105,7 +105,7 @@
#define PIN_DESC_r(pin, flags, getFun, iRel) \
.insert( \
makePinDesc<flags | IS_PIN, iRel>( \
- #pin, \
+ wxT(#pin), \
&this_class::pin, \
&this_class::getFun \
) \
@@ -114,7 +114,7 @@
#define SLOT_DESC(pin, flags) \
.insert( \
makeSlotDesc<flags | IS_SLOT>( \
- #pin, \
+ wxT(#pin), \
&this_class::pin \
) \
)
@@ -213,10 +213,10 @@
// ISup is used here in two places - it's on purpose, for type safety.
// (Without this template it wouldn't be type safe.)
template<int flags, typename I, typename T, typename ISup>
-PinSlotDesc* makePinDesc(char* name, Pin<I>* T::* pin, ISup* (T::* getFun)(),
+PinSlotDesc* makePinDesc(wxChar* name, Pin<I>* T::* pin, ISup* (T::* getFun)(),
void (T::* relFun)(ISup*) ) {
return
- makePinSlotDesc(std::string(typeid(T).name()) + "::" + name,
+ makePinSlotDesc(toString(typeid(T).name()) + wxT("::") + name,
I::static_GUID(),
flags,
accessPin(pin),
@@ -230,9 +230,9 @@
//can turn into a macro to allow for other release() function names
template<int flags, typename Irel, typename I, typename T, typename ISup>
-PinSlotDesc* makePinDesc(char* name, Pin<I>* T::* pin, ISup* (T::* getFun)() ) {
+PinSlotDesc* makePinDesc(wxChar* name, Pin<I>* T::* pin, ISup* (T::* getFun)() ) {
return
- makePinSlotDesc(std::string(typeid(T).name()) + "::" + name,
+ makePinSlotDesc(toString(typeid(T).name()) + wxT("::") + name,
I::static_GUID(),
flags,
accessPin(pin),
@@ -247,9 +247,9 @@
}
template<int flags, typename I, typename T>
-PinSlotDesc* makeSlotDesc(char* name, Slot<I>* T::* slot) {
+PinSlotDesc* makeSlotDesc(wxChar* name, Slot<I>* T::* slot) {
return
- makePinSlotDesc(std::string(typeid(T).name()) + "::" + name,
+ makePinSlotDesc(toString(typeid(T).name()) + wxT("::") + name,
I::static_GUID(),
flags,
accessSlot(slot),
Modified: scummex/branches/gsoc2007-gameresbrowser/src/core/plugin.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/core/plugin.h 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/core/plugin.h 2007-07-05 23:26:35 UTC (rev 27932)
@@ -57,8 +57,8 @@
class ObjectPluginImpl : public ObjectPlugin {
public:
- ASSIGN_GUID_VERBOSE( (std::string("ObjectPluginImpl<") + typeid(T).name() + ">"),
- "ObjectPlugins", 1)
+ ASSIGN_GUID_VERBOSE( (coreString(wxT("ObjectPluginImpl<")) + toString(typeid(T).name()) + wxT(">")),
+ wxT("ObjectPlugins"), 1)
virtual const BObjectDesc& get_desc() const {
return T::static_desc();
Modified: scummex/branches/gsoc2007-gameresbrowser/src/core/rcobject.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/core/rcobject.cpp 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/core/rcobject.cpp 2007-07-05 23:26:35 UTC (rev 27932)
@@ -1,6 +1,6 @@
//http://www.aristeia.com/BookErrata/M29Source_frames.html
-#include "core-stdafx.h"
+#include "core_stdafx.h"
#include "rcobject.h"
@@ -10,7 +10,7 @@
/******************************************************************************
* *
-* Code from Item 29 ("Reference Counting") of MORE EFFECTIVE C++ *
+* Code from Item 29 (wxT("Reference Counting")) of MORE EFFECTIVE C++ *
* *
* Scott Meyers *
* *
Modified: scummex/branches/gsoc2007-gameresbrowser/src/core/rcobject.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/core/rcobject.h 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/core/rcobject.h 2007-07-05 23:26:35 UTC (rev 27932)
@@ -10,7 +10,7 @@
/******************************************************************************
* *
-* Code from Item 29 ("Reference Counting") of MORE EFFECTIVE C++ *
+* Code from Item 29 (wxT("Reference Counting")) of MORE EFFECTIVE C++ *
* *
* Scott Meyers *
* *
@@ -240,7 +240,7 @@
******************************************************************************
class String { // class to be used by
public: // application developers
- String(const char *value = "");
+ String(const char *value = wxT(""));
char operator[](int index) const;
char& operator[](int index);
@@ -260,7 +260,7 @@
// This function is not in the book, but it's convenient for testing the
// class -- see below.
- friend std::ostream& operator<<(std::ostream& stream, const String& string);
+ friend streamout& operator<<(streamout& stream, const String& string);
};
void String::StringValue::init(const char *initValue) {
@@ -301,7 +301,7 @@
return value->data[index];
}
-std::ostream& operator<<(std::ostream& stream, const String& string) {
+streamout& operator<<(streamout& stream, const String& string) {
return stream << string.value->data;
}
@@ -440,13 +440,13 @@
* Functions to perform VERY simple test of the above. *
******************************************************************************
void testRCPtr() {
- String s1 = "String with no changes.";
+ String s1 = wxT("String with no changes.");
String s2(s1);
s2[12] = s2[13] = ' ';
- std::cout << s1 << '\n'; // prints "String with no changes."
- std::cout << s2 << '\n'; // prints "String with changes."
+ std::cout << s1 << '\n'; // prints wxT("String with no changes.")
+ std::cout << s2 << '\n'; // prints wxT("String with changes.")
}
void testRCIPtr() {
Modified: scummex/branches/gsoc2007-gameresbrowser/src/core/safe_static.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/core/safe_static.cpp 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/core/safe_static.cpp 2007-07-05 23:26:35 UTC (rev 27932)
@@ -2,7 +2,7 @@
// safe_static.cpp
//
-#include "core-stdafx.h"
+#include "core_stdafx.h"
#include "safe_static.h"
Modified: scummex/branches/gsoc2007-gameresbrowser/src/core/tostring.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/core/tostring.h 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/core/tostring.h 2007-07-05 23:26:35 UTC (rev 27932)
@@ -8,11 +8,8 @@
#ifndef ZZ_TO_STRING_H
#define ZZ_TO_STRING_H
-#include <string>
-#include <sstream> // only for implementation
+#include "core_stdafx.h"
-#include <wx/string.h>
-
namespace Browser {
/////////////////////////////////////////////////////////////////////////////
@@ -20,20 +17,45 @@
template<typename T>
inline
-std::string toString(const T& obj) {
- std::ostringstream oss;
- oss << obj;
- return oss.str();
+wxString toString(const T& obj) {
+ return wxString() << obj;
}
+template<typename T>
+inline
+wxString toString(const T *const& ptr) {
+ return wxString::Format(wxT("%x"), ptr);
+}
+
+template<typename T>
+inline
+wxString toString(T *const& ptr) {
+ return wxString::Format(wxT("%x"), ptr);
+}
+
template<>
inline
-std::string toString<wxString>(const wxString& obj) {
- std::ostringstream oss;
- oss << obj.mb_str(wxConvUTF8);
- return oss.str();
+wxString toString<wxString>(const wxString& obj) {
+ return obj;
}
+template<>
+inline
+wxString toString<const char*>(const char *const& str) {
+ return wxString(wxConvCurrent->cMB2WX(str));
+}
+
+template<>
+inline
+wxString toString<char*>(char *const& str) {
+ return wxString(wxConvCurrent->cMB2WX(str));
+}
+
+inline
+streamout& operator<<(streamout& os, const wxString& str) {
+ return os << str.c_str();
+}
+
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
Modified: scummex/branches/gsoc2007-gameresbrowser/src/gui/BitmapPanel.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/gui/BitmapPanel.cpp 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/gui/BitmapPanel.cpp 2007-07-05 23:26:35 UTC (rev 27932)
@@ -1,8 +1,8 @@
/////////////////////////////////////////////////////////////////////////////
// BitmapPanel.cpp
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "gui-stdafx.h"
+// For compilers that support precompilation, includes wxT("wx/wx.h").
+#include "gui_stdafx.h"
#include "BitmapPanel.h"
Modified: scummex/branches/gsoc2007-gameresbrowser/src/gui/BitmapPanel.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/gui/BitmapPanel.h 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/gui/BitmapPanel.h 2007-07-05 23:26:35 UTC (rev 27932)
@@ -4,8 +4,8 @@
#ifndef _BITMAP_PANEL_H_
#define _BITMAP_PANEL_H_
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "gui-stdafx.h"
+// For compilers that support precompilation, includes wxT("wx/wx.h").
+#include "gui_stdafx.h"
#include "wx/panel.h"
Modified: scummex/branches/gsoc2007-gameresbrowser/src/gui/BrowserApp.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/gui/BrowserApp.cpp 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/gui/BrowserApp.cpp 2007-07-05 23:26:35 UTC (rev 27932)
@@ -7,7 +7,7 @@
//
//---------------------------------------------------------------------------
-#include "gui-stdafx.h"
+#include "gui_stdafx.h"
#include "BrowserApp.h"
//#include "BrowserDlg.h"
Modified: scummex/branches/gsoc2007-gameresbrowser/src/gui/BrowserApp.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/gui/BrowserApp.h 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/gui/BrowserApp.h 2007-07-05 23:26:35 UTC (rev 27932)
@@ -10,7 +10,7 @@
#ifndef __BROWSERDLGApp_h__
#define __BROWSERDLGApp_h__
-#include "gui-stdafx.h"
+#include "gui_stdafx.h"
class BrowserDlgApp : public wxApp
{
Modified: scummex/branches/gsoc2007-gameresbrowser/src/gui/DirectoryPresenter.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/gui/DirectoryPresenter.cpp 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/gui/DirectoryPresenter.cpp 2007-07-05 23:26:35 UTC (rev 27932)
@@ -1,7 +1,7 @@
/////////////////////////////////////////////////////////////////////////////
// DirectoryPresenter.cpp
-#include "gui-stdafx.h"
+#include "gui_stdafx.h"
#include "DirectoryPresenter.h"
#include "ExplorationTree.h"
@@ -39,7 +39,7 @@
//ExplorationTree::get()->setItemHasChildren(node, true);
wxTreeItemId dummyTreeItem = ExplorationTree::get()->appendItem(
- node->getTreeItem(), _T("Dummy"));
+ node->getTreeItem(), wxT("Dummy"));
_expanded = false;
@@ -48,9 +48,9 @@
void DirectoryPresenter::doUnrealize(ObjectChain* ochain) {
ASSERT(_inodeprovider && _inodeprovider->getNode());
- std::cout << "DirectoryPresenter::unrealize(): "
- << (_inodeprovider ? toString(_inodeprovider->getNode()->getTreeItemName()) : "<error>") << " "
- << (_idirectory ? _idirectory->getName() : "<not expanded>") << " "
+ infoout << wxT("DirectoryPresenter::unrealize(): ")
+ << (_inodeprovider ? toString(_inodeprovider->getNode()->getTreeItemName()) : wxT("<error>")) << wxT(" ")
+ << (_idirectory ? _idirectory->getName() : wxT("<not expanded>")) << wxT(" ")
<< std::endl;
ExplorationTree::get()->unregisterDirectoryPresenter(this);
@@ -96,7 +96,7 @@
break;
RCPtr<BObject> parser = ObjectRegistry::get()->getObject( *i );
if (parser.get() == NULL) {
- std::cout << "ERROR: DirectoryPresenter::prepareKidChain(): can't create parser: " << (*i) << std::endl;
+ errout << wxT("ERROR: DirectoryPresenter::prepareKidChain(): can't create parser: ") << (*i) << std::endl;
addingOk = false;
break;
}
@@ -122,11 +122,11 @@
_idirectory = _directorySlot->getInterface();
if (!_idirectory) {
- std::cout << "ERROR: DirectoryPresenter::expand(): can't get IDirectory interface." << std::endl;
+ errout << wxT("ERROR: DirectoryPresenter::expand(): can't get IDirectory interface.") << std::endl;
return; //TODO: report error
}
- std::cout << "DirectoryPresenter::expand(): " << _idirectory->getName() << std::endl;
+ infoout << wxT("DirectoryPresenter::expand(): ") << _idirectory->getName() << std::endl;
VirtualNode* parent = _inodeprovider->getNode();
@@ -163,7 +163,7 @@
//now realize those chains:
if (!realizeKidChains()) {
deleteKidChains();
- std::cout << "ERROR: DirectoryPresenter::expand(): can't realize kids." << std::endl;
+ errout << wxT("ERROR: DirectoryPresenter::expand(): can't realize kids.") << std::endl;
return; //TODO: report error
}
}
@@ -193,12 +193,12 @@
return res;
}
-void DirectoryPresenter::dumpObjectChains(std::ostream& os) {
+void DirectoryPresenter::dumpObjectChains(streamout& os) {
std::list<ObjectChain*>::const_iterator i;
int idx = 0;
for (i = _kidChains.begin(); i != _kidChains.end(); ++i) {
ObjectChain* kidchain = *i;
- kidchain->dumpObjectChain(std::string("kid") + toString(idx), os);
+ kidchain->dumpObjectChain(coreString(wxT("kid")) + toString(idx), os);
idx++;
}
}
Modified: scummex/branches/gsoc2007-gameresbrowser/src/gui/DirectoryPresenter.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/gui/DirectoryPresenter.h 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/gui/DirectoryPresenter.h 2007-07-05 23:26:35 UTC (rev 27932)
@@ -32,7 +32,7 @@
bool _expanded;
public:
- ASSIGN_DESC(0,"CoreObjects", 1)
+ ASSIGN_DESC(0,wxT("CoreObjects"), 1)
SLOTS_DECL
@@ -48,7 +48,7 @@
virtual void expand();
bool prepareKidChain(const RCPtr<VirtualNode>& virtualNode, bool isFile);
- virtual void dumpObjectChains(std::ostream& os);
+ virtual void dumpObjectChains(streamout& os);
};
Modified: scummex/branches/gsoc2007-gameresbrowser/src/gui/ExplorationTree.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/gui/ExplorationTree.cpp 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/gui/ExplorationTree.cpp 2007-07-05 23:26:35 UTC (rev 27932)
@@ -1,7 +1,7 @@
/////////////////////////////////////////////////////////////////////////////
// ExplorationTree.cpp
-#include "gui-stdafx.h"
+#include "gui_stdafx.h"
#include "ExplorationTree.h"
#include "PanelProvider.h"
@@ -184,9 +184,9 @@
return _explorationTree;
}*/
-wxTreeItemId ExplorationTree::appendItem(const wxTreeItemId& parent, std::string title) {
+wxTreeItemId ExplorationTree::appendItem(const wxTreeItemId& parent, wxString title) {
ASSERT_VALID_TREE_ITEM(parent);
- wxTreeItemId item = _explorationTree->AppendItem(parent, wxString(title.c_str(), wxConvUTF8), -1, -1, NULL);
+ wxTreeItemId item = _explorationTree->AppendItem(parent, title, -1, -1, NULL);
ASSERT_VALID_TREE_ITEM(item);
return item;
}
@@ -232,7 +232,7 @@
}
-wxTreeItemId ExplorationTree::addRoot(std::string title) {
+wxTreeItemId ExplorationTree::addRoot(wxString title) {
wxTreeItemId item = _explorationTree->AddRoot(title, -1, -1, NULL);
ASSERT_VALID_TREE_ITEM(item);
return item;
@@ -278,8 +278,7 @@
return;
wxPanel* panel = new wxPanel(_panelNotebook);
- _panelNotebook->AddPage(panel,
- wxString(pinfo->_panelProvider->getPanelTitle().c_str(), wxConvUTF8) );
+ _panelNotebook->AddPage(panel, pinfo->_panelProvider->getPanelTitle());
pinfo->_activated = true;
pinfo->_page = panel;
pinfo->_pageIdx = _panelNotebook->GetPageCount() - 1;
Modified: scummex/branches/gsoc2007-gameresbrowser/src/gui/ExplorationTree.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/gui/ExplorationTree.h 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/gui/ExplorationTree.h 2007-07-05 23:26:35 UTC (rev 27932)
@@ -53,14 +53,14 @@
//static wxTreeCtrl* _getTree();
//wxTreeCtrl* getTree();
- wxTreeItemId appendItem(const wxTreeItemId& parent, std::string title);
+ wxTreeItemId appendItem(const wxTreeItemId& parent, wxString title);
void _recDel(const wxTreeItemId& item); //HACK
void deleteChildren(const wxTreeItemId& parent);
void setItemData(const wxTreeItemId& item, wxTreeItemData* data);
wxTreeItemData* getItemData(const wxTreeItemId& item);
wxTreeItemId getItemParent(const wxTreeItemId& item);
wxString getItemText(const wxTreeItemId& item);
- wxTreeItemId addRoot(std::string title);
+ wxTreeItemId addRoot(wxString title);
void deleteAllItems();
ObjectChain* getRootObjectChain();
Modified: scummex/branches/gsoc2007-gameresbrowser/src/gui/FilePresenter.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/gui/FilePresenter.cpp 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/gui/FilePresenter.cpp 2007-07-05 23:26:35 UTC (rev 27932)
@@ -1,7 +1,7 @@
/////////////////////////////////////////////////////////////////////////////
// FilePresenter.cpp
-#include "gui-stdafx.h"
+#include "gui_stdafx.h"
#include "FilePresenter.h"
@@ -25,20 +25,20 @@
END_DESCS
IPanelRecieverImpl* FilePresenter::getPanelRecieverImpl() {
- //std::cout << "FilePresenter::getPanelRecieverImpl(): " << std::endl;
+ //infoout << wxT("FilePresenter::getPanelRecieverImpl(): ") << std::endl;
return new IPanelRecieverImpl(this);
}
-std::string FilePresenter::getPanelTitle() {
+coreString FilePresenter::getPanelTitle() {
IFile* ifile = _fileSlot->getInterface();
if (!ifile) {
- std::cout << "FilePresenter::getPanelTitle(): could not get IFile interface" << std::endl;
- return "error reading file";
+ errout << wxT("FilePresenter::getPanelTitle(): could not get IFile interface") << std::endl;
+ return wxT("error reading file");
}
- std::string name = ifile->getName();
+ coreString name = ifile->getName();
_fileSlot->releaseInterface();
@@ -46,33 +46,33 @@
}
void FilePresenter::panelActivate(wxPanel* panel) {
- std::cout << "FilePresenter::panelActivate()" << std::endl;
+ //infoout << wxT("FilePresenter::panelActivate()") << std::endl;
IFile* ifile = _fileSlot->getInterface();
if (!ifile) {
- std::cout << "FilePresenter::panelActivate(): could not get IFile interface" << std::endl;
+ errout << wxT("FilePresenter::panelActivate(): could not get IFile interface") << std::endl;
return;
}
- std::string name = ifile->getName();
- std::string text = name;
+ coreString name = ifile->getName();
+ coreString text = name;
Common::SeekableReadStream* stream = ifile->getStream();
if (stream) {
uint32 p = stream->pos();
uint32 s = stream->size();
- text += " ";
- text += toString(p) + "/" + toString(s);
+ text += wxT(" ");
+ text += toString(p) + wxT("/") + toString(s);
} else {
- text += " ERROR while getting Stream";
+ text += wxT(" ERROR while getting Stream");
}
- new wxStaticText(panel, wxID_ANY, wxString(text.c_str(), wxConvUTF8));
+ new wxStaticText(panel, wxID_ANY, text);
_fileSlot->releaseInterface();
}
void FilePresenter::panelDeactivate() {
- std::cout << "FilePresenter::panelDeactivate()" << std::endl;
+ //infoout << wxT("FilePresenter::panelDeactivate()") << std::endl;
}
/////////////////////////////////////////////////////////////////////////////
Modified: scummex/branches/gsoc2007-gameresbrowser/src/gui/FilePresenter.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/gui/FilePresenter.h 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/gui/FilePresenter.h 2007-07-05 23:26:35 UTC (rev 27932)
@@ -25,12 +25,12 @@
wxPanel* _bmpPanel;
public:
- ASSIGN_DESC(0,"CoreObjects", 1)
+ ASSIGN_DESC(0,wxT("CoreObjects"), 1)
PINS_DECL
SLOTS_DECL
- virtual std::string getPanelTitle();
+ virtual coreString getPanelTitle();
virtual void panelActivate(wxPanel* panel);
virtual void panelDeactivate();
Modified: scummex/branches/gsoc2007-gameresbrowser/src/gui/ImagePresenter.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/gui/ImagePresenter.cpp 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/gui/ImagePresenter.cpp 2007-07-05 23:26:35 UTC (rev 27932)
@@ -1,7 +1,7 @@
/////////////////////////////////////////////////////////////////////////////
// ImagePresenter.cpp
-#include "gui-stdafx.h"
+#include "gui_stdafx.h"
#include "ImagePresenter.h"
@@ -26,7 +26,7 @@
END_DESCS
IPanelRecieverImpl* ImagePresenter::getPanelRecieverImpl() {
- //std::cout << "ImagePresenter::getPanelRecieverImpl(): " << std::endl;
+ //infoout << wxT("ImagePresenter::getPanelRecieverImpl(): ") << std::endl;
return new IPanelRecieverImpl(this);
}
@@ -39,24 +39,24 @@
delete _bitmap;
}
-std::string ImagePresenter::getPanelTitle() {
- return "Image";
+coreString ImagePresenter::getPanelTitle() {
+ return wxT("Image");
}
void ImagePresenter::panelActivate(wxPanel* panel) {
- std::cout << "ImagePresenter::panelActivate()" << std::endl;
+ //infoout << wxT("ImagePresenter::panelActivate()") << std::endl;
if (!_bitmap) {
IImage* iimage = _imageSlot->getInterface();
if (!iimage) {
- std::cout << " -- could not get IImage interface" << std::endl;
+ errout << wxT("ImagePresenter::panelActivate(): could not get IImage interface") << std::endl;
return;
}
- //std::cout << " -- bitmap: " << bitmap->getBitmap() << std::endl;
+ //std::cout << wxT(" -- bitmap: ") << bitmap->getBitmap() << std::endl;
wxImage* image = iimage->getImage();
if (!image) {
- std::cout << " -- could not get wxImage from IImage interface" << std::endl;
+ errout << wxT("ImagePresenter::panelActivate(): could not get wxImage from IImage interface") << std::endl;
_imageSlot->releaseInterface();
return;
}
@@ -73,7 +73,7 @@
}
void ImagePresenter::panelDeactivate() {
- std::cout << "ImagePresenter::panelDeactivate()" << std::endl;
+ //infoout << wxT("ImagePresenter::panelDeactivate()") << std::endl;
if (_bmpPanel) {
_bmpPanel->Destroy();
Modified: scummex/branches/gsoc2007-gameresbrowser/src/gui/ImagePresenter.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/gui/ImagePresenter.h 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/gui/ImagePresenter.h 2007-07-05 23:26:35 UTC (rev 27932)
@@ -25,7 +25,7 @@
wxPanel* _bmpPanel;
public:
- ASSIGN_DESC(0,"CoreObjects", 1)
+ ASSIGN_DESC(0,wxT("CoreObjects"), 1)
PINS_DECL
SLOTS_DECL
@@ -33,7 +33,7 @@
ImagePresenter();
~ImagePresenter();
- virtual std::string getPanelTitle();
+ virtual coreString getPanelTitle();
virtual void panelActivate(wxPanel* panel);
virtual void panelDeactivate();
Modified: scummex/branches/gsoc2007-gameresbrowser/src/gui/MainForm.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/gui/MainForm.cpp 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/gui/MainForm.cpp 2007-07-05 23:26:35 UTC (rev 27932)
@@ -7,7 +7,7 @@
//
//---------------------------------------------------------------------------
-#include "gui-stdafx.h"
+#include "gui_stdafx.h"
#include "MainForm.h"
@@ -73,7 +73,7 @@
ExplorationTree::initialize(browserTree, browserNotebook);
#endif
- char* leak = new char[5]; // a deliberate memory leak
+ wxChar* leak = new wxChar[5]; // a deliberate memory leak
leak[0] = 'L'; leak[1] = 'E'; leak[2] = 'A'; leak[3] = 'K'; leak[4] = '\0';
}
Modified: scummex/branches/gsoc2007-gameresbrowser/src/gui/MainForm.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/gui/MainForm.h 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/gui/MainForm.h 2007-07-05 23:26:35 UTC (rev 27932)
@@ -10,7 +10,7 @@
#ifndef __MAINFORM_h__
#define __MAINFORM_h__
-#include "gui-stdafx.h"
+#include "gui_stdafx.h"
#include <wx/frame.h>
Modified: scummex/branches/gsoc2007-gameresbrowser/src/gui/PanelProvider.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/gui/PanelProvider.cpp 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/gui/PanelProvider.cpp 2007-07-05 23:26:35 UTC (rev 27932)
@@ -1,7 +1,7 @@
/////////////////////////////////////////////////////////////////////////////
// PanelProvider.cpp
-#include "gui-stdafx.h"
+#include "gui_stdafx.h"
#include "PanelProvider.h"
#include "ExplorationTree.h"
@@ -46,7 +46,7 @@
BObject::doUnrealize(ochain);
}
-std::string PanelProvider::getPanelTitle() {
+coreString PanelProvider::getPanelTitle() {
return _ipanelreciever->getPanelTitle();
}
void PanelProvider::panelActivate(wxPanel* panel) {
Modified: scummex/branches/gsoc2007-gameresbrowser/src/gui/PanelProvider.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/gui/PanelProvider.h 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/gui/PanelProvider.h 2007-07-05 23:26:35 UTC (rev 27932)
@@ -16,14 +16,14 @@
class PanelReciever {
public:
- virtual std::string getPanelTitle() = 0;
+ virtual coreString getPanelTitle() = 0;
virtual void panelActivate(wxPanel* panel) = 0;
virtual void panelDeactivate() = 0;
};
class IPanelReciever : public IInterface, public PanelReciever {
public:
- GUID_FOR(IPanelReciever, "CoreInterfaces", 1);
+ GUID_FOR(IPanelReciever, wxT("CoreInterfaces"), 1);
};
/////////////////////////////////////////////////////////////////////////////
@@ -37,7 +37,7 @@
//inherit guid - it's a concrete implementation of an abstract interface
IPanelRecieverImpl(PanelReciever* that)
: _that(that) {}
- virtual std::string getPanelTitle() {
+ virtual coreString getPanelTitle() {
return _that->getPanelTitle();
}
virtual void panelActivate(wxPanel* panel) {
@@ -69,14 +69,14 @@
IPanelReciever* _ipanelreciever;
INodeProvider* _inodeprovider;
public:
- ASSIGN_DESC(0,"CoreObjects", 1)
+ ASSIGN_DESC(0,wxT("CoreObjects"), 1)
SLOTS_DECL
virtual bool doRealize(ObjectChain* ochain);
virtual void doUnrealize(ObjectChain* ochain);
- virtual std::string getPanelTitle();
+ virtual coreString getPanelTitle();
virtual void panelActivate(wxPanel* panel);
virtual void panelDeactivate();
};
Modified: scummex/branches/gsoc2007-gameresbrowser/src/gui/Test1.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/gui/Test1.cpp 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/gui/Test1.cpp 2007-07-05 23:26:35 UTC (rev 27932)
@@ -7,7 +7,7 @@
//
//---------------------------------------------------------------------------
-#include "gui-stdafx.h"
+#include "gui_stdafx.h"
#include "MainForm.h"
@@ -43,7 +43,7 @@
//#ifndef NO_BOBJECTS
-PLUGIN_DESC(Test1Plugin, "MyPlugins", 1)
+PLUGIN_DESC(Test1Plugin, wxT("MyPlugins"), 1)
//PLUGGED_OBJECT(RootDirectory)
PLUGGED_OBJECT(DirectoryPresenter)
PLUGGED_OBJECT(BMPParser)
@@ -66,28 +66,28 @@
OnTest1Cleanup(event);
- std::cout << "Registering Test1 Plugin." << std::endl;
+ infoout << wxT("Registering Test1 Plugin.") << std::endl;
ObjectRegistry::get()->registerPlugin( &getTest1Plugin, false );
- wxTreeItemId rootItem = ExplorationTree::get()->addRoot(_T("RootDirectory"));
+ wxTreeItemId rootItem = ExplorationTree::get()->addRoot(wxT("RootDirectory"));
RCPtr<RootDirectory> rootDir( new RootDirectory(rootItem) );
ExplorationTree::get()->setItemData(rootItem, new VirtualNodeItemData( rootDir.get() ) );
- wxFileName doll(_T("data"), _T("lalka.bmp"));
- wxFileName dog(_T("data"), _T("pies.bmp"));
- wxFileName foxes(_T("data"), _T("lisy.bmp"));
+ wxFileName doll(wxT("data"), wxT("lalka.bmp"));
+ wxFileName dog(wxT("data"), wxT("pies.bmp"));
+ wxFileName foxes(wxT("data"), wxT("lisy.bmp"));
if (doll.IsOk() && doll.FileExists() && doll.IsFileReadable())
- rootDir->addFile("Doll", toString(doll.GetFullPath()));
+ rootDir->addFile(wxT("Doll"), toString(doll.GetFullPath()));
if (dog.IsOk() && dog.FileExists() && dog.IsFileReadable())
- rootDir->addFile("Dog", toString(dog.GetFullPath()));
+ rootDir->addFile(wxT("Dog"), toString(dog.GetFullPath()));
if (foxes.IsOk() && foxes.FileExists() && foxes.IsFileReadable())
- rootDir->addFile("Foxes", toString(foxes.GetFullPath()));
+ rootDir->addFile(wxT("Foxes"), toString(foxes.GetFullPath()));
ObjectChain* rootChain = ExplorationTree::get()->getRootObjectChain();
@@ -102,7 +102,7 @@
bool res = rootChain->realize();
if (!res) {
- wxMessageBox(_T("ObjectChain realisation failed."), _T("Test0 Failed"),
+ wxMessageBox(wxT("ObjectChain realisation failed."), wxT("Test0 Failed"),
wxOK | wxICON_ERROR, this);
}
}
@@ -114,32 +114,32 @@
OnTest1Cleanup(event);
- std::cout << "Registering Test1 Plugin." << std::endl;
+ infoout << wxT("Registering Test1 Plugin.") << std::endl;
ObjectRegistry::get()->registerPlugin( &getTest1Plugin, false );
#ifndef NO_BOBJECTS
- wxTreeItemId rootItem = ExplorationTree::get()->addRoot(_T("RootDirectory"));
+ wxTreeItemId rootItem = ExplorationTree::get()->addRoot(wxT("RootDirectory"));
RCPtr<RootDirectory> rootDir( new RootDirectory(rootItem) );
ExplorationTree::get()->setItemData(rootItem, new VirtualNodeItemData( rootDir.get() ) );
- wxFileName doll(_T("data"), _T("lalka.bmp"));
- wxFileName dog(_T("data"), _T("pies.bmp"));
- wxFileName foxes(_T("data"), _T("lisy.bmp"));
+ wxFileName doll(wxT("data"), wxT("lalka.bmp"));
+ wxFileName dog(wxT("data"), wxT("pies.bmp"));
+ wxFileName foxes(wxT("data"), wxT("lisy.bmp"));
- rootDir->addSubDir("data", "data");
+ rootDir->addSubDir(wxT("data"), wxT("data"));
if (doll.IsOk() && doll.FileExists() && doll.IsFileReadable())
- rootDir->addFile("Doll", toString(doll.GetFullPath()));
+ rootDir->addFile(wxT("Doll"), toString(doll.GetFullPath()));
if (dog.IsOk() && dog.FileExists() && dog.IsFileReadable())
- rootDir->addFile("Dog", toString(dog.GetFullPath()));
+ rootDir->addFile(wxT("Dog"), toString(dog.GetFullPath()));
if (foxes.IsOk() && foxes.FileExists() && foxes.IsFileReadable())
- rootDir->addFile("Foxes", toString(foxes.GetFullPath()));
+ rootDir->addFile(wxT("Foxes"), toString(foxes.GetFullPath()));
ObjectChain* rootChain = ExplorationTree::get()->getRootObjectChain();
@@ -149,7 +149,7 @@
bool res = rootChain->realize();
if (!res) {
- wxMessageBox(_T("ObjectChain realisation failed."), _T("Test1 Failed"),
+ wxMessageBox(wxT("ObjectChain realisation failed."), wxT("Test1 Failed"),
wxOK | wxICON_ERROR, this);
}
@@ -161,7 +161,7 @@
/////////////////////////////////////////////////////////////////////////////
void MainForm::OnTest1Cleanup(wxCommandEvent& event) {
- std::cout << "Test1 Cleanup." << std::endl;
+ infoout << wxT("Test1 Cleanup.") << std::endl;
#ifndef NO_BOBJECTS
ExplorationTree::get()->deleteAllItems();
ObjectChain* rootChain = ExplorationTree::get()->getRootObjectChain();
@@ -179,16 +179,16 @@
ObjectChain* rootChain = ExplorationTree::get()->getRootObjectChain();
ASSERT(rootChain);
- std::fstream file;
- file.open("rootObjectChain.dot", std::ios_base::out | std::ios_base::trunc);
+ std::wfstream file;
+ file.open(wxT("rootObjectChain.dot"), std::ios_base::out | std::ios_base::trunc);
if (file.fail()) {
- wxMessageBox(_T("Could not create file: rootObjectChain.dot."), _T("DumpRootObjectChain Failed"),
+ wxMessageBox(wxT("Could not create file: rootObjectChain.dot."), wxT("DumpRootObjectChain Failed"),
wxOK | wxICON_ERROR, this);
return;
}
- rootChain->dumpObjectChainStart("RootObjectChain", file);
- wxMessageBox(_T("Dumped to rootObjectChain.dot."), _T("DumpRootObjectChain"),
+ rootChain->dumpObjectChainStart(wxT("RootObjectChain"), file);
+ wxMessageBox(wxT("Dumped to rootObjectChain.dot."), wxT("DumpRootObjectChain"),
wxOK | wxICON_INFORMATION, this);
//#endif
}
Modified: scummex/branches/gsoc2007-gameresbrowser/src/gui/VirtualNode.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/gui/VirtualNode.cpp 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/gui/VirtualNode.cpp 2007-07-05 23:26:35 UTC (rev 27932)
@@ -1,7 +1,7 @@
/////////////////////////////////////////////////////////////////////////////
// VirtualNode.cpp
-#include "gui-stdafx.h"
+#include "gui_stdafx.h"
#include "VirtualNode.h"
@@ -42,7 +42,7 @@
: _node(node) {}
virtual VirtualNode* getNode() {
- std::cout << "INodeProviderImpl::getNode()" << std::endl;
+ //infoout << wxT("INodeProviderImpl::getNode()") << std::endl;
ASSERT_VALID(_node);
return _node;
}
@@ -69,12 +69,12 @@
END_DESCS
INodeProviderImpl* VirtualNode::getNodeProviderImpl() {
- std::cout << "VirtualNode::getNodeProviderImpl()" << std::endl;
+ //infoout << wxT("VirtualNode::getNodeProviderImpl()") << std::endl;
return new INodeProviderImpl(this);
}
void VirtualNode::releaseNodeProviderImpl(INodeProviderImpl* iface) {
- std::cout << "VirtualNode::releaseNodeProviderImpl()" << std::endl;
+ //infoout << wxT("VirtualNode::releaseNodeProviderImpl()") << std::endl;
delete iface;
}
Deleted: scummex/branches/gsoc2007-gameresbrowser/src/gui/gui-stdafx.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/gui/gui-stdafx.cpp 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/gui/gui-stdafx.cpp 2007-07-05 23:26:35 UTC (rev 27932)
@@ -1,28 +0,0 @@
-/*
-* File: src/common/dummy.cpp
-* Purpose: See below
-* Author: Julian Smart
-* Created: 1993
-* Updated:
-* Copyright: (c) 1993, AIAI, University of Edinburgh
-*/
-
-/* A dummy file to include wx.h. If precompiling wx.h,
-* always start by compiling this and producing the PCH file.
-* Then subsequent source files use the PCH file.
-*
-* If precompiling wx.h for wxWidgets and derived apps,
-* link dummy.obj with your program.
-*
-* This will produce a big PCH file.
-*/
-
-#include "gui-stdafx.h"
-
-//#ifdef __WXMSW__
-//#include "wx/msw/msvcrt.h"
-//#endif
-
-//#ifdef __VISAGECPP__
-//char wxDummyChar = 0;
-//#endif
Deleted: scummex/branches/gsoc2007-gameresbrowser/src/gui/gui-stdafx.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/gui/gui-stdafx.h 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/gui/gui-stdafx.h 2007-07-05 23:26:35 UTC (rev 27932)
@@ -1,14 +0,0 @@
-// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently, but
-// are changed infrequently
-//
-
-#pragma once
-
-//#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-//#include <stdio.h>
-//#include <tchar.h>
-
-#include "plugins-stdafx.h"
-
-// TODO: reference additional headers your program requires here
Copied: scummex/branches/gsoc2007-gameresbrowser/src/gui/gui_stdafx.cpp (from rev 27925, scummex/branches/gsoc2007-gameresbrowser/src/gui/gui-stdafx.cpp)
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/gui/gui_stdafx.cpp (rev 0)
+++ scummex/branches/gsoc2007-gameresbrowser/src/gui/gui_stdafx.cpp 2007-07-05 23:26:35 UTC (rev 27932)
@@ -0,0 +1,28 @@
+/*
+* File: src/common/dummy.cpp
+* Purpose: See below
+* Author: Julian Smart
+* Created: 1993
+* Updated:
+* Copyright: (c) 1993, AIAI, University of Edinburgh
+*/
+
+/* A dummy file to include wx.h. If precompiling wx.h,
+* always start by compiling this and producing the PCH file.
+* Then subsequent source files use the PCH file.
+*
+* If precompiling wx.h for wxWidgets and derived apps,
+* link dummy.obj with your program.
+*
+* This will produce a big PCH file.
+*/
+
+#include "gui_stdafx.h"
+
+//#ifdef __WXMSW__
+//#include "wx/msw/msvcrt.h"
+//#endif
+
+//#ifdef __VISAGECPP__
+//wxChar wxDummyChar = 0;
+//#endif
Copied: scummex/branches/gsoc2007-gameresbrowser/src/gui/gui_stdafx.h (from rev 27925, scummex/branches/gsoc2007-gameresbrowser/src/gui/gui-stdafx.h)
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/gui/gui_stdafx.h (rev 0)
+++ scummex/branches/gsoc2007-gameresbrowser/src/gui/gui_stdafx.h 2007-07-05 23:26:35 UTC (rev 27932)
@@ -0,0 +1,15 @@
+// stdafx.h : include file for standard system include files,
+// or project specific include files that are used frequently, but
+// are changed infrequently
+//
+
+#pragma once
+
+#ifndef _GUI_STDAFX_H_
+#define _GUI_STDAFX_H_
+
+#include "plugins_stdafx.h"
+
+// TODO: reference additional headers your program requires here
+
+#endif //_GUI_STDAFX_H_
Modified: scummex/branches/gsoc2007-gameresbrowser/src/gui/guicon.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/gui/guicon.cpp 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/gui/guicon.cpp 2007-07-05 23:26:35 UTC (rev 27932)
@@ -1,6 +1,6 @@
//Listing 1: guicon.cpp -- A console redirection function
-#include "gui-stdafx.h"
+#include "gui_stdafx.h"
#ifndef _MSC_VER
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/BMPParser.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/BMPParser.cpp 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/BMPParser.cpp 2007-07-05 23:26:35 UTC (rev 27932)
@@ -1,7 +1,7 @@
/////////////////////////////////////////////////////////////////////////////
// BMPParser.cpp
-#include "plugins-stdafx.h"
+#include "plugins_stdafx.h"
#include "BMPParser.h"
@@ -26,7 +26,7 @@
IImageImpl* BMPParser::getImageImpl() {
- std::cout << "BMPParser::getImageImpl(): " << std::endl;
+ //infoout << wxT("BMPParser::getImageImpl(): ") << std::endl;
IFile* ifile = _fileSlot->getInterface();
if (!ifile)
@@ -57,7 +57,7 @@
}
void BMPParser::releaseImageImpl(IImageImpl* iface) {
- std::cout << "BMPParser::releaseImageImpl(): " << std::endl;
+ //infoout << wxT("BMPParser::releaseImageImpl(): ") << std::endl;
delete iface;
}
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/BMPParser.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/BMPParser.h 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/BMPParser.h 2007-07-05 23:26:35 UTC (rev 27932)
@@ -22,7 +22,7 @@
Pin<IImage>* _imagePin;
public:
- ASSIGN_DESC(0,"CoreObjects", 1)
+ ASSIGN_DESC(0,wxT("CoreObjects"), 1)
PINS_DECL
SLOTS_DECL
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/Directories.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/Directories.cpp 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/Directories.cpp 2007-07-05 23:26:35 UTC (rev 27932)
@@ -1,7 +1,7 @@
/////////////////////////////////////////////////////////////////////////////
// Directories.cpp
-#include "plugins-stdafx.h"
+#include "plugins_stdafx.h"
#include "Directories.h"
@@ -25,7 +25,7 @@
class IDirectoryImpl : public IDirectory {
protected:
- std::string _name;
+ coreString _name;
str_pair_list _files;
str_pair_list _subdirs;
@@ -36,17 +36,17 @@
bool _created;
public:
//inherit guid - it's a concrete implementation of an abstract interface
- IDirectoryImpl(std::string name);
- IDirectoryImpl(std::string name, const str_pair_list& files, const str_pair_list& subdirs);
+ IDirectoryImpl(coreString name);
+ IDirectoryImpl(coreString name, const str_pair_list& files, const str_pair_list& subdirs);
virtual ~IDirectoryImpl();
- virtual const std::string& getName();
+ virtual const coreString& getName();
virtual const std::list<IFile*>& getFiles();
virtual const std::list<IDirectory*>& getSubDirs();
- bool addFile(std::string name, std::string fullpath);
- bool addSubDir(std::string name, std::string fullpath);
+ bool addFile(coreString name, coreString fullpath);
+ bool addSubDir(coreString name, coreString fullpath);
virtual void create();
@@ -57,10 +57,10 @@
class IDiskDirectoryImpl : public IDirectoryImpl {
protected:
- std::string _directoryPath;
+ coreString _directoryPath;
public:
//inherit guid - it's a concrete implementation of an abstract interface
- IDiskDirectoryImpl(std::string name, std::string directoryPath);
+ IDiskDirectoryImpl(coreString name, coreString directoryPath);
virtual void create();
@@ -69,9 +69,9 @@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-IDirectoryImpl::IDirectoryImpl(std::string name)
+IDirectoryImpl::IDirectoryImpl(coreString name)
: _name(name), _created(false) {}
-IDirectoryImpl::IDirectoryImpl(std::string name, const str_pair_list& files, const str_pair_list& subdirs)
+IDirectoryImpl::IDirectoryImpl(coreString name, const str_pair_list& files, const str_pair_list& subdirs)
: _name(name), _files(files), _subdirs(subdirs), _created(false) {}
IDirectoryImpl::~IDirectoryImpl() {
@@ -85,28 +85,28 @@
}
}
-const std::string& IDirectoryImpl::getName() {
+const coreString& IDirectoryImpl::getName() {
return _name;
}
const std::list<IFile*>& IDirectoryImpl::getFiles() {
- std::cout << "IDirectoryImpl::getFiles()" << std::endl;
+ //infoout << wxT("IDirectoryImpl::getFiles()") << std::endl;
create();
return _ifiles;
}
const std::list<IDirectory*>& IDirectoryImpl::getSubDirs() {
- std::cout << "IDirectoryImpl::getSubDirs()" << std::endl;
+ //infoout << wxT("IDirectoryImpl::getSubDirs()") << std::endl;
create();
return _isubdirs;
}
-bool IDirectoryImpl::addFile(std::string name, std::string fullpath) {
+bool IDirectoryImpl::addFile(coreString name, coreString fullpath) {
_files.push_back( std::make_pair(name, fullpath) );
return true;
}
-bool IDirectoryImpl::addSubDir(std::string name, std::string fullpath) {
+bool IDirectoryImpl::addSubDir(coreString name, coreString fullpath) {
_subdirs.push_back( std::make_pair(name, fullpath) );
return true;
}
@@ -119,15 +119,15 @@
str_pair_list::const_iterator i;
for (i = _files.begin(); i != _files.end(); ++i) {
- const std::string& name = i->first;
- const std::string& fullpath = i->second;
+ const coreString& name = i->first;
+ const coreString& fullpath = i->second;
_ifiles.push_back( new IDiskFileImpl(name, fullpath) );
}
for (i = _subdirs.begin(); i != _subdirs.end(); ++i) {
- const std::string& name = i->first;
- const std::string& fullpath = i->second;
+ const coreString& name = i->first;
+ const coreString& fullpath = i->second;
_isubdirs.push_back( new IDiskDirectoryImpl(name, fullpath) );
}
@@ -136,16 +136,16 @@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-IDiskDirectoryImpl::IDiskDirectoryImpl(std::string name, std::string directoryPath)
+IDiskDirectoryImpl::IDiskDirectoryImpl(coreString name, coreString directoryPath)
: IDirectoryImpl(name), _directoryPath(directoryPath) {}
void IDiskDirectoryImpl::create() {
if (_created)
return;
- wxFileName dir = wxFileName::DirName( wxString(_directoryPath.c_str(), wxConvUTF8) );
+ wxFileName dir = wxFileName::DirName(_directoryPath);
if ( !(dir.IsOk() && dir.DirExists() && dir.IsDirReadable()) ) {
- std::cout << "IDiskDirectoryImpl::create(): unreadable dir: " << dir.GetPath() << std::endl;
+ errout << wxT("IDiskDirectoryImpl::create(): unreadable dir: ") << dir.GetPath() << std::endl;
return;
}
@@ -154,7 +154,7 @@
wxString found;
- found = fs.FindFirst(_T("*"), wxFILE);
+ found = fs.FindFirst(wxT("*"), wxFILE);
while (!found.IsEmpty()) {
//wxFileName fname(dir.GetPath(), found);
wxFileName fname(found);
@@ -163,7 +163,7 @@
found = fs.FindNext();
}
- found = fs.FindFirst(_T("*"), wxDIR);
+ found = fs.FindFirst(wxT("*"), wxDIR);
while (!found.IsEmpty()) {
//wxFileName fname(dir);
//fname.AppendDir(found);
@@ -186,23 +186,23 @@
IDirectoryImpl* RootDirectory::getDirectoryImpl() {
if (_idirectory == NULL) {
- _idirectory = new IDirectoryImpl("Root Directory", _files, _subdirs);
+ _idirectory = new IDirectoryImpl(wxT("Root Directory"), _files, _subdirs);
}
return _idirectory;
}
void RootDirectory::releaseDirectoryImpl(IDirectoryImpl* iface) {
- std::cout << "RootDirectory::releaseDirectoryImpl()" << std::endl;
+ //infoout << wxT("RootDirectory::releaseDirectoryImpl()") << std::endl;
delete iface;
}
-bool RootDirectory::addFile(std::string name, std::string fullpath) {
+bool RootDirectory::addFile(coreString name, coreString fullpath) {
_files.push_back( std::make_pair(name, fullpath) );
return true;
}
-bool RootDirectory::addSubDir(std::string name, std::string fullpath) {
+bool RootDirectory::addSubDir(coreString name, coreString fullpath) {
_subdirs.push_back( std::make_pair(name, fullpath) );
return true;
}
@@ -223,7 +223,7 @@
}
void DiskDirectory::releaseDirectoryImpl(IDirectoryImpl* iface) {
- std::cout << "DiskDirectory::releaseDirectoryImpl()" << std::endl;
+ //infoout << wxT("DiskDirectory::releaseDirectoryImpl()") << std::endl;
delete iface;
}
@@ -244,7 +244,7 @@
ExplorationTree::_getTree()->SetItemHasChildren(node, true);
wxTreeItemId dummyTreeItem = ExplorationTree::_getTree()->
- AppendItem(node->getTreeItem(), _T("Dummy"), -1, -1, NULL);
+ AppendItem(node->getTreeItem(), wxT("Dummy"), -1, -1, NULL);
_expanded = false;
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/Directories.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/Directories.h 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/Directories.h 2007-07-05 23:26:35 UTC (rev 27932)
@@ -19,7 +19,7 @@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-typedef std::list< std::pair< std::string, std::string > > str_pair_list;
+typedef std::list< std::pair< coreString, coreString > > str_pair_list;
class RootDirectory : public VirtualNode {
DECLARE_BOBJECT_CLASS(RootDirectory, VirtualNode)
@@ -33,15 +33,15 @@
IDirectoryImpl* _idirectory;
public:
- ASSIGN_DESC(0,"CoreObjects", 1)
+ ASSIGN_DESC(0,wxT("CoreObjects"), 1)
PINS_DECL
RootDirectory(wxTreeItemId mineTreeItem)
: VirtualNode(mineTreeItem), _idirectory(NULL) {}
- bool addFile(std::string name, std::string fullpath);
- bool addSubDir(std::string name, std::string fullpath);
+ bool addFile(coreString name, coreString fullpath);
+ bool addSubDir(coreString name, coreString fullpath);
IDirectoryImpl* getDirectoryImpl();
void releaseDirectoryImpl(IDirectoryImpl* iface);
@@ -57,16 +57,16 @@
protected:
Pin<IDirectory>* _directoryPin;
- std::string _directoryPath;
+ coreString _directoryPath;
IDiskDirectoryImpl* _idirectory;
public:
- ASSIGN_DESC(0,"CoreObjects", 1)
+ ASSIGN_DESC(0,wxT("CoreObjects"), 1)
PINS_DECL
- DiskDirectory(wxTreeItemId mineTreeItem, std::string directoryPath)
+ DiskDirectory(wxTreeItemId mineTreeItem, coreString directoryPath)
: VirtualNode(mineTreeItem), _directoryPath(directoryPath) {}
IDirectoryImpl* getDirectoryImpl();
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/DiskFileProvider.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/DiskFileProvider.cpp 2007-07-05 21:19:47 UTC (rev 27931)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/DiskFileProvider.cpp 2007-07-05 23:26:35 UTC (rev 27932)
@@ -1,7 +1,7 @@
/////////////////////////////////////////////////////////////////////////////
// DiskFileProvider.cpp
-#include "plugins-stdafx.h"
+#include "plugins_stdafx.h"
#include "DiskFileProvider.h"
#include "common/simplefile.h"
@@ -21,9 +21,9 @@
IFileImpl* DiskFileProvider::getFileImpl() {
- std::cout << "DiskFileProvider::getFileImpl(): " << _diskFileName << std::endl;
+ //infoout << wxT("DiskFileProvider::getFileImpl(): ") << _diskFileName << std::endl;
Common::SimpleFile* file = new Common::SimpleFile();
- bool res = file->open(_diskFileName.c_str());
+ bool res = file->open(_diskFileName);
if (!res) {
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list