Skip to content

Commit

Permalink
fix for #28 when another app instance is running; not it doesn't hang…
Browse files Browse the repository at this point in the history
… app on exit
  • Loading branch information
krzemin committed Dec 12, 2015
1 parent b26f0d5 commit 37fe500
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/qcumber/qinterprocesschannel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ void QInterProcessChannel::sendMessage()
*/
void QInterProcessChannel::sendMessage(const QString& s)
{
sendMessage(s.toLocal8Bit());
sendMessage(s.toUtf8());
}
/*!
\brief Send a message to server instance
Expand Down
2 changes: 1 addition & 1 deletion src/qcumber/qinterprocesschannel_win32.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ void QInterProcessChannel::sendMessage()
*/
void QInterProcessChannel::sendMessage(const QString& s)
{
sendMessage(s.toLocal8Bit());
sendMessage(s.toUtf8());
}
/*!
\brief Send a message to server instance
Expand Down
6 changes: 3 additions & 3 deletions src/qcumber/qmanagedrequest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ QManagedRequest& QManagedRequest::operator = (const QManagedRequest& r)

QString QManagedRequest::toString() const
{
return QString::fromLocal8Bit(joinArguments(sCommand, lArguments));
return QString::fromUtf8(joinArguments(sCommand, lArguments));
}

QManagedRequest QManagedRequest::fromString(const QString& s)
Expand Down Expand Up @@ -105,7 +105,7 @@ QByteArray QManagedRequest::joinArguments(const QString& cmd, const QStringList&
{
QByteArray msg;

msg += cmd.toLocal8Bit();
msg += cmd.toUtf8();

foreach ( QString a, l )
{
Expand All @@ -116,7 +116,7 @@ QByteArray QManagedRequest::joinArguments(const QString& cmd, const QStringList&
a = "\"" + a + "\"";

msg += " ";
msg += a.toLocal8Bit();
msg += a.toUtf8();
}

return msg;
Expand Down
2 changes: 1 addition & 1 deletion src/qcumber/qmanagedsocket.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ void QManagedSocket::readyRead()
{
if ( pSocket )
{
QString msg = QString::fromLocal8Bit(pSocket->readAll());
QString msg = QString::fromUtf8(pSocket->readAll());

emit message(msg);
emit message(msg, this);
Expand Down

0 comments on commit 37fe500

Please sign in to comment.