From kde-commits Tue May 31 22:42:35 2011 From: Aaron Seigo Date: Tue, 31 May 2011 22:42:35 +0000 To: kde-commits Subject: =?utf-8?q?=5Bkde-workspace=5D_plasma/generic/tools/engineexplore?= Message-Id: <20110531224235.009C2A60A4 () git ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=130688179019523 Git commit 3dac8034225e9f2a2fd2f7eda4b7224c66075a5b by Aaron Seigo. Committed on 01/06/2011 at 00:42. Pushed by aseigo into branch 'master'. do a better job of showng the results of service jobs M +1 -1 plasma/generic/tools/engineexplorer/engineexplorer.cpp M +2 -1 plasma/generic/tools/engineexplorer/engineexplorer.h M +3 -1 plasma/generic/tools/engineexplorer/serviceviewer.cpp http://commits.kde.org/kde-workspace/3dac8034225e9f2a2fd2f7eda4b7224c66075a5b diff --git a/plasma/generic/tools/engineexplorer/engineexplorer.cpp b/plasma/generic/tools/engineexplorer/engineexplorer.cpp index 90acde4..1ee0cd6 100644 --- a/plasma/generic/tools/engineexplorer/engineexplorer.cpp +++ b/plasma/generic/tools/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/plasma/generic/tools/engineexplorer/engineexplorer.h b/plasma/generic/tools/engineexplorer/engineexplorer.h index 951a8dc..bd17efd 100644 --- a/plasma/generic/tools/engineexplorer/engineexplorer.h +++ b/plasma/generic/tools/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/plasma/generic/tools/engineexplorer/serviceviewer.cpp b/plasma/generic/tools/engineexplorer/serviceviewer.cpp index 31270d4..ebff97a 100644 --- a/plasma/generic/tools/engineexplorer/serviceviewer.cpp +++ b/plasma/generic/tools/engineexplorer/serviceviewer.cpp @@ -27,6 +27,8 @@ #include #include +#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."); }