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>
This commit is contained in:
hjk
2020-01-15 13:22:48 +01:00
parent 3974f1f629
commit c75923756a
28 changed files with 1 additions and 31 deletions

View File

@@ -99,7 +99,6 @@ public:
private: private:
void apply() final { saveSettings(); } void apply() final { saveSettings(); }
void finish() final {}
void saveSettings(); void saveSettings();
void validateJdk(); void validateJdk();

View File

@@ -42,7 +42,6 @@ public:
explicit BoostTestSettingsWidget(QSharedPointer<BoostTestSettings> settings); explicit BoostTestSettingsWidget(QSharedPointer<BoostTestSettings> settings);
void apply() final; void apply() final;
void finish() final {}
void setSettings(const BoostTestSettings &settings); void setSettings(const BoostTestSettings &settings);
BoostTestSettings settings() const; BoostTestSettings settings() const;

View File

@@ -50,7 +50,6 @@ public:
private: private:
void apply() final; void apply() final;
void finish() final {}
Ui::GTestSettingsPage m_ui; Ui::GTestSettingsPage m_ui;
QString m_currentGTestFilter; QString m_currentGTestFilter;

View File

@@ -44,7 +44,6 @@ public:
explicit QtTestSettingsWidget(QSharedPointer<QtTestSettings> settings); explicit QtTestSettingsWidget(QSharedPointer<QtTestSettings> settings);
void apply() final; void apply() final;
void finish() final {}
private: private:
Ui::QtTestSettingsPage m_ui; Ui::QtTestSettingsPage m_ui;

View File

@@ -277,7 +277,6 @@ public:
DebugServerProvidersSettingsWidget(); DebugServerProvidersSettingsWidget();
void apply() final { m_model.apply(); } void apply() final { m_model.apply(); }
void finish() final {}
void providerSelectionChanged(); void providerSelectionChanged();
void removeProvider(); void removeProvider();

View File

@@ -45,7 +45,6 @@ public:
explicit ArtisticStyleOptionsPageWidget(ArtisticStyleSettings *settings); explicit ArtisticStyleOptionsPageWidget(ArtisticStyleSettings *settings);
void apply() final; void apply() final;
void finish() final {}
private: private:
Ui::ArtisticStyleOptionsPage ui; Ui::ArtisticStyleOptionsPage ui;

View File

@@ -44,7 +44,6 @@ public:
explicit ClangFormatOptionsPageWidget(ClangFormatSettings *settings); explicit ClangFormatOptionsPageWidget(ClangFormatSettings *settings);
void apply() final; void apply() final;
void finish() final {}
private: private:
Ui::ClangFormatOptionsPage ui; Ui::ClangFormatOptionsPage ui;

View File

@@ -39,7 +39,6 @@ public:
private: private:
void apply() final; void apply() final;
void finish() final {}
Ui::GeneralOptionsPage ui; Ui::GeneralOptionsPage ui;
}; };

View File

@@ -45,7 +45,6 @@ public:
explicit UncrustifyOptionsPageWidget(UncrustifySettings *settings); explicit UncrustifyOptionsPageWidget(UncrustifySettings *settings);
void apply() final; void apply() final;
void finish() final {}
private: private:
Ui::UncrustifyOptionsPage ui; Ui::UncrustifyOptionsPage ui;

View File

@@ -51,7 +51,6 @@ public:
private: private:
void apply() final; void apply() final;
void finish() final {};
std::unique_ptr<Ui::SettingsWidget> m_ui; std::unique_ptr<Ui::SettingsWidget> m_ui;
ClangToolsSettings *m_settings; ClangToolsSettings *m_settings;

View File

@@ -52,7 +52,6 @@ public:
private: private:
void apply() final; void apply() final;
void finish() final { }
Ui::SettingsPage m_ui; Ui::SettingsPage m_ui;
}; };

View File

@@ -590,7 +590,6 @@ public:
} }
void apply() final; void apply() final;
void finish() final {}
void cloneCMakeTool(); void cloneCMakeTool();
void addCMakeTool(); void addCMakeTool();

View File

@@ -41,7 +41,6 @@ public:
explicit CMakeSpecificSettingWidget(CMakeSpecificSettings *settings); explicit CMakeSpecificSettingWidget(CMakeSpecificSettings *settings);
void apply() final; void apply() final;
void finish() final {}
private: private:
Ui::CMakeSpecificSettingForm m_ui; Ui::CMakeSpecificSettingForm m_ui;

