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

List:       kde-commits
Subject:    [kcachegrind] /: QByteArray -> QString conversion via QString::fromLocal8Bit()
From:       Christian Ehrlicher <Ch.Ehrlicher () gmx ! de>
Date:       2016-11-23 19:22:35
Message-ID: E1c9d7r-0000Cx-1w () code ! kde ! org
[Download RAW message or body]

Git commit 73340dcd3479773bc670122920ef3baafbaf7fa6 by Christian Ehrlicher.
Committed on 23/11/2016 at 19:22.
Pushed by chehrlic into branch 'master'.

QByteArray -> QString conversion via QString::fromLocal8Bit()
REVIEW: 129536

M  +1    -1    kcachegrind/toplevel.cpp
M  +1    -1    libcore/tracedata.cpp
M  +3    -3    libviews/callgraphview.cpp

https://commits.kde.org/kcachegrind/73340dcd3479773bc670122920ef3baafbaf7fa6

diff --git a/kcachegrind/toplevel.cpp b/kcachegrind/toplevel.cpp
index 74fe1b7..fc48c39 100644
--- a/kcachegrind/toplevel.cpp
+++ b/kcachegrind/toplevel.cpp
@@ -2072,7 +2072,7 @@ void TopLevel::ccReadOutput()
     if (!_ccProcess) return;
     if (p != _ccProcess) return;
 
-    _ccOutput.append(QString(_ccProcess->readAllStandardOutput()));
+    _ccOutput.append(QString::fromLocal8Bit(_ccProcess->readAllStandardOutput()));
 }
 
 void TopLevel::ccError(QProcess::ProcessError e)
diff --git a/libcore/tracedata.cpp b/libcore/tracedata.cpp
index b2a64ea..61270ea 100644
--- a/libcore/tracedata.cpp
+++ b/libcore/tracedata.cpp
@@ -3190,7 +3190,7 @@ int TraceData::internalLoad(QIODevice* device, const QString& filename)
 {
     if (!device->open( QIODevice::ReadOnly ) ) {
         _logger->loadStart(filename);
-        _logger->loadFinished(QString(strerror( errno )));
+        _logger->loadFinished(QString::fromLocal8Bit(strerror( errno )));
         return 0;
     }
 
diff --git a/libviews/callgraphview.cpp b/libviews/callgraphview.cpp
index 3d6b5ba..1b967d0 100644
--- a/libviews/callgraphview.cpp
+++ b/libviews/callgraphview.cpp
@@ -2108,7 +2108,7 @@ void CallGraphView::readDotOutput()
         return;
     }
 
-    _unparsedOutput.append(_renderProcess->readAllStandardOutput());
+    _unparsedOutput.append(QString::fromLocal8Bit(_renderProcess->readAllStandardOutput()));
 }
 
 void CallGraphView::dotError()
@@ -2123,7 +2123,7 @@ void CallGraphView::dotError()
         return;
     }
 
-    showRenderError(_renderProcess->readAllStandardError());
+    showRenderError(QString::fromLocal8Bit(_renderProcess->readAllStandardError()));
 
     // not interesting any longer
     _renderProcess->deleteLater();
@@ -2142,7 +2142,7 @@ void CallGraphView::dotExited()
         return;
     }
 
-    _unparsedOutput.append(_renderProcess->readAllStandardOutput());
+    _unparsedOutput.append(QString::fromLocal8Bit(_renderProcess->readAllStandardOutput()));
     _renderProcess->deleteLater();
     _renderProcess = 0;
 
[prev in list] [next in list] [prev in thread] [next in thread]