All destructors made virtual.
This commit is contained in:
parent
524fd819fe
commit
c542d65f61
6 changed files with 12 additions and 5 deletions
|
@ -14,7 +14,7 @@ class Settings : public QSettings {
|
||||||
|
|
||||||
// Constructor and destructor.
|
// Constructor and destructor.
|
||||||
Settings(const QString & file_name, Format format, QObject * parent = 0);
|
Settings(const QString & file_name, Format format, QObject * parent = 0);
|
||||||
~Settings();
|
virtual ~Settings();
|
||||||
|
|
||||||
// Getter/setter for settings values.
|
// Getter/setter for settings values.
|
||||||
QVariant value(const QString §ion,
|
QVariant value(const QString §ion,
|
||||||
|
|
|
@ -28,6 +28,11 @@ FormMain::FormMain(QWidget *parent) : QMainWindow(parent), m_ui(new Ui::FormMain
|
||||||
|
|
||||||
FormMain::~FormMain() {
|
FormMain::~FormMain() {
|
||||||
delete m_ui;
|
delete m_ui;
|
||||||
|
|
||||||
|
if (SystemTrayIcon::isSystemTrayAvailable()) {
|
||||||
|
delete m_trayMenu;
|
||||||
|
qDebug("Deleting tray icon menu.");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
FormMain *FormMain::getInstance() {
|
FormMain *FormMain::getInstance() {
|
||||||
|
@ -46,6 +51,8 @@ void FormMain::prepareMenus() {
|
||||||
// Add needed items to the menu.
|
// Add needed items to the menu.
|
||||||
m_trayMenu->addAction(m_ui->m_actionSettings);
|
m_trayMenu->addAction(m_ui->m_actionSettings);
|
||||||
m_trayMenu->addAction(m_ui->m_actionQuit);
|
m_trayMenu->addAction(m_ui->m_actionQuit);
|
||||||
|
|
||||||
|
qDebug("Creating tray icon menu.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@ class FormMain : public QMainWindow {
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit FormMain(QWidget *parent = 0);
|
explicit FormMain(QWidget *parent = 0);
|
||||||
~FormMain();
|
virtual ~FormMain();
|
||||||
|
|
||||||
// Returns menu for the tray icon.
|
// Returns menu for the tray icon.
|
||||||
QMenu *getTrayMenu();
|
QMenu *getTrayMenu();
|
||||||
|
|
|
@ -15,7 +15,7 @@ class FormSettings : public QDialog {
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit FormSettings(QWidget *parent = 0);
|
explicit FormSettings(QWidget *parent = 0);
|
||||||
~FormSettings();
|
virtual ~FormSettings();
|
||||||
|
|
||||||
protected slots:
|
protected slots:
|
||||||
// Saves settings into global configuration.
|
// Saves settings into global configuration.
|
||||||
|
|
|
@ -16,7 +16,7 @@ class FormWelcome : public QDialog {
|
||||||
public:
|
public:
|
||||||
// Constructors and destructors.
|
// Constructors and destructors.
|
||||||
explicit FormWelcome(QWidget *parent = 0);
|
explicit FormWelcome(QWidget *parent = 0);
|
||||||
~FormWelcome();
|
virtual ~FormWelcome();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Ui::FormWelcome *m_ui;
|
Ui::FormWelcome *m_ui;
|
||||||
|
|
|
@ -14,7 +14,7 @@ class SystemTrayIcon : public QSystemTrayIcon {
|
||||||
explicit SystemTrayIcon(const QString &normal_icon,
|
explicit SystemTrayIcon(const QString &normal_icon,
|
||||||
const QString &plain_icon,
|
const QString &plain_icon,
|
||||||
FormMain *parent = 0);
|
FormMain *parent = 0);
|
||||||
~SystemTrayIcon();
|
virtual ~SystemTrayIcon();
|
||||||
|
|
||||||
// Returns true if tray icon CAN be constructed on this machine.
|
// Returns true if tray icon CAN be constructed on this machine.
|
||||||
static bool isSystemTrayAvailable();
|
static bool isSystemTrayAvailable();
|
||||||
|
|
Loading…
Add table
Reference in a new issue