diff options
| author | Max Horn | 2003-10-02 17:43:02 +0000 |
|---|---|---|
| committer | Max Horn | 2003-10-02 17:43:02 +0000 |
| commit | 0e645f88ae1586dbac2bf0855fd0fda1f8f11eeb (patch) | |
| tree | cef3882f5cb527ab9ced0c208d6f9c045bf8f3c4 /base | |
| parent | f26d3d1784756fccaaf306f6b13a28cb709ad5bc (diff) | |
| download | scummvm-rg350-0e645f88ae1586dbac2bf0855fd0fda1f8f11eeb.tar.gz scummvm-rg350-0e645f88ae1586dbac2bf0855fd0fda1f8f11eeb.tar.bz2 scummvm-rg350-0e645f88ae1586dbac2bf0855fd0fda1f8f11eeb.zip | |
renamed namespace ScummVM to Common
svn-id: r10544
Diffstat (limited to 'base')
| -rw-r--r-- | base/gameDetector.cpp | 2 | ||||
| -rw-r--r-- | base/gameDetector.h | 2 | ||||
| -rw-r--r-- | base/plugins.cpp | 4 | ||||
| -rw-r--r-- | base/plugins.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/base/gameDetector.cpp b/base/gameDetector.cpp index 728c1db9c5..4e44eb1a62 100644 --- a/base/gameDetector.cpp +++ b/base/gameDetector.cpp @@ -672,7 +672,7 @@ bool GameDetector::detectGame() { } } -const ScummVM::String& GameDetector::getGameName() { +const Common::String& GameDetector::getGameName() { if (_gameText.isEmpty()) { _gameText = "Unknown game: \""; _gameText += _gameFileName; diff --git a/base/gameDetector.h b/base/gameDetector.h index 2f88080060..798780adf9 100644 --- a/base/gameDetector.h +++ b/base/gameDetector.h @@ -103,7 +103,7 @@ struct Language { typedef Engine *(*EngineFactory)(GameDetector *detector, OSystem *syst); class GameDetector { - typedef ScummVM::String String; + typedef Common::String String; public: static const MusicDriver *getMusicDrivers(); diff --git a/base/plugins.cpp b/base/plugins.cpp index 096a1832b7..3ba63f3e0e 100644 --- a/base/plugins.cpp +++ b/base/plugins.cpp @@ -131,9 +131,9 @@ public: 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; diff --git a/base/plugins.h b/base/plugins.h index d79ff0c5d9..a463861c7b 100644 --- a/base/plugins.h +++ b/base/plugins.h @@ -75,7 +75,7 @@ public: /** List of plugins. */ -typedef ScummVM::List<Plugin *> PluginList; +typedef Common::List<Plugin *> PluginList; /** |