Styles are now mostly functional under Qt4

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1216403 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

2 files changed, 21 insertions, 21 deletions

diff --git a/kstyles/keramik/keramik.cpp b/kstyles/keramik/keramik.cpp
index 9ba8cb6a2..8b33c3afe 100644
--- a/kstyles/keramik/keramik.cpp
+++ b/kstyles/keramik/keramik.cpp
@@ -123,7 +123,7 @@ namespace
 
 namespace
 {
-	void drawKeramikArrow(TQPainter* p, TQColorGroup cg, TQRect r, TQStyle::PrimitiveElement pe, bool down, bool enabled)
+	void drawKeramikArrow(TQPainter* p, TQColorGroup cg, TQRect r, TQStyle::TQ_PrimitiveElement pe, bool down, bool enabled)
 	{
 		TQPointArray a;
 
@@ -533,7 +533,7 @@ static void renderToolbarWidgetBackground(TQPainter* painter, const TQWidget* wi
 }
 
 // This function draws primitive elements as well as their masks.
-void KeramikStyle::drawPrimitive( PrimitiveElement pe,
+void KeramikStyle::tqdrawPrimitive( TQ_PrimitiveElement pe,
 									TQPainter *p,
 									const TQRect &r,
 									const TQColorGroup &cg,
@@ -1324,7 +1324,7 @@ bool KeramikStyle::isFormWidget(const TQWidget* widget) const
 	return true;
 }
 
-void KeramikStyle::tqdrawControl( ControlElement element,
+void KeramikStyle::tqdrawControl( TQ_ControlElement element,
 								  TQPainter *p,
 								  const TQWidget *widget,
 								  const TQRect &r,
@@ -1552,7 +1552,7 @@ void KeramikStyle::tqdrawControl( ControlElement element,
 										 tb->orientation() == Qt::Horizontal);
 			}
 			else
-				KStyle::tqdrawControl( (QStyle::ControlElement)CE_DockWindowEmptyArea, p, 
+				KStyle::tqdrawControl( (TQ_ControlElement)CE_DockWindowEmptyArea, p, 
 					widget, r, cg, flags, opt );
 			break;
 		}
@@ -1787,7 +1787,7 @@ void KeramikStyle::tqdrawControl( ControlElement element,
 
 			// Does the menu item have a submenu?
 			if ( mi->popup() ) {
-				PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight;
+				TQ_PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight;
 				int dim = tqpixelMetric(PM_MenuButtonIndicator) - itemFrame;
 				TQRect vr = tqvisualRect( TQRect( x + w - arrowHMargin - itemFrame - dim,
 							y + h / 2 - dim / 2, dim, dim), r );
@@ -1919,7 +1919,7 @@ void KeramikStyle::tqdrawControl( ControlElement element,
 	}
 }
 
-void KeramikStyle::tqdrawControlMask( ControlElement element,
+void KeramikStyle::tqdrawControlMask( TQ_ControlElement element,
 								    TQPainter *p,
 								    const TQWidget *widget,
 								    const TQRect &r,
@@ -1943,7 +1943,7 @@ bool KeramikStyle::isSizeConstrainedCombo(const TQComboBox* combo) const
 	return false;
 }
 
-void KeramikStyle::tqdrawComplexControl( ComplexControl control,
+void KeramikStyle::tqdrawComplexControl( TQ_ComplexControl control,
                                          TQPainter *p,
                                          const TQWidget *widget,
                                          const TQRect &r,
@@ -2114,7 +2114,7 @@ void KeramikStyle::tqdrawComplexControl( ComplexControl control,
 		case CC_SpinWidget:
 		{
 			const TQSpinWidget* sw = static_cast< const TQSpinWidget* >( widget );
-			TQRect br = tqvisualRect( querySubControlMetrics( (QStyle::ComplexControl)CC_SpinWidget, widget, SC_SpinWidgetButtonField ), widget );
+			TQRect br = tqvisualRect( querySubControlMetrics( (TQ_ComplexControl)CC_SpinWidget, widget, SC_SpinWidgetButtonField ), widget );
 			if ( controls & SC_SpinWidgetButtonField )
 			{
 				Keramik::SpinBoxPainter().draw( p, br, cg.button(), cg.background(), !sw->isEnabled() );
@@ -2319,7 +2319,7 @@ void KeramikStyle::tqdrawComplexControl( ComplexControl control,
 	}
 }
 
-void KeramikStyle::tqdrawComplexControlMask( ComplexControl control,
+void KeramikStyle::tqdrawComplexControlMask( TQ_ComplexControl control,
                                          TQPainter *p,
                                          const TQWidget *widget,
                                          const TQRect &r,
@@ -2414,7 +2414,7 @@ int KeramikStyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const
 }
 
 
-TQSize KeramikStyle::sizeFromContents( ContentsType contents,
+TQSize KeramikStyle::tqsizeFromContents( ContentsType contents,
 										const TQWidget* widget,
 										const TQSize &contentSize,
 										const TQStyleOption& opt ) const
@@ -2524,7 +2524,7 @@ TQSize KeramikStyle::sizeFromContents( ContentsType contents,
 }
 
 
-TQStyle::SubControl KeramikStyle::querySubControl( ComplexControl control,
+TQStyle::SubControl KeramikStyle::querySubControl( TQ_ComplexControl control,
 	                                              const TQWidget* widget,
                                                   const TQPoint& point,
                                                   const TQStyleOption& opt ) const
@@ -2542,7 +2542,7 @@ TQStyle::SubControl KeramikStyle::querySubControl( ComplexControl control,
 	return result;
 }
 
-TQRect KeramikStyle::querySubControlMetrics( ComplexControl control,
+TQRect KeramikStyle::querySubControlMetrics( TQ_ComplexControl control,
 									const TQWidget* widget,
 	                              SubControl subcontrol,
 	                              const TQStyleOption& opt ) const
diff --git a/kstyles/keramik/keramik.h b/kstyles/keramik/keramik.h
index 746626b70..b0f021aee 100644
--- a/kstyles/keramik/keramik.h
+++ b/kstyles/keramik/keramik.h
@@ -4,7 +4,7 @@
    based on the KDE3 HighColor Style
 
    Copyright (C) 2001-2002 Karol Szwed      <[email protected]>
-             (C) 2001-2002 Fredrik H�glund  <[email protected]>
+             (C) 2001-2002 Fredrik H�glund  <[email protected]>
 
    Drawing routines adapted from the KDE2 HCStyle,
    Copyright (C) 2000 Daniel M. Duley       <[email protected]>
@@ -63,14 +63,14 @@ public:
 	                          SFlags flags = Style_Default,
 	                          const TQStyleOption& = TQStyleOption::Default ) const;
 
-	void drawPrimitive( PrimitiveElement pe,
+	void tqdrawPrimitive( TQ_PrimitiveElement pe,
 	                    TQPainter* p,
 	                    const TQRect& r,
 	                    const TQColorGroup& cg,
 	                    SFlags flags = Style_Default,
 	                    const TQStyleOption& = TQStyleOption::Default ) const;
 
-	void tqdrawControl( ControlElement element,
+	void tqdrawControl( TQ_ControlElement element,
 	                  TQPainter* p,
 	                  const TQWidget* widget,
 	                  const TQRect& r,
@@ -78,13 +78,13 @@ public:
 	                  SFlags flags = Style_Default,
 	                  const TQStyleOption& opt = TQStyleOption::Default ) const;
 
-	void tqdrawControlMask( ControlElement element,
+	void tqdrawControlMask( TQ_ControlElement element,
 	                      TQPainter* p,
 	                      const TQWidget* widget,
 	                      const TQRect& r,
 	                      const TQStyleOption& opt = TQStyleOption::Default ) const;
 
-	void tqdrawComplexControl( ComplexControl control,
+	void tqdrawComplexControl( TQ_ComplexControl control,
 	                         TQPainter* p,
 	                         const TQWidget* widget,
 	                         const TQRect& r,
@@ -94,7 +94,7 @@ public:
 	                         SCFlags active = SC_None,
 	                         const TQStyleOption& = TQStyleOption::Default ) const;
 
-	void tqdrawComplexControlMask( ComplexControl control,
+	void tqdrawComplexControlMask( TQ_ComplexControl control,
 	                             TQPainter* p,
 	                             const TQWidget* widget,
 	                             const TQRect& r,
@@ -102,17 +102,17 @@ public:
 
 	int tqpixelMetric( PixelMetric m, const TQWidget* widget = 0 ) const;
 
-	TQSize sizeFromContents( ContentsType contents,
+	TQSize tqsizeFromContents( ContentsType contents,
 	                        const TQWidget* widget,
 	                        const TQSize& contentSize,
 	                        const TQStyleOption& opt ) const;
 
-	SubControl querySubControl( ComplexControl control,
+	SubControl querySubControl( TQ_ComplexControl control,
 	                            const TQWidget* widget,
 	                            const TQPoint& point,
 						        const TQStyleOption& opt = TQStyleOption::Default ) const;
 
-	TQRect querySubControlMetrics( ComplexControl control,
+	TQRect querySubControlMetrics( TQ_ComplexControl control,
 	                              const TQWidget* widget,
 	                              SubControl subcontrol,
 	                              const TQStyleOption& opt = TQStyleOption::Default ) const;