ProjectExplorer: Split Target and ToolRunners into smaller tasks

This increases re-usability of activities like 'port gathering',
and makes their use less dependent on actual device implementations.

Change-Id: I017cb74874f2b38c487ba2d03906a675d5618647
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

1 files changed, 12 insertions, 15 deletions

diff --git a/src/plugins/qnx/slog2inforunner.h b/src/plugins/qnx/slog2inforunner.h
index 4e08b5f950..048915baac 100644
--- a/src/plugins/qnx/slog2inforunner.h
+++ b/src/plugins/qnx/slog2inforunner.h
@@ -27,6 +27,7 @@
 
 #include <QObject>
 
+#include <projectexplorer/runconfiguration.h>
 #include <remotelinux/linuxdevice.h>
 #include <utils/outputformat.h>
 
@@ -38,26 +39,23 @@ namespace ProjectExplorer { class SshDeviceProcess; }
 namespace Qnx {
 namespace Internal {
 
-class Slog2InfoRunner : public QObject
+class Slog2InfoRunner : public ProjectExplorer::RunWorker
 {
     Q_OBJECT
 public:
-    explicit Slog2InfoRunner(const QString &applicationId, const RemoteLinux::LinuxDevice::ConstPtr &device, QObject *parent = 0);
+    explicit Slog2InfoRunner(ProjectExplorer::RunControl *runControl);
 
-    void stop();
+    void start() override;
+    void stop() override;
 
     bool commandFound() const;
 
-public slots:
-    void start();
-
 signals:
     void commandMissing();
     void started();
     void finished();
-    void output(const QString &msg, Utils::OutputFormat format);
 
-private slots:
+private:
     void handleTestProcessCompleted();
     void launchSlog2Info();
 
@@ -65,22 +63,21 @@ private slots:
     void readLogStandardError();
     void handleLogError();
 
-private:
+    void printMissingWarning();
     void readLaunchTime();
     void processLog(bool force);
     void processLogLine(const QString &line);
 
     QString m_applicationId;
 
-    bool m_found;
-
     QDateTime m_launchDateTime;
-    bool m_currentLogs;
+    bool m_found = false;
+    bool m_currentLogs = false;
     QString m_remainingData;
 
-    ProjectExplorer::SshDeviceProcess *m_launchDateTimeProcess;
-    ProjectExplorer::SshDeviceProcess *m_testProcess;
-    ProjectExplorer::SshDeviceProcess *m_logProcess;
+    ProjectExplorer::SshDeviceProcess *m_launchDateTimeProcess = nullptr;
+    ProjectExplorer::SshDeviceProcess *m_testProcess = nullptr;
+    ProjectExplorer::SshDeviceProcess *m_logProcess = nullptr;
 };
 
 } // namespace Internal