settings dialog will show when clicked.

slots are all virtual so always the right one is called!
Note: It is better to make all slots declared virtual - or do not make any
child-classes!

4 files changed, 14 insertions, 16 deletions

diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp
index cf4cbe8..2a74286 100644
--- a/noncore/net/mail/mainwindow.cpp
+++ b/noncore/net/mail/mainwindow.cpp
@@ -13,3 +13,2 @@
 #include "mainwindow.h"
-#include "settingsdialog.h"
 #include "viewmail.h"
@@ -82,3 +81,2 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
              SLOT( slotEditSettings() ) );
-
     editAccounts = new QAction( tr( "Configure accounts" ), ICON_EDITACCOUNTS,
@@ -159,6 +157,4 @@ void MainWindow::slotAdjustColumns()
 
-void MainWindow::slotEditSettings() {
-    SettingsDialog settingsDialog( this,  0, true );
-    settingsDialog.showMaximized();
-    settingsDialog.exec();
+void MainWindow::slotEditSettings()
+{
 }
diff --git a/noncore/net/mail/mainwindow.h b/noncore/net/mail/mainwindow.h
index 638232a..0e077f6 100644
--- a/noncore/net/mail/mainwindow.h
+++ b/noncore/net/mail/mainwindow.h
@@ -23,3 +23,3 @@ public:
 public slots:
-    void slotAdjustColumns();
+    virtual void slotAdjustColumns();
     
diff --git a/noncore/net/mail/opiemail.cpp b/noncore/net/mail/opiemail.cpp
index 2909893..e35f5b6 100644
--- a/noncore/net/mail/opiemail.cpp
+++ b/noncore/net/mail/opiemail.cpp
@@ -1,2 +1,3 @@
 #include <qmessagebox.h>
+#include "settingsdialog.h"
 #include "opiemail.h"
@@ -19,3 +20,2 @@ OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags )
 //    connect( searchMails, SIGNAL( activated() ), SLOT( slotSearchMails() ) );
-    connect( editSettings, SIGNAL( activated() ), SLOT( slotEditSettings() ) );
     connect( editAccounts, SIGNAL( activated() ), SLOT( slotEditAccounts() ) );
@@ -94,3 +94,5 @@ void OpieMail::slotEditSettings()
 {
-    qDebug( "Edit Settings" );
+    SettingsDialog settingsDialog( this,  0, true );
+    settingsDialog.showMaximized();
+    settingsDialog.exec();
 }
diff --git a/noncore/net/mail/opiemail.h b/noncore/net/mail/opiemail.h
index 8cbcaa4..4e3c974 100644
--- a/noncore/net/mail/opiemail.h
+++ b/noncore/net/mail/opiemail.h
@@ -15,10 +15,10 @@ public:
 public slots:
-    void slotwriteMail(const QString&name,const QString&email);
-    void slotComposeMail();
-    void appMessage(const QCString &msg, const QByteArray &data);
+    virtual void slotwriteMail(const QString&name,const QString&email);
+    virtual void slotComposeMail();
+    virtual void appMessage(const QCString &msg, const QByteArray &data);
 protected slots:
-    void slotSendQueued();
-    void slotSearchMails();
-    void slotEditSettings();
-    void slotEditAccounts();
+    virtual void slotSendQueued();
+    virtual void slotSearchMails();
+    virtual void slotEditSettings();
+    virtual void slotEditAccounts();
 private: