Fix conversion of TQString to const char*

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

1 files changed, 12 insertions, 12 deletions

diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp
index 3624402d..ee82b9c9 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())
 		{
@@ -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"))