summaryrefslogtreecommitdiffstats
path: root/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/platformsupport/themes/genericunix/qgenericunixthemes.cpp')
-rw-r--r--src/platformsupport/themes/genericunix/qgenericunixthemes.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
index 0f03ab0e52..026ba11c3d 100644
--- a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
+++ b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
@@ -583,23 +583,23 @@ const char *QGnomeTheme::name = "gnome";
class QGnomeThemePrivate : public QPlatformThemePrivate
{
public:
- QGnomeThemePrivate() : fontsConfigured(false) { }
+ QGnomeThemePrivate() : systemFont(Q_NULLPTR), fixedFont(Q_NULLPTR) {}
+ ~QGnomeThemePrivate() { delete systemFont; delete fixedFont; }
+
void configureFonts(const QString &gtkFontName) const
{
- Q_ASSERT(!fontsConfigured);
+ Q_ASSERT(!systemFont);
const int split = gtkFontName.lastIndexOf(QChar::Space);
float size = gtkFontName.mid(split+1).toFloat();
QString fontName = gtkFontName.left(split);
- systemFont = QFont(fontName, size);
- fixedFont = QFont(QLatin1String("monospace"), systemFont.pointSize());
- fixedFont.setStyleHint(QFont::TypeWriter);
- fontsConfigured = true;
+ systemFont = new QFont(fontName, size);
+ fixedFont = new QFont(QLatin1String("monospace"), systemFont->pointSize());
+ fixedFont->setStyleHint(QFont::TypeWriter);
}
- mutable QFont systemFont;
- mutable QFont fixedFont;
- mutable bool fontsConfigured;
+ mutable QFont *systemFont;
+ mutable QFont *fixedFont;
};
QGnomeTheme::QGnomeTheme()
@@ -638,13 +638,13 @@ QVariant QGnomeTheme::themeHint(QPlatformTheme::ThemeHint hint) const
const QFont *QGnomeTheme::font(Font type) const
{
Q_D(const QGnomeTheme);
- if (!d->fontsConfigured)
+ if (!d->systemFont)
d->configureFonts(gtkFontName());
switch (type) {
case QPlatformTheme::SystemFont:
- return &d->systemFont;
+ return d->systemFont;
case QPlatformTheme::FixedFont:
- return &d->fixedFont;
+ return d->fixedFont;
default:
return 0;
}