diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2020-03-30 21:33:05 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-03-30 13:54:12 -0700 |
| commit | 9d485f9626135f1297b01b095320b8c134f3a7e9 (patch) | |
| tree | 7c0e075630d0952c1abbf36d1392de1448269155 | |
| parent | 0e9bd27bae00641ce7f2df9dd4d080414b33e3fd (diff) | |
| download | subsurface-9d485f9626135f1297b01b095320b8c134f3a7e9.tar.gz | |
cleanup: fold ThemeInterface::setup() into constructor
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>
| -rw-r--r-- | mobile-widgets/themeinterface.cpp | 5 | ||||
| -rw-r--r-- | mobile-widgets/themeinterface.h | 3 | ||||
| -rw-r--r-- | subsurface-helper.cpp | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/mobile-widgets/themeinterface.cpp b/mobile-widgets/themeinterface.cpp index 68f9564db..9e522b936 100644 --- a/mobile-widgets/themeinterface.cpp +++ b/mobile-widgets/themeinterface.cpp @@ -50,11 +50,8 @@ ThemeInterface *ThemeInterface::instance() return self; } -void ThemeInterface::setup(QQmlContext *ct) +ThemeInterface::ThemeInterface() { - // Register interface class - ct->setContextProperty("subsurfaceTheme", this); - // get current theme m_currentTheme = qPrefDisplay::theme(); update_theme(); diff --git a/mobile-widgets/themeinterface.h b/mobile-widgets/themeinterface.h index e364d74b5..e4e61144f 100644 --- a/mobile-widgets/themeinterface.h +++ b/mobile-widgets/themeinterface.h @@ -36,7 +36,6 @@ class ThemeInterface : public QObject { public: static ThemeInterface *instance(); - void setup(QQmlContext *ct); double currentScale(); public slots: @@ -66,7 +65,7 @@ signals: void currentThemeChanged(); private: - ThemeInterface() {} + ThemeInterface(); void update_theme(); QColor m_backgroundColor; diff --git a/subsurface-helper.cpp b/subsurface-helper.cpp index eb3bcc27a..65a6e9630 100644 --- a/subsurface-helper.cpp +++ b/subsurface-helper.cpp @@ -199,7 +199,7 @@ void register_qml_types(QQmlEngine *engine) // Register qml interface classes QMLInterface::setup(ct); - ThemeInterface::instance()->setup(ct); + ct->setContextProperty("subsurfaceTheme", ThemeInterface::instance()); } REGISTER_TYPE(QMLManager, "QMLManager"); |