[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kstars] kstars/indi: use std::string from libindi
From:       Jasem Mutlaq <mutlaqja () ikarustech ! com>
Date:       2014-11-30 21:50:38
Message-ID: E1XvCO6-00041E-1q () scm ! kde ! org
[Download RAW message or body]

Git commit 97c3d53af2998420f7646b3a482417d00c291ec8 by Jasem Mutlaq.
Committed on 30/11/2014 at 21:50.
Pushed by mutlaqja into branch 'master'.

use std::string from libindi

M  +2    -1    kstars/indi/indidevice.cpp

http://commits.kde.org/kstars/97c3d53af2998420f7646b3a482417d00c291ec8

diff --git a/kstars/indi/indidevice.cpp b/kstars/indi/indidevice.cpp
index f52decc..2a05ca6 100644
--- a/kstars/indi/indidevice.cpp
+++ b/kstars/indi/indidevice.cpp
@@ -268,7 +268,8 @@ void INDI_D::updateMessageLog(INDI::BaseDevice *idv, int messageID)
         return;
 
     msgST_w->ensureCursorVisible();
-    msgST_w->insertPlainText(dv->messageQueue(messageID) + QString("\n"));
+    msgST_w->insertPlainText(QString::fromStdString(dv->messageQueue(messageID)));
+    msgST_w->insertPlainText("\n");
     QTextCursor c = msgST_w->textCursor();
     c.movePosition(QTextCursor::Start);
     msgST_w->setTextCursor(c);
[prev in list] [next in list] [prev in thread] [next in thread]