(cleanup) Delete an awful global variable (g_plugin in ConfigDiag). Rename the Plugin class in InputConfig to InputPlugin, which is better but not ideal.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5663 8ced0084-cf51-0410-be5f-012b33b47a6e

2 files changed, 10 insertions, 7 deletions

diff --git a/Source/Core/InputCommon/Src/InputConfig.cpp b/Source/Core/InputCommon/Src/InputConfig.cpp
index 410aecb928..b4d8a3b546 100644
--- a/Source/Core/InputCommon/Src/InputConfig.cpp
+++ b/Source/Core/InputCommon/Src/InputConfig.cpp
@@ -17,7 +17,7 @@
 
 #include "InputConfig.h"
 
-Plugin::Plugin( const char* const _ini_name, const char* const _gui_name, const char* const _profile_name  )
+InputPlugin::InputPlugin( const char* const _ini_name, const char* const _gui_name, const char* const _profile_name  )
 	: ini_name(_ini_name)
 	, gui_name(_gui_name)
 	, profile_name(_profile_name)
@@ -30,7 +30,7 @@ Plugin::Plugin( const char* const _ini_name, const char* const _gui_name, const
 	//	controllers.push_back( new Wiimote( i ) );
 };
 
-Plugin::~Plugin()
+InputPlugin::~InputPlugin()
 {
 	// delete pads
 	std::vector<ControllerEmu*>::const_iterator i = controllers.begin(),
@@ -39,7 +39,7 @@ Plugin::~Plugin()
 		delete *i;
 }
 
-bool Plugin::LoadConfig()
+bool InputPlugin::LoadConfig()
 {
 	IniFile inifile;
 	if (false == inifile.Load(std::string(File::GetUserPath(D_CONFIG_IDX)) + ini_name + ".ini"))
@@ -51,9 +51,10 @@ bool Plugin::LoadConfig()
 	for ( ; i!=e; ++i ) {
 		(*i)->LoadConfig(inifile.GetOrCreateSection((*i)->GetName().c_str()));
 	}
+	return true;
 }
 
-void Plugin::SaveConfig()
+void InputPlugin::SaveConfig()
 {
 	std::string ini_filename = (std::string(File::GetUserPath(D_CONFIG_IDX)) + ini_name + ".ini" );
 
diff --git a/Source/Core/InputCommon/Src/InputConfig.h b/Source/Core/InputCommon/Src/InputConfig.h
index 6e8d8adef0..1e2c708df0 100644
--- a/Source/Core/InputCommon/Src/InputConfig.h
+++ b/Source/Core/InputCommon/Src/InputConfig.h
@@ -30,12 +30,14 @@
 #include <map>
 #include <sstream>
 
-class Plugin
+// InputPlugin isn't a very good name anymore since it's also used for GCPad which
+// will soon not even be a plugin anymore.
+class InputPlugin
 {
 public:
 
-	Plugin( const char* const _ini_name, const char* const _gui_name, const char* const _profile_name  );
-	~Plugin();
+	InputPlugin( const char* const _ini_name, const char* const _gui_name, const char* const _profile_name  );
+	~InputPlugin();
 
 	bool LoadConfig();
 	void SaveConfig();