remove unused QStyle::StandardPixmap::SP_VistaShield enum

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/gui/styles/qstyle.cpp b/src/gui/styles/qstyle.cpp
index d91ceed..729b6d6 100644 (file)
--- a/src/gui/styles/qstyle.cpp
+++ b/src/gui/styles/qstyle.cpp
@@ -1879,7 +1879,6 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment,
     \value SP_ArrowBack Equivalent to SP_ArrowLeft when the current layout direction is Qt::LeftToRight, otherwise SP_ArrowRight.
     \value SP_ArrowForward Equivalent to SP_ArrowRight when the current layout direction is Qt::LeftToRight, otherwise SP_ArrowLeft.
     \value SP_CommandLink Icon used to indicate a Vista style command link glyph.
-    \value SP_VistaShield Icon used to indicate UAC prompts on Windows Vista. This will return a null pixmap or icon on all other platforms.
     \value SP_BrowserReload  Icon indicating that the current page should be reloaded.
     \value SP_BrowserStop  Icon indicating that the page loading should stop.
     \value SP_MediaPlay   Icon indicating that media should begin playback.
@@ -2104,10 +2103,7 @@ int QStyle::sliderValueFromPosition(int min, int max, int pos, int span, bool up
      Returns the style's standard palette.
 
     Note that on systems that support system colors, the style's
-    standard palette is not used. In particular, the Windows XP,
-    Vista, and Mac styles do not use the standard palette, but make
-    use of native theme engines. With these styles, you should not set
-    the palette with QApplication::setStandardPalette().
+    standard palette is not used.
 
  */
 QPalette QStyle::standardPalette() const

diff --git a/src/gui/styles/qstyle.h b/src/gui/styles/qstyle.h
index 147c94b..d93b8ff 100644 (file)
--- a/src/gui/styles/qstyle.h
+++ b/src/gui/styles/qstyle.h
@@ -735,7 +735,6 @@ public:
         SP_ArrowForward,
         SP_DirHomeIcon,
         SP_CommandLink,
-        SP_VistaShield,
         SP_BrowserReload,
         SP_BrowserStop,
         SP_MediaPlay,

diff --git a/src/gui/styles/qstylesheetstyle.cpp b/src/gui/styles/qstylesheetstyle.cpp
index 7c990b7..4a3b7d5 100644 (file)
--- a/src/gui/styles/qstylesheetstyle.cpp
+++ b/src/gui/styles/qstylesheetstyle.cpp
@@ -5202,7 +5202,7 @@ int QStyleSheetStyle::styleHint(StyleHint sh, const QStyleOption *opt, const QWi
             if (subRule.hasDrawable())
                 return 1;
             break;
-                                   }
+        }
         case SH_ItemView_ArrowKeysNavigateIntoChildren: s = QLatin1String("arrow-keys-navigate-into-children"); break;
         case SH_ItemView_PaintAlternatingRowColorsForEmptyArea: s = QLatin1String("paint-alternating-row-colors-for-empty-area"); break;
         default: break;