[Scummvm-cvs-logs] CVS: scummvm/base engine.cpp,1.45,1.46 engine.h,1.24,1.25 gameDetector.cpp,1.120,1.121 gameDetector.h,1.34,1.35 main.cpp,1.87,1.88 plugins.cpp,1.44,1.45 plugins.h,1.28,1.29

[Eugene Sandulenko]

Update of /cvsroot/scummvm/scummvm/base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9428/base

Modified Files:
	engine.cpp engine.h gameDetector.cpp gameDetector.h main.cpp 
	plugins.cpp plugins.h 
Log Message:
Remove trailing whitespaces.


Index: engine.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/engine.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- engine.cpp	5 Jul 2005 20:51:54 -0000	1.45
+++ engine.cpp	30 Jul 2005 21:10:57 -0000	1.46
@@ -75,18 +75,18 @@
 			_system->setGraphicsMode(ConfMan.get("gfx_mode").c_str());
 		}
 	}
-	
+
 	// (De)activate aspect-ratio correction as determined by the config settings
 	if (ConfMan.hasKey("aspect_ratio", detector._targetName))
 		_system->setFeatureState(OSystem::kFeatureAspectRatioCorrection, ConfMan.getBool("aspect_ratio"));
-		
-	// (De)activate fullscreen mode as determined by the config settings 
+
+	// (De)activate fullscreen mode as determined by the config settings
 	if (ConfMan.hasKey("fullscreen", detector._targetName))
 		_system->setFeatureState(OSystem::kFeatureFullscreenMode, ConfMan.getBool("fullscreen"));
 }
 
 void Engine::checkCD() {
-#if defined (WIN32) && !defined(_WIN32_WCE) 
+#if defined (WIN32) && !defined(_WIN32_WCE)
 	// It is a known bug under Windows that games that play CD audio cause
 	// ScummVM to crash if the data files are read from the same CD. Check
 	// if this appears to be the case and issue a warning.

Index: engine.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/engine.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- engine.h	24 Jun 2005 15:22:35 -0000	1.24
+++ engine.h	30 Jul 2005 21:10:57 -0000	1.25
@@ -47,7 +47,7 @@
 public:
 	Engine(OSystem *syst);
 	virtual ~Engine();
-	
+
 	/**
 	 * Init the engine.
 	 * @return 0 for success, else an error code.
@@ -57,7 +57,7 @@
 	/**
 	 * Start the main engine loop.
 	 * The return value is not yet used, but could indicate whether the user
-	 * wants to return to the launch or to fully quit ScummVM. 
+	 * wants to return to the launch or to fully quit ScummVM.
 	 * @return a result code
 	 */
 	virtual int go() = 0;

Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/gameDetector.cpp,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- gameDetector.cpp	24 Jun 2005 15:22:35 -0000	1.120
+++ gameDetector.cpp	30 Jul 2005 21:10:57 -0000	1.121
@@ -51,7 +51,7 @@
 #if defined(__PALM_OS__) || defined(__SYMBIAN32__)
 static const char USAGE_STRING[] = "NoUsageString"; // save more data segment space
 #else
-static const char USAGE_STRING[] = 
+static const char USAGE_STRING[] =
 	"ScummVM - Graphical Adventure Game Interpreter\n"
 	"Usage: scummvm [OPTIONS]... [GAME]\n"
 	"  -v, --version            Display ScummVM version information and exit\n"
@@ -170,12 +170,12 @@
 	ConfMan.registerDefault("alsa_port", "65:0");
 #endif
 
-#ifdef DEFAULT_SAVE_PATH 
+#ifdef DEFAULT_SAVE_PATH
 	char savePath[MAXPATHLEN];
 #ifdef UNIX
 	struct stat sb;
 	if (getenv("HOME") != NULL) {
-		snprintf(savePath, MAXPATHLEN, "%s/%s", getenv("HOME"), DEFAULT_SAVE_PATH);	
+		snprintf(savePath, MAXPATHLEN, "%s/%s", getenv("HOME"), DEFAULT_SAVE_PATH);
 		if (stat(savePath, &sb) == -1) {
 			/* create the dir if it does not exist */
 			if (errno == ENOENT) {
@@ -323,7 +323,7 @@
 	char *current_option = NULL;
 	char shortCmdLower;
 	bool isLongCmd, boolValue;
-	
+
 	// We store all command line settings in a string map, instead of
 	// immediately putting it into the config manager. We do that to
 	// make a potential future change to the config manager easier: In
@@ -336,7 +336,7 @@
 	Common::StringMap settings;
 
 
-	// The user can override the savepath with the SCUMMVM_SAVEPATH 
+	// The user can override the savepath with the SCUMMVM_SAVEPATH
 	// environment variable. This is weaker than a --savepath on the
 	// command line, but overrides the default savepath, hence it is
 	// handled here, just before the command line gets parsed.
@@ -379,12 +379,12 @@
 			DO_OPTION_INT('b', "boot-param")
 				settings["boot_param"] = option;
 			END_OPTION
-			
+
 			DO_OPTION_OPT('d', "debuglevel")
 				gDebugLevel = option ? (int)strtol(option, 0, 10) : 0;
 				printf("Debuglevel (from command line): %d\n", gDebugLevel);
 			END_OPTION
-			
+
 			DO_OPTION('e', "music-driver")
 				// TODO: Instead of just showing the generic help text,
 				// maybe print a message like:
@@ -536,7 +536,7 @@
 
 #ifndef DISABLE_SCUMM
 			DO_LONG_OPTION("tempo")
-				// Use the special value '0' for the base in (int)strtol. 
+				// Use the special value '0' for the base in (int)strtol.
 				// Doing that makes it possible to enter hex values
 				// as "0x1234", but also decimal values ("123").
 				int value = (int)strtol(option, 0, 0);

Index: gameDetector.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/gameDetector.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- gameDetector.h	10 May 2005 23:48:36 -0000	1.34
+++ gameDetector.h	30 Jul 2005 21:10:57 -0000	1.35
@@ -58,7 +58,7 @@
 	String _targetName;
 	GameSettings _game;	// TODO: Eventually get rid of this?!
 	const Plugin *_plugin;
-	
+
 	bool _dumpScripts;
 
 	bool _force1xOverlay;

Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/main.cpp,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- main.cpp	5 Jul 2005 20:22:37 -0000	1.87
+++ main.cpp	30 Jul 2005 21:10:57 -0000	1.88
@@ -27,7 +27,7 @@
  * Currently not much is actually properly documented, but at least you can get an overview
  * of almost all the classes, methods and variables, and how they interact.
  */
- 
+
 #include "common/stdafx.h"
 #include "base/engine.h"
 #include "base/gameDetector.h"
@@ -43,7 +43,7 @@
 #include "sound/mididrv.h"
 
 #ifdef _WIN32_WCE
-#include "backends/wince/CELauncherDialog.h" 
+#include "backends/wince/CELauncherDialog.h"
 #endif
 
 #ifdef __DC__
@@ -146,7 +146,7 @@
 extern "C" int main(int argc, char *argv[]);
 #endif
 
-#if defined(MACOSX) || defined(QTOPIA) || defined(__SYMBIAN32__) 
+#if defined(MACOSX) || defined(QTOPIA) || defined(__SYMBIAN32__)
 #include <SDL.h>
 #elif !defined(__MORPHOS__) && !defined(__DC__) && !defined(__GP32__)
 #undef main
@@ -218,22 +218,22 @@
 	// 1) allow for 16 bit mouse cursors in overlay mode
 	// 2) no need to backup & restore the mouse cursor before/after the overlay is shown
 	const byte dummy_palette[] = {
-		0, 0, 0, 0, 
-		0, 0, 171, 0, 
-		0, 171, 0, 0, 
-		0, 171, 171, 0, 
-		171, 0, 0, 0, 
-		171, 0, 171, 0, 
-		171, 87, 0, 0, 
-		171, 171, 171, 0, 
-		87, 87, 87, 0, 
-		87, 87, 255, 0, 
-		87, 255, 87, 0, 
-		87, 255, 255, 0, 
-		255, 87, 87, 0, 
-		255, 87, 255, 0, 
-		255, 255, 87, 0, 
-		255, 255, 255, 0, 
+		0, 0, 0, 0,
+		0, 0, 171, 0,
+		0, 171, 0, 0,
+		0, 171, 171, 0,
+		171, 0, 0, 0,
+		171, 0, 171, 0,
+		171, 87, 0, 0,
+		171, 171, 171, 0,
+		87, 87, 87, 0,
+		87, 87, 255, 0,
+		87, 255, 87, 0,
+		87, 255, 255, 0,
+		255, 87, 87, 0,
+		255, 87, 255, 0,
+		255, 255, 87, 0,
+		255, 255, 255, 0,
 	};
 
 	system.setPalette(dummy_palette, 0, 16);
@@ -244,12 +244,12 @@
 	system.beginGFXTransaction();
 		// Set the user specified graphics mode (if any).
 		system.setGraphicsMode(ConfMan.get("gfx_mode").c_str());
-	
+
 		// Make GUI 640 x 400
 		system.initSize(320, 200, (detector._force1xOverlay ? 1 : 2));
 	system.endGFXTransaction();
 
-	
+
 	// Clear the main screen
 	system.clearScreen();
 
@@ -283,12 +283,12 @@
 
 	if (caption.isEmpty() && detector._game.description)
 		caption = detector._game.description;
-	if (caption.isEmpty())	
+	if (caption.isEmpty())
 		caption = detector._targetName;
 	if (!caption.isEmpty())	{
 		system.setWindowCaption(caption.c_str());
 	}
-	
+
 	// Add extrapath (if any) to the directory search list
 	if (ConfMan.hasKey("extrapath"))
 		Common::File::addDefaultDirectory(ConfMan.get("extrapath"));
@@ -311,7 +311,7 @@
 
 	// Stop all sound processing now (this prevents some race conditions later on)
 	system.clearSoundCallback();
-	
+
 	return result;
 }
 
@@ -412,7 +412,7 @@
 	GUI::Actions::init(detector);
 #endif
 
-	// Ensure the system object exists (it may have already been created 
+	// Ensure the system object exists (it may have already been created
 	// at an earlier point, though!)
 	OSystem &system = OSystem::instance();
 
@@ -470,7 +470,7 @@
 	// ...and quit (the return 0 should never be reached)
 	delete Common::g_timer;
 	system.quit();
-	
+
 	error("If you are seeing this, your OSystem backend is not working properly");
 
 	return 0;
@@ -513,7 +513,7 @@
 	vsnprintf(buf, STRINGBUFLEN, s, va);
 #endif
 	va_end(va);
-	
+
 	debugHelper(buf);
 }
 

Index: plugins.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/plugins.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- plugins.cpp	24 Jun 2005 15:22:36 -0000	1.44
+++ plugins.cpp	30 Jul 2005 21:10:57 -0000	1.45
@@ -256,7 +256,7 @@
 void PluginManager::loadPlugins() {
 #ifdef DYNAMIC_MODULES
 	// Load dynamic plugins
-	// TODO... this is right now just a nasty hack. 
+	// TODO... this is right now just a nasty hack.
 	// This should search one or multiple directories for all plugins it can
 	// find (to this end, we maybe should use a special prefix/suffix; e.g.
 	// instead of libscumm.so, use scumm.engine or scumm.plugin etc.).
@@ -274,7 +274,7 @@
 	// Scan for all plugins in this directory
 	FilesystemNode dir(PLUGIN_DIRECTORY);
 	FSList files(dir.listDir(FilesystemNode::kListFilesOnly));
-	
+
 	for (FSList::const_iterator i = files.begin(); i != files.end(); ++i) {
 		Common::String name(i->displayName());
 		if (name.hasPrefix(PLUGIN_PREFIX) && name.hasSuffix(PLUGIN_SUFFIX)) {
@@ -291,7 +291,7 @@
 	// "Loader" for the static plugins.
 	// Iterate over all registered (static) plugins and load them.
 	PluginRegistrator *plugin;
-	
+
 	#ifndef DISABLE_SCUMM
 	LINK_PLUGIN(SCUMM)
 	#endif
@@ -367,6 +367,6 @@
 	for (iter = _plugins.begin(); iter != _plugins.end(); ++iter) {
 		candidates.push_back((*iter)->detectGames(fslist));
 	}
-	
+
 	return candidates;
 }

Index: plugins.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/plugins.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- plugins.h	5 Jun 2005 12:55:33 -0000	1.28
+++ plugins.h	30 Jul 2005 21:10:57 -0000	1.29
@@ -68,7 +68,7 @@
 
 	virtual const char *getName() const = 0;
 	virtual int getVersion() const	{ return 0; }	// TODO!
-	
+
 	virtual GameList getSupportedGames() const = 0;
 	virtual GameSettings findGame(const char *gameName) const;
 	virtual DetectedGameList detectGames(const FSList &fslist) const = 0;
@@ -137,9 +137,9 @@
 class PluginManager : public Common::Singleton<PluginManager> {
 private:
 	PluginList _plugins;
-	
+
 	bool tryLoadPlugin(Plugin *plugin);
-	
+
 	friend class Common::Singleton<SingletonBaseType>;
 	PluginManager();
 
@@ -149,7 +149,7 @@
 	void loadPlugins();
 	void unloadPlugins();
 	void unloadPluginsExcept(const Plugin *plugin);
-	
+
 	const PluginList &getPlugins()	{ return _plugins; }
 
 	DetectedGameList detectGames(const FSList &fslist) const;