From 2ba2bd6da04b86d32ce1d3a3680a00810938cf9c Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 5 Aug 2012 01:02:07 -0500
Subject: Update to new style API

---
 kstyles/light/lightstyle-v3.h | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

(limited to 'kstyles/light/lightstyle-v3.h')

diff --git a/kstyles/light/lightstyle-v3.h b/kstyles/light/lightstyle-v3.h
index a07bf6e53..dbdb50ca0 100644
--- a/kstyles/light/lightstyle-v3.h
+++ b/kstyles/light/lightstyle-v3.h
@@ -48,41 +48,44 @@ public:
 
     void polishPopupMenu( TQPopupMenu * );
 
-    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 drawControl(TQ_ControlElement, TQPainter *, const TQWidget *, const TQRect &,
+    void drawControl(TQ_ControlElement, TQPainter *, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &,
 		     const TQColorGroup &, SFlags = Style_Default,
-		     const TQStyleOption & = TQStyleOption::Default ) const;
-    void drawControlMask(TQ_ControlElement, TQPainter *, const TQWidget *, const TQRect &,
-			 const TQStyleOption & = TQStyleOption::Default) const;
+		     const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const;
+    void drawControlMask(TQ_ControlElement, TQPainter *, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &,
+			 const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0) const;
 
-    TQRect subRect(SubRect, const TQWidget *) const;
+    TQRect subRect(SubRect, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget *) const;
 
-    void drawComplexControl(TQ_ComplexControl, TQPainter *, const TQWidget *, const TQRect &,
+    void drawComplexControl(TQ_ComplexControl, TQPainter *, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &,
 			    const TQColorGroup &, SFlags = Style_Default,
 			    SCFlags = SC_All, SCFlags = SC_None,
-			    const TQStyleOption & = TQStyleOption::Default ) const;
+			    const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const;
 
-    TQRect querySubControlMetrics(TQ_ComplexControl, const TQWidget *, SubControl,
-				 const TQStyleOption & = TQStyleOption::Default ) const;
+    TQRect querySubControlMetrics(TQ_ComplexControl, TQStyleControlElementData ceData, ControlElementFlags elementFlags, SubControl,
+				 const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const;
 
-    SubControl querySubControl(TQ_ComplexControl, const TQWidget *, const TQPoint &,
-			       const TQStyleOption &data = TQStyleOption::Default ) const;
+    SubControl querySubControl(TQ_ComplexControl, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQPoint &,
+			       const TQStyleOption &data = TQStyleOption::Default, const TQWidget * = 0 ) const;
 
-    int pixelMetric(PixelMetric, const TQWidget * = 0 ) const;
+    int pixelMetric(PixelMetric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget * = 0 ) const;
 
-    TQSize tqsizeFromContents(ContentsType, const TQWidget *, const TQSize &,
-			   const TQStyleOption & = TQStyleOption::Default ) const;
+    TQSize sizeFromContents(ContentsType, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQSize &,
+			   const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const;
 
-    int styleHint(TQ_StyleHint, const TQWidget * = 0,
+    int styleHint(TQ_StyleHint, TQStyleControlElementData ceData, ControlElementFlags elementFlags,
 		  const TQStyleOption & = TQStyleOption::Default,
-		  TQStyleHintReturn * = 0 ) const;
+		  TQStyleHintReturn * = 0,
+		  const TQWidget * = 0 ) const;
 
     TQPixmap stylePixmap( StylePixmap stylepixmap,
-			 const TQWidget* widget = 0,
-			 const TQStyleOption& = TQStyleOption::Default ) const;
+			 TQStyleControlElementData ceData,
+			 ControlElementFlags elementFlags,
+			 const TQStyleOption& = TQStyleOption::Default,
+			 const TQWidget* widget = 0 ) const;
 };
 
 
-- 
cgit v1.2.3