From 86fc13a3dabbc218896247605a75f0c847af7839 Mon Sep 17 00:00:00 2001 From: Elvio Basello Date: Tue, 8 Apr 2008 23:46:37 +0000 Subject: more code clean git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1440 17fca916-40b9-46aa-a4ea-0a15b648b75c --- src/modules/options/libkvioptions.cpp | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'src/modules/options/libkvioptions.cpp') diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp index 98371a708..b67695112 100644 --- a/src/modules/options/libkvioptions.cpp +++ b/src/modules/options/libkvioptions.cpp @@ -22,6 +22,10 @@ // //============================================================================================ +#include "container.h" +#include "instances.h" +#include "dialog.h" + #include "kvi_module.h" #include "kvi_options.h" #include "kvi_app.h" @@ -31,15 +35,9 @@ #include "kvi_mirccntrl.h" #include "kvi_out.h" #include "kvi_splash.h" - -#include "container.h" -#include "instances.h" - -#include "dialog.h" - -#include #include "kvi_pointerhashtable.h" +#include KviPointerHashTable * g_pOptionsDialogDict = 0; @@ -157,6 +155,7 @@ static void options_kvs_module_print_pages(KviKvsModuleCommandCall * c,KviOption } } } + static bool options_kvs_cmd_pages(KviKvsModuleCommandCall * c) { KviPointerList * l = g_pOptionsInstanceManager->instanceEntryTree(); @@ -258,7 +257,7 @@ static bool options_kvs_cmd_edit(KviKvsModuleCommandCall * c) */ static bool options_kvs_fnc_isdialog(KviKvsModuleFunctionCall * c) -{ +{ QString szGroup; KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETER("options_group",KVS_PT_STRING,KVS_PF_OPTIONAL,szGroup) @@ -268,7 +267,6 @@ static bool options_kvs_fnc_isdialog(KviKvsModuleFunctionCall * c) return true; } - static bool options_module_init(KviModule * m) { g_pOptionsInstanceManager = new KviOptionsInstanceManager(); @@ -299,10 +297,10 @@ static bool options_module_cleanup(KviModule *m) for(d = l.first();d;d = l.next())delete d; delete g_pOptionsDialogDict; g_pOptionsDialogDict = 0; - + g_pOptionsInstanceManager->cleanup(m); delete g_pOptionsInstanceManager; - g_pOptionsInstanceManager = 0; + g_pOptionsInstanceManager = 0; return true; } @@ -314,7 +312,7 @@ static bool options_module_can_unload(KviModule *m) KVIRC_MODULE( "Options", // module name - "1.0.0", // module version + "4.0.0", // module version "Copyright (C) 2000 Szymon Stefanek (pragma at kvirc dot net)", // author & (C) "Options Dialog", options_module_init, -- cgit v1.3.1-10-gc9f91