From f3957d383fbe2599637933486f8566596dc8b737 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Tue, 24 May 2022 13:45:35 +0200 Subject: [PATCH] Utils: More forward declarations / drop unused headers [T-Z] Round 1 - focus on headers. For classes with initial in range [T-Z]. Replace QT_FORWARD_DECLARE_CLASS with QT_BEGIN_NAMESPACE and QT_END_NAMESPACE and forward declare inside. Change-Id: I4ac3a8391e6167aa2db3973a9f94a45ac3c8ebd1 Reviewed-by: hjk --- src/libs/utils/changeset.h | 4 +++- src/libs/utils/detailsbutton.h | 4 +++- src/libs/utils/environment.h | 4 +++- src/libs/utils/fileinprojectfinder.h | 4 +++- src/libs/utils/hostosinfo.h | 4 +++- src/libs/utils/htmldocextractor.h | 4 +++- src/libs/utils/icon.h | 8 +++++--- src/libs/utils/json.h | 4 +++- src/libs/utils/minimizableinfobars.h | 4 +++- src/libs/utils/namevaluesdialog.h | 4 +++- src/libs/utils/namevaluevalidator.h | 4 +++- src/libs/utils/networkaccessmanager.h | 4 +++- src/libs/utils/pathlisteditor.h | 4 +++- src/libs/utils/portlist.h | 4 +++- src/libs/utils/proxycredentialsdialog.h | 4 +++- src/libs/utils/savefile.h | 4 +++- src/libs/utils/statuslabel.h | 4 +++- src/libs/utils/templateengine.cpp | 1 + src/libs/utils/templateengine.h | 11 ++++++----- src/libs/utils/terminalcommand.cpp | 4 ++-- src/libs/utils/terminalprocess.cpp | 8 ++++---- src/libs/utils/textfieldcheckbox.h | 4 +++- src/libs/utils/textfieldcombobox.h | 4 +++- src/libs/utils/textutils.cpp | 4 ++-- src/libs/utils/textutils.h | 9 ++++++--- src/libs/utils/theme/theme.h | 6 ++++-- src/libs/utils/theme/theme_p.h | 3 ++- src/libs/utils/tooltip/tips.cpp | 6 +++--- src/libs/utils/tooltip/tips.h | 6 ++++-- src/libs/utils/tooltip/tooltip.h | 1 - src/libs/utils/touchbar/touchbar.cpp | 5 +++++ src/libs/utils/touchbar/touchbar.h | 12 +++++++----- src/libs/utils/treemodel.h | 1 + src/libs/utils/uncommentselection.cpp | 1 + src/libs/utils/uncommentselection.h | 2 +- src/libs/utils/unixutils.h | 1 + src/libs/utils/url.cpp | 1 + src/libs/utils/url.h | 6 +++++- src/libs/utils/variablechooser.cpp | 6 +++--- src/libs/utils/variablechooser.h | 7 ++++--- src/libs/utils/wizard.cpp | 2 +- .../languageclient/languageclientsettings.cpp | 1 + src/plugins/texteditor/snippets/snippet.cpp | 1 + .../auto/utils/templateengine/tst_templateengine.cpp | 1 + 44 files changed, 126 insertions(+), 60 deletions(-) diff --git a/src/libs/utils/changeset.h b/src/libs/utils/changeset.h index 84614910db6..e74f340039a 100644 --- a/src/libs/utils/changeset.h +++ b/src/libs/utils/changeset.h @@ -30,7 +30,9 @@ #include #include -QT_FORWARD_DECLARE_CLASS(QTextCursor) +QT_BEGIN_NAMESPACE +class QTextCursor; +QT_END_NAMESPACE namespace Utils { diff --git a/src/libs/utils/detailsbutton.h b/src/libs/utils/detailsbutton.h index 3c7286e9ee6..72702688137 100644 --- a/src/libs/utils/detailsbutton.h +++ b/src/libs/utils/detailsbutton.h @@ -29,7 +29,9 @@ #include -QT_FORWARD_DECLARE_CLASS(QGraphicsOpacityEffect) +QT_BEGIN_NAMESPACE +class QGraphicsOpacityEffect; +QT_END_NAMESPACE namespace Utils { class QTCREATOR_UTILS_EXPORT FadingPanel : public QWidget diff --git a/src/libs/utils/environment.h b/src/libs/utils/environment.h index ca152647321..06ab65725c1 100644 --- a/src/libs/utils/environment.h +++ b/src/libs/utils/environment.h @@ -34,7 +34,9 @@ #include -QT_FORWARD_DECLARE_CLASS(QProcessEnvironment) +QT_BEGIN_NAMESPACE +class QProcessEnvironment; +QT_END_NAMESPACE namespace Utils { diff --git a/src/libs/utils/fileinprojectfinder.h b/src/libs/utils/fileinprojectfinder.h index 1629341c0ba..f4b08596dcc 100644 --- a/src/libs/utils/fileinprojectfinder.h +++ b/src/libs/utils/fileinprojectfinder.h @@ -33,7 +33,9 @@ #include #include -QT_FORWARD_DECLARE_CLASS(QUrl) +QT_BEGIN_NAMESPACE +class QUrl; +QT_END_NAMESPACE namespace Utils { class QrcParser; diff --git a/src/libs/utils/hostosinfo.h b/src/libs/utils/hostosinfo.h index d80bcbaa61c..694146e3459 100644 --- a/src/libs/utils/hostosinfo.h +++ b/src/libs/utils/hostosinfo.h @@ -29,7 +29,9 @@ #include "osspecificaspects.h" -QT_FORWARD_DECLARE_CLASS(QString) +QT_BEGIN_NAMESPACE +class QString; +QT_END_NAMESPACE #ifdef Q_OS_WIN #define QTC_HOST_EXE_SUFFIX QTC_WIN_EXE_SUFFIX diff --git a/src/libs/utils/htmldocextractor.h b/src/libs/utils/htmldocextractor.h index b71aed78a41..0ed9a535359 100644 --- a/src/libs/utils/htmldocextractor.h +++ b/src/libs/utils/htmldocextractor.h @@ -27,7 +27,9 @@ #include "utils_global.h" -QT_FORWARD_DECLARE_CLASS(QString) +QT_BEGIN_NAMESPACE +class QString; +QT_END_NAMESPACE namespace Utils { diff --git a/src/libs/utils/icon.h b/src/libs/utils/icon.h index 8fdb51f2ac3..92097fdf4ac 100644 --- a/src/libs/utils/icon.h +++ b/src/libs/utils/icon.h @@ -34,9 +34,11 @@ #include #include -QT_FORWARD_DECLARE_CLASS(QColor) -QT_FORWARD_DECLARE_CLASS(QPixmap) -QT_FORWARD_DECLARE_CLASS(QString) +QT_BEGIN_NAMESPACE +class QColor; +class QPixmap; +class QString; +QT_END_NAMESPACE namespace Utils { diff --git a/src/libs/utils/json.h b/src/libs/utils/json.h index c1e52703115..142150493a8 100644 --- a/src/libs/utils/json.h +++ b/src/libs/utils/json.h @@ -32,7 +32,9 @@ #include #include -QT_FORWARD_DECLARE_CLASS(QVariant) +QT_BEGIN_NAMESPACE +class QVariant; +QT_END_NAMESPACE namespace Utils { diff --git a/src/libs/utils/minimizableinfobars.h b/src/libs/utils/minimizableinfobars.h index 1150e5b4cb2..bf2c874e20d 100644 --- a/src/libs/utils/minimizableinfobars.h +++ b/src/libs/utils/minimizableinfobars.h @@ -34,7 +34,9 @@ #include -QT_FORWARD_DECLARE_CLASS(QAction) +QT_BEGIN_NAMESPACE +class QAction; +QT_END_NAMESPACE namespace Utils { diff --git a/src/libs/utils/namevaluesdialog.h b/src/libs/utils/namevaluesdialog.h index 2341838d2ae..815bfecadd8 100644 --- a/src/libs/utils/namevaluesdialog.h +++ b/src/libs/utils/namevaluesdialog.h @@ -35,7 +35,9 @@ #include #include -QT_FORWARD_DECLARE_CLASS(QPlainTextEdit) +QT_BEGIN_NAMESPACE +class QPlainTextEdit; +QT_END_NAMESPACE namespace Utils { diff --git a/src/libs/utils/namevaluevalidator.h b/src/libs/utils/namevaluevalidator.h index dc4952569dd..0d18e3385cc 100644 --- a/src/libs/utils/namevaluevalidator.h +++ b/src/libs/utils/namevaluevalidator.h @@ -33,7 +33,9 @@ #include #include -QT_FORWARD_DECLARE_CLASS(QModelIndex) +QT_BEGIN_NAMESPACE +class QModelIndex; +QT_END_NAMESPACE namespace Utils { diff --git a/src/libs/utils/networkaccessmanager.h b/src/libs/utils/networkaccessmanager.h index 4f09123aab2..91d23c84600 100644 --- a/src/libs/utils/networkaccessmanager.h +++ b/src/libs/utils/networkaccessmanager.h @@ -29,7 +29,9 @@ #include -QT_FORWARD_DECLARE_CLASS(QUrl) +QT_BEGIN_NAMESPACE +class QUrl; +QT_END_NAMESPACE namespace Utils { diff --git a/src/libs/utils/pathlisteditor.h b/src/libs/utils/pathlisteditor.h index 5f655311222..a7c61448d18 100644 --- a/src/libs/utils/pathlisteditor.h +++ b/src/libs/utils/pathlisteditor.h @@ -31,7 +31,9 @@ #include -QT_FORWARD_DECLARE_CLASS(QPushButton) +QT_BEGIN_NAMESPACE +class QPushButton; +QT_END_NAMESPACE namespace Utils { diff --git a/src/libs/utils/portlist.h b/src/libs/utils/portlist.h index 911fbd0e7a4..3b0bbf7958a 100644 --- a/src/libs/utils/portlist.h +++ b/src/libs/utils/portlist.h @@ -29,7 +29,9 @@ #include "port.h" -QT_FORWARD_DECLARE_CLASS(QString) +QT_BEGIN_NAMESPACE +class QString; +QT_END_NAMESPACE namespace Utils { namespace Internal { class PortListPrivate; } diff --git a/src/libs/utils/proxycredentialsdialog.h b/src/libs/utils/proxycredentialsdialog.h index 8c79af01475..03ea87363b7 100644 --- a/src/libs/utils/proxycredentialsdialog.h +++ b/src/libs/utils/proxycredentialsdialog.h @@ -29,7 +29,9 @@ #include -QT_FORWARD_DECLARE_CLASS(QNetworkProxy) +QT_BEGIN_NAMESPACE +class QNetworkProxy; +QT_END_NAMESPACE namespace Utils { diff --git a/src/libs/utils/savefile.h b/src/libs/utils/savefile.h index d2d7016618d..336c6999e79 100644 --- a/src/libs/utils/savefile.h +++ b/src/libs/utils/savefile.h @@ -29,7 +29,9 @@ #include -QT_FORWARD_DECLARE_CLASS(QTemporaryFile) +QT_BEGIN_NAMESPACE +class QTemporaryFile; +QT_END_NAMESPACE #include diff --git a/src/libs/utils/statuslabel.h b/src/libs/utils/statuslabel.h index 054330b0853..57a89c5212f 100644 --- a/src/libs/utils/statuslabel.h +++ b/src/libs/utils/statuslabel.h @@ -27,7 +27,9 @@ #include "utils_global.h" -QT_FORWARD_DECLARE_CLASS(QTimer) +QT_BEGIN_NAMESPACE +class QTimer; +QT_END_NAMESPACE #include diff --git a/src/libs/utils/templateengine.cpp b/src/libs/utils/templateengine.cpp index 2030e62237a..1f59c81d9e6 100644 --- a/src/libs/utils/templateengine.cpp +++ b/src/libs/utils/templateengine.cpp @@ -25,6 +25,7 @@ #include "templateengine.h" +#include "macroexpander.h" #include "qtcassert.h" #include diff --git a/src/libs/utils/templateengine.h b/src/libs/utils/templateengine.h index c96ebc322f6..f6e92c6fa93 100644 --- a/src/libs/utils/templateengine.h +++ b/src/libs/utils/templateengine.h @@ -27,14 +27,15 @@ #include "utils_global.h" -#include "macroexpander.h" - -#include - -QT_FORWARD_DECLARE_CLASS(QJSEngine) +QT_BEGIN_NAMESPACE +class QJSEngine; +class QString; +QT_END_NAMESPACE namespace Utils { +class MacroExpander; + class QTCREATOR_UTILS_EXPORT TemplateEngine { public: static bool preprocessText(const QString &input, QString *output, QString *errorMessage); diff --git a/src/libs/utils/terminalcommand.cpp b/src/libs/utils/terminalcommand.cpp index 41c0604868c..4652bfa43cd 100644 --- a/src/libs/utils/terminalcommand.cpp +++ b/src/libs/utils/terminalcommand.cpp @@ -155,8 +155,8 @@ TerminalCommand TerminalCommand::terminalEmulator() const QStringList splitCommand = ProcessArgs::splitArgs(value); if (QTC_GUARD(!splitCommand.isEmpty())) { const QString command = splitCommand.first(); - const QStringList quotedArgs = Utils::transform(splitCommand.mid(1), - &ProcessArgs::quoteArgUnix); + const QStringList quotedArgs = transform(splitCommand.mid(1), + &ProcessArgs::quoteArgUnix); const QString options = quotedArgs.join(' '); return {command, "", options}; } diff --git a/src/libs/utils/terminalprocess.cpp b/src/libs/utils/terminalprocess.cpp index 59a33c98ed4..0b94879a80a 100644 --- a/src/libs/utils/terminalprocess.cpp +++ b/src/libs/utils/terminalprocess.cpp @@ -437,14 +437,14 @@ void TerminalImpl::cleanupAfterStartFailure(const QString &errorMessage) void TerminalImpl::sendControlSignal(ControlSignal controlSignal) { switch (controlSignal) { - case Utils::ControlSignal::Terminate: - case Utils::ControlSignal::Kill: + case ControlSignal::Terminate: + case ControlSignal::Kill: stopProcess(); break; - case Utils::ControlSignal::Interrupt: + case ControlSignal::Interrupt: sendCommand('i'); break; - case Utils::ControlSignal::KickOff: + case ControlSignal::KickOff: sendCommand('c'); break; } diff --git a/src/libs/utils/textfieldcheckbox.h b/src/libs/utils/textfieldcheckbox.h index 3fea4f1ec32..99292ea8db4 100644 --- a/src/libs/utils/textfieldcheckbox.h +++ b/src/libs/utils/textfieldcheckbox.h @@ -32,11 +32,13 @@ namespace Utils { // Documentation inside. -class QTCREATOR_UTILS_EXPORT TextFieldCheckBox : public QCheckBox { +class QTCREATOR_UTILS_EXPORT TextFieldCheckBox : public QCheckBox +{ Q_PROPERTY(QString compareText READ text WRITE setText) Q_PROPERTY(QString trueText READ trueText WRITE setTrueText) Q_PROPERTY(QString falseText READ falseText WRITE setFalseText) Q_OBJECT + public: explicit TextFieldCheckBox(const QString &text, QWidget *parent = nullptr); diff --git a/src/libs/utils/textfieldcombobox.h b/src/libs/utils/textfieldcombobox.h index a10906bcbc9..119ccfa6d3b 100644 --- a/src/libs/utils/textfieldcombobox.h +++ b/src/libs/utils/textfieldcombobox.h @@ -32,9 +32,11 @@ namespace Utils { // Documentation inside. -class QTCREATOR_UTILS_EXPORT TextFieldComboBox : public QComboBox { +class QTCREATOR_UTILS_EXPORT TextFieldComboBox : public QComboBox +{ Q_PROPERTY(QString indexText READ text WRITE setText) Q_OBJECT + public: explicit TextFieldComboBox(QWidget *parent = nullptr); diff --git a/src/libs/utils/textutils.cpp b/src/libs/utils/textutils.cpp index 4e0764fffb7..6075b71fa33 100644 --- a/src/libs/utils/textutils.cpp +++ b/src/libs/utils/textutils.cpp @@ -165,7 +165,7 @@ int utf8NthLineOffset(const QTextDocument *textDocument, const QByteArray &buffe LineColumn utf16LineColumn(const QByteArray &utf8Buffer, int utf8Offset) { - Utils::LineColumn lineColumn; + LineColumn lineColumn; lineColumn.line = static_cast( std::count(utf8Buffer.begin(), utf8Buffer.begin() + utf8Offset, '\n')) + 1; @@ -221,7 +221,7 @@ void applyReplacements(QTextDocument *doc, const Replacements &replacements) int fullOffsetShift = 0; QTextCursor editCursor(doc); editCursor.beginEditBlock(); - for (const Utils::Text::Replacement &replacement : replacements) { + for (const Text::Replacement &replacement : replacements) { editCursor.setPosition(replacement.offset + fullOffsetShift); editCursor.movePosition(QTextCursor::NextCharacter, QTextCursor::KeepAnchor, diff --git a/src/libs/utils/textutils.h b/src/libs/utils/textutils.h index 272e4911b37..7f68fb47aae 100644 --- a/src/libs/utils/textutils.h +++ b/src/libs/utils/textutils.h @@ -25,13 +25,16 @@ #pragma once -#include "linecolumn.h" #include "utils_global.h" +#include "linecolumn.h" + #include -QT_FORWARD_DECLARE_CLASS(QTextDocument) -QT_FORWARD_DECLARE_CLASS(QTextCursor) +QT_BEGIN_NAMESPACE +class QTextCursor; +class QTextDocument; +QT_END_NAMESPACE namespace Utils { namespace Text { diff --git a/src/libs/utils/theme/theme.h b/src/libs/utils/theme/theme.h index b3d54497455..cbcf3658577 100644 --- a/src/libs/utils/theme/theme.h +++ b/src/libs/utils/theme/theme.h @@ -30,8 +30,10 @@ #include // QGradientStops #include -QT_FORWARD_DECLARE_CLASS(QSettings) -QT_FORWARD_DECLARE_CLASS(QPalette) +QT_BEGIN_NAMESPACE +class QPalette; +class QSettings; +QT_END_NAMESPACE namespace Utils { diff --git a/src/libs/utils/theme/theme_p.h b/src/libs/utils/theme/theme_p.h index 1feeeda4e25..3f300de136e 100644 --- a/src/libs/utils/theme/theme_p.h +++ b/src/libs/utils/theme/theme_p.h @@ -25,9 +25,10 @@ #pragma once -#include "theme.h" #include "../utils_global.h" +#include "theme.h" + #include #include diff --git a/src/libs/utils/tooltip/tips.cpp b/src/libs/utils/tooltip/tips.cpp index e8c3cae6df6..b53a586e884 100644 --- a/src/libs/utils/tooltip/tips.cpp +++ b/src/libs/utils/tooltip/tips.cpp @@ -26,12 +26,11 @@ #include "tips.h" #include "tooltip.h" -#include -#include +#include "../qtcassert.h" -#include #include #include +#include #include #include #include @@ -43,6 +42,7 @@ #include #include #include +#include #include #include diff --git a/src/libs/utils/tooltip/tips.h b/src/libs/utils/tooltip/tips.h index ba5f4151013..cc43cb25e82 100644 --- a/src/libs/utils/tooltip/tips.h +++ b/src/libs/utils/tooltip/tips.h @@ -29,9 +29,11 @@ #include #include -#include #include -#include + +QT_BEGIN_NAMESPACE +class QVBoxLayout; +QT_END_NAMESPACE namespace Utils { namespace Internal { diff --git a/src/libs/utils/tooltip/tooltip.h b/src/libs/utils/tooltip/tooltip.h index 4c0c3de84f8..b8899a46507 100644 --- a/src/libs/utils/tooltip/tooltip.h +++ b/src/libs/utils/tooltip/tooltip.h @@ -27,7 +27,6 @@ #include "../utils_global.h" -#include #include #include #include diff --git a/src/libs/utils/touchbar/touchbar.cpp b/src/libs/utils/touchbar/touchbar.cpp index 191fae385f6..b1bdeb05149 100644 --- a/src/libs/utils/touchbar/touchbar.cpp +++ b/src/libs/utils/touchbar/touchbar.cpp @@ -25,6 +25,11 @@ #include "touchbar.h" +#include +#include +#include +#include + namespace Utils { namespace Internal { diff --git a/src/libs/utils/touchbar/touchbar.h b/src/libs/utils/touchbar/touchbar.h index d00a33c4c99..55893172ba1 100644 --- a/src/libs/utils/touchbar/touchbar.h +++ b/src/libs/utils/touchbar/touchbar.h @@ -25,12 +25,14 @@ #pragma once -#include +#include "../utils_global.h" -#include -#include -#include -#include +QT_BEGIN_NAMESPACE +class QAction; +class QByteArray; +class QIcon; +class QString; +QT_END_NAMESPACE namespace Utils { diff --git a/src/libs/utils/treemodel.h b/src/libs/utils/treemodel.h index 7240d8d6b6b..570f39fd75e 100644 --- a/src/libs/utils/treemodel.h +++ b/src/libs/utils/treemodel.h @@ -26,6 +26,7 @@ #pragma once #include "utils_global.h" + #include "indexedcontainerproxyconstiterator.h" #include diff --git a/src/libs/utils/uncommentselection.cpp b/src/libs/utils/uncommentselection.cpp index 4b707eb42a5..051344bbc1b 100644 --- a/src/libs/utils/uncommentselection.cpp +++ b/src/libs/utils/uncommentselection.cpp @@ -29,6 +29,7 @@ #include "utils/multitextcursor.h" #include +#include #include namespace Utils { diff --git a/src/libs/utils/uncommentselection.h b/src/libs/utils/uncommentselection.h index 40895cbb9ea..ae09b63796e 100644 --- a/src/libs/utils/uncommentselection.h +++ b/src/libs/utils/uncommentselection.h @@ -28,10 +28,10 @@ #include "utils_global.h" #include -#include QT_BEGIN_NAMESPACE class QPlainTextEdit; +class QTextCursor; QT_END_NAMESPACE namespace Utils { diff --git a/src/libs/utils/unixutils.h b/src/libs/utils/unixutils.h index b43cb091427..32c4c40f0ca 100644 --- a/src/libs/utils/unixutils.h +++ b/src/libs/utils/unixutils.h @@ -29,6 +29,7 @@ QT_BEGIN_NAMESPACE class QSettings; +class QString; QT_END_NAMESPACE namespace Utils { diff --git a/src/libs/utils/url.cpp b/src/libs/utils/url.cpp index e325615bb2d..582a454a260 100644 --- a/src/libs/utils/url.cpp +++ b/src/libs/utils/url.cpp @@ -28,6 +28,7 @@ #include #include +#include namespace Utils { diff --git a/src/libs/utils/url.h b/src/libs/utils/url.h index 91ced4d4446..3d3400366ab 100644 --- a/src/libs/utils/url.h +++ b/src/libs/utils/url.h @@ -26,7 +26,11 @@ #pragma once #include "utils_global.h" -#include + +QT_BEGIN_NAMESPACE +class QString; +class QUrl; +QT_END_NAMESPACE namespace Utils { diff --git a/src/libs/utils/variablechooser.cpp b/src/libs/utils/variablechooser.cpp index 9ae14075790..cebf894d605 100644 --- a/src/libs/utils/variablechooser.cpp +++ b/src/libs/utils/variablechooser.cpp @@ -104,7 +104,7 @@ public: void createIconButton() { m_iconButton = new IconButton; - m_iconButton->setIcon(Utils::Icons::REPLACE.icon()); + m_iconButton->setIcon(Icons::REPLACE.icon()); m_iconButton->setToolTip(VariableChooser::tr("Insert Variable")); m_iconButton->hide(); connect(m_iconButton.data(), static_cast(&QAbstractButton::clicked), @@ -132,7 +132,7 @@ public: QPointer m_plainTextEdit; QPointer m_iconButton; - Utils::FancyLineEdit *m_variableFilter; + FancyLineEdit *m_variableFilter; VariableTreeView *m_variableTree; QLabel *m_variableDescription; QSortFilterProxyModel *m_sortModel; @@ -275,7 +275,7 @@ VariableChooserPrivate::VariableChooserPrivate(VariableChooser *parent) { m_defaultDescription = VariableChooser::tr("Select a variable to insert."); - m_variableFilter = new Utils::FancyLineEdit(q); + m_variableFilter = new FancyLineEdit(q); m_variableTree = new VariableTreeView(q, this); m_variableDescription = new QLabel(q); diff --git a/src/libs/utils/variablechooser.h b/src/libs/utils/variablechooser.h index 69b95141f6c..23cb56facf1 100644 --- a/src/libs/utils/variablechooser.h +++ b/src/libs/utils/variablechooser.h @@ -26,7 +26,6 @@ #pragma once #include "utils_global.h" -#include "macroexpander.h" #include @@ -34,6 +33,8 @@ namespace Utils { +class MacroExpander; + namespace Internal { class VariableChooserPrivate; } class QTCREATOR_UTILS_EXPORT VariableChooser : public QWidget @@ -44,10 +45,10 @@ public: explicit VariableChooser(QWidget *parent = nullptr); ~VariableChooser() override; - void addMacroExpanderProvider(const Utils::MacroExpanderProvider &provider); + void addMacroExpanderProvider(const std::function &provider); void addSupportedWidget(QWidget *textcontrol, const QByteArray &ownName = QByteArray()); - static void addSupportForChildWidgets(QWidget *parent, Utils::MacroExpander *expander); + static void addSupportForChildWidgets(QWidget *parent, MacroExpander *expander); protected: bool event(QEvent *ev) override; diff --git a/src/libs/utils/wizard.cpp b/src/libs/utils/wizard.cpp index 68ae59129c9..f0f291e575d 100644 --- a/src/libs/utils/wizard.cpp +++ b/src/libs/utils/wizard.cpp @@ -319,7 +319,7 @@ Wizard::Wizard(QWidget *parent, Qt::WindowFlags flags) : setOption(QWizard::NoCancelButton, false); setOption(QWizard::NoDefaultButton, false); setOption(QWizard::NoBackButtonOnStartPage, true); - if (!Utils::creatorTheme()->preferredStyles().isEmpty()) + if (!creatorTheme()->preferredStyles().isEmpty()) setWizardStyle(QWizard::ModernStyle); if (HostOsInfo::isMacHost()) { diff --git a/src/plugins/languageclient/languageclientsettings.cpp b/src/plugins/languageclient/languageclientsettings.cpp index ecdd8023a3b..bf4c3b9917e 100644 --- a/src/plugins/languageclient/languageclientsettings.cpp +++ b/src/plugins/languageclient/languageclientsettings.cpp @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include diff --git a/src/plugins/texteditor/snippets/snippet.cpp b/src/plugins/texteditor/snippets/snippet.cpp index 45b93f5c514..885b0080267 100644 --- a/src/plugins/texteditor/snippets/snippet.cpp +++ b/src/plugins/texteditor/snippets/snippet.cpp @@ -26,6 +26,7 @@ #include "snippet.h" #include +#include #include #include diff --git a/tests/auto/utils/templateengine/tst_templateengine.cpp b/tests/auto/utils/templateengine/tst_templateengine.cpp index ed51e5330af..a9352b17839 100644 --- a/tests/auto/utils/templateengine/tst_templateengine.cpp +++ b/tests/auto/utils/templateengine/tst_templateengine.cpp @@ -23,6 +23,7 @@ ** ****************************************************************************/ +#include #include #include