QNX: Refactor BlackBerryLogProcessRunner

This change introduce a separate class for running the slog2info
process, in order to be able to use that for pure QNX (non-BlackBerry)
devices.

Also moved from using QSsh::SshRemoteProcessRunner to use
ProcessExplorer::SshDeviceProcess for the tail/slog2info processes
instead.

Change-Id: If917bd2a1099800f1a7333639d674c8d1b16de7b
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>

1 files changed, 10 insertions, 33 deletions

diff --git a/src/plugins/qnx/blackberrylogprocessrunner.h b/src/plugins/qnx/blackberrylogprocessrunner.h
index 8a80bb0317..49a8948f20 100644
--- a/src/plugins/qnx/blackberrylogprocessrunner.h
+++ b/src/plugins/qnx/blackberrylogprocessrunner.h
@@ -35,19 +35,18 @@
 #include "blackberrydeviceconfiguration.h"
 
 #include <utils/outputformat.h>
-#include <ssh/sshconnection.h>
-
-#include <QDateTime>
 
 #include <QObject>
 
-namespace QSsh {
-class SshRemoteProcessRunner;
+namespace ProjectExplorer {
+class SshDeviceProcess;
 }
 
 namespace Qnx {
 namespace Internal {
 
+class Slog2InfoRunner;
+
 class BlackBerryLogProcessRunner : public QObject
 {
     Q_OBJECT
@@ -63,39 +62,17 @@ public slots:
     void stop();
 
 private slots:
-    void handleSlog2infoFound();
-    void readLaunchTime();
-    void readApplicationLog();
-
-    void handleTailOutput();
-    void handleTailProcessConnectionError();
-
-    void handleSlog2infoOutput();
-    void handleSlog2infoProcessConnectionError();
-
-    void handleLogError();
+    void launchTailProcess();
+    void readTailStandardOutput();
+    void readTailStandardError();
+    void handleTailProcessError();
 
 private:
     QString m_appId;
-    QString m_tailCommand;
-    QString m_slog2infoCommand;
-
-    bool m_currentLogs;
-    bool m_slog2infoFound;
-
-    QDateTime m_launchDateTime;
 
     BlackBerryDeviceConfiguration::ConstPtr m_device;
-    QSsh::SshConnectionParameters m_sshParams;
-
-    QSsh::SshRemoteProcessRunner *m_tailProcess;
-    QSsh::SshRemoteProcessRunner *m_slog2infoProcess;
-
-    QSsh::SshRemoteProcessRunner *m_testSlog2Process;
-    QSsh::SshRemoteProcessRunner *m_launchDateTimeProcess;
-
-    bool showQtMessage(const QString& pattern, const QString& line);
-    void killProcessRunner(QSsh::SshRemoteProcessRunner *processRunner, const QString& command);
+    ProjectExplorer::SshDeviceProcess *m_tailProcess;
+    Slog2InfoRunner *m_slog2InfoRunner;
 };
 } // namespace Internal
 } // namespace Qnx