ProjectExplorer: Modernize

modernize-*

Change-Id: I01b9b3d73a2dc2a5c858cf316a1fbff7a4113600
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

5 files changed, 8 insertions, 8 deletions

diff --git a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.h b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.h
index e1ddc7b559..487dbd1a64 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.h
+++ b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.h
@@ -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);
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage_p.h b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage_p.h
index 874ca8735d..44ab872802 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 35077a2405..a81aa6871d 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonkitspage.h
+++ b/src/plugins/projectexplorer/jsonwizard/jsonkitspage.h
@@ -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);
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizard.h b/src/plugins/projectexplorer/jsonwizard/jsonwizard.h
index 89da484514..1f8aca7741 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<GeneratorFile> GeneratorFiles;
+    using GeneratorFiles = QList<GeneratorFile>;
     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 04997198c8..28311711e8 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,