Preliminary KDE4 support. Now compiles and runs.

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1616 17fca916-40b9-46aa-a4ea-0a15b648b75c

32 files changed, 180 insertions, 179 deletions

diff --git a/src/kvilib/CMakeLists.txt b/src/kvilib/CMakeLists.txt
index 542aadd5c..a46764e2d 100644
--- a/src/kvilib/CMakeLists.txt
+++ b/src/kvilib/CMakeLists.txt
@@ -79,22 +79,17 @@ SET(kvilib_MOC_HDRS
 	system/kvi_stdarg.h
 	system/kvi_thread.h
 	system/kvi_time.h
-	tal/kvi_tal_application_qt.h
-	tal/kvi_tal_menubar_qt.h
 	tal/kvi_tal_popupmenu.h
 	tal/kvi_tal_application.h
-	tal/kvi_tal_filedialog_qt.h
 	tal/kvi_tal_grid.h
 	tal/kvi_tal_groupbox.h
 	tal/kvi_tal_hbox.h
 	tal/kvi_tal_iconview.h
 	tal/kvi_tal_listbox.h
 	tal/kvi_tal_listview.h
-	tal/kvi_tal_mainwindow_qt.h
 	tal/kvi_tal_menubar.h
 	tal/kvi_tal_scrollview.h
 	tal/kvi_tal_tabdialog.h
-	tal/kvi_tal_toolbar_qt.h
 	tal/kvi_tal_toolbardocktype.h
 	tal/kvi_tal_tooltip.h
 	tal/kvi_tal_textedit.h
@@ -104,6 +99,27 @@ SET(kvilib_MOC_HDRS
 	tal/kvi_tal_wizard.h
 )
 
+IF(COMPILE_KDE_SUPPORT)
+	SET(kvilib_MOC_HDRS
+		${kvilib_MOC_HDRS}
+		tal/kvi_tal_application_kde.h
+		tal/kvi_tal_menubar_kde.h
+		tal/kvi_tal_filedialog_kde.h
+		tal/kvi_tal_mainwindow_kde.h
+		tal/kvi_tal_toolbar_kde.h
+	)
+ELSE()
+	SET(kvilib_MOC_HDRS
+		${kvilib_MOC_HDRS}
+		tal/kvi_tal_application_qt.h
+		tal/kvi_tal_menubar_qt.h
+		tal/kvi_tal_filedialog_qt.h
+		tal/kvi_tal_mainwindow_qt.h
+		tal/kvi_tal_toolbar_qt.h
+	)
+ENDIF()
+
+
 SET(kvilib_SRCS
 	config/kvi_buildinfo.cpp
 	core/kvi_error.cpp
diff --git a/src/kvilib/tal/kvi_tal_application.cpp b/src/kvilib/tal/kvi_tal_application.cpp
index de1f6fbe6..a86590eb2 100644
--- a/src/kvilib/tal/kvi_tal_application.cpp
+++ b/src/kvilib/tal/kvi_tal_application.cpp
@@ -27,24 +27,9 @@
 
 #ifdef COMPILE_KDE_SUPPORT
 
-	// The constructor below triggers a warning
-	// ../tal/kvi_tal_application.cpp: In constructor
-	//   `KviTalApplication::KviTalApplication(int, char**)':
-	// ../tal/kvi_tal_application.cpp:31: warning: `__base_ctor' is deprecated
-	//   (declared at /opt/kde/include/kapplication.h:198)
-	//
-	// The KApplication constructor has been declared as deprecated
-	// in favor of a complexier initialization that uses KCmdLineArgs
-	// and can't be abstracted easily.
-	// The other constructors are not "old" and "stable" enough
-	// to be safely used at this time. We'll rethink this when KDE 4 is out.
-
 	KviTalApplication::KviTalApplication(int &argc,char ** argv)
 	: KApplication()
 	{
-
-
-
 	}
 
 	KviTalApplication::~KviTalApplication()
diff --git a/src/kvirc/kernel/kvi_customtoolbardescriptor.cpp b/src/kvirc/kernel/kvi_customtoolbardescriptor.cpp
index 3cd2d6e24..e492460fb 100644
--- a/src/kvirc/kernel/kvi_customtoolbardescriptor.cpp
+++ b/src/kvirc/kernel/kvi_customtoolbardescriptor.cpp
@@ -147,7 +147,8 @@ KviCustomToolBar * KviCustomToolBarDescriptor::createToolBar()
 {
 	if(!m_pToolBar)
 	{
-		m_pToolBar = new KviCustomToolBar(this,label(),QT_DOCK_TOP,false,id().toUtf8().data());
+		QByteArray dd = id().toUtf8();
+		m_pToolBar = new KviCustomToolBar(this,label(),QT_DOCK_TOP,false,dd.data());
 		fillToolBar();
 	}
 	return m_pToolBar;
diff --git a/src/kvirc/kernel/kvi_main.cpp b/src/kvirc/kernel/kvi_main.cpp
index 57e0d5361..48cd44da9 100644
--- a/src/kvirc/kernel/kvi_main.cpp
+++ b/src/kvirc/kernel/kvi_main.cpp
@@ -41,6 +41,10 @@
 
 #include <QMessageBox>
 
+#ifdef COMPILE_KDE_SUPPORT
+	#include <kcmdlineargs.h>
+#endif
+
 #define KVI_ARGS_RETCODE_OK 0
 #define KVI_ARGS_RETCODE_ERROR 1
 #define KVI_ARGS_RETCODE_STOP 2
@@ -309,6 +313,9 @@ int main(int argc,char ** argv)
 
 	if(retCode != KVI_ARGS_RETCODE_OK)return ((retCode == KVI_ARGS_RETCODE_ERROR) ? (-1) : 0);
 
+#ifdef COMPILE_KDE_SUPPORT
+	KCmdLineArgs::init(argc,argv,"kvirc","noway",ki18n("KVIrc"),KVI_VERSION);
+#endif
 	// Need to have the X socket open before IPC startup
 	KviApp * theApp = new KviApp(argc,argv);
 
diff --git a/src/modules/aliaseditor/aliaseditor.cpp b/src/modules/aliaseditor/aliaseditor.cpp
index 2b75a9ee7..0392528e6 100644
--- a/src/modules/aliaseditor/aliaseditor.cpp
+++ b/src/modules/aliaseditor/aliaseditor.cpp
@@ -1335,7 +1335,7 @@ void KviAliasEditor::renameItem()
 			QMessageBox::information(this,

 				__tr2qs("Namespace already exists"),

 				__tr2qs("This name is already in use. Please choose another one."),

-				__tr2qs("Ok, let me try again..."));

+				__tr2qs("Ok, Let me try again..."));

 			g_pAliasEditorModule->unlock();

 			return;

 		}

@@ -1376,6 +1376,7 @@ void KviAliasEditor::renameItem()
 		ait->setBuffer(szCode);

 		ait->setCursorPosition(pntCursor);

 		activateItem(ait);

+
 	} else {

 		KviAliasNamespaceListViewItem * nit = createFullNamespaceItem(szNewName);

 		activateItem(nit);

diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp
index ec91460bc..45a1532ed 100644
--- a/src/modules/dcc/send.cpp
+++ b/src/modules/dcc/send.cpp
@@ -376,10 +376,7 @@ void KviDccRecvThread::run()
 			}
 			// include the artificial delay if needed
 			if(m_pOpt->iIdleStepLengthInMSec > 0)
