From c542d65f6144af51f182f3d1c15edc086f4136c4 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Tue, 25 Jun 2013 17:25:36 +0200
Subject: [PATCH] All destructors made virtual.

---
 src/core/settings.h      | 2 +-
 src/gui/formmain.cpp     | 7 +++++++
 src/gui/formmain.h       | 2 +-
 src/gui/formsettings.h   | 2 +-
 src/gui/formwelcome.h    | 2 +-
 src/gui/systemtrayicon.h | 2 +-
 6 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/core/settings.h b/src/core/settings.h
index 6771d304f..0da70b661 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -14,7 +14,7 @@ class Settings : public QSettings {
 
     // Constructor and destructor.
     Settings(const QString & file_name, Format format, QObject * parent = 0);
-    ~Settings();
+    virtual ~Settings();
 
     // Getter/setter for settings values.
     QVariant value(const QString &section,
diff --git a/src/gui/formmain.cpp b/src/gui/formmain.cpp
index b069b490e..6804aff3a 100644
--- a/src/gui/formmain.cpp
+++ b/src/gui/formmain.cpp
@@ -28,6 +28,11 @@ FormMain::FormMain(QWidget *parent) : QMainWindow(parent), m_ui(new Ui::FormMain
 
 FormMain::~FormMain() {
   delete m_ui;
+
+  if (SystemTrayIcon::isSystemTrayAvailable()) {
+    delete m_trayMenu;
+    qDebug("Deleting tray icon menu.");
+  }
 }
 
 FormMain *FormMain::getInstance() {
@@ -46,6 +51,8 @@ void FormMain::prepareMenus() {
     // Add needed items to the menu.
     m_trayMenu->addAction(m_ui->m_actionSettings);
     m_trayMenu->addAction(m_ui->m_actionQuit);
+
+    qDebug("Creating tray icon menu.");
   }
 }
 
diff --git a/src/gui/formmain.h b/src/gui/formmain.h
index b24751fca..e45ad30b9 100644
--- a/src/gui/formmain.h
+++ b/src/gui/formmain.h
@@ -11,7 +11,7 @@ class FormMain : public QMainWindow {
     
   public:
     explicit FormMain(QWidget *parent = 0);
-    ~FormMain();
+    virtual ~FormMain();
 
     // Returns menu for the tray icon.
     QMenu *getTrayMenu();
diff --git a/src/gui/formsettings.h b/src/gui/formsettings.h
index 0658e9389..95729f7a5 100644
--- a/src/gui/formsettings.h
+++ b/src/gui/formsettings.h
@@ -15,7 +15,7 @@ class FormSettings : public QDialog {
     
   public:
     explicit FormSettings(QWidget *parent = 0);
-    ~FormSettings();
+    virtual ~FormSettings();
 
   protected slots:
     // Saves settings into global configuration.
diff --git a/src/gui/formwelcome.h b/src/gui/formwelcome.h
index 001f88f44..c4222991f 100644
--- a/src/gui/formwelcome.h
+++ b/src/gui/formwelcome.h
@@ -16,7 +16,7 @@ class FormWelcome : public QDialog {
   public:
     // Constructors and destructors.
     explicit FormWelcome(QWidget *parent = 0);
-    ~FormWelcome();
+    virtual ~FormWelcome();
     
   private:
     Ui::FormWelcome *m_ui;
diff --git a/src/gui/systemtrayicon.h b/src/gui/systemtrayicon.h
index b158f506e..42faf4107 100644
--- a/src/gui/systemtrayicon.h
+++ b/src/gui/systemtrayicon.h
@@ -14,7 +14,7 @@ class SystemTrayIcon : public QSystemTrayIcon {
     explicit SystemTrayIcon(const QString &normal_icon,
                             const QString &plain_icon,
                             FormMain *parent = 0);
-    ~SystemTrayIcon();
+    virtual ~SystemTrayIcon();
 
     // Returns true if tray icon CAN be constructed on this machine.
     static bool isSystemTrayAvailable();