Replaced various '#define' with actual strings - part 3

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

44 files changed, 126 insertions, 126 deletions

diff --git a/kate/part/kateviewinternal.cpp b/kate/part/kateviewinternal.cpp
index 406d14b24..732aa06a5 100644
--- a/kate/part/kateviewinternal.cpp
+++ b/kate/part/kateviewinternal.cpp
@@ -420,7 +420,7 @@ void KateViewInternal::scrollPos(KateTextCursor& c, bool force, bool calledExter
 
     Q_ASSERT(lines >= 0);
 
-    if (!calledExternally && QABS(viewLinesScrolled) < lines)
+    if (!calledExternally && TQABS(viewLinesScrolled) < lines)
     {
       updateView(false, viewLinesScrolled);
 
@@ -456,7 +456,7 @@ void KateViewInternal::scrollColumns ( int x )
   int dx = m_startX - x;
   m_startX = x;
 
-  if (QABS(dx) < width())
+  if (TQABS(dx) < width())
     scroll(dx, 0);
   else
     update();
diff --git a/kimgio/ico.cpp b/kimgio/ico.cpp
index 35cef0282..bf53ecc3b 100644
--- a/kimgio/ico.cpp
+++ b/kimgio/ico.cpp
@@ -233,7 +233,7 @@ namespace
                 TQRgb* p = reinterpret_cast< TQRgb* >( lines[ y ] );
                 for ( unsigned x = 0; x < rec.width; ++x, ++p )
                     if ( ( ( buf[ x / 8 ] >> ( 7 - ( x & 0x07 ) ) ) & 1 ) )
-                        *p &= TQRGB_MASK;
+                        *p &= TQT_RGB_MASK;
             }
             delete[] buf;
         }
