Valgrind: Dissolve CallGrindRunner

Basically merge with CallGrindToolRunner, to which there was
a 1:1 relationship.

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

1 files changed, 14 insertions, 4 deletions

diff --git a/src/plugins/valgrind/callgrindengine.h b/src/plugins/valgrind/callgrindengine.h
index 1e251f7136..44fb9ca8eb 100644
--- a/src/plugins/valgrind/callgrindengine.h
+++ b/src/plugins/valgrind/callgrindengine.h
@@ -25,10 +25,12 @@
 
 #pragma once
 
-#include <valgrind/valgrindengine.h>
+#include "valgrindengine.h"
+#include "valgrindrunner.h"
 
-#include <valgrind/callgrind/callgrindrunner.h>
-#include <valgrind/callgrind/callgrindparsedata.h>
+#include "callgrind/callgrindparsedata.h"
+#include "callgrind/callgrindparser.h"
+#include "callgrind/callgrindcontroller.h"
 
 namespace Valgrind {
 namespace Internal {
@@ -66,9 +68,17 @@ signals:
 
 private:
     void slotFinished();
+    void showStatusMessage(const QString &message);
 
-    Valgrind::Callgrind::CallgrindRunner m_runner;
+    void triggerParse();
+    void localParseDataAvailable(const QString &file);
+    void controllerFinished(Callgrind::CallgrindController::Option option);
+
+    ValgrindRunner m_runner;
     bool m_markAsPaused = false;
+    Callgrind::CallgrindController m_controller;
+    Callgrind::Parser m_parser;
+    bool m_paused = false;
 
     QString m_argumentForToggleCollect;
 };