The big rename for modules. Still some details remaining.

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5284 17fca916-40b9-46aa-a4ea-0a15b648b75c

4 files changed, 43 insertions, 43 deletions

diff --git a/src/modules/system/CMakeLists.txt b/src/modules/system/CMakeLists.txt
index 559250260..412856c7e 100644
--- a/src/modules/system/CMakeLists.txt
+++ b/src/modules/system/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 SET(kvisystem_SRCS
 	libkvisystem.cpp
-	plugin.cpp
+	Plugin.cpp
 )
 
 # After this call, files will be moc'ed to moc_kvi_*.cpp
diff --git a/src/modules/system/plugin.cpp b/src/modules/system/Plugin.cpp
index f1a47bea1..35190af95 100644
--- a/src/modules/system/plugin.cpp
+++ b/src/modules/system/Plugin.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : plugin.cpp
+//   File : Plugin.cpp
 //   Creation date : Wed Apr 11 04 2007 00:54:00 GMT+1 by TheXception
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "plugin.h"
+#include "Plugin.h"
 
 #include "KviModule.h"
 #include "KviCString.h"
@@ -102,19 +102,19 @@
 		[/example]
 */
 
-KviPlugin::KviPlugin(QLibrary * pLibrary, const QString& name)
+Plugin::Plugin(QLibrary * pLibrary, const QString& name)
 {
 	m_pLibrary = pLibrary;
 	m_szName = name;
 }
 
-KviPlugin::~KviPlugin()
+Plugin::~Plugin()
 {
 	if(m_pLibrary->isLoaded()) m_pLibrary->unload();
 	delete m_pLibrary;
 }
 
-KviPlugin* KviPlugin::load(const QString& szFileName)
+Plugin* Plugin::load(const QString& szFileName)
 {
 	QLibrary* pLibrary = new QLibrary(szFileName);
 	if (!pLibrary->load())
@@ -123,7 +123,7 @@ KviPlugin* KviPlugin::load(const QString& szFileName)
 		return 0;
 	}
 
-	KviPlugin* pPlugin = new KviPlugin(pLibrary,KviFileUtils::extractFileName(szFileName));
+	Plugin* pPlugin = new Plugin(pLibrary,KviFileUtils::extractFileName(szFileName));
 
 	plugin_load function_load;
 
@@ -136,7 +136,7 @@ KviPlugin* KviPlugin::load(const QString& szFileName)
 	return pPlugin;
 }
 
-bool KviPlugin::pfree(char * pBuffer)
+bool Plugin::pfree(char * pBuffer)
 {
 	plugin_free function_free;
 
@@ -150,7 +150,7 @@ bool KviPlugin::pfree(char * pBuffer)
 	return false;
 }
 
-bool KviPlugin::unload()
+bool Plugin::unload()
 {
 	plugin_unload function_unload;
 
@@ -165,7 +165,7 @@ bool KviPlugin::unload()
 	return true;
 }
 
-bool KviPlugin::canunload()
+bool Plugin::canunload()
 {
 	plugin_canunload function_canunload;
 
@@ -178,7 +178,7 @@ bool KviPlugin::canunload()
 	return true;
 }
 
