Replace various tqtinterface's TQ_* defines with actual types

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 0f36f8966371d24decc0740ccf9f8b0cc2c57838)

2 files changed, 6 insertions, 6 deletions

diff --git a/tdestyles/plastik/plastik.cpp b/tdestyles/plastik/plastik.cpp
index 2cfd60db1..2e6749137 100644
--- a/tdestyles/plastik/plastik.cpp
+++ b/tdestyles/plastik/plastik.cpp
@@ -1451,7 +1451,7 @@ void PlastikStyle::drawTDEStylePrimitive(TDEStylePrimitive kpe,
 }
 
 
-void PlastikStyle::drawPrimitive(TQ_PrimitiveElement pe,
+void PlastikStyle::drawPrimitive(PrimitiveElement pe,
                                 TQPainter *p,
                                 const TQStyleControlElementData &ceData,
                                 ControlElementFlags elementFlags,
@@ -2695,7 +2695,7 @@ void PlastikStyle::drawControl(TQ_ControlElement element,
 
             // Does the menu item have a submenu?
             if ( mi->popup() ) {
-                TQ_PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight;
+                PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight;
                 int dim = pixelMetric(PM_MenuButtonIndicator, ceData, elementFlags) - 1;
                 TQRect vr = visualRect( TQRect( r.x() + r.width() - 5 - 1 - dim,
                             r.y() + r.height() / 2 - dim / 2, dim, dim), r );
@@ -3013,7 +3013,7 @@ void PlastikStyle::drawComplexControl(TQ_ComplexControl control,
 
             const TQSpinWidget *sw = dynamic_cast<const TQSpinWidget *>(widget);
             SFlags sflags = flags;
-            TQ_PrimitiveElement pe;
+            PrimitiveElement pe;
 
             bool hasFocus = false;
             if (sw)
@@ -3465,7 +3465,7 @@ TQSize PlastikStyle::sizeFromContents(ContentsType t,
     return TDEStyle::sizeFromContents (t, ceData, elementFlags, s, opt, widget);
 }
 
-int PlastikStyle::styleHint( TQ_StyleHint stylehint,
+int PlastikStyle::styleHint( StyleHint stylehint,
                                    const TQStyleControlElementData &ceData,
                                    ControlElementFlags elementFlags,
                                    const TQStyleOption &option,
diff --git a/tdestyles/plastik/plastik.h b/tdestyles/plastik/plastik.h
index d25888e15..d19408c52 100644
--- a/tdestyles/plastik/plastik.h
+++ b/tdestyles/plastik/plastik.h
@@ -76,7 +76,7 @@ public:
                              const TQStyleOption& = TQStyleOption::Default,
                              const TQWidget* widget = 0 ) const;
 
-    void drawPrimitive(TQ_PrimitiveElement pe,
+    void drawPrimitive(PrimitiveElement pe,
                        TQPainter *p,
                        const TQStyleControlElementData &ceData,
                        ControlElementFlags elementFlags,
@@ -137,7 +137,7 @@ public:
                            const TQStyleOption &o,
                            const TQWidget *w = 0) const;
 
-    int styleHint(TQ_StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
+    int styleHint(StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
                   const TQStyleOption & = TQStyleOption::Default,
                   TQStyleHintReturn * = 0, const TQWidget * = 0 ) const;