2 files changed, 6 insertions, 26 deletions
diff --git a/src/tools/canbusutil/canbusutil.cpp b/src/tools/canbusutil/canbusutil.cpp
index 8421caf..68dbab2 100644
--- a/src/tools/canbusutil/canbusutil.cpp
+++ b/src/tools/canbusutil/canbusutil.cpp
@@ -89,7 +89,7 @@ void CanBusUtil::printUsage()
 
 void CanBusUtil::printPlugins()
 {
-    QList<QByteArray> plugins = canBus->plugins();
+    const QStringList plugins = canBus->plugins();
     output << "Plugins: " << endl;
     for (int i = 0; i < plugins.size(); i++)
         output << plugins.at(i) << endl;
@@ -222,7 +222,7 @@ bool CanBusUtil::parsePayloadField(QString payload, bool &rtrFrame,
 bool CanBusUtil::connectCanDevice()
 {
     bool foundPlugin = false;
-    QList<QByteArray> plugins = canBus->plugins();
+    const QStringList plugins = canBus->plugins();
     for (int i = 0; i < plugins.size(); i++)
     {
         if (plugins.at(i) == pluginName) {
diff --git a/src/tools/canbusutil/readtask.cpp b/src/tools/canbusutil/readtask.cpp
index bb9b344..6c09e02 100644
--- a/src/tools/canbusutil/readtask.cpp
+++ b/src/tools/canbusutil/readtask.cpp
@@ -51,33 +51,13 @@ void ReadTask::checkMessages() {
 
     const QCanBusFrame frame = canDevice->readFrame();
 
-    const qint32 id = frame.frameId();
-    const qint8 dataLength = frame.payload().size();
-
     QString view;
-    if (frame.frameType() == QCanBusFrame::ErrorFrame) {
+    if (frame.frameType() == QCanBusFrame::ErrorFrame)
         view = canDevice->interpretErrorFrame(frame);
-    } else {
-        view += QLatin1String("Id: ");
-        view += QString::number(id, 16);
-        view += QLatin1String(" bytes: ");
-        view += QString::number(dataLength, 10);
-        view += QLatin1String(" data:");
-        QByteArray array = frame.payload();
-        for (int i=0; i < array.size(); i++) {
-            view += QLatin1String(" 0x");
-            quint8 number = array[i];
-            view += QString::number(number, 16);
-        }
-    }
+    else
+        view = frame.toString();
 
-    if (frame.frameType() == QCanBusFrame::RemoteRequestFrame) {
-        output << "RTR: " << view << endl;
-    } else if (frame.frameType() == QCanBusFrame::ErrorFrame) {
-        output << "ERR: " << view << endl;
-    } else {
-        output << view << endl;
-    }
+    output << view << endl;
 }
 
 void ReadTask::receiveError(QCanBusDevice::CanBusError /*error*/) {