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, 7 insertions, 7 deletions

diff --git a/tdestyles/highcontrast/highcontrast.cpp b/tdestyles/highcontrast/highcontrast.cpp
index fefdb0d9a..0a7009dfd 100644
--- a/tdestyles/highcontrast/highcontrast.cpp
+++ b/tdestyles/highcontrast/highcontrast.cpp
@@ -286,7 +286,7 @@ void HighContrastStyle::drawEllipse (TQPainter* p, TQRect r, int offset, bool fi
 	p->drawRoundRect (r, 99, 99);
 }
 
-void HighContrastStyle::drawArrow (TQPainter* p, TQRect r, TQ_PrimitiveElement arrow, int offset) const
+void HighContrastStyle::drawArrow (TQPainter* p, TQRect r, PrimitiveElement arrow, int offset) const
 {
 	p->save();
 	addOffset (&r, offset);
@@ -337,7 +337,7 @@ void HighContrastStyle::drawArrow (TQPainter* p, TQRect r, TQ_PrimitiveElement a
 }
 
 // This function draws primitive elements
-void HighContrastStyle::drawPrimitive (TQ_PrimitiveElement pe,
+void HighContrastStyle::drawPrimitive (PrimitiveElement pe,
 								TQPainter *p,
 								const TQStyleControlElementData &ceData,
 								ControlElementFlags elementFlags,
@@ -764,7 +764,7 @@ void HighContrastStyle::drawTDEStylePrimitive (TDEStylePrimitive kpe,
 			// Probably it would be better to add a KPM_ListViewExpander metric
 			// to the TDEStyle TDEStylePixelMetric enum, and have the TDEStyle
 			// drawComplexControl handle it.
-			TQ_PrimitiveElement direction;
+			PrimitiveElement direction;
 			if (flags & Style_On) { // Collapsed = On
 				direction = PE_ArrowRight;
 
@@ -1146,7 +1146,7 @@ void HighContrastStyle::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);
 				TQRect vr = visualRect( TQRect( x + w - arrowHMargin - 2*itemFrame - dim,
 							y + h / 2 - dim / 2, dim, dim), r );
diff --git a/tdestyles/highcontrast/highcontrast.h b/tdestyles/highcontrast/highcontrast.h
index 905a35ea4..20469a064 100644
--- a/tdestyles/highcontrast/highcontrast.h
+++ b/tdestyles/highcontrast/highcontrast.h
@@ -69,7 +69,7 @@ class HighContrastStyle : public TDEStyle
 					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,
@@ -149,7 +149,7 @@ class HighContrastStyle : public TDEStyle
 
 		TQRect subRect (SubRect subrect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget * widget) 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;
 
@@ -166,7 +166,7 @@ class HighContrastStyle : public TDEStyle
 		void drawRect (TQPainter* p, TQRect r, int offset = 0, bool filled = true) const;
 		void drawRoundRect (TQPainter* p, TQRect r, int offset = 0, bool filled = true) const;
 		void drawEllipse (TQPainter* p, TQRect r, int offset = 0, bool filled = true) const;
-		void drawArrow (TQPainter* p, TQRect r, TQ_PrimitiveElement arrow, int offset = 0) const;
+		void drawArrow (TQPainter* p, TQRect r, PrimitiveElement arrow, int offset = 0) const;
 
 		int basicLineWidth;
 		// Disable copy constructor and = operator