aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xquitdialog.cpp2
-rwxr-xr-xquitdialog.h2
-rwxr-xr-xsettingsdialog.cpp2
-rwxr-xr-xsettingsdialog.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/quitdialog.cpp b/quitdialog.cpp
index ecfb486..ed5b6cc 100755
--- a/quitdialog.cpp
+++ b/quitdialog.cpp
@@ -107,7 +107,7 @@ QuitDialog::QuitDialog(QWidget *parent, QHash<int, QString> unsavedDocs)
}
-void QuitDialog::myDiscard()
+void QuitDialog::slotMyDiscard()
{
discarded =true;
reject();
diff --git a/quitdialog.h b/quitdialog.h
index eec9b63..bc24712 100755
--- a/quitdialog.h
+++ b/quitdialog.h
@@ -38,7 +38,7 @@ public:
QList <int> getTabIdsToSave();
private slots:
- void myDiscard();
+ void slotMyDiscard();
private:
QAction *closeAct;
diff --git a/settingsdialog.cpp b/settingsdialog.cpp
index 1cb4ce8..6929ee2 100755
--- a/settingsdialog.cpp
+++ b/settingsdialog.cpp
@@ -55,7 +55,7 @@ SettingsDialog::SettingsDialog(QWidget *parent)
exec();
}
-void SettingsDialog::accept()
+void SettingsDialog::slotAccept()
{
generalTab->applySettings();
mimeTab->applySettings();
diff --git a/settingsdialog.h b/settingsdialog.h
index d97fd49..3626cbb 100755
--- a/settingsdialog.h
+++ b/settingsdialog.h
@@ -171,7 +171,7 @@ public:
public slots:
- void accept();
+ void slotAccept();
private:
QTabWidget *tabWidget;