diff options
| -rw-r--r-- | mobile-widgets/themeinterface.cpp | 14 | ||||
| -rw-r--r-- | mobile-widgets/themeinterface.h | 6 | ||||
| -rw-r--r-- | subsurface-helper.cpp | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/mobile-widgets/themeinterface.cpp b/mobile-widgets/themeinterface.cpp index 905262f89..d76e09aaa 100644 --- a/mobile-widgets/themeinterface.cpp +++ b/mobile-widgets/themeinterface.cpp @@ -44,13 +44,13 @@ static const QColor DARK_PRIMARY_TEXT_COLOR = "#ECECEC"; static const QColor DARK_SECONDARY_TEXT_COLOR = "#757575"; static const QColor DARK_TEXT_COLOR = "#ECECEC"; -themeInterface *themeInterface::instance() +ThemeInterface *ThemeInterface::instance() { - static themeInterface *self = new themeInterface; + static ThemeInterface *self = new ThemeInterface; return self; } -void themeInterface::setup(QQmlContext *ct) +void ThemeInterface::setup(QQmlContext *ct) { // Register interface class ct->setContextProperty("subsurfaceTheme", this); @@ -67,7 +67,7 @@ void themeInterface::setup(QQmlContext *ct) set_currentScale(qPrefDisplay::mobile_scale()); } -void themeInterface::set_currentTheme(const QString &theme) +void ThemeInterface::set_currentTheme(const QString &theme) { m_currentTheme = theme; qPrefDisplay::set_theme(m_currentTheme); @@ -75,11 +75,11 @@ void themeInterface::set_currentTheme(const QString &theme) emit currentThemeChanged(theme); } -double themeInterface::currentScale() +double ThemeInterface::currentScale() { return qPrefDisplay::mobile_scale(); } -void themeInterface::set_currentScale(double newScale) +void ThemeInterface::set_currentScale(double newScale) { if (newScale != qPrefDisplay::mobile_scale()) { qPrefDisplay::set_mobile_scale(newScale); @@ -103,7 +103,7 @@ void themeInterface::set_currentScale(double newScale) emit titlePointSizeChanged(m_titlePointSize); } -void themeInterface::update_theme() +void ThemeInterface::update_theme() { if (m_currentTheme == "Blue") { m_backgroundColor = BLUE_BACKGROUND_COLOR; diff --git a/mobile-widgets/themeinterface.h b/mobile-widgets/themeinterface.h index 622ce5eaa..1fb0c8186 100644 --- a/mobile-widgets/themeinterface.h +++ b/mobile-widgets/themeinterface.h @@ -6,7 +6,7 @@ #include <QSettings> #include <QQmlContext> -class themeInterface : public QObject { +class ThemeInterface : public QObject { Q_OBJECT // Color themes @@ -35,7 +35,7 @@ class themeInterface : public QObject { Q_PROPERTY(QString currentTheme MEMBER m_currentTheme WRITE set_currentTheme NOTIFY currentThemeChanged) public: - static themeInterface *instance(); + static ThemeInterface *instance(); void setup(QQmlContext *ct); double currentScale(); @@ -66,7 +66,7 @@ signals: void currentThemeChanged(const QString &); private: - themeInterface() {} + ThemeInterface() {} void update_theme(); QColor m_backgroundColor; diff --git a/subsurface-helper.cpp b/subsurface-helper.cpp index 01637679a..eb3bcc27a 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); + ThemeInterface::instance()->setup(ct); } REGISTER_TYPE(QMLManager, "QMLManager"); |