-int KviPlugin::call(const QString& pszFunctionName, int argc, char * argv[], char ** pBuffer)
+int Plugin::call(const QString& pszFunctionName, int argc, char * argv[], char ** pBuffer)
 {
 	int r;
 	plugin_function function_call;
@@ -194,30 +194,30 @@ int KviPlugin::call(const QString& pszFunctionName, int argc, char * argv[], cha
 	return r;
 }
 
-QString KviPlugin::name() const
+QString Plugin::name() const
 {
 	return m_szName;
 }
 
-void KviPlugin::setName(const QString& Name)
+void Plugin::setName(const QString& Name)
 {
 	m_szName = Name;
 }
 
-KviPluginManager::KviPluginManager()
+PluginManager::PluginManager()
 {
-	m_pPluginDict = new KviPointerHashTable<QString,KviPlugin>(5,false);
+	m_pPluginDict = new KviPointerHashTable<QString,Plugin>(5,false);
 	m_pPluginDict->setAutoDelete(false);
 
 	m_bCanUnload = true;
 }
 
-KviPluginManager::~KviPluginManager()
+PluginManager::~PluginManager()
 {
 	delete 	m_pPluginDict;
 }
 
-bool KviPluginManager::pluginCall(KviKvsModuleFunctionCall *c)
+bool PluginManager::pluginCall(KviKvsModuleFunctionCall *c)
 {
 	//   /echo $system.call("traffic.dll",about)
 	QString szPluginPath; //contains full path and plugin name like "c:/plugin.dll"
@@ -295,7 +295,7 @@ bool KviPluginManager::pluginCall(KviKvsModuleFunctionCall *c)
 
 	//Preparing return buffer
 	char * returnBuffer;
-	KviPlugin * plugin;
+	Plugin * plugin;
 
 	plugin = getPlugin(szPluginPath);
 	int r = plugin->call(szFunctionName,iArgc,ppArgv,&returnBuffer);
@@ -325,13 +325,13 @@ bool KviPluginManager::pluginCall(KviKvsModuleFunctionCall *c)
 	return true;
 }
 
-bool KviPluginManager::checkUnload()
+bool PluginManager::checkUnload()
 {
 	/*
 	Always called when system module should be unloaded
 	Checking here if all small "modules" can be unloaded
 	*/
-	KviPointerHashTableIterator<QString,KviPlugin> it(*m_pPluginDict);
+	KviPointerHashTableIterator<QString,Plugin> it(*m_pPluginDict);
 
 	m_bCanUnload = true;
 
@@ -350,9 +350,9 @@ bool KviPluginManager::checkUnload()
 	return m_bCanUnload;
 }
 
-void KviPluginManager::unloadAll()
+void PluginManager::unloadAll()
 {
-	KviPointerHashTableIterator<QString,KviPlugin> it(*m_pPluginDict);
+	KviPointerHashTableIterator<QString,Plugin> it(*m_pPluginDict);
 
 	while(it.current())
 	{
@@ -362,7 +362,7 @@ void KviPluginManager::unloadAll()
 	}
 }
 
-bool KviPluginManager::findPlugin(QString& szPath)
+bool PluginManager::findPlugin(QString& szPath)
 {
 	QString szFileName(KviFileUtils::extractFileName(szPath));
 //	szFileName.detach();
@@ -388,22 +388,22 @@ bool KviPluginManager::findPlugin(QString& szPath)
 	return true;
 }
 
-bool KviPluginManager::isPluginLoaded(const QString& pSingleName)
+bool PluginManager::isPluginLoaded(const QString& pSingleName)
 {
-	KviPlugin * p = m_pPluginDict->find(pSingleName);
+	Plugin * p = m_pPluginDict->find(pSingleName);
 	if (!p)
 		return false;
 	else
 		return true;
 }
 
-bool KviPluginManager::loadPlugin(const QString& szPluginPath)
+bool PluginManager::loadPlugin(const QString& szPluginPath)
 {
 	if(isPluginLoaded(szPluginPath))
 	{
 		return getPlugin(szPluginPath)!=0;
 	} else {
-		KviPlugin * plugin = KviPlugin::load(szPluginPath);
+		Plugin * plugin = Plugin::load(szPluginPath);
 		if(plugin)
 		{
 			m_pPluginDict->insert(szPluginPath,plugin);
@@ -413,8 +413,8 @@ bool KviPluginManager::loadPlugin(const QString& szPluginPath)
 	return false;
 }
 
-KviPlugin * KviPluginManager::getPlugin(const QString& szPluginPath)
+Plugin * PluginManager::getPlugin(const QString& szPluginPath)
 {
-	KviPlugin * p = m_pPluginDict->find(szPluginPath);
+	Plugin * p = m_pPluginDict->find(szPluginPath);
 	return p;
 }
diff --git a/src/modules/system/plugin.h b/src/modules/system/Plugin.h
index 3edb9ad48..2a5f4f03a 100644
--- a/src/modules/system/plugin.h
+++ b/src/modules/system/Plugin.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : plugin.h
+//   File : Plugin.h
 //   Creation date : Wed Apr 11 04 2007 00:54:00 GMT+1 by TheXception
 //
 //   This file is part of the KVIrc irc client distribution
@@ -35,20 +35,20 @@ typedef int (*plugin_canunload)();
 typedef int (*plugin_load)();
 typedef int (*plugin_free)(char * pBuffer);
 
-class KviPlugin
+class Plugin
 {
 protected:
-	// You have to create plugin instance by calling KviPlugin::load()
-	KviPlugin(QLibrary * pLibrary,const QString& name);
+	// You have to create plugin instance by calling Plugin::load()
+	Plugin(QLibrary * pLibrary,const QString& name);
 public:
-	~KviPlugin();
+	~Plugin();
 private:
 	// shared
 	// internal
 	QLibrary *m_pLibrary;
 	QString   m_szName;
 public:
-	static KviPlugin* load(const QString& szFileName);
+	static Plugin* load(const QString& szFileName);
 	bool pfree(char * pBuffer);
 	bool unload();
 	bool canunload();
@@ -58,16 +58,16 @@ public:
 protected:
 };
 
-class KviPluginManager
+class PluginManager
 {
 	public:
-		KviPluginManager();
-		~KviPluginManager();
+		PluginManager();
+		~PluginManager();
 	private:
 		// shared
 		bool m_bCanUnload;
 		// internal
-		KviPointerHashTable<QString,KviPlugin> * m_pPluginDict;
+		KviPointerHashTable<QString,Plugin> * m_pPluginDict;
 	public:
 		bool pluginCall(KviKvsModuleFunctionCall *c);
 		bool checkUnload();
@@ -76,7 +76,7 @@ class KviPluginManager
 		bool findPlugin(QString& szName);
 		bool isPluginLoaded(const QString& szFileNameOrPathToLoad);
 		bool loadPlugin(const QString& szPluginPath);
-		KviPlugin * getPlugin(const QString& szPluginPath);
+		Plugin * getPlugin(const QString& szPluginPath);
 };
 
 #endif //_PLUGIN_H_
diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp
index 4c1f4ffff..3dd02cbb7 100644
--- a/src/modules/system/libkvisystem.cpp
+++ b/src/modules/system/libkvisystem.cpp
@@ -23,7 +23,7 @@
 //
 //=============================================================================
 
-#include "plugin.h"
+#include "Plugin.h"
 
 #include "kvi_settings.h"
 #include "KviModule.h"
@@ -53,7 +53,7 @@
 	#include <QStringList>
 #endif
 
-KviPluginManager * g_pPluginManager;
+PluginManager * g_pPluginManager;
 
 /*
 	@doc: system.ostype
@@ -777,7 +777,7 @@ static bool system_module_init(KviModule * m)
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"setSelection",system_kvs_cmd_setSelection);
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"runcmd",system_kvs_cmd_runcmd);
 
-	g_pPluginManager = new(KviPluginManager);
+	g_pPluginManager = new(PluginManager);
 
 	return true;
 }