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

QmakeProjectManager: Modernize more

Browse Source 
Some files (mostly headers) were missing modernization for:

modernize-use-nullptr
modernize-use-override
modernize-use-using
modernize-use-default-member-init

Change-Id: I7027efac7daa3645af21ac25c0301105945e04da
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Alessandro Portale
2018-07-23 00:39:48 +02:00
parent e38410b76c
commit d814dbce6a
12 changed files with 42 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qmakeprojectmanager/addlibrarywizard.h
View File

@@ -76,8 +76,8 @@ public:
Q_DECLARE_FLAGS(Platforms, Platform) Q_DECLARE_FLAGS(Platforms, Platform)
explicit AddLibraryWizard(const QString &fileName, QWidget *parent = 0); explicit AddLibraryWizard(const QString &fileName, QWidget *parent = nullptr);
~AddLibraryWizard(); ~AddLibraryWizard() override;
LibraryKind libraryKind() const; LibraryKind libraryKind() const;
QString proFile() const; QString proFile() const;
@@ -113,8 +113,8 @@ class DetailsPage : public QWizardPage
Q_OBJECT Q_OBJECT
public: public:
DetailsPage(AddLibraryWizard *parent); DetailsPage(AddLibraryWizard *parent);
virtual void initializePage(); void initializePage() override;
virtual bool isComplete() const; bool isComplete() const override;
QString snippet() const; QString snippet() const;
private: private:
@@ -128,7 +128,7 @@ class SummaryPage : public QWizardPage
Q_OBJECT Q_OBJECT
public: public:
SummaryPage(AddLibraryWizard *parent); SummaryPage(AddLibraryWizard *parent);
virtual void initializePage(); void initializePage() override;
QString snippet() const; QString snippet() const;
private: private:
AddLibraryWizard *m_libraryWizard = nullptr; AddLibraryWizard *m_libraryWizard = nullptr;

2
src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.h
View File

@@ -56,7 +56,7 @@ public:
QString *errorMessage); QString *errorMessage);
private: private:
typedef QMap<QString,QString> SubstitutionMap; using SubstitutionMap = QMap<QString, QString>;
static QString processTemplate(const QString &tmpl, const SubstitutionMap &substMap, QString *errorMessage); static QString processTemplate(const QString &tmpl, const SubstitutionMap &substMap, QString *errorMessage);
static QString cStringQuote(QString s); static QString cStringQuote(QString s);
}; };

2
src/plugins/qmakeprojectmanager/externaleditors.h
View File

@@ -110,7 +110,7 @@ private:
void processTerminated(const QString &binary); void processTerminated(const QString &binary);
// A per-binary entry containing the socket // A per-binary entry containing the socket
typedef QMap<QString, QTcpSocket*> ProcessCache; using ProcessCache = QMap<QString, QTcpSocket*>;
ProcessCache m_processCache; ProcessCache m_processCache;
}; };

44
src/plugins/qmakeprojectmanager/librarydetailscontroller.h
View File

