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

List:       kde-commits
Subject:    [plasmate/terietor/tools] engineexplorer: do a better job of showng the results of service jobs
From:       Aaron Seigo <aseigo () kde ! org>
Date:       2012-08-16 18:41:51
Message-ID: 20120816184151.70DABA60DC () git ! kde ! org
[Download RAW message or body]

Git commit c5f72cd8a64f85b512ca19962f8460e00b353fdb by Aaron Seigo.
Committed on 01/06/2011 at 00:42.
Pushed by tsiapaliwkas into branch 'terietor/tools'.

do a better job of showng the results of service jobs

M  +1    -1    engineexplorer/engineexplorer.cpp
M  +2    -1    engineexplorer/engineexplorer.h
M  +3    -1    engineexplorer/serviceviewer.cpp

http://commits.kde.org/plasmate/c5f72cd8a64f85b512ca19962f8460e00b353fdb

diff --git a/engineexplorer/engineexplorer.cpp b/engineexplorer/engineexplorer.cpp
index 90acde4..1ee0cd6 100644
--- a/engineexplorer/engineexplorer.cpp
+++ b/engineexplorer/engineexplorer.cpp
@@ -289,7 +289,7 @@ void EngineExplorer::showDataContextMenu(const QPoint &point)
     }
 }
 
-QString EngineExplorer::convertToString(const QVariant &value) const
+QString EngineExplorer::convertToString(const QVariant &value)
 {
     switch (value.type())
     {
diff --git a/engineexplorer/engineexplorer.h b/engineexplorer/engineexplorer.h
index 951a8dc..bd17efd 100644
--- a/engineexplorer/engineexplorer.h
+++ b/engineexplorer/engineexplorer.h
@@ -46,6 +46,8 @@ class EngineExplorer : public KDialog, public Ui::EngineExplorer
         void setInterval(const int interval);
         void requestSource(const QString &source);
 
+        static QString convertToString(const QVariant &value);
+
     public slots:
         void dataUpdated(const QString& source, const Plasma::DataEngine::Data& data);
 
@@ -59,7 +61,6 @@ class EngineExplorer : public KDialog, public Ui::EngineExplorer
 
     private:
         void listEngines();
-        QString convertToString(const QVariant &value) const;
         int showData(QStandardItem* parent, Plasma::DataEngine::Data data);
         void updateTitle();
 
diff --git a/engineexplorer/serviceviewer.cpp b/engineexplorer/serviceviewer.cpp
index 31270d4..ebff97a 100644
--- a/engineexplorer/serviceviewer.cpp
+++ b/engineexplorer/serviceviewer.cpp
@@ -27,6 +27,8 @@
 #include <Plasma/Service>
 #include <Plasma/ServiceJob>
 
+#include "engineexplorer.h"
+
 ServiceViewer::ServiceViewer(Plasma::DataEngine *engine, const QString &source, QWidget *parent)
     : KDialog(parent),
       m_engine(engine),
@@ -171,7 +173,7 @@ void ServiceViewer::operationResult(Plasma::ServiceJob *job)
                                       QString::number(job->error()) + ": " + job->errorString()),
                                  i18n("Operation Result"));
     } else {
-        QString result = job->result().toString();
+        QString result = EngineExplorer::convertToString(job->result());
         if (result.isEmpty()) {
             result = i18n("No response from job.");
         }

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