┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/settings/dolphinsettingsdialog.cpp16
-rw-r--r--src/settings/dolphinsettingsdialog.h6
2 files changed, 4 insertions, 18 deletions
diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp
index 8df2996b3..f248335e9 100644
--- a/src/settings/dolphinsettingsdialog.cpp
+++ b/src/settings/dolphinsettingsdialog.cpp
@@ -53,6 +53,10 @@ DolphinSettingsDialog::DolphinSettingsDialog(const KUrl& url, QWidget* parent) :
box->button(QDialogButtonBox::Ok)->setDefault(true);
setButtonBox(box);
+ connect(box->button(QDialogButtonBox::Ok), &QAbstractButton::clicked, this, &DolphinSettingsDialog::applySettings);
+ connect(box->button(QDialogButtonBox::Apply), &QAbstractButton::clicked, this, &DolphinSettingsDialog::applySettings);
+ connect(box->button(QDialogButtonBox::RestoreDefaults), &QAbstractButton::clicked, this, &DolphinSettingsDialog::restoreDefaults);
+
// Startup
StartupSettingsPage* startupSettingsPage = new StartupSettingsPage(url, this);
KPageWidgetItem* startupSettingsFrame = addPage(startupSettingsPage,
@@ -114,18 +118,6 @@ DolphinSettingsDialog::~DolphinSettingsDialog()
//saveDialogSize(dialogConfig);
}
-void DolphinSettingsDialog::slotButtonClicked(int button)
-{
- if ((button == QDialogButtonBox::Ok) || (button == QDialogButtonBox::Apply)) {
- applySettings();
- } else if (button == QDialogButtonBox::RestoreDefaults) {
- restoreDefaults();
- }
-
-#pragma message("TODO: port")
- //KPageDialog::slotButtonClicked(button);
-}
-
void DolphinSettingsDialog::enableApply()
{
buttonBox()->button(QDialogButtonBox::Apply)->setEnabled(true);
diff --git a/src/settings/dolphinsettingsdialog.h b/src/settings/dolphinsettingsdialog.h
index 2de195017..56d924c7d 100644
--- a/src/settings/dolphinsettingsdialog.h
+++ b/src/settings/dolphinsettingsdialog.h
@@ -42,15 +42,9 @@ public:
signals:
void settingsChanged();
-protected slots:
- /** @see KDialog::slotButtonClicked() */
- virtual void slotButtonClicked(int button);
-
private slots:
/** Enables the Apply button. */
void enableApply();
-
-private:
void applySettings();
void restoreDefaults();