diff options
| author |  Elvio Basello | 2008-04-05 17:34:00 +0000 |
|---|---|---|
| committer | Elvio Basello | 2008-04-05 17:34:00 +0000 |
| commit | bcfa1f6ef04d1ce00e1716d3e181a5e234cad51a (patch) | |
| tree | 59fad5d5545e3bcccbc6c46a9ec2f31823d3cbbe /src/modules/system | |
| parent | Cmakelists' fix on earlier fix (diff) | |
| download | KVIrc-bcfa1f6ef04d1ce00e1716d3e181a5e234cad51a.tar.gz KVIrc-bcfa1f6ef04d1ce00e1716d3e181a5e234cad51a.tar.bz2 KVIrc-bcfa1f6ef04d1ce00e1716d3e181a5e234cad51a.zip | |
more code clean
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1400 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/system')
| -rw-r--r-- | src/modules/system/libkvisystem.cpp | 24 | ||||
| -rw-r--r-- | src/modules/system/plugin.cpp | 7 |
2 files changed, 7 insertions, 24 deletions
diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp index ddbf25980..e65817b94 100644 --- a/src/modules/system/libkvisystem.cpp +++ b/src/modules/system/libkvisystem.cpp @@ -22,20 +22,22 @@ // //============================================================================= +#include "plugin.h" + #include "kvi_settings.h" #include "kvi_module.h" #include "kvi_string.h" #include "kvi_library.h" #include "kvi_thread.h" - #include "kvi_locale.h" #include "kvi_qcstring.h" #include "kvi_app.h" #include "kvi_env.h" #include "kvi_osinfo.h" #include "kvi_qcstring.h" +#include "kvi_modulemanager.h" -#include <qclipboard.h> +#include <QClipboard> #ifndef COMPILE_ON_WINDOWS #include <sys/utsname.h> @@ -47,10 +49,6 @@ #include <dcopclient.h> #endif -#include "kvi_modulemanager.h" - -#include "plugin.h" - KviPluginManager * g_pPluginManager; /* @@ -565,18 +563,6 @@ static bool system_kvs_fnc_dcop(KviKvsModuleFunctionCall *c) c->returnValue()->setInteger(iii); } else if(szRetType == "QCStringList") { -#ifndef COMPILE_USE_QT4 - QCStringList csl; - ret >> csl; - KviKvsArray * arry = new KviKvsArray(); - int idx = 0; - for(QCStringList::Iterator iter = csl.begin();iter != csl.end();++iter) - { - arry->set(idx,new KviKvsVariant(QString(*iter))); - idx++; - } - c->returnValue()->setArray(arry); -#endif } else if(szRetType == "QStringList") { QStringList csl; @@ -737,7 +723,7 @@ static bool system_module_can_unload(KviModule *m) KVIRC_MODULE( "System", // module name - "1.0.0", // module version + "4.0.0", // module version "Copyright (C) 2001 Szymon Stefanek (pragma at kvirc dot net)" \ " (C) 2005 Tonino Imbesi (grifisx at barmes dot org)"\ " (C) 2005 Alessandro Carbone (noldor at barmes dot org)",// author & (C) diff --git a/src/modules/system/plugin.cpp b/src/modules/system/plugin.cpp index 7c888f7fe..0b47e5872 100644 --- a/src/modules/system/plugin.cpp +++ b/src/modules/system/plugin.cpp @@ -32,8 +32,8 @@ #include "kvi_app.h" #include "kvi_fileutils.h" -#include <qdir.h> -#include <qfileinfo.h> +#include <QDir> +#include <QFileInfo> /* @doc: easyplugins @type: @@ -209,7 +209,6 @@ void KviPlugin::setName(const QString& Name) m_szName = Name; } - KviPluginManager::KviPluginManager() { m_pPluginDict = new KviPointerHashTable<QString,KviPlugin>(5,false); @@ -328,8 +327,6 @@ bool KviPluginManager::pluginCall(KviKvsModuleFunctionCall *c) } } - - return true; } |