diff options
Diffstat (limited to 'src/modules/objects')
| -rw-r--r-- | src/modules/objects/class_socket.cpp | 12 | ||||
| -rw-r--r-- | src/modules/objects/class_xmlreader.cpp | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp index ffbb0d6e0..e2453afdb 100644 --- a/src/modules/objects/class_socket.cpp +++ b/src/modules/objects/class_socket.cpp @@ -22,10 +22,13 @@ // //============================================================================= -#include "kvi_settings.h" -#include "kvi_qstring.h" +#include "class_socket.h" #include "class_memorybuffer.h" #include "class_file.h" + +#include "kvi_settings.h" +#include "kvi_qstring.h" + #define _KVI_DEBUG_CHECK_RANGE_ #include "kvi_debug.h" @@ -40,9 +43,8 @@ #include "kvi_malloc.h" #include "kvi_memmove.h" #include "kvi_databuffer.h" -#include "kvi_qcstring.h" -#include "class_socket.h" +#include <QByteArray> //#include <stdlib.h> @@ -531,7 +533,7 @@ KVSO_CLASS_FUNCTION(socket,write) pVariantData->asString(szData); if(!KviFileUtils::fileExists(szData)) { - KviQCString szData8 = szData.toUtf8(); + QByteArray szData8 = szData.toUtf8(); if(szData8.length() > 0) { m_pOutBuffer->append((const unsigned char*)szData8.data(),szData8.length()); diff --git a/src/modules/objects/class_xmlreader.cpp b/src/modules/objects/class_xmlreader.cpp index f49ea7e64..4e2a1605d 100644 --- a/src/modules/objects/class_xmlreader.cpp +++ b/src/modules/objects/class_xmlreader.cpp @@ -347,7 +347,7 @@ KVSO_CLASS_FUNCTION(xmlreader,parse) // We have a problem here.. most kvirc functions already interpret the data // read from files. We should have binary data handling features to get this to work correctly. // The following snippet of code tries to provide a best-effort workaround. - KviQCString utf8data = KviQString::toUtf8(szString); + QByteArray utf8data = KviQString::toUtf8(szString); QByteArray data = utf8data; data.truncate(utf8data.length()); // don't include the null terminator in data source.setData(data); |