diff options
| -rw-r--r-- | base/commandLine.cpp | 4 | ||||
| -rw-r--r-- | base/plugins.cpp | 20 | ||||
| -rw-r--r-- | base/plugins.h | 4 | ||||
| -rw-r--r-- | engines/metaengine.h | 2 | ||||
| -rw-r--r-- | gui/about.cpp | 4 | ||||
| -rw-r--r-- | sound/midiplugin.h | 2 |
6 files changed, 18 insertions, 18 deletions
diff --git a/base/commandLine.cpp b/base/commandLine.cpp index 96ed6c89f1..b9fd4ecfb7 100644 --- a/base/commandLine.cpp +++ b/base/commandLine.cpp @@ -564,8 +564,8 @@ static void listGames() { printf("Game ID Full Title \n" "-------------------- ------------------------------------------------------\n"); - const EnginePlugin::list &plugins = EngineMan.getPlugins(); - EnginePlugin::list::const_iterator iter = plugins.begin(); + const EnginePlugin::List &plugins = EngineMan.getPlugins(); + EnginePlugin::List::const_iterator iter = plugins.begin(); for (iter = plugins.begin(); iter != plugins.end(); ++iter) { GameList list = (**iter)->getSupportedGames(); for (GameList::iterator v = list.begin(); v != list.end(); ++v) { diff --git a/base/plugins.cpp b/base/plugins.cpp index ac8e498469..435e5bf1f1 100644 --- a/base/plugins.cpp +++ b/base/plugins.cpp @@ -284,7 +284,7 @@ void PluginManager::loadPlugins() { for (ProviderList::iterator pp = _providers.begin(); pp != _providers.end(); ++pp) { - PluginList pl((**pp).getPlugins()); + PluginList pl((*pp)->getPlugins()); for (PluginList::iterator plugin = pl.begin(); plugin != pl.end(); ++plugin) { tryLoadPlugin(*plugin); } @@ -303,7 +303,7 @@ void PluginManager::unloadPluginsExcept(PluginType type, const Plugin *plugin) { if (*p == plugin) { found = *p; } else { - (**p).unloadPlugin(); + (*p)->unloadPlugin(); delete *p; } } @@ -355,13 +355,13 @@ DECLARE_SINGLETON(EngineManager); GameDescriptor EngineManager::findGame(const Common::String &gameName, const EnginePlugin **plugin) const { // Find the GameDescriptor for this target - const EnginePlugin::list &plugins = getPlugins(); + const EnginePlugin::List &plugins = getPlugins(); GameDescriptor result; if (plugin) *plugin = 0; - EnginePlugin::list::const_iterator iter = plugins.begin(); + EnginePlugin::List::const_iterator iter = plugins.begin(); for (iter = plugins.begin(); iter != plugins.end(); ++iter) { result = (**iter)->findGame(gameName.c_str()); if (!result.gameid().empty()) { @@ -376,11 +376,11 @@ GameDescriptor EngineManager::findGame(const Common::String &gameName, const Eng GameList EngineManager::detectGames(const FSList &fslist) const { GameList candidates; - const EnginePlugin::list &plugins = getPlugins(); + const EnginePlugin::List &plugins = getPlugins(); // Iterate over all known games and for each check if it might be // the game in the presented directory. - EnginePlugin::list::const_iterator iter; + EnginePlugin::List::const_iterator iter; for (iter = plugins.begin(); iter != plugins.end(); ++iter) { candidates.push_back((**iter)->detectGames(fslist)); } @@ -388,8 +388,8 @@ GameList EngineManager::detectGames(const FSList &fslist) const { return candidates; } -const EnginePlugin::list &EngineManager::getPlugins() const { - return (const EnginePlugin::list&)PluginManager::instance().getPlugins(PLUGIN_TYPE_ENGINE); +const EnginePlugin::List &EngineManager::getPlugins() const { + return (const EnginePlugin::List &)PluginManager::instance().getPlugins(PLUGIN_TYPE_ENGINE); } @@ -399,6 +399,6 @@ const EnginePlugin::list &EngineManager::getPlugins() const { DECLARE_SINGLETON(MidiManager); -const MidiPlugin::list &MidiManager::getPlugins() const { - return (const MidiPlugin::list&)PluginManager::instance().getPlugins(PLUGIN_TYPE_MIDI); +const MidiPlugin::List &MidiManager::getPlugins() const { + return (const MidiPlugin::List &)PluginManager::instance().getPlugins(PLUGIN_TYPE_MIDI); } diff --git a/base/plugins.h b/base/plugins.h index 20469e67bd..7507e0c358 100644 --- a/base/plugins.h +++ b/base/plugins.h @@ -193,7 +193,7 @@ public: return (PO_t *)_pluginObject; } - typedef Common::Array<PluginSubclass *> list; + typedef Common::Array<PluginSubclass *> List; }; /** @@ -246,7 +246,7 @@ protected: * @param filename the name of the loadable code module * @return a pointer to a Plugin instance, or 0 if an error occurred. */ - virtual Plugin* createPlugin(const Common::String &filename) const = 0; + virtual Plugin *createPlugin(const Common::String &filename) const = 0; /** * Check if the supplied filename corresponds to a loadable plugin file in diff --git a/engines/metaengine.h b/engines/metaengine.h index c5fb006faa..aef860e0f9 100644 --- a/engines/metaengine.h +++ b/engines/metaengine.h @@ -108,7 +108,7 @@ private: public: GameDescriptor findGame(const Common::String &gameName, const EnginePlugin **plugin = NULL) const; GameList detectGames(const FSList &fslist) const; - const EnginePlugin::list &getPlugins() const; + const EnginePlugin::List &getPlugins() const; }; /** Convenience shortcut for accessing the engine manager. */ diff --git a/gui/about.cpp b/gui/about.cpp index 2afaae9a97..758f3ee6a7 100644 --- a/gui/about.cpp +++ b/gui/about.cpp @@ -128,8 +128,8 @@ AboutDialog::AboutDialog() _lines.push_back(""); addLine("\\C\\c1""Available engines:"); - const EnginePlugin::list &plugins = EngineMan.getPlugins(); - EnginePlugin::list::const_iterator iter = plugins.begin(); + const EnginePlugin::List &plugins = EngineMan.getPlugins(); + EnginePlugin::List::const_iterator iter = plugins.begin(); for (; iter != plugins.end(); ++iter) { Common::String str; str = "\\C"; diff --git a/sound/midiplugin.h b/sound/midiplugin.h index c3b407a142..0247e160e1 100644 --- a/sound/midiplugin.h +++ b/sound/midiplugin.h @@ -84,7 +84,7 @@ private: friend class Common::Singleton<SingletonBaseType>; public: - const MidiPlugin::list &getPlugins() const; + const MidiPlugin::List &getPlugins() const; }; /** Convenience shortcut for accessing the MIDI manager. */ |