diff --git a/kimgio/xcf.cpp b/kimgio/xcf.cpp
index dd243bcce..78af2e995 100644
--- a/kimgio/xcf.cpp
+++ b/kimgio/xcf.cpp
@@ -80,7 +80,7 @@ const XCFImageFormat::LayerModes XCFImageFormat::layer_modes[] = {
 //! Change a TQRgb value's alpha only.
 inline TQRgb tqRgba ( TQRgb rgb, int a )
 {
-	return ((a & 0xff) << 24 | (rgb & TQRGB_MASK));
+	return ((a & 0xff) << 24 | (rgb & TQT_RGB_MASK));
 }
 
 
diff --git a/tdecore/kdemacros.h.cmake b/tdecore/kdemacros.h.cmake
index 083cc8c8d..3750db1e4 100644
--- a/tdecore/kdemacros.h.cmake
+++ b/tdecore/kdemacros.h.cmake
@@ -54,7 +54,7 @@
  * cope with symbol visibility.
  */
 #define KDE_Q_EXPORT_PLUGIN(PLUGIN) \
-  TQ_EXTERN_C KDE_EXPORT const char* tqt_ucm_query_verification_data(); \
+  TQ_EXTERN_C KDE_EXPORT const char* qt_ucm_query_verification_data(); \
   TQ_EXTERN_C KDE_EXPORT TQUnknownInterface* ucm_instantiate(); \
   TQ_EXPORT_PLUGIN(PLUGIN)
 
diff --git a/tdecore/kdemacros.h.in b/tdecore/kdemacros.h.in
index 9566c386b..41cb0d68f 100644
--- a/tdecore/kdemacros.h.in
+++ b/tdecore/kdemacros.h.in
@@ -53,7 +53,7 @@
  * cope with symbol visibility.
  */
 #define KDE_Q_EXPORT_PLUGIN(PLUGIN) \
-  TQ_EXTERN_C KDE_EXPORT const char* tqt_ucm_query_verification_data(); \
+  TQ_EXTERN_C KDE_EXPORT const char* qt_ucm_query_verification_data(); \
   TQ_EXTERN_C KDE_EXPORT TQUnknownInterface* ucm_instantiate(); \
   TQ_EXPORT_PLUGIN(PLUGIN)
 
diff --git a/tdecore/ktimezones.cpp b/tdecore/ktimezones.cpp
index ce818bd87..999446b7c 100644
--- a/tdecore/ktimezones.cpp
+++ b/tdecore/ktimezones.cpp
@@ -605,7 +605,7 @@ const KTimezone *KTimezones::local()
         for (ZoneMap::Iterator it = m_zones->begin(); it != m_zones->end(); ++it)
         {
             KTimezone *zone = it.data();
-            int candidateOffset = QABS(zone->offset(TQt::LocalTime));
+            int candidateOffset = TQABS(zone->offset(TQt::LocalTime));
             if (zone->parse(matcher) && matcher.test() && (candidateOffset < bestOffset))
             {
                 // kdError() << "local=" << zone->name() << endl;
diff --git a/tdefx/tdestyle.cpp b/tdefx/tdestyle.cpp
index a1d60656a..87c4f3991 100644
--- a/tdefx/tdestyle.cpp
+++ b/tdefx/tdestyle.cpp
@@ -664,7 +664,7 @@ void TDEStyle::drawPrimitive( PrimitiveElement pe,
 
 
 
-void TDEStyle::drawControl( TQ_ControlElement element,
+void TDEStyle::drawControl( ControlElement element,
 						  TQPainter* p,
 						  const TQStyleControlElementData &ceData,
 						  ControlElementFlags elementFlags,
@@ -1109,7 +1109,7 @@ static TQListViewItem* nextVisibleSibling(TQListViewItem* item)
     return sibling;
 }
 
-void TDEStyle::drawComplexControl( TQ_ComplexControl control,
+void TDEStyle::drawComplexControl( ComplexControl control,
 								 TQPainter* p,
 								 const TQStyleControlElementData &ceData,
 								 ControlElementFlags elementFlags,
@@ -1415,7 +1415,7 @@ void TDEStyle::drawComplexControl( TQ_ComplexControl control,
 }
 
 
-TQStyle::SubControl TDEStyle::querySubControl( TQ_ComplexControl control,
+TQStyle::SubControl TDEStyle::querySubControl( ComplexControl control,
 											const TQStyleControlElementData &ceData,
 											ControlElementFlags elementFlags,
 											const TQPoint &pos,
@@ -1433,7 +1433,7 @@ TQStyle::SubControl TDEStyle::querySubControl( TQ_ComplexControl control,
 }
 
 
-TQRect TDEStyle::querySubControlMetrics( TQ_ComplexControl control,
+TQRect TDEStyle::querySubControlMetrics( ComplexControl control,
 									  const TQStyleControlElementData &ceData,
 									  ControlElementFlags elementFlags,
 									  SubControl sc,
diff --git a/tdefx/tdestyle.h b/tdefx/tdestyle.h
index 613a7a1a8..c9cd11f88 100644
--- a/tdefx/tdestyle.h
+++ b/tdefx/tdestyle.h
@@ -248,12 +248,12 @@ class TDEFX_EXPORT TDEStyle: public TQCommonStyle
 					const TQStyleOption& = TQStyleOption::Default ) const;
 
 		/**
-		 * This function is identical to Qt's TQStyle::tqdrawPrimitive(), except that 
+		 * This function is identical to Qt's TQStyle::drawPrimitive(), except that 
 		 * it adds one further parameter, 'widget', that can be used to determine 
 		 * the widget state of the TDEStylePrimitive in question.
 		 *
 		 * @see TDEStyle::TDEStylePrimitive
-		 * @see TQStyle::tqdrawPrimitive
+		 * @see TQStyle::drawPrimitive
 		 * @see TQStyle::drawComplexControl
 		 */
 		virtual void drawTDEStylePrimitive( TDEStylePrimitive kpe,
@@ -296,7 +296,7 @@ class TDEFX_EXPORT TDEStyle: public TQCommonStyle
 					SFlags flags = Style_Default,
 					const TQStyleOption& = TQStyleOption::Default ) const;
 
-		void drawControl( TQ_ControlElement element,
+		void drawControl( ControlElement element,
 					TQPainter* p,
 					const TQStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
@@ -306,7 +306,7 @@ class TDEFX_EXPORT TDEStyle: public TQCommonStyle
 					const TQStyleOption& = TQStyleOption::Default,
 					const TQWidget* widget = 0 ) const;
 
-		void drawComplexControl( TQ_ComplexControl control,
+		void drawComplexControl( ComplexControl control,
 					TQPainter *p,
 					const TQStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
@@ -318,14 +318,14 @@ class TDEFX_EXPORT TDEStyle: public TQCommonStyle
 					const TQStyleOption& = TQStyleOption::Default,
 					const TQWidget* widget = 0 ) const;
 
-		SubControl querySubControl( TQ_ComplexControl control,
+		SubControl querySubControl( ComplexControl control,
 					const TQStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
 					const TQPoint &pos,
 					const TQStyleOption& = TQStyleOption::Default,
 					const TQWidget* widget = 0 ) const;
 
-		TQRect querySubControlMetrics( TQ_ComplexControl control,
+		TQRect querySubControlMetrics( ComplexControl control,
 					const TQStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
 					SubControl sc,
diff --git a/tdehtml/rendering/render_form.cpp b/tdehtml/rendering/render_form.cpp
index f28706bd3..63bba2914 100644
--- a/tdehtml/rendering/render_form.cpp
+++ b/tdehtml/rendering/render_form.cpp
@@ -263,7 +263,7 @@ void RenderSubmitButton::calcMinMaxWidth()
         raw = TQString::fromLatin1("X");
     TQFontMetrics fm = pb->fontMetrics();
     TQSize ts = fm.size( ShowPrefix, raw);
-    TQSize s(pb->style().tqsizeFromContents( TQStyle::CT_PushButton, pb, ts )
+    TQSize s(pb->style().sizeFromContents( TQStyle::CT_PushButton, pb, ts )
             .expandedTo(TQApplication::globalStrut()));
     int margin = pb->style().pixelMetric( TQStyle::PM_ButtonMargin, pb) +
 		 pb->style().pixelMetric( TQStyle::PM_DefaultFrameWidth, pb ) * 2;
@@ -805,7 +805,7 @@ void RenderFileButton::calcMinMaxWidth()
     int h = fm.lineSpacing();
     int w = fm.width( 'x' ) * (size > 0 ? size+1 : 17); // "some"
     KLineEdit* edit = static_cast<KURLRequester*>( m_widget )->lineEdit();
-    TQSize s = edit->style().tqsizeFromContents(TQStyle::CT_LineEdit,
+    TQSize s = edit->style().sizeFromContents(TQStyle::CT_LineEdit,
                                              edit,
           TQSize(w + 2 + 2*edit->frameWidth(), kMax(h, 14) + 2 + 2*edit->frameWidth()))
         .expandedTo(TQApplication::globalStrut());
diff --git a/tdehtml/tdehtml_settings.cpp b/tdehtml/tdehtml_settings.cpp
index 7f799e311..2e4c5dcb6 100644
--- a/tdehtml/tdehtml_settings.cpp
+++ b/tdehtml/tdehtml_settings.cpp
@@ -442,7 +442,7 @@ void TDEHTMLSettings::init( TDEConfig * config, bool reset )
     d->m_fallbackAccessKeysAssignments.clear();
     for( TQStringList::ConstIterator it = accesskeys.begin(); it != accesskeys.end(); ++it )
         if( (*it).length() > 2 && (*it)[ 1 ] == ':' )
-            d->m_fallbackAccessKeysAssignments.append( tqMakePair( (*it).mid( 2 ), (*it)[ 0 ] ));
+            d->m_fallbackAccessKeysAssignments.append( qMakePair( (*it).mid( 2 ), (*it)[ 0 ] ));
   }
 
   // Colors
diff --git a/tdehtml/xml/dom_nodeimpl.cpp b/tdehtml/xml/dom_nodeimpl.cpp
index a00b072b9..22b71051f 100644
--- a/tdehtml/xml/dom_nodeimpl.cpp
+++ b/tdehtml/xml/dom_nodeimpl.cpp
@@ -1659,7 +1659,7 @@ NodeImpl *NodeListImpl::item( unsigned long index ) const
     bool      usedCache = false;
     if (m_cache->current.node) {
         //Compute distance from the requested index to the cache node
-        long cacheDist = QABS(long(index) - long(m_cache->position));
+        long cacheDist = TQABS(long(index) - long(m_cache->position));
 
         if (cacheDist < (long)index) { //Closer to the cached position
             usedCache = true;
diff --git a/tdeio/tdefile/tdefiledialog.cpp b/tdeio/tdefile/tdefiledialog.cpp
index bed8155c1..bfe73cb5c 100644
--- a/tdeio/tdefile/tdefiledialog.cpp
+++ b/tdeio/tdefile/tdefiledialog.cpp
@@ -834,10 +834,10 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge
     d->autoSelectExtChecked = false;
     d->urlBar = 0; // delayed loading
 
-    TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceQToolBar );
+    TQtMsgHandler oldHandler = qInstallMsgHandler( silenceQToolBar );
     toolbar = new TDEToolBar( d->mainWidget, "KFileDialog::toolbar", true);
     toolbar->setFlat(true);
-    tqInstallMsgHandler( oldHandler );
+    qInstallMsgHandler( oldHandler );
 
     d->pathCombo = new KURLComboBox( KURLComboBox::Directories, true,
                                      toolbar, "path combo" );
diff --git a/tdestyles/asteroid/asteroid.cpp b/tdestyles/asteroid/asteroid.cpp
index 7c56741a3..45739cff9 100644
--- a/tdestyles/asteroid/asteroid.cpp
+++ b/tdestyles/asteroid/asteroid.cpp
@@ -969,7 +969,7 @@ void AsteroidStyle::drawPrimitive(PrimitiveElement pe,
 	}
 }
 
-void AsteroidStyle::drawControl(TQ_ControlElement ce,
+void AsteroidStyle::drawControl(ControlElement ce,
                                 TQPainter *p,
                                 const TQStyleControlElementData &ceData,
                                 ControlElementFlags elementFlags,
@@ -1710,7 +1710,7 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce,
 	}
 }
 
-void AsteroidStyle::drawControlMask(TQ_ControlElement ce,
+void AsteroidStyle::drawControlMask(ControlElement ce,
                                     TQPainter *p,
                                     const TQStyleControlElementData &ceData,
                                     ControlElementFlags elementFlags,
@@ -1757,7 +1757,7 @@ void AsteroidStyle::drawControlMask(TQ_ControlElement ce,
 	}
 }
 
-void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc,
+void AsteroidStyle::drawComplexControl(ComplexControl cc,
                                        TQPainter *p,
                                        const TQStyleControlElementData &ceData,
                                        ControlElementFlags elementFlags,
@@ -2173,7 +2173,7 @@ void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc,
 	}
 }
 
-void AsteroidStyle::drawComplexControlMask(TQ_ComplexControl cc,
+void AsteroidStyle::drawComplexControlMask(ComplexControl cc,
                                            TQPainter *p,
                                            const TQStyleControlElementData &ceData,
                                            const ControlElementFlags elementFlags,
@@ -2373,7 +2373,7 @@ TQRect AsteroidStyle::subRect(SubRect sr, const TQStyleControlElementData &ceDat
 	}
 }
 
-TQRect AsteroidStyle::querySubControlMetrics(TQ_ComplexControl cc,
+TQRect AsteroidStyle::querySubControlMetrics(ComplexControl cc,
                                             const TQStyleControlElementData &ceData,
                                             ControlElementFlags elementFlags,
                                             SubControl sc,
diff --git a/tdestyles/asteroid/asteroid.h b/tdestyles/asteroid/asteroid.h
index 9f08a01ff..8cea936c0 100644
--- a/tdestyles/asteroid/asteroid.h
+++ b/tdestyles/asteroid/asteroid.h
@@ -58,7 +58,7 @@ public:
 	                   SFlags = Style_Default,
 	                   const TQStyleOption & = TQStyleOption::Default) const;
 
-	void drawControl(TQ_ControlElement,
+	void drawControl(ControlElement,
 	                 TQPainter *,
 	                 const TQStyleControlElementData &ceData,
 	                 ControlElementFlags elementFlags,
@@ -68,7 +68,7 @@ public:
 	                 const TQStyleOption & = TQStyleOption::Default,
 	                 const TQWidget * = 0) const;
 
-	void drawControlMask(TQ_ControlElement,
+	void drawControlMask(ControlElement,
 	                     TQPainter *,
 	                     const TQStyleControlElementData &ceData,
 	                     ControlElementFlags elementFlags,
@@ -76,7 +76,7 @@ public:
 	                     const TQStyleOption &,
 	                     const TQWidget * = 0) const;
 
-	void drawComplexControl(TQ_ComplexControl,
+	void drawComplexControl(ComplexControl,
 	                        TQPainter *,
 	                        const TQStyleControlElementData &ceData,
 	                        ControlElementFlags elementFlags,
@@ -88,7 +88,7 @@ public:
 	                        const TQStyleOption & = TQStyleOption::Default,
 	                        const TQWidget * = 0) const;
 
-	void drawComplexControlMask(TQ_ComplexControl,
+	void drawComplexControlMask(ComplexControl,
 	                            TQPainter *,
 	                            const TQStyleControlElementData &ceData,
 	                            const ControlElementFlags elementFlags,
@@ -102,7 +102,7 @@ public:
 
 	TQRect subRect(SubRect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *) const;
 
-	TQRect querySubControlMetrics(TQ_ComplexControl,
+	TQRect querySubControlMetrics(ComplexControl,
 	                             const TQStyleControlElementData &ceData,
 	                             ControlElementFlags elementFlags,
 	                             SubControl,
diff --git a/tdestyles/highcolor/highcolor.cpp b/tdestyles/highcolor/highcolor.cpp
index ba093b1ca..e2b2ccdaa 100644
--- a/tdestyles/highcolor/highcolor.cpp
+++ b/tdestyles/highcolor/highcolor.cpp
@@ -1144,7 +1144,7 @@ void HighColorStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
 }
 
 
-void HighColorStyle::drawControl( TQ_ControlElement element,
+void HighColorStyle::drawControl( ControlElement element,
 								  TQPainter *p,
 								  const TQStyleControlElementData &ceData,
 								  ControlElementFlags elementFlags,
@@ -1520,7 +1520,7 @@ void HighColorStyle::drawControl( TQ_ControlElement element,
 }
 
 
-void HighColorStyle::drawControlMask( TQ_ControlElement element,
+void HighColorStyle::drawControlMask( ControlElement element,
 								  	  TQPainter *p,
 								  	  const TQStyleControlElementData &ceData,
 								  	  ControlElementFlags elementFlags,
@@ -1548,7 +1548,7 @@ void HighColorStyle::drawControlMask( TQ_ControlElement element,
 }
 
 
-void HighColorStyle::drawComplexControl( TQ_ComplexControl control,
+void HighColorStyle::drawComplexControl( ComplexControl control,
                                          TQPainter *p,
                                          const TQStyleControlElementData &ceData,
                                          ControlElementFlags elementFlags,
@@ -1735,7 +1735,7 @@ void HighColorStyle::drawComplexControl( TQ_ComplexControl control,
 }
 
 
-void HighColorStyle::drawComplexControlMask( TQ_ComplexControl control,
+void HighColorStyle::drawComplexControlMask( ComplexControl control,
 											 TQPainter *p,
 											 const TQStyleControlElementData &ceData,
 											 const ControlElementFlags elementFlags,
diff --git a/tdestyles/highcolor/highcolor.h b/tdestyles/highcolor/highcolor.h
index 55b2fce8e..4019dc10b 100644
--- a/tdestyles/highcolor/highcolor.h
+++ b/tdestyles/highcolor/highcolor.h
@@ -90,7 +90,7 @@ class HighColorStyle : public TDEStyle
 					SFlags flags = Style_Default,
 					const TQStyleOption& = TQStyleOption::Default ) const;
 
-		void drawControl( TQ_ControlElement element,
+		void drawControl( ControlElement element,
 					TQPainter *p,
 					const TQStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
@@ -100,7 +100,7 @@ class HighColorStyle : public TDEStyle
 					const TQStyleOption& = TQStyleOption::Default,
 					const TQWidget *widget = 0 ) const;
 
-		void drawControlMask( TQ_ControlElement element,
+		void drawControlMask( ControlElement element,
 					TQPainter *p,
 					const TQStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
@@ -108,7 +108,7 @@ class HighColorStyle : public TDEStyle
 					const TQStyleOption& = TQStyleOption::Default,
 					const TQWidget *widget = 0 ) const;
 		
-		void drawComplexControl( TQ_ComplexControl control,
+		void drawComplexControl( ComplexControl control,
 					TQPainter *p,
 					const TQStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
@@ -120,7 +120,7 @@ class HighColorStyle : public TDEStyle
 					const TQStyleOption& = TQStyleOption::Default,
 					const TQWidget *widget = 0 ) const;
 
-		void drawComplexControlMask( TQ_ComplexControl control,
+		void drawComplexControlMask( ComplexControl control,
 					TQPainter *p,
 					const TQStyleControlElementData &ceData,
 					const ControlElementFlags elementFlags,
diff --git a/tdestyles/highcontrast/highcontrast.cpp b/tdestyles/highcontrast/highcontrast.cpp
index 7631a5376..5ef1f36d6 100644
--- a/tdestyles/highcontrast/highcontrast.cpp
+++ b/tdestyles/highcontrast/highcontrast.cpp
@@ -784,7 +784,7 @@ void HighContrastStyle::drawTDEStylePrimitive (TDEStylePrimitive kpe,
 }
 
 
-void HighContrastStyle::drawControl (TQ_ControlElement element,
+void HighContrastStyle::drawControl (ControlElement element,
 								TQPainter *p,
 								const TQStyleControlElementData &ceData,
 								ControlElementFlags elementFlags,
@@ -1162,7 +1162,7 @@ void HighContrastStyle::drawControl (TQ_ControlElement element,
 	}
 }
 
-void HighContrastStyle::drawControlMask (TQ_ControlElement element,
+void HighContrastStyle::drawControlMask (ControlElement element,
 										TQPainter *p,
 										const TQStyleControlElementData &ceData,
 										ControlElementFlags elementFlags,
@@ -1207,7 +1207,7 @@ static TQListViewItem* nextVisibleSibling(TQListViewItem* item)
     return sibling;
 }
 
-void HighContrastStyle::drawComplexControl (TQ_ComplexControl control,
+void HighContrastStyle::drawComplexControl (ComplexControl control,
 									TQPainter *p,
 									const TQStyleControlElementData &ceData,
 									ControlElementFlags elementFlags,
@@ -1262,12 +1262,12 @@ void HighContrastStyle::drawComplexControl (TQ_ComplexControl control,
 			setColorsButton (p, cg, flags);
 			// Draw arrows if required
 			if (controls & SC_SpinWidgetDown) {
-				TQRect r2 = TQStyle::visualRect (querySubControlMetrics ((TQ_ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetDown, TQStyleOption::Default, widget), ceData, elementFlags);
+				TQRect r2 = TQStyle::visualRect (querySubControlMetrics ((ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetDown, TQStyleOption::Default, widget), ceData, elementFlags);
 				drawRoundRect (p, r2);
 				drawArrow (p, r2, PE_SpinWidgetDown, 2*basicLineWidth);
 			}
 			if (controls & SC_SpinWidgetUp) {
-				TQRect r2 = TQStyle::visualRect (querySubControlMetrics ((TQ_ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetUp, TQStyleOption::Default, widget), ceData, elementFlags);
+				TQRect r2 = TQStyle::visualRect (querySubControlMetrics ((ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetUp, TQStyleOption::Default, widget), ceData, elementFlags);
 				drawRoundRect (p, r2);
 				drawArrow (p, r2, PE_SpinWidgetUp, 2*basicLineWidth);
 			}
@@ -1490,7 +1490,7 @@ void HighContrastStyle::drawComplexControl (TQ_ComplexControl control,
 	}
 }
 
-void HighContrastStyle::drawComplexControlMask(TQ_ComplexControl c,
+void HighContrastStyle::drawComplexControlMask(ComplexControl c,
 											   TQPainter *p,
 											   const TQStyleControlElementData &ceData,
 											   const ControlElementFlags elementFlags,
@@ -1535,7 +1535,7 @@ void HighContrastStyle::drawItem( TQPainter *p,
 	p->restore();
 }
 
-TQRect HighContrastStyle::querySubControlMetrics( TQ_ComplexControl control,
+TQRect HighContrastStyle::querySubControlMetrics( ComplexControl control,
 								  const TQStyleControlElementData &ceData,
 								  ControlElementFlags elementFlags,
 								  SubControl subcontrol,
diff --git a/tdestyles/highcontrast/highcontrast.h b/tdestyles/highcontrast/highcontrast.h
index 20469a064..688742fb6 100644
--- a/tdestyles/highcontrast/highcontrast.h
+++ b/tdestyles/highcontrast/highcontrast.h
@@ -78,7 +78,7 @@ class HighContrastStyle : public TDEStyle
 					SFlags flags = Style_Default,
 					const TQStyleOption& = TQStyleOption::Default ) const;
 
-		void drawControl( TQ_ControlElement element,
+		void drawControl( ControlElement element,
 					TQPainter *p,
 					const TQStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
@@ -88,7 +88,7 @@ class HighContrastStyle : public TDEStyle
 					const TQStyleOption& = TQStyleOption::Default,
 					const TQWidget *widget = 0 ) const;
 
-		void drawControlMask( TQ_ControlElement element,
+		void drawControlMask( ControlElement element,
 					TQPainter *p,
 					const TQStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
@@ -96,7 +96,7 @@ class HighContrastStyle : public TDEStyle
 					const TQStyleOption& = TQStyleOption::Default,
 					const TQWidget *widget = 0 ) const;
 
-		void drawComplexControl( TQ_ComplexControl control,
+		void drawComplexControl( ComplexControl control,
 					TQPainter *p,
 					const TQStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
@@ -108,7 +108,7 @@ class HighContrastStyle : public TDEStyle
 					const TQStyleOption& = TQStyleOption::Default,
 					const TQWidget *widget = 0 ) const;
 
-		void drawComplexControlMask( TQ_ComplexControl control,
+		void drawComplexControlMask( ComplexControl control,
 					TQPainter *p,
 					const TQStyleControlElementData &ceData,
 					const ControlElementFlags elementFlags,
@@ -116,7 +116,7 @@ class HighContrastStyle : public TDEStyle
 					const TQStyleOption& = TQStyleOption::Default,
 					const TQWidget *widget = 0 ) const;
 
-		TQRect querySubControlMetrics( TQ_ComplexControl control,
+		TQRect querySubControlMetrics( ComplexControl control,
 					const TQStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
 					SubControl subcontrol,
diff --git a/tdestyles/keramik/keramik.cpp b/tdestyles/keramik/keramik.cpp
index 346a5a2c3..508848b33 100644
--- a/tdestyles/keramik/keramik.cpp
+++ b/tdestyles/keramik/keramik.cpp
@@ -1380,7 +1380,7 @@ bool KeramikStyle::isFormWidget(const TQStyleControlElementData &ceData, const C
 	return false;
 }
 
-void KeramikStyle::drawControl( TQ_ControlElement element,
+void KeramikStyle::drawControl( ControlElement element,
 								  TQPainter *p,
 								  const TQStyleControlElementData &ceData,
 								  ControlElementFlags elementFlags,
@@ -1603,7 +1603,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element,
 										 tb->orientation() == TQt::Horizontal);
 			}
 			else
-				TDEStyle::drawControl( (TQ_ControlElement)CE_DockWindowEmptyArea, p, ceData, elementFlags,
+				TDEStyle::drawControl( (ControlElement)CE_DockWindowEmptyArea, p, ceData, elementFlags,
 					r, cg, flags, opt, widget );
 			break;
 		}
@@ -1963,7 +1963,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element,
 	}
 }
 
-void KeramikStyle::drawControlMask( TQ_ControlElement element,
+void KeramikStyle::drawControlMask( ControlElement element,
 								    TQPainter *p,
 								    const TQStyleControlElementData &ceData,
 								    ControlElementFlags elementFlags,
@@ -1995,7 +1995,7 @@ bool KeramikStyle::isSizeConstrainedCombo(const TQStyleControlElementData &ceDat
 	}
 }
 
-void KeramikStyle::drawComplexControl( TQ_ComplexControl control,
+void KeramikStyle::drawComplexControl( ComplexControl control,
                                          TQPainter *p,
                                          const TQStyleControlElementData &ceData,
                                          ControlElementFlags elementFlags,
@@ -2164,7 +2164,7 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control,
 		case CC_SpinWidget:
 		{
 			const TQSpinWidget* sw = static_cast< const TQSpinWidget* >( widget );
-			TQRect br = visualRect( querySubControlMetrics( (TQ_ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetButtonField, TQStyleOption::Default, widget ), ceData, elementFlags );
+			TQRect br = visualRect( querySubControlMetrics( (ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetButtonField, TQStyleOption::Default, widget ), ceData, elementFlags );
 			if ( controls & SC_SpinWidgetButtonField )
 			{
 				Keramik::SpinBoxPainter().draw( p, br, cg.button(), cg.background(), !sw->isEnabled() );
@@ -2361,7 +2361,7 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control,
 	}
 }
 
-void KeramikStyle::drawComplexControlMask( TQ_ComplexControl control,
+void KeramikStyle::drawComplexControlMask( ComplexControl control,
                                          TQPainter *p,
                                          const TQStyleControlElementData &ceData,
                                          const ControlElementFlags elementFlags,
@@ -2574,7 +2574,7 @@ TQSize KeramikStyle::sizeFromContents( ContentsType contents,
 }
 
 
-TQStyle::SubControl KeramikStyle::querySubControl( TQ_ComplexControl control,
+TQStyle::SubControl KeramikStyle::querySubControl( ComplexControl control,
                                                   const TQStyleControlElementData &ceData,
                                                   ControlElementFlags elementFlags,
                                                   const TQPoint& point,
@@ -2594,7 +2594,7 @@ TQStyle::SubControl KeramikStyle::querySubControl( TQ_ComplexControl control,
 	return result;
 }
 
-TQRect KeramikStyle::querySubControlMetrics( TQ_ComplexControl control,
+TQRect KeramikStyle::querySubControlMetrics( ComplexControl control,
 	                              const TQStyleControlElementData &ceData,
 	                              ControlElementFlags elementFlags,
 	                              SubControl subcontrol,
diff --git a/tdestyles/keramik/keramik.h b/tdestyles/keramik/keramik.h
index ba7139c63..23cc0d044 100644
--- a/tdestyles/keramik/keramik.h
+++ b/tdestyles/keramik/keramik.h
@@ -74,7 +74,7 @@ public:
 	                    SFlags flags = Style_Default,
 	                    const TQStyleOption& = TQStyleOption::Default ) const;
 
-	void drawControl( TQ_ControlElement element,
+	void drawControl( ControlElement element,
 	                  TQPainter* p,
 	                  const TQStyleControlElementData &ceData,
 	                  ControlElementFlags elementFlags,
@@ -84,7 +84,7 @@ public:
 	                  const TQStyleOption& opt = TQStyleOption::Default,
 	                  const TQWidget* widget = 0 ) const;
 
-	void drawControlMask( TQ_ControlElement element,
+	void drawControlMask( ControlElement element,
 	                      TQPainter* p,
 	                      const TQStyleControlElementData &ceData,
 	                      ControlElementFlags elementFlags,
@@ -92,7 +92,7 @@ public:
 	                      const TQStyleOption& opt = TQStyleOption::Default,
 	                      const TQWidget* widget = 0 ) const;
 
-	void drawComplexControl( TQ_ComplexControl control,
+	void drawComplexControl( ComplexControl control,
 	                         TQPainter* p,
 	                         const TQStyleControlElementData &ceData,
 	                         ControlElementFlags elementFlags,
@@ -104,7 +104,7 @@ public:
 	                         const TQStyleOption& = TQStyleOption::Default,
 	                         const TQWidget* widget = 0 ) const;
 
-	void drawComplexControlMask( TQ_ComplexControl control,
+	void drawComplexControlMask( ComplexControl control,
 	                             TQPainter* p,
 	                             const TQStyleControlElementData &ceData,
 	                             const ControlElementFlags elementFlags,
@@ -121,14 +121,14 @@ public:
 	                        const TQStyleOption& opt,
 	                        const TQWidget* widget = 0 ) const;
 
-	SubControl querySubControl( TQ_ComplexControl control,
+	SubControl querySubControl( ComplexControl control,
 	                            const TQStyleControlElementData &ceData,
 	                            ControlElementFlags elementFlags,
 	                            const TQPoint& point,
 						        const TQStyleOption& opt = TQStyleOption::Default,
 	                            const TQWidget* widget = 0 ) const;
 
-	TQRect querySubControlMetrics( TQ_ComplexControl control,
+	TQRect querySubControlMetrics( ComplexControl control,
 	                              const TQStyleControlElementData &ceData,
 	                              ControlElementFlags elementFlags,
 	                              SubControl subcontrol,
diff --git a/tdestyles/kthemestyle/kthemebase.h b/tdestyles/kthemestyle/kthemebase.h
index 12b2e7908..5317c806c 100644
--- a/tdestyles/kthemestyle/kthemebase.h
+++ b/tdestyles/kthemestyle/kthemebase.h
@@ -517,12 +517,12 @@ protected:
                                  SFlags flags = Style_Default,
                                  const TQStyleOption& option = TQStyleOption::Default ) const
     {
-        TDEStyle::tqdrawPrimitive ( pe, p, ceData, elementFlags, r, cg,
+        TDEStyle::drawPrimitive ( pe, p, ceData, elementFlags, r, cg,
                                 flags, option );
     }
 
 
-    virtual void drawControl( TQ_ControlElement element,
+    virtual void drawControl( ControlElement element,
                               TQPainter *p,
                               const TQStyleControlElementData &ceData,
                               ControlElementFlags elementFlags,
@@ -536,7 +536,7 @@ protected:
                              r, cg, how, opt, widget );
     }
 
-    virtual void drawControlMask( TQ_ControlElement element,
+    virtual void drawControlMask( ControlElement element,
                                   TQPainter *p,
                                   const TQStyleControlElementData &ceData,
                                   ControlElementFlags elementFlags,
@@ -548,7 +548,7 @@ protected:
     }
 
 
-    virtual void drawComplexControl( TQ_ComplexControl control,
+    virtual void drawComplexControl( ComplexControl control,
                                      TQPainter *p,
                                      const TQStyleControlElementData &ceData,
                                      ControlElementFlags elementFlags,
diff --git a/tdestyles/kthemestyle/kthemestyle.cpp b/tdestyles/kthemestyle/kthemestyle.cpp
index d72e524a8..bd89fb060 100644
--- a/tdestyles/kthemestyle/kthemestyle.cpp
+++ b/tdestyles/kthemestyle/kthemestyle.cpp
@@ -2013,7 +2013,7 @@ void KThemeStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
 
 
 
-void KThemeStyle::drawComplexControl ( TQ_ComplexControl control, TQPainter * p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
+void KThemeStyle::drawComplexControl ( ComplexControl control, TQPainter * p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
                                        const TQRect & r, const TQColorGroup & g, SFlags how ,
                                        SCFlags controls, SCFlags active,
                                        const TQStyleOption & opt, const TQWidget * widget ) const
diff --git a/tdestyles/kthemestyle/kthemestyle.h b/tdestyles/kthemestyle/kthemestyle.h
index e53187b2f..029301aae 100644
--- a/tdestyles/kthemestyle/kthemestyle.h
+++ b/tdestyles/kthemestyle/kthemestyle.h
@@ -104,7 +104,7 @@ public:
                                   const TQWidget *widget = 0 ) const;
 
 
-    virtual void drawComplexControl( TQ_ComplexControl control,
+    virtual void drawComplexControl( ComplexControl control,
                                      TQPainter *p,
                                      const TQStyleControlElementData &ceData,
                                      ControlElementFlags elementFlags,
diff --git a/tdestyles/light/lightstyle-v2.cpp b/tdestyles/light/lightstyle-v2.cpp
index 6e6cfa788..fbf197b88 100644
--- a/tdestyles/light/lightstyle-v2.cpp
+++ b/tdestyles/light/lightstyle-v2.cpp
@@ -642,7 +642,7 @@ void LightStyleV2::drawPrimitive( PrimitiveElement pe,
     }
 }
 
-void LightStyleV2::drawControl( TQ_ControlElement control,
+void LightStyleV2::drawControl( ControlElement control,
 			      TQPainter *p,
 			      const TQStyleControlElementData &ceData,
 			      ControlElementFlags elementFlags,
@@ -999,7 +999,7 @@ void LightStyleV2::drawControl( TQ_ControlElement control,
     }
 }
 
-void LightStyleV2::drawControlMask( TQ_ControlElement control,
+void LightStyleV2::drawControlMask( ControlElement control,
 				  TQPainter *p,
 				  const TQStyleControlElementData &ceData,
 				  ControlElementFlags elementFlags,
@@ -1045,7 +1045,7 @@ TQRect LightStyleV2::subRect(SubRect subrect, const TQStyleControlElementData &c
     return rect;
 }
 
-void LightStyleV2::drawComplexControl( TQ_ComplexControl control,
+void LightStyleV2::drawComplexControl( ComplexControl control,
 				     TQPainter* p,
 				     const TQStyleControlElementData &ceData,
 				     ControlElementFlags elementFlags,
@@ -1119,7 +1119,7 @@ void LightStyleV2::drawComplexControl( TQ_ComplexControl control,
 	    const TQSpinWidget *spinwidget = (const TQSpinWidget *) widget;
 	    TQRect frame, up, down;
 
-	    frame = querySubControlMetrics((TQ_ComplexControl)CC_SpinWidget, ceData, elementFlags,
+	    frame = querySubControlMetrics((ComplexControl)CC_SpinWidget, ceData, elementFlags,
 					   SC_SpinWidgetFrame, data, widget);
 	    up = ceData.spinWidgetData.upRect;
 	    down = ceData.spinWidgetData.downRect;
@@ -1329,7 +1329,7 @@ void LightStyleV2::drawComplexControl( TQ_ComplexControl control,
     }
 }
 
-TQRect LightStyleV2::querySubControlMetrics( TQ_ComplexControl control,
+TQRect LightStyleV2::querySubControlMetrics( ComplexControl control,
 					  const TQStyleControlElementData &ceData,
 					  ControlElementFlags elementFlags,
 					  SubControl sc,
@@ -1424,7 +1424,7 @@ TQRect LightStyleV2::querySubControlMetrics( TQ_ComplexControl control,
     return ret;
 }
 
-TQStyle::SubControl LightStyleV2::querySubControl( TQ_ComplexControl control,
+TQStyle::SubControl LightStyleV2::querySubControl( ComplexControl control,
 						const TQStyleControlElementData &ceData,
 						ControlElementFlags elementFlags,
 						const TQPoint &pos,
diff --git a/tdestyles/light/lightstyle-v2.h b/tdestyles/light/lightstyle-v2.h
index 2151d7f55..17240ac88 100644
--- a/tdestyles/light/lightstyle-v2.h
+++ b/tdestyles/light/lightstyle-v2.h
@@ -48,23 +48,23 @@ public:
 		       SFlags = Style_Default,
 		       const TQStyleOption & = TQStyleOption::Default ) const;
 
-    void drawControl(TQ_ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
+    void drawControl(ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
 		     const TQColorGroup &, SFlags = Style_Default,
 		     const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const;
-    void drawControlMask(TQ_ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
+    void drawControlMask(ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
 			 const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0) const;
 
     TQRect subRect(SubRect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *) const;
 
-    void drawComplexControl(TQ_ComplexControl, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
+    void drawComplexControl(ComplexControl, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
 			    const TQColorGroup &, SFlags = Style_Default,
 			    SCFlags = SC_All, SCFlags = SC_None,
 			    const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const;
 
-    TQRect querySubControlMetrics(TQ_ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl,
+    TQRect querySubControlMetrics(ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl,
 				 const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const;
 
-    SubControl querySubControl(TQ_ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &,
+    SubControl querySubControl(ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &,
 			       const TQStyleOption &data = TQStyleOption::Default, const TQWidget * = 0 ) const;
 
     int pixelMetric(PixelMetric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget * = 0 ) const;
diff --git a/tdestyles/light/lightstyle-v3.cpp b/tdestyles/light/lightstyle-v3.cpp
index 38159134c..790c03d79 100644
--- a/tdestyles/light/lightstyle-v3.cpp
+++ b/tdestyles/light/lightstyle-v3.cpp
@@ -830,7 +830,7 @@ void LightStyleV3::drawPrimitive( PrimitiveElement pe,
     }
 }
 
-void LightStyleV3::drawControl( TQ_ControlElement control,
+void LightStyleV3::drawControl( ControlElement control,
 			      TQPainter *p,
 			      const TQStyleControlElementData &ceData,
 			      ControlElementFlags elementFlags,
@@ -1114,7 +1114,7 @@ void LightStyleV3::drawControl( TQ_ControlElement control,
     }
 }
 
-void LightStyleV3::drawControlMask( TQ_ControlElement control,
+void LightStyleV3::drawControlMask( ControlElement control,
 				  TQPainter *p,
 				  const TQStyleControlElementData &ceData,
 				  ControlElementFlags elementFlags,
@@ -1178,7 +1178,7 @@ TQRect LightStyleV3::subRect(SubRect subrect, const TQStyleControlElementData &c
     return rect;
 }
 
-void LightStyleV3::drawComplexControl( TQ_ComplexControl control,
+void LightStyleV3::drawComplexControl( ComplexControl control,
 				     TQPainter* p,
 				     const TQStyleControlElementData &ceData,
 				     ControlElementFlags elementFlags,
@@ -1248,7 +1248,7 @@ void LightStyleV3::drawComplexControl( TQ_ComplexControl control,
 	    const TQSpinWidget *spinwidget = (const TQSpinWidget *) widget;
 	    TQRect frame, up, down;
 
-	    frame = querySubControlMetrics((TQ_ComplexControl)CC_SpinWidget, ceData, elementFlags,
+	    frame = querySubControlMetrics((ComplexControl)CC_SpinWidget, ceData, elementFlags,
 					   SC_SpinWidgetFrame, data, widget);
 	    up = ceData.spinWidgetData.upRect;
 	    down = ceData.spinWidgetData.downRect;
@@ -1455,7 +1455,7 @@ void LightStyleV3::drawComplexControl( TQ_ComplexControl control,
     }
 }
 
-TQRect LightStyleV3::querySubControlMetrics( TQ_ComplexControl control,
+TQRect LightStyleV3::querySubControlMetrics( ComplexControl control,
 					  const TQStyleControlElementData &ceData,
 					  ControlElementFlags elementFlags,
 					  SubControl sc,
@@ -1606,7 +1606,7 @@ TQRect LightStyleV3::querySubControlMetrics( TQ_ComplexControl control,
     return ret;
 }
 
-TQStyle::SubControl LightStyleV3::querySubControl( TQ_ComplexControl control,
+TQStyle::SubControl LightStyleV3::querySubControl( ComplexControl control,
 						const TQStyleControlElementData &ceData,
 						ControlElementFlags elementFlags,
 						const TQPoint &pos,
diff --git a/tdestyles/light/lightstyle-v3.h b/tdestyles/light/lightstyle-v3.h
index 7c2ba8e65..8f03cca74 100644
--- a/tdestyles/light/lightstyle-v3.h
+++ b/tdestyles/light/lightstyle-v3.h
@@ -52,23 +52,23 @@ public:
 		       SFlags = Style_Default,
 		       const TQStyleOption & = TQStyleOption::Default ) const;
 
-    void drawControl(TQ_ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
+    void drawControl(ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
 		     const TQColorGroup &, SFlags = Style_Default,
 		     const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const;
-    void drawControlMask(TQ_ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
+    void drawControlMask(ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
 			 const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0) const;
 
     TQRect subRect(SubRect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *) const;
 
-    void drawComplexControl(TQ_ComplexControl, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
+    void drawComplexControl(ComplexControl, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
 			    const TQColorGroup &, SFlags = Style_Default,
 			    SCFlags = SC_All, SCFlags = SC_None,
 			    const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const;
 
-    TQRect querySubControlMetrics(TQ_ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl,
+    TQRect querySubControlMetrics(ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl,
 				 const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const;
 
-    SubControl querySubControl(TQ_ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &,
+    SubControl querySubControl(ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &,
 			       const TQStyleOption &data = TQStyleOption::Default, const TQWidget * = 0 ) const;
 
     int pixelMetric(PixelMetric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget * = 0 ) const;
diff --git a/tdestyles/plastik/plastik.cpp b/tdestyles/plastik/plastik.cpp
index 06816aa32..01026122f 100644
--- a/tdestyles/plastik/plastik.cpp
+++ b/tdestyles/plastik/plastik.cpp
@@ -2181,7 +2181,7 @@ void PlastikStyle::drawPrimitive(PrimitiveElement pe,
 }
 
 
-void PlastikStyle::drawControl(TQ_ControlElement element,
+void PlastikStyle::drawControl(ControlElement element,
                               TQPainter *p,
                               const TQStyleControlElementData &ceData,
                               ControlElementFlags elementFlags,
@@ -2737,7 +2737,7 @@ void PlastikStyle::drawControl(TQ_ControlElement element,
     }
 }
 
-void PlastikStyle::drawControlMask(TQ_ControlElement element,
+void PlastikStyle::drawControlMask(ControlElement element,
                                   TQPainter *p,
                                   const TQStyleControlElementData &ceData,
                                   ControlElementFlags elementFlags,
@@ -2759,7 +2759,7 @@ void PlastikStyle::drawControlMask(TQ_ControlElement element,
     }
 }
 
-void PlastikStyle::drawComplexControlMask(TQ_ComplexControl c,
+void PlastikStyle::drawComplexControlMask(ComplexControl c,
                                          TQPainter *p,
                                          const TQStyleControlElementData &ceData,
                                          const ControlElementFlags elementFlags,
@@ -2782,7 +2782,7 @@ void PlastikStyle::drawComplexControlMask(TQ_ComplexControl c,
     }
 }
 
-void PlastikStyle::drawComplexControl(TQ_ComplexControl control,
+void PlastikStyle::drawComplexControl(ComplexControl control,
                                      TQPainter *p,
                                      const TQStyleControlElementData &ceData,
                                      ControlElementFlags elementFlags,
@@ -3199,7 +3199,7 @@ TQRect PlastikStyle::subRect(SubRect r, const TQStyleControlElementData &ceData,
     }
 }
 
-TQRect PlastikStyle::querySubControlMetrics(TQ_ComplexControl control,
+TQRect PlastikStyle::querySubControlMetrics(ComplexControl control,
                                           const TQStyleControlElementData &ceData,
                                           ControlElementFlags elementFlags,
                                           SubControl subcontrol,
diff --git a/tdestyles/plastik/plastik.h b/tdestyles/plastik/plastik.h
index b1edd6c04..89946fd48 100644
--- a/tdestyles/plastik/plastik.h
+++ b/tdestyles/plastik/plastik.h
@@ -85,7 +85,7 @@ public:
                        SFlags flags = Style_Default,
                        const TQStyleOption &opt = TQStyleOption::Default ) const;
 
-    void drawControl(TQ_ControlElement element,
+    void drawControl(ControlElement element,
                      TQPainter *p,
                      const TQStyleControlElementData &ceData,
                      ControlElementFlags elementFlags,
@@ -95,9 +95,9 @@ public:
                      const TQStyleOption& = TQStyleOption::Default,
                      const TQWidget *widget = 0 ) const;
 
-    void drawControlMask( TQ_ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQStyleOption &, const TQWidget * = 0) const;
+    void drawControlMask( ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQStyleOption &, const TQWidget * = 0) const;
 
-    void drawComplexControl(TQ_ComplexControl control,
+    void drawComplexControl(ComplexControl control,
                             TQPainter *p,
                             const TQStyleControlElementData &ceData,
                             ControlElementFlags elementFlags,
@@ -115,14 +115,14 @@ public:
     TQRect subRect(SubRect r, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags,
                   const TQWidget *widget ) const;
 
-    TQRect querySubControlMetrics(TQ_ComplexControl control,
+    TQRect querySubControlMetrics(ComplexControl control,
                                  const TQStyleControlElementData &ceData,
                                  ControlElementFlags elementFlags,
                                  SubControl subcontrol,
                                  const TQStyleOption &opt = TQStyleOption::Default,
                                  const TQWidget *widget = 0 ) const;
 
-    void drawComplexControlMask(TQStyle::TQ_ComplexControl c,
+    void drawComplexControlMask(TQStyle::ComplexControl c,
                                 TQPainter *p,
                                 const TQStyleControlElementData &ceData,
                                 const ControlElementFlags elementFlags,
diff --git a/tdeui/karrowbutton.cpp b/tdeui/karrowbutton.cpp
index b1ecc4c88..c02e4a028 100644
--- a/tdeui/karrowbutton.cpp
+++ b/tdeui/karrowbutton.cpp
@@ -63,7 +63,7 @@ void KArrowButton::drawButton(TQPainter *p)
 	const unsigned int margin = 2;
 	
         p->fillRect( rect(), colorGroup().brush( TQColorGroup::Background ) );
-	style().tqdrawPrimitive( TQStyle::PE_Panel, p, TQRect( 0, 0, width(), height() ),
+	style().drawPrimitive( TQStyle::PE_Panel, p, TQRect( 0, 0, width(), height() ),
 			       colorGroup(), 
 			       isDown() ? TQStyle::Style_Sunken : TQStyle::Style_Default,
 			       TQStyleOption( 2, 0 ) );
@@ -103,7 +103,7 @@ void KArrowButton::drawButton(TQPainter *p)
 	int flags = TQStyle::Style_Enabled;
 	if ( isDown() )
 		flags |= TQStyle::Style_Down;
-	style().tqdrawPrimitive( e, p, TQRect( TQPoint( x, y ), TQSize( arrowSize, arrowSize ) ),
+	style().drawPrimitive( e, p, TQRect( TQPoint( x, y ), TQSize( arrowSize, arrowSize ) ),
 			       colorGroup(), flags );
 }
 
diff --git a/tdeui/kcharselect.cpp b/tdeui/kcharselect.cpp
index a4cc92791..76ec10bf2 100644
--- a/tdeui/kcharselect.cpp
+++ b/tdeui/kcharselect.cpp
@@ -173,7 +173,7 @@ void KCharSelectTable::paintCell( class TQPainter* p, int row, int col )
     }
 
     if ( c == focusItem.unicode() && hasFocus() ) {
-	style().tqdrawPrimitive( TQStyle::PE_FocusRect, p, TQRect( 2, 2, w - 4, h - 4 ), 
+	style().drawPrimitive( TQStyle::PE_FocusRect, p, TQRect( 2, 2, w - 4, h - 4 ), 
 			       colorGroup() );
 	focusPos = TQPoint( col, row );
     }
diff --git a/tdeui/kcolorbutton.cpp b/tdeui/kcolorbutton.cpp
index 37ab8a111..bebedf6c9 100644
--- a/tdeui/kcolorbutton.cpp
+++ b/tdeui/kcolorbutton.cpp
@@ -126,13 +126,13 @@ void KColorButton::drawButtonLabel( TQPainter *painter )
 
   if ( hasFocus() ) {
     TQRect focusRect = style().subRect( TQStyle::SR_PushButtonFocusRect, this );
-    style().tqdrawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, colorGroup() );
+    style().drawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, colorGroup() );
   }
 }
 
 TQSize KColorButton::sizeHint() const
 {
-  return style().tqsizeFromContents(TQStyle::CT_PushButton, this, TQSize(40, 15)).
+  return style().sizeFromContents(TQStyle::CT_PushButton, this, TQSize(40, 15)).
 	  	expandedTo(TQApplication::globalStrut());
 }
 
diff --git a/tdeui/kdatepicker.cpp b/tdeui/kdatepicker.cpp
index a6dffca89..3d57d5a3f 100644
--- a/tdeui/kdatepicker.cpp
+++ b/tdeui/kdatepicker.cpp
@@ -507,7 +507,7 @@ KDatePicker::setFontSize(int s)
       maxMonthRect.setHeight(TQMAX(r.height(),  maxMonthRect.height()));
     }
 
-  TQSize metricBound = style().tqsizeFromContents(TQStyle::CT_ToolButton,
+  TQSize metricBound = style().sizeFromContents(TQStyle::CT_ToolButton,
                                                selectMonth,
                                                maxMonthRect);
   selectMonth->setMinimumSize(metricBound);
diff --git a/tdeui/kdockwidget.cpp b/tdeui/kdockwidget.cpp
index d423ea161..7e5e6bd64 100644
--- a/tdeui/kdockwidget.cpp
+++ b/tdeui/kdockwidget.cpp
@@ -203,7 +203,7 @@ void KDockWidgetHeaderDrag::paintEvent( TQPaintEvent* )
 
   paint.begin( this );
 
-  style().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup());
+  style().drawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup());
 
   paint.end();
 }
@@ -574,7 +574,7 @@ void KDockWidget::paintEvent(TQPaintEvent* pe)
 	TQWidget::paintEvent(pe);
         TQPainter paint;
         paint.begin( this );
-        style().tqdrawPrimitive (TQStyle::PE_Panel, &paint, TQRect(0,0,width(), height()), colorGroup());
+        style().drawPrimitive (TQStyle::PE_Panel, &paint, TQRect(0,0,width(), height()), colorGroup());
         paint.end();
 }
 
diff --git a/tdeui/kseparator.cpp b/tdeui/kseparator.cpp
index 647f62ba5..f97a54080 100644
--- a/tdeui/kseparator.cpp
+++ b/tdeui/kseparator.cpp
@@ -95,7 +95,7 @@ void KSeparator::drawFrame(TQPainter *p)
    }
 
    TQStyleOption opt( lineWidth(), midLineWidth() );
-   style().tqdrawPrimitive( TQStyle::PE_Separator, p, TQRect( p1, p2 ), g,
+   style().drawPrimitive( TQStyle::PE_Separator, p, TQRect( p1, p2 ), g,
 		          TQStyle::Style_Sunken, opt );
 }
 
diff --git a/tdeui/kstdguiitem.cpp b/tdeui/kstdguiitem.cpp
index 3091092f5..0ed7241dd 100644
--- a/tdeui/kstdguiitem.cpp
+++ b/tdeui/kstdguiitem.cpp
@@ -199,7 +199,7 @@ KGuiItem KStdGuiItem::forward( BidiMode useBidi )
 
 TQPair<KGuiItem, KGuiItem> KStdGuiItem::backAndForward()
 {
-    return tqMakePair( back( UseRTL ), forward( UseRTL ) );
+    return qMakePair( back( UseRTL ), forward( UseRTL ) );
 }
 
 KGuiItem KStdGuiItem::print()
diff --git a/tdeui/ktabwidget.cpp b/tdeui/ktabwidget.cpp
index a6f14d2a2..10ed6ae76 100644
--- a/tdeui/ktabwidget.cpp
+++ b/tdeui/ktabwidget.cpp
@@ -190,7 +190,7 @@ unsigned int KTabWidget::tabBarWidthForMaxChars( uint maxLength )
         int iw = 0;
         if ( tab->iconSet() )
           iw = tab->iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).width() + 4;
-        x += ( tabBar()->style().tqsizeFromContents( TQStyle::CT_TabBarTab, this,
+        x += ( tabBar()->style().sizeFromContents( TQStyle::CT_TabBarTab, this,
                    TQSize( TQMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ),
                    TQStyleOption( tab ) ) ).width();
     }
diff --git a/tdeui/kurllabel.cpp b/tdeui/kurllabel.cpp
index 754871c17..c87695e68 100644
--- a/tdeui/kurllabel.cpp
+++ b/tdeui/kurllabel.cpp
@@ -367,7 +367,7 @@ bool KURLLabel::event (TQEvent *e)
     if (result && hasFocus()) {
         TQPainter p(this);
         TQRect r( activeRect() );
-        style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, r, colorGroup() );
+        style().drawPrimitive( TQStyle::PE_FocusRect, &p, r, colorGroup() );
     }
     return result;
   }
diff --git a/tdeui/tdelistview.cpp b/tdeui/tdelistview.cpp
index ce7f530be..4935bf566 100644
--- a/tdeui/tdelistview.cpp
+++ b/tdeui/tdelistview.cpp
@@ -1399,7 +1399,7 @@ TQRect TDEListView::drawItemHighlighter(TQPainter *painter, TQListViewItem *item
     r = itemRect(item);
     r.setLeft(r.left()+(item->depth()+(rootIsDecorated() ? 1 : 0))*treeStepSize());
     if (painter)
-      style().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, r, colorGroup(),
+      style().drawPrimitive(TQStyle::PE_FocusRect, painter, r, colorGroup(),
                             TQStyle::Style_FocusAtBorder, colorGroup().highlight());
   }
 
@@ -2152,7 +2152,7 @@ void TDEListView::viewportPaintEvent(TQPaintEvent *e)
       TQPainter painter(viewport());
 
       // This is where we actually draw the drop-highlighter
-      style().tqdrawPrimitive(TQStyle::PE_FocusRect, &painter, d->mOldDropHighlighter, colorGroup(),
+      style().drawPrimitive(TQStyle::PE_FocusRect, &painter, d->mOldDropHighlighter, colorGroup(),
                             TQStyle::Style_FocusAtBorder);
     }
   d->painting = false;
diff --git a/tdeui/tdepopupmenu.cpp b/tdeui/tdepopupmenu.cpp
index 6110667f9..453a3e41f 100644
--- a/tdeui/tdepopupmenu.cpp
+++ b/tdeui/tdepopupmenu.cpp
@@ -86,7 +86,7 @@ void TDEPopupTitle::paintEvent(TQPaintEvent *)
 {
     TQRect r(rect());
     TQPainter p(this);
-    kapp->style().tqdrawPrimitive(TQStyle::PE_HeaderSectionMenu, &p, r, palette().active());
+    kapp->style().drawPrimitive(TQStyle::PE_HeaderSectionMenu, &p, r, palette().active());
 
     if (!miniicon.isNull())
         p.drawPixmap(4, (r.height()-miniicon.height())/2, miniicon);
diff --git a/tdeui/tdeselect.cpp b/tdeui/tdeselect.cpp
index 9d1a898fd..3d453f01e 100644
--- a/tdeui/tdeselect.cpp
+++ b/tdeui/tdeselect.cpp
@@ -122,7 +122,7 @@ void KXYSelector::paintEvent( TQPaintEvent *ev )
 	TQPainter painter;
 	painter.begin( this );
 
-	style().tqdrawPrimitive(TQStyle::PE_Panel, &painter, 
+	style().drawPrimitive(TQStyle::PE_Panel, &painter, 
 			      borderRect, colorGroup(), 
 			      TQStyle::Style_Sunken);
 
@@ -281,7 +281,7 @@ void TDESelector::paintEvent( TQPaintEvent * )
 			r.addCoords(0, iw - w, -iw, w - iw);
 		else
 			r.addCoords(iw - w, 0, w - iw, -iw);
-		style().tqdrawPrimitive(TQStyle::PE_Panel, &painter, 
+		style().drawPrimitive(TQStyle::PE_Panel, &painter, 
 			r, colorGroup(), 
 			TQStyle::Style_Sunken);
 	}
diff --git a/tdeui/tdetoolbar.cpp b/tdeui/tdetoolbar.cpp
index 039c483d8..651e789a9 100644
--- a/tdeui/tdetoolbar.cpp
+++ b/tdeui/tdetoolbar.cpp
@@ -170,7 +170,7 @@ void TDEToolBarSeparator::drawContents( TQPainter* p )
         if ( orientation() == TQt::Horizontal )
             flags = flags | TQStyle::Style_Horizontal;
 
-        style().tqdrawPrimitive(TQStyle::PE_DockWindowSeparator, p,
+        style().drawPrimitive(TQStyle::PE_DockWindowSeparator, p,
                               contentsRect(), colorGroup(), flags);
     } else {
         TQFrame::drawContents(p);
diff --git a/tdeui/tdetoolbarbutton.cpp b/tdeui/tdetoolbarbutton.cpp
index 9e3313de3..854ad2f9b 100644
--- a/tdeui/tdetoolbarbutton.cpp
+++ b/tdeui/tdetoolbarbutton.cpp
@@ -251,7 +251,7 @@ void TDEToolBarButton::modeChange()
     break;
   }
 
-  mysize = style().tqsizeFromContents(TQStyle::CT_ToolButton, this, mysize).
+  mysize = style().sizeFromContents(TQStyle::CT_ToolButton, this, mysize).
                expandedTo(TQApplication::globalStrut());
 
   // make sure that this isn't taller then it is wide
@@ -628,7 +628,7 @@ void TDEToolBarButton::drawButton( TQPainter *_painter )
     if (isDown())	arrowFlags |= TQStyle::Style_Down;
     if (isEnabled()) 	arrowFlags |= TQStyle::Style_Enabled;
 
-      style().tqdrawPrimitive(TQStyle::PE_ArrowDown, _painter,
+      style().drawPrimitive(TQStyle::PE_ArrowDown, _painter,
           TQRect(width()-7, height()-7, 7, 7), colorGroup(),
 	  arrowFlags, TQStyleOption() );
   }
diff --git a/tdeutils/tdemultitabbar.cpp b/tdeutils/tdemultitabbar.cpp
index ea82e2d6e..2661893d6 100644
--- a/tdeutils/tdemultitabbar.cpp
+++ b/tdeutils/tdemultitabbar.cpp
@@ -491,7 +491,7 @@ TQSize KMultiTabBarButton::sizeHint() const
             h = TQMAX(h, sz.height());
     }
 
-    return (style().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)).
+    return (style().sizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)).
             expandedTo(TQApplication::globalStrut()));
 }