From 8a81e3e9ade5820c2764b7c912b5115c2fd64c1c Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 5 Aug 2012 01:03:33 -0500
Subject: Update to new style API

---
 style/qtcurve.h | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'style/qtcurve.h')

diff --git a/style/qtcurve.h b/style/qtcurve.h
index 3ac4764..77ad4e7 100644
--- a/style/qtcurve.h
+++ b/style/qtcurve.h
@@ -158,28 +158,28 @@ class TQtCurveStyle : public BASE_STYLE
                         EntryColor coloration, int round, EWidget=WIDGET_ENTRY) const;
     void drawArrow(TQPainter *p, const TQRect &r, const TQColorGroup &cg, SFlags flags,
                    TQ_PrimitiveElement pe,  bool small=false, bool checkActive=false) const;
-    void tqdrawPrimitive(TQ_PrimitiveElement, TQPainter *, const TQRect &, const TQColorGroup &,
+    void drawPrimitive(TQ_PrimitiveElement, TQPainter *, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &,
                        SFlags = Style_Default, const TQStyleOption & = TQStyleOption::Default) const;
-    void drawKStylePrimitive(KStylePrimitive kpe, TQPainter* p, const TQWidget* widget, const TQRect &r,
-                             const TQColorGroup &cg, SFlags flags, const TQStyleOption &opt ) const;
-    void drawControl(ControlElement, TQPainter *, const TQWidget *, const TQRect &, const TQColorGroup &,
-                     SFlags = Style_Default, const TQStyleOption & = TQStyleOption::Default) const;
-    void drawControlMask(ControlElement, TQPainter *, const TQWidget *, const TQRect &,
-                         const TQStyleOption & = TQStyleOption::Default) const;
-    void drawComplexControlMask(ComplexControl control, TQPainter *p, const TQWidget *widget,
-                                const TQRect &r, const TQStyleOption &data) const;
-    TQRect subRect(SubRect, const TQWidget *) const;
-    void drawComplexControl(ComplexControl, TQPainter *, const TQWidget *, const TQRect &,
+    void drawKStylePrimitive(KStylePrimitive kpe, TQPainter* p, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &r,
+                             const TQColorGroup &cg, SFlags flags, const TQStyleOption &opt, const TQWidget* widget = 0 ) const;
+    void drawControl(ControlElement, TQPainter *, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &,
+                     SFlags = Style_Default, const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0) const;
+    void drawControlMask(ControlElement, TQPainter *, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &,
+                         const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0) const;
+    void drawComplexControlMask(ComplexControl control, TQPainter *p, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags,
+                                const TQRect &r, const TQStyleOption &data, const TQWidget *widget) const;
+    TQRect subRect(SubRect, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget * = 0) const;
+    void drawComplexControl(ComplexControl, TQPainter *, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &,
                             const TQColorGroup &, SFlags = Style_Default, SCFlags = SC_All,
-                            SCFlags = SC_None, const TQStyleOption & = TQStyleOption::Default) const;
-    TQRect querySubControlMetrics(TQ_ComplexControl, const TQWidget *, SubControl,
-                                 const TQStyleOption & = TQStyleOption::Default) const;
-    int pixelMetric(PixelMetric, const TQWidget *widget= 0) const;
+                            SCFlags = SC_None, const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0) const;
+    TQRect querySubControlMetrics(TQ_ComplexControl, TQStyleControlElementData ceData, ControlElementFlags elementFlags, SubControl,
+                                 const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0) const;
+    int pixelMetric(PixelMetric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget= 0) const;
     int kPixelMetric(KStylePixelMetric kpm, const TQWidget *widget) const;
-    TQSize tqsizeFromContents(ContentsType, const TQWidget *, const TQSize &,
-                           const TQStyleOption & = TQStyleOption::Default) const;
-    int styleHint(StyleHint, const TQWidget *widget= 0, const TQStyleOption & = TQStyleOption::Default,
-                  TQStyleHintReturn *returnData= 0) const;
+    TQSize sizeFromContents(ContentsType, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQSize &,
+                           const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0) const;
+    int styleHint(StyleHint, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQStyleOption & = TQStyleOption::Default,
+                  TQStyleHintReturn *returnData= 0, const TQWidget *widget= 0) const;
     void drawItem(TQPainter *p, const TQRect &r, int flags, const TQColorGroup &cg, bool enabled,
                   const TQPixmap *pixmap, const TQString &text, int len=-1, const TQColor *penColor=0) const;
 
-- 
cgit v1.2.3