-			{
-				debug("LOOP: artificial delay");
 				msleep(m_pOpt->iIdleStepLengthInMSec);
-			}
 		} else {
 			// sleep up to 200 msecs (if data arrives...we want low exit latency here)
 			if(iFailedSelects < 100)iFailedSelects++;
diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp
index 04ea9aa0c..133fc95db 100644
--- a/src/modules/objects/class_painter.cpp
+++ b/src/modules/objects/class_painter.cpp
@@ -530,8 +530,8 @@ if(__pXOrArray->isArray())\
 	} else {\

 		if(c->params()->count() < 4)\

 		{\

-			QString error=function+" requires either an array as first parameter or four integers";\

-			c->error(__tr2qs(error));\

+			QString error=function+__tr2qs(" requires either an array as first parameter or four integers");\

+			c->error(error);\

 			return false;\

 		}\

 		if(!__pXOrArray->asInteger(iX))\

@@ -564,8 +564,8 @@ if(__pXOrArray->isArray())\
 	} else {\

 		if(c->params()->count() < 2)\

 		{\

-			QString error=function+" requires either an array as first parameter or two integers";\

-			c->error(__tr2qs(error));\

+			QString error=function+__tr2qs(" requires either an array as first parameter or two integers");\

+			c->error(error);\

 			return false;\

 		}\

 		if(!__pXOrArray->asInteger(iX))\

@@ -608,8 +608,8 @@ if(__pCol1OrArray->isArray())\
 	} else {\

 		if(c->params()->count() < 3)\

 		{\

-			QString error=function+" requires either an array as first parameter or 3 integers";\

-			c->error(__tr2qs(error));\

+			QString error=function+__tr2qs(" requires either an array as first parameter or 3 integers");\

+			c->error(error);\

 			return false;\

 		}\

 		if(!__pCol1OrArray->asInteger(iCol1))\

diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp
index 7f1741bed..84cd2b70b 100644
--- a/src/modules/objects/class_socket.cpp
+++ b/src/modules/objects/class_socket.cpp
@@ -509,7 +509,7 @@ bool KviKvsObject_socket::functionAccept(KviKvsObjectFunctionCall *c)
 
 	if(m_secondarySock != KVI_INVALID_SOCKET)
 	{
-		((KviKvsObject_socket *)pObject)->acceptConnection(m_secondarySock,m_uSecondaryPort,m_szSecondaryIp);
+		((KviKvsObject_socket *)pObject)->acceptConnection(m_secondarySock,m_uSecondaryPort,m_szSecondaryIp.toUtf8().data());
 
 		m_secondarySock = KVI_INVALID_SOCKET;
 		m_uSecondaryPort = 0;
@@ -600,9 +600,9 @@ bool  KviKvsObject_socket::functionConnect(KviKvsObjectFunctionCall *c)
 
 
 #ifdef COMPILE_IPV6_SUPPORT
-	if(kvi_isValidStringIp(m_szRemoteIp) || kvi_isValidStringIp_V6(m_szRemoteIp))
+	if(kvi_isValidStringIp(m_szRemoteIp.toUtf8().data()) || kvi_isValidStringIp_V6(m_szRemoteIp.toUtf8().data()))
 #else
-	if(kvi_isValidStringIp(m_szRemoteIp))
+	if(kvi_isValidStringIp(m_szRemoteIp.toUtf8().data()))
 #endif
 	{
 		debug ("ok connecting");
@@ -658,10 +658,10 @@ bool KviKvsObject_socket::functionListen(KviKvsObjectFunctionCall *c)
 	{
 
 		// Check the address type
-		if(kvi_isValidStringIp(m_szLocalIp))bGotIp = true;
+		if(kvi_isValidStringIp(m_szLocalIp.toUtf8().data()))bGotIp = true;
 		else {
 #ifdef COMPILE_IPV6_SUPPORT
-			if(kvi_isValidStringIp_V6(m_szLocalIp))
+			if(kvi_isValidStringIp_V6(m_szLocalIp.toUtf8().data()))
 			{
 				bGotIp = true;
 				m_bIpV6 = true;
@@ -697,9 +697,9 @@ bool KviKvsObject_socket::functionListen(KviKvsObjectFunctionCall *c)
 	if(!m_szLocalIp.isEmpty())
 	{
 #ifdef COMPILE_IPV6_SUPPORT
-		KviSockaddr sa(m_szLocalIp,m_uLocalPort,m_bIpV6,m_bUdp);
+		KviSockaddr sa(m_szLocalIp.toUtf8().data(),m_uLocalPort,m_bIpV6,m_bUdp);
 #else
-		KviSockaddr sa(m_szLocalIp,m_uLocalPort,false,m_bUdp);
+		KviSockaddr sa(m_szLocalIp.toUtf8().data(),m_uLocalPort,false,m_bUdp);
 #endif
 		if(!sa.socketAddress())
 		{
@@ -868,7 +868,7 @@ void KviKvsObject_socket::doConnect()
 	m_pDelayTimer = 0;
 
 
-	KviSockaddr sa(m_szRemoteIp,m_uRemotePort,!kvi_isValidStringIp(m_szRemoteIp),m_bUdp);
+	KviSockaddr sa(m_szRemoteIp.toUtf8().data(),m_uRemotePort,!kvi_isValidStringIp(m_szRemoteIp.toUtf8().data()),m_bUdp);
 
 	if(!sa.socketAddress())
 	{
diff --git a/src/modules/objects/class_wizard.cpp b/src/modules/objects/class_wizard.cpp
index 03b0b7d8c..2b34b34b5 100644
--- a/src/modules/objects/class_wizard.cpp
+++ b/src/modules/objects/class_wizard.cpp
@@ -124,7 +124,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_wizard)
 
 bool KviKvsObject_wizard::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(new KviKvsMdmWizard(parentScriptWidget(), getName(),this), true);
+	setObject(new KviKvsMdmWizard(parentScriptWidget(), getName().toUtf8().data(),this), true);
 
 	return true;
 }
diff --git a/src/modules/objects/class_wrapper.cpp b/src/modules/objects/class_wrapper.cpp
index bede2f59d..6f88fee5b 100644
--- a/src/modules/objects/class_wrapper.cpp
+++ b/src/modules/objects/class_wrapper.cpp
@@ -151,10 +151,10 @@ bool KviKvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis
 		} 		else {
 		if(pWidget) {
     pWidget = findWidgetToWrap(
-     !szClass.isEmpty() ? szClass : KviQString::empty, !szName.isEmpty() ? szName : KviQString::empty, pWidget
+     !szClass.isEmpty() ? szClass.toUtf8().data() : "", !szName.isEmpty() ? szName.toUtf8().data() : "", pWidget
     );
    } else {
-    pWidget = findTopLevelWidgetToWrap(szClass.isEmpty() ? szClass : KviQString::empty, !szName.isEmpty() ? szName : KviQString::empty);
+    pWidget = findTopLevelWidgetToWrap(!szClass.isEmpty() ? szClass.toUtf8().data() : "", !szName.isEmpty() ? szName.toUtf8().data() : "");
    }
 		}
 		if( !pWidget )
diff --git a/src/modules/options/instances.cpp b/src/modules/options/instances.cpp
index ed5359513..5c8b7c117 100644
--- a/src/modules/options/instances.cpp
+++ b/src/modules/options/instances.cpp
@@ -28,8 +28,6 @@
 // so any change should go in that script
 //
 
-#include "instances.h"
-
 #include "optw_antispam.h"
 #include "optw_avatar.h"
 #include "optw_away.h"
@@ -70,6 +68,7 @@
 
 #include "kvi_locale.h"
 #include "kvi_iconmanager.h"
+#include "instances.h"
 
 int g_iOptionWidgetInstances = 0;
 
@@ -647,7 +646,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 : QObject(0)
 {
 
-	//qDebug("Instantiating");
+	//debug("Instantiating");
 	// Create the global widget dict : case sensitive , do not copy keys
 	m_pInstanceTree = new KviPointerList<KviOptionsWidgetInstanceEntry>;
 	m_pInstanceTree->setAutoDelete(true);
@@ -666,7 +665,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	#endif
 	#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviConnectionOptionsWidget
 	e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviConnectionOptionsWidget;
-	e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale,"options");;
+	e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options");;
 	#endif
 	#ifdef KVI_OPTIONS_WIDGET_GROUP_KviConnectionOptionsWidget
 	e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviConnectionOptionsWidget;
@@ -703,7 +702,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviConnectionAdvancedOptionsWidget
 		e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviConnectionAdvancedOptionsWidget;
-		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");;
+		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_GROUP_KviConnectionAdvancedOptionsWidget
 		e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviConnectionAdvancedOptionsWidget;
@@ -740,7 +739,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviSSLOptionsWidget
 			e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviSSLOptionsWidget;
-			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");;
+			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options");;
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_GROUP_KviSSLOptionsWidget
 			e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviSSLOptionsWidget;
@@ -774,7 +773,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviTransportOptionsWidget
 			e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviTransportOptionsWidget;
-			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");;
+			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options");;
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_GROUP_KviTransportOptionsWidget
 			e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviTransportOptionsWidget;
@@ -808,7 +807,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviIdentOptionsWidget
 			e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviIdentOptionsWidget;
-			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");;
+			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options");;
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_GROUP_KviIdentOptionsWidget
 			e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviIdentOptionsWidget;
@@ -842,7 +841,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviProxyOptionsWidget
 		e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviProxyOptionsWidget;
-		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");;
+		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_GROUP_KviProxyOptionsWidget
 		e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviProxyOptionsWidget;
@@ -876,7 +875,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	#endif
 	#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviDccOptionsWidget
 	e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviDccOptionsWidget;
-	e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale,"options");;
+	e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options");;
 	#endif
 	#ifdef KVI_OPTIONS_WIDGET_GROUP_KviDccOptionsWidget
 	e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviDccOptionsWidget;
@@ -912,7 +911,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviDccGeneralOptionsWidget
 		e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviDccGeneralOptionsWidget;
-		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");;
+		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_GROUP_KviDccGeneralOptionsWidget
 		e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviDccGeneralOptionsWidget;
@@ -946,7 +945,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviDccAdvancedOptionsWidget
 		e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviDccAdvancedOptionsWidget;
-		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");;
+		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_GROUP_KviDccAdvancedOptionsWidget
 		e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviDccAdvancedOptionsWidget;
@@ -980,7 +979,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviDccSendOptionsWidget
 		e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviDccSendOptionsWidget;
-		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");;
+		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_GROUP_KviDccSendOptionsWidget
 		e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviDccSendOptionsWidget;
@@ -1016,7 +1015,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviDccSendGeneralOptionsWidget
 			e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviDccSendGeneralOptionsWidget;
-			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");;
+			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options");;
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_GROUP_KviDccSendGeneralOptionsWidget
 			e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviDccSendGeneralOptionsWidget;
@@ -1050,7 +1049,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviDccSendAdvancedOptionsWidget
 			e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviDccSendAdvancedOptionsWidget;
-			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");;
+			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options");;
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_GROUP_KviDccSendAdvancedOptionsWidget
 			e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviDccSendAdvancedOptionsWidget;
@@ -1084,7 +1083,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviDccChatOptionsWidget
 		e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviDccChatOptionsWidget;
-		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");;
+		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_GROUP_KviDccChatOptionsWidget
 		e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviDccChatOptionsWidget;
@@ -1118,7 +1117,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviDccVoiceOptionsWidget
 		e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviDccVoiceOptionsWidget;
-		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");;
+		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_GROUP_KviDccVoiceOptionsWidget
 		e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviDccVoiceOptionsWidget;
@@ -1152,7 +1151,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	#endif
 	#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviGeneralOptOptionsWidget
 	e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviGeneralOptOptionsWidget;
-	e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale,"options");;
+	e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options");;
 	#endif
 	#ifdef KVI_OPTIONS_WIDGET_GROUP_KviGeneralOptOptionsWidget
 	e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviGeneralOptOptionsWidget;
@@ -1188,7 +1187,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviMediaTypesOptionsWidget
 		e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviMediaTypesOptionsWidget;
-		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");;
+		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_GROUP_KviMediaTypesOptionsWidget
 		e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviMediaTypesOptionsWidget;
@@ -1222,7 +1221,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviSoundOptionsWidget
 		e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviSoundOptionsWidget;
-		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");;
+		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_GROUP_KviSoundOptionsWidget
 		e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviSoundOptionsWidget;
@@ -1258,7 +1257,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviSoundGeneralOptionsWidget
 			e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviSoundGeneralOptionsWidget;
-			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");;
+			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options");;
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_GROUP_KviSoundGeneralOptionsWidget
 			e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviSoundGeneralOptionsWidget;
@@ -1292,7 +1291,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviSoundsOptionsWidget
 			e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviSoundsOptionsWidget;
-			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");;
+			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options");;
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_GROUP_KviSoundsOptionsWidget
 			e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviSoundsOptionsWidget;
@@ -1326,7 +1325,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviTextEncodingOptionsWidget
 		e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviTextEncodingOptionsWidget;
-		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");;
+		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_GROUP_KviTextEncodingOptionsWidget
 		e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviTextEncodingOptionsWidget;
@@ -1360,7 +1359,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviUParserOptionsWidget
 		e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviUParserOptionsWidget;
-		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");;
+		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_GROUP_KviUParserOptionsWidget
 		e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviUParserOptionsWidget;
@@ -1394,7 +1393,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviUrlHandlersOptionsWidget
 		e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviUrlHandlersOptionsWidget;
-		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");;
+		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_GROUP_KviUrlHandlersOptionsWidget
 		e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviUrlHandlersOptionsWidget;
@@ -1428,7 +1427,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	#endif
 	#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviIdentityOptionsWidget
 	e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviIdentityOptionsWidget;
-	e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale,"options");;
+	e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options");;
 	#endif
 	#ifdef KVI_OPTIONS_WIDGET_GROUP_KviIdentityOptionsWidget
 	e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviIdentityOptionsWidget;
@@ -1464,7 +1463,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviIdentityGeneralOptionsWidget
 		e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviIdentityGeneralOptionsWidget;
-		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");;
+		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_GROUP_KviIdentityGeneralOptionsWidget
 		e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviIdentityGeneralOptionsWidget;
@@ -1498,7 +1497,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviIdentityAvatarOptionsWidget
 		e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviIdentityAvatarOptionsWidget;
-		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");;
+		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_GROUP_KviIdentityAvatarOptionsWidget
 		e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviIdentityAvatarOptionsWidget;
@@ -1532,7 +1531,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviIdentityAdvancedOptionsWidget
 		e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviIdentityAdvancedOptionsWidget;
-		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");;
+		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_GROUP_KviIdentityAdvancedOptionsWidget
 		e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviIdentityAdvancedOptionsWidget;
@@ -1566,7 +1565,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	#endif
 	#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviInputLookOptionsWidget
 	e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviInputLookOptionsWidget;
-	e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale,"options");;
+	e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options");;
 	#endif
 	#ifdef KVI_OPTIONS_WIDGET_GROUP_KviInputLookOptionsWidget
 	e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviInputLookOptionsWidget;
@@ -1600,7 +1599,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	#endif
 	#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviInterfaceFeaturesOptionsWidget
 	e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviInterfaceFeaturesOptionsWidget;
-	e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale,"options");;
+	e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options");;
 	#endif
 	#ifdef KVI_OPTIONS_WIDGET_GROUP_KviInterfaceFeaturesOptionsWidget
 	e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviInterfaceFeaturesOptionsWidget;
@@ -1636,7 +1635,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviInputFeaturesOptionsWidget
 		e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviInputFeaturesOptionsWidget;
-		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");;
+		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_GROUP_KviInputFeaturesOptionsWidget
 		e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviInputFeaturesOptionsWidget;
@@ -1670,7 +1669,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviNotifierOptionsWidget
 		e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviNotifierOptionsWidget;
-		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");;
+		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_GROUP_KviNotifierOptionsWidget
 		e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviNotifierOptionsWidget;
@@ -1704,7 +1703,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviTrayOptionsWidget
 		e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviTrayOptionsWidget;
-		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");;
+		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_GROUP_KviTrayOptionsWidget
 		e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviTrayOptionsWidget;
@@ -1738,7 +1737,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	#endif
 	#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviThemeGeneralOptionsWidget
 	e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviThemeGeneralOptionsWidget;
-	e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale,"options");;
+	e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options");;
 	#endif
 	#ifdef KVI_OPTIONS_WIDGET_GROUP_KviThemeGeneralOptionsWidget
 	e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviThemeGeneralOptionsWidget;
