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

core: remove double definition of enum cloud_storage_status

Browse source 
Remove cloud_storage_status from qmlprefs.h.
usage to qPref::

enum cloud_storage_status is not used from C, but only from C++, and
having the same structure defined multiple times is a maintenance
challenge.

Signed-off-by: Jan Iversen <jani@apache.org>
This commit is contained in:
jan Iversen 2018-06-16 10:08:34 +02:00 • committed by Dirk Hohndel
parent d02a03983d
commit 2f95141330
8 changed files with 45 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

13
core/settings/qPref.cpp
View file

@ -2,17 +2,16 @@
#include "qPref_private.h"
#include "qPref.h"
qPref *qPref::m_instance = NULL;
qPref::qPref(QObject *parent) :
QObject(parent)
{
}
qPref *qPref::instance()
{
if (!m_instance)
m_instance = new qPref;
return m_instance;
static qPref *self = new qPref;
return self;
}
void qPref::loadSync(bool doSync)
{
}

5
core/settings/qPref.h
View file

@ -7,10 +7,10 @@
class qPref : public QObject {
Q_OBJECT
Q_ENUMS(cloud_status);
public:
qPref(QObject *parent = NULL) : QObject(parent) {};
~qPref() {};
qPref(QObject *parent = NULL);
static qPref *instance();
// Load/Sync local settings (disk) and struct preference
@ -19,7 +19,6 @@ public:
public:
private:
static qPref *m_instance;
};
#endif