[Scummvm-cvs-logs] CVS: scummvm/base gameDetector.cpp,1.8,1.9 gameDetector.h,1.4,1.5 plugins.cpp,1.8,1.9 plugins.h,1.2,1.3

Max Horn fingolfin at users.sourceforge.net
Thu Oct 2 10:44:10 CEST 2003


Update of /cvsroot/scummvm/scummvm/base
In directory sc8-pr-cvs1:/tmp/cvs-serv18298/base

Modified Files:
	gameDetector.cpp gameDetector.h plugins.cpp plugins.h 
Log Message:
renamed namespace ScummVM to Common

Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/gameDetector.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gameDetector.cpp	1 Oct 2003 11:42:32 -0000	1.8
+++ gameDetector.cpp	2 Oct 2003 17:42:59 -0000	1.9
@@ -672,7 +672,7 @@
 	}
 }
 
-const ScummVM::String& GameDetector::getGameName() {
+const Common::String& GameDetector::getGameName() {
 	if (_gameText.isEmpty()) {
 		_gameText = "Unknown game: \"";
 		_gameText += _gameFileName;

Index: gameDetector.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/gameDetector.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gameDetector.h	1 Oct 2003 10:47:19 -0000	1.4
+++ gameDetector.h	2 Oct 2003 17:43:00 -0000	1.5
@@ -103,7 +103,7 @@
 typedef Engine *(*EngineFactory)(GameDetector *detector, OSystem *syst);
 
 class GameDetector {
-	typedef ScummVM::String String;
+	typedef Common::String String;
 
 public:
 	static const MusicDriver *getMusicDrivers();

Index: plugins.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/plugins.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- plugins.cpp	28 Sep 2003 15:50:47 -0000	1.8
+++ plugins.cpp	2 Oct 2003 17:43:00 -0000	1.9
@@ -131,9 +131,9 @@
 
 class DynamicPlugin : public Plugin {
 	void *_dlHandle;
-	ScummVM::String _filename;
+	Common::String _filename;
 
-	ScummVM::String _name;
+	Common::String _name;
 	const TargetSettings *_targets;
 	int _targetCount;
 	EngineFactory _ef;

Index: plugins.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/plugins.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- plugins.h	18 Sep 2003 18:23:52 -0000	1.2
+++ plugins.h	2 Oct 2003 17:43:00 -0000	1.3
@@ -75,7 +75,7 @@
 
 
 /** List of plugins. */
-typedef ScummVM::List<Plugin *> PluginList;
+typedef Common::List<Plugin *> PluginList;
 
 
 /**





More information about the Scummvm-git-logs mailing list