Revert "eliminate local 8-bit conversion in qcumber, which fixes #28 …

…when another app instance is running (at least on Windows)" as it causes app to hang at exit This reverts commit 2f9fff8.
QNapi · Dec 12, 2015 · b26f0d5 · b26f0d5
1 parent 75cae32
commit b26f0d5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/qcumber/qinterprocesschannel.cpp b/src/qcumber/qinterprocesschannel.cpp
@@ -117,7 +117,7 @@ void QInterProcessChannel::sendMessage()
 */
 void QInterProcessChannel::sendMessage(const QString& s)
 {
-    sendMessage(s);
+    sendMessage(s.toLocal8Bit());
 }
 /*!
     \brief Send a message to server instance

diff --git a/src/qcumber/qinterprocesschannel_win32.cpp b/src/qcumber/qinterprocesschannel_win32.cpp
@@ -95,7 +95,7 @@ void QInterProcessChannel::sendMessage()
 */
 void QInterProcessChannel::sendMessage(const QString& s)
 {
-    sendMessage(s);
+    sendMessage(s.toLocal8Bit());
 }
 /*!
     \brief Send a message to server instance

diff --git a/src/qcumber/qmanagedrequest.cpp b/src/qcumber/qmanagedrequest.cpp
@@ -58,7 +58,7 @@ QManagedRequest& QManagedRequest::operator = (const QManagedRequest& r)
 
 QString QManagedRequest::toString() const
 {
-    return joinArguments(sCommand, lArguments);
+    return QString::fromLocal8Bit(joinArguments(sCommand, lArguments));
 }
 
 QManagedRequest QManagedRequest::fromString(const QString& s)
@@ -105,7 +105,7 @@ QByteArray QManagedRequest::joinArguments(const QString& cmd, const QStringList&
 {
     QByteArray msg;
 
-    msg += cmd;
+    msg += cmd.toLocal8Bit();
 
     foreach ( QString a, l )
     {
@@ -116,7 +116,7 @@ QByteArray QManagedRequest::joinArguments(const QString& cmd, const QStringList&
             a = "\"" + a + "\"";
 
         msg += " ";
-        msg += a;
+        msg += a.toLocal8Bit();
     }
 
     return msg;

diff --git a/src/qcumber/qmanagedsocket.cpp b/src/qcumber/qmanagedsocket.cpp
@@ -51,7 +51,7 @@ void QManagedSocket::readyRead()
 {
     if ( pSocket )
     {
-        QString msg = pSocket->readAll();
+        QString msg = QString::fromLocal8Bit(pSocket->readAll());
 
         emit message(msg);
         emit message(msg, this);