From 667ad61710eec0e197fad62bf59bdab7f57a8ca3 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Thu, 15 Nov 2018 10:32:56 +0100 Subject: [PATCH] ProjectExplorer: Modernize modernize-* Change-Id: I01b9b3d73a2dc2a5c858cf316a1fbff7a4113600 Reviewed-by: Orgad Shaneh --- src/plugins/projectexplorer/abstractprocessstep.h | 2 +- src/plugins/projectexplorer/buildstep.h | 5 ++--- .../projectexplorer/customwizard/customwizard.h | 6 +++--- .../customwizard/customwizardpage.h | 8 ++++---- .../customwizard/customwizardparameters.h | 8 ++++---- src/plugins/projectexplorer/dependenciespanel.h | 2 +- src/plugins/projectexplorer/deployconfiguration.h | 5 ++--- .../projectexplorer/devicesupport/desktopdevice.h | 2 +- .../desktopdeviceconfigurationwidget.h | 2 +- .../devicesupport/desktopdeviceprocess.h | 2 +- .../devicesupport/devicefactoryselectiondialog.h | 2 +- .../devicesupport/devicemanagermodel.h | 2 +- .../devicesupport/deviceprocesslist.h | 3 +-- .../devicesupport/devicesettingspage.h | 2 +- .../devicesupport/devicesettingswidget.h | 2 +- .../projectexplorer/devicesupport/idevice.h | 15 +++++++-------- .../devicesupport/localprocesslist.h | 2 +- .../projectexplorer/foldernavigationwidget.h | 2 +- src/plugins/projectexplorer/journaldwatcher.h | 4 ++-- .../projectexplorer/jsonwizard/jsonfieldpage.h | 4 ++-- .../projectexplorer/jsonwizard/jsonfieldpage_p.h | 2 +- .../projectexplorer/jsonwizard/jsonkitspage.h | 2 +- .../projectexplorer/jsonwizard/jsonwizard.h | 6 +++--- .../jsonwizard/jsonwizardgeneratorfactory.h | 2 +- src/plugins/projectexplorer/kitmanager.cpp | 2 +- src/plugins/projectexplorer/kitmanager.h | 7 +++---- .../projectexplorer/localenvironmentaspect.h | 2 +- src/plugins/projectexplorer/msvctoolchain.cpp | 8 +++----- src/plugins/projectexplorer/msvctoolchain.h | 6 +++--- .../projectexplorer/projectconfiguration.h | 5 ++--- src/plugins/projectexplorer/projecttreewidget.h | 6 +++--- src/plugins/projectexplorer/runconfiguration.cpp | 2 +- src/plugins/projectexplorer/runconfiguration.h | 7 +++---- .../projectexplorer/runsettingspropertiespage.h | 2 +- 34 files changed, 65 insertions(+), 74 deletions(-) diff --git a/src/plugins/projectexplorer/abstractprocessstep.h b/src/plugins/projectexplorer/abstractprocessstep.h index 072b35b5cdd..c640e88f88b 100644 --- a/src/plugins/projectexplorer/abstractprocessstep.h +++ b/src/plugins/projectexplorer/abstractprocessstep.h @@ -57,7 +57,7 @@ public: protected: AbstractProcessStep(BuildStepList *bsl, Core::Id id); - ~AbstractProcessStep(); + ~AbstractProcessStep() override; virtual void processStarted(); virtual void processFinished(int exitCode, QProcess::ExitStatus status); diff --git a/src/plugins/projectexplorer/buildstep.h b/src/plugins/projectexplorer/buildstep.h index efc53f3ea63..295c10dbdaa 100644 --- a/src/plugins/projectexplorer/buildstep.h +++ b/src/plugins/projectexplorer/buildstep.h @@ -132,6 +132,8 @@ class PROJECTEXPLORER_EXPORT BuildStepFactory { public: BuildStepFactory(); + BuildStepFactory(const BuildStepFactory &) = delete; + BuildStepFactory &operator=(const BuildStepFactory &) = delete; virtual ~BuildStepFactory(); static const QList allBuildStepFactories(); @@ -144,9 +146,6 @@ public: bool canHandle(BuildStepList *bsl) const; protected: - BuildStepFactory(const BuildStepFactory &) = delete; - BuildStepFactory &operator=(const BuildStepFactory &) = delete; - using BuildStepCreator = std::function; template diff --git a/src/plugins/projectexplorer/customwizard/customwizard.h b/src/plugins/projectexplorer/customwizard/customwizard.h index 315b4ae5b0a..e883a738e4d 100644 --- a/src/plugins/projectexplorer/customwizard/customwizard.h +++ b/src/plugins/projectexplorer/customwizard/customwizard.h @@ -82,7 +82,7 @@ class PROJECTEXPLORER_EXPORT CustomWizard : public Core::BaseFileWizardFactory Q_OBJECT public: - typedef QMap FieldReplacementMap; + using FieldReplacementMap = QMap; CustomWizard(); ~CustomWizard() override; @@ -101,8 +101,8 @@ public: static int verbose(); protected: - typedef QSharedPointer CustomWizardParametersPtr; - typedef QSharedPointer CustomWizardContextPtr; + using CustomWizardParametersPtr = QSharedPointer; + using CustomWizardContextPtr = QSharedPointer; // generate files in path Core::GeneratedFiles generateWizardFiles(QString *errorMessage) const; diff --git a/src/plugins/projectexplorer/customwizard/customwizardpage.h b/src/plugins/projectexplorer/customwizard/customwizardpage.h index e670b974300..5ba82d6d92a 100644 --- a/src/plugins/projectexplorer/customwizard/customwizardpage.h +++ b/src/plugins/projectexplorer/customwizard/customwizardpage.h @@ -50,7 +50,7 @@ class CustomWizardContext; class CustomWizardFieldPage : public QWizardPage { Q_OBJECT public: - typedef QList FieldList; + using FieldList = QList; explicit CustomWizardFieldPage(const QSharedPointer &ctx, const QSharedPointer ¶meters, @@ -92,9 +92,9 @@ private: QString userChange; }; - typedef QList LineEditDataList; - typedef QList TextEditDataList; - typedef QList PathChooserDataList; + using LineEditDataList = QList; + using TextEditDataList = QList; + using PathChooserDataList = QList; QWidget *registerLineEdit(const QString &fieldName, const CustomWizardField &field); QWidget *registerComboBox(const QString &fieldName, const CustomWizardField &field); diff --git a/src/plugins/projectexplorer/customwizard/customwizardparameters.h b/src/plugins/projectexplorer/customwizard/customwizardparameters.h index a633ac0a493..bb697d10b09 100644 --- a/src/plugins/projectexplorer/customwizard/customwizardparameters.h +++ b/src/plugins/projectexplorer/customwizard/customwizardparameters.h @@ -45,7 +45,7 @@ namespace Internal { class CustomWizardField { public: // Parameters of the widget control are stored as map - typedef QMap ControlAttributeMap; + using ControlAttributeMap = QMap; CustomWizardField(); void clear(); @@ -136,9 +136,9 @@ public: // Documentation inside. class CustomWizardContext { public: - typedef QMap FieldReplacementMap; - typedef QSharedPointer TemporaryFilePtr; - typedef QList TemporaryFilePtrList; + using FieldReplacementMap = QMap; + using TemporaryFilePtr = QSharedPointer; + using TemporaryFilePtrList = QList; void reset(); diff --git a/src/plugins/projectexplorer/dependenciespanel.h b/src/plugins/projectexplorer/dependenciespanel.h index 2a87b26a4e3..b1e4d78f59a 100644 --- a/src/plugins/projectexplorer/dependenciespanel.h +++ b/src/plugins/projectexplorer/dependenciespanel.h @@ -86,7 +86,7 @@ class DependenciesWidget : public QWidget Q_OBJECT public: - explicit DependenciesWidget(Project *project, QWidget *parent = 0); + explicit DependenciesWidget(Project *project, QWidget *parent = nullptr); private: Project *m_project; diff --git a/src/plugins/projectexplorer/deployconfiguration.h b/src/plugins/projectexplorer/deployconfiguration.h index f1b4e512f0f..e56e778579c 100644 --- a/src/plugins/projectexplorer/deployconfiguration.h +++ b/src/plugins/projectexplorer/deployconfiguration.h @@ -76,6 +76,8 @@ class PROJECTEXPLORER_EXPORT DeployConfigurationFactory { public: DeployConfigurationFactory(); + DeployConfigurationFactory(const DeployConfigurationFactory &) = delete; + DeployConfigurationFactory operator=(const DeployConfigurationFactory &) = delete; virtual ~DeployConfigurationFactory(); // used to show the list of possible additons to a target, returns a list of types @@ -113,9 +115,6 @@ protected: } private: - DeployConfigurationFactory(const DeployConfigurationFactory &) = delete; - DeployConfigurationFactory operator=(const DeployConfigurationFactory &) = delete; - DeployConfigurationCreator m_creator; Core::Id m_deployConfigBaseId; Core::Id m_supportedProjectType; diff --git a/src/plugins/projectexplorer/devicesupport/desktopdevice.h b/src/plugins/projectexplorer/devicesupport/desktopdevice.h index 203dd8fe49d..5074c2d88bf 100644 --- a/src/plugins/projectexplorer/devicesupport/desktopdevice.h +++ b/src/plugins/projectexplorer/devicesupport/desktopdevice.h @@ -44,7 +44,7 @@ public: IDeviceWidget *createWidget() override; QList actionIds() const override; QString displayNameForActionId(Core::Id actionId) const override; - void executeAction(Core::Id actionId, QWidget *parent = 0) override; + void executeAction(Core::Id actionId, QWidget *parent = nullptr) override; bool canAutoDetectPorts() const override; bool canCreateProcessModel() const override; DeviceProcessList *createProcessListModel(QObject *parent) const override; diff --git a/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.h b/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.h index 06938498ffa..ed78b6e8022 100644 --- a/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.h +++ b/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.h @@ -34,7 +34,7 @@ class DesktopDeviceConfigurationWidget : public IDeviceWidget { Q_OBJECT public: - explicit DesktopDeviceConfigurationWidget(const IDevice::Ptr &device, QWidget *parent = 0); + explicit DesktopDeviceConfigurationWidget(const IDevice::Ptr &device, QWidget *parent = nullptr); ~DesktopDeviceConfigurationWidget() override; void updateDeviceFromUi() override; diff --git a/src/plugins/projectexplorer/devicesupport/desktopdeviceprocess.h b/src/plugins/projectexplorer/devicesupport/desktopdeviceprocess.h index d7b0123fd4f..f0cc1419a94 100644 --- a/src/plugins/projectexplorer/devicesupport/desktopdeviceprocess.h +++ b/src/plugins/projectexplorer/devicesupport/desktopdeviceprocess.h @@ -35,7 +35,7 @@ class DesktopDeviceProcess : public DeviceProcess Q_OBJECT public: - DesktopDeviceProcess(const QSharedPointer &device, QObject *parent = 0); + DesktopDeviceProcess(const QSharedPointer &device, QObject *parent = nullptr); void start(const Runnable &runnable) override; void interrupt() override; diff --git a/src/plugins/projectexplorer/devicesupport/devicefactoryselectiondialog.h b/src/plugins/projectexplorer/devicesupport/devicefactoryselectiondialog.h index bd1b0f713be..f3bb2ac0f31 100644 --- a/src/plugins/projectexplorer/devicesupport/devicefactoryselectiondialog.h +++ b/src/plugins/projectexplorer/devicesupport/devicefactoryselectiondialog.h @@ -40,7 +40,7 @@ class DeviceFactorySelectionDialog : public QDialog Q_OBJECT public: - explicit DeviceFactorySelectionDialog(QWidget *parent = 0); + explicit DeviceFactorySelectionDialog(QWidget *parent = nullptr); ~DeviceFactorySelectionDialog() override; Core::Id selectedId() const; diff --git a/src/plugins/projectexplorer/devicesupport/devicemanagermodel.h b/src/plugins/projectexplorer/devicesupport/devicemanagermodel.h index da2fee8e469..c7544cdf681 100644 --- a/src/plugins/projectexplorer/devicesupport/devicemanagermodel.h +++ b/src/plugins/projectexplorer/devicesupport/devicemanagermodel.h @@ -41,7 +41,7 @@ class PROJECTEXPLORER_EXPORT DeviceManagerModel : public QAbstractListModel { Q_OBJECT public: - explicit DeviceManagerModel(const DeviceManager *deviceManager, QObject *parent = 0); + explicit DeviceManagerModel(const DeviceManager *deviceManager, QObject *parent = nullptr); ~DeviceManagerModel() override; void setFilter(const QList &filter); diff --git a/src/plugins/projectexplorer/devicesupport/deviceprocesslist.h b/src/plugins/projectexplorer/devicesupport/deviceprocesslist.h index 6e965b04500..18fa97337d2 100644 --- a/src/plugins/projectexplorer/devicesupport/deviceprocesslist.h +++ b/src/plugins/projectexplorer/devicesupport/deviceprocesslist.h @@ -39,10 +39,9 @@ namespace Internal { class DeviceProcessListPrivate; } class PROJECTEXPLORER_EXPORT DeviceProcessItem { public: - DeviceProcessItem() : pid(0) {} bool operator<(const DeviceProcessItem &other) const; - int pid; + int pid = 0; QString cmdLine; QString exe; }; diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingspage.h b/src/plugins/projectexplorer/devicesupport/devicesettingspage.h index 2712e51c324..d652ad3c503 100644 --- a/src/plugins/projectexplorer/devicesupport/devicesettingspage.h +++ b/src/plugins/projectexplorer/devicesupport/devicesettingspage.h @@ -39,7 +39,7 @@ class DeviceSettingsPage : public Core::IOptionsPage Q_OBJECT public: - DeviceSettingsPage(QObject *parent = 0); + DeviceSettingsPage(QObject *parent = nullptr); QWidget *widget() override; void apply() override; diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h index 774306bbbbb..28662bd4153 100644 --- a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h +++ b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h @@ -49,7 +49,7 @@ class DeviceSettingsWidget : public QWidget { Q_OBJECT public: - DeviceSettingsWidget(QWidget *parent = 0); + DeviceSettingsWidget(QWidget *parent = nullptr); ~DeviceSettingsWidget() override; void saveSettings(); diff --git a/src/plugins/projectexplorer/devicesupport/idevice.h b/src/plugins/projectexplorer/devicesupport/idevice.h index d917fc18636..4d3a2f83024 100644 --- a/src/plugins/projectexplorer/devicesupport/idevice.h +++ b/src/plugins/projectexplorer/devicesupport/idevice.h @@ -72,7 +72,7 @@ class PROJECTEXPLORER_EXPORT DeviceProcessSignalOperation : public QObject { Q_OBJECT public: - typedef QSharedPointer Ptr; + using Ptr = QSharedPointer; virtual void killProcess(qint64 pid) = 0; virtual void killProcess(const QString &filePath) = 0; @@ -96,7 +96,7 @@ class PROJECTEXPLORER_EXPORT DeviceEnvironmentFetcher : public QObject { Q_OBJECT public: - typedef QSharedPointer Ptr; + using Ptr = QSharedPointer; virtual void start() = 0; @@ -110,7 +110,7 @@ protected: class PROJECTEXPLORER_EXPORT PortsGatheringMethod { public: - typedef QSharedPointer Ptr; + using Ptr = QSharedPointer; virtual ~PortsGatheringMethod() = default; virtual Runnable runnable(QAbstractSocket::NetworkLayerProtocol protocol) const = 0; @@ -121,12 +121,13 @@ public: class PROJECTEXPLORER_EXPORT IDevice : public QEnableSharedFromThis { public: - typedef QSharedPointer Ptr; - typedef QSharedPointer ConstPtr; + using Ptr = QSharedPointer; + using ConstPtr = QSharedPointer; enum Origin { ManuallyAdded, AutoDetected }; enum MachineType { Hardware, Emulator }; + IDevice &operator=(const IDevice &) = delete; virtual ~IDevice(); QString displayName() const; @@ -141,7 +142,7 @@ public: QString key; QString value; }; - typedef QList DeviceInfo; + using DeviceInfo = QList; virtual DeviceInfo deviceInformation() const; Core::Id type() const; @@ -211,8 +212,6 @@ protected: IDevice(const IDevice &other); private: - IDevice &operator=(const IDevice &) = delete; - int version() const; const std::unique_ptr d; diff --git a/src/plugins/projectexplorer/devicesupport/localprocesslist.h b/src/plugins/projectexplorer/devicesupport/localprocesslist.h index d6e90e298cc..599f20ed3e6 100644 --- a/src/plugins/projectexplorer/devicesupport/localprocesslist.h +++ b/src/plugins/projectexplorer/devicesupport/localprocesslist.h @@ -35,7 +35,7 @@ class LocalProcessList : public DeviceProcessList Q_OBJECT public: - explicit LocalProcessList(const IDevice::ConstPtr &device, QObject *parent = 0); + explicit LocalProcessList(const IDevice::ConstPtr &device, QObject *parent = nullptr); Qt::ItemFlags flags(const QModelIndex &index) const override; static QList getLocalProcesses(); diff --git a/src/plugins/projectexplorer/foldernavigationwidget.h b/src/plugins/projectexplorer/foldernavigationwidget.h index 5c8a2e24f6a..b741de7cfe3 100644 --- a/src/plugins/projectexplorer/foldernavigationwidget.h +++ b/src/plugins/projectexplorer/foldernavigationwidget.h @@ -94,7 +94,7 @@ class FolderNavigationWidget : public QWidget Q_PROPERTY(bool autoSynchronization READ autoSynchronization WRITE setAutoSynchronization) public: explicit FolderNavigationWidget(QWidget *parent = nullptr); - ~FolderNavigationWidget(); + ~FolderNavigationWidget() override; static QStringList projectFilesInDirectory(const QString &path); diff --git a/src/plugins/projectexplorer/journaldwatcher.h b/src/plugins/projectexplorer/journaldwatcher.h index d556ef65532..5fa635de534 100644 --- a/src/plugins/projectexplorer/journaldwatcher.h +++ b/src/plugins/projectexplorer/journaldwatcher.h @@ -40,8 +40,8 @@ class JournaldWatcher : public QObject Q_OBJECT public: - typedef QMap LogEntry; - typedef std::function Subscription; + using LogEntry = QMap; + using Subscription = std::function; ~JournaldWatcher() override; diff --git a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.h b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.h index e1ddc7b5598..487dbd1a64a 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.h +++ b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.h @@ -110,10 +110,10 @@ public: const std::unique_ptr d; }; - JsonFieldPage(Utils::MacroExpander *expander, QWidget *parent = 0); + JsonFieldPage(Utils::MacroExpander *expander, QWidget *parent = nullptr); ~JsonFieldPage() override; - typedef std::function FieldFactory; + using FieldFactory = std::function; static void registerFieldFactory(const QString &id, const FieldFactory &ff); bool setup(const QVariant &data); diff --git a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage_p.h b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage_p.h index 874ca8735d8..44ab872802b 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage_p.h +++ b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage_p.h @@ -189,7 +189,7 @@ public: IconStringRole = Qt::UserRole + 2 }; ListField(); - virtual ~ListField() override; + ~ListField() override; protected: bool parseData(const QVariant &data, QString *errorMessage) override; diff --git a/src/plugins/projectexplorer/jsonwizard/jsonkitspage.h b/src/plugins/projectexplorer/jsonwizard/jsonkitspage.h index 35077a2405a..a81aa6871d4 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonkitspage.h +++ b/src/plugins/projectexplorer/jsonwizard/jsonkitspage.h @@ -59,7 +59,7 @@ public: QVariant condition; }; static QVector parseFeatures(const QVariant &data, - QString *errorMessage = 0); + QString *errorMessage = nullptr); private: void setupProjectFiles(const JsonWizard::GeneratorFiles &files); diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizard.h b/src/plugins/projectexplorer/jsonwizard/jsonwizard.h index 89da4845147..1f8aca77414 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizard.h +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizard.h @@ -47,7 +47,7 @@ class PROJECTEXPLORER_EXPORT JsonWizard : public Utils::Wizard public: class GeneratorFile { public: - GeneratorFile() : generator(nullptr) { } + GeneratorFile() = default; GeneratorFile(const Core::GeneratedFile &f, JsonWizardGenerator *g) : file(f), generator(g) { } @@ -55,9 +55,9 @@ public: bool isValid() const { return generator; } Core::GeneratedFile file; - JsonWizardGenerator *generator; + JsonWizardGenerator *generator = nullptr; }; - typedef QList GeneratorFiles; + using GeneratorFiles = QList; Q_PROPERTY(GeneratorFiles generateFileList READ generateFileList) explicit JsonWizard(QWidget *parent = nullptr); diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.h b/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.h index 04997198c8f..28311711e82 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.h +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.h @@ -41,7 +41,7 @@ namespace ProjectExplorer { class JsonWizardGenerator { public: - virtual ~JsonWizardGenerator() { } + virtual ~JsonWizardGenerator() = default; virtual Core::GeneratedFiles fileList(Utils::MacroExpander *expander, const QString &baseDir, const QString &projectDir, diff --git a/src/plugins/projectexplorer/kitmanager.cpp b/src/plugins/projectexplorer/kitmanager.cpp index 090b34765f0..499f1f19b45 100644 --- a/src/plugins/projectexplorer/kitmanager.cpp +++ b/src/plugins/projectexplorer/kitmanager.cpp @@ -270,7 +270,7 @@ QSet KitManager::availableFeatures(Core::Id platformId) return features; } -QList KitManager::sortKits(const QList kits) +QList KitManager::sortKits(const QList &kits) { // This method was added to delay the sorting of kits as long as possible. // Since the displayName can contain variables it can be costly (e.g. involve diff --git a/src/plugins/projectexplorer/kitmanager.h b/src/plugins/projectexplorer/kitmanager.h index a576a1d3603..189dc1c2169 100644 --- a/src/plugins/projectexplorer/kitmanager.h +++ b/src/plugins/projectexplorer/kitmanager.h @@ -66,8 +66,8 @@ class PROJECTEXPLORER_EXPORT KitInformation : public QObject Q_OBJECT public: - typedef QPair Item; - typedef QList ItemList; + using Item = QPair; + using ItemList = QList; Core::Id id() const { return m_id; } int priority() const { return m_priority; } @@ -136,7 +136,7 @@ public: static QSet supportedPlatforms(); static QSet availableFeatures(Core::Id platformId); - static QList sortKits(const QList kits); // Avoid sorting whenever possible! + static QList sortKits(const QList &kits); // Avoid sorting whenever possible! static void saveKits(); @@ -167,7 +167,6 @@ private: class KitList { public: - KitList() {} Core::Id defaultKit; std::vector> kits; }; diff --git a/src/plugins/projectexplorer/localenvironmentaspect.h b/src/plugins/projectexplorer/localenvironmentaspect.h index d8424b41ea2..967a985e8f4 100644 --- a/src/plugins/projectexplorer/localenvironmentaspect.h +++ b/src/plugins/projectexplorer/localenvironmentaspect.h @@ -34,7 +34,7 @@ class PROJECTEXPLORER_EXPORT LocalEnvironmentAspect : public EnvironmentAspect Q_OBJECT public: - typedef std::function BaseEnvironmentModifier; + using BaseEnvironmentModifier = std::function; LocalEnvironmentAspect(Target *parent, const BaseEnvironmentModifier &modifier); Utils::Environment baseEnvironment() const override; diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp index d2ccce72dcf..ff4a8cd72f5 100644 --- a/src/plugins/projectexplorer/msvctoolchain.cpp +++ b/src/plugins/projectexplorer/msvctoolchain.cpp @@ -461,7 +461,7 @@ static QByteArray msvcCompilationFile() // // [1] https://msdn.microsoft.com/en-us/library/b0084kay.aspx // [2] http://stackoverflow.com/questions/3665537/how-to-find-out-cl-exes-built-in-macros -Macros MsvcToolChain::msvcPredefinedMacros(const QStringList cxxflags, +Macros MsvcToolChain::msvcPredefinedMacros(const QStringList &cxxflags, const Utils::Environment &env) const { Macros predefinedMacros; @@ -1384,7 +1384,7 @@ bool ClangClToolChain::operator ==(const ToolChain &other) const return m_clangPath == clangClTc->m_clangPath; } -Macros ClangClToolChain::msvcPredefinedMacros(const QStringList cxxflags, +Macros ClangClToolChain::msvcPredefinedMacros(const QStringList &cxxflags, const Utils::Environment &env) const { if (!cxxflags.contains("--driver-mode=g++")) @@ -1497,9 +1497,7 @@ static void detectCppBuildTools2015(QList *list) + QLatin1Char('/') + name + QStringLiteral("/vcbuildtools.bat"); if (!QFileInfo(vcVarsBat).isFile()) return; - const size_t count = sizeof(entries) / sizeof(entries[0]); - for (size_t i = 0; i < count; ++i) { - const Entry &e = entries[i]; + for (const Entry &e : entries) { const Abi abi(e.architecture, Abi::WindowsOS, Abi::WindowsMsvc2015Flavor, e.format, e.wordSize); for (auto language: {Constants::C_LANGUAGE_ID, Constants::CXX_LANGUAGE_ID}) { diff --git a/src/plugins/projectexplorer/msvctoolchain.h b/src/plugins/projectexplorer/msvctoolchain.h index 3b4f5bde5c6..c2d6dbfb11f 100644 --- a/src/plugins/projectexplorer/msvctoolchain.h +++ b/src/plugins/projectexplorer/msvctoolchain.h @@ -67,7 +67,7 @@ public: Core::Id l, Detection d = ManualDetection); MsvcToolChain(const MsvcToolChain &other); MsvcToolChain(); - ~MsvcToolChain(); + ~MsvcToolChain() override; Abi targetAbi() const override; @@ -137,7 +137,7 @@ protected: Utils::Environment readEnvironmentSetting(const Utils::Environment& env) const; // Function must be thread-safe! - virtual Macros msvcPredefinedMacros(const QStringList cxxflags, + virtual Macros msvcPredefinedMacros(const QStringList &cxxflags, const Utils::Environment &env) const; virtual LanguageVersion msvcLanguageVersion(const QStringList &cxxflags, const Core::Id &language, @@ -198,7 +198,7 @@ public: void setClangPath(const QString &path) { m_clangPath = path; } void resetMsvcToolChain(const MsvcToolChain *base = nullptr); - Macros msvcPredefinedMacros(const QStringList cxxflags, + Macros msvcPredefinedMacros(const QStringList &cxxflags, const Utils::Environment &env) const override; LanguageVersion msvcLanguageVersion(const QStringList &cxxflags, const Core::Id &language, diff --git a/src/plugins/projectexplorer/projectconfiguration.h b/src/plugins/projectexplorer/projectconfiguration.h index 37ac506028c..685661d4827 100644 --- a/src/plugins/projectexplorer/projectconfiguration.h +++ b/src/plugins/projectexplorer/projectconfiguration.h @@ -87,6 +87,8 @@ class PROJECTEXPLORER_EXPORT ProjectConfigurationAspects public: ProjectConfigurationAspects(); + ProjectConfigurationAspects(const ProjectConfigurationAspects &) = delete; + ProjectConfigurationAspects &operator=(const ProjectConfigurationAspects &) = delete; ~ProjectConfigurationAspects(); template @@ -117,9 +119,6 @@ public: private: Base &base() { return *this; } const Base &base() const { return *this; } - - ProjectConfigurationAspects(const ProjectConfigurationAspects &) = delete; - ProjectConfigurationAspects &operator=(const ProjectConfigurationAspects &) = delete; }; class PROJECTEXPLORER_EXPORT ProjectConfiguration : public QObject diff --git a/src/plugins/projectexplorer/projecttreewidget.h b/src/plugins/projectexplorer/projecttreewidget.h index 8e7df10adf8..ab9dd7a3b7d 100644 --- a/src/plugins/projectexplorer/projecttreewidget.h +++ b/src/plugins/projectexplorer/projecttreewidget.h @@ -104,9 +104,9 @@ class ProjectTreeWidgetFactory : public Core::INavigationWidgetFactory public: ProjectTreeWidgetFactory(); - Core::NavigationView createWidget(); - void restoreSettings(QSettings *settings, int position, QWidget *widget); - void saveSettings(QSettings *settings, int position, QWidget *widget); + Core::NavigationView createWidget() override; + void restoreSettings(QSettings *settings, int position, QWidget *widget) override; + void saveSettings(QSettings *settings, int position, QWidget *widget) override; }; } // namespace Internal diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp index d5ec08471f7..aeaf2452802 100644 --- a/src/plugins/projectexplorer/runconfiguration.cpp +++ b/src/plugins/projectexplorer/runconfiguration.cpp @@ -429,7 +429,7 @@ RunConfigurationFactory::~RunConfigurationFactory() m_ownedRunWorkerFactories.clear(); } -QString RunConfigurationFactory::decoratedTargetName(const QString targetName, Target *target) +QString RunConfigurationFactory::decoratedTargetName(const QString &targetName, Target *target) { QString displayName; if (!targetName.isEmpty()) diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h index 2c82ba97b68..c454f7e0ade 100644 --- a/src/plugins/projectexplorer/runconfiguration.h +++ b/src/plugins/projectexplorer/runconfiguration.h @@ -242,6 +242,8 @@ class PROJECTEXPLORER_EXPORT RunConfigurationFactory { public: RunConfigurationFactory(); + RunConfigurationFactory(const RunConfigurationFactory &) = delete; + RunConfigurationFactory operator=(const RunConfigurationFactory &) = delete; virtual ~RunConfigurationFactory(); static RunConfiguration *restore(Target *parent, const QVariantMap &map); @@ -250,7 +252,7 @@ public: Core::Id runConfigurationBaseId() const { return m_runConfigBaseId; } - static QString decoratedTargetName(const QString targetName, Target *kit); + static QString decoratedTargetName(const QString &targetName, Target *kit); protected: virtual QList availableCreators(Target *parent) const; @@ -283,9 +285,6 @@ private: RunWorkerFactory *addRunWorkerFactoryHelper (Core::Id runMode, const std::function &creator); - RunConfigurationFactory(const RunConfigurationFactory &) = delete; - RunConfigurationFactory operator=(const RunConfigurationFactory &) = delete; - bool canHandle(Target *target) const; friend class RunConfigurationCreationInfo; diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.h b/src/plugins/projectexplorer/runsettingspropertiespage.h index 6442fb14411..428f7459885 100644 --- a/src/plugins/projectexplorer/runsettingspropertiespage.h +++ b/src/plugins/projectexplorer/runsettingspropertiespage.h @@ -94,7 +94,7 @@ private: QMenu *m_addRunMenu; QMenu *m_addDeployMenu; bool m_ignoreChange = false; - typedef QPair RunConfigItem; + using RunConfigItem = QPair; QList m_subWidgets; QGridLayout *m_gridLayout;