diff options
180 files changed, 700 insertions, 1256 deletions
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 49522cfb96..f58b3782a2 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -544,10 +544,10 @@ static std::function<bool(const Kit *)> cdbMatcher(char wordWidth = 0) static Kit *findUniversalCdbKit() { if (Utils::is64BitWindowsSystem()) { - if (Kit *cdb64Kit = KitManager::find(cdbMatcher(64))) + if (Kit *cdb64Kit = KitManager::find(KitMatcher(cdbMatcher(64)))) return cdb64Kit; } - return KitManager::find(cdbMatcher()); + return KitManager::find(KitMatcher(cdbMatcher())); } /////////////////////////////////////////////////////////////////////// diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp index d9edf16ec8..fbb2826232 100644 --- a/src/plugins/debugger/debuggerruncontrol.cpp +++ b/src/plugins/debugger/debuggerruncontrol.cpp @@ -367,20 +367,20 @@ void DebuggerRunControlCreator::enrich(const RunConfiguration *runConfig, const if (!abis.isEmpty()) { // Try exact abis. - m_kit = KitManager::find(std::function<bool (const Kit *)>([abis](const Kit *k) -> bool { + m_kit = KitManager::find(KitMatcher(std::function<bool (const Kit *)>([abis](const Kit *k) -> bool { if (const ToolChain *tc = ToolChainKitInformation::toolChain(k)) return abis.contains(tc->targetAbi()) && DebuggerKitInformation::isValidDebugger(k); return false; - })); + }))); if (!m_kit) { // Or something compatible. - m_kit = KitManager::find(std::function<bool (const Kit *)>([abis](const Kit *k) -> bool { + m_kit = KitManager::find(KitMatcher(std::function<bool (const Kit *)>([abis](const Kit *k) -> bool { if (const ToolChain *tc = ToolChainKitInformation::toolChain(k)) foreach (const Abi &a, abis) if (a.isCompatibleWith(tc->targetAbi()) && DebuggerKitInformation::isValidDebugger(k)) return true; return false; - })); + }))); } } } diff --git a/src/plugins/projectexplorer/abi.h b/src/plugins/projectexplorer/abi.h index 6066678b3d..f5973e7dc6 100644 --- a/src/plugins/projectexplorer/abi.h +++ b/src/plugins/projectexplorer/abi.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROJECTEXPLORER_ABI_H -#define PROJECTEXPLORER_ABI_H +#pragma once #include "projectexplorer_export.h" @@ -156,6 +155,5 @@ inline int qHash(const ProjectExplorer::Abi &abi) + (abi.wordWidth() << 13); return QT_PREPEND_NAMESPACE(qHash)(h); } -} // namespace ProjectExplorer -#endif // PROJECTEXPLORER_ABI_H +} // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/abiwidget.h b/src/plugins/projectexplorer/abiwidget.h index 2994ef90e0..7c34a8519f 100644 --- a/src/plugins/projectexplorer/abiwidget.h +++ b/src/plugins/projectexplorer/abiwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROJECTEXPLORER_ABIWIDGET_H -#define PROJECTEXPLORER_ABIWIDGET_H +#pragma once #include "projectexplorer_export.h" @@ -45,7 +44,7 @@ class PROJECTEXPLORER_EXPORT AbiWidget : public QWidget public: AbiWidget(QWidget *parent = 0); - ~AbiWidget(); + ~AbiWidget() override; void setAbis(const QList<Abi> &, const Abi ¤t); QList<Abi> supportedAbis() const; @@ -66,5 +65,3 @@ private: }; } // namespace ProjectExplorer - -#endif // PROJECTEXPLORER_ABIWIDGET_H diff --git a/src/plugins/projectexplorer/abstractmsvctoolchain.h b/src/plugins/projectexplorer/abstractmsvctoolchain.h index a5ff79425d..be95a36083 100644 --- a/src/plugins/projectexplorer/abstractmsvctoolchain.h +++ b/src/plugins/projectexplorer/abstractmsvctoolchain.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ABSTRACTMSVCTOOLCHAIN_H -#define ABSTRACTMSVCTOOLCHAIN_H +#pragma once #include "toolchain.h" #include "abi.h" @@ -100,5 +99,3 @@ protected: } // namespace Internal } // namespace ProjectExplorer - -#endif // ABSTRACTMSVCTOOLCHAIN_H diff --git a/src/plugins/projectexplorer/abstractprocessstep.h b/src/plugins/projectexplorer/abstractprocessstep.h index 23719078d9..cd32d2716a 100644 --- a/src/plugins/projectexplorer/abstractprocessstep.h +++ b/src/plugins/projectexplorer/abstractprocessstep.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ABSTRACTPROCESSSTEP_H -#define ABSTRACTPROCESSSTEP_H +#pragma once #include "buildstep.h" #include "processparameters.h" @@ -100,5 +99,3 @@ private: }; } // namespace ProjectExplorer - -#endif // ABSTRACTPROCESSSTEP_H diff --git a/src/plugins/projectexplorer/allprojectsfilter.h b/src/plugins/projectexplorer/allprojectsfilter.h index b000d0f816..0d8319d913 100644 --- a/src/plugins/projectexplorer/allprojectsfilter.h +++ b/src/plugins/projectexplorer/allprojectsfilter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ALLPROJECTSFILTER_H -#define ALLPROJECTSFILTER_H +#pragma once #include <coreplugin/locator/basefilefilter.h> @@ -39,8 +38,8 @@ class AllProjectsFilter : public Core::BaseFileFilter public: AllProjectsFilter(); - void refresh(QFutureInterface<void> &future); - void prepareSearch(const QString &entry); + void refresh(QFutureInterface<void> &future) override; + void prepareSearch(const QString &entry) override; private: void markFilesAsOutOfDate(); @@ -48,5 +47,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // ALLPROJECTSFILTER_H diff --git a/src/plugins/projectexplorer/allprojectsfind.h b/src/plugins/projectexplorer/allprojectsfind.h index f3ab40ca6b..b3b9f4f1e0 100644 --- a/src/plugins/projectexplorer/allprojectsfind.h +++ b/src/plugins/projectexplorer/allprojectsfind.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ALLPROJECTSFIND_H -#define ALLPROJECTSFIND_H +#pragma once #include <texteditor/basefilefind.h> @@ -43,24 +42,24 @@ class AllProjectsFind : public TextEditor::BaseFileFind public: AllProjectsFind(); - QString id() const; - QString displayName() const; + QString id() const override; + QString displayName() const override; - bool isEnabled() const; + bool isEnabled() const override; - QWidget *createConfigWidget(); - void writeSettings(QSettings *settings); - void readSettings(QSettings *settings); + QWidget *createConfigWidget() override; + void writeSettings(QSettings *settings) override; + void readSettings(QSettings *settings) override; protected: Utils::FileIterator *files(const QStringList &nameFilters, - const QVariant &additionalParameters) const; + const QVariant &additionalParameters) const override; Utils::FileIterator *filesForProjects(const QStringList &nameFilters, - const QList<Project *> &projects) const; + const QList<Project *> &projects) const; - QVariant additionalParameters() const; - QString label() const; - QString toolTip() const; + QVariant additionalParameters() const override; + QString label() const override; + QString toolTip() const override; private: void handleFileListChanged(); @@ -70,5 +69,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // ALLPROJECTSFIND_H diff --git a/src/plugins/projectexplorer/ansifilterparser.h b/src/plugins/projectexplorer/ansifilterparser.h index 0febbdd37e..b70423e1f0 100644 --- a/src/plugins/projectexplorer/ansifilterparser.h +++ b/src/plugins/projectexplorer/ansifilterparser.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANSIFILTERPARSER_H -#define ANSIFILTERPARSER_H +#pragma once #include "ioutputparser.h" @@ -36,13 +35,11 @@ class AnsiFilterParser : public IOutputParser public: AnsiFilterParser(); - void stdOutput(const QString &line); - void stdError(const QString &line); + void stdOutput(const QString &line) override; + void stdError(const QString &line) override; private: QString filterLine(const QString &line); }; } // namespace ProjectExplorer - -#endif // ANSIFILTERPARSER_H diff --git a/src/plugins/projectexplorer/applicationlauncher.h b/src/plugins/projectexplorer/applicationlauncher.h index f36ea7ab26..06820b7f6c 100644 --- a/src/plugins/projectexplorer/applicationlauncher.h +++ b/src/plugins/projectexplorer/applicationlauncher.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef APPLICATIONLAUNCHER_H -#define APPLICATIONLAUNCHER_H +#pragma once #include "projectexplorer_export.h" @@ -49,7 +48,7 @@ public: }; explicit ApplicationLauncher(QObject *parent = 0); - ~ApplicationLauncher(); + ~ApplicationLauncher() override; void setProcessChannelMode(QProcess::ProcessChannelMode mode); void start(const ProjectExplorer::StandardRunnable &runnable); @@ -85,5 +84,3 @@ private: }; } // namespace ProjectExplorer - -#endif // APPLICATIONLAUNCHER_H diff --git a/src/plugins/projectexplorer/appoutputpane.h b/src/plugins/projectexplorer/appoutputpane.h index bb9b2c45e2..a68349b8df 100644 --- a/src/plugins/projectexplorer/appoutputpane.h +++ b/src/plugins/projectexplorer/appoutputpane.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef APPOUTPUTPANE_H -#define APPOUTPUTPANE_H +#pragma once #include <coreplugin/ioutputpane.h> @@ -62,23 +61,23 @@ public: }; AppOutputPane(); - virtual ~AppOutputPane(); - - QWidget *outputWidget(QWidget *); - QList<QWidget *> toolBarWidgets() const; - QString displayName() const; - int priorityInStatusBar() const; - void clearContents(); - void visibilityChanged(bool); - bool canFocus() const; - bool hasFocus() const; - void setFocus(); - - bool canNext() const; - bool canPrevious() const; - void goToNext(); - void goToPrev(); - bool canNavigate() const; + ~AppOutputPane() override; + + QWidget *outputWidget(QWidget *) override; + QList<QWidget *> toolBarWidgets() const override; + QString displayName() const override; + int priorityInStatusBar() const override; + void clearContents() override; + void visibilityChanged(bool) override; + bool canFocus() const override; + bool hasFocus() const override; + void setFocus() override; + + bool canNext() const override; + bool canPrevious() const override; + void goToNext() override; + void goToPrev() override; + bool canNavigate() const override; void createNewOutputWindow(RunControl *rc); void showTabFor(RunControl *rc); @@ -162,5 +161,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // APPOUTPUTPANE_H diff --git a/src/plugins/projectexplorer/baseprojectwizarddialog.h b/src/plugins/projectexplorer/baseprojectwizarddialog.h index ed02084fa5..3cd414e338 100644 --- a/src/plugins/projectexplorer/baseprojectwizarddialog.h +++ b/src/plugins/projectexplorer/baseprojectwizarddialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BASEPROJECTWIZARDDIALOG_H -#define BASEPROJECTWIZARDDIALOG_H +#pragma once #include "projectexplorer_export.h" @@ -51,7 +50,7 @@ public: explicit BaseProjectWizardDialog(const Core::BaseFileWizardFactory *factory, QWidget *parent, const Core::WizardDialogParameters ¶meters); - virtual ~BaseProjectWizardDialog(); + ~BaseProjectWizardDialog() override; QString projectName() const; QString path() const; @@ -81,11 +80,9 @@ protected: private: void init(); void slotAccepted(); - bool validateCurrentPage(); + bool validateCurrentPage() override; BaseProjectWizardDialogPrivate *d; }; } // namespace ProjectExplorer - -#endif // BASEPROJECTWIZARDDIALOG_H diff --git a/src/plugins/projectexplorer/buildconfiguration.h b/src/plugins/projectexplorer/buildconfiguration.h index 90ad97f717..fb80a4d4fb 100644 --- a/src/plugins/projectexplorer/buildconfiguration.h +++ b/src/plugins/projectexplorer/buildconfiguration.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BUILDCONFIGURATION_H -#define BUILDCONFIGURATION_H +#pragma once #include "projectexplorer_export.h" #include "projectconfiguration.h" @@ -155,5 +154,3 @@ signals: } // namespace ProjectExplorer Q_DECLARE_METATYPE(ProjectExplorer::BuildConfiguration *) - -#endif // BUILDCONFIGURATION_H diff --git a/src/plugins/projectexplorer/buildconfigurationmodel.h b/src/plugins/projectexplorer/buildconfigurationmodel.h index 938523bfe2..c267facd04 100644 --- a/src/plugins/projectexplorer/buildconfigurationmodel.h +++ b/src/plugins/projectexplorer/buildconfigurationmodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BUILDCONFIGURATIONMODEL_H -#define BUILDCONFIGURATIONMODEL_H +#pragma once #include <QAbstractItemModel> @@ -39,21 +38,21 @@ class BuildConfigurationModel : public QAbstractListModel public: explicit BuildConfigurationModel(Target *target, QObject *parent = 0); - int rowCount(const QModelIndex &parent = QModelIndex()) const; - int columnCount(const QModelIndex &parent = QModelIndex()) const; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; BuildConfiguration *buildConfigurationAt(int i); BuildConfiguration *buildConfigurationFor(const QModelIndex &idx); QModelIndex indexFor(BuildConfiguration *rc); + private: void addedBuildConfiguration(ProjectExplorer::BuildConfiguration*); void removedBuildConfiguration(ProjectExplorer::BuildConfiguration*); void displayNameChanged(); + Target *m_target; QList<BuildConfiguration *> m_buildConfigurations; }; -} - -#endif // RUNCONFIGURATIONMODEL_H +} // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/buildenvironmentwidget.h b/src/plugins/projectexplorer/buildenvironmentwidget.h index 235b2b0a3a..7c45bd8f89 100644 --- a/src/plugins/projectexplorer/buildenvironmentwidget.h +++ b/src/plugins/projectexplorer/buildenvironmentwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BUILDENVIRONMENTWIDGET_H -#define BUILDENVIRONMENTWIDGET_H +#pragma once #include <projectexplorer/namedwidget.h> @@ -42,7 +41,7 @@ class PROJECTEXPLORER_EXPORT BuildEnvironmentWidget : public NamedWidget Q_OBJECT public: - BuildEnvironmentWidget(BuildConfiguration *bc); + explicit BuildEnvironmentWidget(BuildConfiguration *bc); private: void environmentModelUserChangesChanged(); @@ -55,5 +54,3 @@ private: }; } // namespace ProjectExplorer - -#endif // BUILDENVIRONMENTWIDGET_H diff --git a/src/plugins/projectexplorer/buildinfo.h b/src/plugins/projectexplorer/buildinfo.h index 20e0cd787c..ddda9363a4 100644 --- a/src/plugins/projectexplorer/buildinfo.h +++ b/src/plugins/projectexplorer/buildinfo.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BUILDINFO_H -#define BUILDINFO_H +#pragma once #include "projectexplorer_export.h" @@ -74,5 +73,3 @@ private: }; } // namespace ProjectExplorer - -#endif // BUILDINFO_H diff --git a/src/plugins/projectexplorer/buildmanager.h b/src/plugins/projectexplorer/buildmanager.h index fdda54a785..6716be4c0c 100644 --- a/src/plugins/projectexplorer/buildmanager.h +++ b/src/plugins/projectexplorer/buildmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BUILDMANAGER_H -#define BUILDMANAGER_H +#pragma once #include "projectexplorer_export.h" #include "buildstep.h" @@ -43,7 +42,7 @@ class PROJECTEXPLORER_EXPORT BuildManager : public QObject public: explicit BuildManager(QObject *parent, QAction *cancelBuildAction); - ~BuildManager(); + ~BuildManager() override; static BuildManager *instance(); static void extensionsInitialized(); @@ -104,5 +103,3 @@ private: }; } // namespace ProjectExplorer - -#endif // BUILDMANAGER_H diff --git a/src/plugins/projectexplorer/buildprogress.h b/src/plugins/projectexplorer/buildprogress.h index ff905ef8eb..d07dd06a5c 100644 --- a/src/plugins/projectexplorer/buildprogress.h +++ b/src/plugins/projectexplorer/buildprogress.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BUILDPROGRESS_H -#define BUILDPROGRESS_H +#pragma once #include "taskwindow.h" @@ -39,8 +38,9 @@ namespace Internal { class BuildProgress : public QWidget { Q_OBJECT + public: - BuildProgress(TaskWindow *taskWindow, Qt::Orientation orientation = Qt::Vertical); + explicit BuildProgress(TaskWindow *taskWindow, Qt::Orientation orientation = Qt::Vertical); private: void updateState(); @@ -55,5 +55,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // BUILDPROGRESS_H diff --git a/src/plugins/projectexplorer/buildsettingspropertiespage.h b/src/plugins/projectexplorer/buildsettingspropertiespage.h index 4c52f6f72b..e2e5c5a6da 100644 --- a/src/plugins/projectexplorer/buildsettingspropertiespage.h +++ b/src/plugins/projectexplorer/buildsettingspropertiespage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BUILDSETTINGSPROPERTIESPAGE_H -#define BUILDSETTINGSPROPERTIESPAGE_H +#pragma once #include <QWidget> @@ -49,7 +48,7 @@ class BuildSettingsWidget : public QWidget Q_OBJECT public: BuildSettingsWidget(Target *target); - ~BuildSettingsWidget(); + ~BuildSettingsWidget() override; void clearWidgets(); void addSubWidget(NamedWidget *widget); @@ -86,5 +85,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // BUILDSETTINGSPROPERTIESPAGE_H diff --git a/src/plugins/projectexplorer/buildstep.h b/src/plugins/projectexplorer/buildstep.h index f3d257018a..727c4ee3ba 100644 --- a/src/plugins/projectexplorer/buildstep.h +++ b/src/plugins/projectexplorer/buildstep.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BUILDSTEP_H -#define BUILDSTEP_H +#pragma once #include "projectconfiguration.h" #include "projectexplorer_export.h" @@ -94,8 +93,7 @@ private: bool m_enabled; }; -class PROJECTEXPLORER_EXPORT IBuildStepFactory : - public QObject +class PROJECTEXPLORER_EXPORT IBuildStepFactory : public QObject { Q_OBJECT @@ -116,14 +114,10 @@ public: virtual BuildStep *clone(BuildStepList *parent, BuildStep *product) = 0; }; -class PROJECTEXPLORER_EXPORT BuildStepConfigWidget - : public QWidget +class PROJECTEXPLORER_EXPORT BuildStepConfigWidget : public QWidget { Q_OBJECT public: - BuildStepConfigWidget() - : QWidget() - {} virtual QString summaryText() const = 0; virtual QString additionalSummaryText() const { return QString(); } virtual QString displayName() const = 0; @@ -134,20 +128,16 @@ signals: void updateAdditionalSummary(); }; -class PROJECTEXPLORER_EXPORT SimpleBuildStepConfigWidget - : public BuildStepConfigWidget +class PROJECTEXPLORER_EXPORT SimpleBuildStepConfigWidget : public BuildStepConfigWidget { Q_OBJECT public: - SimpleBuildStepConfigWidget(BuildStep *step) - : m_step(step) + SimpleBuildStepConfigWidget(BuildStep *step) : m_step(step) { connect(m_step, &ProjectConfiguration::displayNameChanged, this, &BuildStepConfigWidget::updateSummary); } - ~SimpleBuildStepConfigWidget() {} - QString summaryText() const { return QLatin1String("<b>") + displayName() + QLatin1String("</b>"); } QString displayName() const { return m_step->displayName(); } bool showWidget() const { return false; } @@ -161,5 +151,3 @@ private: Q_DECLARE_METATYPE(ProjectExplorer::BuildStep::OutputFormat) Q_DECLARE_METATYPE(ProjectExplorer::BuildStep::OutputNewlineSetting) - -#endif // BUILDSTEP_H diff --git a/src/plugins/projectexplorer/buildsteplist.h b/src/plugins/projectexplorer/buildsteplist.h index 899480c872..c91bfc508a 100644 --- a/src/plugins/projectexplorer/buildsteplist.h +++ b/src/plugins/projectexplorer/buildsteplist.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROJECTEXPLORER_BUILDSTEPLIST_H -#define PROJECTEXPLORER_BUILDSTEPLIST_H +#pragma once #include "projectexplorer_export.h" @@ -81,5 +80,3 @@ private: } // namespace ProjectExplorer Q_DECLARE_METATYPE(ProjectExplorer::BuildStepList *) - -#endif // PROJECTEXPLORER_BUILDSTEPLIST_H diff --git a/src/plugins/projectexplorer/buildstepspage.h b/src/plugins/projectexplorer/buildstepspage.h index 4275819be0..e315d77c43 100644 --- a/src/plugins/projectexplorer/buildstepspage.h +++ b/src/plugins/projectexplorer/buildstepspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BUILDSTEPSPAGE_H -#define BUILDSTEPSPAGE_H +#pragma once #include "buildstep.h" #include "namedwidget.h" @@ -52,7 +51,7 @@ class ToolWidget : public Utils::FadingPanel { Q_OBJECT public: - ToolWidget(QWidget *parent = 0); + explicit ToolWidget(QWidget *parent = 0); void fadeTo(qreal value); void setOpacity(qreal value); @@ -63,6 +62,7 @@ public: void setRemoveEnabled(bool b); void setUpVisible(bool b); void setDownVisible(bool b); + signals: void disabledClicked(); void upClicked(); @@ -154,5 +154,3 @@ private: } // Internal } // ProjectExplorer - -#endif // BUILDSTEPSPAGE_H diff --git a/src/plugins/projectexplorer/buildtargetinfo.h b/src/plugins/projectexplorer/buildtargetinfo.h index c513d0cc9f..ad93ff93d1 100644 --- a/src/plugins/projectexplorer/buildtargetinfo.h +++ b/src/plugins/projectexplorer/buildtargetinfo.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BUILDTARGETINFO_H -#define BUILDTARGETINFO_H +#pragma once #include "projectexplorer_export.h" @@ -39,14 +38,13 @@ namespace ProjectExplorer { class PROJECTEXPLORER_EXPORT BuildTargetInfo { public: - BuildTargetInfo() {} + BuildTargetInfo() = default; BuildTargetInfo(const QString &targetName, const Utils::FileName &targetFilePath, - const Utils::FileName &projectFilePath) - : targetName(targetName) - , targetFilePath(targetFilePath) - , projectFilePath(projectFilePath) - { - } + const Utils::FileName &projectFilePath) : + targetName(targetName), + targetFilePath(targetFilePath), + projectFilePath(projectFilePath) + { } QString targetName; Utils::FileName targetFilePath; @@ -71,7 +69,6 @@ inline uint qHash(const BuildTargetInfo &ti) return qHash(ti.targetName); } - class PROJECTEXPLORER_EXPORT BuildTargetInfoList { public: @@ -115,5 +112,3 @@ inline bool operator!=(const BuildTargetInfoList &til1, const BuildTargetInfoLis } } // namespace ProjectExplorer - -#endif // BUILDTARGETINFO_H diff --git a/src/plugins/projectexplorer/cesdkhandler.cpp b/src/plugins/projectexplorer/cesdkhandler.cpp index fbb19a28a2..5ddd17d436 100644 --- a/src/plugins/projectexplorer/cesdkhandler.cpp +++ b/src/plugins/projectexplorer/cesdkhandler.cpp @@ -48,10 +48,6 @@ void CeSdkInfo::addToEnvironment(Environment &env) env.prependOrSetPath(m_bin); } -CeSdkHandler::CeSdkHandler() -{ -} - bool CeSdkHandler::parse(const QString &vsdir) { // look at the file at %VCInstallDir%/vcpackages/WCE.VCPlatform.config diff --git a/src/plugins/projectexplorer/cesdkhandler.h b/src/plugins/projectexplorer/cesdkhandler.h index 0b46bc7f0b..dbbb5356a6 100644 --- a/src/plugins/projectexplorer/cesdkhandler.h +++ b/src/plugins/projectexplorer/cesdkhandler.h @@ -23,10 +23,9 @@ ** ****************************************************************************/ -#ifndef CE_SDK_HANDLER_H -#define CE_SDK_HANDLER_H +#pragma once -#include <projectexplorer/projectexplorer.h> +#include "projectexplorer.h" #include <QDir> @@ -38,6 +37,7 @@ class PROJECTEXPLORER_EXPORT CeSdkInfo { public: CeSdkInfo(); + inline QString name() const; inline QString binPath() const; inline QString includePath() const; @@ -47,6 +47,7 @@ public: inline int majorVersion() const; inline int minorVersion() const; inline bool isSupported() const; + private: friend class CeSdkHandler; QString m_name; @@ -69,16 +70,15 @@ inline bool CeSdkInfo::isSupported() const { return m_major >= 5; } class PROJECTEXPLORER_EXPORT CeSdkHandler { public: - CeSdkHandler(); - bool parse(const QString &path); - inline QList<CeSdkInfo> listAll() const; - CeSdkInfo find(const QString &name) const; - static QString platformName(const QString &qtpath); + bool parse(const QString &path); + inline QList<CeSdkInfo> listAll() const; + CeSdkInfo find(const QString &name) const; + static QString platformName(const QString &qtpath); private: - inline QString fixPaths(QString path) const; - QList<CeSdkInfo> m_list; - QString VCInstallDir; - QString VSInstallDir; + inline QString fixPaths(QString path) const; + QList<CeSdkInfo> m_list; + QString VCInstallDir; + QString VSInstallDir; }; inline QList<CeSdkInfo> CeSdkHandler::listAll() const @@ -98,5 +98,3 @@ inline QString CeSdkHandler::fixPaths(QString path) const } } // namespace ProjectExplorer - -#endif // CE_SDK_HANDLER_H diff --git a/src/plugins/projectexplorer/clangparser.h b/src/plugins/projectexplorer/clangparser.h index c4a6b9100a..642a1d6177 100644 --- a/src/plugins/projectexplorer/clangparser.h +++ b/src/plugins/projectexplorer/clangparser.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGPARSER_H -#define CLANGPARSER_H +#pragma once #include "gccparser.h" #include "task.h" @@ -51,5 +50,3 @@ private: }; } // namespace ProjectExplorer - -#endif // CLANGPARSER_H diff --git a/src/plugins/projectexplorer/codestylesettingspropertiespage.h b/src/plugins/projectexplorer/codestylesettingspropertiespage.h index d6e766d481..7ab03ff7ac 100644 --- a/src/plugins/projectexplorer/codestylesettingspropertiespage.h +++ b/src/plugins/projectexplorer/codestylesettingspropertiespage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CODESTYLESETTINGSPROPERTIESPAGE_H -#define CODESTYLESETTINGSPROPERTIESPAGE_H +#pragma once #include "ui_codestylesettingspropertiespage.h" @@ -38,7 +37,7 @@ class CodeStyleSettingsWidget : public QWidget { Q_OBJECT public: - CodeStyleSettingsWidget(Project *project); + explicit CodeStyleSettingsWidget(Project *project); private: Ui::CodeStyleSettingsPropertiesPage m_ui; @@ -47,6 +46,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - - -#endif // CODESTYLESETTINGSPROPERTIESPAGE_H diff --git a/src/plugins/projectexplorer/compileoutputwindow.h b/src/plugins/projectexplorer/compileoutputwindow.h index cb81ef521e..043b07001b 100644 --- a/src/plugins/projectexplorer/compileoutputwindow.h +++ b/src/plugins/projectexplorer/compileoutputwindow.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef COMPILEOUTPUTWINDOW_H -#define COMPILEOUTPUTWINDOW_H +#pragma once #include "buildstep.h" #include <coreplugin/ioutputpane.h> @@ -55,25 +54,26 @@ class CompileOutputWindow : public Core::IOutputPane Q_OBJECT public: - CompileOutputWindow(QAction *cancelBuildAction); - ~CompileOutputWindow(); - - QWidget *outputWidget(QWidget *); - QList<QWidget *> toolBarWidgets() const; - QString displayName() const { return tr("Compile Output"); } - int priorityInStatusBar() const; - void clearContents(); - void visibilityChanged(bool visible); - void appendText(const QString &text, BuildStep::OutputFormat format); - bool canFocus() const; - bool hasFocus() const; - void setFocus(); + explicit CompileOutputWindow(QAction *cancelBuildAction); + ~CompileOutputWindow() override; + + QWidget *outputWidget(QWidget *) override; + QList<QWidget *> toolBarWidgets() const override; + QString displayName() const override { return tr("Compile Output"); } + int priorityInStatusBar() const override; + void clearContents() override; + void visibilityChanged(bool visible) override; + bool canFocus() const override; + bool hasFocus() const override; + void setFocus() override; + + bool canNext() const override; + bool canPrevious() const override; + void goToNext() override; + void goToPrev() override; + bool canNavigate() const override; - bool canNext() const; - bool canPrevious() const; - void goToNext(); - void goToPrev(); - bool canNavigate() const; + void appendText(const QString &text, BuildStep::OutputFormat format); void registerPositionOf(const Task &task, int linkedOutputLines, int skipLines); bool knowsPositionOf(const Task &task); @@ -87,7 +87,7 @@ private: CompileOutputTextEdit *m_outputWindow; QHash<unsigned int, QPair<int, int>> m_taskPositions; - ShowOutputTaskHandler * m_handler; + ShowOutputTaskHandler *m_handler; QToolButton *m_cancelBuildButton; QToolButton *m_zoomInButton; QToolButton *m_zoomOutButton; @@ -96,5 +96,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // COMPILEOUTPUTWINDOW_H diff --git a/src/plugins/projectexplorer/configtaskhandler.h b/src/plugins/projectexplorer/configtaskhandler.h index 80ddcf907a..418c325233 100644 --- a/src/plugins/projectexplorer/configtaskhandler.h +++ b/src/plugins/projectexplorer/configtaskhandler.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROJECTEXPLORER_CONFIGTASKHANDLER_H -#define PROJECTEXPLORER_CONFIGTASKHANDLER_H +#pragma once #include "itaskhandler.h" @@ -40,9 +39,9 @@ class ConfigTaskHandler : public ITaskHandler public: ConfigTaskHandler(const Task &pattern, Core::Id page); - bool canHandle(const Task &task) const; - void handle(const Task &task); - QAction *createAction(QObject *parent) const; + bool canHandle(const Task &task) const override; + void handle(const Task &task) override; + QAction *createAction(QObject *parent) const override; private: const Task m_pattern; @@ -51,5 +50,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // PROJECTEXPLORER_CONFIGTASKHANDLER_H diff --git a/src/plugins/projectexplorer/copytaskhandler.h b/src/plugins/projectexplorer/copytaskhandler.h index 1f91ebcb8f..373cace0a1 100644 --- a/src/plugins/projectexplorer/copytaskhandler.h +++ b/src/plugins/projectexplorer/copytaskhandler.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROJECTEXPLORER_COPYTASKHANDLER_H -#define PROJECTEXPLORER_COPYTASKHANDLER_H +#pragma once #include "itaskhandler.h" @@ -36,15 +35,11 @@ class CopyTaskHandler : public ITaskHandler Q_OBJECT public: - CopyTaskHandler() {} - - bool canHandle(const Task &) const { return true; } - void handle(const Task &task); - Core::Id actionManagerId() const; - QAction *createAction(QObject *parent) const; + bool canHandle(const Task &) const override { return true; } + void handle(const Task &task) override; + Core::Id actionManagerId() const override; + QAction *createAction(QObject *parent) const override; }; } // namespace Internal } // namespace ProjectExplorer - -#endif // PROJECTEXPLORER_COPYTASKHANDLER_H diff --git a/src/plugins/projectexplorer/currentprojectfilter.cpp b/src/plugins/projectexplorer/currentprojectfilter.cpp index e34f8d1c46..be1ecd448b 100644 --- a/src/plugins/projectexplorer/currentprojectfilter.cpp +++ b/src/plugins/projectexplorer/currentprojectfilter.cpp @@ -36,8 +36,7 @@ using namespace Core; using namespace ProjectExplorer; using namespace ProjectExplorer::Internal; -CurrentProjectFilter::CurrentProjectFilter() - : BaseFileFilter(), m_project(0) +CurrentProjectFilter::CurrentProjectFilter() : BaseFileFilter(), m_project(0) { setId("Files in current project"); setDisplayName(tr("Files in Current Project")); diff --git a/src/plugins/projectexplorer/currentprojectfilter.h b/src/plugins/projectexplorer/currentprojectfilter.h index 3fe57aad8d..c62b2fa5de 100644 --- a/src/plugins/projectexplorer/currentprojectfilter.h +++ b/src/plugins/projectexplorer/currentprojectfilter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CURRENTPROJECTFILTER_H -#define CURRENTPROJECTFILTER_H +#pragma once #include <coreplugin/locator/basefilefilter.h> @@ -43,8 +42,8 @@ class CurrentProjectFilter : public Core::BaseFileFilter public: CurrentProjectFilter(); - void refresh(QFutureInterface<void> &future); - void prepareSearch(const QString &entry); + void refresh(QFutureInterface<void> &future) override; + void prepareSearch(const QString &entry) override; private: void currentProjectChanged(); @@ -55,5 +54,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // CURRENTPROJECTFILTER_H diff --git a/src/plugins/projectexplorer/currentprojectfind.h b/src/plugins/projectexplorer/currentprojectfind.h index 1404bca29c..301f97ebe3 100644 --- a/src/plugins/projectexplorer/currentprojectfind.h +++ b/src/plugins/projectexplorer/currentprojectfind.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CURRENTPROJECTFIND_H -#define CURRENTPROJECTFIND_H +#pragma once #include "allprojectsfind.h" @@ -41,19 +40,19 @@ class CurrentProjectFind : public AllProjectsFind public: CurrentProjectFind(); - QString id() const; - QString displayName() const; + QString id() const override; + QString displayName() const override; - bool isEnabled() const; + bool isEnabled() const override; - void writeSettings(QSettings *settings); - void readSettings(QSettings *settings); + void writeSettings(QSettings *settings) override; + void readSettings(QSettings *settings) override; protected: Utils::FileIterator *files(const QStringList &nameFilters, - const QVariant &additionalParameters) const; - QVariant additionalParameters() const; - QString label() const; + const QVariant &additionalParameters) const override; + QVariant additionalParameters() const override; + QString label() const override; private: void handleProjectChanged(); @@ -62,5 +61,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // CURRENTPROJECTFIND_H diff --git a/src/plugins/projectexplorer/customparser.cpp b/src/plugins/projectexplorer/customparser.cpp index 85dff66347..db68e85dec 100644 --- a/src/plugins/projectexplorer/customparser.cpp +++ b/src/plugins/projectexplorer/customparser.cpp @@ -118,10 +118,6 @@ CustomParser::CustomParser(const CustomParserSettings &settings) setSettings(settings); } -CustomParser::~CustomParser() -{ -} - void CustomParser::stdError(const QString &line) { if (parseLine(line, CustomParserExpression::ParseStdErrChannel)) diff --git a/src/plugins/projectexplorer/customparser.h b/src/plugins/projectexplorer/customparser.h index f9347ace41..a9e2c7b29c 100644 --- a/src/plugins/projectexplorer/customparser.h +++ b/src/plugins/projectexplorer/customparser.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CUSTOMPARSER_H -#define CUSTOMPARSER_H +#pragma once #include "ioutputparser.h" @@ -86,9 +85,9 @@ class CustomParser : public ProjectExplorer::IOutputParser { public: CustomParser(const CustomParserSettings &settings = CustomParserSettings()); - ~CustomParser(); - void stdError(const QString &line); - void stdOutput(const QString &line); + + void stdError(const QString &line) override; + void stdOutput(const QString &line) override; void setSettings(const CustomParserSettings &settings); @@ -104,5 +103,3 @@ private: } // namespace ProjectExplorer Q_DECLARE_METATYPE(ProjectExplorer::CustomParserExpression::CustomParserChannel); - -#endif // CUSTOMPARSER_H diff --git a/src/plugins/projectexplorer/customparserconfigdialog.h b/src/plugins/projectexplorer/customparserconfigdialog.h index f9e2577e9d..3b235c8205 100644 --- a/src/plugins/projectexplorer/customparserconfigdialog.h +++ b/src/plugins/projectexplorer/customparserconfigdialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CUSTOMPARSERCONFIGDIALOG_H -#define CUSTOMPARSERCONFIGDIALOG_H +#pragma once #include "customparser.h" @@ -45,7 +44,7 @@ class CustomParserConfigDialog : public QDialog public: explicit CustomParserConfigDialog(QDialog *parent = 0); - ~CustomParserConfigDialog(); + ~CustomParserConfigDialog() override; void setExampleSettings(); void setSettings(const CustomParserSettings &settings); @@ -89,5 +88,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // CUSTOMPARSERCONFIGDIALOG_H diff --git a/src/plugins/projectexplorer/customtoolchain.h b/src/plugins/projectexplorer/customtoolchain.h index b3b9e52a56..c0d1cd7635 100644 --- a/src/plugins/projectexplorer/customtoolchain.h +++ b/src/plugins/projectexplorer/customtoolchain.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CUSTOMTOOLCHAIN_H -#define CUSTOMTOOLCHAIN_H +#pragma once #include "projectexplorer_export.h" @@ -50,6 +49,7 @@ namespace ProjectExplorer { class AbiWidget; namespace Internal { class CustomToolChainFactory; } + // -------------------------------------------------------------------------- // CustomToolChain // -------------------------------------------------------------------------- @@ -199,5 +199,3 @@ protected: } // namespace Internal } // namespace ProjectExplorer - -#endif // CUSTOMTOOLCHAIN_H diff --git a/src/plugins/projectexplorer/dependenciespanel.h b/src/plugins/projectexplorer/dependenciespanel.h index 4c9c342876..5c5c886e5c 100644 --- a/src/plugins/projectexplorer/dependenciespanel.h +++ b/src/plugins/projectexplorer/dependenciespanel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEPENDENCIESPANEL_H -#define DEPENDENCIESPANEL_H +#pragma once #include <QAbstractListModel> @@ -53,11 +52,11 @@ class DependenciesModel : public QAbstractListModel public: explicit DependenciesModel(Project *project, QObject *parent = 0); - int rowCount(const QModelIndex &index) const; - int columnCount(const QModelIndex &index) const; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); - Qt::ItemFlags flags(const QModelIndex &index) const; + int rowCount(const QModelIndex &index) const override; + int columnCount(const QModelIndex &index) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; + Qt::ItemFlags flags(const QModelIndex &index) const override; private: void resetModel(); @@ -71,10 +70,10 @@ class DependenciesView : public QTreeView Q_OBJECT public: - DependenciesView(QWidget *parent); + explicit DependenciesView(QWidget *parent); - QSize sizeHint() const; - void setModel(QAbstractItemModel *model); + QSize sizeHint() const override; + void setModel(QAbstractItemModel *model) override; private: void updateSizeHint(); @@ -98,5 +97,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // DEPENDENCIESPANEL_H diff --git a/src/plugins/projectexplorer/deployablefile.h b/src/plugins/projectexplorer/deployablefile.h index 557ea78c87..4517b2e62e 100644 --- a/src/plugins/projectexplorer/deployablefile.h +++ b/src/plugins/projectexplorer/deployablefile.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEPLOYABLEFILE_H -#define DEPLOYABLEFILE_H +#pragma once #include "projectexplorer_export.h" @@ -77,5 +76,3 @@ inline bool operator!=(const DeployableFile &d1, const DeployableFile &d2) PROJECTEXPLORER_EXPORT uint qHash(const DeployableFile &d); } // namespace ProjectExplorer - -#endif // DEPLOYABLEFILE_H diff --git a/src/plugins/projectexplorer/deployconfiguration.h b/src/plugins/projectexplorer/deployconfiguration.h index 4044c86f98..fb59feeb4d 100644 --- a/src/plugins/projectexplorer/deployconfiguration.h +++ b/src/plugins/projectexplorer/deployconfiguration.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROJECTEXPLORER_DEPLOYCONFIGURATION_H -#define PROJECTEXPLORER_DEPLOYCONFIGURATION_H +#pragma once #include "projectexplorer_export.h" @@ -80,6 +79,7 @@ class PROJECTEXPLORER_EXPORT DefaultDeployConfiguration : public DeployConfigura { Q_OBJECT friend class DefaultDeployConfigurationFactory; // for the ctors + protected: DefaultDeployConfiguration(Target *target, Core::Id id); DefaultDeployConfiguration(Target *target, DeployConfiguration *source); @@ -132,5 +132,3 @@ private: } // namespace ProjectExplorer Q_DECLARE_METATYPE(ProjectExplorer::DeployConfiguration *) - -#endif // PROJECTEXPLORER_DEPLOYCONFIGURATION_H diff --git a/src/plugins/projectexplorer/deployconfigurationmodel.h b/src/plugins/projectexplorer/deployconfigurationmodel.h index 16bf7aa0ad..af0712c64e 100644 --- a/src/plugins/projectexplorer/deployconfigurationmodel.h +++ b/src/plugins/projectexplorer/deployconfigurationmodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROJECTEXPLORER_DEPLOYCONFIGURATIONMODEL_H -#define PROJECTEXPLORER_DEPLOYCONFIGURATIONMODEL_H +#pragma once #include <QAbstractItemModel> @@ -40,21 +39,21 @@ class DeployConfigurationModel : public QAbstractListModel public: explicit DeployConfigurationModel(Target *target, QObject *parent = 0); - int rowCount(const QModelIndex &parent = QModelIndex()) const; - int columnCount(const QModelIndex &parent = QModelIndex()) const; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; DeployConfiguration *deployConfigurationAt(int i); DeployConfiguration *deployConfigurationFor(const QModelIndex &idx); QModelIndex indexFor(DeployConfiguration *rc); + private: void addedDeployConfiguration(ProjectExplorer::DeployConfiguration*); void removedDeployConfiguration(ProjectExplorer::DeployConfiguration*); void displayNameChanged(); + Target *m_target; QList<DeployConfiguration *> m_deployConfigurations; }; } // namespace ProjectExplorer - -#endif // PROJECTEXPLORER_DEPLOYCONFIGURATIONMODEL_H diff --git a/src/plugins/projectexplorer/deploymentdata.h b/src/plugins/projectexplorer/deploymentdata.h index 159775adf0..937beb3d70 100644 --- a/src/plugins/projectexplorer/deploymentdata.h +++ b/src/plugins/projectexplorer/deploymentdata.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEPLOYMENTDATA_H -#define DEPLOYMENTDATA_H +#pragma once #include "deployablefile.h" #include "projectexplorer_export.h" @@ -84,5 +83,3 @@ inline bool operator!=(const DeploymentData &d1, const DeploymentData &d2) } } // namespace ProjectExplorer - -#endif // DEPLOYMENTDATA_H diff --git a/src/plugins/projectexplorer/deploymentdatamodel.h b/src/plugins/projectexplorer/deploymentdatamodel.h index 2cbb223a37..d148b572ad 100644 --- a/src/plugins/projectexplorer/deploymentdatamodel.h +++ b/src/plugins/projectexplorer/deploymentdatamodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEPLOYMENTDATAMODEL_H -#define DEPLOYMENTDATAMODEL_H +#pragma once #include "deploymentdata.h" #include "projectexplorer_export.h" @@ -42,14 +41,12 @@ public: void setDeploymentData(const DeploymentData &deploymentData); private: - int rowCount(const QModelIndex &parent = QModelIndex()) const; - int columnCount(const QModelIndex &parent = QModelIndex()) const; - QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; DeploymentData m_deploymentData; }; } // namespace ProjectExplorer - -#endif // Include guard diff --git a/src/plugins/projectexplorer/deploymentdataview.h b/src/plugins/projectexplorer/deploymentdataview.h index 0e64a222ff..5f984b3189 100644 --- a/src/plugins/projectexplorer/deploymentdataview.h +++ b/src/plugins/projectexplorer/deploymentdataview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEPLOYMENTDATAVIEW_H -#define DEPLOYMENTDATAVIEW_H +#pragma once #include "namedwidget.h" #include "projectexplorer_export.h" @@ -40,7 +39,7 @@ class PROJECTEXPLORER_EXPORT DeploymentDataView : public NamedWidget public: explicit DeploymentDataView(Target *target, QWidget *parent = 0); - ~DeploymentDataView(); + ~DeploymentDataView() override; private: void updateDeploymentDataModel(); @@ -49,5 +48,3 @@ private: }; } // namespace ProjectExplorer - -#endif // Include guard diff --git a/src/plugins/projectexplorer/devicesupport/desktopdevice.h b/src/plugins/projectexplorer/devicesupport/desktopdevice.h index ba22007d82..da6c1fada9 100644 --- a/src/plugins/projectexplorer/devicesupport/desktopdevice.h +++ b/src/plugins/projectexplorer/devicesupport/desktopdevice.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DESKTOPDEVICE_H -#define DESKTOPDEVICE_H +#pragma once #include "../projectexplorer_export.h" @@ -39,22 +38,22 @@ namespace Internal { class DesktopDeviceFactory; } class PROJECTEXPLORER_EXPORT DesktopDevice : public IDevice { public: - IDevice::DeviceInfo deviceInformation() const; + IDevice::DeviceInfo deviceInformation() const override; - QString displayType() const; - IDeviceWidget *createWidget(); - QList<Core::Id> actionIds() const; - QString displayNameForActionId(Core::Id actionId) const; - void executeAction(Core::Id actionId, QWidget *parent = 0); - bool canAutoDetectPorts() const; - bool canCreateProcessModel() const; - DeviceProcessList *createProcessListModel(QObject *parent) const; - bool canCreateProcess() const { return true; } - DeviceProcess *createProcess(QObject *parent) const; - DeviceProcessSignalOperation::Ptr signalOperation() const; - QString qmlProfilerHost() const; + QString displayType() const override; + IDeviceWidget *createWidget() override; + QList<Core::Id> actionIds() const override; + QString displayNameForActionId(Core::Id actionId) const override; + void executeAction(Core::Id actionId, QWidget *parent = 0) override; + bool canAutoDetectPorts() const override; + bool canCreateProcessModel() const override; + DeviceProcessList *createProcessListModel(QObject *parent) const override; + bool canCreateProcess() const override { return true; } + DeviceProcess *createProcess(QObject *parent) const override; + DeviceProcessSignalOperation::Ptr signalOperation() const override; + QString qmlProfilerHost() const override; - IDevice::Ptr clone() const; + IDevice::Ptr clone() const override; protected: DesktopDevice(); @@ -65,5 +64,3 @@ protected: }; } // namespace ProjectExplorer - -#endif // DESKTOPDEVICE_H diff --git a/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.h b/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.h index b6fca1fed2..06938498ff 100644 --- a/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.h +++ b/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DESKTOPDEVICECONFIGURATIONWIDGET_H -#define DESKTOPDEVICECONFIGURATIONWIDGET_H +#pragma once #include "idevicewidget.h" @@ -36,9 +35,9 @@ class DesktopDeviceConfigurationWidget : public IDeviceWidget Q_OBJECT public: explicit DesktopDeviceConfigurationWidget(const IDevice::Ptr &device, QWidget *parent = 0); - ~DesktopDeviceConfigurationWidget(); + ~DesktopDeviceConfigurationWidget() override; - void updateDeviceFromUi(); + void updateDeviceFromUi() override; private: void updateFreePorts(); @@ -50,5 +49,3 @@ private: }; } // namespace ProjectExplorer - -#endif // DESKTOPDEVICECONFIGURATIONWIDGET_H diff --git a/src/plugins/projectexplorer/devicesupport/desktopdevicefactory.h b/src/plugins/projectexplorer/devicesupport/desktopdevicefactory.h index b6fe711b17..6afcffce1c 100644 --- a/src/plugins/projectexplorer/devicesupport/desktopdevicefactory.h +++ b/src/plugins/projectexplorer/devicesupport/desktopdevicefactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DESKTOPDEVICEFACTORY_H -#define DESKTOPDEVICEFACTORY_H +#pragma once #include "idevicefactory.h" @@ -38,16 +37,14 @@ class DesktopDeviceFactory : public IDeviceFactory public: explicit DesktopDeviceFactory(QObject *parent = 0); - QString displayNameForId(Core::Id type) const; - QList<Core::Id> availableCreationIds() const; + QString displayNameForId(Core::Id type) const override; + QList<Core::Id> availableCreationIds() const override; - bool canCreate() const; - IDevice::Ptr create(Core::Id id) const; - bool canRestore(const QVariantMap &map) const; - IDevice::Ptr restore(const QVariantMap &map) const; + bool canCreate() const override; + IDevice::Ptr create(Core::Id id) const override; + bool canRestore(const QVariantMap &map) const override; + IDevice::Ptr restore(const QVariantMap &map) const override; }; } // namespace Internal } // namespace ProjectExplorer - -#endif // DESKTOPDEVICE_H diff --git a/src/plugins/projectexplorer/devicesupport/desktopdeviceprocess.h b/src/plugins/projectexplorer/devicesupport/desktopdeviceprocess.h index 9435c090c9..d7b0123fd4 100644 --- a/src/plugins/projectexplorer/devicesupport/desktopdeviceprocess.h +++ b/src/plugins/projectexplorer/devicesupport/desktopdeviceprocess.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QTC_DESKTOPDEVICEPROCESS_H -#define QTC_DESKTOPDEVICEPROCESS_H +#pragma once #include "deviceprocess.h" @@ -59,5 +58,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // Include guard diff --git a/src/plugins/projectexplorer/devicesupport/desktopprocesssignaloperation.h b/src/plugins/projectexplorer/devicesupport/desktopprocesssignaloperation.h index bd733238f5..cf41db2270 100644 --- a/src/plugins/projectexplorer/devicesupport/desktopprocesssignaloperation.h +++ b/src/plugins/projectexplorer/devicesupport/desktopprocesssignaloperation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef WINDOWSPROCESSSIGNALOPERATION_H -#define WINDOWSPROCESSSIGNALOPERATION_H +#pragma once #include "idevice.h" @@ -36,11 +35,10 @@ class PROJECTEXPLORER_EXPORT DesktopProcessSignalOperation : public DeviceProces { Q_OBJECT public: - ~DesktopProcessSignalOperation() {} - void killProcess(qint64 pid); - void killProcess(const QString &filePath); - void interruptProcess(qint64 pid); - void interruptProcess(const QString &filePath); + void killProcess(qint64 pid) override; + void killProcess(const QString &filePath) override; + void interruptProcess(qint64 pid) override; + void interruptProcess(const QString &filePath) override; private: void killProcessSilently(qint64 pid); @@ -50,10 +48,9 @@ private: void appendMsgCannotInterrupt(qint64 pid, const QString &why); protected: - explicit DesktopProcessSignalOperation() {} + DesktopProcessSignalOperation() = default; friend class DesktopDevice; }; } // namespace ProjectExplorer -#endif // WINDOWSPROCESSSIGNALOPERATION_H diff --git a/src/plugins/projectexplorer/devicesupport/deviceapplicationrunner.h b/src/plugins/projectexplorer/devicesupport/deviceapplicationrunner.h index 4b5610fec5..0eabc57d91 100644 --- a/src/plugins/projectexplorer/devicesupport/deviceapplicationrunner.h +++ b/src/plugins/projectexplorer/devicesupport/deviceapplicationrunner.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ONDEVICEAPPLICATIONRUNNER_H -#define ONDEVICEAPPLICATIONRUNNER_H +#pragma once #include "idevice.h" @@ -43,7 +42,7 @@ class PROJECTEXPLORER_EXPORT DeviceApplicationRunner : public QObject public: explicit DeviceApplicationRunner(QObject *parent = 0); - ~DeviceApplicationRunner(); + ~DeviceApplicationRunner() override; void start(const IDevice::ConstPtr &device, const Runnable &runnable); void stop(); @@ -70,5 +69,3 @@ private: }; } // namespace ProjectExplorer - -#endif // ONDEVICEAPPLICATIONRUNNER_H diff --git a/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.h b/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.h index f1b9accf0d..b56f12f078 100644 --- a/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.h +++ b/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROJECTEXPLORER_DEVICECHECKBUILDSTEP_H -#define PROJECTEXPLORER_DEVICECHECKBUILDSTEP_H +#pragma once #include "../buildstep.h" #include "../projectexplorer_export.h" @@ -51,5 +50,3 @@ public: }; } // namespace ProjectExplorer - -#endif // PROJECTEXPLORER_DEVICECHECKBUILDSTEP_H diff --git a/src/plugins/projectexplorer/devicesupport/devicefactoryselectiondialog.h b/src/plugins/projectexplorer/devicesupport/devicefactoryselectiondialog.h index b344c81675..bd1b0f713b 100644 --- a/src/plugins/projectexplorer/devicesupport/devicefactoryselectiondialog.h +++ b/src/plugins/projectexplorer/devicesupport/devicefactoryselectiondialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEVICEFACTORYSELECTIONDIALOG_H -#define DEVICEFACTORYSELECTIONDIALOG_H +#pragma once #include <QDialog> @@ -42,7 +41,7 @@ class DeviceFactorySelectionDialog : public QDialog public: explicit DeviceFactorySelectionDialog(QWidget *parent = 0); - ~DeviceFactorySelectionDialog(); + ~DeviceFactorySelectionDialog() override; Core::Id selectedId() const; private: @@ -53,5 +52,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // DEVICEFACTORYSELECTIONDIALOG_H diff --git a/src/plugins/projectexplorer/devicesupport/devicemanager.h b/src/plugins/projectexplorer/devicesupport/devicemanager.h index 5f5f134293..40e4af9c7f 100644 --- a/src/plugins/projectexplorer/devicesupport/devicemanager.h +++ b/src/plugins/projectexplorer/devicesupport/devicemanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEVICEMANAGER_H -#define DEVICEMANAGER_H +#pragma once #include "idevice.h" @@ -53,7 +52,7 @@ class PROJECTEXPLORER_EXPORT DeviceManager : public QObject friend class IDevice; public: - ~DeviceManager(); + ~DeviceManager() override; static DeviceManager *instance(); @@ -116,5 +115,3 @@ private: }; } // namespace ProjectExplorer - -#endif // DEVICEMANAGER_H diff --git a/src/plugins/projectexplorer/devicesupport/devicemanagermodel.h b/src/plugins/projectexplorer/devicesupport/devicemanagermodel.h index fe3734c6aa..5851699478 100644 --- a/src/plugins/projectexplorer/devicesupport/devicemanagermodel.h +++ b/src/plugins/projectexplorer/devicesupport/devicemanagermodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEVICEMANAGERMODEL_H -#define DEVICEMANAGERMODEL_H +#pragma once #include "../projectexplorer_export.h" #include "idevice.h" @@ -41,7 +40,7 @@ class PROJECTEXPLORER_EXPORT DeviceManagerModel : public QAbstractListModel Q_OBJECT public: explicit DeviceManagerModel(const DeviceManager *deviceManager, QObject *parent = 0); - ~DeviceManagerModel(); + ~DeviceManagerModel() override; void setFilter(const QList<Core::Id> &filter); void setTypeFilter(Core::Id type); @@ -50,7 +49,7 @@ public: Core::Id deviceId(int pos) const; int indexOf(IDevice::ConstPtr dev) const; int indexForId(Core::Id id) const; - int rowCount(const QModelIndex &parent = QModelIndex()) const; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; void updateDevice(Core::Id id); @@ -60,12 +59,10 @@ private: void handleDeviceUpdated(Core::Id id); void handleDeviceListChanged(); - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; bool matchesTypeFilter(const IDevice::ConstPtr &dev) const; Internal::DeviceManagerModelPrivate * const d; }; } // namespace ProjectExplorer - -#endif // DEVICEMANAGERMODEL_H diff --git a/src/plugins/projectexplorer/devicesupport/deviceprocess.cpp b/src/plugins/projectexplorer/devicesupport/deviceprocess.cpp index bdcfca22a1..dd6b89d4c7 100644 --- a/src/plugins/projectexplorer/devicesupport/deviceprocess.cpp +++ b/src/plugins/projectexplorer/devicesupport/deviceprocess.cpp @@ -36,10 +36,6 @@ DeviceProcess::DeviceProcess(const IDevice::ConstPtr &device, QObject *parent) { } -DeviceProcess::~DeviceProcess() -{ -} - IDevice::ConstPtr DeviceProcess::device() const { return m_device; diff --git a/src/plugins/projectexplorer/devicesupport/deviceprocess.h b/src/plugins/projectexplorer/devicesupport/deviceprocess.h index 3563172825..0bf423e967 100644 --- a/src/plugins/projectexplorer/devicesupport/deviceprocess.h +++ b/src/plugins/projectexplorer/devicesupport/deviceprocess.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QTC_DEVICEPROCESS_H -#define QTC_DEVICEPROCESS_H +#pragma once #include "../projectexplorer_export.h" #include "../runconfiguration.h" @@ -43,8 +42,6 @@ class PROJECTEXPLORER_EXPORT DeviceProcess : public QObject { Q_OBJECT public: - virtual ~DeviceProcess(); - virtual void start(const Runnable &runnable) = 0; virtual void interrupt() = 0; virtual void terminate() = 0; @@ -69,7 +66,7 @@ signals: void readyReadStandardError(); protected: - DeviceProcess(const QSharedPointer<const IDevice> &device, QObject *parent = 0); + explicit DeviceProcess(const QSharedPointer<const IDevice> &device, QObject *parent = 0); QSharedPointer<const IDevice> device() const; private: @@ -77,5 +74,3 @@ private: }; } // namespace ProjectExplorer - -#endif // Include guard. diff --git a/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.h b/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.h index 37e385d291..485bd6ff86 100644 --- a/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.h +++ b/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEVICEPROCESSESDIALOG_H -#define DEVICEPROCESSESDIALOG_H +#pragma once #include "../projectexplorer_export.h" @@ -45,7 +44,7 @@ class PROJECTEXPLORER_EXPORT DeviceProcessesDialog : public QDialog public: explicit DeviceProcessesDialog(QWidget *parent = 0); - ~DeviceProcessesDialog(); + ~DeviceProcessesDialog() override; void addAcceptButton(const QString &label); void addCloseButton(); @@ -63,5 +62,3 @@ private: }; } // namespace ProjectExplorer - -#endif // DEVICEPROCESSESDIALOG_H diff --git a/src/plugins/projectexplorer/devicesupport/deviceprocesslist.h b/src/plugins/projectexplorer/devicesupport/deviceprocesslist.h index 5b0be081cd..66f1f518c0 100644 --- a/src/plugins/projectexplorer/devicesupport/deviceprocesslist.h +++ b/src/plugins/projectexplorer/devicesupport/deviceprocesslist.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEVICEPROCESSLIST_H -#define DEVICEPROCESSLIST_H +#pragma once #include "idevice.h" @@ -52,7 +51,7 @@ class PROJECTEXPLORER_EXPORT DeviceProcessList : public QAbstractItemModel public: DeviceProcessList(const IDevice::ConstPtr &device, QObject *parent = 0); - ~DeviceProcessList(); + ~DeviceProcessList() override; void update(); void killProcess(int row); @@ -73,14 +72,14 @@ protected: IDevice::ConstPtr device() const; private: - QModelIndex index(int row, int column, const QModelIndex &parent) const; - int rowCount(const QModelIndex &parent = QModelIndex()) const; - int columnCount(const QModelIndex &parent = QModelIndex()) const; + QModelIndex index(int row, int column, const QModelIndex &parent) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; QVariant headerData(int section, Qt::Orientation orientation, - int role = Qt::DisplayRole) const; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - QModelIndex parent(const QModelIndex &) const; - bool hasChildren(const QModelIndex &parent) const; + int role = Qt::DisplayRole) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + QModelIndex parent(const QModelIndex &) const override; + bool hasChildren(const QModelIndex &parent) const override; virtual void doUpdate() = 0; virtual void doKillProcess(const DeviceProcessItem &process) = 0; @@ -91,5 +90,3 @@ private: }; } // namespace ProjectExplorer - -#endif // DEVICEPROCESSLIST_H diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingspage.h b/src/plugins/projectexplorer/devicesupport/devicesettingspage.h index 13fbf8e6a1..2712e51c32 100644 --- a/src/plugins/projectexplorer/devicesupport/devicesettingspage.h +++ b/src/plugins/projectexplorer/devicesupport/devicesettingspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEVICESETTINGSPAGE_H -#define DEVICESETTINGSPAGE_H +#pragma once #include <coreplugin/dialogs/ioptionspage.h> @@ -42,9 +41,9 @@ class DeviceSettingsPage : public Core::IOptionsPage public: DeviceSettingsPage(QObject *parent = 0); - QWidget *widget(); - void apply(); - void finish(); + QWidget *widget() override; + void apply() override; + void finish() override; private: QPointer<DeviceSettingsWidget> m_widget; @@ -52,5 +51,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // DEVICESETTINGSPAGE_H diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h index 1aa45f414e..c2fa9abe2b 100644 --- a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h +++ b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEVICESETTINGSWIDGET_H -#define DEVICESETTINGSWIDGET_H +#pragma once #include "idevice.h" @@ -51,7 +50,7 @@ class DeviceSettingsWidget : public QWidget Q_OBJECT public: DeviceSettingsWidget(QWidget *parent = 0); - ~DeviceSettingsWidget(); + ~DeviceSettingsWidget() override; void saveSettings(); @@ -87,5 +86,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // DEVICESETTINGSWIDGET_H diff --git a/src/plugins/projectexplorer/devicesupport/devicetestdialog.h b/src/plugins/projectexplorer/devicesupport/devicetestdialog.h index 414bdbd2ea..69e7c3c9b5 100644 --- a/src/plugins/projectexplorer/devicesupport/devicetestdialog.h +++ b/src/plugins/projectexplorer/devicesupport/devicetestdialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEVICETESTDIALOG_H -#define DEVICETESTDIALOG_H +#pragma once #include "idevice.h" @@ -39,9 +38,9 @@ class DeviceTestDialog : public QDialog public: DeviceTestDialog(const IDevice::ConstPtr &deviceConfiguration, QWidget *parent = 0); - ~DeviceTestDialog(); + ~DeviceTestDialog() override; - void reject(); + void reject() override; private: void handleProgressMessage(const QString &message); @@ -56,5 +55,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // Include guard. diff --git a/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.h b/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.h index ff17c849a9..f57e5951c0 100644 --- a/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.h +++ b/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEVICEUSEDPORTSGATHERER_H -#define DEVICEUSEDPORTSGATHERER_H +#pragma once #include "idevice.h" @@ -39,7 +38,7 @@ class PROJECTEXPLORER_EXPORT DeviceUsedPortsGatherer : public QObject public: DeviceUsedPortsGatherer(QObject *parent = 0); - ~DeviceUsedPortsGatherer(); + ~DeviceUsedPortsGatherer() override; void start(const ProjectExplorer::IDevice::ConstPtr &device); void stop(); @@ -63,5 +62,3 @@ private: }; } // namespace ProjectExplorer - -#endif // DEVICEUSEDPORTSGATHERER_H diff --git a/src/plugins/projectexplorer/devicesupport/idevice.cpp b/src/plugins/projectexplorer/devicesupport/idevice.cpp index 7c5c8db9d3..2f7a19ec9b 100644 --- a/src/plugins/projectexplorer/devicesupport/idevice.cpp +++ b/src/plugins/projectexplorer/devicesupport/idevice.cpp @@ -155,7 +155,6 @@ public: }; } // namespace Internal -PortsGatheringMethod::~PortsGatheringMethod() { } DeviceTester::DeviceTester(QObject *parent) : QObject(parent) { } IDevice::IDevice() : d(new Internal::IDevicePrivate) diff --git a/src/plugins/projectexplorer/devicesupport/idevice.h b/src/plugins/projectexplorer/devicesupport/idevice.h index c2f3543176..d1484e25ff 100644 --- a/src/plugins/projectexplorer/devicesupport/idevice.h +++ b/src/plugins/projectexplorer/devicesupport/idevice.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IDEVICE_H -#define IDEVICE_H +#pragma once #include "../projectexplorer_export.h" @@ -58,7 +57,6 @@ class PROJECTEXPLORER_EXPORT DeviceProcessSignalOperation : public QObject { Q_OBJECT public: - ~DeviceProcessSignalOperation() {} typedef QSharedPointer<DeviceProcessSignalOperation> Ptr; virtual void killProcess(qint64 pid) = 0; @@ -84,7 +82,7 @@ class PROJECTEXPLORER_EXPORT PortsGatheringMethod public: typedef QSharedPointer<const PortsGatheringMethod> Ptr; - virtual ~PortsGatheringMethod(); + virtual ~PortsGatheringMethod() = default; virtual QByteArray commandLine(QAbstractSocket::NetworkLayerProtocol protocol) const = 0; virtual QList<int> usedPorts(const QByteArray &commandOutput) const = 0; }; @@ -207,5 +205,3 @@ protected: }; } // namespace ProjectExplorer - -#endif // IDEVICE_H diff --git a/src/plugins/projectexplorer/devicesupport/idevicefactory.h b/src/plugins/projectexplorer/devicesupport/idevicefactory.h index 6f694dea39..d924b6e363 100644 --- a/src/plugins/projectexplorer/devicesupport/idevicefactory.h +++ b/src/plugins/projectexplorer/devicesupport/idevicefactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IDEVICEFACTORY_H -#define IDEVICEFACTORY_H +#pragma once #include "idevice.h" #include <projectexplorer/projectexplorer_export.h> @@ -51,19 +50,15 @@ public: virtual QList<Core::Id> availableCreationIds() const = 0; virtual bool canCreate() const; - virtual IDevice::Ptr create(Core::Id id) const = 0; virtual bool canRestore(const QVariantMap &map) const = 0; - virtual IDevice::Ptr restore(const QVariantMap &map) const = 0; static IDeviceFactory *find(Core::Id type); protected: - IDeviceFactory(QObject *parent = 0); + explicit IDeviceFactory(QObject *parent = 0); }; } // namespace ProjectExplorer - -#endif // IDEVICEFACTORY_H diff --git a/src/plugins/projectexplorer/devicesupport/idevicewidget.h b/src/plugins/projectexplorer/devicesupport/idevicewidget.h index 66c0db8e28..058e237d0e 100644 --- a/src/plugins/projectexplorer/devicesupport/idevicewidget.h +++ b/src/plugins/projectexplorer/devicesupport/idevicewidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IDEVICEWIDGET_H -#define IDEVICEWIDGET_H +#pragma once #include "idevice.h" #include <projectexplorer/projectexplorer_export.h> @@ -41,8 +40,9 @@ public: virtual void updateDeviceFromUi() = 0; protected: - IDeviceWidget(const IDevice::Ptr &device, QWidget *parent = 0) - : QWidget(parent), m_device(device) {} + explicit IDeviceWidget(const IDevice::Ptr &device, QWidget *parent = 0) : QWidget(parent), + m_device(device) + { } IDevice::Ptr device() const { return m_device; } @@ -51,5 +51,3 @@ private: }; } // namespace ProjectExplorer - -#endif // IDEVICEWIDGET_H diff --git a/src/plugins/projectexplorer/devicesupport/localprocesslist.h b/src/plugins/projectexplorer/devicesupport/localprocesslist.h index 9e8b50e5a6..7f9a22112f 100644 --- a/src/plugins/projectexplorer/devicesupport/localprocesslist.h +++ b/src/plugins/projectexplorer/devicesupport/localprocesslist.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef LOCALPROCESSLIST_H -#define LOCALPROCESSLIST_H +#pragma once #include "deviceprocesslist.h" @@ -42,24 +41,21 @@ class LocalProcessList : public DeviceProcessList Q_OBJECT public: - LocalProcessList(const IDevice::ConstPtr &device, QObject *parent = 0); - virtual Qt::ItemFlags flags(const QModelIndex &index) const; + explicit LocalProcessList(const IDevice::ConstPtr &device, QObject *parent = 0); + Qt::ItemFlags flags(const QModelIndex &index) const override; static QList<DeviceProcessItem> getLocalProcesses(); private: - void doUpdate(); - void doKillProcess(const DeviceProcessItem &process); + void doUpdate() override; + void doKillProcess(const DeviceProcessItem &process) override; private: void handleUpdate(); void reportDelayedKillStatus(const QString &errorMessage); const qint64 m_myPid; - }; } // namespace Internal } // namespace ProjectExplorer - -#endif // LOCALPROCESSLIST_H diff --git a/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.h b/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.h index 629ad20289..34cd908f2c 100644 --- a/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.h +++ b/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QTC_SSHDEVICEPROCESS_H -#define QTC_SSHDEVICEPROCESS_H +#pragma once #include "deviceprocess.h" @@ -36,23 +35,23 @@ class PROJECTEXPLORER_EXPORT SshDeviceProcess : public DeviceProcess { Q_OBJECT public: - SshDeviceProcess(const QSharedPointer<const IDevice> &device, QObject *parent = 0); - ~SshDeviceProcess(); + explicit SshDeviceProcess(const QSharedPointer<const IDevice> &device, QObject *parent = 0); + ~SshDeviceProcess() override; - void start(const Runnable &runnable); - void interrupt(); - void terminate(); - void kill(); + void start(const Runnable &runnable) override; + void interrupt() override; + void terminate() override; + void kill() override; - QProcess::ProcessState state() const; - QProcess::ExitStatus exitStatus() const; - int exitCode() const; - QString errorString() const; + QProcess::ProcessState state() const override; + QProcess::ExitStatus exitStatus() const override; + int exitCode() const override; + QString errorString() const override; - QByteArray readAllStandardOutput(); - QByteArray readAllStandardError(); + QByteArray readAllStandardOutput() override; + QByteArray readAllStandardError() override; - qint64 write(const QByteArray &data); + qint64 write(const QByteArray &data) override; // Default is "false" due to OpenSSH not implementing this feature for some reason. void setSshServerSupportsSignals(bool signalsSupported); @@ -76,5 +75,3 @@ private: }; } // namespace ProjectExplorer - -#endif // Include guard. diff --git a/src/plugins/projectexplorer/devicesupport/sshdeviceprocesslist.h b/src/plugins/projectexplorer/devicesupport/sshdeviceprocesslist.h index 62266f6b3e..2eeaccf69a 100644 --- a/src/plugins/projectexplorer/devicesupport/sshdeviceprocesslist.h +++ b/src/plugins/projectexplorer/devicesupport/sshdeviceprocesslist.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SSHDEVICEPROCESSLIST_H -#define SSHDEVICEPROCESSLIST_H +#pragma once #include "deviceprocesslist.h" @@ -35,7 +34,7 @@ class PROJECTEXPLORER_EXPORT SshDeviceProcessList : public DeviceProcessList Q_OBJECT public: explicit SshDeviceProcessList(const IDevice::ConstPtr &device, QObject *parent = 0); - ~SshDeviceProcessList(); + ~SshDeviceProcessList() override; private: void handleConnectionError(); @@ -45,8 +44,8 @@ private: virtual QString listProcessesCommandLine() const = 0; virtual QList<DeviceProcessItem> buildProcessList(const QString &listProcessesReply) const = 0; - void doUpdate(); - void doKillProcess(const DeviceProcessItem &process); + void doUpdate() override; + void doKillProcess(const DeviceProcessItem &process) override; void handleProcessError(const QString &errorMessage); void setFinished(); @@ -56,5 +55,3 @@ private: }; } // namespace ProjectExplorer - -#endif // SSHDEVICEPROCESSLIST_H diff --git a/src/plugins/projectexplorer/doubletabwidget.h b/src/plugins/projectexplorer/doubletabwidget.h index aec94e5beb..d701bcea00 100644 --- a/src/plugins/projectexplorer/doubletabwidget.h +++ b/src/plugins/projectexplorer/doubletabwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DOUBLETABWIDGET_H -#define DOUBLETABWIDGET_H +#pragma once #include <QVector> #include <QWidget> @@ -39,8 +38,8 @@ class DoubleTabWidget : public QWidget { Q_OBJECT public: - DoubleTabWidget(QWidget *parent = 0); - ~DoubleTabWidget(); + explicit DoubleTabWidget(QWidget *parent = 0); + ~DoubleTabWidget() override; void setTitle(const QString &title); QString title() const { return m_title; } @@ -63,10 +62,10 @@ signals: void currentIndexChanged(int index, int subIndex); protected: - void paintEvent(QPaintEvent *event); - void mousePressEvent(QMouseEvent *event); - bool event(QEvent *event); - QSize minimumSizeHint() const; + void paintEvent(QPaintEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + bool event(QEvent *event) override; + QSize minimumSizeHint() const override; private: struct Tab { @@ -97,5 +96,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // DOUBLETABWIDGET_H diff --git a/src/plugins/projectexplorer/editorconfiguration.h b/src/plugins/projectexplorer/editorconfiguration.h index 7535c1d6d6..9f410d6a1e 100644 --- a/src/plugins/projectexplorer/editorconfiguration.h +++ b/src/plugins/projectexplorer/editorconfiguration.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef EDITORCONFIGURATION_H -#define EDITORCONFIGURATION_H +#pragma once #include "projectexplorer_export.h" @@ -60,7 +59,7 @@ class PROJECTEXPLORER_EXPORT EditorConfiguration : public QObject public: EditorConfiguration(); - ~EditorConfiguration(); + ~EditorConfiguration() override; void setUseGlobalSettings(bool use); bool useGlobalSettings() const; @@ -117,6 +116,4 @@ private: PROJECTEXPLORER_EXPORT TextEditor::TabSettings actualTabSettings( const QString &fileName, const TextEditor::TextDocument *baseTextDocument); -} // ProjectExplorer - -#endif // EDITORCONFIGURATION_H +} // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/editorsettingspropertiespage.h b/src/plugins/projectexplorer/editorsettingspropertiespage.h index 5624fb2248..6f3fdb9670 100644 --- a/src/plugins/projectexplorer/editorsettingspropertiespage.h +++ b/src/plugins/projectexplorer/editorsettingspropertiespage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef EDITORSETTINGSPROPERTIESPAGE_H -#define EDITORSETTINGSPROPERTIESPAGE_H +#pragma once #include "ui_editorsettingspropertiespage.h" @@ -38,7 +37,7 @@ class EditorSettingsWidget : public QWidget { Q_OBJECT public: - EditorSettingsWidget(Project *project); + explicit EditorSettingsWidget(Project *project); private: void globalSettingsActivated(int index); @@ -52,5 +51,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // EDITORSETTINGSPROPERTIESPAGE_H diff --git a/src/plugins/projectexplorer/environmentaspect.h b/src/plugins/projectexplorer/environmentaspect.h index 97f7591c09..9fb946ef4b 100644 --- a/src/plugins/projectexplorer/environmentaspect.h +++ b/src/plugins/projectexplorer/environmentaspect.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ENVIRONMENTASPECT_H -#define ENVIRONMENTASPECT_H +#pragma once #include "projectexplorer_export.h" @@ -43,7 +42,7 @@ class PROJECTEXPLORER_EXPORT EnvironmentAspect : public IRunConfigurationAspect public: // IRunConfigurationAspect: - RunConfigWidget *createConfigurationWidget(); + RunConfigWidget *createConfigurationWidget() override; virtual QList<int> possibleBaseEnvironments() const = 0; virtual QString baseEnvironmentDisplayName(int base) const = 0; @@ -64,8 +63,8 @@ signals: protected: explicit EnvironmentAspect(RunConfiguration *rc); - void fromMap(const QVariantMap &map); - void toMap(QVariantMap &map) const; + void fromMap(const QVariantMap &map) override; + void toMap(QVariantMap &map) const override; private: mutable int m_base; @@ -73,5 +72,3 @@ private: }; } // namespace ProjectExplorer - -#endif // ENVIRONMENTASPECT_H diff --git a/src/plugins/projectexplorer/environmentaspectwidget.h b/src/plugins/projectexplorer/environmentaspectwidget.h index d81a6c4c76..c983373c3d 100644 --- a/src/plugins/projectexplorer/environmentaspectwidget.h +++ b/src/plugins/projectexplorer/environmentaspectwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ENVIRONMENTASPECTWIDGET_H -#define ENVIRONMENTASPECTWIDGET_H +#pragma once #include "projectexplorer_export.h" @@ -51,9 +50,9 @@ class PROJECTEXPLORER_EXPORT EnvironmentAspectWidget : public RunConfigWidget Q_OBJECT public: - EnvironmentAspectWidget(EnvironmentAspect *aspect, QWidget *additionalWidget = 0); + explicit EnvironmentAspectWidget(EnvironmentAspect *aspect, QWidget *additionalWidget = 0); - QString displayName() const; + QString displayName() const override; virtual EnvironmentAspect *aspect() const; QWidget *additionalWidget() const; @@ -75,5 +74,3 @@ private: }; } // namespace ProjectExplorer - -#endif // ENVIRONMENTASPECTWIDGET_H diff --git a/src/plugins/projectexplorer/environmentitemswidget.h b/src/plugins/projectexplorer/environmentitemswidget.h index a7f5ac119e..6306d5f770 100644 --- a/src/plugins/projectexplorer/environmentitemswidget.h +++ b/src/plugins/projectexplorer/environmentitemswidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ENVIRONMENTITEMSWIDGET_H -#define ENVIRONMENTITEMSWIDGET_H +#pragma once #include <QDialog> @@ -38,7 +37,7 @@ class EnvironmentItemsWidget : public QWidget Q_OBJECT public: explicit EnvironmentItemsWidget(QWidget *parent = 0); - ~EnvironmentItemsWidget(); + ~EnvironmentItemsWidget() override; void setEnvironmentItems(const QList<Utils::EnvironmentItem> &items); QList<Utils::EnvironmentItem> environmentItems() const; @@ -55,18 +54,16 @@ class EnvironmentItemsDialog : public QDialog Q_OBJECT public: explicit EnvironmentItemsDialog(QWidget *parent = 0); - ~EnvironmentItemsDialog(); + ~EnvironmentItemsDialog() override; void setEnvironmentItems(const QList<Utils::EnvironmentItem> &items); QList<Utils::EnvironmentItem> environmentItems() const; - static QList<Utils::EnvironmentItem> getEnvironmentItems(QWidget *parent, - const QList<Utils::EnvironmentItem> &initial, bool *ok = 0); + static QList<Utils::EnvironmentItem> + getEnvironmentItems(QWidget *parent, const QList<Utils::EnvironmentItem> &initial, bool *ok = 0); private: EnvironmentItemsDialogPrivate *d; }; } // namespace ProjectExplorer - -#endif // ENVIRONMENTITEMSWIDGET_H diff --git a/src/plugins/projectexplorer/environmentwidget.h b/src/plugins/projectexplorer/environmentwidget.h index 76e022a992..99a390d0f4 100644 --- a/src/plugins/projectexplorer/environmentwidget.h +++ b/src/plugins/projectexplorer/environmentwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ENVIRONMENTWIDGET_H -#define ENVIRONMENTWIDGET_H +#pragma once #include "projectexplorer_export.h" @@ -36,7 +35,7 @@ QT_FORWARD_DECLARE_CLASS(QModelIndex) namespace Utils { class Environment; class EnvironmentItem; -} +} // namespace Utils namespace ProjectExplorer { namespace Internal { @@ -48,7 +47,7 @@ protected: QModelIndex moveCursor(CursorAction cursorAction, Qt::KeyboardModifiers modifiers); void keyPressEvent(QKeyEvent *event); }; -} +} // namespace Internal class EnvironmentWidgetPrivate; @@ -58,7 +57,7 @@ class PROJECTEXPLORER_EXPORT EnvironmentWidget : public QWidget public: explicit EnvironmentWidget(QWidget *parent, QWidget *additionalDetailsWidget = 0); - virtual ~EnvironmentWidget(); + ~EnvironmentWidget() override; void setBaseEnvironmentText(const QString &text); void setBaseEnvironment(const Utils::Environment &env); @@ -87,5 +86,3 @@ private: }; } // namespace ProjectExplorer - -#endif // ENVIRONMENTWIDGET_H diff --git a/src/plugins/projectexplorer/expanddata.h b/src/plugins/projectexplorer/expanddata.h index 1c61c17098..090007b619 100644 --- a/src/plugins/projectexplorer/expanddata.h +++ b/src/plugins/projectexplorer/expanddata.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef EXPANDDATA_H -#define EXPANDDATA_H +#pragma once #include <QString> #include <QHash> @@ -49,5 +48,3 @@ int qHash(const ExpandData &data); } // namespace Internal } // namespace ProjectExplorer - -#endif // EXPANDDATA_H diff --git a/src/plugins/projectexplorer/foldernavigationwidget.h b/src/plugins/projectexplorer/foldernavigationwidget.h index 6faa4fd02e..d74040fe5f 100644 --- a/src/plugins/projectexplorer/foldernavigationwidget.h +++ b/src/plugins/projectexplorer/foldernavigationwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FOLDERNAVIGATIONWIDGET_H -#define FOLDERNAVIGATIONWIDGET_H +#pragma once #include <coreplugin/inavigationwidgetfactory.h> @@ -49,7 +48,7 @@ class FolderNavigationWidget : public QWidget Q_OBJECT Q_PROPERTY(bool autoSynchronization READ autoSynchronization WRITE setAutoSynchronization) public: - FolderNavigationWidget(QWidget *parent = 0); + explicit FolderNavigationWidget(QWidget *parent = 0); bool autoSynchronization() const; bool hiddenFilesFilter() const; @@ -65,7 +64,7 @@ private: void ensureCurrentIndex(); protected: - virtual void contextMenuEvent(QContextMenuEvent *ev); + void contextMenuEvent(QContextMenuEvent *ev) override; private: void setCurrentTitle(QString dirName, const QString &fullPath); @@ -91,12 +90,10 @@ class FolderNavigationWidgetFactory : public Core::INavigationWidgetFactory public: FolderNavigationWidgetFactory(); - Core::NavigationView createWidget(); - void saveSettings(int position, QWidget *widget); - void restoreSettings(int position, QWidget *widget); + Core::NavigationView createWidget() override; + void saveSettings(int position, QWidget *widget) override; + void restoreSettings(int position, QWidget *widget) override; }; } // namespace Internal } // namespace ProjectExplorer - -#endif // FOLDERNAVIGATIONWIDGET_H diff --git a/src/plugins/projectexplorer/gccparser.h b/src/plugins/projectexplorer/gccparser.h index 6c704c30c3..441122f1c7 100644 --- a/src/plugins/projectexplorer/gccparser.h +++ b/src/plugins/projectexplorer/gccparser.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GCCPARSER_H -#define GCCPARSER_H +#pragma once #include "ioutputparser.h" @@ -41,12 +40,12 @@ class PROJECTEXPLORER_EXPORT GccParser : public ProjectExplorer::IOutputParser public: GccParser(); - void stdError(const QString &line); - void stdOutput(const QString &line); + void stdError(const QString &line) override; + void stdOutput(const QString &line) override; protected: void newTask(const Task &task); - void doFlush(); + void doFlush() override; void amendDescription(const QString &desc, bool monospaced); @@ -60,5 +59,3 @@ private: }; } // namespace ProjectExplorer - -#endif // GCCPARSER_H diff --git a/src/plugins/projectexplorer/gcctoolchain.h b/src/plugins/projectexplorer/gcctoolchain.h index 7e2bc129a0..849bee9f10 100644 --- a/src/plugins/projectexplorer/gcctoolchain.h +++ b/src/plugins/projectexplorer/gcctoolchain.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GCCTOOLCHAIN_H -#define GCCTOOLCHAIN_H +#pragma once #include "projectexplorer_export.h" @@ -222,5 +221,3 @@ private: }; } // namespace ProjectExplorer - -#endif // GCCTOOLCHAIN_H diff --git a/src/plugins/projectexplorer/gcctoolchainfactories.h b/src/plugins/projectexplorer/gcctoolchainfactories.h index cd3e95f930..700e8d09eb 100644 --- a/src/plugins/projectexplorer/gcctoolchainfactories.h +++ b/src/plugins/projectexplorer/gcctoolchainfactories.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GCCTOOLCHAINFACTORIES_H -#define GCCTOOLCHAINFACTORIES_H +#pragma once #include "toolchain.h" #include "toolchainconfigwidget.h" @@ -51,13 +50,13 @@ class GccToolChainFactory : public ToolChainFactory public: GccToolChainFactory(); - QList<ToolChain *> autoDetect(const QList<ToolChain *> &alreadyKnown); + QList<ToolChain *> autoDetect(const QList<ToolChain *> &alreadyKnown) override; - bool canCreate(); - ToolChain *create(); + bool canCreate() override; + ToolChain *create() override; - bool canRestore(const QVariantMap &data); - ToolChain *restore(const QVariantMap &data); + bool canRestore(const QVariantMap &data) override; + ToolChain *restore(const QVariantMap &data) override; protected: virtual GccToolChain *createToolChain(bool autoDetect); @@ -75,7 +74,7 @@ class GccToolChainConfigWidget : public ToolChainConfigWidget Q_OBJECT public: - GccToolChainConfigWidget(GccToolChain *); + explicit GccToolChainConfigWidget(GccToolChain *tc); static QStringList splitString(const QString &s); private: @@ -83,10 +82,10 @@ private: void handlePlatformCodeGenFlagsChange(); void handlePlatformLinkerFlagsChange(); - void applyImpl(); - void discardImpl() { setFromToolchain(); } - bool isDirtyImpl() const; - void makeReadOnlyImpl(); + void applyImpl() override; + void discardImpl() override { setFromToolchain(); } + bool isDirtyImpl() const override; + void makeReadOnlyImpl() override; void setFromToolchain(); @@ -110,12 +109,12 @@ class ClangToolChainFactory : public GccToolChainFactory public: ClangToolChainFactory(); - QList<ToolChain *> autoDetect(const QList<ToolChain *> &alreadyKnown); + QList<ToolChain *> autoDetect(const QList<ToolChain *> &alreadyKnown) override; - bool canRestore(const QVariantMap &data); + bool canRestore(const QVariantMap &data) override; protected: - GccToolChain *createToolChain(bool autoDetect); + GccToolChain *createToolChain(bool autoDetect) override; }; // -------------------------------------------------------------------------- @@ -129,12 +128,12 @@ class MingwToolChainFactory : public GccToolChainFactory public: MingwToolChainFactory(); - QList<ToolChain *> autoDetect(const QList<ToolChain *> &alreadyKnown); + QList<ToolChain *> autoDetect(const QList<ToolChain *> &alreadyKnown) override; - bool canRestore(const QVariantMap &data); + bool canRestore(const QVariantMap &data) override; protected: - GccToolChain *createToolChain(bool autoDetect); + GccToolChain *createToolChain(bool autoDetect) override; }; // -------------------------------------------------------------------------- @@ -148,15 +147,13 @@ class LinuxIccToolChainFactory : public GccToolChainFactory public: LinuxIccToolChainFactory(); - QList<ToolChain *> autoDetect(const QList<ToolChain *> &alreadyKnown); + QList<ToolChain *> autoDetect(const QList<ToolChain *> &alreadyKnown) override; - bool canRestore(const QVariantMap &data); + bool canRestore(const QVariantMap &data) override; protected: - GccToolChain *createToolChain(bool autoDetect); + GccToolChain *createToolChain(bool autoDetect) override; }; } // namespace Internal } // namespace ProjectExplorer - -#endif // GCCTOOLCHAINFACTORIES_H diff --git a/src/plugins/projectexplorer/gnumakeparser.h b/src/plugins/projectexplorer/gnumakeparser.h index fb5871e36a..97bd7805fc 100644 --- a/src/plugins/projectexplorer/gnumakeparser.h +++ b/src/plugins/projectexplorer/gnumakeparser.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GNUMAKEPARSER_H -#define GNUMAKEPARSER_H +#pragma once #include "ioutputparser.h" @@ -40,16 +39,16 @@ class PROJECTEXPLORER_EXPORT GnuMakeParser : public ProjectExplorer::IOutputPars public: explicit GnuMakeParser(); - void stdOutput(const QString &line); - void stdError(const QString &line); + void stdOutput(const QString &line) override; + void stdError(const QString &line) override; - void setWorkingDirectory(const QString &workingDirectory); + void setWorkingDirectory(const QString &workingDirectory) override; QStringList searchDirectories() const; - bool hasFatalErrors() const; + bool hasFatalErrors() const override; - void taskAdded(const ProjectExplorer::Task &task, int linkedLines, int skippedLines); + void taskAdded(const ProjectExplorer::Task &task, int linkedLines, int skippedLines) override; private: void addDirectory(const QString &dir); @@ -85,5 +84,3 @@ public: #endif } // namespace ProjectExplorer - -#endif // GNUMAKEPARSER_H diff --git a/src/plugins/projectexplorer/headerpath.h b/src/plugins/projectexplorer/headerpath.h index 82129727e1..37200239a0 100644 --- a/src/plugins/projectexplorer/headerpath.h +++ b/src/plugins/projectexplorer/headerpath.h @@ -23,9 +23,7 @@ ** ****************************************************************************/ -#ifndef HEADERPATH_H -#define HEADERPATH_H - +#pragma once #include <QString> #include "projectexplorer_export.h" @@ -41,12 +39,10 @@ public: FrameworkHeaderPath }; - HeaderPath() - : m_kind(GlobalHeaderPath) + HeaderPath() : m_kind(GlobalHeaderPath) { } - HeaderPath(const QString &path, Kind kind) - : m_path(path), m_kind(kind) + HeaderPath(const QString &path, Kind kind) : m_path(path), m_kind(kind) { } QString path() const { return m_path; } @@ -54,8 +50,7 @@ public: bool operator==(const HeaderPath &other) const { - return m_kind == other.m_kind - && m_path == other.m_path; + return m_kind == other.m_kind && m_path == other.m_path; } private: @@ -64,5 +59,3 @@ private: }; } // namespace ProjectExplorer - -#endif // HEADERPATH_H diff --git a/src/plugins/projectexplorer/importwidget.cpp b/src/plugins/projectexplorer/importwidget.cpp index daf1677cdb..2e6deeabef 100644 --- a/src/plugins/projectexplorer/importwidget.cpp +++ b/src/plugins/projectexplorer/importwidget.cpp @@ -64,9 +64,6 @@ ImportWidget::ImportWidget(QWidget *parent) : detailsWidget->setWidget(widget); } -ImportWidget::~ImportWidget() -{ } - void ImportWidget::setCurrentDirectory(const Utils::FileName &dir) { m_pathChooser->setBaseFileName(dir); diff --git a/src/plugins/projectexplorer/importwidget.h b/src/plugins/projectexplorer/importwidget.h index 7dc6646c79..dc3601c71d 100644 --- a/src/plugins/projectexplorer/importwidget.h +++ b/src/plugins/projectexplorer/importwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IMPORTWIDGET_H -#define IMPORTWIDGET_H +#pragma once #include <QWidget> @@ -42,7 +41,6 @@ class ImportWidget : public QWidget public: explicit ImportWidget(QWidget *parent = 0); - ~ImportWidget(); void setCurrentDirectory(const Utils::FileName &dir); @@ -57,5 +55,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // IMPORTWIDGET_H diff --git a/src/plugins/projectexplorer/ioutputparser.h b/src/plugins/projectexplorer/ioutputparser.h index 03b8468b66..bd668e8766 100644 --- a/src/plugins/projectexplorer/ioutputparser.h +++ b/src/plugins/projectexplorer/ioutputparser.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IOUTPUTPARSER_H -#define IOUTPUTPARSER_H +#pragma once #include "projectexplorer_export.h" #include "buildstep.h" @@ -40,7 +39,7 @@ class PROJECTEXPLORER_EXPORT IOutputParser : public QObject Q_OBJECT public: IOutputParser() = default; - ~IOutputParser(); + ~IOutputParser() override; virtual void appendOutputParser(IOutputParser *parser); @@ -77,5 +76,3 @@ private: } // namespace ProjectExplorer Q_DECLARE_METATYPE(ProjectExplorer::IOutputParser*) - -#endif // IOUTPUTPARSER_H diff --git a/src/plugins/projectexplorer/ipotentialkit.cpp b/src/plugins/projectexplorer/ipotentialkit.cpp deleted file mode 100644 index 9e25bf207a..0000000000 --- a/src/plugins/projectexplorer/ipotentialkit.cpp +++ /dev/null @@ -1,31 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -#include "ipotentialkit.h" - -ProjectExplorer::IPotentialKit::~IPotentialKit() -{ - -} diff --git a/src/plugins/projectexplorer/ipotentialkit.h b/src/plugins/projectexplorer/ipotentialkit.h index ad4cf47c89..3be5b9907e 100644 --- a/src/plugins/projectexplorer/ipotentialkit.h +++ b/src/plugins/projectexplorer/ipotentialkit.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IPOTENTIALKIT_H -#define IPOTENTIALKIT_H +#pragma once #include <QObject> #include <QMetaType> @@ -36,7 +35,6 @@ class PROJECTEXPLORER_EXPORT IPotentialKit : public QObject { Q_OBJECT public: - virtual ~IPotentialKit(); virtual QString displayName() const = 0; virtual void executeFromMenu() = 0; virtual QWidget *createWidget(QWidget *parent) const = 0; @@ -45,5 +43,3 @@ public: } Q_DECLARE_METATYPE(ProjectExplorer::IPotentialKit*) - -#endif // IPOTENTIALKIT_H diff --git a/src/plugins/projectexplorer/iprojectmanager.h b/src/plugins/projectexplorer/iprojectmanager.h index 9a1532b942..7d25e9ba02 100644 --- a/src/plugins/projectexplorer/iprojectmanager.h +++ b/src/plugins/projectexplorer/iprojectmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROJECTMANAGER_H -#define PROJECTMANAGER_H +#pragma once #include "projectexplorer_export.h" @@ -34,19 +33,14 @@ namespace ProjectExplorer { class Project; -class PROJECTEXPLORER_EXPORT IProjectManager - : public QObject +class PROJECTEXPLORER_EXPORT IProjectManager : public QObject { Q_OBJECT public: - IProjectManager() {} - virtual QString mimeType() const = 0; // fileName is a canonical path! virtual Project *openProject(const QString &fileName, QString *errorString) = 0; }; } // namespace ProjectExplorer - -#endif //PROJECTMANAGER_H diff --git a/src/plugins/projectexplorer/itaskhandler.h b/src/plugins/projectexplorer/itaskhandler.h index a76e0780d7..307a15a330 100644 --- a/src/plugins/projectexplorer/itaskhandler.h +++ b/src/plugins/projectexplorer/itaskhandler.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROJECTEXPLORER_ITASKHANDLER_H -#define PROJECTEXPLORER_ITASKHANDLER_H +#pragma once #include "projectexplorer_export.h" @@ -45,8 +44,6 @@ class PROJECTEXPLORER_EXPORT ITaskHandler : public QObject Q_OBJECT public: - explicit ITaskHandler() {} - virtual bool isDefaultHandler() const { return false; } virtual bool canHandle(const Task &) const = 0; virtual void handle(const Task &) = 0; @@ -55,5 +52,3 @@ public: }; } // namespace ProjectExplorer - -#endif // PROJECTEXPLORER_ITASKHANDLER_H diff --git a/src/plugins/projectexplorer/journaldwatcher.h b/src/plugins/projectexplorer/journaldwatcher.h index 904fb90e46..27ed739142 100644 --- a/src/plugins/projectexplorer/journaldwatcher.h +++ b/src/plugins/projectexplorer/journaldwatcher.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef JOURNALDWATCHER_H -#define JOURNALDWATCHER_H +#pragma once #include <QByteArray> #include <QMap> @@ -44,7 +43,7 @@ public: typedef QMap<QByteArray, QByteArray> LogEntry; typedef std::function<void(LogEntry)> Subscription; - ~JournaldWatcher(); + ~JournaldWatcher() override; static JournaldWatcher *instance(); @@ -67,5 +66,3 @@ private: }; } // namespace ProjectExplorer - -#endif // JOURNALDWATCHER_H diff --git a/src/plugins/projectexplorer/kit.h b/src/plugins/projectexplorer/kit.h index b92023024a..00cb589ec4 100644 --- a/src/plugins/projectexplorer/kit.h +++ b/src/plugins/projectexplorer/kit.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef KIT_H -#define KIT_H +#pragma once #include "projectexplorer_export.h" #include "task.h" @@ -56,7 +55,7 @@ class KitPrivate; class PROJECTEXPLORER_EXPORT Kit { public: - Kit(Core::Id id = Core::Id()); + explicit Kit(Core::Id id = Core::Id()); // Do not trigger evaluations void blockNotification(); @@ -157,5 +156,3 @@ private: } // namespace ProjectExplorer Q_DECLARE_METATYPE(ProjectExplorer::Kit *) - -#endif // KIT_H diff --git a/src/plugins/projectexplorer/kitchooser.h b/src/plugins/projectexplorer/kitchooser.h index f838853665..95269a3daa 100644 --- a/src/plugins/projectexplorer/kitchooser.h +++ b/src/plugins/projectexplorer/kitchooser.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROJECTEXPLORER_KITCHOOSER_H -#define PROJECTEXPLORER_KITCHOOSER_H +#pragma once #include "projectexplorer_export.h" @@ -81,5 +80,3 @@ private: }; } // namespace ProjectExplorer - -#endif // PROJECTEXPLORER_KITCHOOSER_H diff --git a/src/plugins/projectexplorer/kitconfigwidget.h b/src/plugins/projectexplorer/kitconfigwidget.h index f54717b9e5..15ed12e7ac 100644 --- a/src/plugins/projectexplorer/kitconfigwidget.h +++ b/src/plugins/projectexplorer/kitconfigwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef KITCONFIGWIDGET_H -#define KITCONFIGWIDGET_H +#pragma once #include "projectexplorer_export.h" @@ -80,5 +79,3 @@ protected: }; } // namespace ProjectExplorer - -#endif // KITCONFIGWIDGET_H diff --git a/src/plugins/projectexplorer/kitfeatureprovider.h b/src/plugins/projectexplorer/kitfeatureprovider.h index adc673b613..69a8feee60 100644 --- a/src/plugins/projectexplorer/kitfeatureprovider.h +++ b/src/plugins/projectexplorer/kitfeatureprovider.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef KITFEATUREPROVIDER_H -#define KITFEATUREPROVIDER_H +#pragma once #include <coreplugin/id.h> #include <coreplugin/featureprovider.h> @@ -35,12 +34,10 @@ namespace Internal { class KitFeatureProvider : public Core::IFeatureProvider { public: - QSet<Core::Id> availableFeatures(Core::Id id) const; - QSet<Core::Id> availablePlatforms() const; - QString displayNameForPlatform(Core::Id id) const; + QSet<Core::Id> availableFeatures(Core::Id id) const override; + QSet<Core::Id> availablePlatforms() const override; + QString displayNameForPlatform(Core::Id id) const override; }; } // namespace Internal } // namespace ProjectExplorer - -#endif // KITFEATUREPROVIDER_H diff --git a/src/plugins/projectexplorer/kitinformation.cpp b/src/plugins/projectexplorer/kitinformation.cpp index cef8e1f59e..24238e6b9b 100644 --- a/src/plugins/projectexplorer/kitinformation.cpp +++ b/src/plugins/projectexplorer/kitinformation.cpp @@ -332,9 +332,9 @@ void DeviceTypeKitInformation::setDeviceTypeId(Kit *k, Core::Id type) KitMatcher DeviceTypeKitInformation::deviceTypeMatcher(Core::Id type) { - return std::function<bool(const Kit *)>([type](const Kit *kit) { + return KitMatcher(std::function<bool(const Kit *)>([type](const Kit *kit) { return type.isValid() && deviceTypeId(kit) == type; - }); + })); } QSet<Core::Id> DeviceTypeKitInformation::supportedPlatforms(const Kit *k) const diff --git a/src/plugins/projectexplorer/kitinformation.h b/src/plugins/projectexplorer/kitinformation.h index bfe37acdd9..3a3fa52729 100644 --- a/src/plugins/projectexplorer/kitinformation.h +++ b/src/plugins/projectexplorer/kitinformation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef KITINFORMATION_H -#define KITINFORMATION_H +#pragma once #include "kitmanager.h" #include "kit.h" @@ -197,5 +196,3 @@ public: }; } // namespace ProjectExplorer - -#endif // KITINFORMATION_H diff --git a/src/plugins/projectexplorer/kitinformationconfigwidget.h b/src/plugins/projectexplorer/kitinformationconfigwidget.h index 1eaec7113b..5f1f6c2803 100644 --- a/src/plugins/projectexplorer/kitinformationconfigwidget.h +++ b/src/plugins/projectexplorer/kitinformationconfigwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef KITINFORMATIONCONFIGWIDGET_H -#define KITINFORMATIONCONFIGWIDGET_H +#pragma once #include "kitconfigwidget.h" @@ -193,5 +192,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // KITINFORMATIONCONFIGWIDGET_H diff --git a/src/plugins/projectexplorer/kitmanager.h b/src/plugins/projectexplorer/kitmanager.h index 9d9779ff9a..63d5396b40 100644 --- a/src/plugins/projectexplorer/kitmanager.h +++ b/src/plugins/projectexplorer/kitmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef KITMANAGER_H -#define KITMANAGER_H +#pragma once #include "projectexplorer_export.h" @@ -109,8 +108,9 @@ class PROJECTEXPLORER_EXPORT KitMatcher { public: typedef std::function<bool(const Kit *)> Matcher; - KitMatcher(const Matcher &m) : m_matcher(m) {} - KitMatcher() {} + + explicit KitMatcher(const Matcher &m) : m_matcher(m) {} + KitMatcher() = default; bool isValid() const { return !!m_matcher; } bool matches(const Kit *kit) const { return m_matcher(kit); } @@ -125,7 +125,7 @@ class PROJECTEXPLORER_EXPORT KitManager : public QObject public: static KitManager *instance(); - ~KitManager(); + ~KitManager() override; static QList<Kit *> kits(); static QList<Kit *> matchingKits(const KitMatcher &matcher); @@ -176,8 +176,7 @@ private: class KitList { public: - KitList() - { } + KitList() { } Core::Id defaultKit; QList<Kit *> kits; }; @@ -193,5 +192,3 @@ private: }; } // namespace ProjectExplorer - -#endif // KITMANAGER_H diff --git a/src/plugins/projectexplorer/kitmanagerconfigwidget.h b/src/plugins/projectexplorer/kitmanagerconfigwidget.h index 9f2a1b9347..86ae1d1a0b 100644 --- a/src/plugins/projectexplorer/kitmanagerconfigwidget.h +++ b/src/plugins/projectexplorer/kitmanagerconfigwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef KITMANAGERCONFIGWIDGET_H -#define KITMANAGERCONFIGWIDGET_H +#pragma once #include "kitconfigwidget.h" @@ -48,7 +47,7 @@ class KitManagerConfigWidget : public QWidget public: explicit KitManagerConfigWidget(Kit *k); - ~KitManagerConfigWidget(); + ~KitManagerConfigWidget() override; QString displayName() const; @@ -87,7 +86,7 @@ private: ButtonColumn }; - void showEvent(QShowEvent *event); + void showEvent(QShowEvent *event) override; QLabel *createLabel(const QString &name, const QString &toolTip); QGridLayout *m_layout; @@ -107,5 +106,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // KITMANAGERCONFIGWIDGET_H diff --git a/src/plugins/projectexplorer/kitmodel.h b/src/plugins/projectexplorer/kitmodel.h index e7cf2ac0f1..545130e8ff 100644 --- a/src/plugins/projectexplorer/kitmodel.h +++ b/src/plugins/projectexplorer/kitmodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef KITMODEL_H -#define KITMODEL_H +#pragma once #include "projectexplorer_export.h" @@ -98,5 +97,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // KITMODEL_H diff --git a/src/plugins/projectexplorer/kitoptionspage.h b/src/plugins/projectexplorer/kitoptionspage.h index 79706f17a4..b9d484e9d0 100644 --- a/src/plugins/projectexplorer/kitoptionspage.h +++ b/src/plugins/projectexplorer/kitoptionspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef KITOPTIONSPAGE_H -#define KITOPTIONSPAGE_H +#pragma once #include "projectexplorer_export.h" @@ -49,9 +48,9 @@ class PROJECTEXPLORER_EXPORT KitOptionsPage : public Core::IOptionsPage public: KitOptionsPage(); - QWidget *widget(); - void apply(); - void finish(); + QWidget *widget() override; + void apply() override; + void finish() override; void showKit(Kit *k); @@ -60,5 +59,3 @@ private: }; } // namespace ProjectExplorer - -#endif // KITOPTIONSPAGE_H diff --git a/src/plugins/projectexplorer/ldparser.h b/src/plugins/projectexplorer/ldparser.h index 997359b8e3..ccee344d0e 100644 --- a/src/plugins/projectexplorer/ldparser.h +++ b/src/plugins/projectexplorer/ldparser.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef LDPARSER_H -#define LDPARSER_H +#pragma once #include "ioutputparser.h" @@ -38,7 +37,7 @@ class LdParser : public ProjectExplorer::IOutputParser public: LdParser(); - void stdError(const QString &line); + void stdError(const QString &line) override; private: QRegularExpression m_ranlib; @@ -47,5 +46,3 @@ private: }; } // namespace ProjectExplorer - -#endif // GCCPARSER_H diff --git a/src/plugins/projectexplorer/linuxiccparser.h b/src/plugins/projectexplorer/linuxiccparser.h index c9337ec6fd..866e5cfb5d 100644 --- a/src/plugins/projectexplorer/linuxiccparser.h +++ b/src/plugins/projectexplorer/linuxiccparser.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef LINUXICCPARSER_H -#define LINUXICCPARSER_H +#pragma once #include "ioutputparser.h" #include "task.h" @@ -40,10 +39,10 @@ class LinuxIccParser : public ProjectExplorer::IOutputParser public: LinuxIccParser(); - void stdError(const QString &line); + void stdError(const QString &line) override; private: - void doFlush(); + void doFlush() override; QRegExp m_firstLine; QRegExp m_continuationLines; @@ -57,5 +56,3 @@ private: }; } // namespace ProjectExplorer - -#endif // GCCPARSER_H diff --git a/src/plugins/projectexplorer/localapplicationruncontrol.h b/src/plugins/projectexplorer/localapplicationruncontrol.h index 7206ef9018..c4703d7132 100644 --- a/src/plugins/projectexplorer/localapplicationruncontrol.h +++ b/src/plugins/projectexplorer/localapplicationruncontrol.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef LOCALAPPLICATIONRUNCONTROL_H -#define LOCALAPPLICATIONRUNCONTROL_H +#pragma once #include "runconfiguration.h" @@ -41,5 +40,3 @@ public: } // namespace Internal } // namespace ProjectExplorer - -#endif // LOCALAPPLICATIONRUNCONTROL_H diff --git a/src/plugins/projectexplorer/localenvironmentaspect.h b/src/plugins/projectexplorer/localenvironmentaspect.h index bcdb8d227a..1d394b12eb 100644 --- a/src/plugins/projectexplorer/localenvironmentaspect.h +++ b/src/plugins/projectexplorer/localenvironmentaspect.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef LOCALENVIRONMENTASPECT_H -#define LOCALENVIRONMENTASPECT_H +#pragma once #include "environmentaspect.h" @@ -37,11 +36,11 @@ class PROJECTEXPLORER_EXPORT LocalEnvironmentAspect : public EnvironmentAspect public: typedef std::function<void(RunConfiguration *, Utils::Environment &)> BaseEnvironmentModifier; LocalEnvironmentAspect(RunConfiguration *parent, const BaseEnvironmentModifier &modifier); - LocalEnvironmentAspect *create(RunConfiguration *parent) const; + LocalEnvironmentAspect *create(RunConfiguration *parent) const override; - QList<int> possibleBaseEnvironments() const; - QString baseEnvironmentDisplayName(int base) const; - Utils::Environment baseEnvironment() const; + QList<int> possibleBaseEnvironments() const override; + QString baseEnvironmentDisplayName(int base) const override; + Utils::Environment baseEnvironment() const override; void buildEnvironmentHasChanged(); @@ -56,5 +55,3 @@ private: }; } // namespace ProjectExplorer - -#endif // LOCALENVIRONMENTASPECT_H diff --git a/src/plugins/projectexplorer/metatypedeclarations.h b/src/plugins/projectexplorer/metatypedeclarations.h index 00b8f867f5..61b7b59b40 100644 --- a/src/plugins/projectexplorer/metatypedeclarations.h +++ b/src/plugins/projectexplorer/metatypedeclarations.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROJECTEXPLORERMETATYPEDECLARATIONS_H -#define PROJECTEXPLORERMETATYPEDECLARATIONS_H +#pragma once #include <QMetaType> @@ -42,5 +41,3 @@ Q_DECLARE_OPAQUE_POINTER(ProjectExplorer::SessionManager*) Q_DECLARE_METATYPE(QList<ProjectExplorer::Project*>) Q_DECLARE_METATYPE(ProjectExplorer::SessionManager*) Q_DECLARE_METATYPE(ProjectExplorer::IProjectManager*) - -#endif // PROJECTEXPLORERMETATYPEDECLARATIONS_H diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.h b/src/plugins/projectexplorer/miniprojecttargetselector.h index 5ae51e234c..e099a075ea 100644 --- a/src/plugins/projectexplorer/miniprojecttargetselector.h +++ b/src/plugins/projectexplorer/miniprojecttargetselector.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MINIPROJECTTARGETSELECTOR_H -#define MINIPROJECTTARGETSELECTOR_H +#pragma once #include <QListWidget> #include <QDateTime> @@ -52,10 +51,11 @@ namespace Internal { class ListWidget : public QListWidget { Q_OBJECT + public: ListWidget(QWidget *parent); - void keyPressEvent(QKeyEvent *event); - void keyReleaseEvent(QKeyEvent *event); + void keyPressEvent(QKeyEvent *event) override; + void keyReleaseEvent(QKeyEvent *event) override; void setMaxCount(int maxCount); int maxCount(); @@ -63,6 +63,7 @@ public: void setOptimalWidth(int width); int padding(); + private: int m_maxCount; int m_optimalWidth; @@ -71,8 +72,10 @@ private: class ProjectListWidget : public ListWidget { Q_OBJECT + public: explicit ProjectListWidget(QWidget *parent = 0); + private: void addProject(ProjectExplorer::Project *project); void removeProject(ProjectExplorer::Project *project); @@ -89,7 +92,7 @@ class KitAreaWidget : public QWidget Q_OBJECT public: explicit KitAreaWidget(QWidget *parent = 0); - ~KitAreaWidget(); + ~KitAreaWidget() override; void setKit(ProjectExplorer::Kit *k); @@ -105,15 +108,19 @@ private: class GenericListWidget : public ListWidget { Q_OBJECT + public: - GenericListWidget(QWidget *parent = 0); + explicit GenericListWidget(QWidget *parent = 0); + signals: void changeActiveProjectConfiguration(ProjectExplorer::ProjectConfiguration *dc); + public: void setProjectConfigurations(const QList<ProjectConfiguration *> &list, ProjectConfiguration *active); void setActiveProjectConfiguration(ProjectConfiguration *active); void addProjectConfiguration(ProjectConfiguration *pc); void removeProjectConfiguration(ProjectConfiguration *pc); + private: void rowChanged(int index); void displayNameChanged(); @@ -125,13 +132,14 @@ private: class MiniProjectTargetSelector : public QWidget { Q_OBJECT + public: explicit MiniProjectTargetSelector(QAction *projectAction, QWidget *parent = 0); - void setVisible(bool visible); + void setVisible(bool visible) override; - void keyPressEvent(QKeyEvent *ke); - void keyReleaseEvent(QKeyEvent *ke); - bool event(QEvent *event); + void keyPressEvent(QKeyEvent *ke) override; + void keyReleaseEvent(QKeyEvent *ke) override; + bool event(QEvent *event) override; void toggleVisible(); void nextOrShow(); @@ -178,8 +186,8 @@ private: void updateDeployListVisible(); void updateRunListVisible(); void updateSummary(); - void paintEvent(QPaintEvent *); - void mousePressEvent(QMouseEvent *); + void paintEvent(QPaintEvent *) override; + void mousePressEvent(QMouseEvent *) override; void doLayout(bool keepSize); QVector<int> listWidgetWidths(int minSize, int maxSize); @@ -205,5 +213,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // MINIPROJECTTARGETSELECTOR_H diff --git a/src/plugins/projectexplorer/msvcparser.h b/src/plugins/projectexplorer/msvcparser.h index c4f2bd8ac8..78504a4a79 100644 --- a/src/plugins/projectexplorer/msvcparser.h +++ b/src/plugins/projectexplorer/msvcparser.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MSVCPARSER_H -#define MSVCPARSER_H +#pragma once #include "ioutputparser.h" #include "task.h" @@ -41,11 +40,11 @@ class PROJECTEXPLORER_EXPORT MsvcParser : public ProjectExplorer::IOutputParser public: MsvcParser(); - void stdOutput(const QString &line); - void stdError(const QString &line); + void stdOutput(const QString &line) override; + void stdError(const QString &line) override; private: - void doFlush(); + void doFlush() override; bool processCompileLine(const QString &line); QRegularExpression m_compileRegExp; @@ -56,5 +55,3 @@ private: }; } // namespace ProjectExplorer - -#endif // MSVCPARSER_H diff --git a/src/plugins/projectexplorer/msvctoolchain.h b/src/plugins/projectexplorer/msvctoolchain.h index 167e54d527..684f04184f 100644 --- a/src/plugins/projectexplorer/msvctoolchain.h +++ b/src/plugins/projectexplorer/msvctoolchain.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MSVCTOOLCHAIN_H -#define MSVCTOOLCHAIN_H +#pragma once #include "abstractmsvctoolchain.h" #include "abi.h" @@ -120,10 +119,10 @@ public: MsvcToolChainConfigWidget(ToolChain *); private: - void applyImpl() override {} + void applyImpl() override { } void discardImpl() override { setFromToolChain(); } bool isDirtyImpl() const override { return false; } - void makeReadOnlyImpl() override {} + void makeReadOnlyImpl() override { } void setFromToolChain(); @@ -132,5 +131,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // MSVCTOOLCHAIN_H diff --git a/src/plugins/projectexplorer/namedwidget.h b/src/plugins/projectexplorer/namedwidget.h index 560cd14bae..d11d439ef0 100644 --- a/src/plugins/projectexplorer/namedwidget.h +++ b/src/plugins/projectexplorer/namedwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROJECTEXPLORER_NAMEDWIDGET_H -#define PROJECTEXPLORER_NAMEDWIDGET_H +#pragma once #include "projectexplorer_export.h" @@ -37,7 +36,7 @@ class PROJECTEXPLORER_EXPORT NamedWidget : public QWidget Q_OBJECT public: - NamedWidget(QWidget *parent = 0); + explicit NamedWidget(QWidget *parent = 0); QString displayName() const; @@ -52,5 +51,3 @@ private: }; } // namespace ProjectExplorer - -#endif // PROJECTEXPLORER_NAMEDWIDGET_H diff --git a/src/plugins/projectexplorer/nodesvisitor.h b/src/plugins/projectexplorer/nodesvisitor.h index fc6d04d05b..957e9f4131 100644 --- a/src/plugins/projectexplorer/nodesvisitor.h +++ b/src/plugins/projectexplorer/nodesvisitor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef NODESVISITOR_H -#define NODESVISITOR_H +#pragma once #include "projectexplorer_export.h" @@ -47,6 +46,7 @@ public: virtual void visitSessionNode(SessionNode *) {} virtual void visitProjectNode(ProjectNode *) {} virtual void visitFolderNode(FolderNode *) {} + protected: NodesVisitor() {} }; @@ -55,13 +55,14 @@ protected: class PROJECTEXPLORER_EXPORT FindNodesForFileVisitor : public NodesVisitor { public: - FindNodesForFileVisitor(const Utils::FileName &fileToSearch); + explicit FindNodesForFileVisitor(const Utils::FileName &fileToSearch); QList<Node*> nodes() const; - void visitProjectNode(ProjectNode *node); - void visitFolderNode(FolderNode *node); - void visitSessionNode(SessionNode *node); + void visitProjectNode(ProjectNode *node) override; + void visitFolderNode(FolderNode *node) override; + void visitSessionNode(SessionNode *node) override; + private: Utils::FileName m_path; QList<Node*> m_nodes; @@ -71,12 +72,11 @@ class PROJECTEXPLORER_EXPORT FindAllFilesVisitor : public NodesVisitor { public: Utils::FileNameList filePaths() const; - void visitProjectNode(ProjectNode *projectNode); - void visitFolderNode(FolderNode *folderNode); + void visitProjectNode(ProjectNode *projectNode) override; + void visitFolderNode(FolderNode *folderNode) override; + private: Utils::FileNameList m_filePaths; }; } // namespace ProjectExplorer - -#endif // NODESVISITOR_H diff --git a/src/plugins/projectexplorer/osparser.h b/src/plugins/projectexplorer/osparser.h index 7f6f52e224..40fc67d275 100644 --- a/src/plugins/projectexplorer/osparser.h +++ b/src/plugins/projectexplorer/osparser.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef OSPARSER_H -#define OSPARSER_H +#pragma once #include "ioutputparser.h" @@ -41,15 +40,13 @@ class PROJECTEXPLORER_EXPORT OsParser : public ProjectExplorer::IOutputParser public: OsParser(); - void stdError(const QString &line); - void stdOutput(const QString &line); + void stdError(const QString &line) override; + void stdOutput(const QString &line) override; - bool hasFatalErrors() const; + bool hasFatalErrors() const override; private: bool m_hasFatalError; }; } // namespace ProjectExplorer - -#endif // OSPARSER_H diff --git a/src/plugins/projectexplorer/outputparser_test.h b/src/plugins/projectexplorer/outputparser_test.h index 99e1d0c0c8..630767669b 100644 --- a/src/plugins/projectexplorer/outputparser_test.h +++ b/src/plugins/projectexplorer/outputparser_test.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef OUTPUTPARSER_TESTER_H -#define OUTPUTPARSER_TESTER_H +#pragma once #if defined(WITH_TESTS) @@ -63,14 +62,14 @@ public: void setDebugEnabled(bool); - void appendOutputParser(IOutputParser *parser); + void appendOutputParser(IOutputParser *parser) override; signals: void aboutToDeleteParser(); private: - void outputAdded(const QString &string, ProjectExplorer::BuildStep::OutputFormat format); - void taskAdded(const ProjectExplorer::Task &task, int linkedLines, int skipLines); + void outputAdded(const QString &string, ProjectExplorer::BuildStep::OutputFormat format) override; + void taskAdded(const ProjectExplorer::Task &task, int linkedLines, int skipLines) override; void reset(); @@ -91,8 +90,8 @@ class TestTerminator : public IOutputParser public: TestTerminator(OutputParserTester *t); - void stdOutput(const QString &line); - void stdError(const QString &line); + void stdOutput(const QString &line) override; + void stdError(const QString &line) override; private: OutputParserTester *m_tester; @@ -103,5 +102,3 @@ private: Q_DECLARE_METATYPE(ProjectExplorer::OutputParserTester::Channel) #endif - -#endif // OUTPUTPARSER_TESTER_H diff --git a/src/plugins/projectexplorer/panelswidget.h b/src/plugins/projectexplorer/panelswidget.h index c849de300a..067cfc5811 100644 --- a/src/plugins/projectexplorer/panelswidget.h +++ b/src/plugins/projectexplorer/panelswidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PANELSWIDGET_H -#define PANELSWIDGET_H +#pragma once #include "projectexplorer_export.h" @@ -42,7 +41,8 @@ class PROJECTEXPLORER_EXPORT PanelsWidget : public QScrollArea Q_OBJECT public: explicit PanelsWidget(QWidget *parent = 0); - ~PanelsWidget(); + ~PanelsWidget() override; + // Adds a widget void addPropertiesPanel(PropertiesPanel *panel); @@ -54,5 +54,4 @@ private: QWidget *m_root; }; -} // end namespace -#endif // PANELSWIDGET_H +} // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/processparameters.h b/src/plugins/projectexplorer/processparameters.h index 796fed9fc6..fd43e03bf7 100644 --- a/src/plugins/projectexplorer/processparameters.h +++ b/src/plugins/projectexplorer/processparameters.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROCESSPARAMETERS_H -#define PROCESSPARAMETERS_H +#pragma once #include "projectexplorer_export.h" @@ -85,5 +84,3 @@ private: }; } // namespace ProjectExplorer - -#endif // PROCESSPARAMETERS_H diff --git a/src/plugins/projectexplorer/processstep.h b/src/plugins/projectexplorer/processstep.h index 2e91b483f1..cabe17fbb9 100644 --- a/src/plugins/projectexplorer/processstep.h +++ b/src/plugins/projectexplorer/processstep.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROCESSSTEP_H -#define PROCESSSTEP_H +#pragma once #include "ui_processstep.h" #include "abstractprocessstep.h" @@ -105,5 +104,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // PROCESSSTEP_H diff --git a/src/plugins/projectexplorer/project.h b/src/plugins/projectexplorer/project.h index 34683d8bb2..23f7c9e989 100644 --- a/src/plugins/projectexplorer/project.h +++ b/src/plugins/projectexplorer/project.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROJECT_H -#define PROJECT_H +#pragma once #include "projectexplorer_export.h" @@ -193,5 +192,3 @@ private: } // namespace ProjectExplorer Q_DECLARE_METATYPE(ProjectExplorer::Project *) - -#endif // PROJECT_H diff --git a/src/plugins/projectexplorer/projectconfiguration.h b/src/plugins/projectexplorer/projectconfiguration.h index 11461984bb..4715c6453b 100644 --- a/src/plugins/projectexplorer/projectconfiguration.h +++ b/src/plugins/projectexplorer/projectconfiguration.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROJECTCONFIGURATION_H -#define PROJECTCONFIGURATION_H +#pragma once #include "projectexplorer_export.h" @@ -84,5 +83,3 @@ PROJECTEXPLORER_EXPORT QString displayNameFromMap(const QVariantMap &map); } // namespace ProjectExplorer Q_DECLARE_METATYPE(ProjectExplorer::ProjectConfiguration *) - -#endif // PROJECTCONFIGURATION_H diff --git a/src/plugins/projectexplorer/projectexplorer.h b/src/plugins/projectexplorer/projectexplorer.h index b4d70e3095..b5e141b1d4 100644 --- a/src/plugins/projectexplorer/projectexplorer.h +++ b/src/plugins/projectexplorer/projectexplorer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROJECTEXPLORER_H -#define PROJECTEXPLORER_H +#pragma once #include "projectexplorer_export.h" #include "projectexplorerconstants.h" @@ -56,8 +55,7 @@ class FileNode; namespace Internal { class ProjectExplorerSettings; } -class PROJECTEXPLORER_EXPORT ProjectExplorerPlugin - : public ExtensionSystem::IPlugin +class PROJECTEXPLORER_EXPORT ProjectExplorerPlugin : public ExtensionSystem::IPlugin { Q_OBJECT Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "ProjectExplorer.json") @@ -66,7 +64,7 @@ class PROJECTEXPLORER_EXPORT ProjectExplorerPlugin public: ProjectExplorerPlugin(); - ~ProjectExplorerPlugin(); + ~ProjectExplorerPlugin() override; static ProjectExplorerPlugin *instance(); @@ -120,9 +118,9 @@ public: static void showContextMenu(QWidget *view, const QPoint &globalPos, Node *node); //PluginInterface - bool initialize(const QStringList &arguments, QString *errorMessage); - void extensionsInitialized(); - ShutdownFlag aboutToShutdown(); + bool initialize(const QStringList &arguments, QString *errorMessage) override; + void extensionsInitialized() override; + ShutdownFlag aboutToShutdown() override; static void setProjectExplorerSettings(const Internal::ProjectExplorerSettings &pes); static Internal::ProjectExplorerSettings projectExplorerSettings(); @@ -225,5 +223,3 @@ private slots: }; } // namespace ProjectExplorer - -#endif // PROJECTEXPLORER_H diff --git a/src/plugins/projectexplorer/projectexplorer.pro b/src/plugins/projectexplorer/projectexplorer.pro index c544a9ddea..586d0cc1ae 100644 --- a/src/plugins/projectexplorer/projectexplorer.pro +++ b/src/plugins/projectexplorer/projectexplorer.pro @@ -286,7 +286,6 @@ SOURCES += projectexplorer.cpp \ projectmacroexpander.cpp \ customparser.cpp \ customparserconfigdialog.cpp \ - ipotentialkit.cpp \ selectablefilesmodel.cpp \ xcodebuildparser.cpp \ propertiespanel.cpp \ diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs index 5dff962409..3891598c84 100644 --- a/src/plugins/projectexplorer/projectexplorer.qbs +++ b/src/plugins/projectexplorer/projectexplorer.qbs @@ -78,7 +78,6 @@ QtcPlugin { "headerpath.h", "importwidget.cpp", "importwidget.h", "ioutputparser.cpp", "ioutputparser.h", - "ipotentialkit.cpp", "ipotentialkit.h", "iprojectmanager.h", "itaskhandler.h", diff --git a/src/plugins/projectexplorer/projectexplorer_export.h b/src/plugins/projectexplorer/projectexplorer_export.h index 387e354b37..31493696f1 100644 --- a/src/plugins/projectexplorer/projectexplorer_export.h +++ b/src/plugins/projectexplorer/projectexplorer_export.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROJECTEXPLORER_EXPORT_H -#define PROJECTEXPLORER_EXPORT_H +#pragma once #include <qglobal.h> @@ -33,5 +32,3 @@ #else # define PROJECTEXPLORER_EXPORT Q_DECL_IMPORT #endif - -#endif // PROJECTEXPLORER_EXPORT_H diff --git a/src/plugins/projectexplorer/projectexplorer_global.h b/src/plugins/projectexplorer/projectexplorer_global.h index 48ca4f0101..cd46d2044c 100644 --- a/src/plugins/projectexplorer/projectexplorer_global.h +++ b/src/plugins/projectexplorer/projectexplorer_global.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROJECTEXPLORER_GLOBAL_H -#define PROJECTEXPLORER_GLOBAL_H +#pragma once namespace ProjectExplorer { @@ -81,6 +80,5 @@ inline WarningFlags operator~(WarningFlags flags) { return static_cast<WarningFlags>(~static_cast<int>(flags)); } -} // namespace ProjectExplorer -#endif // PROJECTEXPLORER_GLOBAL_H +} // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/projectexplorerconstants.h b/src/plugins/projectexplorer/projectexplorerconstants.h index e9f3034960..d5d6cc1c65 100644 --- a/src/plugins/projectexplorer/projectexplorerconstants.h +++ b/src/plugins/projectexplorer/projectexplorerconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROJECTEXPLORERCONSTANTS_H -#define PROJECTEXPLORERCONSTANTS_H +#pragma once #include <QtGlobal> @@ -263,5 +262,3 @@ const char PROJECTTREE_ID[] = "Projects"; } // namespace Constants } // namespace ProjectExplorer - -#endif // PROJECTEXPLORERCONSTANTS_H diff --git a/src/plugins/projectexplorer/projectexplorericons.h b/src/plugins/projectexplorer/projectexplorericons.h index a3842ab5f0..e889848d72 100644 --- a/src/plugins/projectexplorer/projectexplorericons.h +++ b/src/plugins/projectexplorer/projectexplorericons.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROJECTEXPLORERICONS_H -#define PROJECTEXPLORERICONS_H +#pragma once #include <utils/icon.h> @@ -83,5 +82,3 @@ const Utils::Icon INTERRUPT_SMALL({ } // namespace Icons } // namespace ProjectExplorer - -#endif // PROJECTEXPLORERICONS_H diff --git a/src/plugins/projectexplorer/projectexplorersettings.h b/src/plugins/projectexplorer/projectexplorersettings.h index 1a5a2e785e..046b90e88a 100644 --- a/src/plugins/projectexplorer/projectexplorersettings.h +++ b/src/plugins/projectexplorer/projectexplorersettings.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROJECTEXPLORERSETTINGS_H -#define PROJECTEXPLORERSETTINGS_H +#pragma once #include <QUuid> @@ -36,30 +35,20 @@ class ProjectExplorerSettings public: enum StopBeforeBuild { StopNone = 0, StopSameProject = 1, StopAll = 2 }; - ProjectExplorerSettings() : - buildBeforeDeploy(true), deployBeforeRun(true), - saveBeforeBuild(false), showCompilerOutput(false), - showRunOutput(true), showDebugOutput(false), - cleanOldAppOutput(false), mergeStdErrAndStdOut(false), - wrapAppOutput(true), useJom(true), - autorestoreLastSession(false), prompToStopRunControl(false), - maxAppOutputLines(100000), stopBeforeBuild(StopBeforeBuild::StopNone) - { } - - bool buildBeforeDeploy; - bool deployBeforeRun; - bool saveBeforeBuild; - bool showCompilerOutput; - bool showRunOutput; - bool showDebugOutput; - bool cleanOldAppOutput; - bool mergeStdErrAndStdOut; - bool wrapAppOutput; - bool useJom; - bool autorestoreLastSession; // This option is set in the Session Manager! - bool prompToStopRunControl; - int maxAppOutputLines; - StopBeforeBuild stopBeforeBuild; + bool buildBeforeDeploy = true; + bool deployBeforeRun = true; + bool saveBeforeBuild = false; + bool showCompilerOutput = false; + bool showRunOutput = true; + bool showDebugOutput = false; + bool cleanOldAppOutput = false; + bool mergeStdErrAndStdOut = false; + bool wrapAppOutput = true; + bool useJom = true; + bool autorestoreLastSession = false; // This option is set in the Session Manager! + bool prompToStopRunControl = false; + int maxAppOutputLines = 100000; + StopBeforeBuild stopBeforeBuild = StopBeforeBuild::StopNone; // Add a UUid which is used to identify the development environment. // This is used to warn the user when he is trying to open a .user file that was created @@ -88,5 +77,3 @@ inline bool operator==(const ProjectExplorerSettings &p1, const ProjectExplorerS } // namespace ProjectExplorer } // namespace Internal - -#endif // PROJECTEXPLORERSETTINGS_H diff --git a/src/plugins/projectexplorer/projectexplorersettingspage.cpp b/src/plugins/projectexplorer/projectexplorersettingspage.cpp index aa2f7098ea..c10882a573 100644 --- a/src/plugins/projectexplorer/projectexplorersettingspage.cpp +++ b/src/plugins/projectexplorer/projectexplorersettingspage.cpp @@ -162,10 +162,6 @@ ProjectExplorerSettingsPage::ProjectExplorerSettingsPage() setCategoryIcon(QLatin1String(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY_ICON)); } -ProjectExplorerSettingsPage::~ProjectExplorerSettingsPage() -{ -} - QWidget *ProjectExplorerSettingsPage::widget() { if (!m_widget) { diff --git a/src/plugins/projectexplorer/projectexplorersettingspage.h b/src/plugins/projectexplorer/projectexplorersettingspage.h index 3d1e003bdd..e7e2c82c2b 100644 --- a/src/plugins/projectexplorer/projectexplorersettingspage.h +++ b/src/plugins/projectexplorer/projectexplorersettingspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROJECTEXPLORERSETTINGSPAGE_H -#define PROJECTEXPLORERSETTINGSPAGE_H +#pragma once #include "ui_projectexplorersettingspage.h" @@ -41,6 +40,7 @@ class ProjectExplorerSettings; // Documentation inside. class ProjectExplorerSettingsWidget : public QWidget { Q_OBJECT + public: explicit ProjectExplorerSettingsWidget(QWidget *parent = 0); @@ -73,17 +73,14 @@ class ProjectExplorerSettingsPage : public Core::IOptionsPage public: ProjectExplorerSettingsPage(); - ~ProjectExplorerSettingsPage(); - QWidget *widget(); - void apply(); - void finish(); + QWidget *widget() override; + void apply() override; + void finish() override; private: QPointer<ProjectExplorerSettingsWidget> m_widget; }; -} // Internal -} // ProjectExplorer - -#endif // PROJECTEXPLORERSETTINGSPAGE_H +} // namespace Internal +} // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/projectfilewizardextension.cpp b/src/plugins/projectexplorer/projectfilewizardextension.cpp index 977eae2fda..4f163f3e42 100644 --- a/src/plugins/projectexplorer/projectfilewizardextension.cpp +++ b/src/plugins/projectexplorer/projectfilewizardextension.cpp @@ -101,10 +101,6 @@ void ProjectWizardContext::clear() } // ---- ProjectFileWizardExtension -ProjectFileWizardExtension::ProjectFileWizardExtension() - : m_context(0) -{ -} ProjectFileWizardExtension::~ProjectFileWizardExtension() { diff --git a/src/plugins/projectexplorer/projectfilewizardextension.h b/src/plugins/projectexplorer/projectfilewizardextension.h index 51ea2bdd85..9a3675c01c 100644 --- a/src/plugins/projectexplorer/projectfilewizardextension.h +++ b/src/plugins/projectexplorer/projectfilewizardextension.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROJECTFILEWIZARDEXTENSION2_H -#define PROJECTFILEWIZARDEXTENSION2_H +#pragma once #include "projectexplorer_export.h" @@ -40,26 +39,24 @@ class ProjectWizardContext; class PROJECTEXPLORER_EXPORT ProjectFileWizardExtension : public Core::IFileWizardExtension { Q_OBJECT + public: - explicit ProjectFileWizardExtension(); - ~ProjectFileWizardExtension(); + ~ProjectFileWizardExtension() override; - QList<QWizardPage *> extensionPages(const Core::IWizardFactory *wizard); + QList<QWizardPage *> extensionPages(const Core::IWizardFactory *wizard) override; bool processFiles(const QList<Core::GeneratedFile> &files, - bool *removeOpenProjectAttribute, QString *errorMessage); - void applyCodeStyle(Core::GeneratedFile *file) const; + bool *removeOpenProjectAttribute, QString *errorMessage) override; + void applyCodeStyle(Core::GeneratedFile *file) const override; public slots: - void firstExtensionPageShown(const QList<Core::GeneratedFile> &files, const QVariantMap &extraValues); + void firstExtensionPageShown(const QList<Core::GeneratedFile> &files, const QVariantMap &extraValues) override; private: bool processProject(const QList<Core::GeneratedFile> &files, bool *removeOpenProjectAttribute, QString *errorMessage); - ProjectWizardContext *m_context; + ProjectWizardContext *m_context = 0; }; } // namespace Internal } // namespace ProjectExplorer - -#endif // PROJECTFILEWIZARDEXTENSION2_H diff --git a/src/plugins/projectexplorer/projectimporter.h b/src/plugins/projectexplorer/projectimporter.h index 186597d756..f11b03aa8e 100644 --- a/src/plugins/projectexplorer/projectimporter.h +++ b/src/plugins/projectexplorer/projectimporter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROJECTIMPORTER_H -#define PROJECTIMPORTER_H +#pragma once #include "projectexplorer_export.h" @@ -76,5 +75,3 @@ private: }; } // namespace ProjectExplorer - -#endif // PROJECTIMPORTER_H diff --git a/src/plugins/projectexplorer/projectmacroexpander.h b/src/plugins/projectexplorer/projectmacroexpander.h index 9916b23cd2..e36d0bf98d 100644 --- a/src/plugins/projectexplorer/projectmacroexpander.h +++ b/src/plugins/projectexplorer/projectmacroexpander.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROJECTMACROEXPANDER_H -#define PROJECTMACROEXPANDER_H +#pragma once #include "projectexplorer_export.h" @@ -43,5 +42,3 @@ public: }; } // namespace ProjectExplorer - -#endif // PROJECTMACROEXPANDER_H diff --git a/src/plugins/projectexplorer/projectmodels.h b/src/plugins/projectexplorer/projectmodels.h index 3f4fc7d485..0d8eca9a8f 100644 --- a/src/plugins/projectexplorer/projectmodels.h +++ b/src/plugins/projectexplorer/projectmodels.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROJECTMODELS_H -#define PROJECTMODELS_H +#pragma once #include <utils/fileutils.h> @@ -44,28 +43,29 @@ namespace Internal { class FlatModel : public QAbstractItemModel { Q_OBJECT + public: FlatModel(SessionNode *rootNode, QObject *parent); // QAbstractItemModel - QModelIndex index(int row, int column, const QModelIndex & parent = QModelIndex()) const; - QModelIndex parent(const QModelIndex &index) const; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - Qt::ItemFlags flags(const QModelIndex &index) const; - bool setData(const QModelIndex &index, const QVariant &value, int role); + QModelIndex index(int row, int column, const QModelIndex & parent = QModelIndex()) const override; + QModelIndex parent(const QModelIndex &index) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + Qt::ItemFlags flags(const QModelIndex &index) const override; + bool setData(const QModelIndex &index, const QVariant &value, int role) override; - int rowCount(const QModelIndex & parent = QModelIndex()) const; - int columnCount(const QModelIndex & parent = QModelIndex()) const; - bool hasChildren(const QModelIndex & parent = QModelIndex()) const; + int rowCount(const QModelIndex & parent = QModelIndex()) const override; + int columnCount(const QModelIndex & parent = QModelIndex()) const override; + bool hasChildren(const QModelIndex & parent = QModelIndex()) const override; - bool canFetchMore(const QModelIndex & parent) const; - void fetchMore(const QModelIndex & parent); + bool canFetchMore(const QModelIndex & parent) const override; + void fetchMore(const QModelIndex & parent) override; void reset(); - Qt::DropActions supportedDragActions() const; - QStringList mimeTypes() const; - QMimeData *mimeData(const QModelIndexList &indexes) const; + Qt::DropActions supportedDragActions() const override; + QStringList mimeTypes() const override; + QMimeData *mimeData(const QModelIndexList &indexes) const override; void setStartupProject(ProjectNode *projectNode); @@ -136,6 +136,3 @@ int caseFriendlyCompare(const QString &a, const QString &b); } // namespace Internal } // namespace ProjectExplorer - - -#endif // PROJECTMODELS_H diff --git a/src/plugins/projectexplorer/projectnodes.h b/src/plugins/projectexplorer/projectnodes.h index b22a5d04df..bd03c17587 100644 --- a/src/plugins/projectexplorer/projectnodes.h +++ b/src/plugins/projectexplorer/projectnodes.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROJECTNODES_H -#define PROJECTNODES_H +#pragma once #include "projectexplorer_export.h" @@ -409,5 +408,3 @@ T1 subtractSortedList(T1 list1, T1 list2, T3 sorter) Q_DECLARE_METATYPE(ProjectExplorer::Node *) Q_DECLARE_METATYPE(ProjectExplorer::FolderNode *) - -#endif // PROJECTNODES_H diff --git a/src/plugins/projectexplorer/projectpanelfactory.cpp b/src/plugins/projectexplorer/projectpanelfactory.cpp index b982187293..2240252056 100644 --- a/src/plugins/projectexplorer/projectpanelfactory.cpp +++ b/src/plugins/projectexplorer/projectpanelfactory.cpp @@ -29,10 +29,10 @@ namespace ProjectExplorer { static QList<ProjectPanelFactory *> s_factories; -ProjectPanelFactory::ProjectPanelFactory() - : m_priority(0), - m_supportsFunction([] (Project *) { return true; }) -{} +ProjectPanelFactory::ProjectPanelFactory() : + m_priority(0), + m_supportsFunction([] (Project *) { return true; }) +{ } int ProjectPanelFactory::priority() const { diff --git a/src/plugins/projectexplorer/projectpanelfactory.h b/src/plugins/projectexplorer/projectpanelfactory.h index 1e9849e142..a251da03ea 100644 --- a/src/plugins/projectexplorer/projectpanelfactory.h +++ b/src/plugins/projectexplorer/projectpanelfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROJECTPANELFACTORY_H -#define PROJECTPANELFACTORY_H +#pragma once #include "projectexplorer_export.h" #include "propertiespanel.h" @@ -99,5 +98,3 @@ private: }; } // namespace ProjectExplorer - -#endif // PROJECTPANELFACTORY_H diff --git a/src/plugins/projectexplorer/projecttree.h b/src/plugins/projectexplorer/projecttree.h index fd94e22903..678f298b70 100644 --- a/src/plugins/projectexplorer/projecttree.h +++ b/src/plugins/projectexplorer/projecttree.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROJECTTREE_H -#define PROJECTTREE_H +#pragma once #include "projectexplorer_export.h" @@ -156,6 +155,5 @@ private: Internal::ProjectTreeWidget *m_focusForContextMenu; Core::Context m_lastProjectContext; }; -} -#endif // PROJECTTREE_H +} // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/projecttreewidget.h b/src/plugins/projectexplorer/projecttreewidget.h index b47930bc06..bd0bd97310 100644 --- a/src/plugins/projectexplorer/projecttreewidget.h +++ b/src/plugins/projectexplorer/projecttreewidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROJECTTREEWIDGET_H -#define PROJECTTREEWIDGET_H +#pragma once #include "expanddata.h" @@ -54,7 +53,7 @@ class ProjectTreeWidget : public QWidget Q_OBJECT public: explicit ProjectTreeWidget(QWidget *parent = 0); - ~ProjectTreeWidget(); + ~ProjectTreeWidget() override; bool autoSynchronization() const; void setAutoSynchronization(bool sync); @@ -124,5 +123,3 @@ public: } // namespace Internal } // namespace ProjectExplorer - -#endif // PROJECTTREEWIDGET_H diff --git a/src/plugins/projectexplorer/projectwelcomepage.h b/src/plugins/projectexplorer/projectwelcomepage.h index 92af1eafa7..9ab1207112 100644 --- a/src/plugins/projectexplorer/projectwelcomepage.h +++ b/src/plugins/projectexplorer/projectwelcomepage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROJECTWELCOMEPAGE_H -#define PROJECTWELCOMEPAGE_H +#pragma once #include <QAbstractListModel> @@ -40,13 +39,15 @@ namespace Internal { class SessionModel : public QAbstractListModel { Q_OBJECT + public: enum { DefaultSessionRole = Qt::UserRole+1, LastSessionRole, ActiveSessionRole, ProjectsPathRole, ProjectsDisplayRole }; explicit SessionModel(QObject *parent = 0); - int rowCount(const QModelIndex &parent) const; - QVariant data(const QModelIndex &index, int role) const; - QHash<int, QByteArray> roleNames() const; + + int rowCount(const QModelIndex &parent) const override; + QVariant data(const QModelIndex &index, int role) const override; + QHash<int, QByteArray> roleNames() const override; Q_SCRIPTABLE bool isDefaultVirgin() const; @@ -61,13 +62,14 @@ public slots: class ProjectModel : public QAbstractListModel { Q_OBJECT + public: enum { FilePathRole = Qt::UserRole+1, PrettyFilePathRole }; ProjectModel(QObject *parent = 0); - int rowCount(const QModelIndex &parent) const; - QVariant data(const QModelIndex &index, int role) const; - QHash<int, QByteArray> roleNames() const; + int rowCount(const QModelIndex &parent) const override; + QVariant data(const QModelIndex &index, int role) const override; + QHash<int, QByteArray> roleNames() const override; public slots: void resetProjects(); @@ -79,12 +81,12 @@ class ProjectWelcomePage : public Core::IWelcomePage public: ProjectWelcomePage(); - void facilitateQml(QQmlEngine *engine); - QUrl pageLocation() const; + void facilitateQml(QQmlEngine *engine) override; + QUrl pageLocation() const override; QWidget *page() { return 0; } - QString title() const { return tr("Projects"); } - int priority() const { return 20; } - Core::Id id() const; + QString title() const override { return tr("Projects"); } + int priority() const override { return 20; } + Core::Id id() const override; void reloadWelcomeScreenData(); @@ -104,5 +106,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // PROJECTWELCOMEPAGE_H diff --git a/src/plugins/projectexplorer/projectwindow.cpp b/src/plugins/projectexplorer/projectwindow.cpp index b7a4ee9bdc..62a83b5d5d 100644 --- a/src/plugins/projectexplorer/projectwindow.cpp +++ b/src/plugins/projectexplorer/projectwindow.cpp @@ -85,10 +85,6 @@ ProjectWindow::ProjectWindow(QWidget *parent) showProperties(-1, -1); } -ProjectWindow::~ProjectWindow() -{ -} - void ProjectWindow::aboutToShutdown() { showProperties(-1, -1); diff --git a/src/plugins/projectexplorer/projectwindow.h b/src/plugins/projectexplorer/projectwindow.h index f4042c850a..6389965a06 100644 --- a/src/plugins/projectexplorer/projectwindow.h +++ b/src/plugins/projectexplorer/projectwindow.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROJECTWINDOW_H -#define PROJECTWINDOW_H +#pragma once #include "projectexplorer_export.h" @@ -80,7 +79,6 @@ class ProjectWindow : public QWidget public: explicit ProjectWindow(QWidget *parent = 0); - ~ProjectWindow(); void aboutToShutdown(); @@ -105,5 +103,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // PROJECTWINDOW_H diff --git a/src/plugins/projectexplorer/projectwizardpage.h b/src/plugins/projectexplorer/projectwizardpage.h index 56552d6eef..a074595b3b 100644 --- a/src/plugins/projectexplorer/projectwizardpage.h +++ b/src/plugins/projectexplorer/projectwizardpage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROJECTWIZARDPAGE_H -#define PROJECTWIZARDPAGE_H +#pragma once #include "projectnodes.h" @@ -55,7 +54,7 @@ class ProjectWizardPage : public Utils::WizardPage public: explicit ProjectWizardPage(QWidget *parent = 0); - virtual ~ProjectWizardPage(); + ~ProjectWizardPage() override; FolderNode *currentNode() const; @@ -106,5 +105,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // PROJECTWIZARDPAGE_H diff --git a/src/plugins/projectexplorer/propertiespanel.h b/src/plugins/projectexplorer/propertiespanel.h index 62f9ebe659..3bff1012c8 100644 --- a/src/plugins/projectexplorer/propertiespanel.h +++ b/src/plugins/projectexplorer/propertiespanel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROPERTIESPANEL_H -#define PROPERTIESPANEL_H +#pragma once #include "projectexplorer_export.h" @@ -32,12 +31,13 @@ #include <QWidget> namespace ProjectExplorer { + class PROJECTEXPLORER_EXPORT PropertiesPanel { Q_DISABLE_COPY(PropertiesPanel) public: - PropertiesPanel() {} + PropertiesPanel() = default; ~PropertiesPanel() { delete m_widget; } QString displayName() const { return m_displayName; } @@ -53,5 +53,5 @@ private: QWidget *m_widget; QIcon m_icon; }; -} -#endif // PROPERTIESPANEL_H + +} // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/removetaskhandler.h b/src/plugins/projectexplorer/removetaskhandler.h index 97f4d22ebb..ae320d029d 100644 --- a/src/plugins/projectexplorer/removetaskhandler.h +++ b/src/plugins/projectexplorer/removetaskhandler.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROJECTEXPLORER_REMOVETASKHANDLER_H -#define PROJECTEXPLORER_REMOVETASKHANDLER_H +#pragma once #include "itaskhandler.h" @@ -36,14 +35,10 @@ class RemoveTaskHandler : public ITaskHandler Q_OBJECT public: - RemoveTaskHandler() {} - - bool canHandle(const Task &) const { return true; } - void handle(const Task &task); - QAction *createAction(QObject *parent) const; + bool canHandle(const Task &) const override { return true; } + void handle(const Task &task) override; + QAction *createAction(QObject *parent) const override; }; } // namespace Internal } // namespace ProjectExplorer - -#endif // PROJECTEXPLORER_REMOVETASKHANDLER_H diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h index 4f1ef63ff1..d8190562d9 100644 --- a/src/plugins/projectexplorer/runconfiguration.h +++ b/src/plugins/projectexplorer/runconfiguration.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef RUNCONFIGURATION_H -#define RUNCONFIGURATION_H +#pragma once #include "projectconfiguration.h" #include "projectexplorerconstants.h" @@ -87,7 +86,7 @@ class PROJECTEXPLORER_EXPORT ISettingsAspect : public QObject Q_OBJECT public: - ISettingsAspect() {} + ISettingsAspect() { } /// Create a configuration widget for this settings aspect. virtual QWidget *createConfigWidget(QWidget *parent) = 0; @@ -118,7 +117,7 @@ class PROJECTEXPLORER_EXPORT IRunConfigurationAspect : public QObject public: explicit IRunConfigurationAspect(RunConfiguration *runConfig); - ~IRunConfigurationAspect(); + ~IRunConfigurationAspect() override; virtual IRunConfigurationAspect *create(RunConfiguration *runConfig) const = 0; virtual IRunConfigurationAspect *clone(RunConfiguration *runConfig) const; @@ -157,7 +156,7 @@ private: class PROJECTEXPLORER_EXPORT ClonableConcept { public: - virtual ~ClonableConcept() {} + virtual ~ClonableConcept() = default; virtual ClonableConcept *clone() const = 0; virtual bool equals(const std::unique_ptr<ClonableConcept> &other) const = 0; }; @@ -166,7 +165,7 @@ template <class T> class ClonableModel : public ClonableConcept { public: - ClonableModel(const T &data) : m_data(data) {} + ClonableModel(const T &data) : m_data(data) { } ClonableConcept *clone() const override { return new ClonableModel(*this); } bool equals(const std::unique_ptr<ClonableConcept> &other) const override @@ -181,8 +180,8 @@ public: class PROJECTEXPLORER_EXPORT Runnable { public: - Runnable() {} - Runnable(const Runnable &other) : d(other.d->clone()) {} + Runnable() = default; + Runnable(const Runnable &other) : d(other.d->clone()) { } Runnable(Runnable &&other) /* MSVC 2013 doesn't want = default */ : d(std::move(other.d)) {} template <class T> Runnable(const T &data) : d(new ClonableModel<T>(data)) {} @@ -205,8 +204,8 @@ private: class PROJECTEXPLORER_EXPORT Connection { public: - Connection() {} - Connection(const Connection &other) : d(other.d->clone()) {} + Connection() = default; + Connection(const Connection &other) : d(other.d->clone()) { } Connection(Connection &&other) /* MSVC 2013 doesn't want = default */ : d(std::move(other.d)) {} template <class T> Connection(const T &data) : d(new ClonableModel<T>(data)) {} @@ -328,15 +327,11 @@ public: virtual IRunConfigurationAspect *createRunConfigurationAspect(RunConfiguration *rc); }; -class PROJECTEXPLORER_EXPORT RunConfigWidget - : public QWidget +class PROJECTEXPLORER_EXPORT RunConfigWidget : public QWidget { Q_OBJECT -public: - RunConfigWidget() - : QWidget(0) - {} +public: virtual QString displayName() const = 0; signals: @@ -346,6 +341,7 @@ signals: class PROJECTEXPLORER_EXPORT RunControl : public QObject { Q_OBJECT + public: enum StopResult { StoppedSynchronously, // Stopped. @@ -412,5 +408,3 @@ private: // Allow a RunConfiguration to be stored in a QVariant Q_DECLARE_METATYPE(ProjectExplorer::RunConfiguration*) Q_DECLARE_METATYPE(ProjectExplorer::RunControl*) - -#endif // RUNCONFIGURATION_H diff --git a/src/plugins/projectexplorer/runconfigurationaspects.h b/src/plugins/projectexplorer/runconfigurationaspects.h index 5e24e48441..b5e0281e3a 100644 --- a/src/plugins/projectexplorer/runconfigurationaspects.h +++ b/src/plugins/projectexplorer/runconfigurationaspects.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef RUNCONFIGURATION_ASPECTS_H -#define RUNCONFIGURATION_ASPECTS_H +#pragma once #include "runconfiguration.h" #include "applicationlauncher.h" @@ -49,7 +48,8 @@ class PROJECTEXPLORER_EXPORT TerminalAspect : public IRunConfigurationAspect Q_OBJECT public: - explicit TerminalAspect(RunConfiguration *rc, const QString &key, bool useTerminal = false, bool userSet = false); + explicit TerminalAspect(RunConfiguration *rc, const QString &key, + bool useTerminal = false, bool userSet = false); TerminalAspect *create(RunConfiguration *runConfig) const override; TerminalAspect *clone(RunConfiguration *runConfig) const override; @@ -138,5 +138,3 @@ private: }; } // namespace ProjectExplorer - -#endif // RUNCONFIGURATION_ASPECTS_H diff --git a/src/plugins/projectexplorer/runconfigurationmodel.h b/src/plugins/projectexplorer/runconfigurationmodel.h index 49efef242f..a5d9235798 100644 --- a/src/plugins/projectexplorer/runconfigurationmodel.h +++ b/src/plugins/projectexplorer/runconfigurationmodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef RUNCONFIGURATIONMODEL_H -#define RUNCONFIGURATIONMODEL_H +#pragma once #include <QAbstractItemModel> @@ -36,16 +35,18 @@ class RunConfiguration; class RunConfigurationModel : public QAbstractListModel { Q_OBJECT + public: explicit RunConfigurationModel(Target *target, QObject *parent = 0); - int rowCount(const QModelIndex &parent = QModelIndex()) const; - int columnCount(const QModelIndex &parent = QModelIndex()) const; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; RunConfiguration *runConfigurationAt(int i); RunConfiguration *runConfigurationFor(const QModelIndex &idx); QModelIndex indexFor(RunConfiguration *rc); + private: void addedRunConfiguration(ProjectExplorer::RunConfiguration*); void removedRunConfiguration(ProjectExplorer::RunConfiguration*); @@ -54,6 +55,4 @@ private: QList<RunConfiguration *> m_runConfigurations; }; -} - -#endif // RUNCONFIGURATIONMODEL_H +} // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/runnables.h b/src/plugins/projectexplorer/runnables.h index 41079482eb..67b6809ecf 100644 --- a/src/plugins/projectexplorer/runnables.h +++ b/src/plugins/projectexplorer/runnables.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROJECTEXPLORER_RUNNABLES_H -#define PROJECTEXPLORER_RUNNABLES_H +#pragma once #include "runconfiguration.h" @@ -48,5 +47,3 @@ public: PROJECTEXPLORER_EXPORT bool operator==(const StandardRunnable &r1, const StandardRunnable &r2); } // namespace ProjectExplorer - -#endif // PROJECTEXPLORER_RUNNABLES_H diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.cpp b/src/plugins/projectexplorer/runsettingspropertiespage.cpp index 73a91805af..6323d8a46b 100644 --- a/src/plugins/projectexplorer/runsettingspropertiespage.cpp +++ b/src/plugins/projectexplorer/runsettingspropertiespage.cpp @@ -228,10 +228,6 @@ RunSettingsWidget::RunSettingsWidget(Target *target) this, &RunSettingsWidget::activeRunConfigurationChanged); } -RunSettingsWidget::~RunSettingsWidget() -{ -} - void RunSettingsWidget::aboutToShowAddMenu() { m_addRunMenu->clear(); diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.h b/src/plugins/projectexplorer/runsettingspropertiespage.h index e7ad001ca5..e03408cd22 100644 --- a/src/plugins/projectexplorer/runsettingspropertiespage.h +++ b/src/plugins/projectexplorer/runsettingspropertiespage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef RUNSETTINGSPROPERTIESPAGE_H -#define RUNSETTINGSPROPERTIESPAGE_H +#pragma once #include <QWidget> @@ -58,7 +57,6 @@ class RunSettingsWidget : public QWidget Q_OBJECT public: explicit RunSettingsWidget(Target *target); - ~RunSettingsWidget(); private: void currentRunConfigurationChanged(int index); @@ -113,5 +111,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // RUNSETTINGSPROPERTIESPAGE_H diff --git a/src/plugins/projectexplorer/selectablefilesmodel.h b/src/plugins/projectexplorer/selectablefilesmodel.h index 15b154439d..d31159931b 100644 --- a/src/plugins/projectexplorer/selectablefilesmodel.h +++ b/src/plugins/projectexplorer/selectablefilesmodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SELECTABLEFILESMODEL_H -#define SELECTABLEFILESMODEL_H +#pragma once #include <QAbstractItemModel> #include <QSet> @@ -61,8 +60,9 @@ public: Tree *parent; }; -struct Glob +class Glob { +public: enum Mode { EXACT, ENDSWITH, REGEXP }; Mode mode; QString matchString; @@ -90,18 +90,18 @@ class PROJECTEXPLORER_EXPORT SelectableFilesModel : public QAbstractItemModel public: SelectableFilesModel(QObject *parent); - ~SelectableFilesModel(); + ~SelectableFilesModel() override; void setInitialMarkedFiles(const Utils::FileNameList &files); - int columnCount(const QModelIndex &parent) const; - int rowCount(const QModelIndex &parent) const; - QModelIndex index(int row, int column, const QModelIndex &parent) const; - QModelIndex parent(const QModelIndex &child) const; + int columnCount(const QModelIndex &parent) const override; + int rowCount(const QModelIndex &parent) const override; + QModelIndex index(int row, int column, const QModelIndex &parent) const override; + QModelIndex parent(const QModelIndex &child) const override; - bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - Qt::ItemFlags flags(const QModelIndex &index) const; + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + Qt::ItemFlags flags(const QModelIndex &index) const override; Utils::FileNameList selectedFiles() const; Utils::FileNameList selectedPaths() const; @@ -230,6 +230,3 @@ public: }; } // namespace ProjectExplorer - -#endif // SELECTABLEFILESMODEL_H - diff --git a/src/plugins/projectexplorer/session.h b/src/plugins/projectexplorer/session.h index f7499fe522..9912b4fa03 100644 --- a/src/plugins/projectexplorer/session.h +++ b/src/plugins/projectexplorer/session.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SESSION_H -#define SESSION_H +#pragma once #include "projectexplorer_export.h" @@ -44,7 +43,7 @@ QT_END_NAMESPACE namespace Core { class IMode; class IEditor; -} +} // namespace Core namespace ProjectExplorer { @@ -63,7 +62,7 @@ class PROJECTEXPLORER_EXPORT SessionManager : public QObject public: explicit SessionManager(QObject *parent = 0); - ~SessionManager(); + ~SessionManager() override; static SessionManager *instance(); @@ -158,5 +157,3 @@ private: }; } // namespace ProjectExplorer - -#endif // SESSION_H diff --git a/src/plugins/projectexplorer/sessiondialog.h b/src/plugins/projectexplorer/sessiondialog.h index ab17f025b6..4cf231f29e 100644 --- a/src/plugins/projectexplorer/sessiondialog.h +++ b/src/plugins/projectexplorer/sessiondialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SESSIONDIALOG_H -#define SESSIONDIALOG_H +#pragma once #include "ui_sessiondialog.h" @@ -67,8 +66,9 @@ private: class SessionNameInputDialog : public QDialog { Q_OBJECT + public: - SessionNameInputDialog(const QStringList &sessions, QWidget *parent = 0); + explicit SessionNameInputDialog(const QStringList &sessions, QWidget *parent = 0); void setValue(const QString &value); QString value() const; @@ -84,5 +84,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // SESSIONDIALOG_H diff --git a/src/plugins/projectexplorer/settingsaccessor.h b/src/plugins/projectexplorer/settingsaccessor.h index 0a7b21d3c8..0980e4b49d 100644 --- a/src/plugins/projectexplorer/settingsaccessor.h +++ b/src/plugins/projectexplorer/settingsaccessor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SETTINGSACCESSOR_H -#define SETTINGSACCESSOR_H +#pragma once #include <utils/fileutils.h> @@ -45,7 +44,7 @@ class SettingsAccessorPrivate; class SettingsAccessor { public: - SettingsAccessor(Project *project); + explicit SettingsAccessor(Project *project); virtual ~SettingsAccessor(); Project *project() const; @@ -144,11 +143,9 @@ public: UserFileAccessor(Project *project); protected: - QVariantMap prepareSettings(const QVariantMap &data) const; - QVariantMap prepareToSaveSettings(const QVariantMap &data) const; + QVariantMap prepareSettings(const QVariantMap &data) const override; + QVariantMap prepareToSaveSettings(const QVariantMap &data) const override; }; } // namespace Internal } // namespace ProjectExplorer - -#endif // SETTINGSACCESSOR_H diff --git a/src/plugins/projectexplorer/showineditortaskhandler.h b/src/plugins/projectexplorer/showineditortaskhandler.h index 63cecbb516..7ea3d035e4 100644 --- a/src/plugins/projectexplorer/showineditortaskhandler.h +++ b/src/plugins/projectexplorer/showineditortaskhandler.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROJECTEXPLORER_SHOWINEDITORTASKHANDLER_H -#define PROJECTEXPLORER_SHOWINEDITORTASKHANDLER_H +#pragma once #include "itaskhandler.h" @@ -36,15 +35,11 @@ class ShowInEditorTaskHandler : public ITaskHandler Q_OBJECT public: - ShowInEditorTaskHandler() {} - - bool isDefaultHandler() const { return true; } - bool canHandle(const Task &) const; - void handle(const Task &task); - QAction *createAction(QObject *parent ) const; + bool isDefaultHandler() const override { return true; } + bool canHandle(const Task &) const override; + void handle(const Task &task) override; + QAction *createAction(QObject *parent ) const override; }; } // namespace Internal } // namespace ProjectExplorer - -#endif // PROJECTEXPLORER_SHOWINEDITORTASKHANDLER_H diff --git a/src/plugins/projectexplorer/showoutputtaskhandler.h b/src/plugins/projectexplorer/showoutputtaskhandler.h index a4acf7e96d..2d17342d57 100644 --- a/src/plugins/projectexplorer/showoutputtaskhandler.h +++ b/src/plugins/projectexplorer/showoutputtaskhandler.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROJECTEXPLORER_SHOWOUTPUTTASKHANDLER_H -#define PROJECTEXPLORER_SHOWOUTPUTTASKHANDLER_H +#pragma once #include "itaskhandler.h" @@ -40,9 +39,9 @@ class ShowOutputTaskHandler : public ITaskHandler public: explicit ShowOutputTaskHandler(CompileOutputWindow *window); - bool canHandle(const Task &) const; - void handle(const Task &task); - QAction *createAction(QObject *parent) const; + bool canHandle(const Task &) const override; + void handle(const Task &task) override; + QAction *createAction(QObject *parent) const override; private: CompileOutputWindow * m_window; @@ -50,5 +49,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // PROJECTEXPLORER_SHOWOUTPUTTASKHANDLER_H diff --git a/src/plugins/projectexplorer/target.h b/src/plugins/projectexplorer/target.h index 728e79168c..c662428651 100644 --- a/src/plugins/projectexplorer/target.h +++ b/src/plugins/projectexplorer/target.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TARGET_H -#define TARGET_H +#pragma once #include "projectconfiguration.h" #include "projectexplorer_export.h" @@ -177,5 +176,3 @@ private: } // namespace ProjectExplorer Q_DECLARE_METATYPE(ProjectExplorer::Target *) - -#endif // TARGET_H diff --git a/src/plugins/projectexplorer/targetselector.h b/src/plugins/projectexplorer/targetselector.h index 0da6e2c32e..bad62d0339 100644 --- a/src/plugins/projectexplorer/targetselector.h +++ b/src/plugins/projectexplorer/targetselector.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TARGETSELECTOR_H -#define TARGETSELECTOR_H +#pragma once #include <QWidget> #include <QPixmap> @@ -42,14 +41,15 @@ class TargetSelector : public QWidget { Q_OBJECT public: - struct Target { + class Target { + public: QString name; int currentSubIndex; }; explicit TargetSelector(QWidget *parent = 0); - QSize sizeHint() const; + QSize sizeHint() const override; int targetWidth() const; QString runButtonString() const { return tr("Run"); } @@ -80,13 +80,13 @@ signals: void menuShown(int targetIndex); protected: - void paintEvent(QPaintEvent *event); - void mousePressEvent(QMouseEvent *event); - void mouseMoveEvent(QMouseEvent *event); - void leaveEvent(QEvent *event); - void showEvent(QShowEvent *event); - void resizeEvent(QResizeEvent *event); - bool event(QEvent *e); + void paintEvent(QPaintEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void leaveEvent(QEvent *event) override; + void showEvent(QShowEvent *event) override; + void resizeEvent(QResizeEvent *event) override; + bool event(QEvent *e) override; private: void changeButtonPressed(); @@ -118,5 +118,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // TARGETSELECTOR_H diff --git a/src/plugins/projectexplorer/targetsettingspanel.h b/src/plugins/projectexplorer/targetsettingspanel.h index 3e6276af48..7705224c09 100644 --- a/src/plugins/projectexplorer/targetsettingspanel.h +++ b/src/plugins/projectexplorer/targetsettingspanel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TARGETSETTINGSPANEL_H -#define TARGETSETTINGSPANEL_H +#pragma once #include <QWidget> @@ -53,7 +52,7 @@ class TargetSettingsPanelWidget : public QWidget Q_OBJECT public: TargetSettingsPanelWidget(Project *project); - ~TargetSettingsPanelWidget(); + ~TargetSettingsPanelWidget() override; void setupUi(); @@ -61,7 +60,7 @@ public: void setCurrentSubIndex(int subIndex); protected: - bool event(QEvent *event); + bool event(QEvent *event) override; private: void currentTargetChanged(int targetIndex, int subIndex); @@ -101,5 +100,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // TARGETSETTINGSPANEL_H diff --git a/src/plugins/projectexplorer/targetsettingswidget.h b/src/plugins/projectexplorer/targetsettingswidget.h index 30c5cdbf4e..ee6573c384 100644 --- a/src/plugins/projectexplorer/targetsettingswidget.h +++ b/src/plugins/projectexplorer/targetsettingswidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TARGETSETTINGSWIDGET_H -#define TARGETSETTINGSWIDGET_H +#pragma once #include "targetselector.h" @@ -46,7 +45,7 @@ class TargetSettingsWidget : public QWidget public: explicit TargetSettingsWidget(QWidget *parent = 0); - ~TargetSettingsWidget(); + ~TargetSettingsWidget() override; void setCentralWidget(QWidget *widget); @@ -64,6 +63,7 @@ public: void setAddButtonEnabled(bool enabled); void setAddButtonMenu(QMenu *menu); void setTargetMenu(QMenu *menu); + signals: void currentChanged(int targetIndex, int subIndex); void manageButtonClicked(); @@ -83,5 +83,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // TARGETSETTINGSWIDGET_H diff --git a/src/plugins/projectexplorer/targetsetuppage.h b/src/plugins/projectexplorer/targetsetuppage.h index 5e7fd24a25..c2d5b1d73b 100644 --- a/src/plugins/projectexplorer/targetsetuppage.h +++ b/src/plugins/projectexplorer/targetsetuppage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TARGETSETUPPAGE_H -#define TARGETSETUPPAGE_H +#pragma once #include "projectexplorer_export.h" @@ -59,11 +58,11 @@ class PROJECTEXPLORER_EXPORT TargetSetupPage : public Utils::WizardPage public: explicit TargetSetupPage(QWidget *parent = 0); - ~TargetSetupPage(); + ~TargetSetupPage() override; /// Initializes the TargetSetupPage /// \note The import information is gathered in initializePage(), make sure that the right projectPath is set before - void initializePage(); + void initializePage() override; // Call these before initializePage! void setRequiredKitMatcher(const KitMatcher &matcher); @@ -74,7 +73,7 @@ public: /// call this before \sa initializePage() void setUseScrollArea(bool b); - bool isComplete() const; + bool isComplete() const override; bool setupProject(Project *project); bool isKitSelected(Core::Id id) const; void setKitSelected(Core::Id id, bool selected); @@ -127,5 +126,3 @@ private: }; } // namespace ProjectExplorer - -#endif // TARGETSETUPPAGE_H diff --git a/src/plugins/projectexplorer/targetsetupwidget.h b/src/plugins/projectexplorer/targetsetupwidget.h index e45aea7fcd..f4fa60f603 100644 --- a/src/plugins/projectexplorer/targetsetupwidget.h +++ b/src/plugins/projectexplorer/targetsetupwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TARGETSETUPWIDGET_H -#define TARGETSETUPWIDGET_H +#pragma once #include "projectexplorer_export.h" @@ -56,11 +55,12 @@ namespace Internal { class TargetSetupWidget : public QWidget { Q_OBJECT + public: TargetSetupWidget(Kit *k, const QString &projectPath, const QList<BuildInfo *> &infoList); - ~TargetSetupWidget(); + ~TargetSetupWidget() override; Kit *kit(); void clearKit(); @@ -107,5 +107,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // TARGETSETUPWIDGET_H diff --git a/src/plugins/projectexplorer/task.cpp b/src/plugins/projectexplorer/task.cpp index 046c37915c..bdb6e26125 100644 --- a/src/plugins/projectexplorer/task.cpp +++ b/src/plugins/projectexplorer/task.cpp @@ -53,9 +53,6 @@ unsigned int Task::s_nextId = 1; \sa ProjectExplorer::TaskHub */ -Task::Task() : taskId(0), type(Unknown), line(-1), movedLine(-1) -{ } - Task::Task(TaskType type_, const QString &description_, const Utils::FileName &file_, int line_, Core::Id category_, const Utils::FileName &iconFile) : diff --git a/src/plugins/projectexplorer/task.h b/src/plugins/projectexplorer/task.h index fe8147bd63..0b29101654 100644 --- a/src/plugins/projectexplorer/task.h +++ b/src/plugins/projectexplorer/task.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROJECTEXPLORER_TASK_H -#define PROJECTEXPLORER_TASK_H +#pragma once #include "projectexplorer_export.h" @@ -48,7 +47,7 @@ public: Warning }; - Task(); + Task() = default; Task(TaskType type, const QString &description, const Utils::FileName &file, int line, Core::Id category, const Utils::FileName &iconName = Utils::FileName()); @@ -59,12 +58,12 @@ public: bool isNull() const; void clear(); - unsigned int taskId; - TaskType type; + unsigned int taskId = 0; + TaskType type = Unknown; QString description; Utils::FileName file; - int line; - int movedLine; // contains a line number if the line was moved in the editor + int line = -1; + int movedLine = -1; // contains a line number if the line was moved in the editor Core::Id category; QIcon icon; void addMark(TextEditor::TextMark *mark); @@ -93,5 +92,3 @@ bool PROJECTEXPLORER_EXPORT operator<(const Task &a, const Task &b); Q_DECLARE_METATYPE(ProjectExplorer::Task) Q_DECLARE_METATYPE(QList<ProjectExplorer::Task>) - -#endif // PROJECTEXPLORER_TASK_H diff --git a/src/plugins/projectexplorer/taskhub.h b/src/plugins/projectexplorer/taskhub.h index 5e39969092..87dbfe6d6a 100644 --- a/src/plugins/projectexplorer/taskhub.h +++ b/src/plugins/projectexplorer/taskhub.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TASKHUB_H -#define TASKHUB_H +#pragma once #include "task.h" @@ -76,7 +75,7 @@ signals: private: TaskHub(); - ~TaskHub(); + ~TaskHub() override; static QVector<Core::Id> m_registeredCategories; @@ -84,4 +83,3 @@ private: }; } // namespace ProjectExplorer -#endif // TASKHUB_H diff --git a/src/plugins/projectexplorer/taskmodel.h b/src/plugins/projectexplorer/taskmodel.h index 6be8c130cc..113c388413 100644 --- a/src/plugins/projectexplorer/taskmodel.h +++ b/src/plugins/projectexplorer/taskmodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TASKMODEL_H -#define TASKMODEL_H +#pragma once #include <QAbstractItemModel> @@ -41,13 +40,13 @@ class TaskModel : public QAbstractItemModel public: // Model stuff - TaskModel(QObject *parent); + explicit TaskModel(QObject *parent); - QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const; - QModelIndex parent(const QModelIndex &child) const; - int rowCount(const QModelIndex &parent = QModelIndex()) const; - int columnCount(const QModelIndex &parent = QModelIndex()) const; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; + QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; + QModelIndex parent(const QModelIndex &child) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; Task task(const QModelIndex &index) const; QList<Core::Id> categoryIds() const; @@ -132,11 +131,11 @@ public: TaskModel *taskModel() { return m_sourceModel; } - QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const; - QModelIndex parent(const QModelIndex &child) const; - int rowCount(const QModelIndex &parent = QModelIndex()) const; - int columnCount(const QModelIndex &parent = QModelIndex()) const; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; + QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; + QModelIndex parent(const QModelIndex &child) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; bool filterIncludesUnknowns() const { return m_includeUnknowns; } void setFilterIncludesUnknowns(bool b) { m_includeUnknowns = b; invalidateFilter(); } @@ -157,6 +156,7 @@ public: { return m_sourceModel->hasFile(mapToSource(index)); } QModelIndex mapFromSource(const QModelIndex &idx) const; + private: void handleNewRows(const QModelIndex &index, int first, int last); void handleRowsAboutToBeRemoved(const QModelIndex &index, int first, int last); @@ -180,5 +180,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // TASKMODEL_H diff --git a/src/plugins/projectexplorer/taskwindow.h b/src/plugins/projectexplorer/taskwindow.h index be2ab7f9a1..267402ad1b 100644 --- a/src/plugins/projectexplorer/taskwindow.h +++ b/src/plugins/projectexplorer/taskwindow.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TASKWINDOW_H -#define TASKWINDOW_H +#pragma once #include <coreplugin/id.h> #include <coreplugin/ioutputpane.h> @@ -49,7 +48,7 @@ class TaskWindow : public Core::IOutputPane public: TaskWindow(); - virtual ~TaskWindow(); + ~TaskWindow() override; void delayedInitialization(); @@ -58,23 +57,23 @@ public: int errorTaskCount(Core::Id category = Core::Id()) const; // IOutputPane - QWidget *outputWidget(QWidget *); - QList<QWidget *> toolBarWidgets() const; + QWidget *outputWidget(QWidget *) override; + QList<QWidget *> toolBarWidgets() const override; - QString displayName() const { return tr("Issues"); } - int priorityInStatusBar() const; - void clearContents(); - void visibilityChanged(bool visible); + QString displayName() const override { return tr("Issues"); } + int priorityInStatusBar() const override; + void clearContents() override; + void visibilityChanged(bool visible) override; - bool canFocus() const; - bool hasFocus() const; - void setFocus(); + bool canFocus() const override; + bool hasFocus() const override; + void setFocus() override; - bool canNavigate() const; - bool canNext() const; - bool canPrevious() const; - void goToNext(); - void goToPrev(); + bool canNavigate() const override; + bool canNext() const override; + bool canPrevious() const override; + void goToNext() override; + void goToPrev() override; signals: void tasksChanged(); @@ -106,5 +105,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // TASKWINDOW_H diff --git a/src/plugins/projectexplorer/toolchain.h b/src/plugins/projectexplorer/toolchain.h index 51237a75ac..e00c2136aa 100644 --- a/src/plugins/projectexplorer/toolchain.h +++ b/src/plugins/projectexplorer/toolchain.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TOOLCHAIN_H -#define TOOLCHAIN_H +#pragma once #include "projectexplorer_export.h" #include "projectexplorer_global.h" @@ -123,6 +122,7 @@ public: // Make sure to call this function when deriving! virtual QVariantMap toMap() const; virtual QList<Task> validateKit(const Kit *k) const; + protected: explicit ToolChain(Core::Id typeId, Detection d); explicit ToolChain(const ToolChain &); @@ -168,5 +168,3 @@ private: }; } // namespace ProjectExplorer - -#endif // TOOLCHAIN_H diff --git a/src/plugins/projectexplorer/toolchainconfigwidget.h b/src/plugins/projectexplorer/toolchainconfigwidget.h index 96740200f9..3fdc440f83 100644 --- a/src/plugins/projectexplorer/toolchainconfigwidget.h +++ b/src/plugins/projectexplorer/toolchainconfigwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TOOLCHAINCONFIGWIDGET_H -#define TOOLCHAINCONFIGWIDGET_H +#pragma once #include "projectexplorer_export.h" @@ -50,7 +49,7 @@ class PROJECTEXPLORER_EXPORT ToolChainConfigWidget : public QScrollArea Q_OBJECT public: - ToolChainConfigWidget(ToolChain *); + explicit ToolChainConfigWidget(ToolChain *tc); ToolChain *toolChain() const; @@ -81,5 +80,3 @@ private: }; } // namespace ProjectExplorer - -#endif // TOOLCHAINCONFIGWIDGET_H diff --git a/src/plugins/projectexplorer/toolchainmanager.h b/src/plugins/projectexplorer/toolchainmanager.h index 2e01537872..d70f4ba974 100644 --- a/src/plugins/projectexplorer/toolchainmanager.h +++ b/src/plugins/projectexplorer/toolchainmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TOOLCHAINMANAGER_H -#define TOOLCHAINMANAGER_H +#pragma once #include "projectexplorer_export.h" @@ -50,7 +49,7 @@ class PROJECTEXPLORER_EXPORT ToolChainManager : public QObject public: static ToolChainManager *instance(); - ~ToolChainManager(); + ~ToolChainManager() override; static QList<ToolChain *> toolChains(); static QList<ToolChain *> findToolChains(const Abi &abi); @@ -92,5 +91,3 @@ private: }; } // namespace ProjectExplorer - -#endif // TOOLCHAINMANAGER_H diff --git a/src/plugins/projectexplorer/toolchainoptionspage.h b/src/plugins/projectexplorer/toolchainoptionspage.h index 40e505896f..3853a51dd9 100644 --- a/src/plugins/projectexplorer/toolchainoptionspage.h +++ b/src/plugins/projectexplorer/toolchainoptionspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TOOLCHAINOPTIONSPAGE_H -#define TOOLCHAINOPTIONSPAGE_H +#pragma once #include <coreplugin/dialogs/ioptionspage.h> @@ -46,9 +45,9 @@ class ToolChainOptionsPage : public Core::IOptionsPage public: ToolChainOptionsPage(); - QWidget *widget(); - void apply(); - void finish(); + QWidget *widget() override; + void apply() override; + void finish() override; private: QPointer<ToolChainOptionsWidget> m_widget; @@ -56,5 +55,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // TOOLCHAINOPTIONSPAGE_H diff --git a/src/plugins/projectexplorer/unconfiguredprojectpanel.h b/src/plugins/projectexplorer/unconfiguredprojectpanel.h index 4199c3698e..8730d78682 100644 --- a/src/plugins/projectexplorer/unconfiguredprojectpanel.h +++ b/src/plugins/projectexplorer/unconfiguredprojectpanel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef UNCONFIGUREDPROJECTPANEL_H -#define UNCONFIGUREDPROJECTPANEL_H +#pragma once #include <QString> #include <QWidget> @@ -42,10 +41,12 @@ class TargetSetupPageWrapper : public QWidget { Q_OBJECT public: - TargetSetupPageWrapper(Project *project); + explicit TargetSetupPageWrapper(Project *project); + protected: - void keyReleaseEvent(QKeyEvent *event); - void keyPressEvent(QKeyEvent *event); + void keyReleaseEvent(QKeyEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; + private: void done(); void cancel(); @@ -61,5 +62,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // UNCONFIGUREDPROJECTPANEL_H diff --git a/src/plugins/projectexplorer/vcsannotatetaskhandler.h b/src/plugins/projectexplorer/vcsannotatetaskhandler.h index 69edeb50df..68d99255d9 100644 --- a/src/plugins/projectexplorer/vcsannotatetaskhandler.h +++ b/src/plugins/projectexplorer/vcsannotatetaskhandler.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROJECTEXPLORER_VCSANNOTATETASKHANDLER_H -#define PROJECTEXPLORER_VCSANNOTATETASKHANDLER_H +#pragma once #include "itaskhandler.h" @@ -36,14 +35,10 @@ class VcsAnnotateTaskHandler : public ITaskHandler Q_OBJECT public: - VcsAnnotateTaskHandler() {} - - bool canHandle(const Task &) const; - void handle(const Task &task); - QAction *createAction(QObject *parent) const; + bool canHandle(const Task &) const override; + void handle(const Task &task) override; + QAction *createAction(QObject *parent) const override; }; } // namespace Internal } // namespace ProjectExplorer - -#endif // PROJECTEXPLORER_VCSANNOTATETASKHANDLER_H diff --git a/src/plugins/projectexplorer/waitforstopdialog.h b/src/plugins/projectexplorer/waitforstopdialog.h index 235eb86da6..d8c0037712 100644 --- a/src/plugins/projectexplorer/waitforstopdialog.h +++ b/src/plugins/projectexplorer/waitforstopdialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef WAITFORSTOPDIALOG_H -#define WAITFORSTOPDIALOG_H +#pragma once #include <QList> #include <QDialog> @@ -43,7 +42,7 @@ class WaitForStopDialog : public QDialog { Q_OBJECT public: - WaitForStopDialog(QList<ProjectExplorer::RunControl *> runControls); + explicit WaitForStopDialog(QList<ProjectExplorer::RunControl *> runControls); bool canceled(); private: @@ -57,6 +56,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // WAITFORSTOPDIALOG_H - diff --git a/src/plugins/projectexplorer/wincetoolchain.h b/src/plugins/projectexplorer/wincetoolchain.h index 3df9d4c229..1422ccfe91 100644 --- a/src/plugins/projectexplorer/wincetoolchain.h +++ b/src/plugins/projectexplorer/wincetoolchain.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef WINCETOOLCHAIN_H -#define WINCETOOLCHAIN_H +#pragma once #include "abstractmsvctoolchain.h" #include "abi.h" @@ -118,8 +117,5 @@ private: QList<ToolChain *> detectCEToolKits(const QString &msvcPath, const QString &vcvarsbat); }; - } // namespace Internal } // namespace ProjectExplorer - -#endif // MSVCTOOLCHAIN_H diff --git a/src/plugins/projectexplorer/windebuginterface.h b/src/plugins/projectexplorer/windebuginterface.h index a1b234e57e..c7de7f6b37 100644 --- a/src/plugins/projectexplorer/windebuginterface.h +++ b/src/plugins/projectexplorer/windebuginterface.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef WINDEBUGINTERFACE_H -#define WINDEBUGINTERFACE_H +#pragma once #include <QThread> @@ -37,7 +36,7 @@ class WinDebugInterface : public QThread public: explicit WinDebugInterface(QObject *parent = 0); - ~WinDebugInterface(); + ~WinDebugInterface() override; static WinDebugInterface *instance(); @@ -50,7 +49,7 @@ signals: private: enum Handles { DataReadyEventHandle, TerminateEventHandle, HandleCount }; - void run(); + void run() override; bool runLoop(); static WinDebugInterface *m_instance; @@ -64,5 +63,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // WINDEBUGINTERFACE_H diff --git a/src/plugins/projectexplorer/xcodebuildparser.h b/src/plugins/projectexplorer/xcodebuildparser.h index 02c78514fb..2557c70342 100644 --- a/src/plugins/projectexplorer/xcodebuildparser.h +++ b/src/plugins/projectexplorer/xcodebuildparser.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IOSXCODEPARSER_H -#define IOSXCODEPARSER_H +#pragma once #include "projectexplorer_export.h" #include "ioutputparser.h" @@ -47,9 +46,10 @@ public: XcodebuildParser(); - void stdOutput(const QString &line); - void stdError(const QString &line); - bool hasFatalErrors() const; + void stdOutput(const QString &line) override; + void stdError(const QString &line) override; + bool hasFatalErrors() const override; + private: int m_fatalErrorCount; QRegExp m_failureRe; @@ -59,6 +59,7 @@ private: XcodebuildStatus m_xcodeBuildParserState; QString m_lastTarget; QString m_lastProject; + #if defined WITH_TESTS friend class XcodebuildParserTester; friend class ProjectExplorerPlugin; @@ -81,5 +82,3 @@ public slots: #endif } // namespace ProjectExplorer - -#endif // IOSXCODEPARSER_H diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp index 43f1d56432..56ff35ec15 100644 --- a/src/plugins/qmlprojectmanager/qmlproject.cpp +++ b/src/plugins/qmlprojectmanager/qmlproject.cpp @@ -338,7 +338,7 @@ Project::RestoreResult QmlProject::fromMap(const QVariantMap &map, QString *erro if (!activeTarget()) { // find a kit that matches prerequisites (prefer default one) QList<Kit*> kits = KitManager::matchingKits( - std::function<bool(const Kit *)>([this](const Kit *k) -> bool { + KitMatcher(std::function<bool(const Kit *)>([this](const Kit *k) -> bool { if (!k->isValid()) return false; @@ -367,7 +367,7 @@ Project::RestoreResult QmlProject::fromMap(const QVariantMap &map, QString *erro } return version->qtVersion() >= minVersion && hasViewer; - })); + }))); if (!kits.isEmpty()) { Kit *kit = 0; diff --git a/src/plugins/qtsupport/qtkitinformation.cpp b/src/plugins/qtsupport/qtkitinformation.cpp index eea7e32c8d..f4d9220785 100644 --- a/src/plugins/qtsupport/qtkitinformation.cpp +++ b/src/plugins/qtsupport/qtkitinformation.cpp @@ -220,16 +220,16 @@ void QtKitInformation::kitsWereLoaded() KitMatcher QtKitInformation::platformMatcher(Core::Id platform) { - return std::function<bool(const Kit *)>([platform](const Kit *kit) -> bool { + return KitMatcher(std::function<bool(const Kit *)>([platform](const Kit *kit) -> bool { BaseQtVersion *version = QtKitInformation::qtVersion(kit); return version && version->targetDeviceTypes().contains(platform); - }); + })); } KitMatcher QtKitInformation::qtVersionMatcher(const QSet<Core::Id> &required, const QtVersionNumber &min, const QtVersionNumber &max) { - return std::function<bool(const Kit *)>([required, min, max](const Kit *kit) -> bool { + return KitMatcher(std::function<bool(const Kit *)>([required, min, max](const Kit *kit) -> bool { BaseQtVersion *version = QtKitInformation::qtVersion(kit); if (!version) return false; @@ -239,7 +239,7 @@ KitMatcher QtKitInformation::qtVersionMatcher(const QSet<Core::Id> &required, if (max.majorVersion > -1 && current > max) return false; return version->availableFeatures().contains(required); - }); + })); } QSet<Core::Id> QtKitInformation::supportedPlatforms(const Kit *k) const |