1 files changed, 34 insertions, 18 deletions
diff --git a/styles/phase/phasestyle.h b/styles/phase/phasestyle.h
index 631653af..b2263822 100644
--- a/styles/phase/phasestyle.h
+++ b/styles/phase/phasestyle.h
@@ -67,8 +67,10 @@ public:
     void polish(TQPalette &pal);
     void unPolish(TQWidget *widget);
 
-    void tqdrawPrimitive(TQ_PrimitiveElement element,
+    void drawPrimitive(TQ_PrimitiveElement element,
             TQPainter *painter,
+            TQStyleControlElementData ceData,
+            ControlElementFlags elementFlags,
             const TQRect &rect,
             const TQColorGroup &group,
             SFlags flags = Style_Default,
@@ -76,56 +78,70 @@ public:
 
     void drawKStylePrimitive(KStylePrimitive element,
             TQPainter *painter,
-            const TQWidget *widget,
+            TQStyleControlElementData ceData,
+            ControlElementFlags elementFlags,
             const TQRect &rect,
             const TQColorGroup &group,
             SFlags flags = Style_Default,
-            const TQStyleOption &option = TQStyleOption::Default) const;
+            const TQStyleOption &option = TQStyleOption::Default,
+            const TQWidget *widget = 0) const;
 
     void drawControl(TQ_ControlElement element,
             TQPainter *painter,
-            const TQWidget *widget,
+            TQStyleControlElementData ceData,
+            ControlElementFlags elementFlags,
             const TQRect &rect,
             const TQColorGroup &group,
             SFlags flags = Style_Default,
-            const TQStyleOption &option = TQStyleOption::Default) const;
+            const TQStyleOption &option = TQStyleOption::Default,
+            const TQWidget *widget = 0) const;
 
     void drawControlMask(TQ_ControlElement element,
             TQPainter *painter,
-            const TQWidget *widget,
+            TQStyleControlElementData ceData,
+            ControlElementFlags elementFlags,
             const TQRect &rect,
-            const TQStyleOption &option = TQStyleOption::Default) const;
+            const TQStyleOption &option = TQStyleOption::Default,
+            const TQWidget *widget = 0) const;
 
     void drawComplexControl(TQ_ComplexControl control,
             TQPainter *painter,
-            const TQWidget *widget,
+            TQStyleControlElementData ceData,
+            ControlElementFlags elementFlags,
             const TQRect &rect,
             const TQColorGroup &group,
             SFlags flags = Style_Default,
             SCFlags controls = SC_All,
             SCFlags active = SC_None,
-            const TQStyleOption &option = TQStyleOption::Default) const;
+            const TQStyleOption &option = TQStyleOption::Default,
+            const TQWidget *widget = 0) const;
 
     void drawComplexControlMask(TQ_ComplexControl control,
             TQPainter *painter,
-            const TQWidget *widget,
+            const TQStyleControlElementData ceData,
+            const ControlElementFlags elementFlags,
             const TQRect &rect,
-            const TQStyleOption &option = TQStyleOption::Default) const;
+            const TQStyleOption &option = TQStyleOption::Default,
+            const TQWidget *widget = 0) const;
 
-    int pixelMetric(PixelMetric metric,
+    int pixelMetric(PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags,
             const TQWidget *widget = 0) const;
 
-    TQRect subRect(SubRect rect, const TQWidget *widget) const;
+    TQRect subRect(SubRect rect, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget *widget = 0) const;
 
     TQRect querySubControlMetrics(TQ_ComplexControl control,
-            const TQWidget *widget,
+            TQStyleControlElementData ceData,
+            ControlElementFlags elementFlags,
 	    SubControl subcontrol,
-            const TQStyleOption &option = TQStyleOption::Default) const;
+            const TQStyleOption &option = TQStyleOption::Default,
+            const TQWidget *widget = 0) const;
 
-    TQSize tqsizeFromContents(ContentsType contents,
-            const TQWidget *widget,
+    TQSize sizeFromContents(ContentsType contents,
+            TQStyleControlElementData ceData,
+            ControlElementFlags elementFlags,
             const TQSize &contentsize,
-            const TQStyleOption& option = TQStyleOption::Default) const;
+            const TQStyleOption& option = TQStyleOption::Default,
+            const TQWidget *widget = 0) const;
 
 private:
     PhaseStyle(const PhaseStyle &);