Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/qt3

1 files changed, 23 insertions, 16 deletions

diff --git a/src/styles/qmotifplusstyle.h b/src/styles/qmotifplusstyle.h
index b1908de..24de609 100644
--- a/src/styles/qmotifplusstyle.h
+++ b/src/styles/qmotifplusstyle.h
@@ -63,14 +63,16 @@ public:
     virtual ~QMotifPlusStyle();
 
     void polish(QPalette &pal);
-    void polish(QWidget *widget);
-    void unPolish(QWidget*widget);
+    void polish(QStyleControlElementData ceData, ControlElementFlags elementFlags, void *);
+    void unPolish(QStyleControlElementData ceData, ControlElementFlags elementFlags, void *);
 
-    void polish(QApplication *app);
-    void unPolish(QApplication *app);
+    void applicationPolish(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,
@@ -78,17 +80,20 @@ 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;
 
-    QRect subRect(SubRect r, const QWidget *widget) const;
+    QRect subRect(SubRect r, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QWidget *widget) const;
 
     void drawComplexControl(ComplexControl control,
 			    QPainter *p,
-			    const QWidget *widget,
+			    QStyleControlElementData ceData,
+			    ControlElementFlags elementFlags,
 			    const QRect &r,
 			    const QColorGroup &cg,
 			    SFlags how = Style_Default,
@@ -98,20 +103,22 @@ public:
 			    SCFlags controls = (uint)SC_All,
 #endif
 			    SCFlags active = SC_None,
-			    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 subcontrol,
-				 const QStyleOption& = QStyleOption::Default) const;
+				 const QStyleOption& = QStyleOption::Default,
+				 const QWidget *widget = 0) const;
 
-    int pixelMetric(PixelMetric metric, const QWidget *widget = 0) const;
+    int pixelMetric(PixelMetric metric, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QWidget *widget = 0) const;
 
-    int styleHint(StyleHint sh, const QWidget *, const QStyleOption & = QStyleOption::Default,
-		  QStyleHintReturn* = 0) const;
+    int styleHint(StyleHint sh, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QStyleOption & = QStyleOption::Default,
+		  QStyleHintReturn* = 0, const QWidget * = 0) const;
 
-protected:
-    bool eventFilter(QObject *, QEvent *);
+    bool objectEventHandler( QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, QEvent *e );
 
 
 private: