diff options
author | erihel <erihel@gmail.com> | 2012-08-09 21:21:14 +0200 |
---|---|---|
committer | erihel <erihel@gmail.com> | 2012-08-09 21:21:14 +0200 |
commit | f1d1cdceee3ec49546ba800a1b53a2dfb9c21e11 (patch) | |
tree | edaf51343085410a66f773b4d189b6eaffa091dd | |
parent | 611680a72e0f04e080c3b7ed59bd23d5b8b709f1 (diff) | |
download | colobot-f1d1cdceee3ec49546ba800a1b53a2dfb9c21e11.tar.gz colobot-f1d1cdceee3ec49546ba800a1b53a2dfb9c21e11.tar.bz2 colobot-f1d1cdceee3ec49546ba800a1b53a2dfb9c21e11.zip |
Changes after merge
-rw-r--r-- | src/plugins/pluginloader.cpp (renamed from src/plugins/plugin.cpp) | 16 | ||||
-rw-r--r-- | src/plugins/pluginloader.h (renamed from src/plugins/plugin.h) | 6 | ||||
-rw-r--r-- | src/plugins/test/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plugins/test/plugin_test.cpp | 4 | ||||
-rw-r--r-- | src/sound/sound.h | 4 |
5 files changed, 16 insertions, 16 deletions
diff --git a/src/plugins/plugin.cpp b/src/plugins/pluginloader.cpp index ca0fe0e..adceb6b 100644 --- a/src/plugins/plugin.cpp +++ b/src/plugins/pluginloader.cpp @@ -14,13 +14,13 @@ // * You should have received a copy of the GNU General Public License // * along with this program. If not, see http://www.gnu.org/licenses/. -// plugin.cpp +// pluginloader.cpp -#include "plugin.h" +#include "pluginloader.h" -CPlugin::CPlugin(std::string filename) +CPluginLoader::CPluginLoader(std::string filename) { mInterface = nullptr; mFilename = filename; @@ -28,7 +28,7 @@ CPlugin::CPlugin(std::string filename) } -char* CPlugin::GetName() +char* CPluginLoader::GetName() { if (mLoaded) return mInterface->PluginName(); @@ -36,7 +36,7 @@ char* CPlugin::GetName() } -int CPlugin::GetVersion() +int CPluginLoader::GetVersion() { if (mLoaded) return mInterface->PluginVersion(); @@ -44,13 +44,13 @@ int CPlugin::GetVersion() } -bool CPlugin::IsLoaded() +bool CPluginLoader::IsLoaded() { return mLoaded; } -bool CPlugin::UnloadPlugin() +bool CPluginLoader::UnloadPlugin() { if (!mLoaded) { GetLogger()->Warn("Plugin %s is not loaded.\n"); @@ -69,7 +69,7 @@ bool CPlugin::UnloadPlugin() } -bool CPlugin::LoadPlugin() +bool CPluginLoader::LoadPlugin() { mHandle = lt_dlopenext(mFilename.c_str()); if (!mHandle) { diff --git a/src/plugins/plugin.h b/src/plugins/pluginloader.h index e7d4b12..d9ee041 100644 --- a/src/plugins/plugin.h +++ b/src/plugins/pluginloader.h @@ -14,7 +14,7 @@ // * You should have received a copy of the GNU General Public License // * along with this program. If not, see http://www.gnu.org/licenses/. -// plugin.h +// pluginloader.h #pragma once @@ -27,9 +27,9 @@ #include "plugininterface.h" -class CPlugin { +class CPluginLoader { public: - CPlugin(std::string filename); + CPluginLoader(std::string filename); char* GetName(); int GetVersion(); diff --git a/src/plugins/test/CMakeLists.txt b/src/plugins/test/CMakeLists.txt index 551daeb..5953468 100644 --- a/src/plugins/test/CMakeLists.txt +++ b/src/plugins/test/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8) set(CMAKE_BUILD_TYPE debug) set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -O0 -std=c++11 -rdynamic") -add_executable(plugin_test plugin_test.cpp ../../common/iman.cpp ../../common/logger.cpp ../plugin.cpp) +add_executable(plugin_test plugin_test.cpp ../../common/iman.cpp ../../common/logger.cpp ../pluginloader.cpp) # Change to DirectX SDK directory include_directories("../../") diff --git a/src/plugins/test/plugin_test.cpp b/src/plugins/test/plugin_test.cpp index 7175773..9aadfac 100644 --- a/src/plugins/test/plugin_test.cpp +++ b/src/plugins/test/plugin_test.cpp @@ -5,7 +5,7 @@ #include <common/logger.h> #include <common/iman.h> #include <sound/sound.h> -#include <plugins/plugin.h> +#include <plugins/pluginloader.h> int main() { @@ -14,7 +14,7 @@ int main() { lt_dlinit(); - CPlugin *plugin = new CPlugin("libopenalsound"); + CPluginLoader *plugin = new CPluginLoader("libopenalsound"); if (plugin->LoadPlugin()) { CSoundInterface *sound = static_cast<CSoundInterface*>(CInstanceManager::GetInstancePointer()->SearchInstance(CLASS_SOUND)); diff --git a/src/sound/sound.h b/src/sound/sound.h index d323918..f18a76a 100644 --- a/src/sound/sound.h +++ b/src/sound/sound.h @@ -26,7 +26,7 @@ #include <math/vector.h> -#include <plugins/plugin.h> +#include <plugins/plugininterface.h> #include <string> @@ -148,7 +148,7 @@ enum SoundNext * @brief Sound plugin interface * */ -class CSoundInterface : public CPlugin +class CSoundInterface : public CPluginInterface { public: CSoundInterface() { |