Various plugins: Reuse QScopeGuard instead of ExecuteOnDestruction

Change-Id: I3341342bc763fade5ad9dcb854928e5499287472
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>

src/libs/extensionsystem/pluginmanager.cpp

@@ -10,6 +10,17 @@
 #include "pluginspec.h"
 #include "pluginspec_p.h"
 
+#include <utils/algorithm.h>
+#include <utils/benchmarker.h>
+#include <utils/fileutils.h>
+#include <utils/futuresynchronizer.h>
+#include <utils/hostosinfo.h>
+#include <utils/mimeutils.h>
+#include <utils/process.h>
+#include <utils/qtcassert.h>
+#include <utils/qtcsettings.h>
+#include <utils/threadutils.h>
+
 #include <QCoreApplication>
 #include <QCryptographicHash>
 #include <QDateTime>
@@ -23,23 +34,12 @@
 #include <QMessageBox>
 #include <QMetaProperty>
 #include <QPushButton>
+#include <QScopeGuard>
 #include <QSysInfo>
 #include <QTextStream>
 #include <QTimer>
 #include <QWriteLocker>
 
-#include <utils/algorithm.h>
-#include <utils/benchmarker.h>
-#include <utils/executeondestruction.h>
-#include <utils/fileutils.h>
-#include <utils/futuresynchronizer.h>
-#include <utils/hostosinfo.h>
-#include <utils/mimeutils.h>
-#include <utils/process.h>
-#include <utils/qtcassert.h>
-#include <utils/qtcsettings.h>
-#include <utils/threadutils.h>
-
 #ifdef WITH_TESTS
 #include <utils/hostosinfo.h>
 #include <QTest>
@@ -1268,8 +1268,7 @@ void PluginManagerPrivate::startTests()
             continue; // plugin not loaded
 
         const QVector<QObject *> testObjects = plugin->createTestObjects();
-        ExecuteOnDestruction deleteTestObjects([&]() { qDeleteAll(testObjects); });
-        Q_UNUSED(deleteTestObjects)
+        const QScopeGuard cleanup([&] { qDeleteAll(testObjects); });
 
         const bool hasDuplicateTestObjects = testObjects.size()
                                              != Utils::filteredUnique(testObjects).size();

src/plugins/debugger/debuggerplugin.cpp

@@ -110,6 +110,7 @@
 #include <QMessageBox>
 #include <QPointer>
 #include <QPushButton>
+#include <QScopeGuard>
 #include <QSettings>
 #include <QStackedWidget>
 #include <QTextBlock>
@@ -125,8 +126,6 @@
 #include <cppeditor/cpptoolstestcase.h>
 #include <cppeditor/projectinfo.h>
 
-#include <utils/executeondestruction.h>
-
 #include <QTest>
 #include <QSignalSpy>
 #include <QTestEventLoop>
@@ -2338,7 +2337,7 @@ void DebuggerUnitTests::testStateMachine()
     BuildManager::buildProjectWithDependencies(ProjectManager::startupProject());
     loop.exec();
 
-    ExecuteOnDestruction guard([] { EditorManager::closeAllEditors(false); });
+    const QScopeGuard cleanup([] { EditorManager::closeAllEditors(false); });
 
     RunConfiguration *rc = ProjectManager::startupRunConfiguration();
     QVERIFY(rc);

src/plugins/marketplace/productlistmodel.cpp

@@ -4,7 +4,6 @@
 #include "productlistmodel.h"
 
 #include <utils/algorithm.h>
-#include <utils/executeondestruction.h>
 #include <utils/networkaccessmanager.h>
 #include <utils/qtcassert.h>
 
@@ -19,6 +18,7 @@
 #include <QNetworkRequest>
 #include <QPixmapCache>
 #include <QRegularExpression>
+#include <QScopeGuard>
 #include <QTimer>
 #include <QUrl>
 #include <QVBoxLayout>
