diff options
author | hjk <hjk@qt.io> | 2020-01-15 13:22:48 +0100 |
---|---|---|
committer | hjk <hjk@qt.io> | 2020-01-15 12:28:29 +0000 |
commit | c75923756abce45f984b7866c9e256d51c996189 (patch) | |
tree | d1cfa5d37f6e264677576f0aef2d995a9dfe1f14 /src | |
parent | 3974f1f62907b87a70954799df7eaab172621c3c (diff) |
Core: Provide empty implementation for IOptionPageWidget::finish()
Having it pure virtual only lead to a lot of unnecessary
re-implementation.
Change-Id: I37f71d1a160e21b93c7c73a6304b0eb6d5f0441d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src')
28 files changed, 1 insertions, 31 deletions
diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp index 65015240f0e..2b790868072 100644 --- a/src/plugins/android/androidsettingswidget.cpp +++ b/src/plugins/android/androidsettingswidget.cpp @@ -99,7 +99,6 @@ public: private: void apply() final { saveSettings(); } - void finish() final {} void saveSettings(); void validateJdk(); diff --git a/src/plugins/autotest/boost/boosttestsettingspage.cpp b/src/plugins/autotest/boost/boosttestsettingspage.cpp index e453028dfb3..64cd4cc91df 100644 --- a/src/plugins/autotest/boost/boosttestsettingspage.cpp +++ b/src/plugins/autotest/boost/boosttestsettingspage.cpp @@ -42,7 +42,6 @@ public: explicit BoostTestSettingsWidget(QSharedPointer<BoostTestSettings> settings); void apply() final; - void finish() final {} void setSettings(const BoostTestSettings &settings); BoostTestSettings settings() const; diff --git a/src/plugins/autotest/gtest/gtestsettingspage.cpp b/src/plugins/autotest/gtest/gtestsettingspage.cpp index a5b1403a48f..f285fafde5f 100644 --- a/src/plugins/autotest/gtest/gtestsettingspage.cpp +++ b/src/plugins/autotest/gtest/gtestsettingspage.cpp @@ -50,7 +50,6 @@ public: private: void apply() final; - void finish() final {} Ui::GTestSettingsPage m_ui; QString m_currentGTestFilter; diff --git a/src/plugins/autotest/qtest/qttestsettingspage.cpp b/src/plugins/autotest/qtest/qttestsettingspage.cpp index 17c580c4ecf..fcc01853a1a 100644 --- a/src/plugins/autotest/qtest/qttestsettingspage.cpp +++ b/src/plugins/autotest/qtest/qttestsettingspage.cpp @@ -44,7 +44,6 @@ public: explicit QtTestSettingsWidget(QSharedPointer<QtTestSettings> settings); void apply() final; - void finish() final {} private: Ui::QtTestSettingsPage m_ui; diff --git a/src/plugins/baremetal/debugserverproviderssettingspage.cpp b/src/plugins/baremetal/debugserverproviderssettingspage.cpp index 925249663d2..d1dafb2e9ea 100644 --- a/src/plugins/baremetal/debugserverproviderssettingspage.cpp +++ b/src/plugins/baremetal/debugserverproviderssettingspage.cpp @@ -277,7 +277,6 @@ public: DebugServerProvidersSettingsWidget(); void apply() final { m_model.apply(); } - void finish() final {} void providerSelectionChanged(); void removeProvider(); diff --git a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp index 73b2645eff9..85406073e98 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp +++ b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp @@ -45,7 +45,6 @@ public: explicit ArtisticStyleOptionsPageWidget(ArtisticStyleSettings *settings); void apply() final; - void finish() final {} private: Ui::ArtisticStyleOptionsPage ui; diff --git a/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp b/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp index 632727c8407..7e7ef8b6947 100644 --- a/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp +++ b/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp @@ -44,7 +44,6 @@ public: explicit ClangFormatOptionsPageWidget(ClangFormatSettings *settings); void apply() final; - void finish() final {} private: Ui::ClangFormatOptionsPage ui; diff --git a/src/plugins/beautifier/generaloptionspage.cpp b/src/plugins/beautifier/generaloptionspage.cpp index a98c1546b89..28c4354d6e3 100644 --- a/src/plugins/beautifier/generaloptionspage.cpp +++ b/src/plugins/beautifier/generaloptionspage.cpp @@ -39,7 +39,6 @@ public: private: void apply() final; - void finish() final {} Ui::GeneralOptionsPage ui; }; diff --git a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp index 4739d07b459..96a63a697e9 100644 --- a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp +++ b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp @@ -45,7 +45,6 @@ public: explicit UncrustifyOptionsPageWidget(UncrustifySettings *settings); void apply() final; - void finish() final {} private: Ui::UncrustifyOptionsPage ui; diff --git a/src/plugins/clangtools/settingswidget.h b/src/plugins/clangtools/settingswidget.h index b59d6f9ee79..8680581cac7 100644 --- a/src/plugins/clangtools/settingswidget.h +++ b/src/plugins/clangtools/settingswidget.h @@ -51,7 +51,6 @@ public: private: void apply() final; - void finish() final {}; std::unique_ptr<Ui::SettingsWidget> m_ui; ClangToolsSettings *m_settings; diff --git a/src/plugins/clearcase/settingspage.cpp b/src/plugins/clearcase/settingspage.cpp index ae5c3255e8c..66808b8d583 100644 --- a/src/plugins/clearcase/settingspage.cpp +++ b/src/plugins/clearcase/settingspage.cpp @@ -52,7 +52,6 @@ public: private: void apply() final; - void finish() final { } Ui::SettingsPage m_ui; }; diff --git a/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp b/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp index 957046efea2..82611adbb79 100644 --- a/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp +++ b/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp @@ -590,7 +590,6 @@ public: } void apply() final; - void finish() final {} void cloneCMakeTool(); void addCMakeTool(); diff --git a/src/plugins/cmakeprojectmanager/cmakespecificsettingspage.cpp b/src/plugins/cmakeprojectmanager/cmakespecificsettingspage.cpp index 21d47b6033f..501c4210e6e 100644 --- a/src/plugins/cmakeprojectmanager/cmakespecificsettingspage.cpp +++ b/src/plugins/cmakeprojectmanager/cmakespecificsettingspage.cpp @@ -41,7 +41,6 @@ public: explicit CMakeSpecificSettingWidget(CMakeSpecificSettings *settings); void apply() final; - void finish() final {} private: Ui::CMakeSpecificSettingForm m_ui; diff --git a/src/plugins/coreplugin/dialogs/ioptionspage.h b/src/plugins/coreplugin/dialogs/ioptionspage.h index a1fb5e43f59..a5b661ae50f 100644 --- a/src/plugins/coreplugin/dialogs/ioptionspage.h +++ b/src/plugins/coreplugin/dialogs/ioptionspage.h @@ -42,7 +42,7 @@ class CORE_EXPORT IOptionsPageWidget : public QWidget { public: virtual void apply() = 0; - virtual void finish() = 0; + virtual void finish() {} }; class CORE_EXPORT IOptionsPage : public QObject diff --git a/src/plugins/coreplugin/systemsettings.cpp b/src/plugins/coreplugin/systemsettings.cpp index 9873a7f94ca..48ace406d89 100644 --- a/src/plugins/coreplugin/systemsettings.cpp +++ b/src/plugins/coreplugin/systemsettings.cpp @@ -157,7 +157,6 @@ public: private: void apply() final; - void finish() final {} void showHelpForFileBrowser(); void resetFileBrowser(); diff --git a/src/plugins/help/docsettingspage.cpp b/src/plugins/help/docsettingspage.cpp index a2626994f4e..17c54c08273 100644 --- a/src/plugins/help/docsettingspage.cpp +++ b/src/plugins/help/docsettingspage.cpp @@ -166,7 +166,6 @@ public: private: void apply() final; - void finish() final {} void addDocumentation(); diff --git a/src/plugins/ios/iossettingswidget.h b/src/plugins/ios/iossettingswidget.h index 339df65fe5a..482d1555fe9 100644 --- a/src/plugins/ios/iossettingswidget.h +++ b/src/plugins/ios/iossettingswidget.h @@ -45,7 +45,6 @@ public: private: void apply() final; - void finish() final {} void saveSettings(); diff --git a/src/plugins/macros/macrooptionswidget.h b/src/plugins/macros/macrooptionswidget.h index 8e910ce9e21..87a0f55b3d9 100644 --- a/src/plugins/macros/macrooptionswidget.h +++ b/src/plugins/macros/macrooptionswidget.h @@ -50,7 +50,6 @@ public: void initialize(); void apply() final; - void finish() final {} private: void remove(); diff --git a/src/plugins/mcusupport/mcusupportoptionspage.cpp b/src/plugins/mcusupport/mcusupportoptionspage.cpp index 108b203a5c8..e88be7c11db 100644 --- a/src/plugins/mcusupport/mcusupportoptionspage.cpp +++ b/src/plugins/mcusupport/mcusupportoptionspage.cpp @@ -64,7 +64,6 @@ public: private: void apply() final; - void finish() final {} void showEvent(QShowEvent *event) final; diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp index 35ef4189004..5211ad277ae 100644 --- a/src/plugins/projectexplorer/appoutputpane.cpp +++ b/src/plugins/projectexplorer/appoutputpane.cpp @@ -877,8 +877,6 @@ public: ProjectExplorerPlugin::setAppOutputSettings(s); } - void finish() final {} - private: QCheckBox m_wrapOutputCheckBox; QCheckBox m_cleanOldOutputCheckBox; diff --git a/src/plugins/projectexplorer/buildpropertiessettingspage.cpp b/src/plugins/projectexplorer/buildpropertiessettingspage.cpp index 9670c193ed7..f2cd4c39a6b 100644 --- a/src/plugins/projectexplorer/buildpropertiessettingspage.cpp +++ b/src/plugins/projectexplorer/buildpropertiessettingspage.cpp @@ -73,8 +73,6 @@ public: ProjectExplorerPlugin::setBuildPropertiesSettings(s); } - void finish() final {} - private: QComboBox m_separateDebugInfoComboBox; QComboBox m_qmlDebuggingComboBox; diff --git a/src/plugins/projectexplorer/compileoutputwindow.cpp b/src/plugins/projectexplorer/compileoutputwindow.cpp index 66e242850d3..ed57c77af84 100644 --- a/src/plugins/projectexplorer/compileoutputwindow.cpp +++ b/src/plugins/projectexplorer/compileoutputwindow.cpp @@ -402,8 +402,6 @@ public: BuildManager::setCompileOutputSettings(s); } - void finish() final {} - private: QCheckBox m_wrapOutputCheckBox; QCheckBox m_popUpCheckBox; diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h index ffe51729dd6..e895da27393 100644 --- a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h +++ b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h @@ -56,7 +56,6 @@ public: private: void apply() final { saveSettings(); } - void finish() final {} void saveSettings(); diff --git a/src/plugins/projectexplorer/devicesupport/sshsettingspage.cpp b/src/plugins/projectexplorer/devicesupport/sshsettingspage.cpp index 417ae57317a..e11dd239058 100644 --- a/src/plugins/projectexplorer/devicesupport/sshsettingspage.cpp +++ b/src/plugins/projectexplorer/devicesupport/sshsettingspage.cpp @@ -52,7 +52,6 @@ public: private: void apply() final { saveSettings(); } - void finish() final {} void setupConnectionSharingCheckBox(); void setupConnectionSharingSpinBox(); diff --git a/src/plugins/qnx/qnxsettingspage.cpp b/src/plugins/qnx/qnxsettingspage.cpp index 1307327e979..24c161adeae 100644 --- a/src/plugins/qnx/qnxsettingspage.cpp +++ b/src/plugins/qnx/qnxsettingspage.cpp @@ -67,7 +67,6 @@ public: }; void apply() final; - void finish() final {} void addConfiguration(); void removeConfiguration(); diff --git a/src/plugins/qtsupport/codegensettingspage.h b/src/plugins/qtsupport/codegensettingspage.h index 5faef91763c..12836126183 100644 --- a/src/plugins/qtsupport/codegensettingspage.h +++ b/src/plugins/qtsupport/codegensettingspage.h @@ -43,7 +43,6 @@ public: private: void apply() final; - void finish() final {} int uiEmbedding() const; void setUiEmbedding(int); diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp index 3b8026968a6..a53fb57c9db 100644 --- a/src/plugins/qtsupport/qtoptionspage.cpp +++ b/src/plugins/qtsupport/qtoptionspage.cpp @@ -182,7 +182,6 @@ public: private: void apply() final; - void finish() final {} void updateDescriptionLabel(); void userChangedCurrentVersion(); diff --git a/src/plugins/vcsbase/vcsbaseoptionspage.h b/src/plugins/vcsbase/vcsbaseoptionspage.h index 41872d3b1b6..d03037b8e5a 100644 --- a/src/plugins/vcsbase/vcsbaseoptionspage.h +++ b/src/plugins/vcsbase/vcsbaseoptionspage.h @@ -56,7 +56,6 @@ public: VcsClientOptionsPageWidget(); void apply() override {} - void finish() override {} virtual void setSettings(const VcsBaseClientSettings &s) = 0; virtual VcsBaseClientSettings settings() const = 0; |