diff options
| author | Alessandro Portale <aportale@trolltech.com> | 2009-06-05 13:58:30 (GMT) |
|---|---|---|
| committer | Alessandro Portale <aportale@trolltech.com> | 2009-06-05 13:58:30 (GMT) |
| commit | d0a2a16bfe73c4281277397dec0fdc8ca201f0fa (patch) | |
| tree | a9d70225ba347a84a7a51e0043dc511d90b2fcac /src/gui/styles/qs60style_p.h | |
| parent | 426dc2fbefa8a901778c5fbafe6fb9ac61c4a004 (diff) | |
| download | Qt-d0a2a16bfe73c4281277397dec0fdc8ca201f0fa.zip Qt-d0a2a16bfe73c4281277397dec0fdc8ca201f0fa.tar.gz Qt-d0a2a16bfe73c4281277397dec0fdc8ca201f0fa.tar.bz2 | |
Prevent double deletion of m_themePalette
RevBy: Sami Merila
Diffstat (limited to 'src/gui/styles/qs60style_p.h')
| -rw-r--r-- | src/gui/styles/qs60style_p.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/styles/qs60style_p.h b/src/gui/styles/qs60style_p.h index 385c6e8..54da9e8 100644 --- a/src/gui/styles/qs60style_p.h +++ b/src/gui/styles/qs60style_p.h @@ -410,7 +410,7 @@ public: static bool isToolBarBackground(); // calculates average color based on button skin graphics (minus borders). - QColor colorFromFrameGraphics(QS60StylePrivate::SkinFrameElements frame) const; + QColor colorFromFrameGraphics(SkinFrameElements frame) const; //set theme palette for application void setThemePalette(QApplication *application) const; @@ -432,7 +432,7 @@ public: static const int m_numberOfLayouts; mutable QHash<QPair<QS60StyleEnums::FontCategories , int>, QFont> m_mappedFontsCache; - mutable QHash<QS60StylePrivate::SkinFrameElements, QColor> m_colorCache; + mutable QHash<SkinFrameElements, QColor> m_colorCache; // Has one entry per SkinFrameElements static const struct frameElementCenter { @@ -465,7 +465,8 @@ private: void setThemePalette(QWidget *widget) const; void setThemePalette(QPalette *palette) const; void setThemePaletteHash(QPalette *palette) const; - static void QS60StylePrivate::storeThemePalette(QPalette *palette); + static void storeThemePalette(QPalette *palette); + static void deleteThemePalette(); static QSize partSize(QS60StyleEnums::SkinParts part, SkinElementFlags flags = KDefaultSkinElementFlags); |