Update example styles to new style API

1 files changed, 28 insertions, 16 deletions

diff --git a/examples/themes/wood.h b/examples/themes/wood.h
index 56ce8f5..3d7b0e6 100644
--- a/examples/themes/wood.h
+++ b/examples/themes/wood.h
@@ -26,13 +26,15 @@ class NorwegianWoodStyle : public QWindowsStyle
 {
 public:
     NorwegianWoodStyle();
-    void polish( QApplication*);
-    void polish( QWidget* );
-    void unPolish( QWidget* );
-    void unPolish( QApplication*);
+    void applicationPolish( QStyleControlElementData ceData, ControlElementFlags elementFlags, void * );
+    void polish( QStyleControlElementData ceData, ControlElementFlags elementFlags, void * );
+    void unPolish( QStyleControlElementData ceData, ControlElementFlags elementFlags, void * );
+    void applicationUnPolish( QStyleControlElementData ceData, ControlElementFlags elementFlags, void * );
 
     void drawPrimitive( PrimitiveElement pe,
 			QPainter *p,
+			QStyleControlElementData ceData,
+			ControlElementFlags elementFlags,
 			const QRect &r,
 			const QColorGroup &cg,
 			SFlags flags = Style_Default,
@@ -40,44 +42,54 @@ public:
 
     void drawControl( ControlElement element,
 		      QPainter *p,
-		      const QWidget *widget,
+		      QStyleControlElementData ceData,
+		      ControlElementFlags elementFlags,
 		      const QRect &r,
 		      const QColorGroup &cg,
 		      SFlags how = Style_Default,
-		      const QStyleOption& = QStyleOption::Default ) const;
+		      const QStyleOption& = QStyleOption::Default,
+		      const QWidget *widget = 0 ) const;
 
     void drawControlMask( ControlElement element,
 			  QPainter *p,
-			  const QWidget *widget,
+			  QStyleControlElementData ceData,
+			  ControlElementFlags elementFlags,
 			  const QRect &r,
-			  const QStyleOption& = QStyleOption::Default ) const;
+			  const QStyleOption& = QStyleOption::Default,
+			  const QWidget *widget = 0 ) const;
 
     void drawComplexControl( ComplexControl cc,
 			     QPainter *p,
-			     const QWidget *widget,
+			     QStyleControlElementData ceData,
+			     ControlElementFlags elementFlags,
 			     const QRect &r,
 			     const QColorGroup &cg,
 			     SFlags how = Style_Default,
 			     SCFlags sub = SC_All,
 			     SCFlags subActive = SC_None,
-			     const QStyleOption& = QStyleOption::Default ) const;
+			     const QStyleOption& = QStyleOption::Default,
+			     const QWidget *widget = 0 ) const;
 
     void drawComplexControlMask( ComplexControl control,
 				 QPainter *p,
-				 const QWidget *widget,
+				 const QStyleControlElementData ceData,
+				 const ControlElementFlags elementFlags,
 				 const QRect &r,
-				 const QStyleOption& = QStyleOption::Default ) const;
+				 const QStyleOption& = QStyleOption::Default,
+				 const QWidget *widget = 0 ) const;
 
     QRect querySubControlMetrics( ComplexControl control,
-				  const QWidget *widget,
+				  QStyleControlElementData ceData,
+				  ControlElementFlags elementFlags,
 				  SubControl sc,
-				  const QStyleOption& = QStyleOption::Default ) const;
+				  const QStyleOption& = QStyleOption::Default,
+				  const QWidget *widget = 0 ) const;
 
-    QRect subRect( SubRect r, const QWidget *widget ) const;
+    QRect subRect( SubRect r, const QStyleControlElementData ceData, const ControlElementFlags elementFlags, const QWidget *widget ) const;
 
 
 private:
-    void drawSemicircleButton(QPainter *p, const QRect &r, int dir,
+    void drawSemicircleButton(QPainter *p, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QRect &r, int dir,
 			      bool sunken, const QColorGroup &g ) const;
     QPalette oldPalette;
     QPixmap *sunkenDark;