@@ -39,7 +39,7 @@ class LibraryDetailsController : public QObject
public: public:
explicit LibraryDetailsController(Ui::LibraryDetailsWidget *libraryDetails, explicit LibraryDetailsController(Ui::LibraryDetailsWidget *libraryDetails,
const QString &proFile, const QString &proFile,
QObject *parent = 0); QObject *parent = nullptr);
virtual bool isComplete() const = 0; virtual bool isComplete() const = 0;
virtual QString snippet() const = 0; virtual QString snippet() const = 0;
@@ -116,14 +116,14 @@ class NonInternalLibraryDetailsController : public LibraryDetailsController
public: public:
explicit NonInternalLibraryDetailsController(Ui::LibraryDetailsWidget *libraryDetails, explicit NonInternalLibraryDetailsController(Ui::LibraryDetailsWidget *libraryDetails,
const QString &proFile, const QString &proFile,
QObject *parent = 0); QObject *parent = nullptr);
virtual bool isComplete() const; bool isComplete() const override;
virtual QString snippet() const; QString snippet() const override;
protected: protected:
virtual AddLibraryWizard::LinkageType suggestedLinkageType() const; AddLibraryWizard::LinkageType suggestedLinkageType() const override;
virtual AddLibraryWizard::MacLibraryType suggestedMacLibraryType() const; AddLibraryWizard::MacLibraryType suggestedMacLibraryType() const override;
virtual QString suggestedIncludePath() const; QString suggestedIncludePath() const override;
virtual void updateWindowsOptionsEnablement(); void updateWindowsOptionsEnablement() override;
private: private:
void slotLinkageTypeChanged(); void slotLinkageTypeChanged();
void slotRemoveSuffixChanged(bool ena); void slotRemoveSuffixChanged(bool ena);
@@ -135,10 +135,10 @@ class PackageLibraryDetailsController : public NonInternalLibraryDetailsControll
Q_OBJECT Q_OBJECT
public: public:
explicit PackageLibraryDetailsController(Ui::LibraryDetailsWidget *libraryDetails, explicit PackageLibraryDetailsController(Ui::LibraryDetailsWidget *libraryDetails,
const QString &proFile, const QString &proFile,
QObject *parent = 0); QObject *parent = nullptr);
virtual bool isComplete() const; bool isComplete() const override;
virtual QString snippet() const; QString snippet() const override;
private: private:
bool isLinkPackageGenerated() const; bool isLinkPackageGenerated() const;
}; };
@@ -149,7 +149,7 @@ class SystemLibraryDetailsController : public NonInternalLibraryDetailsControlle
public: public:
explicit SystemLibraryDetailsController(Ui::LibraryDetailsWidget *libraryDetails, explicit SystemLibraryDetailsController(Ui::LibraryDetailsWidget *libraryDetails,
const QString &proFile, const QString &proFile,
QObject *parent = 0); QObject *parent = nullptr);
}; };
class ExternalLibraryDetailsController : public NonInternalLibraryDetailsController class ExternalLibraryDetailsController : public NonInternalLibraryDetailsController
@@ -158,9 +158,9 @@ class ExternalLibraryDetailsController : public NonInternalLibraryDetailsControl
public: public:
explicit ExternalLibraryDetailsController(Ui::LibraryDetailsWidget *libraryDetails, explicit ExternalLibraryDetailsController(Ui::LibraryDetailsWidget *libraryDetails,
const QString &proFile, const QString &proFile,
QObject *parent = 0); QObject *parent = nullptr);
protected: protected:
virtual void updateWindowsOptionsEnablement(); void updateWindowsOptionsEnablement() override;
}; };
class InternalLibraryDetailsController : public LibraryDetailsController class InternalLibraryDetailsController : public LibraryDetailsController
@@ -169,14 +169,14 @@ class InternalLibraryDetailsController : public LibraryDetailsController
public: public:
explicit InternalLibraryDetailsController(Ui::LibraryDetailsWidget *libraryDetails, explicit InternalLibraryDetailsController(Ui::LibraryDetailsWidget *libraryDetails,
const QString &proFile, const QString &proFile,
QObject *parent = 0); QObject *parent = nullptr);
virtual bool isComplete() const; bool isComplete() const override;
virtual QString snippet() const; QString snippet() const override;
protected: protected:
virtual AddLibraryWizard::LinkageType suggestedLinkageType() const; AddLibraryWizard::LinkageType suggestedLinkageType() const override;
virtual AddLibraryWizard::MacLibraryType suggestedMacLibraryType() const; AddLibraryWizard::MacLibraryType suggestedMacLibraryType() const override;
virtual QString suggestedIncludePath() const; QString suggestedIncludePath() const override;
virtual void updateWindowsOptionsEnablement(); void updateWindowsOptionsEnablement() override;
private: private:
void slotCurrentLibraryChanged(); void slotCurrentLibraryChanged();
void updateProFile(); void updateProFile();

