diff options
Diffstat (limited to 'desktop-widgets/mainwindow.h')
-rw-r--r-- | desktop-widgets/mainwindow.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/desktop-widgets/mainwindow.h b/desktop-widgets/mainwindow.h index 4b91b0dc3..62cc1b6f1 100644 --- a/desktop-widgets/mainwindow.h +++ b/desktop-widgets/mainwindow.h @@ -21,7 +21,6 @@ #include "desktop-widgets/filterwidget2.h" #include "core/applicationstate.h" #include "core/gpslocation.h" -#include "core/singleton.h" #define NUM_RECENT_FILES 4 @@ -43,7 +42,7 @@ class LocationInformationWidget; typedef std::pair<QByteArray, QVariant> WidgetProperty; typedef QVector<WidgetProperty> PropertyList; -class MainWindow : public QMainWindow, public SillySingleton<MainWindow> { +class MainWindow : public QMainWindow { Q_OBJECT public: enum { @@ -62,6 +61,7 @@ public: MainWindow(); ~MainWindow(); + static MainWindow *instance(); void loadRecentFiles(); void updateRecentFiles(); void updateRecentFilesMenu(); @@ -193,6 +193,7 @@ private: QString filter_open(); QString filter_import(); QString filter_import_dive_sites(); + static MainWindow *m_Instance; QString displayedFilename(QString fullFilename); bool askSaveChanges(); bool okToClose(QString message); |