diff options
| author |  Szymon Tomasz Stefanek | 2008-01-15 00:44:02 +0000 |
|---|---|---|
| committer | Szymon Tomasz Stefanek | 2008-01-15 00:44:02 +0000 |
| commit | f366793158b096ece7ca23a742c5ae9ed8688f65 (patch) | |
| tree | 7cf67714b1af2a4e9e520b8c8b8ba1b77332fb20 /src/modules/window | |
| parent | modified Makefiles to accept new Croatian translation files (diff) | |
| download | KVIrc-f366793158b096ece7ca23a742c5ae9ed8688f65.tar.gz KVIrc-f366793158b096ece7ca23a742c5ae9ed8688f65.tar.bz2 KVIrc-f366793158b096ece7ca23a742c5ae9ed8688f65.zip | |
More alternate port to Qt4: no longer relying on Qt collection classes
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1085 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/window')
| -rw-r--r-- | src/modules/window/libkviwindow.cpp | 16 | ||||
| -rw-r--r-- | src/modules/window/userwindow.cpp | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp index fee311552..222cbb01b 100644 --- a/src/modules/window/libkviwindow.cpp +++ b/src/modules/window/libkviwindow.cpp @@ -41,7 +41,7 @@ #include "kvi_channel.h" #include "userwindow.h" -#include "kvi_asciidict.h" +#include "kvi_pointerhashtable.h" #include <qtimer.h> @@ -54,8 +54,8 @@ // kvi_app.cpp -extern KVIRC_API KviAsciiDict<KviWindow> * g_pGlobalWindowDict; -KviPtrList<KviUserWindow> * g_pUserWindowList = 0; +extern KVIRC_API KviPointerHashTable<const char *,KviWindow> * g_pGlobalWindowDict; +KviPointerList<KviUserWindow> * g_pUserWindowList = 0; // $window.caption $window.x $window.y $window.width $window.height $window.isActive $window.type // $window.input.text $window.input.cursorpos $window.input.textlen @@ -858,7 +858,7 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c) { // all contexts but no "no_context" windows bool bAllWindows = KviQString::equalCI(szType,"all"); - KviAsciiDictIterator<KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); while(KviWindow * wnd = it.current()) { @@ -882,7 +882,7 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c) { // all contexts and also "no_context" windows bool bAllWindows = KviQString::equalCI(szType.lower(),"all"); - KviAsciiDictIterator<KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); while(KviWindow * wnd = it.current()) { @@ -903,7 +903,7 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c) { // only "no_context" windows bool bAllWindows = KviQString::equalCI(szType.lower(),"all"); - KviAsciiDictIterator<KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); while(KviWindow * wnd = it.current()) { @@ -948,7 +948,7 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c) } bool bAllWindows = KviQString::equalCI(szType.lower(),"all"); - KviAsciiDictIterator<KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); while(KviWindow * wnd = it.current()) { @@ -1461,7 +1461,7 @@ static bool window_kvs_cmd_setCryptEngine(KviKvsModuleCommandCall * c) static bool window_module_init(KviModule *m) { - g_pUserWindowList = new KviPtrList<KviUserWindow>(); + g_pUserWindowList = new KviPointerList<KviUserWindow>(); g_pUserWindowList->setAutoDelete(false); KVSM_REGISTER_FUNCTION(m,"activityTemperature",window_kvs_fnc_activityTemperature); diff --git a/src/modules/window/userwindow.cpp b/src/modules/window/userwindow.cpp index 505e2843e..d022b040f 100644 --- a/src/modules/window/userwindow.cpp +++ b/src/modules/window/userwindow.cpp @@ -30,7 +30,7 @@ #include "kvi_frame.h" #include "kvi_console.h" -extern KviPtrList<KviUserWindow> * g_pUserWindowList; +extern KviPointerList<KviUserWindow> * g_pUserWindowList; KviUserWindow::KviUserWindow(KviFrame * pFrm,const char * name,int iIcon,KviConsole * pConsole,int iCreationFlags) |