View File

@@ -42,7 +42,7 @@ class CORE_EXPORT IOptionsPageWidget : public QWidget
{ {
public: public:
virtual void apply() = 0; virtual void apply() = 0;
virtual void finish() = 0; virtual void finish() {}
}; };
class CORE_EXPORT IOptionsPage : public QObject class CORE_EXPORT IOptionsPage : public QObject

View File

@@ -157,7 +157,6 @@ public:
private: private:
void apply() final; void apply() final;
void finish() final {}
void showHelpForFileBrowser(); void showHelpForFileBrowser();
void resetFileBrowser(); void resetFileBrowser();

View File

@@ -166,7 +166,6 @@ public:
private: private:
void apply() final; void apply() final;
void finish() final {}
void addDocumentation(); void addDocumentation();

View File

@@ -45,7 +45,6 @@ public:
private: private:
void apply() final; void apply() final;
void finish() final {}
void saveSettings(); void saveSettings();

View File

@@ -50,7 +50,6 @@ public:
void initialize(); void initialize();
void apply() final; void apply() final;
void finish() final {}
private: private:
void remove(); void remove();

View File

@@ -64,7 +64,6 @@ public:
private: private:
void apply() final; void apply() final;
void finish() final {}
void showEvent(QShowEvent *event) final; void showEvent(QShowEvent *event) final;

View File

@@ -877,8 +877,6 @@ public:
ProjectExplorerPlugin::setAppOutputSettings(s); ProjectExplorerPlugin::setAppOutputSettings(s);
} }
void finish() final {}
private: private:
QCheckBox m_wrapOutputCheckBox; QCheckBox m_wrapOutputCheckBox;
QCheckBox m_cleanOldOutputCheckBox; QCheckBox m_cleanOldOutputCheckBox;

View File

@@ -73,8 +73,6 @@ public:
ProjectExplorerPlugin::setBuildPropertiesSettings(s); ProjectExplorerPlugin::setBuildPropertiesSettings(s);
} }
void finish() final {}
private: private:
QComboBox m_separateDebugInfoComboBox; QComboBox m_separateDebugInfoComboBox;
QComboBox m_qmlDebuggingComboBox; QComboBox m_qmlDebuggingComboBox;

View File

@@ -402,8 +402,6 @@ public:
BuildManager::setCompileOutputSettings(s); BuildManager::setCompileOutputSettings(s);
} }
void finish() final {}
private: private:
QCheckBox m_wrapOutputCheckBox; QCheckBox m_wrapOutputCheckBox;
QCheckBox m_popUpCheckBox; QCheckBox m_popUpCheckBox;

View File

@@ -56,7 +56,6 @@ public:
private: private:
void apply() final { saveSettings(); } void apply() final { saveSettings(); }
void finish() final {}
void saveSettings(); void saveSettings();

View File

@@ -52,7 +52,6 @@ public:
private: private:
void apply() final { saveSettings(); } void apply() final { saveSettings(); }
void finish() final {}
void setupConnectionSharingCheckBox(); void setupConnectionSharingCheckBox();
void setupConnectionSharingSpinBox(); void setupConnectionSharingSpinBox();

View File

@@ -67,7 +67,6 @@ public:
}; };
void apply() final; void apply() final;
void finish() final {}
void addConfiguration(); void addConfiguration();
void removeConfiguration(); void removeConfiguration();

View File

@@ -43,7 +43,6 @@ public:
private: private:
void apply() final; void apply() final;
void finish() final {}
int uiEmbedding() const; int uiEmbedding() const;
void setUiEmbedding(int); void setUiEmbedding(int);

View File

@@ -182,7 +182,6 @@ public:
private: private:
void apply() final; void apply() final;
void finish() final {}
void updateDescriptionLabel(); void updateDescriptionLabel();
void userChangedCurrentVersion(); void userChangedCurrentVersion();

View File

@@ -56,7 +56,6 @@ public:
VcsClientOptionsPageWidget(); VcsClientOptionsPageWidget();
void apply() override {} void apply() override {}
void finish() override {}
virtual void setSettings(const VcsBaseClientSettings &s) = 0; virtual void setSettings(const VcsBaseClientSettings &s) = 0;
virtual VcsBaseClientSettings settings() const = 0; virtual VcsBaseClientSettings settings() const = 0;