From 488088b95351716f800acfc48e0ca2885950c261 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Mon, 1 Jun 2009 10:26:37 +0200 Subject: Moved originalPalette member from public to private class. --- src/gui/styles/qs60style.cpp | 9 +++++---- src/gui/styles/qs60style.h | 1 - src/gui/styles/qs60style_p.h | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index 930602b..58ee29f 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -2589,17 +2589,18 @@ void QS60Style::unpolish(QWidget *widget) void QS60Style::polish(QApplication *application) { - Q_D(const QS60Style); - originalPalette = application->palette(); + Q_D(QS60Style); + d->m_originalPalette = application->palette(); d->setThemePalette(application); } void QS60Style::unpolish(QApplication *application) { Q_UNUSED(application) - QPalette newPalette = qApp->style()->standardPalette(); + Q_D(QS60Style); + const QPalette newPalette = QApplication::style()->standardPalette(); application->setPalette(newPalette); - QApplicationPrivate::setSystemPalette(originalPalette); + QApplicationPrivate::setSystemPalette(d->m_originalPalette); } void QS60Style::setStyleProperty(const char *name, const QVariant &value) diff --git a/src/gui/styles/qs60style.h b/src/gui/styles/qs60style.h index 09c6b00..f6e5473 100644 --- a/src/gui/styles/qs60style.h +++ b/src/gui/styles/qs60style.h @@ -70,7 +70,6 @@ protected slots: private: Q_DISABLE_COPY(QS60Style) friend class QStyleFactory; - QPalette originalPalette; }; #endif // QT_NO_STYLE_S60 diff --git a/src/gui/styles/qs60style_p.h b/src/gui/styles/qs60style_p.h index c93d271..8a872fc 100644 --- a/src/gui/styles/qs60style_p.h +++ b/src/gui/styles/qs60style_p.h @@ -438,6 +438,7 @@ private: // Contains background texture. static QPixmap *m_background; const static SkinElementFlags KDefaultSkinElementFlags; + QPalette m_originalPalette; }; QT_END_NAMESPACE -- cgit v0.12