@@ -1772,7 +1771,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	#endif
 	#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviThemeTransparencyOptionsWidget
 	e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviThemeTransparencyOptionsWidget;
-	e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale,"options");;
+	e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options");;
 	#endif
 	#ifdef KVI_OPTIONS_WIDGET_GROUP_KviThemeTransparencyOptionsWidget
 	e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviThemeTransparencyOptionsWidget;
@@ -1806,7 +1805,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	#endif
 	#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviThemeMdiCaptionsOptionsWidget
 	e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviThemeMdiCaptionsOptionsWidget;
-	e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale,"options");;
+	e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options");;
 	#endif
 	#ifdef KVI_OPTIONS_WIDGET_GROUP_KviThemeMdiCaptionsOptionsWidget
 	e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviThemeMdiCaptionsOptionsWidget;
@@ -1840,7 +1839,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	#endif
 	#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviThemeMdiAreaOptionsWidget
 	e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviThemeMdiAreaOptionsWidget;
-	e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale,"options");;
+	e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options");;
 	#endif
 	#ifdef KVI_OPTIONS_WIDGET_GROUP_KviThemeMdiAreaOptionsWidget
 	e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviThemeMdiAreaOptionsWidget;
@@ -1874,7 +1873,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	#endif
 	#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviThemeToolBarAppletsOptionsWidget
 	e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviThemeToolBarAppletsOptionsWidget;
-	e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale,"options");;
+	e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options");;
 	#endif
 	#ifdef KVI_OPTIONS_WIDGET_GROUP_KviThemeToolBarAppletsOptionsWidget
 	e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviThemeToolBarAppletsOptionsWidget;
@@ -1908,7 +1907,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	#endif
 	#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcOptionsWidget
 	e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcOptionsWidget;
-	e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale,"options");;
+	e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options");;
 	#endif
 	#ifdef KVI_OPTIONS_WIDGET_GROUP_KviIrcOptionsWidget
 	e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviIrcOptionsWidget;
@@ -1944,7 +1943,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcGeneralOptionsWidget
 		e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcGeneralOptionsWidget;
-		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");;
+		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_GROUP_KviIrcGeneralOptionsWidget
 		e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviIrcGeneralOptionsWidget;
@@ -1978,7 +1977,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcAdvancedOptionsWidget
 		e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcAdvancedOptionsWidget;
-		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");;
+		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_GROUP_KviIrcAdvancedOptionsWidget
 		e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviIrcAdvancedOptionsWidget;
@@ -2012,7 +2011,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviChannelOptionsWidget
 		e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviChannelOptionsWidget;
-		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");;
+		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_GROUP_KviChannelOptionsWidget
 		e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviChannelOptionsWidget;
@@ -2048,7 +2047,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviChannelGeneralOptionsWidget
 			e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviChannelGeneralOptionsWidget;
-			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");;
+			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options");;
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_GROUP_KviChannelGeneralOptionsWidget
 			e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviChannelGeneralOptionsWidget;
@@ -2082,7 +2081,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviChannelAdvancedOptionsWidget
 			e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviChannelAdvancedOptionsWidget;
-			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");;
+			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options");;
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_GROUP_KviChannelAdvancedOptionsWidget
 			e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviChannelAdvancedOptionsWidget;
@@ -2116,7 +2115,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcOutputOptionsWidget
 		e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcOutputOptionsWidget;
-		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");;
+		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_GROUP_KviIrcOutputOptionsWidget
 		e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviIrcOutputOptionsWidget;
@@ -2150,7 +2149,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviProtectionOptionsWidget
 		e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviProtectionOptionsWidget;
-		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");;
+		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_GROUP_KviProtectionOptionsWidget
 		e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviProtectionOptionsWidget;
@@ -2186,7 +2185,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviAntispamOptionsWidget
 			e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviAntispamOptionsWidget;
-			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");;
+			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options");;
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_GROUP_KviAntispamOptionsWidget
 			e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviAntispamOptionsWidget;
@@ -2220,7 +2219,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviCtcpFloodProtectionOptionsWidget
 			e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviCtcpFloodProtectionOptionsWidget;
-			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");;
+			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options");;
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_GROUP_KviCtcpFloodProtectionOptionsWidget
 			e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviCtcpFloodProtectionOptionsWidget;
@@ -2254,7 +2253,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviIgnoreOptionsWidget
 			e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviIgnoreOptionsWidget;
-			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");;
+			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options");;
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_GROUP_KviIgnoreOptionsWidget
 			e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviIgnoreOptionsWidget;
@@ -2288,7 +2287,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviQueryOptionsWidget
 		e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviQueryOptionsWidget;
-		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");;
+		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_GROUP_KviQueryOptionsWidget
 		e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviQueryOptionsWidget;
@@ -2322,7 +2321,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviToolsOptionsWidget
 		e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviToolsOptionsWidget;
-		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");;
+		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_GROUP_KviToolsOptionsWidget
 		e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviToolsOptionsWidget;
@@ -2358,7 +2357,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviAvatarAdvancedOptionsWidget
 			e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviAvatarAdvancedOptionsWidget;
-			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");;
+			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options");;
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_GROUP_KviAvatarAdvancedOptionsWidget
 			e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviAvatarAdvancedOptionsWidget;
@@ -2392,7 +2391,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviAwayOptionsWidget
 			e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviAwayOptionsWidget;
-			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");;
+			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options");;
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_GROUP_KviAwayOptionsWidget
 			e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviAwayOptionsWidget;
@@ -2426,7 +2425,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviCtcpOptionsWidget
 			e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviCtcpOptionsWidget;
-			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");;
+			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options");;
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_GROUP_KviCtcpOptionsWidget
 			e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviCtcpOptionsWidget;
@@ -2460,7 +2459,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviAlertHighlightingOptionsWidget
 			e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviAlertHighlightingOptionsWidget;
-			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");;
+			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options");;
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_GROUP_KviAlertHighlightingOptionsWidget
 			e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviAlertHighlightingOptionsWidget;
@@ -2497,7 +2496,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 				#endif
 				#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviHighlightingOptionsWidget
 				e3->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviHighlightingOptionsWidget;
-				e3->szKeywords = __tr2qs_ctx_no_xgettext(e3->szKeywordsNoLocale,"options");;
+				e3->szKeywords = __tr2qs_ctx_no_xgettext(e3->szKeywordsNoLocale.toUtf8().data(),"options");;
 				#endif
 				#ifdef KVI_OPTIONS_WIDGET_GROUP_KviHighlightingOptionsWidget
 				e3->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviHighlightingOptionsWidget;
@@ -2531,7 +2530,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 				#endif
 				#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviAlertOptionsWidget
 				e3->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviAlertOptionsWidget;
-				e3->szKeywords = __tr2qs_ctx_no_xgettext(e3->szKeywordsNoLocale,"options");;
+				e3->szKeywords = __tr2qs_ctx_no_xgettext(e3->szKeywordsNoLocale.toUtf8().data(),"options");;
 				#endif
 				#ifdef KVI_OPTIONS_WIDGET_GROUP_KviAlertOptionsWidget
 				e3->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviAlertOptionsWidget;
@@ -2565,7 +2564,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviLagOptionsWidget
 			e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviLagOptionsWidget;
-			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");;
+			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options");;
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_GROUP_KviLagOptionsWidget
 			e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviLagOptionsWidget;
