mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup: unify idiosyncratic singletons

Browse source 
The way we handle singletons in QML, QML insists on allocating the
objects. This leads to a very idiosyncratic way of handling
singletons: The global instance pointer is set in the constructor.

Unify all these by implementing a "SillySingleton" template. All
of the weird singleton-classes can derive from this template and
don't have to bother with reimplementing the instance() function
with all the safety-checks, etc.

This serves firstly as documentation but also improves debugging
as we will now see wanted and unwanted creation and destruction
of these weird singletons.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-09-22 14:33:33 +02:00 • committed by Dirk Hohndel
parent f20d6187f0
commit 05200f9266
13 changed files with 86 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

5
desktop-widgets/mainwindow.h
View file

@ -21,6 +21,7 @@
#include "desktop-widgets/filterwidget2.h"
#include "core/applicationstate.h"
#include "core/gpslocation.h"
#include "core/singleton.h"
#define NUM_RECENT_FILES 4
@ -42,7 +43,7 @@ class LocationInformationWidget;
typedef std::pair<QByteArray, QVariant> WidgetProperty;
typedef QVector<WidgetProperty> PropertyList;
class MainWindow : public QMainWindow {
class MainWindow : public QMainWindow, public SillySingleton<MainWindow> {
Q_OBJECT
public:
enum {
@ -61,7 +62,6 @@ public:
MainWindow();
~MainWindow();
static MainWindow *instance();
void loadRecentFiles();
void updateRecentFiles();
void updateRecentFilesMenu();
@ -193,7 +193,6 @@ 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);