Preliminary KDE4 support. Now compiles and runs.

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

4 files changed, 17 insertions, 17 deletions

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 )