diff options
Diffstat (limited to 'src/modules/objects')
| -rw-r--r-- | src/modules/objects/class_combobox.cpp | 2 | ||||
| -rw-r--r-- | src/modules/objects/class_listbox.cpp | 2 | ||||
| -rw-r--r-- | src/modules/objects/class_socket.cpp | 8 | ||||
| -rw-r--r-- | src/modules/objects/class_widget.cpp | 2 | ||||
| -rw-r--r-- | src/modules/objects/class_wrapper.cpp | 4 | ||||
| -rw-r--r-- | src/modules/objects/class_xmlreader.cpp | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/src/modules/objects/class_combobox.cpp b/src/modules/objects/class_combobox.cpp index 38fc015ea..1df1d9c9f 100644 --- a/src/modules/objects/class_combobox.cpp +++ b/src/modules/objects/class_combobox.cpp @@ -224,7 +224,7 @@ bool KviKvsObject_combobox::functioncount(KviKvsObjectFunctionCall *c) } bool KviKvsObject_combobox::functioncurrent(KviKvsObjectFunctionCall *c) { - if (widget()) c->returnValue()->setString(((QComboBox *)widget())->currentText().local8Bit().data()); + if (widget()) c->returnValue()->setString(((QComboBox *)widget())->currentText().toLocal8Bit().data()); return true; } bool KviKvsObject_combobox::functioncurrentItem(KviKvsObjectFunctionCall *c) diff --git a/src/modules/objects/class_listbox.cpp b/src/modules/objects/class_listbox.cpp index cb44cb5aa..c7275afba 100644 --- a/src/modules/objects/class_listbox.cpp +++ b/src/modules/objects/class_listbox.cpp @@ -226,7 +226,7 @@ bool KviKvsObject_listbox::functioncount(KviKvsObjectFunctionCall *c) } bool KviKvsObject_listbox::functioncurrentText(KviKvsObjectFunctionCall *c) { - if (widget()) c->returnValue()->setString(((KviTalListBox *)widget())->currentText().local8Bit().data()); + if (widget()) c->returnValue()->setString(((KviTalListBox *)widget())->currentText().toLocal8Bit().data()); return true; } bool KviKvsObject_listbox::functioncurrentItem(KviKvsObjectFunctionCall *c) diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp index 48ebddbd9..7f1741bed 100644 --- a/src/modules/objects/class_socket.cpp +++ b/src/modules/objects/class_socket.cpp @@ -546,7 +546,7 @@ bool KviKvsObject_socket::functionWriteHex(KviKvsObjectFunctionCall *c) szTmp=m_szHex.setNum(m_szHex.toInt(&bOk,16),16); if(szTmp.length()>0) { - KviQCString szData8 = szTmp.utf8(); + KviQCString szData8 = szTmp.toUtf8(); m_pOutBuffer->append((const unsigned char *)(szData8.data()),szData8.length()); delayedFlush(0); c->returnValue()->setInteger(szData8.length()); @@ -938,12 +938,12 @@ debug ("Socket created"); unsigned int uOldConnectionId = m_uConnectionId; QString callBackError=__tr2qs("Connect failure: "); - callBackError.append((KviError::getDescription(KviError::translateSystemError(sockError)).utf8().data())); + callBackError.append((KviError::getDescription(KviError::translateSystemError(sockError)).toUtf8().data())); callFunction(this,"connectFailedEvent",new KviKvsVariantList( new KviKvsVariant(callBackError))); /* callEventFunction("connectFailedEvent",0,new KviParameterList( - new KviStr(KviStr::Format,__tr("Connect failure: %s"),KviError::getDescription(KviError::translateSystemError(sockError)).utf8().data()))); + new KviStr(KviStr::Format,__tr("Connect failure: %s"),KviError::getDescription(KviError::translateSystemError(sockError)).toUtf8().data()))); */ if(m_uConnectionId == uOldConnectionId)reset(); // else it has already been called! return; @@ -1315,7 +1315,7 @@ bool KviKvsObject_socket::functionWrite(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("szData",KVS_PT_STRING,0,szData) KVSO_PARAMETERS_END(c) -KviQCString szData8 = szData.utf8(); +KviQCString szData8 = szData.toUtf8(); if(szData8.length() > 0) { m_pOutBuffer->append((const unsigned char*)szData8.data(),szData8.length()); diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp index d511c59ce..215d7e51a 100644 --- a/src/modules/objects/class_widget.cpp +++ b/src/modules/objects/class_widget.cpp @@ -1384,7 +1384,7 @@ bool KviKvsObject_widget::function_setCaption(KviKvsObjectFunctionCall *c) bool KviKvsObject_widget::function_caption(KviKvsObjectFunctionCall *c)
{
- if(widget()) c->returnValue()->setString(widget()->caption().utf8().data());
+ if(widget()) c->returnValue()->setString(widget()->caption().toUtf8().data());
return true;
}
diff --git a/src/modules/objects/class_wrapper.cpp b/src/modules/objects/class_wrapper.cpp index d3abfa558..d45dac910 100644 --- a/src/modules/objects/class_wrapper.cpp +++ b/src/modules/objects/class_wrapper.cpp @@ -135,8 +135,8 @@ bool KviKvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis szClass = s; szName = ""; } - debug ("szClass %s",szClass.utf8().data()); - debug ("szName %s",szName.utf8().data()); + debug ("szClass %s",szClass.toUtf8().data()); + debug ("szName %s",szName.toUtf8().data()); debug ("s %s",s.data()); if(KviQString::equalCI(szClass,"WinId")) diff --git a/src/modules/objects/class_xmlreader.cpp b/src/modules/objects/class_xmlreader.cpp index cb7781409..df0beae5d 100644 --- a/src/modules/objects/class_xmlreader.cpp +++ b/src/modules/objects/class_xmlreader.cpp @@ -325,7 +325,7 @@ bool KviKvsObject_xmlreader::function_parse(KviKvsObjectFunctionCall *c) QByteArray data = utf8data; data.truncate(utf8data.length()); // don't include the null terminator in data source.setData(data); - //debug("PARSING(%s) LEN(%d)",szString.utf8().data(),szString.utf8().length()); + //debug("PARSING(%s) LEN(%d)",szString.toUtf8().data(),szString.toUtf8().length()); QXmlSimpleReader reader; reader.setContentHandler(&handler); reader.setErrorHandler(&handler); |
