diff options
Diffstat (limited to 'src/plugins/projectexplorer/jsonwizard')
21 files changed, 106 insertions, 119 deletions
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp index ca825246b3..b1b1c450ac 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp @@ -662,8 +662,7 @@ void PathChooserField::initializeData(MacroExpander *expander) CheckBoxField::CheckBoxField() : m_checkedValue(QLatin1String("0")), - m_uncheckedValue(QLatin1String("1")), - m_isModified(false) + m_uncheckedValue(QLatin1String("1")) { } bool CheckBoxField::parseData(const QVariant &data, QString *errorMessage) @@ -732,9 +731,6 @@ void CheckBoxField::initializeData(MacroExpander *expander) // ComboBoxFieldData: // -------------------------------------------------------------------- -ComboBoxField::ComboBoxField() : m_index(-1), m_disabledIndex(-1), m_savedIndex(-1) -{ } - struct ComboBoxItem { ComboBoxItem(const QString &k = QString(), const QString &v = QString(), const QVariant &c = true) : key(k), value(v), condition(c) diff --git a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.h b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.h index debc1e6393..62c3556996 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.h +++ b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.h @@ -107,16 +107,16 @@ public: }; JsonFieldPage(Utils::MacroExpander *expander, QWidget *parent = 0); - ~JsonFieldPage(); + ~JsonFieldPage() override; typedef std::function<Field *()> FieldFactory; static void registerFieldFactory(const QString &id, const FieldFactory &ff); bool setup(const QVariant &data); - bool isComplete() const; - void initializePage(); - void cleanupPage(); + bool isComplete() const override; + void initializePage() override; + void cleanupPage() override; QFormLayout *layout() const { return m_formLayout; } diff --git a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage_p.h b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage_p.h index 4a03d114fc..0e67fdff7f 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage_p.h +++ b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage_p.h @@ -53,7 +53,7 @@ public: QVariant m_isCompleteExpando; QString m_isCompleteExpandoMessage; - QWidget *m_widget = 0; + QWidget *m_widget = nullptr; }; // -------------------------------------------------------------------- @@ -66,8 +66,8 @@ public: LabelField(); private: - QWidget *createWidget(const QString &displayName, JsonFieldPage *page); - bool parseData(const QVariant &data, QString *errorMessage); + QWidget *createWidget(const QString &displayName, JsonFieldPage *page) override; + bool parseData(const QVariant &data, QString *errorMessage) override; bool m_wordWrap; QString m_text; @@ -78,11 +78,11 @@ class SpacerField : public JsonFieldPage::Field public: SpacerField(); - bool suppressName() const { return true; } + bool suppressName() const override { return true; } private: - bool parseData(const QVariant &data, QString *errorMessage); - QWidget *createWidget(const QString &displayName, JsonFieldPage *page); + bool parseData(const QVariant &data, QString *errorMessage) override; + QWidget *createWidget(const QString &displayName, JsonFieldPage *page) override; int m_factor; }; @@ -93,13 +93,13 @@ public: LineEditField(); private: - bool parseData(const QVariant &data, QString *errorMessage); - QWidget *createWidget(const QString &displayName, JsonFieldPage *page); + bool parseData(const QVariant &data, QString *errorMessage) override; + QWidget *createWidget(const QString &displayName, JsonFieldPage *page) override; - void setup(JsonFieldPage *page, const QString &name); + void setup(JsonFieldPage *page, const QString &name) override; - bool validate(Utils::MacroExpander *expander, QString *message); - void initializeData(Utils::MacroExpander *expander); + bool validate(Utils::MacroExpander *expander, QString *message) override; + void initializeData(Utils::MacroExpander *expander) override; bool m_isModified; bool m_isValidating; @@ -119,13 +119,13 @@ public: TextEditField(); private: - bool parseData(const QVariant &data, QString *errorMessage); - QWidget *createWidget(const QString &displayName, JsonFieldPage *page); + bool parseData(const QVariant &data, QString *errorMessage) override; + QWidget *createWidget(const QString &displayName, JsonFieldPage *page) override; - void setup(JsonFieldPage *page, const QString &name); + void setup(JsonFieldPage *page, const QString &name) override; - bool validate(Utils::MacroExpander *expander, QString *message); - void initializeData(Utils::MacroExpander *expander); + bool validate(Utils::MacroExpander *expander, QString *message) override; + void initializeData(Utils::MacroExpander *expander) override; QString m_defaultText; bool m_acceptRichText; @@ -140,15 +140,15 @@ public: PathChooserField(); private: - bool parseData(const QVariant &data, QString *errorMessage); + bool parseData(const QVariant &data, QString *errorMessage) override; - QWidget *createWidget(const QString &displayName, JsonFieldPage *page); - void setEnabled(bool e); + QWidget *createWidget(const QString &displayName, JsonFieldPage *page) override; + void setEnabled(bool e) override; - void setup(JsonFieldPage *page, const QString &name); + void setup(JsonFieldPage *page, const QString &name) override; - bool validate(Utils::MacroExpander *expander, QString *message); - void initializeData(Utils::MacroExpander *expander); + bool validate(Utils::MacroExpander *expander, QString *message) override; + void initializeData(Utils::MacroExpander *expander) override; QString m_path; QString m_basePath; @@ -163,47 +163,47 @@ class CheckBoxField : public JsonFieldPage::Field public: CheckBoxField(); - bool suppressName() const { return true; } + bool suppressName() const override { return true; } private: - bool parseData(const QVariant &data, QString *errorMessage); + bool parseData(const QVariant &data, QString *errorMessage) override; - QWidget *createWidget(const QString &displayName, JsonFieldPage *page); + QWidget *createWidget(const QString &displayName, JsonFieldPage *page) override; - void setup(JsonFieldPage *page, const QString &name); + void setup(JsonFieldPage *page, const QString &name) override; - bool validate(Utils::MacroExpander *expander, QString *message); - void initializeData(Utils::MacroExpander *expander); + bool validate(Utils::MacroExpander *expander, QString *message) override; + void initializeData(Utils::MacroExpander *expander) override; QString m_checkedValue; QString m_uncheckedValue; QVariant m_checkedExpression; - bool m_isModified; + bool m_isModified = false; }; class ComboBoxField : public JsonFieldPage::Field { public: - ComboBoxField(); + ComboBoxField() = default; private: - bool parseData(const QVariant &data, QString *errorMessage); + bool parseData(const QVariant &data, QString *errorMessage) override; - QWidget *createWidget(const QString &displayName, JsonFieldPage *page); + QWidget *createWidget(const QString &displayName, JsonFieldPage *page) override; - void setup(JsonFieldPage *page, const QString &name); + void setup(JsonFieldPage *page, const QString &name) override; - bool validate(Utils::MacroExpander *expander, QString *message); - void initializeData(Utils::MacroExpander *expander); + bool validate(Utils::MacroExpander *expander, QString *message) override; + void initializeData(Utils::MacroExpander *expander) override; QStringList m_itemList; QStringList m_itemDataList; QVariantList m_itemConditionList; - int m_index; - int m_disabledIndex; + int m_index = -1; + int m_disabledIndex = -1; - mutable int m_savedIndex; + mutable int m_savedIndex = -1; }; } // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/jsonwizard/jsonfilepage.cpp b/src/plugins/projectexplorer/jsonwizard/jsonfilepage.cpp index cbaf11d8b9..865ee82865 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonfilepage.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonfilepage.cpp @@ -32,13 +32,12 @@ namespace ProjectExplorer { -JsonFilePage::JsonFilePage(QWidget *parent) : - Utils::FileWizardPage(parent) +JsonFilePage::JsonFilePage(QWidget *parent) : Utils::FileWizardPage(parent) { } void JsonFilePage::initializePage() { - JsonWizard *wiz = qobject_cast<JsonWizard *>(wizard()); + auto wiz = qobject_cast<JsonWizard *>(wizard()); if (!wiz) return; diff --git a/src/plugins/projectexplorer/jsonwizard/jsonfilepage.h b/src/plugins/projectexplorer/jsonwizard/jsonfilepage.h index 744e81e369..1bdeb5b8f4 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonfilepage.h +++ b/src/plugins/projectexplorer/jsonwizard/jsonfilepage.h @@ -35,10 +35,10 @@ class JsonFilePage : public Utils::FileWizardPage Q_OBJECT public: - JsonFilePage(QWidget *parent = 0); + JsonFilePage(QWidget *parent = nullptr); - void initializePage(); - bool validatePage(); + void initializePage() override; + bool validatePage() override; }; } // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/jsonwizard/jsonkitspage.cpp b/src/plugins/projectexplorer/jsonwizard/jsonkitspage.cpp index aed65d3cce..4275f6db5d 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonkitspage.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonkitspage.cpp @@ -52,7 +52,7 @@ JsonKitsPage::JsonKitsPage(QWidget *parent) : TargetSetupPage(parent) void JsonKitsPage::initializePage() { - JsonWizard *wiz = qobject_cast<JsonWizard *>(wizard()); + auto wiz = qobject_cast<JsonWizard *>(wizard()); QTC_ASSERT(wiz, return); connect(wiz, &JsonWizard::filesPolished, this, &JsonKitsPage::setupProjectFiles); @@ -72,10 +72,10 @@ void JsonKitsPage::initializePage() void JsonKitsPage::cleanupPage() { - JsonWizard *wiz = qobject_cast<JsonWizard *>(wizard()); + auto wiz = qobject_cast<JsonWizard *>(wizard()); QTC_ASSERT(wiz, return); - disconnect(wiz, &JsonWizard::allDone, this, 0); + disconnect(wiz, &JsonWizard::allDone, this, nullptr); TargetSetupPage::cleanupPage(); } @@ -102,7 +102,7 @@ void JsonKitsPage::setPreferredFeatures(const QVariant &data) void JsonKitsPage::setupProjectFiles(const JsonWizard::GeneratorFiles &files) { - Project *project = 0; + Project *project = nullptr; QList<IProjectManager *> managerList = ExtensionSystem::PluginManager::getObjects<IProjectManager>(); foreach (const JsonWizard::GeneratorFile &f, files) { @@ -122,7 +122,7 @@ void JsonKitsPage::setupProjectFiles(const JsonWizard::GeneratorFiles &files) if (setupProject(project)) project->saveSettings(); delete project; - project = 0; + project = nullptr; } } } diff --git a/src/plugins/projectexplorer/jsonwizard/jsonkitspage.h b/src/plugins/projectexplorer/jsonwizard/jsonkitspage.h index 28ac2af4f1..35077a2405 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonkitspage.h +++ b/src/plugins/projectexplorer/jsonwizard/jsonkitspage.h @@ -38,10 +38,10 @@ class JsonKitsPage : public TargetSetupPage Q_OBJECT public: - JsonKitsPage(QWidget *parent = 0); + JsonKitsPage(QWidget *parent = nullptr); - void initializePage(); - void cleanupPage(); + void initializePage() override; + void cleanupPage() override; void setUnexpandedProjectPath(const QString &path); QString unexpandedProjectPath() const; @@ -70,7 +70,7 @@ private: QVector<ConditionalFeature> m_preferredFeatures; QSet<Core::Id> evaluate(const QVector<ConditionalFeature> &list, const QVariant &defaultSet, - JsonWizard *wiz); + JsonWizard *wiz); }; } // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/jsonwizard/jsonprojectpage.cpp b/src/plugins/projectexplorer/jsonwizard/jsonprojectpage.cpp index c44ce5d2db..b23b000d30 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonprojectpage.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonprojectpage.cpp @@ -35,13 +35,12 @@ namespace ProjectExplorer { -JsonProjectPage::JsonProjectPage(QWidget *parent) : - Utils::ProjectIntroPage(parent) +JsonProjectPage::JsonProjectPage(QWidget *parent) : Utils::ProjectIntroPage(parent) { } void JsonProjectPage::initializePage() { - JsonWizard *wiz = qobject_cast<JsonWizard *>(wizard()); + auto wiz = qobject_cast<JsonWizard *>(wizard()); QTC_ASSERT(wiz, return); setPath(wiz->stringValue(QLatin1String("InitialPath"))); @@ -81,7 +80,6 @@ QString JsonProjectPage::uniqueProjectName(const QString &path) if (!pathDir.exists(name)) return name; } - return prefix; } } // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/jsonwizard/jsonprojectpage.h b/src/plugins/projectexplorer/jsonwizard/jsonprojectpage.h index 17ecc63e80..b362b98894 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonprojectpage.h +++ b/src/plugins/projectexplorer/jsonwizard/jsonprojectpage.h @@ -35,10 +35,10 @@ class JsonProjectPage : public Utils::ProjectIntroPage Q_OBJECT public: - JsonProjectPage(QWidget *parent = 0); + JsonProjectPage(QWidget *parent = nullptr); - void initializePage(); - bool validatePage(); + void initializePage() override; + bool validatePage() override; static QString uniqueProjectName(const QString &path); }; diff --git a/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp b/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp index 6fee29f61a..909f690b22 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp @@ -80,7 +80,7 @@ static IWizardFactory::WizardKind wizardKind(JsonWizard *wiz) JsonSummaryPage::JsonSummaryPage(QWidget *parent) : Internal::ProjectWizardPage(parent), - m_wizard(0) + m_wizard(nullptr) { connect(this, &Internal::ProjectWizardPage::projectNodeChanged, this, &JsonSummaryPage::summarySettingsHaveChanged); @@ -96,6 +96,7 @@ void JsonSummaryPage::setHideProjectUiValue(const QVariant &hideProjectUiValue) void JsonSummaryPage::initializePage() { m_wizard = qobject_cast<JsonWizard *>(wizard()); + QTC_ASSERT(m_wizard, return); m_wizard->setValue(QLatin1String(KEY_SELECTED_PROJECT), QVariant()); m_wizard->setValue(QLatin1String(KEY_SELECTED_NODE), QVariant()); @@ -147,7 +148,7 @@ bool JsonSummaryPage::validatePage() void JsonSummaryPage::cleanupPage() { - disconnect(m_wizard, &JsonWizard::filesReady, this, 0); + disconnect(m_wizard, &JsonWizard::filesReady, this, nullptr); } void JsonSummaryPage::triggerCommit(const JsonWizard::GeneratorFiles &files) diff --git a/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.h b/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.h index 9ca0ad20c5..6ea9598bb3 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.h +++ b/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.h @@ -40,12 +40,12 @@ class JsonSummaryPage : public Internal::ProjectWizardPage Q_OBJECT public: - JsonSummaryPage(QWidget *parent = 0); + JsonSummaryPage(QWidget *parent = nullptr); void setHideProjectUiValue(const QVariant &hideProjectUiValue); - void initializePage(); - bool validatePage(); - void cleanupPage(); + void initializePage() override; + bool validatePage() override; + void cleanupPage() override; public slots: void triggerCommit(const JsonWizard::GeneratorFiles &files); diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp index d95b4e1802..3c2a247e9a 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp @@ -44,8 +44,7 @@ namespace ProjectExplorer { -JsonWizard::JsonWizard(QWidget *parent) : - Utils::Wizard(parent) +JsonWizard::JsonWizard(QWidget *parent) : Utils::Wizard(parent) { setMinimumSize(800, 500); m_expander.registerExtraResolver([this](const QString &name, QString *ret) -> bool { @@ -298,7 +297,7 @@ void JsonWizard::reject() void JsonWizard::handleNewPages(int pageId) { - Utils::WizardPage *wp = qobject_cast<Utils::WizardPage *>(page(pageId)); + auto wp = qobject_cast<Utils::WizardPage *>(page(pageId)); if (!wp) return; diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizard.h b/src/plugins/projectexplorer/jsonwizard/jsonwizard.h index 5fdfe27561..d571f9cab7 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizard.h +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizard.h @@ -46,7 +46,7 @@ class PROJECTEXPLORER_EXPORT JsonWizard : public Utils::Wizard public: class GeneratorFile { public: - GeneratorFile() : generator(0) { } + GeneratorFile() : generator(nullptr) { } GeneratorFile(const Core::GeneratedFile &f, JsonWizardGenerator *g) : file(f), generator(g) { } @@ -59,8 +59,8 @@ public: typedef QList<GeneratorFile> GeneratorFiles; Q_PROPERTY(GeneratorFiles generateFileList READ generateFileList) - explicit JsonWizard(QWidget *parent = 0); - ~JsonWizard(); + explicit JsonWizard(QWidget *parent = nullptr); + ~JsonWizard() override; void addGenerator(JsonWizardGenerator *gen); diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp index 8e5b279937..7856a08b28 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp @@ -308,7 +308,7 @@ JsonWizardFactory *JsonWizardFactory::createWizardFactory(const QVariantMap &dat JsonWizardFactory *factory = new JsonWizardFactory; if (!factory->initialize(data, baseDir, errorMessage)) { delete factory; - factory = 0; + factory = nullptr; } return factory; } @@ -350,9 +350,6 @@ void JsonWizardFactory::registerGeneratorFactory(JsonWizardGeneratorFactory *fac s_generatorFactories.append(factory); } -JsonWizardFactory::~JsonWizardFactory() -{ } - Utils::Wizard *JsonWizardFactory::runWizardImpl(const QString &path, QWidget *parent, Core::Id platform, const QVariantMap &variables) diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h index 7ae4a43f6d..3722f10318 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h @@ -81,8 +81,6 @@ public: static void registerPageFactory(JsonWizardPageFactory *factory); static void registerGeneratorFactory(JsonWizardGeneratorFactory *factory); - ~JsonWizardFactory(); - static QList<QVariant> objectOrList(const QVariant &data, QString *errorMessage); static QString localizedString(const QVariant &value); diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfilegenerator.h b/src/plugins/projectexplorer/jsonwizard/jsonwizardfilegenerator.h index 5f9597079b..52bee65d6e 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfilegenerator.h +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfilegenerator.h @@ -40,9 +40,9 @@ public: Core::GeneratedFiles fileList(Utils::MacroExpander *expander, const QString &wizardDir, const QString &projectDir, - QString *errorMessage); + QString *errorMessage) override; - bool writeFile(const JsonWizard *wizard, Core::GeneratedFile *file, QString *errorMessage); + bool writeFile(const JsonWizard *wizard, Core::GeneratedFile *file, QString *errorMessage) override; private: class File { @@ -60,7 +60,7 @@ private: }; Core::GeneratedFile generateFile(const File &file, Utils::MacroExpander *expander, - QString *errorMessage); + QString *errorMessage); QList<File> m_fileList; }; diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.cpp index 7f45ddf47e..79b29c8f7c 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.cpp @@ -92,10 +92,10 @@ bool JsonWizardGenerator::formatFile(const JsonWizard *wizard, GeneratedFile *fi if (!languageId.isValid()) return true; // don't modify files like *.ui, *.pro - Project *baseProject = qobject_cast<Project *>(wizard->property("SelectedProject").value<QObject *>()); + auto baseProject = qobject_cast<Project *>(wizard->property("SelectedProject").value<QObject *>()); ICodeStylePreferencesFactory *factory = TextEditorSettings::codeStyleFactory(languageId); - Indenter *indenter = 0; + Indenter *indenter = nullptr; if (factory) indenter = factory->createIndenter(); if (!indenter) diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.h b/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.h index 9621e5beae..04997198c8 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.h +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.h @@ -99,8 +99,8 @@ public: JsonWizardGenerator *create(Core::Id typeId, const QVariant &data, const QString &path, Core::Id platform, - const QVariantMap &variables); - bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage); + const QVariantMap &variables) override; + bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage) override; }; class ScannerGeneratorFactory : public JsonWizardGeneratorFactory @@ -112,8 +112,8 @@ public: JsonWizardGenerator *create(Core::Id typeId, const QVariant &data, const QString &path, Core::Id platform, - const QVariantMap &variables); - bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage); + const QVariantMap &variables) override; + bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage) override; }; } // namespace Internal diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.cpp index c3abd6be12..89fa6cb23b 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.cpp @@ -63,13 +63,13 @@ Utils::WizardPage *FieldPageFactory::create(JsonWizard *wizard, Core::Id typeId, { Q_UNUSED(wizard); - QTC_ASSERT(canCreate(typeId), return 0); + QTC_ASSERT(canCreate(typeId), return nullptr); - JsonFieldPage *page = new JsonFieldPage(wizard->expander()); + auto page = new JsonFieldPage(wizard->expander()); if (!page->setup(data)) { delete page; - return 0; + return nullptr; } return page; @@ -110,10 +110,9 @@ Utils::WizardPage *FilePageFactory::create(JsonWizard *wizard, Core::Id typeId, { Q_UNUSED(wizard); Q_UNUSED(data); - QTC_ASSERT(canCreate(typeId), return 0); + QTC_ASSERT(canCreate(typeId), return nullptr); - JsonFilePage *page = new JsonFilePage; - return page; + return new JsonFilePage; } bool FilePageFactory::validateData(Core::Id typeId, const QVariant &data, QString *errorMessage) @@ -144,9 +143,9 @@ KitsPageFactory::KitsPageFactory() Utils::WizardPage *KitsPageFactory::create(JsonWizard *wizard, Core::Id typeId, const QVariant &data) { Q_UNUSED(wizard); - QTC_ASSERT(canCreate(typeId), return 0); + QTC_ASSERT(canCreate(typeId), return nullptr); - JsonKitsPage *page = new JsonKitsPage; + auto page = new JsonKitsPage; const QVariantMap dataMap = data.toMap(); page->setUnexpandedProjectPath(dataMap.value(QLatin1String(KEY_PROJECT_FILE)).toString()); page->setRequiredFeatures(dataMap.value(QLatin1String(KEY_REQUIRED_FEATURES))); @@ -205,9 +204,9 @@ Utils::WizardPage *ProjectPageFactory::create(JsonWizard *wizard, Core::Id typeI { Q_UNUSED(wizard); Q_UNUSED(data); - QTC_ASSERT(canCreate(typeId), return 0); + QTC_ASSERT(canCreate(typeId), return nullptr); - JsonProjectPage *page = new JsonProjectPage; + auto page = new JsonProjectPage; QVariantMap tmp = data.isNull() ? QVariantMap() : data.toMap(); QString description @@ -265,9 +264,9 @@ Utils::WizardPage *SummaryPageFactory::create(JsonWizard *wizard, Core::Id typeI { Q_UNUSED(wizard); Q_UNUSED(data); - QTC_ASSERT(canCreate(typeId), return 0); + QTC_ASSERT(canCreate(typeId), return nullptr); - JsonSummaryPage *page = new JsonSummaryPage; + auto page = new JsonSummaryPage; QVariant hideProjectUi = data.toMap().value(QLatin1String(KEY_HIDE_PROJECT_UI)); page->setHideProjectUiValue(hideProjectUi); return page; diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.h b/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.h index fe8f13221c..447842a889 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.h +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.h @@ -35,8 +35,8 @@ class FieldPageFactory : public JsonWizardPageFactory public: FieldPageFactory(); - Utils::WizardPage *create(JsonWizard *wizard, Core::Id typeId, const QVariant &data); - bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage); + Utils::WizardPage *create(JsonWizard *wizard, Core::Id typeId, const QVariant &data) override; + bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage) override; }; class FilePageFactory : public JsonWizardPageFactory @@ -44,8 +44,8 @@ class FilePageFactory : public JsonWizardPageFactory public: FilePageFactory(); - Utils::WizardPage *create(JsonWizard *wizard, Core::Id typeId, const QVariant &data); - bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage); + Utils::WizardPage *create(JsonWizard *wizard, Core::Id typeId, const QVariant &data) override; + bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage) override; }; class KitsPageFactory : public JsonWizardPageFactory @@ -53,8 +53,8 @@ class KitsPageFactory : public JsonWizardPageFactory public: KitsPageFactory(); - Utils::WizardPage *create(JsonWizard *wizard, Core::Id typeId, const QVariant &data); - bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage); + Utils::WizardPage *create(JsonWizard *wizard, Core::Id typeId, const QVariant &data) override; + bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage) override; }; class ProjectPageFactory : public JsonWizardPageFactory @@ -62,8 +62,8 @@ class ProjectPageFactory : public JsonWizardPageFactory public: ProjectPageFactory(); - Utils::WizardPage *create(JsonWizard *wizard, Core::Id typeId, const QVariant &data); - bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage); + Utils::WizardPage *create(JsonWizard *wizard, Core::Id typeId, const QVariant &data) override; + bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage) override; }; class SummaryPageFactory : public JsonWizardPageFactory @@ -71,8 +71,8 @@ class SummaryPageFactory : public JsonWizardPageFactory public: SummaryPageFactory(); - Utils::WizardPage *create(JsonWizard *wizard, Core::Id typeId, const QVariant &data); - bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage); + Utils::WizardPage *create(JsonWizard *wizard, Core::Id typeId, const QVariant &data) override; + bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage) override; }; } // namespace Internal diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardscannergenerator.h b/src/plugins/projectexplorer/jsonwizard/jsonwizardscannergenerator.h index 01930a847d..e852ad1fe0 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardscannergenerator.h +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardscannergenerator.h @@ -42,7 +42,7 @@ public: Core::GeneratedFiles fileList(Utils::MacroExpander *expander, const QString &wizardDir, const QString &projectDir, - QString *errorMessage); + QString *errorMessage) override; private: Core::GeneratedFiles scan(const QString &dir, const QDir &base); |