aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2024-01-26 17:15:51 +0100
committerhjk <hjk@qt.io>2024-01-29 14:23:39 +0000
commitce1e565a10e76c9119b4cdeaa50e3f5a0134eb2f (patch)
tree5a4b409fbee25a7a4c404c7493f0653df03528e5
parentd4635d438939a7195c81df2d387b553358504e84 (diff)
Utils: Also rename parameteraction.{h,cpp} to action.{h,cpp}
Change-Id: I203909d9b2d460012b9347d507ac7a701700c48a Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-rw-r--r--src/libs/utils/CMakeLists.txt2
-rw-r--r--src/libs/utils/action.cpp (renamed from src/libs/utils/parameteraction.cpp)2
-rw-r--r--src/libs/utils/action.h (renamed from src/libs/utils/parameteraction.h)0
-rw-r--r--src/libs/utils/utils.qbs4
-rw-r--r--src/plugins/bazaar/bazaarplugin.cpp2
-rw-r--r--src/plugins/clangcodemodel/clangcodemodelplugin.cpp2
-rw-r--r--src/plugins/clearcase/clearcaseplugin.cpp2
-rw-r--r--src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp2
-rw-r--r--src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp2
-rw-r--r--src/plugins/compilationdatabaseprojectmanager/compilationdatabaseprojectmanagerplugin.cpp2
-rw-r--r--src/plugins/coreplugin/actionmanager/actionmanager.cpp2
-rw-r--r--src/plugins/cvs/cvsplugin.cpp2
-rw-r--r--src/plugins/fossil/fossilplugin.cpp2
-rw-r--r--src/plugins/git/gitplugin.cpp2
-rw-r--r--src/plugins/mercurial/mercurialplugin.cpp2
-rw-r--r--src/plugins/mesonprojectmanager/mesonactionsmanager.cpp2
-rw-r--r--src/plugins/mesonprojectmanager/mesonactionsmanager.h2
-rw-r--r--src/plugins/perforce/perforceplugin.cpp2
-rw-r--r--src/plugins/projectexplorer/projectexplorer.cpp2
-rw-r--r--src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp4
-rw-r--r--src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp2
-rw-r--r--src/plugins/resourceeditor/resourceeditorplugin.cpp3
-rw-r--r--src/plugins/subversion/subversionplugin.cpp3
-rw-r--r--src/plugins/texteditor/markdowneditor.cpp3
24 files changed, 24 insertions, 29 deletions
diff --git a/src/libs/utils/CMakeLists.txt b/src/libs/utils/CMakeLists.txt
index ab8fec695a..9f11f3fc83 100644
--- a/src/libs/utils/CMakeLists.txt
+++ b/src/libs/utils/CMakeLists.txt
@@ -8,6 +8,7 @@ add_qtc_library(Utils
SOURCES
../3rdparty/span/span.hpp
../3rdparty/tl_expected/include/tl/expected.hpp
+ action.cpp action.h
algorithm.h
ansiescapecodehandler.cpp ansiescapecodehandler.h
appinfo.cpp appinfo.h
@@ -118,7 +119,6 @@ add_qtc_library(Utils
outputformatter.cpp outputformatter.h
overlaywidget.cpp overlaywidget.h
overridecursor.cpp overridecursor.h
- parameteraction.cpp parameteraction.h
passworddialog.cpp passworddialog.h
pathchooser.cpp pathchooser.h
pathlisteditor.cpp pathlisteditor.h
diff --git a/src/libs/utils/parameteraction.cpp b/src/libs/utils/action.cpp
index 69ebd37519..c88b7c39d0 100644
--- a/src/libs/utils/parameteraction.cpp
+++ b/src/libs/utils/action.cpp
@@ -1,7 +1,7 @@
// Copyright (C) 2016 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-#include "parameteraction.h"
+#include "action.h"
/*!
\class Utils::Action
diff --git a/src/libs/utils/parameteraction.h b/src/libs/utils/action.h
index 666a0af143..666a0af143 100644
--- a/src/libs/utils/parameteraction.h
+++ b/src/libs/utils/action.h
diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs
index ace3c16682..d7ccd1d676 100644
--- a/src/libs/utils/utils.qbs
+++ b/src/libs/utils/utils.qbs
@@ -35,6 +35,8 @@ QtcLibrary {
Depends { name: "ptyqt" }
files: [
+ "action.cpp",
+ "action.h",
"algorithm.h",
"ansiescapecodehandler.cpp",
"ansiescapecodehandler.h",
@@ -216,8 +218,6 @@ QtcLibrary {
"overlaywidget.h",
"overridecursor.cpp",
"overridecursor.h",
- "parameteraction.cpp",
- "parameteraction.h",
"passworddialog.cpp",
"passworddialog.h",
"pathchooser.cpp",
diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp
index a51e9ad59a..0f800642f5 100644
--- a/src/plugins/bazaar/bazaarplugin.cpp
+++ b/src/plugins/bazaar/bazaarplugin.cpp
@@ -22,10 +22,10 @@
#include <extensionsystem/iplugin.h>
+#include <utils/action.h>
#include <utils/commandline.h>
#include <utils/environment.h>
#include <utils/layoutbuilder.h>
-#include <utils/parameteraction.h>
#include <utils/qtcassert.h>
#include <utils/stringutils.h>
#include <utils/layoutbuilder.h>
diff --git a/src/plugins/clangcodemodel/clangcodemodelplugin.cpp b/src/plugins/clangcodemodel/clangcodemodelplugin.cpp
index 7852fba9c8..28d00d84a2 100644
--- a/src/plugins/clangcodemodel/clangcodemodelplugin.cpp
+++ b/src/plugins/clangcodemodel/clangcodemodelplugin.cpp
@@ -35,9 +35,9 @@
#include <texteditor/textmark.h>
+#include <utils/action.h>
#include <utils/async.h>
#include <utils/environment.h>
-#include <utils/parameteraction.h>
#include <utils/qtcassert.h>
#include <utils/temporarydirectory.h>
diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp
index 33d27fab9e..7b797f92dd 100644
--- a/src/plugins/clearcase/clearcaseplugin.cpp
+++ b/src/plugins/clearcase/clearcaseplugin.cpp
@@ -29,12 +29,12 @@
#include <projectexplorer/project.h>
#include <projectexplorer/projectmanager.h>
+#include <utils/action.h>
#include <utils/algorithm.h>
#include <utils/async.h>
#include <utils/hostosinfo.h>
#include <utils/infobar.h>
#include <utils/layoutbuilder.h>
-#include <utils/parameteraction.h>
#include <utils/process.h>
#include <utils/qtcassert.h>
#include <utils/temporarydirectory.h>
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
index 9c4783ed2c..73d82393a0 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
@@ -36,9 +36,9 @@
#include <projectexplorer/runcontrol.h>
#include <projectexplorer/target.h>
+#include <utils/action.h>
#include <utils/checkablemessagebox.h>
#include <utils/utilsicons.h>
-#include <utils/parameteraction.h>
#include <QMessageBox>
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp
index ead1913cab..305f886082 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp
@@ -30,9 +30,9 @@
#include <texteditor/formattexteditor.h>
#include <texteditor/snippets/snippetprovider.h>
+#include <utils/action.h>
#include <utils/mimeconstants.h>
#include <utils/fsengine/fileiconprovider.h>
-#include <utils/parameteraction.h>
#include <QTimer>
#include <QMenu>
diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseprojectmanagerplugin.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseprojectmanagerplugin.cpp
index ec5b12737f..9c30bc1b84 100644
--- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseprojectmanagerplugin.cpp
+++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseprojectmanagerplugin.cpp
@@ -17,8 +17,8 @@
#include <projectexplorer/projecttree.h>
#include <projectexplorer/projectmanager.h>
+#include <utils/action.h>
#include <utils/fsengine/fileiconprovider.h>
-#include <utils/parameteraction.h>
#include <utils/utilsicons.h>
using namespace Core;
diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.cpp b/src/plugins/coreplugin/actionmanager/actionmanager.cpp
index 5898db30e3..f2973d1565 100644
--- a/src/plugins/coreplugin/actionmanager/actionmanager.cpp
+++ b/src/plugins/coreplugin/actionmanager/actionmanager.cpp
@@ -7,9 +7,9 @@
#include "command_p.h"
#include "../icore.h"
+#include <utils/action.h>
#include <utils/algorithm.h>
#include <utils/fadingindicator.h>
-#include <utils/parameteraction.h>
#include <utils/qtcassert.h>
#include <nanotrace/nanotrace.h>
diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp
index 35736ef48f..04bc58099a 100644
--- a/src/plugins/cvs/cvsplugin.cpp
+++ b/src/plugins/cvs/cvsplugin.cpp
@@ -34,10 +34,10 @@
#include <extensionsystem/iplugin.h>
+#include <utils/action.h>
#include <utils/commandline.h>
#include <utils/environment.h>
#include <utils/fileutils.h>
-#include <utils/parameteraction.h>
#include <utils/qtcassert.h>
#include <utils/stringutils.h>
diff --git a/src/plugins/fossil/fossilplugin.cpp b/src/plugins/fossil/fossilplugin.cpp
index 8f10e30619..d185d33149 100644
--- a/src/plugins/fossil/fossilplugin.cpp
+++ b/src/plugins/fossil/fossilplugin.cpp
@@ -28,9 +28,9 @@
#include <projectexplorer/project.h>
#include <projectexplorer/jsonwizard/jsonwizardfactory.h>
+#include <utils/action.h>
#include <utils/commandline.h>
#include <utils/layoutbuilder.h>
-#include <utils/parameteraction.h>
#include <utils/qtcassert.h>
#include <vcsbase/basevcseditorfactory.h>
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index bf15eac631..f561ed4140 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -42,11 +42,11 @@
#include <texteditor/texteditor.h>
+#include <utils/action.h>
#include <utils/algorithm.h>
#include <utils/async.h>
#include <utils/commandline.h>
#include <utils/infobar.h>
-#include <utils/parameteraction.h>
#include <utils/pathchooser.h>
#include <utils/qtcassert.h>
#include <utils/stringutils.h>
diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp
index 5237305206..e67f9ca8da 100644
--- a/src/plugins/mercurial/mercurialplugin.cpp
+++ b/src/plugins/mercurial/mercurialplugin.cpp
@@ -23,9 +23,9 @@
#include <extensionsystem/iplugin.h>
+#include <utils/action.h>
#include <utils/commandline.h>
#include <utils/environment.h>
-#include <utils/parameteraction.h>
#include <utils/qtcassert.h>
#include <vcsbase/basevcseditorfactory.h>
diff --git a/src/plugins/mesonprojectmanager/mesonactionsmanager.cpp b/src/plugins/mesonprojectmanager/mesonactionsmanager.cpp
index df7ff6a2cc..221199470e 100644
--- a/src/plugins/mesonprojectmanager/mesonactionsmanager.cpp
+++ b/src/plugins/mesonprojectmanager/mesonactionsmanager.cpp
@@ -15,7 +15,7 @@
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/projecttree.h>
-#include <utils/parameteraction.h>
+#include <utils/action.h>
namespace MesonProjectManager {
namespace Internal {
diff --git a/src/plugins/mesonprojectmanager/mesonactionsmanager.h b/src/plugins/mesonprojectmanager/mesonactionsmanager.h
index f4793c7707..81c3df9fbb 100644
--- a/src/plugins/mesonprojectmanager/mesonactionsmanager.h
+++ b/src/plugins/mesonprojectmanager/mesonactionsmanager.h
@@ -3,7 +3,7 @@
#pragma once
-#include <utils/parameteraction.h>
+#include <utils/action.h>
#include <QCoreApplication>
diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp
index 59d502c3b8..eeb83b1134 100644
--- a/src/plugins/perforce/perforceplugin.cpp
+++ b/src/plugins/perforce/perforceplugin.cpp
@@ -26,9 +26,9 @@
#include <texteditor/textdocument.h>
+#include <utils/action.h>
#include <utils/environment.h>
#include <utils/fileutils.h>
-#include <utils/parameteraction.h>
#include <utils/process.h>
#include <utils/qtcassert.h>
#include <utils/temporarydirectory.h>
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 75332945ca..34d7abae03 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -125,11 +125,11 @@
#include <texteditor/texteditorconstants.h>
#include <texteditor/texteditorsettings.h>
+#include <utils/action.h>
#include <utils/algorithm.h>
#include <utils/fileutils.h>
#include <utils/macroexpander.h>
#include <utils/mimeutils.h>
-#include <utils/parameteraction.h>
#include <utils/processhandle.h>
#include <utils/processinterface.h>
#include <utils/proxyaction.h>
diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp
index 55645c53f1..67cbaf0ecf 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp
+++ b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp
@@ -38,14 +38,12 @@
#include <projectexplorer/projectmanager.h>
#include <projectexplorer/target.h>
+#include <utils/action.h>
#include <utils/fsengine/fileiconprovider.h>
#include <utils/mimeconstants.h>
-#include <utils/parameteraction.h>
#include <utils/qtcassert.h>
#include <utils/utilsicons.h>
-#include <QAction>
-
using namespace ProjectExplorer;
using namespace Utils;
diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp
index c585cb51c2..9dd3fa079b 100644
--- a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp
@@ -39,9 +39,9 @@
#include <texteditor/texteditoractionhandler.h>
#include <texteditor/texteditorconstants.h>
+#include <utils/action.h>
#include <utils/hostosinfo.h>
#include <utils/mimeconstants.h>
-#include <utils/parameteraction.h>
#include <utils/utilsicons.h>
using namespace Core;
diff --git a/src/plugins/resourceeditor/resourceeditorplugin.cpp b/src/plugins/resourceeditor/resourceeditorplugin.cpp
index 20ae5fc7c2..1eebfe955b 100644
--- a/src/plugins/resourceeditor/resourceeditorplugin.cpp
+++ b/src/plugins/resourceeditor/resourceeditorplugin.cpp
@@ -22,12 +22,11 @@
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/projectnodes.h>
+#include <utils/action.h>
#include <utils/algorithm.h>
-#include <utils/parameteraction.h>
#include <utils/qtcassert.h>
#include <utils/stringutils.h>
-#include <QAction>
#include <QDebug>
#include <QDialogButtonBox>
#include <QFormLayout>
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index ba55761cf3..f543683af2 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -24,12 +24,12 @@
#include <texteditor/textdocument.h>
+#include <utils/action.h>
#include <utils/algorithm.h>
#include <utils/commandline.h>
#include <utils/environment.h>
#include <utils/fileutils.h>
#include <utils/hostosinfo.h>
-#include <utils/parameteraction.h>
#include <utils/qtcassert.h>
#include <utils/stringutils.h>
@@ -41,7 +41,6 @@
#include <vcsbase/vcscommand.h>
#include <vcsbase/vcsoutputwindow.h>
-#include <QAction>
#include <QDebug>
#include <QDir>
#include <QFileDialog>
diff --git a/src/plugins/texteditor/markdowneditor.cpp b/src/plugins/texteditor/markdowneditor.cpp
index a535fab2bc..6d91225dbc 100644
--- a/src/plugins/texteditor/markdowneditor.cpp
+++ b/src/plugins/texteditor/markdowneditor.cpp
@@ -18,9 +18,8 @@
#include <texteditor/texteditoractionhandler.h>
+#include <utils/action.h>
#include <utils/ranges.h>
-#include <utils/parameteraction.h>
-#include <utils/qtcsettings.h>
#include <utils/qtcsettings.h>
#include <utils/stringutils.h>
#include <utils/utilsicons.h>