From 875b9b3c697182686d552cae85e136d17f36896a Mon Sep 17 00:00:00 2001
From: Szymon Tomasz Stefanek
Date: Mon, 28 Apr 2008 03:04:54 +0000
Subject: Yet more KDE4 port

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1609 17fca916-40b9-46aa-a4ea-0a15b648b75c
---
 src/modules/objects/class_checkbox.cpp      | 2 +-
 src/modules/objects/class_file.cpp          | 8 ++++----
 src/modules/objects/class_listview.cpp      | 2 +-
 src/modules/objects/class_mainwindow.cpp    | 2 +-
 src/modules/objects/class_multilineedit.cpp | 2 +-
 src/modules/objects/libkviobjects.cpp       | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/modules/objects')

diff --git a/src/modules/objects/class_checkbox.cpp b/src/modules/objects/class_checkbox.cpp
index 50a6f996d..7782b327f 100644
--- a/src/modules/objects/class_checkbox.cpp
+++ b/src/modules/objects/class_checkbox.cpp
@@ -77,7 +77,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_checkbox)
 
 bool KviKvsObject_checkbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	KviStyledCheckBox  * cb = new KviStyledCheckBox(parentScriptWidget(), getName());
+	KviStyledCheckBox  * cb = new KviStyledCheckBox(parentScriptWidget(), getName().toUtf8().data());
 	setObject(cb, true);
 	connect(cb,SIGNAL(toggled(bool)),this,SLOT(toggled(bool)));
 	connect(widget(),SIGNAL(clicked()),this,SLOT(slotClicked()));
diff --git a/src/modules/objects/class_file.cpp b/src/modules/objects/class_file.cpp
index d28f7d939..4bf98f40c 100644
--- a/src/modules/objects/class_file.cpp
+++ b/src/modules/objects/class_file.cpp
@@ -296,12 +296,12 @@ bool KviKvsObject_file::functionputch(KviKvsObjectFunctionCall *c)
 {
 	QString szChar;
 	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("char",KVS_PT_STRING,KVS_PF_OPTIONAL,szChar)
+		KVSO_PARAMETER("char",KVS_PT_STRING,0,szChar)
 	KVSO_PARAMETERS_END(c)
 	if (m_pFile)
 	{
 		if (szChar.length()>1)c->warning(__tr2qs("Argument to long, using only first char"));
-		const char *ch=szChar;
+		const char *ch=szChar.toUtf8().data();
 
 		if (!m_pFile->putChar(ch[0])) c->warning(__tr2qs("Write error occured !"));
 	}
@@ -334,7 +334,7 @@ bool KviKvsObject_file::functionunGetch(KviKvsObjectFunctionCall *c)
 	else
 	{
 		if (szChar.length()>1) c->warning(__tr2qs("Argument to long, using only first char"));
-		const char *ch=szChar;
+		const char *ch=szChar.toUtf8().data();
 		if (m_pFile->ungetch(ch[0])<0) c->warning(__tr2qs("An error occured !"));// c->error ?
 	}
 	return true;
@@ -371,7 +371,7 @@ bool KviKvsObject_file::functionwriteBlock(KviKvsObjectFunctionCall *c)
 	if (!m_pFile) return true;
 	if(!m_pFile->isOpen())
 		c->warning(__tr("File is not open !"));
-	const char *block=szBlock;
+	const char *block=szBlock.toUtf8().data();
 	int rlen = m_pFile->writeBlock(block, uLen);
 	c->returnValue()->setInteger(rlen);
 	m_pFile->flush();
diff --git a/src/modules/objects/class_listview.cpp b/src/modules/objects/class_listview.cpp
index 35cbd7e6e..2ccb4302a 100644
--- a/src/modules/objects/class_listview.cpp
+++ b/src/modules/objects/class_listview.cpp
@@ -215,7 +215,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_listview)
 
 bool KviKvsObject_listview::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(new KviKvsMdmListView(parentScriptWidget(),getName(),this),true);
+	setObject(new KviKvsMdmListView(parentScriptWidget(),getName().toUtf8().data(),this),true);
 	connect(widget(),SIGNAL(clicked(KviTalListViewItem *)),this,SLOT(slotClicked(KviTalListViewItem *)));
 	connect(widget(),SIGNAL(selectionChanged(KviTalListViewItem *)),this,SLOT(slotSelectionChanged(KviTalListViewItem *)));
 	connect(widget(),SIGNAL(selectionChanged()),this,SLOT(slotMultipleSelectionChanged()));
diff --git a/src/modules/objects/class_mainwindow.cpp b/src/modules/objects/class_mainwindow.cpp
index 870fef715..ec6f2564e 100644
--- a/src/modules/objects/class_mainwindow.cpp
+++ b/src/modules/objects/class_mainwindow.cpp
@@ -67,7 +67,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_mainwindow)
 
 bool KviKvsObject_mainwindow::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(new KviTalMainWindow(parentScriptWidget(), getName()), true);
+	setObject(new KviTalMainWindow(parentScriptWidget(), getName().toUtf8().data()), true);
 	return true;
 }
 
diff --git a/src/modules/objects/class_multilineedit.cpp b/src/modules/objects/class_multilineedit.cpp
index b3e9bf40d..2bc49b36f 100644
--- a/src/modules/objects/class_multilineedit.cpp
+++ b/src/modules/objects/class_multilineedit.cpp
@@ -341,7 +341,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_mledit)
 
 bool KviKvsObject_mledit::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams)
 {
-	setObject(new KviTalMultiLineEdit(parentScriptWidget(),getName()),true);
+	setObject(new KviTalMultiLineEdit(parentScriptWidget(),getName().toUtf8().data()),true);
 	return true;
 }
 
diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
index b108a0a85..7936063cd 100644
--- a/src/modules/objects/libkviobjects.cpp
+++ b/src/modules/objects/libkviobjects.cpp
@@ -880,7 +880,7 @@ static void dumpChildObjects(KviWindow *pWnd, QObject *parent, const char *spaci
 			n->set(idx,new KviKvsVariant(v));
 			debug ("string %s",szTemp.latin1());
 			idx++;
-			dumpChildObjects(pWnd, list.at(i), sp, bFlag, n, idx );
+			dumpChildObjects(pWnd, list.at(i), sp.toUtf8().data(), bFlag, n, idx );
 		}
 	}
 
-- 
cgit v1.3.1-10-gc9f91