QStylePrivate cleanup

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/gui/styles/qproxystyle.cpp b/src/gui/styles/qproxystyle.cpp
index d7e59e3..c40a7e1 100644 (file)
--- a/src/gui/styles/qproxystyle.cpp
+++ b/src/gui/styles/qproxystyle.cpp
@@ -82,7 +82,7 @@ void QProxyStylePrivate::ensureBaseStyle() const
     if (baseStyle)
         return;
 
-    if (!baseStyle && !QApplicationPrivate::styleOverride.isEmpty()) {
+    if (!QApplicationPrivate::styleOverride.isEmpty()) {
         baseStyle = QStyleFactory::create(QApplicationPrivate::styleOverride);
         if (baseStyle) {
             // If baseStyle is an instance of the same proxyStyle

diff --git a/src/gui/styles/qstyle_p.h b/src/gui/styles/qstyle_p.h
index b11fc03..4d1b493 100644 (file)
--- a/src/gui/styles/qstyle_p.h
+++ b/src/gui/styles/qstyle_p.h
@@ -67,8 +67,7 @@ class QStylePrivate: public QObjectPrivate
     Q_DECLARE_PUBLIC(QStyle)
 public:
     inline QStylePrivate()
-        : layoutSpacingIndex(-1), proxyStyle(0) {}
-    mutable int layoutSpacingIndex;
+        : proxyStyle(0) {}
     QStyle *proxyStyle;
 };