[Scummvm-cvs-logs] SF.net SVN: scummvm: [32275] scummvm/trunk

[jvprat at users.sourceforge.net]

Revision: 32275
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32275&view=rev
Author:   jvprat
Date:     2008-05-25 17:28:48 -0700 (Sun, 25 May 2008)

Log Message:
-----------
Fixed some code formatting thanks to LordHoto

Modified Paths:
--------------
    scummvm/trunk/base/commandLine.cpp
    scummvm/trunk/base/plugins.cpp
    scummvm/trunk/base/plugins.h
    scummvm/trunk/engines/metaengine.h
    scummvm/trunk/gui/about.cpp
    scummvm/trunk/sound/midiplugin.h

Modified: scummvm/trunk/base/commandLine.cpp
===================================================================
--- scummvm/trunk/base/commandLine.cpp	2008-05-25 23:12:32 UTC (rev 32274)
+++ scummvm/trunk/base/commandLine.cpp	2008-05-26 00:28:48 UTC (rev 32275)
@@ -564,8 +564,8 @@
 	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) {

Modified: scummvm/trunk/base/plugins.cpp
===================================================================
--- scummvm/trunk/base/plugins.cpp	2008-05-25 23:12:32 UTC (rev 32274)
+++ scummvm/trunk/base/plugins.cpp	2008-05-26 00:28:48 UTC (rev 32275)
@@ -284,7 +284,7 @@
 	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 @@
 		if (*p == plugin) {
 			found = *p;
 		} else {
-			(**p).unloadPlugin();
+			(*p)->unloadPlugin();
 			delete *p;
 		}
 	}
@@ -355,13 +355,13 @@
 
 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 @@
 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 @@
 	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 @@
 
 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);
 }

Modified: scummvm/trunk/base/plugins.h
===================================================================
--- scummvm/trunk/base/plugins.h	2008-05-25 23:12:32 UTC (rev 32274)
+++ scummvm/trunk/base/plugins.h	2008-05-26 00:28:48 UTC (rev 32275)
@@ -193,7 +193,7 @@
 		return (PO_t *)_pluginObject;
 	}
 
-	typedef Common::Array<PluginSubclass *> list;
+	typedef Common::Array<PluginSubclass *> List;
 };
 
 /**
@@ -246,7 +246,7 @@
 	 * @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

Modified: scummvm/trunk/engines/metaengine.h
===================================================================
--- scummvm/trunk/engines/metaengine.h	2008-05-25 23:12:32 UTC (rev 32274)
+++ scummvm/trunk/engines/metaengine.h	2008-05-26 00:28:48 UTC (rev 32275)
@@ -108,7 +108,7 @@
 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. */

Modified: scummvm/trunk/gui/about.cpp
===================================================================
--- scummvm/trunk/gui/about.cpp	2008-05-25 23:12:32 UTC (rev 32274)
+++ scummvm/trunk/gui/about.cpp	2008-05-26 00:28:48 UTC (rev 32275)
@@ -128,8 +128,8 @@
 	_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";

Modified: scummvm/trunk/sound/midiplugin.h
===================================================================
--- scummvm/trunk/sound/midiplugin.h	2008-05-25 23:12:32 UTC (rev 32274)
+++ scummvm/trunk/sound/midiplugin.h	2008-05-26 00:28:48 UTC (rev 32275)
@@ -84,7 +84,7 @@
 	friend class Common::Singleton<SingletonBaseType>;
 
 public:
-	const MidiPlugin::list &getPlugins() const;
+	const MidiPlugin::List &getPlugins() const;
 };
 
 /** Convenience shortcut for accessing the MIDI manager. */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.