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: make members of ThemeInterface non-static

Browse source 
We have a singleton class ThemeInterface, which means that it
is global and exists only once. It's members are static, i.e.
also global. A message from the department of redundancy department?
In any case, that makes no sense. Let's just make these members
local to the class.

I would even rip out the whole singleton thing, since the object
is not accessed anywhere outside from QML. Let's keep it for now.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-03-30 21:01:54 +02:00 • committed by Dirk Hohndel
parent 7f2eaba574
commit 79bf243ec0
3 changed files with 44 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

46
mobile-widgets/themeinterface.h
View file

@ -36,12 +36,12 @@ class themeInterface : public QObject {
public:
static themeInterface *instance();
static void setup(QQmlContext *ct);
static double currentScale();
void setup(QQmlContext *ct);
double currentScale();
public slots:
static void set_currentTheme(const QString &theme);
static void set_currentScale(double);
void set_currentTheme(const QString &theme);
void set_currentScale(double);
signals:
void backgroundColorChanged(QColor);
@ -67,27 +67,27 @@ signals:
private:
themeInterface() {}
static void update_theme();
void update_theme();
static QColor m_backgroundColor;
static QColor m_contrastAccentColor;
static QColor m_darkerPrimaryColor;
static QColor m_darkerPrimaryTextColor;
static QColor m_drawerColor;
static QColor m_lightDrawerColor;
static QColor m_lightPrimaryColor;
static QColor m_lightPrimaryTextColor;
static QColor m_primaryColor;
static QColor m_primaryTextColor;
static QColor m_secondaryTextColor;
static QColor m_textColor;
QColor m_backgroundColor;
QColor m_contrastAccentColor;
QColor m_darkerPrimaryColor;
QColor m_darkerPrimaryTextColor;
QColor m_drawerColor;
QColor m_lightDrawerColor;
QColor m_lightPrimaryColor;
QColor m_lightPrimaryTextColor;
QColor m_primaryColor;
QColor m_primaryTextColor;
QColor m_secondaryTextColor;
QColor m_textColor;
static double m_basePointSize;
static double m_headingPointSize;
static double m_regularPointSize;
static double m_smallPointSize;
static double m_titlePointSize;
double m_basePointSize;
double m_headingPointSize;
double m_regularPointSize;
double m_smallPointSize;
double m_titlePointSize;
static QString m_currentTheme;
QString m_currentTheme;
};
#endif