diff options
Diffstat (limited to 'src/modules/window')
| -rw-r--r-- | src/modules/window/Makefile.am | 8 | ||||
| -rw-r--r-- | src/modules/window/libkviwindow.cpp | 26 | ||||
| -rw-r--r-- | src/modules/window/userwindow.cpp | 1 |
3 files changed, 18 insertions, 17 deletions
diff --git a/src/modules/window/Makefile.am b/src/modules/window/Makefile.am index 52912925..623952cc 100644 --- a/src/modules/window/Makefile.am +++ b/src/modules/window/Makefile.am @@ -9,13 +9,13 @@ pluglib_LTLIBRARIES = libkviwindow.la libkviwindow_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) -nodist_libkviwindow_la_SOURCES = moc_userwindow.cpp - libkviwindow_la_SOURCES = libkviwindow.cpp userwindow.cpp -libkviwindow_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkviwindow_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= userwindow.h -moc_%.cpp: %.h +%.moc: %.h $(SS_QT_MOC) $< -o $@ + +userwindow.cpp: userwindow.moc diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp index 3624402d..2f3a3c99 100644 --- a/src/modules/window/libkviwindow.cpp +++ b/src/modules/window/libkviwindow.cpp @@ -54,7 +54,7 @@ // kvi_app.cpp -extern KVIRC_API KviPointerHashTable<const char *,KviWindow> * g_pGlobalWindowDict; +extern KVIRC_API KviPointerHashTable<TQString,KviWindow> * g_pGlobalWindowDict; KviPointerList<KviUserWindow> * g_pUserWindowList = 0; // $window.caption $window.x $window.y $window.width $window.height $window.isActive $window.type @@ -71,7 +71,7 @@ KviPointerList<KviUserWindow> * g_pUserWindowList = 0; { \ pWnd = c->window(); \ } else { \ - pWnd = g_pApp->findWindow(szWnd.utf8().data()); \ + pWnd = g_pApp->findWindow(szWnd); \ if(!pWnd) \ { \ if(!c->hasSwitch('q',"quiet")) \ @@ -90,7 +90,7 @@ KviPointerList<KviUserWindow> * g_pUserWindowList = 0; { \ pWnd = c->window(); \ } else { \ - pWnd = g_pApp->findWindow(szWnd.utf8().data()); \ + pWnd = g_pApp->findWindow(szWnd); \ if(!pWnd) \ return true; \ } @@ -858,7 +858,7 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c) { // all contexts but no "no_context" windows bool bAllWindows = KviTQString::equalCI(szType,"all"); - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,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 = KviTQString::equalCI(szType.lower(),"all"); - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,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 = KviTQString::equalCI(szType.lower(),"all"); - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); while(KviWindow * wnd = it.current()) { @@ -948,7 +948,7 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c) } bool bAllWindows = KviTQString::equalCI(szType.lower(),"all"); - KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict); + KviPointerHashTableIterator<TQString,KviWindow> it(*g_pGlobalWindowDict); while(KviWindow * wnd = it.current()) { @@ -1048,7 +1048,7 @@ static bool window_kvs_fnc_open(KviKvsModuleFunctionCall * c) KviUserWindow * wnd = new KviUserWindow( c->window()->frame(), - szCaption, + szCaption.utf8().data(), iIcon, pConsole, iFlags); @@ -1104,7 +1104,7 @@ static bool window_kvs_cmd_setCaption(KviKvsModuleCommandCall * c) KVSM_PARAMETER("html_active_caption",KVS_PT_STRING,KVS_PF_OPTIONAL,szActive) KVSM_PARAMETERS_END(c) - pWnd = g_pApp->findWindow(szWnd.utf8().data()); + pWnd = g_pApp->findWindow(szWnd); if(!pWnd) { if(!c->hasSwitch('q',"quiet")) @@ -1150,7 +1150,7 @@ static bool window_kvs_cmd_setInputText(KviKvsModuleCommandCall * c) KVSM_PARAMETER("text",KVS_PT_STRING,0, szText) KVSM_PARAMETERS_END(c) - pWnd = g_pApp->findWindow(szWnd.utf8().data()); + pWnd = g_pApp->findWindow(szWnd); if(!pWnd) { if(!c->hasSwitch('q',"quiet")) @@ -1195,7 +1195,7 @@ static bool window_kvs_cmd_insertInInputText(KviKvsModuleCommandCall * c) KVSM_PARAMETER("text",KVS_PT_STRING,0, szText) KVSM_PARAMETERS_END(c) - pWnd = g_pApp->findWindow(szWnd.utf8().data()); + pWnd = g_pApp->findWindow(szWnd); if(!pWnd) { if(!c->hasSwitch('q',"quiet")) @@ -1268,7 +1268,7 @@ static bool window_kvs_cmd_setBackground(KviKvsModuleCommandCall * c) KVSM_PARAMETER("plain_text_caption",KVS_PT_STRING,0, szBackground) KVSM_PARAMETERS_END(c) - pWnd = g_pApp->findWindow(szWnd.utf8().data()); + pWnd = g_pApp->findWindow(szWnd); if(!pWnd) { if(!c->hasSwitch('q',"quiet")) @@ -1401,7 +1401,7 @@ static bool window_kvs_cmd_setCryptEngine(KviKvsModuleCommandCall * c) KVSM_PARAMETERS_END(c) if(szDecryptKey.isEmpty())szDecryptKey = szEncryptKey; #ifdef COMPILE_CRYPT_SUPPORT - pWnd = g_pApp->findWindow(szWnd.utf8().data()); + pWnd = g_pApp->findWindow(szWnd); if(!pWnd) { if(!c->hasSwitch('q',"quiet")) diff --git a/src/modules/window/userwindow.cpp b/src/modules/window/userwindow.cpp index adf52cd3..b45123c2 100644 --- a/src/modules/window/userwindow.cpp +++ b/src/modules/window/userwindow.cpp @@ -105,3 +105,4 @@ void KviUserWindow::setCaptionStrings(const TQString &szPlainText,const TQString updateCaption(); } +#include "userwindow.moc" |