@@ -2599,7 +2598,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviLoggingOptionsWidget
 			e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviLoggingOptionsWidget;
-			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");;
+			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options");;
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_GROUP_KviLoggingOptionsWidget
 			e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviLoggingOptionsWidget;
@@ -2633,7 +2632,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviNickServOptionsWidget
 			e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviNickServOptionsWidget;
-			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");;
+			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options");;
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_GROUP_KviNickServOptionsWidget
 			e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviNickServOptionsWidget;
@@ -2667,7 +2666,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviNotifyOptionsWidget
 			e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviNotifyOptionsWidget;
-			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");;
+			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options");;
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_GROUP_KviNotifyOptionsWidget
 			e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviNotifyOptionsWidget;
@@ -2701,7 +2700,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviTextIconsOptionsWidget
 			e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviTextIconsOptionsWidget;
-			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");;
+			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options");;
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_GROUP_KviTextIconsOptionsWidget
 			e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviTextIconsOptionsWidget;
@@ -2735,7 +2734,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	#endif
 	#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcViewThemeOptionsWidget
 	e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcViewThemeOptionsWidget;
-	e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale,"options");;
+	e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options");;
 	#endif
 	#ifdef KVI_OPTIONS_WIDGET_GROUP_KviIrcViewThemeOptionsWidget
 	e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviIrcViewThemeOptionsWidget;
@@ -2771,7 +2770,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcViewLookOptionsWidget
 		e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcViewLookOptionsWidget;
-		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");;
+		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_GROUP_KviIrcViewLookOptionsWidget
 		e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviIrcViewLookOptionsWidget;
@@ -2805,7 +2804,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcViewFeaturesOptionsWidget
 		e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcViewFeaturesOptionsWidget;
-		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");;
+		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_GROUP_KviIrcViewFeaturesOptionsWidget
 		e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviIrcViewFeaturesOptionsWidget;
@@ -2839,7 +2838,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	#endif
 	#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviMessageOptionsWidget
 	e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviMessageOptionsWidget;
-	e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale,"options");;
+	e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options");;
 	#endif
 	#ifdef KVI_OPTIONS_WIDGET_GROUP_KviMessageOptionsWidget
 	e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviMessageOptionsWidget;
@@ -2875,7 +2874,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviPrivmsgOptionsWidget
 		e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviPrivmsgOptionsWidget;
-		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");;
+		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_GROUP_KviPrivmsgOptionsWidget
 		e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviPrivmsgOptionsWidget;
@@ -2909,7 +2908,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviTimestampOptionsWidget
 		e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviTimestampOptionsWidget;
-		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");;
+		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_GROUP_KviTimestampOptionsWidget
 		e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviTimestampOptionsWidget;
@@ -2943,7 +2942,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviMessageColorsOptionsWidget
 		e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviMessageColorsOptionsWidget;
-		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");;
+		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_GROUP_KviMessageColorsOptionsWidget
 		e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviMessageColorsOptionsWidget;
@@ -2977,7 +2976,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviStandardColorsOptionsWidget
 		e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviStandardColorsOptionsWidget;
-		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");;
+		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_GROUP_KviStandardColorsOptionsWidget
 		e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviStandardColorsOptionsWidget;
@@ -3011,7 +3010,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	#endif
 	#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviServerOptionsWidget
 	e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviServerOptionsWidget;
-	e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale,"options");;
+	e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options");;
 	#endif
 	#ifdef KVI_OPTIONS_WIDGET_GROUP_KviServerOptionsWidget
 	e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviServerOptionsWidget;
@@ -3045,7 +3044,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	#endif
 	#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviTaskBarOptionsWidget
 	e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviTaskBarOptionsWidget;
-	e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale,"options");;
+	e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options");;
 	#endif
 	#ifdef KVI_OPTIONS_WIDGET_GROUP_KviTaskBarOptionsWidget
 	e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviTaskBarOptionsWidget;
@@ -3081,7 +3080,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskBarOptionsWidget
 		e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskBarOptionsWidget;
-		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");;
+		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_GROUP_KviTreeTaskBarOptionsWidget
 		e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviTreeTaskBarOptionsWidget;
@@ -3117,7 +3116,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskBarForegroundOptionsWidget
 			e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskBarForegroundOptionsWidget;
-			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");;
+			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options");;
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_GROUP_KviTreeTaskBarForegroundOptionsWidget
 			e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviTreeTaskBarForegroundOptionsWidget;
@@ -3151,7 +3150,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskBarBackgroundOptionsWidget
 			e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskBarBackgroundOptionsWidget;
-			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");;
+			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options");;
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_GROUP_KviTreeTaskBarBackgroundOptionsWidget
 			e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviTreeTaskBarBackgroundOptionsWidget;
@@ -3185,7 +3184,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskBarFeaturesOptionsWidget
 			e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskBarFeaturesOptionsWidget;
-			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale,"options");;
+			e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options");;
 			#endif
 			#ifdef KVI_OPTIONS_WIDGET_GROUP_KviTreeTaskBarFeaturesOptionsWidget
 			e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviTreeTaskBarFeaturesOptionsWidget;
@@ -3219,7 +3218,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviClassicTaskBarOptionsWidget
 		e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviClassicTaskBarOptionsWidget;
-		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");;
+		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_GROUP_KviClassicTaskBarOptionsWidget
 		e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviClassicTaskBarOptionsWidget;
@@ -3253,7 +3252,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	#endif
 	#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviTopicLabelLookOptionsWidget
 	e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviTopicLabelLookOptionsWidget;
-	e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale,"options");;
+	e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options");;
 	#endif
 	#ifdef KVI_OPTIONS_WIDGET_GROUP_KviTopicLabelLookOptionsWidget
 	e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviTopicLabelLookOptionsWidget;
@@ -3287,7 +3286,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	#endif
 	#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviUserListLookOptionsWidget
 	e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviUserListLookOptionsWidget;
-	e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale,"options");;
+	e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options");;
 	#endif
 	#ifdef KVI_OPTIONS_WIDGET_GROUP_KviUserListLookOptionsWidget
 	e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviUserListLookOptionsWidget;
@@ -3323,7 +3322,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviUserListLookBackgroundOptionsWidget
 		e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviUserListLookBackgroundOptionsWidget;
-		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");;
+		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_GROUP_KviUserListLookBackgroundOptionsWidget
 		e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviUserListLookBackgroundOptionsWidget;
@@ -3357,7 +3356,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviUserListLookForegroundOptionsWidget
 		e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviUserListLookForegroundOptionsWidget;
-		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");;
+		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_GROUP_KviUserListLookForegroundOptionsWidget
 		e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviUserListLookForegroundOptionsWidget;
@@ -3391,7 +3390,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviUserListGridOptionsWidget
 		e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviUserListGridOptionsWidget;
-		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");;
+		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_GROUP_KviUserListGridOptionsWidget
 		e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviUserListGridOptionsWidget;
@@ -3425,7 +3424,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviUserListFeaturesOptionsWidget
 		e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviUserListFeaturesOptionsWidget;
-		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale,"options");;
+		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
 		#endif
 		#ifdef KVI_OPTIONS_WIDGET_GROUP_KviUserListFeaturesOptionsWidget
 		e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviUserListFeaturesOptionsWidget;
@@ -3463,9 +3462,9 @@ void KviOptionsInstanceManager::deleteInstanceTree(KviPointerList<KviOptionsWidg
 					delete e->pWidget->parent();
 					e->pWidget =  0;
 				} else {
-					qDebug("Ops...i have deleted the options dialog ?");
+					debug("Ops...i have deleted the options dialog ?");
 				}
-			} //else qDebug("Clas %s has no widget",e->szName);
+			} //else debug("Clas %s has no widget",e->szName);
 			if(e->pChildList)deleteInstanceTree(e->pChildList);
 		}
 		delete l;
