Update style API to function without an active widget object

3 files changed, 453 insertions, 54 deletions

diff --git a/src/kernel/qstyle.cpp b/src/kernel/qstyle.cpp
index 8c150d5..f8c0fd9 100644
--- a/src/kernel/qstyle.cpp
+++ b/src/kernel/qstyle.cpp
@@ -802,11 +802,14 @@ void QStyle::drawItem( QPainter *p, const QRect &r,
 */
 
 /*!
-    \fn void QStyle::drawPrimitive( PrimitiveElement pe, QPainter *p, const QRect &r, const QColorGroup &cg, SFlags flags, const QStyleOption& opt) const
+    \fn void QStyle::drawPrimitive( PrimitiveElement pe, QPainter *p, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QRect &r, const QColorGroup &cg, SFlags flags, const QStyleOption& opt) const
 
     Draws the style PrimitiveElement \a pe using the painter \a p in
     the area \a r. Colors are used from the color group \a cg.
 
+    \a ceData and \a elementFlags provide additional information about
+    the widget for which the PrimitiveElement is being drawn.
+
     The rect \a r should be in screen coordinates.
 
     The \a flags argument is used to control how the PrimitiveElement
@@ -932,20 +935,25 @@ void QStyle::drawItem( QPainter *p, const QRect &r,
 */
 
 /*!
-    \fn void QStyle::drawControl( ControlElement element, QPainter *p, const QWidget *widget, const QRect &r, const QColorGroup &cg, SFlags how, const QStyleOption& opt) const
+    \fn void QStyle::drawControl( ControlElement element, QPainter *p, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QRect &r, const QColorGroup &cg, SFlags how, const QStyleOption& opt, const QWidget *widget) const
 
     Draws the ControlElement \a element using the painter \a p in the
     area \a r. Colors are used from the color group \a cg.
 
     The rect \a r should be in screen coordinates.
 
+    \a ceData and \a elementFlags provide additional information about
+    the widget for which the PrimitiveElement is being drawn.
+
     The \a how argument is used to control how the ControlElement is
     drawn. Multiple flags can be OR'ed together. See the table below
     for an explanation of which flags are used with the various
     ControlElements.
 
     The \a widget argument is a pointer to a QWidget or one of its
-    subclasses. The widget can be cast to the appropriate type based
+    subclasses. Note that usage of the widget argument is deprecated
+    in favor of specifying widget parameters via \a ceData and \a elementFlags.
+    The widget can be cast to the appropriate type based
     on the value of \a element. The \a opt argument can be used to
     pass extra information required when drawing the ControlElement.
     Note that \a opt may be the default value even for ControlElements
@@ -1086,14 +1094,19 @@ void QStyle::drawItem( QPainter *p, const QRect &r,
 */
 
 /*!
-    \fn void QStyle::drawControlMask( ControlElement element, QPainter *p, const QWidget *widget, const QRect &r, const QStyleOption& opt) const
+    \fn void QStyle::drawControlMask( ControlElement element, QPainter *p, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QRect &r, const QStyleOption& opt, const QWidget *widget) const
 
     Draw a bitmask for the ControlElement \a element using the painter
     \a p in the area \a r. See drawControl() for an explanation of the
     use of the \a widget and \a opt arguments.
 
+    \a ceData and \a elementFlags provide additional information about
+    the widget for which the PrimitiveElement is being drawn.
+
     The rect \a r should be in screen coordinates.
 
+    \a widget is deprecated and should not be used.
+
     \sa drawControl(), ControlElement
 */
 
@@ -1154,15 +1167,19 @@ void QStyle::drawItem( QPainter *p, const QRect &r,
 */
 
 /*!
-    \fn QRect QStyle::subRect( SubRect subrect, const QWidget *widget ) const;
+    \fn QRect QStyle::subRect( SubRect subrect, const QStyleControlElementData ceData, const ControlElementFlags elementFlags, const QWidget *widget ) const;
 
     Returns the sub-area \a subrect for the \a widget in logical
     coordinates.
 
+    \a ceData and \a elementFlags provide additional information about
+    the widget for which the PrimitiveElement is being drawn.
+
     The \a widget argument is a pointer to a QWidget or one of its
-    subclasses. The widget can be cast to the appropriate type based
-    on the value of \a subrect. See the table below for the
-    appropriate \a widget casts:
+    subclasses. Note that usage of \a widget is deprecated in favor
+    of \a ceData and \a elementFlags. The widget can be cast to the
+    appropriate type based on the value of \a subrect. See the table
+    below for the appropriate \a widget casts:
 
     \table
     \header \i SubRect \i Widget Cast
@@ -1282,7 +1299,7 @@ void QStyle::drawItem( QPainter *p, const QRect &r,
 */
 
 /*!
-    \fn void QStyle::drawComplexControl( ComplexControl control, QPainter *p, const QWidget *widget, const QRect &r, const QColorGroup &cg, SFlags how, SCFlags sub, SCFlags subActive, const QStyleOption& opt ) const
+    \fn void QStyle::drawComplexControl( ComplexControl control, QPainter *p, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QRect &r, const QColorGroup &cg, SFlags how, SCFlags sub, SCFlags subActive, const QStyleOption& opt, const QWidget *widget ) const
 
     Draws the ComplexControl \a control using the painter \a p in the
     area \a r. Colors are used from the color group \a cg. The \a sub
@@ -1295,6 +1312,9 @@ void QStyle::drawItem( QPainter *p, const QRect &r,
     coordinates into screen coordinates when using drawPrimitive() and
     drawControl().
 
+    \a ceData and \a elementFlags provide additional information about
+    the widget for which the PrimitiveElement is being drawn.
+
     The \a how argument is used to control how the ComplexControl is
     drawn. Multiple flags can OR'ed together. See the table below for
     an explanation of which flags are used with the various
@@ -1302,11 +1322,13 @@ void QStyle::drawItem( QPainter *p, const QRect &r,
 
     The \a widget argument is a pointer to a QWidget or one of its
     subclasses. The widget can be cast to the appropriate type based
-    on the value of \a control. The \a opt argument can be used to
-    pass extra information required when drawing the ComplexControl.
-    Note that \a opt may be the default value even for ComplexControls
-    that can make use of the extra options. See the table below for
-    the appropriate \a widget and \a opt usage:
+    on the value of \a control. Note that usage of \a widget is
+    deprecated in favor of \a ceData and \a elementFlags.  The \a opt
+    argument can be used to pass extra information required when
+    drawing the ComplexControl. Note that \a opt may be the default
+    value even for ComplexControls that can make use of the extra
+    options. See the table below for the appropriate \a widget and
+    \a opt usage:
 
     \table
     \header \i ComplexControl<br>\& Widget Cast
@@ -1375,26 +1397,34 @@ void QStyle::drawItem( QPainter *p, const QRect &r,
 */
 
 /*!
-    \fn void QStyle::drawComplexControlMask( ComplexControl control, QPainter *p, const QWidget *widget, const QRect &r, const QStyleOption& opt) const
+    \fn void QStyle::drawComplexControlMask( ComplexControl control, QPainter *p, const QStyleControlElementData ceData, const ControlElementFlags elementFlags, const QRect &r, const QStyleOption& opt, const QWidget *widget) const
 
     Draw a bitmask for the ComplexControl \a control using the painter
     \a p in the area \a r. See drawComplexControl() for an explanation
     of the use of the \a widget and \a opt arguments.
 
+    \a ceData and \a elementFlags provide additional information about
+    the widget for which the PrimitiveElement is being drawn.
+
     The rect \a r should be in logical coordinates. Reimplementations
     of this function should use visualRect() to change the logical
     corrdinates into screen coordinates when using drawPrimitive() and
     drawControl().
 
+    Note that usage of \a widget is deprecated in favor of \a ceData and \a elementFlags.
+
     \sa drawComplexControl() ComplexControl
 */
 
 /*!
-    \fn QRect QStyle::querySubControlMetrics( ComplexControl control, const QWidget *widget, SubControl subcontrol, const QStyleOption& opt = QStyleOption::Default ) const;
+    \fn QRect QStyle::querySubControlMetrics( ComplexControl control, QStyleControlElementData ceData, ControlElementFlags elementFlags, SubControl subcontrol, const QStyleOption& opt = QStyleOption::Default, const QWidget *widget = 0 ) const;
 
     Returns the rect for the SubControl \a subcontrol for \a widget in
     logical coordinates.
 
+    \a ceData and \a elementFlags provide additional information about
+    the widget for which the PrimitiveElement is being drawn.
+
     The \a widget argument is a pointer to a QWidget or one of its
     subclasses. The widget can be cast to the appropriate type based
     on the value of \a control. The \a opt argument can be used to
@@ -1403,11 +1433,13 @@ void QStyle::drawItem( QPainter *p, const QRect &r,
     that can make use of the extra options. See drawComplexControl()
     for an explanation of the \a widget and \a opt arguments.
 
+    Note that usage of \a widget is deprecated in favor of \a ceData and \a elementFlags.
+
     \sa drawComplexControl(), ComplexControl, SubControl
 */
 
 /*!
-    \fn SubControl QStyle::querySubControl( ComplexControl control, const QWidget *widget, const QPoint &pos, const QStyleOption& opt = QStyleOption::Default ) const;
+    \fn SubControl QStyle::querySubControl( ComplexControl control, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QPoint &pos, const QStyleOption& opt = QStyleOption::Default, const QWidget *widget = 0 ) const;
 
     Returns the SubControl for \a widget at the point \a pos. The \a
     widget argument is a pointer to a QWidget or one of its
@@ -1418,11 +1450,16 @@ void QStyle::drawItem( QPainter *p, const QRect &r,
     that can make use of the extra options. See drawComplexControl()
     for an explanation of the \a widget and \a opt arguments.
 
+    \a ceData and \a elementFlags provide additional information about
+    the widget for which the PrimitiveElement is being drawn.
+
     Note that \a pos is passed in screen coordinates. When using
     querySubControlMetrics() to check for hits and misses, use
     visualRect() to change the logical coordinates into screen
     coordinates.
 
+    Note that usage of \a widget is deprecated in favor of \a ceData and \a elementFlags.
+
     \sa drawComplexControl(), ComplexControl, SubControl, querySubControlMetrics()
 */
 
@@ -1528,14 +1565,20 @@ void QStyle::drawItem( QPainter *p, const QRect &r,
 */
 
 /*!
-    \fn int QStyle::pixelMetric( PixelMetric metric, const QWidget *widget = 0 ) const;
+    \fn int QStyle::pixelMetric( PixelMetric metric, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QWidget *widget = 0 ) const;
+
+    Returns the pixel metric for \a metric.
 
-    Returns the pixel metric for \a metric. The \a widget argument is
-    a pointer to a QWidget or one of its subclasses. The widget can be
-    cast to the appropriate type based on the value of \a metric. Note
-    that \a widget may be zero even for PixelMetrics that can make use
-    of \a widget. See the table below for the appropriate \a widget
-    casts:
+    \a ceData and \a elementFlags provide additional information about
+    the widget for which the PrimitiveElement is being drawn.
+
+    The \a widget argument is a pointer to a QWidget or one of its
+    subclasses. The widget can be cast to the appropriate type based
+    on the value of \a metric. Note that \a widget may be zero even
+    for PixelMetrics that can make use of \a widget. Note also that
+    usage of \a widget is deprecated in favor of \a ceData and
+    \a elementFlags.  See the table below for the appropriate
+    \a widget casts:
 
     \table
     \header \i PixelMetric \i Widget Cast
@@ -1584,18 +1627,22 @@ void QStyle::drawItem( QPainter *p, const QRect &r,
 */
 
 /*!
-    \fn QSize QStyle::sizeFromContents( ContentsType contents, const QWidget *widget, const QSize &contentsSize, const QStyleOption& opt = QStyleOption::Default ) const;
+    \fn QSize QStyle::sizeFromContents( ContentsType contents, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QSize &contentsSize, const QStyleOption& opt = QStyleOption::Default, const QWidget *widget = 0 ) const;
 
     Returns the size of \a widget based on the contents size \a
     contentsSize.
 
+    \a ceData and \a elementFlags provide additional information about
+    the widget for which the PrimitiveElement is being drawn.
+
     The \a widget argument is a pointer to a QWidget or one of its
     subclasses. The widget can be cast to the appropriate type based
     on the value of \a contents. The \a opt argument can be used to
     pass extra information required when calculating the size. Note
     that \a opt may be the default value even for ContentsTypes that
-    can make use of the extra options. See the table below for the
-    appropriate \a widget and \a opt usage:
+    can make use of the extra options. Note that usage of \a widget
+    is deprecated in favor of \a ceData and \a elementFlags. See the
+    table below for the appropriate \a widget and \a opt usage:
 
     \table
     \header \i ContentsType \i Widget Cast \i Options \i Notes
@@ -1770,12 +1817,18 @@ void QStyle::drawItem( QPainter *p, const QRect &r,
 */
 
 /*!
-    \fn int QStyle::styleHint( StyleHint stylehint, const QWidget *widget = 0, const QStyleOption &opt = QStyleOption::Default, QStyleHintReturn *returnData = 0 ) const;
+    \fn int QStyle::styleHint( StyleHint stylehint, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QStyleOption &opt = QStyleOption::Default, QStyleHintReturn *returnData = 0, const QWidget *widget = 0 ) const;
 
     Returns the style hint \a stylehint for \a widget. Currently, \a
     widget, \a opt, and \a returnData are unused; they're included to
     allow for future enhancements.
 
+    \a ceData and \a elementFlags provide additional information about
+    the widget for which the PrimitiveElement is being drawn.
+
+    Note that usage of \a widget is deprecated in favor of \a ceData
+    and \a elementFlags.
+
     For an explanation of the return value see \l StyleHint.
 */
 
@@ -1811,10 +1864,13 @@ void QStyle::drawItem( QPainter *p, const QRect &r,
 */
 
 /*!
-    \fn QPixmap QStyle::stylePixmap( StylePixmap stylepixmap, const QWidget *widget = 0, const QStyleOption& opt = QStyleOption::Default ) const;
+    \fn QPixmap QStyle::stylePixmap( StylePixmap stylepixmap, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QStyleOption& opt = QStyleOption::Default, const QWidget *widget = 0 ) const;
 
     Returns a pixmap for \a stylepixmap.
 
+    \a ceData and \a elementFlags provide additional information about
+    the widget for which the PrimitiveElement is being drawn.
+
     The \a opt argument can be used to pass extra information required
     when drawing the ControlElement. Note that \a opt may be the
     default value even for StylePixmaps that can make use of the extra
@@ -1822,8 +1878,9 @@ void QStyle::drawItem( QPainter *p, const QRect &r,
 
     The \a widget argument is a pointer to a QWidget or one of its
     subclasses. The widget can be cast to the appropriate type based
-    on the value of \a stylepixmap. See the table below for the
-    appropriate \a widget casts:
+    on the value of \a stylepixmap. Note that usage of \a widget is
+    deprecated in favor of \a ceData and \a elementFlags.See the table
+    below for the appropriate \a widget casts:
 
     \table
     \header \i StylePixmap \i Widget Cast
@@ -1847,11 +1904,33 @@ void QStyle::drawItem( QPainter *p, const QRect &r,
     function is provided to aid style implementors in supporting
     right-to-left mode.
 
+    Note that this function is deprecated in favor of visualRect( const QRect &logical, const QStyleControlElementData ceData, const ControlElementFlags elementFlags );
+
     \sa QApplication::reverseLayout()
 */
 QRect QStyle::visualRect( const QRect &logical, const QWidget *w )
 {
-    QRect boundingRect = w->rect();
+    QStyleControlElementData ceData;
+    ceData.rect = w->rect();
+    return visualRect(logical, ceData, CEF_None);
+}
+
+/*!
+    \fn QRect QStyle::visualRect( const QRect &logical, const QStyleControlElementData ceData, const ControlElementFlags elementFlags );
+
+    Returns the rect \a logical in screen coordinates. The bounding
+    rect for the widget described by \a ceData and \a elementFlags
+    is used to perform the translation. This function is provided to
+    aid style implementors in supporting
+    right-to-left mode.
+
+    \sa QApplication::reverseLayout()
+*/
+QRect QStyle::visualRect( const QRect &logical, const QStyleControlElementData ceData, const ControlElementFlags elementFlags )
+{
+    Q_UNUSED(elementFlags)
+
+    QRect boundingRect = ceData.rect;
     QRect r = logical;
     if ( QApplication::reverseLayout() )
 	r.moveBy( 2*(boundingRect.right() - logical.right()) +
diff --git a/src/kernel/qstyle.h b/src/kernel/qstyle.h
index 64152ed..9a10b7f 100644
--- a/src/kernel/qstyle.h
+++ b/src/kernel/qstyle.h
@@ -42,11 +42,19 @@
 
 #ifndef QT_H
 #include "qobject.h"
+#include "qpixmap.h"
+#include "qcolor.h"
+#include "qiconset.h"
+#include "qtabbar.h"
+#include "qtoolbutton.h"
 #endif // QT_H
 
 
 #ifndef QT_NO_STYLE
 
+/* DEV ONLY */
+/* #define MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED 1 */
+
 class QPopupMenu;
 class QStylePrivate;
 class QMenuItem;
@@ -58,26 +66,26 @@ class QStyleOption {
 public:
     enum StyleOptionDefault { Default };
 
-    QStyleOption(StyleOptionDefault=Default) : def(TRUE) {}
+    QStyleOption(StyleOptionDefault=Default) : def(TRUE), tb(NULL) {}
 
     // Note: we don't use default arguments since that is unnecessary
     // initialization.
     QStyleOption(int in1) :
-	def(FALSE), i1(in1) {}
+	def(FALSE), tb(NULL), i1(in1) {}
     QStyleOption(int in1, int in2) :
-	def(FALSE), i1(in1), i2(in2) {}
+	def(FALSE), tb(NULL), i1(in1), i2(in2) {}
     QStyleOption(int in1, int in2, int in3, int in4) :
-	def(FALSE), i1(in1), i2(in2), i3(in3), i4(in4) {}
-    QStyleOption(QMenuItem* m) : def(FALSE), mi(m) {}
-    QStyleOption(QMenuItem* m, int in1) : def(FALSE), mi(m), i1(in1) {}
-    QStyleOption(QMenuItem* m, int in1, int in2) : def(FALSE), mi(m), i1(in1), i2(in2) {}
-    QStyleOption(const QColor& c) : def(FALSE), cl(&c) {}
+	def(FALSE), tb(NULL), i1(in1), i2(in2), i3(in3), i4(in4) {}
+    QStyleOption(QMenuItem* m) : def(FALSE), mi(m), tb(NULL) {}
+    QStyleOption(QMenuItem* m, int in1) : def(FALSE), mi(m), tb(NULL), i1(in1) {}
+    QStyleOption(QMenuItem* m, int in1, int in2) : def(FALSE), mi(m), tb(NULL), i1(in1), i2(in2) {}
+    QStyleOption(const QColor& c) : def(FALSE), tb(NULL), cl(&c) {}
     QStyleOption(QTab* t) : def(FALSE), tb(t) {}
-    QStyleOption(QListViewItem* i) : def(FALSE), li(i) {}
-    QStyleOption(QCheckListItem* i) : def(FALSE), cli(i) {}
-    QStyleOption(Qt::ArrowType a) : def(FALSE), i1((int)a) {}
-    QStyleOption(const QRect& r) : def(FALSE), i1(r.x()), i2(r.y()), i3(r.width()),i4(r.height()){}
-    QStyleOption(QWidget *w) : def(FALSE), p1((void*)w) {}
+    QStyleOption(QListViewItem* i) : def(FALSE), tb(NULL), li(i) {}
+    QStyleOption(QCheckListItem* i) : def(FALSE), tb(NULL), cli(i) {}
+    QStyleOption(Qt::ArrowType a) : def(FALSE), tb(NULL), i1((int)a) {}
+    QStyleOption(const QRect& r) : def(FALSE), tb(NULL), i1(r.x()), i2(r.y()), i3(r.width()),i4(r.height()){}
+    QStyleOption(QWidget *w) : def(FALSE), tb(NULL), p1((void*)w) {}
 
     bool isDefault() const { return def; }
 
@@ -121,6 +129,118 @@ private:
 
 class QStyleHintReturn; // not defined yet
 
+typedef QMap<Q_UINT32, QSize> DialogButtonSizeMap;
+typedef QMap<Q_INT32, Q_INT32> TabIdentifierIndexMap;
+
+class QStyleControlElementPopupMenuData {
+	public:
+		//
+};
+
+class QStyleControlElementTabBarData {
+	public:
+		int tabCount;
+		QTabBar::Shape shape;
+		TabIdentifierIndexMap identIndexMap;
+};
+
+class QStyleControlElementListViewData {
+	public:
+		bool rootDecorated;
+		int itemMargin;
+};
+
+class QStyleControlElementSpinWidgetData {
+	public:
+		Q_UINT32 buttonSymbols;
+		QRect upRect;
+		QRect downRect;
+		bool upEnabled;
+		bool downEnabled;
+};
+
+class QStyleControlElementTitleBarData {
+	public:
+		bool hasWindow;
+		bool usesActiveColor;
+		int windowState;
+		QString visibleText;
+};
+
+class QStyleControlElementDockWidgetData {
+	public:
+		bool hasDockArea;
+		bool closeEnabled;
+		Qt::Orientation areaOrientation;
+};
+
+class QStyleControlElementGenericWidgetData {
+	public:
+		QStringList widgetObjectTypes;
+		Qt::WFlags wflags;
+		QPixmap bgPixmap;
+		QBrush bgBrush;
+		QColor bgColor;
+		QPoint bgOffset;
+		Qt::BackgroundMode backgroundMode;
+		QColor fgColor;
+		QColorGroup colorGroup;
+		QRect geometry;
+		QRect rect;
+		QPoint pos;
+		QPixmap icon;
+		QPalette palette;
+		QFont font;
+};
+
+class QStyleControlElementData {
+	public:
+		QStringList widgetObjectTypes;
+		Qt::WFlags wflags;
+		QPixmap bgPixmap;
+		QBrush bgBrush;
+		QColor bgColor;
+		QPoint bgOffset;
+		Qt::BackgroundMode backgroundMode;
+		QPixmap fgPixmap;
+		QColor fgColor;
+		QColorGroup colorGroup;
+		QRect geometry;
+		QRect rect;
+		QPoint pos;
+		QPixmap icon;
+		QIconSet iconSet;
+		QString text;
+		Qt::Orientation orientation;
+		QColor activeItemPaletteBgColor;
+		QPalette palette;
+		int totalSteps;
+		int currentStep;
+		Q_UINT32 tickMarkSetting;
+		int tickInterval;
+		int minSteps;
+		int maxSteps;
+		int startStep;
+		int pageStep;
+		int lineStep;
+		int dlgVisibleButtons;
+		DialogButtonSizeMap dlgVisibleSizeHints;
+		QString progressText;
+		QString textLabel;
+		QFont font;
+		int percentageVisible;
+		QStyleControlElementDockWidgetData dwData;
+		QToolButton::TextPosition toolButtonTextPosition;
+		int popupDelay;
+		QStyleControlElementTitleBarData titleBarData;
+		QStyleControlElementSpinWidgetData spinWidgetData;
+		QStyleControlElementGenericWidgetData parentWidgetData;
+		QStyleControlElementGenericWidgetData viewportData;
+		QStyleControlElementListViewData listViewData;
+		QStyleControlElementTabBarData tabBarData;
+		Q_UINT32 comboBoxLineEditFlags;
+};
+
 class Q_EXPORT QStyle: public QObject
 {
     Q_OBJECT
@@ -151,6 +271,30 @@ public:
 			   const QPixmap *pixmap, const QString &text,
 			   int len = -1, const QColor *penColor = 0 ) const;
 
+    enum ControlElementFlags {
+	CEF_None			= 0x00000000,
+	CEF_IsDefault			= 0x00000001,
+	CEF_AutoDefault			= 0x00000002,
+	CEF_IsActive			= 0x00000004,
+	CEF_IsDown			= 0x00000008,
+	CEF_IsOn			= 0x00000010,
+	CEF_IsEnabled			= 0x00000020,
+	CEF_BiState			= 0x00000040,
+	CEF_HasFocus			= 0x00000080,
+	CEF_IsMenuWidget		= 0x00000100,
+	CEF_IsContainerEmpty		= 0x00000200,
+	CEF_CenterIndicator		= 0x00000400,
+	CEF_IndicatorFollowsStyle	= 0x00000800,
+	CEF_UsesTextLabel		= 0x00001000,
+	CEF_UsesBigPixmap		= 0x00002000,
+	CEF_UseGenericParameters	= 0x00004000,
+	CEF_HasParentWidget		= 0x00008000,
+	CEF_HasPopupMenu		= 0x00010000,
+	CEF_IsCheckable			= 0x00020000,
+	CEF_HasFocusProxy		= 0x00040000,
+	CEF_IsEditable			= 0x00080000,
+	CEF_IsFlat			= 0x00100000
+    };
 
     enum PrimitiveElement {
 	PE_ButtonCommand,
@@ -252,6 +396,11 @@ public:
     };
     typedef uint SFlags;
 
+    // Old API
+    // DEPRECATED
+#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
+    __attribute__ ((deprecated))
+#endif
     virtual void drawPrimitive( PrimitiveElement pe,
 				QPainter *p,
 				const QRect &r,
@@ -259,6 +408,16 @@ public:
 				SFlags flags = Style_Default,
 				const QStyleOption& = QStyleOption::Default ) const = 0;
 
+    // New API
+    virtual void drawPrimitive( PrimitiveElement pe,
+				QPainter *p,
+				QStyleControlElementData ceData,
+				ControlElementFlags elementFlags,
+				const QRect &r,
+				const QColorGroup &cg,
+				SFlags flags = Style_Default,
+				const QStyleOption& = QStyleOption::Default ) const = 0;
+
 
     enum ControlElement {
 	CE_PushButton,
@@ -294,6 +453,11 @@ public:
 	CE_CustomBase =		0xf0000000
     };
 
+    // Old API
+    // DEPRECATED
+#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
+    __attribute__ ((deprecated))
+#endif
     virtual void drawControl( ControlElement element,
 			      QPainter *p,
 			      const QWidget *widget,
@@ -301,12 +465,38 @@ public:
 			      const QColorGroup &cg,
 			      SFlags how = Style_Default,
 			      const QStyleOption& = QStyleOption::Default ) const = 0;
+
+    // New API
+    virtual void drawControl( ControlElement element,
+			      QPainter *p,
+			      QStyleControlElementData ceData,
+			      ControlElementFlags elementFlags,
+			      const QRect &r,
+			      const QColorGroup &cg,
+			      SFlags how = Style_Default,
+			      const QStyleOption& = QStyleOption::Default,
+			      const QWidget *widget = 0 /* compat, will likely go away */ ) const = 0;
+
+    // Old API
+    // DEPRECATED
+#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
+    __attribute__ ((deprecated))
+#endif
     virtual void drawControlMask( ControlElement element,
 				  QPainter *p,
 				  const QWidget *widget,
 				  const QRect &r,
 				  const QStyleOption& = QStyleOption::Default ) const = 0;
 
+    // New API
+    virtual void drawControlMask( ControlElement element,
+				  QPainter *p,
+				  QStyleControlElementData ceData,
+				  ControlElementFlags elementFlags,
+				  const QRect &r,
+				  const QStyleOption& = QStyleOption::Default,
+				  const QWidget *widget = 0 /* compat, will likely go away */ ) const = 0;
+
     enum SubRect {
 	SR_PushButtonContents,
 	SR_PushButtonFocusRect,
@@ -347,8 +537,16 @@ public:
 	SR_CustomBase =		0xf0000000
     };
 
+    // Old API
+    // DEPRECATED
+#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
+    __attribute__ ((deprecated))
+#endif
     virtual QRect subRect( SubRect r, const QWidget *widget ) const = 0;
 
+    // New API
+    virtual QRect subRect( SubRect r, const QStyleControlElementData ceData, const ControlElementFlags elementFlags, const QWidget *widget ) const = 0;
+
 
     enum ComplexControl{
 	CC_SpinWidget,
@@ -411,6 +609,11 @@ public:
     typedef uint SCFlags;
 
 
+    // Old API
+    // DEPRECATED
+#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
+    __attribute__ ((deprecated))
+#endif
     virtual void drawComplexControl( ComplexControl control,
 				     QPainter *p,
 				     const QWidget *widget,
@@ -424,21 +627,79 @@ public:
 #endif
 				     SCFlags subActive = SC_None,
 				     const QStyleOption& = QStyleOption::Default ) const = 0;
+
+    virtual void drawComplexControl( ComplexControl control,
+				     QPainter *p,
+				     QStyleControlElementData ceData,
+				     ControlElementFlags elementFlags,
+				     const QRect &r,
+				     const QColorGroup &cg,
+				     SFlags how = Style_Default,
+#ifdef Q_QDOC
+				     SCFlags sub = SC_All,
+#else
+				     SCFlags sub = (uint)SC_All,
+#endif
+				     SCFlags subActive = SC_None,
+				     const QStyleOption& = QStyleOption::Default,
+				     const QWidget *widget = 0 ) const = 0;
+
+    // Old API
+    // DEPRECATED
+#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
+    __attribute__ ((deprecated))
+#endif
     virtual void drawComplexControlMask( ComplexControl control,
 					 QPainter *p,
 					 const QWidget *widget,
 					 const QRect &r,
 					 const QStyleOption& = QStyleOption::Default ) const = 0;
 
+    // New API
+    virtual void drawComplexControlMask( ComplexControl control,
+					 QPainter *p,
+					 const QStyleControlElementData ceData,
+					 const ControlElementFlags elementFlags,
+					 const QRect &r,
+					 const QStyleOption& = QStyleOption::Default,
+					 const QWidget *widget = 0 ) const = 0;
+
+    // Old API
+    // DEPRECATED
+#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
+    __attribute__ ((deprecated))
+#endif
     virtual QRect querySubControlMetrics( ComplexControl control,
 					  const QWidget *widget,
 					  SubControl sc,
 					  const QStyleOption& = QStyleOption::Default ) const = 0;
+
+    // New API
+    virtual QRect querySubControlMetrics( ComplexControl control,
+					  QStyleControlElementData ceData,
+					  ControlElementFlags elementFlags,
+					  SubControl sc,
+					  const QStyleOption& = QStyleOption::Default,
+					  const QWidget *widget = 0 ) const = 0;
+
+    // Old API
+    // DEPRECATED
+#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
+    __attribute__ ((deprecated))
+#endif
     virtual SubControl querySubControl( ComplexControl control,
 					const QWidget *widget,
 					const QPoint &pos,
 					const QStyleOption& = QStyleOption::Default ) const = 0;
 
+    // New API
+    virtual SubControl querySubControl( ComplexControl control,
+					QStyleControlElementData ceData,
+					ControlElementFlags elementFlags,
+					const QPoint &pos,
+					const QStyleOption& = QStyleOption::Default,
+					const QWidget *widget = 0 ) const = 0;
+
 
     enum PixelMetric {
 	PM_ButtonMargin,
@@ -508,9 +769,20 @@ public:
 	PM_CustomBase =		0xf0000000
     };
 
+    // Old API
+    // DEPRECATED
+#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
+    __attribute__ ((deprecated))
+#endif
     virtual int pixelMetric( PixelMetric metric,
 			     const QWidget *widget = 0 ) const = 0;
 
+    // New API
+    virtual int pixelMetric( PixelMetric metric,
+			     QStyleControlElementData ceData,
+			     ControlElementFlags elementFlags,
+			     const QWidget *widget = 0 ) const = 0;
+
 
     enum ContentsType {
 	CT_PushButton,
@@ -536,11 +808,23 @@ public:
 	CT_CustomBase =		0xf0000000
     };
 
+    // Old API
+    // DEPRECATED
+#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
+    __attribute__ ((deprecated))
+#endif
     virtual QSize sizeFromContents( ContentsType contents,
 				    const QWidget *widget,
 				    const QSize &contentsSize,
 				    const QStyleOption& = QStyleOption::Default ) const = 0;
 
+    virtual QSize sizeFromContents( ContentsType contents,
+				    QStyleControlElementData ceData,
+				    ControlElementFlags elementFlags,
+				    const QSize &contentsSize,
+				    const QStyleOption& = QStyleOption::Default,
+				    const QWidget *widget = 0 ) const = 0;
+
     enum StyleHint  {
 	// ...
 	// the general hints
@@ -687,12 +971,26 @@ public:
 	SH_CustomBase =		0xf0000000
     };
 
+    // Old API
+    // DEPRECATED
+#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
+    __attribute__ ((deprecated))
+#endif
     virtual int styleHint( StyleHint stylehint,
 			   const QWidget *widget = 0,
 			   const QStyleOption& = QStyleOption::Default,
 			   QStyleHintReturn* returnData = 0
 			   ) const = 0;
 
+    // New API
+    virtual int styleHint( StyleHint stylehint,
+			   QStyleControlElementData ceData,
+			   ControlElementFlags elementFlags,
+			   const QStyleOption& = QStyleOption::Default,
+			   QStyleHintReturn* returnData = 0,
+			   const QWidget *widget = 0
+			   ) const = 0;
+
 
     enum StylePixmap {
 	SP_TitleBarMinButton,
@@ -711,13 +1009,32 @@ public:
 	SP_CustomBase =		0xf0000000
     };
 
+    // Old API
+    // DEPRECATED
+#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
+    __attribute__ ((deprecated))
+#endif
     virtual QPixmap stylePixmap( StylePixmap stylepixmap,
 				 const QWidget *widget = 0,
 				 const QStyleOption& = QStyleOption::Default ) const = 0;
 
+    virtual QPixmap stylePixmap( StylePixmap stylepixmap,
+				 QStyleControlElementData ceData,
+				 ControlElementFlags elementFlags,
+				 const QStyleOption& = QStyleOption::Default,
+				 const QWidget *widget = 0 ) const = 0;
+
 
+    // Old API
+    // DEPRECATED
+#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
+    __attribute__ ((deprecated))
+#endif
     static QRect visualRect( const QRect &logical, const QWidget *w );
 
+    // New API
+    static QRect visualRect( const QRect &logical, const QStyleControlElementData ceData, const ControlElementFlags elementFlags );
+
     static QRect visualRect( const QRect &logical, const QRect &bounding );
 
 
@@ -728,19 +1045,19 @@ public:
 #ifndef QT_NO_COMPAT
     int defaultFrameWidth() const
     {
-	return pixelMetric( PM_DefaultFrameWidth );
+	return pixelMetric( PM_DefaultFrameWidth, QStyleControlElementData(), CEF_None );
     }
     void tabbarMetrics( const QWidget* t,
 			int& hf, int& vf, int& ov ) const
     {
-	hf = pixelMetric( PM_TabBarTabHSpace, t );
-	vf = pixelMetric( PM_TabBarTabVSpace, t );
-	ov = pixelMetric( PM_TabBarBaseOverlap, t );
+	hf = pixelMetric( PM_TabBarTabHSpace, QStyleControlElementData(), CEF_None, t );
+	vf = pixelMetric( PM_TabBarTabVSpace, QStyleControlElementData(), CEF_None, t );
+	ov = pixelMetric( PM_TabBarBaseOverlap, QStyleControlElementData(), CEF_None, t );
     }
     QSize scrollBarExtent() const
     {
-	return QSize(pixelMetric(PM_ScrollBarExtent),
-		     pixelMetric(PM_ScrollBarExtent));
+	return QSize(pixelMetric(PM_ScrollBarExtent, QStyleControlElementData(), CEF_None),
+		     pixelMetric(PM_ScrollBarExtent, QStyleControlElementData(), CEF_None));
     }
 #endif
 
@@ -754,5 +1071,8 @@ private:
 #endif
 };
 
+inline QStyle::ControlElementFlags operator|(const QStyle::ControlElementFlags a, const QStyle::ControlElementFlags b) { return static_cast<QStyle::ControlElementFlags>(static_cast<int>(a) | static_cast<int>(b)); }
+// inline QStyle::ControlElementFlags operator|=(QStyle::ControlElementFlags &a, const QStyle::ControlElementFlags b) { a = static_cast<QStyle::ControlElementFlags>(static_cast<int>(a) | static_cast<int>(b)); return a; }
+
 #endif // QT_NO_STYLE
 #endif // QSTYLE_H
diff --git a/src/kernel/qwidget.h b/src/kernel/qwidget.h
index d20fe4d..9df9710 100644
--- a/src/kernel/qwidget.h
+++ b/src/kernel/qwidget.h
@@ -456,6 +456,9 @@ public:
     WState		testWState( WState s ) const;
     WFlags		testWFlags( WFlags f ) const;
     NFlags		testNFlags( NFlags f ) const;
+    uint		getWState() const;
+    WFlags		getWFlags() const;
+    NFlags		getNFlags() const;
     static QWidget *	find( WId );
     static QWidgetMapper *wmapper();
 
@@ -573,13 +576,10 @@ protected:
 			 bool destroyOldWindow = TRUE );
     virtual void destroy( bool destroyWindow = TRUE,
 			  bool destroySubWindows = TRUE );
-    uint	 getWState() const;
     virtual void setWState( uint );
     void	 clearWState( uint n );
-    WFlags	 getWFlags() const;
     virtual void setWFlags( WFlags );
     void	 clearWFlags( WFlags n );
-    NFlags	 getNFlags() const;
     virtual void setNFlags( NFlags );
     void	 clearNFlags( NFlags n );