2
src/plugins/qmakeprojectmanager/profilehighlighter.h
View File

@@ -43,7 +43,7 @@ public:
}; };
ProFileHighlighter(); ProFileHighlighter();
void highlightBlock(const QString &text); void highlightBlock(const QString &text) override;
private: private:
const TextEditor::Keywords m_keywords; const TextEditor::Keywords m_keywords;

2
src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.h
View File

@@ -44,7 +44,7 @@ class QmakeProjectConfigWidget : public ProjectExplorer::NamedWidget
Q_OBJECT Q_OBJECT
public: public:
QmakeProjectConfigWidget(QmakeBuildConfiguration *bc); QmakeProjectConfigWidget(QmakeBuildConfiguration *bc);
~QmakeProjectConfigWidget(); ~QmakeProjectConfigWidget() override;
private: private:
// User changes in our widgets // User changes in our widgets

4
src/plugins/qmakeprojectmanager/wizards/filespage.h
View File

@@ -41,8 +41,8 @@ class FilesPage : public QWizardPage
Q_OBJECT Q_OBJECT
public: public:
explicit FilesPage(QWidget *parent = 0); explicit FilesPage(QWidget *parent = nullptr);
virtual bool isComplete() const; bool isComplete() const override;
QString className() const; QString className() const;
void setClassName(const QString &suggestedClassName); void setClassName(const QString &suggestedClassName);

4
src/plugins/qmakeprojectmanager/wizards/guiappwizard.h
View File

@@ -40,9 +40,9 @@ public:
GuiAppWizard(); GuiAppWizard();
private: private:
Core::BaseFileWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const; Core::BaseFileWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const override;
Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const; Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const override;
private: private:
static bool parametrizeTemplate(const QString &templatePath, const QString &templateName, static bool parametrizeTemplate(const QString &templatePath, const QString &templateName,

4
src/plugins/qmakeprojectmanager/wizards/librarywizard.h
View File

@@ -39,9 +39,9 @@ public:
LibraryWizard(); LibraryWizard();
protected: protected:
Core::BaseFileWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const; Core::BaseFileWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const override;
Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const; Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const override;
}; };
} // namespace Internal } // namespace Internal

2
src/plugins/qmakeprojectmanager/wizards/modulespage.h
View File

@@ -41,7 +41,7 @@ class ModulesPage : public QWizardPage
Q_OBJECT Q_OBJECT
public: public:
explicit ModulesPage(QWidget* parent = 0); explicit ModulesPage(QWidget* parent = nullptr);
QStringList selectedModulesList() const; QStringList selectedModulesList() const;
QStringList deselectedModulesList() const; QStringList deselectedModulesList() const;

5
src/plugins/qmakeprojectmanager/wizards/qtprojectparameters.cpp
View File

@@ -36,10 +36,7 @@ namespace QmakeProjectManager {
namespace Internal { namespace Internal {
// ----------- QtProjectParameters // ----------- QtProjectParameters
QtProjectParameters::QtProjectParameters() QtProjectParameters::QtProjectParameters() = default;
: type(ConsoleApp), flags(0), qtVersionSupport(SupportQt4And5)
{
}
QString QtProjectParameters::projectPath() const QString QtProjectParameters::projectPath() const
{ {

6
src/plugins/qmakeprojectmanager/wizards/qtprojectparameters.h
View File

@@ -57,9 +57,9 @@ struct QtProjectParameters {
// Shared library: name of #define indicating compilation within library // Shared library: name of #define indicating compilation within library
static QString libraryMacro(const QString &projectName); static QString libraryMacro(const QString &projectName);
Type type; Type type = ConsoleApp;
unsigned flags; unsigned flags = 0;
QtVersionSupport qtVersionSupport; QtVersionSupport qtVersionSupport = SupportQt4And5;
QString fileName; QString fileName;
QString target; QString target;
QString path; QString path;