@@ -107,7 +107,7 @@ void SectionedProducts::updateCollections()
 void SectionedProducts::onFetchCollectionsFinished(QNetworkReply *reply)
 {
     QTC_ASSERT(reply, return);
-    Utils::ExecuteOnDestruction replyDeleter([reply]() { reply->deleteLater(); });
+    const QScopeGuard cleanup([reply] { reply->deleteLater(); });
 
     if (reply->error() == QNetworkReply::NoError) {
         const QJsonDocument doc = QJsonDocument::fromJson(reply->readAll());
@@ -141,7 +141,7 @@ void SectionedProducts::onFetchSingleCollectionFinished(QNetworkReply *reply)
     emit toggleProgressIndicator(false);
 
     QTC_ASSERT(reply, return);
-    Utils::ExecuteOnDestruction replyDeleter([reply]() { reply->deleteLater(); });
+    const QScopeGuard cleanup([reply] { reply->deleteLater(); });
 
     QList<Core::ListItem *> productsForCollection;
     if (reply->error() == QNetworkReply::NoError) {
@@ -259,7 +259,7 @@ void SectionedProducts::fetchNextImage()
 void SectionedProducts::onImageDownloadFinished(QNetworkReply *reply)
 {
     QTC_ASSERT(reply, return);
-    Utils::ExecuteOnDestruction replyDeleter([reply]() { reply->deleteLater(); });
+    const QScopeGuard cleanup([reply] { reply->deleteLater(); });
 
     if (reply->error() == QNetworkReply::NoError) {
         const QByteArray data = reply->readAll();

src/plugins/qmakeprojectmanager/profilehoverhandler.cpp

@@ -8,8 +8,8 @@
 #include <coreplugin/helpmanager.h>
 #include <texteditor/texteditor.h>
 #include <utils/htmldocextractor.h>
-#include <utils/executeondestruction.h>
 
+#include <QScopeGuard>
 #include <QTextBlock>
 #include <QUrl>
 
@@ -28,7 +28,7 @@ void ProFileHoverHandler::identifyMatch(TextEditor::TextEditorWidget *editorWidg
                                         int pos,
                                         ReportPriority report)
 {
-    ExecuteOnDestruction reportPriority([this, report](){ report(priority()); });
+    const QScopeGuard cleanup([this, report] { report(priority()); });
 
     m_docFragment.clear();
     m_manualKind = UnknownManual;

src/plugins/qmljseditor/qmljshoverhandler.cpp

@@ -23,7 +23,6 @@
 #include <qmljs/parser/qmljsastfwd_p.h>
 #include <qmljs/qmljsutils.h>
 #include <texteditor/texteditor.h>
-#include <utils/executeondestruction.h>
 #include <utils/qrcparser.h>
 #include <utils/tooltip/tooltip.h>
 
@@ -31,6 +30,7 @@
 #include <QList>
 #include <QRegularExpression>
 #include <QRegularExpressionMatch>
+#include <QScopeGuard>
 
 using namespace Core;
 using namespace QmlJS;
@@ -175,7 +175,7 @@ bool QmlJSHoverHandler::setQmlTypeHelp(const ScopeChain &scopeChain, const Docum
 
 void QmlJSHoverHandler::identifyMatch(TextEditorWidget *editorWidget, int pos, ReportPriority report)
 {
-    Utils::ExecuteOnDestruction reportPriority([this, report](){ report(priority()); });
+    const QScopeGuard cleanup([this, report] { report(priority()); });
 
     reset();
 

src/plugins/squish/squishrunnerprocess.cpp

@@ -6,9 +6,9 @@
 #include "squishtr.h"
 
 #include <debugger/breakhandler.h>
-#include <utils/executeondestruction.h>
 
 #include <QLoggingCategory>
+#include <QScopeGuard>
 
 Q_LOGGING_CATEGORY(runnerLOG, "qtc.squish.squishrunner", QtWarningMsg)
 
@@ -153,7 +153,7 @@ void SquishRunnerProcess::onStdOutput(const QString &lineIn)
 
 void SquishRunnerProcess::handleMultiLineOutput(OutputMode mode)
 {
-    Utils::ExecuteOnDestruction atExit([this]{
+    const QScopeGuard cleanup([this] {
         m_multiLineContent.clear();
         m_context.clear();
     });