1 files changed, 56 insertions, 26 deletions
diff --git a/style/polyester.h b/style/polyester.h
index 84f1133..6ae1eb7 100755
--- a/style/polyester.h
+++ b/style/polyester.h
@@ -70,20 +70,24 @@ public:
     PolyesterStyle();
     virtual ~PolyesterStyle();
 
-    void polish(TQApplication* app );
-    void polish(TQWidget* widget );
-    void unPolish(TQWidget* widget );
+    void applicationPolish(const TQStyleControlElementData &ceData, ControlElementFlags, void *);
+    void polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
+    void unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
 
     void drawTDEStylePrimitive(TDEStylePrimitive kpe,
-                             TQPainter* p,
-                             const TQWidget* widget,
-                             const TQRect &r,
-                             const TQColorGroup &cg,
-                             SFlags flags = Style_Default,
-                             const TQStyleOption& = TQStyleOption::Default ) const;
+                               TQPainter* p,
+                               const TQStyleControlElementData &ceData,
+                               ControlElementFlags elementFlags,
+                               const TQRect &r,
+                               const TQColorGroup &cg,
+                               SFlags flags = Style_Default,
+                               const TQStyleOption& = TQStyleOption::Default,
+                               const TQWidget *widget = nullptr) const;
 
     void drawPrimitive(PrimitiveElement pe,
                        TQPainter *p,
+                       const TQStyleControlElementData &ceData,
+                       ControlElementFlags elementFlags,
                        const TQRect &r,
                        const TQColorGroup &cg,
                        SFlags flags = Style_Default,
@@ -91,51 +95,77 @@ public:
 
     void drawControl(ControlElement element,
                      TQPainter *p,
-                     const TQWidget *widget,
+                     const TQStyleControlElementData &ceData,
+                     ControlElementFlags elementFlags,
                      const TQRect &r,
                      const TQColorGroup &cg,
                      SFlags flags = Style_Default,
-                     const TQStyleOption& = TQStyleOption::Default ) const;
+                     const TQStyleOption& = TQStyleOption::Default,
+                     const TQWidget *widget = nullptr) const;
 
-    void drawControlMask( ControlElement, TQPainter *, const TQWidget *, const TQRect &, const TQStyleOption &) const;
+    void drawControlMask(ControlElement element,
+                         TQPainter *p,
+                         const TQStyleControlElementData &ceData,
+                         ControlElementFlags elementFlags,
+                         const TQRect &r,
+                         const TQStyleOption & = TQStyleOption::Default,
+                         const TQWidget *widget = nullptr) const;
 
     void drawComplexControl(ComplexControl control,
                             TQPainter *p,
-                            const TQWidget *widget,
+                            const TQStyleControlElementData &ceData,
+                            ControlElementFlags elementFlags,
                             const TQRect &r,
                             const TQColorGroup &cg,
                             SFlags flags = Style_Default,
                             SCFlags controls = SC_All,
                             SCFlags active = SC_None,
-                            const TQStyleOption& = TQStyleOption::Default ) const;
+                            const TQStyleOption& = TQStyleOption::Default,
+                            const TQWidget *widget = nullptr) const;
 
     int pixelMetric(PixelMetric m,
-                    const TQWidget *widget = 0 ) const;
+                    const TQStyleControlElementData &ceData,
+                    ControlElementFlags elementFlags,
+                    const TQWidget *widget = nullptr) const;
 
-    int kPixelMetric(TDEStylePixelMetric kpm, const TQWidget *widget) const;
+    int kPixelMetric(TDEStylePixelMetric kpm,
+                     const TQStyleControlElementData &ceData,
+                     ControlElementFlags elementFlags,
+                     const TQWidget *widget) const;
 
     TQRect subRect(SubRect r,
-                  const TQWidget *widget ) const;
+                   const TQStyleControlElementData &ceData,
+                   ControlElementFlags elementFlags,
+                   const TQWidget *widget = nullptr) const;
 
     TQRect querySubControlMetrics(ComplexControl control,
-                                 const TQWidget *widget,
-                                 SubControl subcontrol,
-                                 const TQStyleOption &opt = TQStyleOption::Default ) const;
+                                  const TQStyleControlElementData &ceData,
+                                  ControlElementFlags elementFlags,
+                                  SubControl subcontrol,
+                                  const TQStyleOption &opt = TQStyleOption::Default,
+                                  const TQWidget *widget = nullptr) const;
 
     void drawComplexControlMask(TQStyle::ComplexControl c,
                                 TQPainter *p,
-                                const TQWidget *w,
+                                const TQStyleControlElementData &ceData,
+                                ControlElementFlags elementFlags,
                                 const TQRect &r,
-                                const TQStyleOption &o=TQStyleOption::Default) const;
+                                const TQStyleOption &o=TQStyleOption::Default,
+                                const TQWidget *widget = nullptr) const;
 
     TQSize sizeFromContents(TQStyle::ContentsType t,
-                           const TQWidget *w,
+                           const TQStyleControlElementData &ceData,
+                           ControlElementFlags elementFlags,
                            const TQSize &s,
-                           const TQStyleOption &o) const;
+                           const TQStyleOption &o,
+                           const TQWidget *widget = nullptr) const;
 
-    int styleHint(StyleHint, const TQWidget * = 0,
+    int styleHint(StyleHint hint,
+                  const TQStyleControlElementData &ceData,
+                  ControlElementFlags elementFlags,
                   const TQStyleOption & = TQStyleOption::Default,
-                  TQStyleHintReturn * = 0 ) const;
+                  TQStyleHintReturn * = nullptr,
+                  const TQWidget *widget = nullptr) const;
 
 protected:
     enum TabPosition