From 2119a6c254dbb4bf0f3a600f24c3ba44f677b664 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Wed, 16 Aug 2023 17:54:33 +0200
Subject: [PATCH] ValgrindRunner: Get rid of errorString()

Change-Id: I5ef4d911f0986a721855525f6b2b7645253606fe
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/valgrind/valgrindrunner.cpp    | 5 -----
 src/plugins/valgrind/valgrindrunner.h      | 2 --
 tests/auto/valgrind/memcheck/modeldemo.cpp | 7 ++++++-
 tests/auto/valgrind/memcheck/modeldemo.h   | 6 ------
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/plugins/valgrind/valgrindrunner.cpp b/src/plugins/valgrind/valgrindrunner.cpp
index 621e837e1c1..79615d41e7b 100644
--- a/src/plugins/valgrind/valgrindrunner.cpp
+++ b/src/plugins/valgrind/valgrindrunner.cpp
@@ -229,11 +229,6 @@ void ValgrindRunner::waitForFinished() const
     loop.exec();
 }
 
-QString ValgrindRunner::errorString() const
-{
-    return d->m_process.errorString();
-}
-
 bool ValgrindRunner::start()
 {
     return d->run();
diff --git a/src/plugins/valgrind/valgrindrunner.h b/src/plugins/valgrind/valgrindrunner.h
index ff7dea0dde6..b9f90636f41 100644
--- a/src/plugins/valgrind/valgrindrunner.h
+++ b/src/plugins/valgrind/valgrindrunner.h
@@ -37,8 +37,6 @@ public:
 
     void waitForFinished() const;
 
-    QString errorString() const;
-
     bool start();
     void stop();
 
diff --git a/tests/auto/valgrind/memcheck/modeldemo.cpp b/tests/auto/valgrind/memcheck/modeldemo.cpp
index 9eaf314e0ab..6d0ff1b4e1e 100644
--- a/tests/auto/valgrind/memcheck/modeldemo.cpp
+++ b/tests/auto/valgrind/memcheck/modeldemo.cpp
@@ -33,7 +33,12 @@ int main(int argc, char *argv[])
     runner.setValgrindCommand({VALGRIND_FAKE_PATH,
                               {"-i", PARSERTESTS_DATA_DIR "/memcheck-output-sample1.xml"}});
     ModelDemo demo(&runner);
-    QObject::connect(&runner, &ValgrindRunner::done, &demo, &ModelDemo::finished);
+    QObject::connect(&runner, &ValgrindRunner::processErrorReceived, &app, [](const QString &err) {
+        qDebug() << err;
+    });
+    QObject::connect(&runner, &ValgrindRunner::done, &app, [](bool success) {
+        qApp->exit(success ? 0 : 1);
+    });
     ErrorListModel model;
     QObject::connect(&runner, &ValgrindRunner::error, &model, &ErrorListModel::addError,
                      Qt::QueuedConnection);
diff --git a/tests/auto/valgrind/memcheck/modeldemo.h b/tests/auto/valgrind/memcheck/modeldemo.h
index 0950c66d53c..59c38f0c3f9 100644
--- a/tests/auto/valgrind/memcheck/modeldemo.h
+++ b/tests/auto/valgrind/memcheck/modeldemo.h
@@ -27,11 +27,6 @@ public:
     Valgrind::XmlProtocol::StackModel* stackModel;
 
 public Q_SLOTS:
-    void finished() {
-        qDebug() << runner->errorString();
-        qApp->exit(!runner->errorString().isEmpty());
-    }
-
     void selectionChanged(const QItemSelection &sel, const QItemSelection &) {
         if (sel.indexes().isEmpty())
             return;
@@ -41,7 +36,6 @@ public Q_SLOTS:
         stackModel->setError(err);
     }
 
-
 private:
     Valgrind::ValgrindRunner *runner;
 };