@@ -3475,7 +3474,7 @@ void KviOptionsInstanceManager::deleteInstanceTree(KviPointerList<KviOptionsWidg
 
 KviOptionsInstanceManager::~KviOptionsInstanceManager()
 {
-	if(m_pInstanceTree) qDebug("Ops...KviOptionsInstanceManager::cleanup() not called ?");
+	if(m_pInstanceTree)debug("Ops...KviOptionsInstanceManager::cleanup() not called ?");
 }
 
 void KviOptionsInstanceManager::cleanup(KviModule * m)
@@ -3582,8 +3581,3 @@ KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(con
 	return findInstanceEntry(clName,m_pInstanceTree);
 }
 
-
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_instances.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
-
diff --git a/src/modules/options/instances.h b/src/modules/options/instances.h
index 5e7c05e59..12f10a42c 100644
--- a/src/modules/options/instances.h
+++ b/src/modules/options/instances.h
@@ -1,3 +1,5 @@
+
+
 #ifndef __OPTIONS_INSTANCES_H__
 #define __OPTIONS_INSTANCES_H__
 
@@ -36,6 +38,7 @@
 
 typedef struct _KviOptionsWidgetInstanceEntry KviOptionsWidgetInstanceEntry;
 
+
 typedef struct _KviOptionsWidgetInstanceEntry
 {
 	KviOptionsWidget                          * (*createProc)(QWidget *);
diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp
index b67695112..cd23e31f6 100644
--- a/src/modules/options/libkvioptions.cpp
+++ b/src/modules/options/libkvioptions.cpp
@@ -192,7 +192,7 @@ static bool options_kvs_cmd_edit(KviKvsModuleCommandCall * c)
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("option",KVS_PT_STRING,0,szOption)
 	KVSM_PARAMETERS_END(c)
-	KviOptionsWidgetInstanceEntry * e = g_pOptionsInstanceManager->findInstanceEntry(szOption);
+	KviOptionsWidgetInstanceEntry * e = g_pOptionsInstanceManager->findInstanceEntry(szOption.toUtf8().data());
 	if(!e)
 	{
 		c->warning(__tr2qs_ctx("No such options page class name %Q","options"),&szOption);
diff --git a/src/modules/options/mkcreateinstanceproc.sh b/src/modules/options/mkcreateinstanceproc.sh
index f421f4bc3..337b8eb07 100755
--- a/src/modules/options/mkcreateinstanceproc.sh
+++ b/src/modules/options/mkcreateinstanceproc.sh
@@ -239,7 +239,7 @@ printclass()
 
 	echo "$3	#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_$2" >> $TARGET
 	echo "$3	e$1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_$2;" >> $TARGET
-	echo "$3	e$1->szKeywords = __tr2qs_ctx_no_xgettext(e$1->szKeywordsNoLocale,\"options\");;" >> $TARGET
+	echo "$3	e$1->szKeywords = __tr2qs_ctx_no_xgettext(e$1->szKeywordsNoLocale.toUtf8().data(),\"options\");;" >> $TARGET
 	echo "$3	#endif" >> $TARGET
 
 	echo "$3	#ifdef KVI_OPTIONS_WIDGET_GROUP_$2" >> $TARGET
@@ -433,9 +433,6 @@ KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(con
 	return findInstanceEntry(clName,m_pInstanceTree);
 }
 
-
-#include "m_instances.moc"
-
 EOF
 ######################################################################################################
 
diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp
index 4036a5592..237e9c843 100644
--- a/src/modules/options/optw_messages.cpp
+++ b/src/modules/options/optw_messages.cpp
@@ -283,7 +283,7 @@ void KviMessageListViewItem::paintCell(QPainter * p,const QColorGroup &,int,int
 	// skip the msgtype prefix
 	QString txt = g_msgtypeOptionsTable[m_iOptId].name.remove(0,7);
 	txt += " (";
-	txt += __tr2qs_no_xgettext(QString::fromUtf8(m_pMsgType->type()));
+	txt += __tr2qs_no_xgettext(m_pMsgType->type());
 	txt += ")";
 	p->drawText(24,listView()->itemMargin(),w - 24,height() - (listView()->itemMargin() * 2),Qt::AlignLeft | Qt::AlignVCenter,txt);
 	if(isSelected())
@@ -609,7 +609,7 @@ void KviMessageColorsOptionsWidget::load()
 	//qDebug("SYMLINKING %s to %s",szGlobal.ptr(),szLocal.ptr());
 	//qDebug("SYMLINK RETURNS %d (%d)",::symlink(szGlobal.ptr(),szLocal.ptr()));
 	//qDebug("ERRNO (%d)",errno);
-	symlink(szGlobal,szLocal);
+	symlink(szGlobal.toLocal8Bit().data(),szLocal.toLocal8Bit().data());
 	// FIXME: Do it also on windows...
 #endif
 
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
index a46c7d010..60e097efb 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/optw_servers.cpp
@@ -1534,13 +1534,12 @@ void KviServerOptionsWidget::removeCurrent()
 	}
 }
 
-KviServerOptionsListViewItem * KviServerOptionsWidget::findNetItem(const char * netname)
+KviServerOptionsListViewItem * KviServerOptionsWidget::findNetItem(const QString &netname)
 {
 	KviServerOptionsListViewItem * it = (KviServerOptionsListViewItem *)m_pListView->firstChild();
 	while(it)
 	{
-		KviStr szNetName = it->text(0);
-		if(kvi_strEqualCI(szNetName.ptr(),netname))return it;
+		if(KviQString::equalCI(it->text(0),netname))return it;
 		it = (KviServerOptionsListViewItem *)it->nextSibling();
 	}
 	return 0;
diff --git a/src/modules/options/optw_servers.h b/src/modules/options/optw_servers.h
index 5cdf8f335..97a773f9e 100644
--- a/src/modules/options/optw_servers.h
+++ b/src/modules/options/optw_servers.h
@@ -184,7 +184,7 @@ protected:
 private:
 	void fillServerList();
 	void saveLastItem();
-	KviServerOptionsListViewItem * findNetItem(const char * netname);
+	KviServerOptionsListViewItem * findNetItem(const QString &netname);
 protected slots:
 	void importerDead();
 	void importServer(const KviIrcServer & s,const QString &network);
diff --git a/src/modules/regchan/libkviregchan.cpp b/src/modules/regchan/libkviregchan.cpp
index 2cf23b1ee..e39406f4a 100644
--- a/src/modules/regchan/libkviregchan.cpp
+++ b/src/modules/regchan/libkviregchan.cpp
@@ -110,8 +110,8 @@ static bool regchan_kvs_cmd_remove(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("network",KVS_PT_NONEMPTYSTRING,0,szNetwork)
 	KVSM_PARAMETERS_END(c)
 	KviRegisteredChannel * ch;
-	if(c->hasSwitch('e',"exactly"))ch = g_pRegisteredChannelDataBase->findExact(szChan,szNetwork);
-	else ch = g_pRegisteredChannelDataBase->find(szChan,szNetwork);
+	if(c->hasSwitch('e',"exactly"))ch = g_pRegisteredChannelDataBase->findExact(szChan.toUtf8().data(),szNetwork.toUtf8().data());
+	else ch = g_pRegisteredChannelDataBase->find(szChan.toUtf8().data(),szNetwork.toUtf8().data());
 	if(ch)
 	{
 		g_pRegisteredChannelDataBase->remove(ch);
@@ -162,15 +162,15 @@ static bool regchan_kvs_cmd_setProperty(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("value",KVS_PT_STRING,0,szValue)
 	KVSM_PARAMETERS_END(c)
 	KviRegisteredChannel * ch;
-	if(c->hasSwitch('e',"exactly"))ch = g_pRegisteredChannelDataBase->findExact(szChan,szNetwork);
-	else ch = g_pRegisteredChannelDataBase->find(szChan,szNetwork);
+	if(c->hasSwitch('e',"exactly"))ch = g_pRegisteredChannelDataBase->findExact(szChan.toUtf8().data(),szNetwork.toUtf8().data());
+	else ch = g_pRegisteredChannelDataBase->find(szChan.toUtf8().data(),szNetwork.toUtf8().data());
 	if(ch)
 	{
 		if(!szValue.isEmpty())
 		{
 			ch->setProperty(szProperty.toUtf8().data(),new KviStr(szValue));
 		} else {
-			ch->removeProperty(szProperty);
+			ch->removeProperty(szProperty.toUtf8().data());
 		}
 	} else {
 		if(!c->hasSwitch('q',"quiet")) c->warning(__tr2qs("No such channel/netmask entry in the database"));
@@ -309,10 +309,10 @@ static bool regchan_kvs_fnc_property(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("network",KVS_PT_STRING,0,szNetwork)
 		KVSM_PARAMETER("property name",KVS_PT_NONEMPTYSTRING,0,szPropertyName)
 	KVSM_PARAMETERS_END(c)
-	KviRegisteredChannel * ch = g_pRegisteredChannelDataBase->find(szChan,szNetwork);
+	KviRegisteredChannel * ch = g_pRegisteredChannelDataBase->find(szChan.toUtf8().data(),szNetwork.toUtf8().data());
 	if(ch)
 	{
-		KviStr * p = ch->property(szPropertyName);
+		KviStr * p = ch->property(szPropertyName.toUtf8().data());
 		if(p)c->returnValue()->setString(p->ptr());
 	} //else c->warning(__tr("User %s not found"),parms->safeFirstParam());
 	return true;
@@ -347,7 +347,7 @@ static bool regchan_kvs_fnc_match(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("channel name",KVS_PT_STRING,0,szChan)
 		KVSM_PARAMETER("network",KVS_PT_STRING,0,szNetwork)
 	KVSM_PARAMETERS_END(c)
-	KviRegisteredChannel * ch = g_pRegisteredChannelDataBase->find(szChan,szNetwork);
+	KviRegisteredChannel * ch = g_pRegisteredChannelDataBase->find(szChan.toUtf8().data(),szNetwork.toUtf8().data());
 	c->returnValue()->setBoolean(ch);
 	return true;
 }
@@ -383,7 +383,7 @@ static bool regchan_kvs_fnc_find(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("channel name",KVS_PT_STRING,0,szChan)
 		KVSM_PARAMETER("netmask",KVS_PT_STRING,0,szNetmask)
 	KVSM_PARAMETERS_END(c)
-	KviRegisteredChannel * ch = g_pRegisteredChannelDataBase->find(szChan,szNetmask);
+	KviRegisteredChannel * ch = g_pRegisteredChannelDataBase->find(szChan.toUtf8().data(),szNetmask.toUtf8().data());
 	c->returnValue()->setBoolean(ch);
 	return true;
 }
diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp
index 731bf5d92..203748675 100644
--- a/src/modules/reguser/edituser.cpp
+++ b/src/modules/reguser/edituser.cpp
@@ -410,10 +410,10 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(QWidget *p,KviRegiste
 	m_pAvatar = 0;

 	if(r)

 	{

-		const char * av = r->getProperty("avatar");

-		if(av)

+		const QString av = r->getProperty("avatar");

+		if(!av.isEmpty())

 		{

-			m_pAvatar = new KviPixmap(av);

+			m_pAvatar = new KviPixmap(av.toUtf8().data());

 		}

 	}

 	if(!m_pAvatar)m_pAvatar = new KviPixmap();

diff --git a/src/modules/reguser/wizard.cpp b/src/modules/reguser/wizard.cpp
index 6d5638926..206a75856 100644
--- a/src/modules/reguser/wizard.cpp
+++ b/src/modules/reguser/wizard.cpp
@@ -46,7 +46,7 @@
 extern KVIRC_API KviRegisteredUserDataBase * g_pRegisteredUserDataBase;
 extern KviPointerList<KviRegistrationWizard> * g_pRegistrationWizardList;
 
-KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegisteredUserDataBase * db,QWidget * par,bool bModal)
+KviRegistrationWizard::KviRegistrationWizard(const QString &startMask,KviRegisteredUserDataBase * db,QWidget * par,bool bModal)
 : KviTalWizard(par)
 {
 	m_pDb = db;
@@ -55,7 +55,7 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere
 	
 	m_bModal = bModal;
 
-	KviIrcMask mask(startMask ? startMask : "*!*@*");
+	KviIrcMask mask(!startMask.isEmpty() ? startMask.toUtf8().data() : "*!*@*");
 
 	g_pRegistrationWizardList->append(this);
 
diff --git a/src/modules/reguser/wizard.h b/src/modules/reguser/wizard.h
index cc5b8c1b2..9d34aa667 100644
--- a/src/modules/reguser/wizard.h
+++ b/src/modules/reguser/wizard.h
@@ -40,7 +40,7 @@ class KviRegistrationWizard : public KviTalWizard
 {
 	Q_OBJECT
 public:
-	KviRegistrationWizard(const char * startMask,KviRegisteredUserDataBase * db = 0,QWidget * par = 0,bool bModal = false);
+	KviRegistrationWizard(const QString &startMask,KviRegisteredUserDataBase * db = 0,QWidget * par = 0,bool bModal = false);
 	~KviRegistrationWizard();
 
 	KviRegisteredUserDataBase * m_pDb;
diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp
index d30e92295..0bc3a2457 100644
--- a/src/modules/setup/setupwizard.cpp
+++ b/src/modules/setup/setupwizard.cpp
@@ -37,7 +37,7 @@ bool g_bFoundMirc;
 #include "kvi_options.h"
 #include "kvi_config.h"
 
-#include <kvi_tal_textedit.h>
+#include "kvi_tal_textedit.h"
 #include "kvi_tal_hbox.h"
 
 #include <QMessageBox>
@@ -228,11 +228,10 @@ KviSetupWizard::KviSetupWizard()
 		"will be preserved." \
 		"</p>"));
 
-	addPage(m_pDirectory,__tr2qs("Application Folders"));
 
 	QString tmp;
 
-	m_pDirButtonGroup = new KviTalVButtonGroup(__tr2qs("Store configuration in folder"),m_pDirectory->m_pVBox);
+	m_pDirButtonGroup = new KviTalGroupBox(1,Qt::Horizontal,__tr2qs("Store configuration in folder"),m_pDirectory->m_pVBox);
 	m_pDirUsePrev = new QRadioButton(__tr2qs("Use settings folder from previous installation"),m_pDirButtonGroup);
 	connect(m_pDirUsePrev,SIGNAL(clicked()),this,SLOT(oldDirClicked()));
 	
@@ -308,6 +307,7 @@ KviSetupWizard::KviSetupWizard()
 
 	//m_pDirectory->m_pVBox->setStretchFactor(m_pDirectory->m_pTextLabel,1);
 
+	addPage(m_pDirectory,__tr2qs("Application Folders"));
 	setHelpEnabled(m_pDirectory,false);
 
 	connect(m_pDataPathEdit,SIGNAL(textChanged ( const QString & )),this,SLOT(newDataTextChanged ( const QString & )));
diff --git a/src/modules/setup/setupwizard.h b/src/modules/setup/setupwizard.h
index fbd6bc9b9..6172e7765 100644
--- a/src/modules/setup/setupwizard.h
+++ b/src/modules/setup/setupwizard.h
@@ -79,7 +79,7 @@ public:
 	KviSetupPage  * m_pServers;
 	
 	// Theme
-	KviTalVButtonGroup * m_pThemeButtonGroup;
+	//KviTalGroupBox  * m_pThemeButtonGroup;
 
 	QRadioButton  * m_pThemeHiRes;
 	QRadioButton  * m_pThemeLoRes;
@@ -92,7 +92,7 @@ public:
 	//Dir
 	QLineEdit     * m_pDataPathEdit;
 	QLineEdit     * m_pIncomingPathEdit;
-	KviTalVButtonGroup * m_pDirButtonGroup;
+	KviTalGroupBox * m_pDirButtonGroup;
 	QRadioButton  * m_pDirUsePrev;
 	QRadioButton  * m_pDirUseNew;
 #ifdef COMPILE_ON_WINDOWS
diff --git a/src/modules/spaste/libkvispaste.cpp b/src/modules/spaste/libkvispaste.cpp
index 4b8c5215a..41fcf2023 100644
--- a/src/modules/spaste/libkvispaste.cpp
+++ b/src/modules/spaste/libkvispaste.cpp
@@ -26,6 +26,7 @@
 
 #include "kvi_module.h"
 #include "kvi_fileutils.h"
+#include "kvi_qstring.h"
 #include "kvi_app.h"
 #include "kvi_locale.h"
 #include "kvi_console.h"
@@ -219,7 +220,7 @@ static bool spaste_kvs_cmd_stop(KviKvsModuleCommandCall * c)
 				while( (item = it.current()) != 0)
 				{
 					++it;
-					if(kvi_strEqualCS(item->window()->id(),c->window()->id()))delete item;
+					if(KviQString::equalCS(item->window()->id(),c->window()->id()))delete item;
 				}
 			}
 		} else {
diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp
index 38023226a..63efd9a16 100644
--- a/src/modules/system/libkvisystem.cpp
+++ b/src/modules/system/libkvisystem.cpp
@@ -45,7 +45,7 @@
 	#include <unistd.h>
 #endif
 
-#ifdef COMPILE_KDE_SUPPORT
+#ifdef COMPILE_KDE3_SUPPORT
 	#include <dcopclient.h>
 #endif
 
@@ -466,7 +466,7 @@ static bool system_kvs_fnc_dcop(KviKvsModuleFunctionCall *c)
 		}
 	}
 
-#ifdef COMPILE_KDE_SUPPORT
+#ifdef COMPILE_KDE3_SUPPORT
 
 	QByteArray ba;
 	QDataStream ds(ba, IO_WriteOnly);
diff --git a/src/modules/term/libkviterm.cpp b/src/modules/term/libkviterm.cpp
index 9cd217c18..6ddba21d4 100644
--- a/src/modules/term/libkviterm.cpp
+++ b/src/modules/term/libkviterm.cpp
@@ -28,7 +28,7 @@
 
 #include <QSplitter>
 
-#ifdef COMPILE_KDE_SUPPORT
+#ifdef COMPILE_KDE3_SUPPORT
 	#include "termwidget.h"
 	#include "termwindow.h"
 
@@ -40,7 +40,7 @@
 
 KviModule * g_pTermModule = 0;
 
-#ifdef COMPILE_KDE_SUPPORT
+#ifdef COMPILE_KDE3_SUPPORT
 	KviPointerList<KviTermWidget> * g_pTermWidgetList      = 0;
 	KviPointerList<KviTermWindow> * g_pTermWindowList      = 0;
 	KviStr                 g_szKonsoleLibraryName = "";
@@ -71,7 +71,7 @@ KviModule * g_pTermModule = 0;
 
 static bool term_kvs_cmd_open(KviKvsModuleCommandCall * c)
 {
-#ifdef COMPILE_KDE_SUPPORT
+#ifdef COMPILE_KDE3_SUPPORT
 	if(g_szKonsoleLibraryName.hasData())
 	{
 		c->module()->lock(); // multiple locks are allowed
@@ -97,7 +97,7 @@ static bool term_module_init(KviModule * m)
 {
 	g_pTermModule = m;
 
-#ifdef COMPILE_KDE_SUPPORT
+#ifdef COMPILE_KDE3_SUPPORT
 	g_pTermWidgetList = new KviPointerList<KviTermWidget>;
 	g_pTermWidgetList->setAutoDelete(false);
 	g_pTermWindowList = new KviPointerList<KviTermWindow>;
@@ -136,7 +136,7 @@ static bool term_module_init(KviModule * m)
 
 static bool term_module_cleanup(KviModule *m)
 {
-#ifdef COMPILE_KDE_SUPPORT
+#ifdef COMPILE_KDE3_SUPPORT
 	while(g_pTermWidgetList->first())delete g_pTermWidgetList->first();
 	delete g_pTermWidgetList;
 	g_pTermWidgetList = 0;
diff --git a/src/modules/term/termwidget.cpp b/src/modules/term/termwidget.cpp
index a972f0cc6..8356f5cef 100644
--- a/src/modules/term/termwidget.cpp
+++ b/src/modules/term/termwidget.cpp
@@ -33,7 +33,7 @@
 #include <QToolTip>
 #include <QTimer>
 
-#ifdef COMPILE_KDE_SUPPORT
+#ifdef COMPILE_KDE3_SUPPORT
 
 	#include "klibloader.h"
 	#include "kparts/part.h"
diff --git a/src/modules/term/termwidget.h b/src/modules/term/termwidget.h
index 3ea54023f..933b2bc2e 100644
--- a/src/modules/term/termwidget.h
+++ b/src/modules/term/termwidget.h
@@ -24,7 +24,7 @@
 
 #include "kvi_settings.h"
 
-#ifdef COMPILE_KDE_SUPPORT
+#ifdef COMPILE_KDE3_SUPPORT
 	#include <QFrame>
 	#include <QLabel>
 	#include <QPushButton>
diff --git a/src/modules/term/termwindow.cpp b/src/modules/term/termwindow.cpp
index 0b8d08215..f1af07634 100644
--- a/src/modules/term/termwindow.cpp
+++ b/src/modules/term/termwindow.cpp
@@ -22,7 +22,7 @@
 #include "termwindow.h"
 #include "termwidget.h"
 
-#ifdef COMPILE_KDE_SUPPORT
+#ifdef COMPILE_KDE3_SUPPORT
 	#include "kvi_iconmanager.h"
 	#include "kvi_options.h"
 	#include "kvi_locale.h"
diff --git a/src/modules/term/termwindow.h b/src/modules/term/termwindow.h
index ec71c6b65..90bea80c6 100644
--- a/src/modules/term/termwindow.h
+++ b/src/modules/term/termwindow.h
@@ -24,7 +24,7 @@
 
 #include "kvi_settings.h"
 
-#ifdef COMPILE_KDE_SUPPORT
+#ifdef COMPILE_KDE3_SUPPORT
 	#include "kvi_window.h"
 	#include "kvi_string.h"
 	
diff --git a/src/modules/tip/libkvitip.cpp b/src/modules/tip/libkvitip.cpp
index 3b11aa5c1..ef1d7d4fe 100644
--- a/src/modules/tip/libkvitip.cpp
+++ b/src/modules/tip/libkvitip.cpp
@@ -160,7 +160,7 @@ bool KviTipWindow::openConfig(QString filename,bool bEnsureExists)
 //	m_szConfigFileName.cutToLast('/');

 

 	QString buffer;

-	g_pApp->getReadOnlyConfigPath(buffer,m_szConfigFileName,KviApp::ConfigPlugins,true);

+	g_pApp->getReadOnlyConfigPath(buffer,m_szConfigFileName.toUtf8().data(),KviApp::ConfigPlugins,true);

 	debug("Check path %s and file %s",buffer.toUtf8().data(),m_szConfigFileName.toUtf8().data());

 	if(bEnsureExists)

 	{

diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp
index 9e1e7ab2e..8f796139c 100644
--- a/src/modules/window/libkviwindow.cpp
+++ b/src/modules/window/libkviwindow.cpp
@@ -1047,7 +1047,7 @@ static bool window_kvs_fnc_open(KviKvsModuleFunctionCall * c)
 
 	KviUserWindow * wnd = new KviUserWindow(
 		c->window()->frame(),
-		szCaption,
+		szCaption.toUtf8().data(),
 		iIcon,
 		pConsole,
 		iFlags);