diff options
author | Jordi Vilalta Prat | 2008-01-27 19:47:41 +0000 |
---|---|---|
committer | Jordi Vilalta Prat | 2008-01-27 19:47:41 +0000 |
commit | 66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985 (patch) | |
tree | e27aadabecd8dd910884280e6559ff9c94c3d73c /backends/plugins | |
parent | 278857698dc7b1623096fe1ad12511dc4c886c7e (diff) | |
download | scummvm-rg350-66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985.tar.gz scummvm-rg350-66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985.tar.bz2 scummvm-rg350-66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985.zip |
Removed trailing spaces.
svn-id: r30664
Diffstat (limited to 'backends/plugins')
-rw-r--r-- | backends/plugins/dc/dc-provider.cpp | 16 | ||||
-rw-r--r-- | backends/plugins/dynamic-plugin.h | 14 | ||||
-rw-r--r-- | backends/plugins/posix/posix-provider.cpp | 14 | ||||
-rw-r--r-- | backends/plugins/sdl/sdl-provider.cpp | 14 | ||||
-rw-r--r-- | backends/plugins/win32/win32-provider.cpp | 12 |
5 files changed, 35 insertions, 35 deletions
diff --git a/backends/plugins/dc/dc-provider.cpp b/backends/plugins/dc/dc-provider.cpp index db0242f7d8..00471b790d 100644 --- a/backends/plugins/dc/dc-provider.cpp +++ b/backends/plugins/dc/dc-provider.cpp @@ -44,7 +44,7 @@ protected: void *func = dlsym(_dlHandle, symbol); if (!func) warning("Failed loading symbol '%s' from plugin '%s' (%s)", symbol, _filename.c_str(), dlerror()); - + // FIXME HACK: This is a HACK to circumvent a clash between the ISO C++ // standard and POSIX: ISO C++ disallows casting between function pointers // and data pointers, but dlsym always returns a void pointer. For details, @@ -62,14 +62,14 @@ public: bool loadPlugin() { assert(!_dlHandle); _dlHandle = dlopen(_filename.c_str(), RTLD_LAZY); - + if (!_dlHandle) { warning("Failed loading plugin '%s' (%s)", _filename.c_str(), dlerror()); return false; } - + bool ret = DynamicPlugin::loadPlugin(); - + if (ret) dlforgetsyms(_dlHandle); @@ -93,8 +93,8 @@ DCPluginProvider::~DCPluginProvider() { PluginList DCPluginProvider::getPlugins() { PluginList pl; - - + + // Load dynamic plugins // TODO... this is right now just a nasty hack. // This should search one or multiple directories for all plugins it can @@ -124,8 +124,8 @@ PluginList DCPluginProvider::getPlugins() { pl.push_back(new DCPlugin(i->getPath())); } } - - + + return pl; } diff --git a/backends/plugins/dynamic-plugin.h b/backends/plugins/dynamic-plugin.h index a7a8eb5b96..44b379a625 100644 --- a/backends/plugins/dynamic-plugin.h +++ b/backends/plugins/dynamic-plugin.h @@ -41,7 +41,7 @@ typedef GameList (*DetectFunc)(const FSList &fslist); class DynamicPlugin : public Plugin { protected: typedef void (*VoidFunc)(); - + Common::String _name; Common::String _copyright; GameIDQueryFunc _qf; @@ -82,7 +82,7 @@ public: return false; } _name = nameFunc(); - + // Query the plugin's copyright nameFunc = (NameFunc)findSymbol("PLUGIN_copyright"); if (!nameFunc) { @@ -90,7 +90,7 @@ public: return false; } _copyright = nameFunc(); - + // Query the plugin for the game ids it supports GameIDListFunc gameListFunc = (GameIDListFunc)findSymbol("PLUGIN_gameIDList"); if (!gameListFunc) { @@ -98,28 +98,28 @@ public: return false; } _games = gameListFunc(); - + // Retrieve the gameid query function _qf = (GameIDQueryFunc)findSymbol("PLUGIN_findGameID"); if (!_qf) { unloadPlugin(); return false; } - + // Retrieve the factory function _ef = (EngineFactory)findSymbol("PLUGIN_createEngine"); if (!_ef) { unloadPlugin(); return false; } - + // Retrieve the detector function _df = (DetectFunc)findSymbol("PLUGIN_detectGames"); if (!_df) { unloadPlugin(); return false; } - + return true; } }; diff --git a/backends/plugins/posix/posix-provider.cpp b/backends/plugins/posix/posix-provider.cpp index 03ee1c204f..6ee7f5c241 100644 --- a/backends/plugins/posix/posix-provider.cpp +++ b/backends/plugins/posix/posix-provider.cpp @@ -42,7 +42,7 @@ protected: void *func = dlsym(_dlHandle, symbol); if (!func) warning("Failed loading symbol '%s' from plugin '%s' (%s)", symbol, _filename.c_str(), dlerror()); - + // FIXME HACK: This is a HACK to circumvent a clash between the ISO C++ // standard and POSIX: ISO C++ disallows casting between function pointers // and data pointers, but dlsym always returns a void pointer. For details, @@ -60,12 +60,12 @@ public: bool loadPlugin() { assert(!_dlHandle); _dlHandle = dlopen(_filename.c_str(), RTLD_LAZY); - + if (!_dlHandle) { warning("Failed loading plugin '%s' (%s)", _filename.c_str(), dlerror()); return false; } - + return DynamicPlugin::loadPlugin(); } void unloadPlugin() { @@ -86,8 +86,8 @@ POSIXPluginProvider::~POSIXPluginProvider() { PluginList POSIXPluginProvider::getPlugins() { PluginList pl; - - + + // Load dynamic plugins // TODO... this is right now just a nasty hack. // This should search one or multiple directories for all plugins it can @@ -117,8 +117,8 @@ PluginList POSIXPluginProvider::getPlugins() { pl.push_back(new POSIXPlugin(i->getPath())); } } - - + + return pl; } diff --git a/backends/plugins/sdl/sdl-provider.cpp b/backends/plugins/sdl/sdl-provider.cpp index cb09af20ca..fd06f23e14 100644 --- a/backends/plugins/sdl/sdl-provider.cpp +++ b/backends/plugins/sdl/sdl-provider.cpp @@ -43,7 +43,7 @@ protected: void *func = SDL_LoadFunction(_dlHandle, symbol); if (!func) warning("Failed loading symbol '%s' from plugin '%s' (%s)", symbol, _filename.c_str(), SDL_GetError()); - + // FIXME HACK: This is a HACK to circumvent a clash between the ISO C++ // standard and POSIX: ISO C++ disallows casting between function pointers // and data pointers, but dlsym always returns a void pointer. For details, @@ -61,12 +61,12 @@ public: bool loadPlugin() { assert(!_dlHandle); _dlHandle = SDL_LoadObject(_filename.c_str()); - + if (!_dlHandle) { warning("Failed loading plugin '%s' (%s)", _filename.c_str(), SDL_GetError()); return false; } - + return DynamicPlugin::loadPlugin(); } void unloadPlugin() { @@ -86,8 +86,8 @@ SDLPluginProvider::~SDLPluginProvider() { PluginList SDLPluginProvider::getPlugins() { PluginList pl; - - + + // Load dynamic plugins // TODO... this is right now just a nasty hack. // This should search one or multiple directories for all plugins it can @@ -117,8 +117,8 @@ PluginList SDLPluginProvider::getPlugins() { pl.push_back(new SDLPlugin(i->getPath())); } } - - + + return pl; } diff --git a/backends/plugins/win32/win32-provider.cpp b/backends/plugins/win32/win32-provider.cpp index e20256cd82..170ce15e3e 100644 --- a/backends/plugins/win32/win32-provider.cpp +++ b/backends/plugins/win32/win32-provider.cpp @@ -61,7 +61,7 @@ protected: #endif if (!func) debug("Failed loading symbol '%s' from plugin '%s'", symbol, _filename.c_str()); - + // FIXME HACK: This is a HACK to circumvent a clash between the ISO C++ // standard and POSIX: ISO C++ disallows casting between function pointers // and data pointers, but dlsym always returns a void pointer. For details, @@ -84,7 +84,7 @@ public: if (!_filename.hasSuffix("scummvm.dll")) // skip loading the core scummvm module _dlHandle = LoadLibrary(toUnicode(_filename.c_str())); #endif - + if (!_dlHandle) { debug("Failed loading plugin '%s' (error code %d)", _filename.c_str(), (int32) GetLastError()); return false; @@ -114,8 +114,8 @@ Win32PluginProvider::~Win32PluginProvider() { PluginList Win32PluginProvider::getPlugins() { PluginList pl; - - + + // Load dynamic plugins // TODO... this is right now just a nasty hack. // This should search one or multiple directories for all plugins it can @@ -145,8 +145,8 @@ PluginList Win32PluginProvider::getPlugins() { pl.push_back(new Win32Plugin(i->getPath())); } } - - + + return pl; } |