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

List:       kde-commits
Subject:    [kdepim/KDE/4.14] pimcommon/baloodebug: Improve++
From:       Montel Laurent <montel () kde ! org>
Date:       2014-11-02 19:14:27
Message-ID: E1Xl0bb-0006QP-Va () scm ! kde ! org
[Download RAW message or body]

Git commit 2d8802171737b14ef3c1a553d04043003d3774c3 by Montel Laurent.
Committed on 02/11/2014 at 19:13.
Pushed by mlaurent into branch 'KDE/4.14'.

Improve++

M  +21   -2    pimcommon/baloodebug/baloodebugsearchjob.cpp
M  +6    -0    pimcommon/baloodebug/baloodebugsearchjob.h
M  +6    -0    pimcommon/baloodebug/baloodebugwidget.cpp
M  +1    -0    pimcommon/baloodebug/baloodebugwidget.h

http://commits.kde.org/kdepim/2d8802171737b14ef3c1a553d04043003d3774c3

diff --git a/pimcommon/baloodebug/baloodebugsearchjob.cpp b/pimcommon/baloodebug/baloodebugsearchjob.cpp
index 20864ef..664d635 100644
--- a/pimcommon/baloodebug/baloodebugsearchjob.cpp
+++ b/pimcommon/baloodebug/baloodebugsearchjob.cpp
@@ -39,9 +39,28 @@ void BalooDebugSearchJob::start()
         deleteLater();
         return;
     } else {
-        //TODO
+        mProcess = new QProcess(this);
+        connect(mProcess, SIGNAL(readyReadStandardOutput()), this, SLOT(slotReadStandard()));
+        connect(mProcess, SIGNAL(readyReadStandardError()), this, SLOT(slotReadError()));
+        QStringList arguments;
+        arguments << mAkonadiId;
+        arguments << mPath;
+        //TODO add more arguments
+        mProcess->start(delvePath, arguments);
     }
-    //TODO
+}
+
+void BalooDebugSearchJob::slotReadStandard()
+{
+    const QByteArray stdStrg = mProcess->readAllStandardOutput();
+    Q_EMIT result(QString::fromUtf8(stdStrg));
+    deleteLater();
+}
+
+void BalooDebugSearchJob::slotReadError()
+{
+    const QByteArray errorStrg = mProcess->readAllStandardOutput();
+    Q_EMIT error(QString::fromUtf8(errorStrg));
     deleteLater();
 }
 
diff --git a/pimcommon/baloodebug/baloodebugsearchjob.h b/pimcommon/baloodebug/baloodebugsearchjob.h
index b5e78eb..0e8f658 100644
--- a/pimcommon/baloodebug/baloodebugsearchjob.h
+++ b/pimcommon/baloodebug/baloodebugsearchjob.h
@@ -21,6 +21,7 @@
 
 #include <QObject>
 #include <QStringList>
+class QProcess;
 namespace PimCommon {
 class BalooDebugSearchJob : public QObject
 {
@@ -39,10 +40,15 @@ Q_SIGNALS:
     void error(const QString &errorString);
     void result(const QString &text);
 
+private slots:
+    void slotReadStandard();
+    void slotReadError();
+
 private:
     QStringList mArguments;
     QString mAkonadiId;
     QString mPath;
+    QProcess *mProcess;
 };
 }
 
diff --git a/pimcommon/baloodebug/baloodebugwidget.cpp b/pimcommon/baloodebug/baloodebugwidget.cpp
index c23e510..b6615b1 100644
--- a/pimcommon/baloodebug/baloodebugwidget.cpp
+++ b/pimcommon/baloodebug/baloodebugwidget.cpp
@@ -79,9 +79,15 @@ void BalooDebugWidget::slotSearch()
     PimCommon::BalooDebugSearchJob *job = new PimCommon::BalooDebugSearchJob(this);
     job->setAkonadiId(mLineEdit->text());
     connect(job, SIGNAL(result(QString)), this, SLOT(slotResult(QString)));
+    connect(job, SIGNAL(error(QString)), this, SLOT(slotError(QString)));
 }
 
 void BalooDebugWidget::slotResult(const QString &result)
 {
     mPlainTextEditor->setPlainText(result);
 }
+
+void BalooDebugWidget::slotError(const QString &errorStr)
+{
+    mPlainTextEditor->setPlainText(QLatin1String("Error found:\n") + errorStr);
+}
diff --git a/pimcommon/baloodebug/baloodebugwidget.h b/pimcommon/baloodebug/baloodebugwidget.h
index a391912..c31fd99 100644
--- a/pimcommon/baloodebug/baloodebugwidget.h
+++ b/pimcommon/baloodebug/baloodebugwidget.h
@@ -38,6 +38,7 @@ private Q_SLOTS:
     void slotSearchLineTextChanged(const QString &text);
     void slotSearch();
     void slotResult(const QString &result);
+    void slotError(const QString &errorStr);
 
 private:
     PimCommon::PlainTextEditorWidget *mPlainTextEditor;
[prev in list] [next in list] [prev in thread] [next in thread]