mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

cleanup: fold ThemeInterface::setup() into constructor

Browse source 
There appears to be no reason for two-phase initialization.
Let's keep things simple: let the constructor produce a
functioning object.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-03-30 21:33:05 +02:00 committed by Dirk Hohndel
parent 0e9bd27bae
commit 9d485f9626
3 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
mobile-widgets/themeinterface.cpp
View file

@ -50,11 +50,8 @@ ThemeInterface *ThemeInterface::instance()
return self; return self;
} }
void ThemeInterface::setup(QQmlContext *ct) ThemeInterface::ThemeInterface()
{ {
// Register interface class
ct->setContextProperty("subsurfaceTheme", this);
// get current theme // get current theme
m_currentTheme = qPrefDisplay::theme(); m_currentTheme = qPrefDisplay::theme();
update_theme(); update_theme();

3
mobile-widgets/themeinterface.h
View file

@ -36,7 +36,6 @@ class ThemeInterface : public QObject {
public: public:
static ThemeInterface *instance(); static ThemeInterface *instance();
void setup(QQmlContext *ct);
double currentScale(); double currentScale();
public slots: public slots:
@ -66,7 +65,7 @@ signals:
void currentThemeChanged(); void currentThemeChanged();
private: private:
ThemeInterface() {} ThemeInterface();
void update_theme(); void update_theme();
QColor m_backgroundColor; QColor m_backgroundColor;

2
subsurface-helper.cpp
View file

@ -199,7 +199,7 @@ void register_qml_types(QQmlEngine *engine)
// Register qml interface classes // Register qml interface classes
QMLInterface::setup(ct); QMLInterface::setup(ct);
ThemeInterface::instance()->setup(ct); ct->setContextProperty("subsurfaceTheme", ThemeInterface::instance());
} }
REGISTER_TYPE(QMLManager, "QMLManager"); REGISTER_TYPE(QMLManager, "QMLManager");