feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Modernize

Browse Source 
modernize-*

Change-Id: I01b9b3d73a2dc2a5c858cf316a1fbff7a4113600
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Alessandro Portale
2018-11-15 10:32:56 +01:00
committed by Orgad Shaneh
parent 859dce092b
commit 667ad61710
34 changed files with 65 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/projectexplorer/abstractprocessstep.h
View File

@@ -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);

5
src/plugins/projectexplorer/buildstep.h
View File

@@ -132,6 +132,8 @@ class PROJECTEXPLORER_EXPORT BuildStepFactory
{
public:
BuildStepFactory();
BuildStepFactory(const BuildStepFactory &) = delete;
BuildStepFactory &operator=(const BuildStepFactory &) = delete;
virtual ~BuildStepFactory();
static const QList<BuildStepFactory *> 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<BuildStep *(BuildStepList *)>;
template <class BuildStepType>

6
src/plugins/projectexplorer/customwizard/customwizard.h
View File

@@ -82,7 +82,7 @@ class PROJECTEXPLORER_EXPORT CustomWizard : public Core::BaseFileWizardFactory
Q_OBJECT
public:
typedef QMap<QString, QString> FieldReplacementMap;
using FieldReplacementMap = QMap<QString, QString>;
CustomWizard();
~CustomWizard() override;
@@ -101,8 +101,8 @@ public:
static int verbose();
protected:
typedef QSharedPointer<Internal::CustomWizardParameters> CustomWizardParametersPtr;
typedef QSharedPointer<Internal::CustomWizardContext> CustomWizardContextPtr;
using CustomWizardParametersPtr = QSharedPointer<Internal::CustomWizardParameters>;
using CustomWizardContextPtr = QSharedPointer<Internal::CustomWizardContext>;
// generate files in path
Core::GeneratedFiles generateWizardFiles(QString *errorMessage) const;

8
src/plugins/projectexplorer/customwizard/customwizardpage.h
View File

@@ -50,7 +50,7 @@ class CustomWizardContext;
class CustomWizardFieldPage : public QWizardPage {
Q_OBJECT
public:
typedef QList<CustomWizardField> FieldList;
using FieldList = QList<CustomWizardField>;
explicit CustomWizardFieldPage(const QSharedPointer<CustomWizardContext> &ctx,
const QSharedPointer<CustomWizardParameters> &parameters,
@@ -92,9 +92,9 @@ private:
QString userChange;
};
typedef QList<LineEditData> LineEditDataList;
typedef QList<TextEditData> TextEditDataList;
typedef QList<PathChooserData> PathChooserDataList;
using LineEditDataList = QList<LineEditData>;
using TextEditDataList = QList<TextEditData>;
using PathChooserDataList = QList<PathChooserData>;
QWidget *registerLineEdit(const QString &fieldName, const CustomWizardField &field);
QWidget *registerComboBox(const QString &fieldName, const CustomWizardField &field);

8
src/plugins/projectexplorer/customwizard/customwizardparameters.h
View File

@@ -45,7 +45,7 @@ namespace Internal {
class CustomWizardField {
public:
// Parameters of the widget control are stored as map
typedef QMap<QString, QString> ControlAttributeMap;
using ControlAttributeMap = QMap<QString, QString>;
CustomWizardField();
void clear();
@@ -136,9 +136,9 @@ public:
// Documentation inside.
class CustomWizardContext {
public:
typedef QMap<QString, QString> FieldReplacementMap;
typedef QSharedPointer<Utils::TemporaryFile> TemporaryFilePtr;
typedef QList<TemporaryFilePtr> TemporaryFilePtrList;
using FieldReplacementMap = QMap<QString, QString>;
using TemporaryFilePtr = QSharedPointer<Utils::TemporaryFile>;
using TemporaryFilePtrList = QList<TemporaryFilePtr>;
void reset();

2
src/plugins/projectexplorer/dependenciespanel.h
View File

@@ -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;

5
src/plugins/projectexplorer/deployconfiguration.h
View File

@@ -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;

2
src/plugins/projectexplorer/devicesupport/desktopdevice.h
View File

@@ -44,7 +44,7 @@ public:
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;
void executeAction(Core::Id actionId, QWidget *parent = nullptr) override;
bool canAutoDetectPorts() const override;
bool canCreateProcessModel() const override;
DeviceProcessList *createProcessListModel(QObject *parent) const override;

2
src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.h
View File

@@ -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;

2
src/plugins/projectexplorer/devicesupport/desktopdeviceprocess.h
View File

@@ -35,7 +35,7 @@ class DesktopDeviceProcess : public DeviceProcess
Q_OBJECT
public:
DesktopDeviceProcess(const QSharedPointer<const IDevice> &device, QObject *parent = 0);
DesktopDeviceProcess(const QSharedPointer<const IDevice> &device, QObject *parent = nullptr);
void start(const Runnable &runnable) override;
void interrupt() override;

2
src/plugins/projectexplorer/devicesupport/devicefactoryselectiondialog.h
View File

@@ -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;

2
src/plugins/projectexplorer/devicesupport/devicemanagermodel.h
View File

@@ -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<Core::Id> &filter);

3
src/plugins/projectexplorer/devicesupport/deviceprocesslist.h
View File

@@ -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;
};

2
src/plugins/projectexplorer/devicesupport/devicesettingspage.h
View File

@@ -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;

2
src/plugins/projectexplorer/devicesupport/devicesettingswidget.h
View File

@@ -49,7 +49,7 @@ class DeviceSettingsWidget : public QWidget
{
Q_OBJECT
public:
DeviceSettingsWidget(QWidget *parent = 0);
DeviceSettingsWidget(QWidget *parent = nullptr);
~DeviceSettingsWidget() override;
void saveSettings();

15
src/plugins/projectexplorer/devicesupport/idevice.h
View File

@@ -72,7 +72,7 @@ class PROJECTEXPLORER_EXPORT DeviceProcessSignalOperation : public QObject
{
Q_OBJECT
public:
typedef QSharedPointer<DeviceProcessSignalOperation> Ptr;
using Ptr = QSharedPointer<DeviceProcessSignalOperation>;
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<DeviceEnvironmentFetcher> Ptr;
using Ptr = QSharedPointer<DeviceEnvironmentFetcher>;
virtual void start() = 0;
@@ -110,7 +110,7 @@ protected:
class PROJECTEXPLORER_EXPORT PortsGatheringMethod
{
public:
typedef QSharedPointer<const PortsGatheringMethod> Ptr;
using Ptr = QSharedPointer<const PortsGatheringMethod>;
virtual ~PortsGatheringMethod() = default;
virtual Runnable runnable(QAbstractSocket::NetworkLayerProtocol protocol) const = 0;
@@ -121,12 +121,13 @@ public:
class PROJECTEXPLORER_EXPORT IDevice : public QEnableSharedFromThis<IDevice>
{
public:
typedef QSharedPointer<IDevice> Ptr;
typedef QSharedPointer<const IDevice> ConstPtr;
using Ptr = QSharedPointer<IDevice>;
using ConstPtr = QSharedPointer<const IDevice>;
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<DeviceInfoItem> DeviceInfo;
using DeviceInfo = QList<DeviceInfoItem>;
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<Internal::IDevicePrivate> d;

2
src/plugins/projectexplorer/devicesupport/localprocesslist.h
View File

@@ -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<DeviceProcessItem> getLocalProcesses();

2
src/plugins/projectexplorer/foldernavigationwidget.h
View File

@@ -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);

4
src/plugins/projectexplorer/journaldwatcher.h
View File

@@ -40,8 +40,8 @@ class JournaldWatcher : public QObject
Q_OBJECT
public:
typedef QMap<QByteArray, QByteArray> LogEntry;
typedef std::function<void(const LogEntry&)> Subscription;
using LogEntry = QMap<QByteArray, QByteArray>;
using Subscription = std::function<void(const LogEntry&)>;
~JournaldWatcher() override;

4
src/plugins/projectexplorer/jsonwizard/jsonfieldpage.h
View File

@@ -110,10 +110,10 @@ public:
const std::unique_ptr<FieldPrivate> d;
};
JsonFieldPage(Utils::MacroExpander *expander, QWidget *parent = 0);
JsonFieldPage(Utils::MacroExpander *expander, QWidget *parent = nullptr);
~JsonFieldPage() override;
typedef std::function<Field *()> FieldFactory;
using FieldFactory = std::function<Field *()>;
static void registerFieldFactory(const QString &id, const FieldFactory &ff);
bool setup(const QVariant &data);

2
src/plugins/projectexplorer/jsonwizard/jsonfieldpage_p.h
View File

@@ -189,7 +189,7 @@ public:
IconStringRole = Qt::UserRole + 2
};
ListField();
virtual ~ListField() override;
~ListField() override;
protected:
bool parseData(const QVariant &data, QString *errorMessage) override;

2
src/plugins/projectexplorer/jsonwizard/jsonkitspage.h
View File

@@ -59,7 +59,7 @@ public:
QVariant condition;
};
static QVector<ConditionalFeature> parseFeatures(const QVariant &data,
QString *errorMessage = 0);
QString *errorMessage = nullptr);
private:
void setupProjectFiles(const JsonWizard::GeneratorFiles &files);

6
src/plugins/projectexplorer/jsonwizard/jsonwizard.h
View File

@@ -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<GeneratorFile> GeneratorFiles;
using GeneratorFiles = QList<GeneratorFile>;
Q_PROPERTY(GeneratorFiles generateFileList READ generateFileList)
explicit JsonWizard(QWidget *parent = nullptr);

2
src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.h
View File

@@ -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,

2
src/plugins/projectexplorer/kitmanager.cpp
View File

@@ -270,7 +270,7 @@ QSet<Id> KitManager::availableFeatures(Core::Id platformId)
return features;
}
QList<Kit *> KitManager::sortKits(const QList<Kit *> kits)
QList<Kit *> KitManager::sortKits(const QList<Kit *> &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

7
src/plugins/projectexplorer/kitmanager.h
View File

@@ -66,8 +66,8 @@ class PROJECTEXPLORER_EXPORT KitInformation : public QObject
Q_OBJECT
public:
typedef QPair<QString, QString> Item;
typedef QList<Item> ItemList;
using Item = QPair<QString, QString>;
using ItemList = QList<Item>;
Core::Id id() const { return m_id; }
int priority() const { return m_priority; }
@@ -136,7 +136,7 @@ public:
static QSet<Core::Id> supportedPlatforms();
static QSet<Core::Id> availableFeatures(Core::Id platformId);
static QList<Kit *> sortKits(const QList<Kit *> kits); // Avoid sorting whenever possible!
static QList<Kit *> sortKits(const QList<Kit *> &kits); // Avoid sorting whenever possible!
static void saveKits();
@@ -167,7 +167,6 @@ private:
class KitList
{
public:
KitList() {}
Core::Id defaultKit;
std::vector<std::unique_ptr<Kit>> kits;
};

2
src/plugins/projectexplorer/localenvironmentaspect.h
View File

@@ -34,7 +34,7 @@ class PROJECTEXPLORER_EXPORT LocalEnvironmentAspect : public EnvironmentAspect
Q_OBJECT
public:
typedef std::function<void(Utils::Environment &)> BaseEnvironmentModifier;
using BaseEnvironmentModifier = std::function<void(Utils::Environment &)>;
LocalEnvironmentAspect(Target *parent, const BaseEnvironmentModifier &modifier);
Utils::Environment baseEnvironment() const override;

8
src/plugins/projectexplorer/msvctoolchain.cpp
View File

@@ -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<ToolChain *> *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}) {

6
src/plugins/projectexplorer/msvctoolchain.h
View File

@@ -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,

5
src/plugins/projectexplorer/projectconfiguration.h
View File

@@ -87,6 +87,8 @@ class PROJECTEXPLORER_EXPORT ProjectConfigurationAspects
public:
ProjectConfigurationAspects();
ProjectConfigurationAspects(const ProjectConfigurationAspects &) = delete;
ProjectConfigurationAspects &operator=(const ProjectConfigurationAspects &) = delete;
~ProjectConfigurationAspects();
template <class Aspect, typename ...Args>
@@ -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

6
src/plugins/projectexplorer/projecttreewidget.h
View File

@@ -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

2
src/plugins/projectexplorer/runconfiguration.cpp
View File

@@ -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())

7
src/plugins/projectexplorer/runconfiguration.h
View File

@@ -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<RunConfigurationCreationInfo> availableCreators(Target *parent) const;
@@ -283,9 +285,6 @@ private:
RunWorkerFactory *addRunWorkerFactoryHelper
(Core::Id runMode, const std::function<RunWorker *(RunControl *)> &creator);
RunConfigurationFactory(const RunConfigurationFactory &) = delete;
RunConfigurationFactory operator=(const RunConfigurationFactory &) = delete;
bool canHandle(Target *target) const;
friend class RunConfigurationCreationInfo;

2
src/plugins/projectexplorer/runsettingspropertiespage.h
View File

@@ -94,7 +94,7 @@ private:
QMenu *m_addRunMenu;
QMenu *m_addDeployMenu;
bool m_ignoreChange = false;
typedef QPair<QWidget *, QLabel *> RunConfigItem;
using RunConfigItem = QPair<QWidget *, QLabel *>;
QList<RunConfigItem> m_subWidgets;
QGridLayout *m_gridLayout;