From 85b4accd824f2fb7a3db7213903591818d8b84e4 Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Mon, 20 Aug 2012 11:12:48 +0200 Subject: Fix multiple enumeration warnings when generating docs Most of these caused by cleaning up enums and not removing omitted values. Also removed some leftovers from qt3support. Change-Id: I75efcc9fadc6a430492bab36e86d7b345d3a6a17 Reviewed-by: J-P Nurmi --- src/widgets/styles/qmacstyle.qdoc | 1 - src/widgets/styles/qstyle.cpp | 16 ---------------- 2 files changed, 17 deletions(-) (limited to 'src/widgets') diff --git a/src/widgets/styles/qmacstyle.qdoc b/src/widgets/styles/qmacstyle.qdoc index 840b22322a..89c67d9809 100644 --- a/src/widgets/styles/qmacstyle.qdoc +++ b/src/widgets/styles/qmacstyle.qdoc @@ -92,7 +92,6 @@ \value SizeLarge \value SizeMini \value SizeDefault - \omitvalue SizeNone */ /*! \fn QMacStyle::QMacStyle() diff --git a/src/widgets/styles/qstyle.cpp b/src/widgets/styles/qstyle.cpp index 836f697442..da8d374538 100644 --- a/src/widgets/styles/qstyle.cpp +++ b/src/widgets/styles/qstyle.cpp @@ -714,15 +714,6 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment, \sa drawPrimitive() */ -/*! - \typedef QStyle::SFlags - \internal -*/ - -/*! - \typedef QStyle::SCFlags - \internal -*/ /*! \enum QStyle::StateFlag @@ -760,7 +751,6 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment, \value State_Small Used to indicate a small style Mac widget or button. \omitvalue State_Window \omitvalue State_Bottom - \omitvalue State_Default \omitvalue State_FocusAtBorder \omitvalue State_Top @@ -1630,8 +1620,6 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment, \value SH_DitherDisabledText Disabled text is dithered as it is on Motif. - \value SH_GUIStyle The GUI style to use. - \value SH_ScrollBar_ContextMenu Whether or not a scroll bar has a context menu. \value SH_ScrollBar_MiddleClickAbsolutePosition A boolean value. @@ -1837,8 +1825,6 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment, \value SH_Dial_BackgroundRole Defines the style's preferred background role (as QPalette::ColorRole) for a dial widget. - \value SH_ScrollBar_BackgroundMode The background mode for a scroll bar. - \value SH_ComboBox_LayoutDirection The layout direction for the combo box. By default it should be the same as indicated by the QStyleOption::direction variable. @@ -1906,8 +1892,6 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment, \value SH_RequestSoftwareInputPanel Determines when a software input panel should be requested by input widgets. Returns an enum of type QStyle::RequestSoftwareInputPanel. - \omitvalue SH_UnderlineAccelerator - \sa styleHint() */ -- cgit v1.2.3