Replace various tqtinterface's TQ_* defines with actual types

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

35 files changed, 98 insertions, 98 deletions

diff --git a/tdecore/kextsock.cpp b/tdecore/kextsock.cpp
index bb7449e7d..39ddc2f18 100644
--- a/tdecore/kextsock.cpp
+++ b/tdecore/kextsock.cpp
@@ -1257,7 +1257,7 @@ void KExtendedSocket::cancelAsyncConnect()
   d->status = lookupDone;
 }
 
-bool KExtendedSocket::open(TQ_OpenMode mode)
+bool KExtendedSocket::open(int mode)
 {
   if (mode != IO_Raw | IO_ReadWrite)
     return false;		// invalid open mode
diff --git a/tdecore/kextsock.h b/tdecore/kextsock.h
index 78068f03f..51d751201 100644
--- a/tdecore/kextsock.h
+++ b/tdecore/kextsock.h
@@ -618,7 +618,7 @@ public:
    * @return true if successful, false when an error occurred or the most was
    *         not correct
    */
-  virtual bool open(TQ_OpenMode mode = (TQ_OpenMode)(IO_Raw | IO_ReadWrite));
+  virtual bool open(int mode = (int)(IO_Raw | IO_ReadWrite));
 
   /**
    * Closes the socket. If we have data still in the write buffer yet to be
diff --git a/tdecore/kkeyserver_x11.h b/tdecore/kkeyserver_x11.h
index 90330911b..090372ef1 100644
--- a/tdecore/kkeyserver_x11.h
+++ b/tdecore/kkeyserver_x11.h
@@ -414,7 +414,7 @@ namespace KKeyServer
 	/**
 	 * Converts the Qt-compatible button state to x11 modifier. 
 	 */
-	TDECORE_EXPORT int qtButtonStateToMod( TQ_ButtonState s );
+	TDECORE_EXPORT int qtButtonStateToMod( Qt::ButtonState s );
 
 	/**
 	 * Converts the mask of ORed X11 modifiers to
diff --git a/tdecore/kqiodevicegzip_p.cpp b/tdecore/kqiodevicegzip_p.cpp
index e63b9e8b4..150715fec 100644
--- a/tdecore/kqiodevicegzip_p.cpp
+++ b/tdecore/kqiodevicegzip_p.cpp
@@ -37,7 +37,7 @@ KQIODeviceGZip::~KQIODeviceGZip(void)
         close();
 }
 
-bool KQIODeviceGZip::open(TQ_OpenMode mode)
+bool KQIODeviceGZip::open(int mode)
 {
     if (m_gzfile)
         close(); // One file is already open, so close it first.
diff --git a/tdecore/kqiodevicegzip_p.h b/tdecore/kqiodevicegzip_p.h
index 22e4133b0..9df93881e 100644
--- a/tdecore/kqiodevicegzip_p.h
+++ b/tdecore/kqiodevicegzip_p.h
@@ -38,7 +38,7 @@ public:
     KQIODeviceGZip(const TQString& filename);
     ~KQIODeviceGZip(void);
 
-    bool open(TQ_OpenMode mode);
+    bool open(int mode);
     void close(void);
     void flush(void);
 
diff --git a/tdecore/network/kclientsocketbase.h b/tdecore/network/kclientsocketbase.h
index 246987859..bb4c44cb9 100644
--- a/tdecore/network/kclientsocketbase.h
+++ b/tdecore/network/kclientsocketbase.h
@@ -272,7 +272,7 @@ public:
    *
    * You should not call this function; instead, use @ref connect
    */
-  virtual inline bool open(TQ_OpenMode)
+  virtual inline bool open(int)
   { return connect(); }
 
   /**
diff --git a/tdecore/network/tdesocketdevice.cpp b/tdecore/network/tdesocketdevice.cpp
index 3d683b405..3832a401b 100644
--- a/tdecore/network/tdesocketdevice.cpp
+++ b/tdecore/network/tdesocketdevice.cpp
@@ -171,7 +171,7 @@ bool TDESocketDevice::setSocketOptions(int opts)
   return true;			// all went well
 }
 
-bool TDESocketDevice::open(TQ_OpenMode)
+bool TDESocketDevice::open(int)
 {
   resetError();
   return false;
diff --git a/tdecore/network/tdesocketdevice.h b/tdecore/network/tdesocketdevice.h
index b01bfbc41..7d04f6694 100644
--- a/tdecore/network/tdesocketdevice.h
+++ b/tdecore/network/tdesocketdevice.h
@@ -142,7 +142,7 @@ public:
   /**
    * Reimplementation from TQIODevice. You should not call this function in sockets.
    */
-  virtual bool open(TQ_OpenMode mode);
+  virtual bool open(int mode);
 
   /**
    * Closes the socket. Reimplemented from TQIODevice.
diff --git a/tdecore/tdeapplication.cpp b/tdecore/tdeapplication.cpp
index dbed066e3..d3ff5bcb2 100644
--- a/tdecore/tdeapplication.cpp
+++ b/tdecore/tdeapplication.cpp
@@ -3632,7 +3632,7 @@ uint TDEApplication::mouseState()
     return mousestate & 0xff00;
 }
 
-TQ_ButtonState TDEApplication::keyboardMouseState()
+Qt::ButtonState TDEApplication::keyboardMouseState()
 {
     int ret = 0;
 #ifdef Q_WS_X11
@@ -3644,35 +3644,35 @@ TQ_ButtonState TDEApplication::keyboardMouseState()
                    &root_x, &root_y, &win_x, &win_y, &state );
     // transform the same way like Qt's qt_x11_translateButtonState()
     if( state & Button1Mask )
-        ret |= TQ_LeftButton;
+        ret |= LeftButton;
     if( state & Button2Mask )
-        ret |= TQ_MidButton;
+        ret |= MidButton;
     if( state & Button3Mask )
-        ret |= TQ_RightButton;
+        ret |= RightButton;
     if( state & ShiftMask )
-        ret |= TQ_ShiftButton;
+        ret |= ShiftButton;
     if( state & ControlMask )
-        ret |= TQ_ControlButton;
+        ret |= ControlButton;
     if( state & KKeyNative::modX( KKey::ALT ))
-        ret |= TQ_AltButton;
+        ret |= AltButton;
     if( state & KKeyNative::modX( KKey::WIN ))
-        ret |= TQ_MetaButton;
+        ret |= MetaButton;
 #elif defined(Q_WS_WIN)
     const bool mousebtn_swapped = GetSystemMetrics(SM_SWAPBUTTON);
     if (GetAsyncKeyState(VK_LBUTTON))
         ret |= (mousebtn_swapped ? RightButton : LeftButton);
     if (GetAsyncKeyState(VK_MBUTTON))
-        ret |= TQ_MidButton;
+        ret |= MidButton;
     if (GetAsyncKeyState(VK_RBUTTON))
-        ret |= (mousebtn_swapped ? TQ_LeftButton : TQ_RightButton);
+        ret |= (mousebtn_swapped ? LeftButton : RightButton);
     if (GetAsyncKeyState(VK_SHIFT))
-        ret |= TQ_ShiftButton;
+        ret |= ShiftButton;
     if (GetAsyncKeyState(VK_CONTROL))
-        ret |= TQ_ControlButton;
+        ret |= ControlButton;
     if (GetAsyncKeyState(VK_MENU))
-        ret |= TQ_AltButton;
+        ret |= AltButton;
     if (GetAsyncKeyState(VK_LWIN) || GetAsyncKeyState(VK_RWIN))
-        ret |= TQ_MetaButton;
+        ret |= MetaButton;
 #else
     //TODO: other platforms
 #endif
diff --git a/tdecore/tdeshortcutmenu.cpp b/tdecore/tdeshortcutmenu.cpp
index c035c0df9..fe868c68a 100644
--- a/tdecore/tdeshortcutmenu.cpp
+++ b/tdecore/tdeshortcutmenu.cpp
@@ -84,14 +84,14 @@ void TDEShortcutMenu::keyPressEvent( TQKeyEvent* pEvent )
 	KKey key( pEvent );
 	
 	switch( pEvent->key() ) {
-	 case TQ_Key_Shift:
-	 case TQ_Key_Control:
-	 case TQ_Key_Alt:
-	 case TQ_Key_Meta:
-	 case TQ_Key_Super_L:
-	 case TQ_Key_Super_R:
-	 case TQ_Key_Hyper_L:
-	 case TQ_Key_Hyper_R:
+	 case Key_Shift:
+	 case Key_Control:
+	 case Key_Alt:
+	 case Key_Meta:
+	 case Key_Super_L:
+	 case Key_Super_R:
+	 case Key_Hyper_L:
+	 case Key_Hyper_R:
 		break;
 	 default:
 		int iItem = searchForKey( key );
diff --git a/tdefx/tdestyle.cpp b/tdefx/tdestyle.cpp
index ce17cc24c..628c5ca7c 100644
--- a/tdefx/tdestyle.cpp
+++ b/tdefx/tdestyle.cpp
@@ -569,7 +569,7 @@ int TDEStyle::kPixelMetric( TDEStylePixelMetric kpm, const TQStyleControlElement
 
 // -----------------------------------------------------------------------------
 
-void TDEStyle::drawPrimitive( TQ_PrimitiveElement pe,
+void TDEStyle::drawPrimitive( PrimitiveElement pe,
 							TQPainter* p,
 							const TQStyleControlElementData &ceData,
 							ControlElementFlags elementFlags,
@@ -1853,7 +1853,7 @@ TQPixmap TDEStyle::stylePixmap( StylePixmap stylepixmap,
 }
 
 
-int TDEStyle::styleHint( TQ_StyleHint sh, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
+int TDEStyle::styleHint( StyleHint sh, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
 					   const TQStyleOption &opt, TQStyleHintReturn* shr, const TQWidget* w) const
 {
 	switch (sh)
diff --git a/tdefx/tdestyle.h b/tdefx/tdestyle.h
index 7cf4e0858..4991eb733 100644
--- a/tdefx/tdestyle.h
+++ b/tdefx/tdestyle.h
@@ -287,7 +287,7 @@ class TDEFX_EXPORT TDEStyle: public TQCommonStyle
 		void unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
 		void polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr );
 
-		void drawPrimitive( TQ_PrimitiveElement pe,
+		void drawPrimitive( PrimitiveElement pe,
 					TQPainter* p,
 					const TQStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
@@ -344,7 +344,7 @@ class TDEFX_EXPORT TDEStyle: public TQCommonStyle
 					const TQStyleOption& = TQStyleOption::SO_Default,
 					const TQWidget* widget = 0 ) const;
 
-		int styleHint( TQ_StyleHint sh, const TQStyleControlElementData &ceData,
+		int styleHint( StyleHint sh, const TQStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
 					const TQStyleOption &opt = TQStyleOption::SO_Default,
 					TQStyleHintReturn* shr = 0,
diff --git a/tdehtml/rendering/render_form.cpp b/tdehtml/rendering/render_form.cpp
index f251b7f3b..33f045553 100644
--- a/tdehtml/rendering/render_form.cpp
+++ b/tdehtml/rendering/render_form.cpp
@@ -99,7 +99,7 @@ void RenderFormElement::layout()
     setNeedsLayout(false);
 }
 
-TQ_Alignment RenderFormElement::textAlignment() const
+Qt::AlignmentFlags RenderFormElement::textAlignment() const
 {
     switch (style()->textAlign()) {
         case LEFT:
diff --git a/tdehtml/rendering/render_form.h b/tdehtml/rendering/render_form.h
index 2ef4cafdb..8fa2099f8 100644
--- a/tdehtml/rendering/render_form.h
+++ b/tdehtml/rendering/render_form.h
@@ -95,7 +95,7 @@ public:
 protected:
     virtual bool isRenderButton() const { return false; }
     virtual bool isEditable() const { return false; }
-    TQ_Alignment textAlignment() const;
+    Qt::AlignmentFlags textAlignment() const;
 
     TQPoint m_mousePos;
     int m_state;
diff --git a/tdeio/tdeio/kfilterdev.cpp b/tdeio/tdeio/kfilterdev.cpp
index 37e3dcde3..22ad620d2 100644
--- a/tdeio/tdeio/kfilterdev.cpp
+++ b/tdeio/tdeio/kfilterdev.cpp
@@ -116,7 +116,7 @@ TQIODevice * KFilterDev::device( TQIODevice* inDevice, const TQString & mimetype
    return 0;
 }
 
-bool KFilterDev::open( TQ_OpenMode mode )
+bool KFilterDev::open( int mode )
 {
     //kdDebug(7005) << "KFilterDev::open " << mode << endl;
     if ( mode == IO_ReadOnly )
@@ -132,7 +132,7 @@ bool KFilterDev::open( TQ_OpenMode mode )
     d->bNeedHeader = !d->bSkipHeaders;
     filter->init( mode );
     d->bOpenedUnderlyingDevice = !filter->device()->isOpen();
-    bool ret = d->bOpenedUnderlyingDevice ? filter->device()->open( (TQ_OpenMode)mode ) : true;
+    bool ret = d->bOpenedUnderlyingDevice ? filter->device()->open( (int)mode ) : true;
     d->result = KFilterBase::OK;
 
     if ( !ret )
diff --git a/tdeio/tdeio/kfilterdev.h b/tdeio/tdeio/kfilterdev.h
index 7599f342e..8db390110 100644
--- a/tdeio/tdeio/kfilterdev.h
+++ b/tdeio/tdeio/kfilterdev.h
@@ -55,7 +55,7 @@ public:
      */
 #ifdef qdoc
 #else
-    virtual bool open( TQ_OpenMode mode );
+    virtual bool open( int mode );
 #endif
     /**
      * Close after reading or writing.
diff --git a/tdeio/tdeio/klimitediodevice.h b/tdeio/tdeio/klimitediodevice.h
index 570b647d7..c1008d079 100644
--- a/tdeio/tdeio/klimitediodevice.h
+++ b/tdeio/tdeio/klimitediodevice.h
@@ -47,7 +47,7 @@ public:
     }
     virtual ~KLimitedIODevice() {}
 
-    virtual bool open( TQ_OpenMode m ) {
+    virtual bool open( int m ) {
         //kdDebug(7005) << "KLimitedIODevice::open m=" << m << endl;
         if ( m & IO_ReadOnly ) {
             /*bool ok = false;
diff --git a/tdestyles/asteroid/asteroid.cpp b/tdestyles/asteroid/asteroid.cpp
index 6034b1c42..bd05125fd 100644
--- a/tdestyles/asteroid/asteroid.cpp
+++ b/tdestyles/asteroid/asteroid.cpp
@@ -283,7 +283,7 @@ void AsteroidStyle::drawTDEStylePrimitive(TDEStylePrimitive ksp,
 	}
 }
 
-int AsteroidStyle::styleHint( TQ_StyleHint stylehint,
+int AsteroidStyle::styleHint( StyleHint stylehint,
                                    const TQStyleControlElementData &ceData,
                                    ControlElementFlags elementFlags,
                                    const TQStyleOption &option,
@@ -313,7 +313,7 @@ int AsteroidStyle::styleHint( TQ_StyleHint stylehint,
 	}
 }
 
-void AsteroidStyle::drawPrimitive(TQ_PrimitiveElement pe,
+void AsteroidStyle::drawPrimitive(PrimitiveElement pe,
                                   TQPainter *p,
                                   const TQStyleControlElementData &ceData,
                                   ControlElementFlags elementFlags,
diff --git a/tdestyles/asteroid/asteroid.h b/tdestyles/asteroid/asteroid.h
index b5d7e5a6e..9f08a01ff 100644
--- a/tdestyles/asteroid/asteroid.h
+++ b/tdestyles/asteroid/asteroid.h
@@ -44,12 +44,12 @@ public:
 	                         const TQStyleOption & = TQStyleOption::Default,
 	                         const TQWidget * = 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;
 
-	void drawPrimitive(TQ_PrimitiveElement,
+	void drawPrimitive(PrimitiveElement,
 	                   TQPainter *,
 	                   const TQStyleControlElementData &ceData,
 	                   ControlElementFlags elementFlags,
diff --git a/tdestyles/highcolor/highcolor.cpp b/tdestyles/highcolor/highcolor.cpp
index 6f06a18e4..f15c335cb 100644
--- a/tdestyles/highcolor/highcolor.cpp
+++ b/tdestyles/highcolor/highcolor.cpp
@@ -251,7 +251,7 @@ void HighColorStyle::renderMenuBlendPixmap( KPixmap& pix, const TQColorGroup &cg
 
 
 // This function draws primitive elements as well as their masks.
-void HighColorStyle::drawPrimitive( TQ_PrimitiveElement pe,
+void HighColorStyle::drawPrimitive( PrimitiveElement pe,
 									TQPainter *p,
 									const TQStyleControlElementData &ceData,
 									ControlElementFlags elementFlags,
@@ -1493,7 +1493,7 @@ void HighColorStyle::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/highcolor/highcolor.h b/tdestyles/highcolor/highcolor.h
index 93e2658dd..55b2fce8e 100644
--- a/tdestyles/highcolor/highcolor.h
+++ b/tdestyles/highcolor/highcolor.h
@@ -81,7 +81,7 @@ class HighColorStyle : 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,
@@ -158,7 +158,7 @@ class HighColorStyle : public TDEStyle
 					const TQStyleOption& = TQStyleOption::Default,
 					const TQWidget *widget = 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;
 
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
diff --git a/tdestyles/keramik/keramik.cpp b/tdestyles/keramik/keramik.cpp
index c33644c66..6b1d5fd4d 100644
--- a/tdestyles/keramik/keramik.cpp
+++ b/tdestyles/keramik/keramik.cpp
@@ -123,7 +123,7 @@ namespace
 
 namespace
 {
-	void drawKeramikArrow(TQPainter* p, TQColorGroup cg, TQRect r, TQStyle::TQ_PrimitiveElement pe, bool down, bool enabled)
+	void drawKeramikArrow(TQPainter* p, TQColorGroup cg, TQRect r, TQStyle::PrimitiveElement pe, bool down, bool enabled)
 	{
 		TQPointArray a;
 
@@ -543,7 +543,7 @@ static void renderToolbarWidgetBackground(TQPainter* painter, const TQStyleContr
 }
 
 // This function draws primitive elements as well as their masks.
-void KeramikStyle::drawPrimitive( TQ_PrimitiveElement pe,
+void KeramikStyle::drawPrimitive( PrimitiveElement pe,
 									TQPainter *p,
 									const TQStyleControlElementData &ceData,
 									ControlElementFlags elementFlags,
@@ -1831,7 +1831,7 @@ void KeramikStyle::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) - itemFrame;
 				TQRect vr = visualRect( TQRect( x + w - arrowHMargin - itemFrame - dim,
 							y + h / 2 - dim / 2, dim, dim), r );
diff --git a/tdestyles/keramik/keramik.h b/tdestyles/keramik/keramik.h
index 6b0cf42ab..ba7139c63 100644
--- a/tdestyles/keramik/keramik.h
+++ b/tdestyles/keramik/keramik.h
@@ -65,7 +65,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,
@@ -135,7 +135,7 @@ public:
 	                              const TQStyleOption& opt = TQStyleOption::Default,
 	                              const TQWidget* widget = 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;
 
diff --git a/tdestyles/light/lightstyle-v2.cpp b/tdestyles/light/lightstyle-v2.cpp
index 7e0c39076..1809f3bad 100644
--- a/tdestyles/light/lightstyle-v2.cpp
+++ b/tdestyles/light/lightstyle-v2.cpp
@@ -129,7 +129,7 @@ static void drawLightBevel(TQPainter *p, const TQRect &r, const TQColorGroup &cg
     if (fill) p->fillRect(br, *fill);
 }
 
-void LightStyleV2::drawPrimitive( TQ_PrimitiveElement pe,
+void LightStyleV2::drawPrimitive( PrimitiveElement pe,
 				TQPainter *p,
 				const TQStyleControlElementData &ceData,
 				ControlElementFlags elementFlags,
@@ -447,7 +447,7 @@ void LightStyleV2::drawPrimitive( TQ_PrimitiveElement pe,
     case PE_ScrollBarSubLine:
 	{
 	    TQRect fr = r, ar = r;
-	    TQ_PrimitiveElement pe;
+	    PrimitiveElement pe;
 
 	    p->setPen(cg.dark());
 	    if (flags & Style_Horizontal) {
@@ -472,7 +472,7 @@ void LightStyleV2::drawPrimitive( TQ_PrimitiveElement pe,
     case PE_ScrollBarAddLine:
 	{
 	    TQRect fr = r, ar = r;
-	    TQ_PrimitiveElement pe;
+	    PrimitiveElement pe;
 
 	    p->setPen(cg.dark());
 	    if (flags & Style_Horizontal) {
@@ -1129,7 +1129,7 @@ void LightStyleV2::drawComplexControl( TQ_ComplexControl control,
 			       &cg.brush(TQColorGroup::Base));
 
 	    if ((controls & SC_SpinWidgetUp) && up.isValid()) {
-		TQ_PrimitiveElement pe = PE_SpinWidgetUp;
+		PrimitiveElement pe = PE_SpinWidgetUp;
 		if ( ceData.spinWidgetData.buttonSymbols == TQSpinWidget::PlusMinus )
 		    pe = PE_SpinWidgetPlus;
 
@@ -1162,7 +1162,7 @@ void LightStyleV2::drawComplexControl( TQ_ComplexControl control,
 	    }
 
 	    if ((controls & SC_SpinWidgetDown) && down.isValid()) {
-		TQ_PrimitiveElement pe = PE_SpinWidgetDown;
+		PrimitiveElement pe = PE_SpinWidgetDown;
 		if ( ceData.spinWidgetData.buttonSymbols == TQSpinWidget::PlusMinus )
 		    pe = PE_SpinWidgetMinus;
 
@@ -1625,7 +1625,7 @@ TQSize LightStyleV2::sizeFromContents( ContentsType contents,
     return ret;
 }
 
-int LightStyleV2::styleHint( TQ_StyleHint stylehint,
+int LightStyleV2::styleHint( StyleHint stylehint,
 			   const TQStyleControlElementData &ceData,
 			   ControlElementFlags elementFlags,
 			   const TQStyleOption &option,
diff --git a/tdestyles/light/lightstyle-v2.h b/tdestyles/light/lightstyle-v2.h
index 9460d53fb..2c81ae6bc 100644
--- a/tdestyles/light/lightstyle-v2.h
+++ b/tdestyles/light/lightstyle-v2.h
@@ -44,7 +44,7 @@ public:
 
     void polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr );
 
-    void drawPrimitive(TQ_PrimitiveElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &,
+    void drawPrimitive(PrimitiveElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &,
 		       SFlags = Style_Default,
 		       const TQStyleOption & = TQStyleOption::Default ) const;
 
@@ -72,7 +72,7 @@ public:
     TQSize sizeFromContents(ContentsType, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQSize &,
 			   const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 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;
 
diff --git a/tdestyles/light/lightstyle-v3.cpp b/tdestyles/light/lightstyle-v3.cpp
index d7fc2bfd3..38ebe4293 100644
--- a/tdestyles/light/lightstyle-v3.cpp
+++ b/tdestyles/light/lightstyle-v3.cpp
@@ -212,7 +212,7 @@ static void drawLightBevel( TQPainter *p,
 	p->fillRect( br, *fill );
 }
 
-void LightStyleV3::drawPrimitive( TQ_PrimitiveElement pe,
+void LightStyleV3::drawPrimitive( PrimitiveElement pe,
 				TQPainter *p,
 				const TQStyleControlElementData &ceData,
 				ControlElementFlags elementFlags,
@@ -590,7 +590,7 @@ void LightStyleV3::drawPrimitive( TQ_PrimitiveElement pe,
     case PE_ScrollBarSubLine:
 	{
 	    TQRect br = r;
-	    TQ_PrimitiveElement pe;
+	    PrimitiveElement pe;
 
 	    p->setPen( cg.background() );
 	    if (flags & Style_Horizontal) {
@@ -624,7 +624,7 @@ void LightStyleV3::drawPrimitive( TQ_PrimitiveElement pe,
     case PE_ScrollBarAddLine:
 	{
 	    TQRect br = r;
-	    TQ_PrimitiveElement pe;
+	    PrimitiveElement pe;
 
 	    p->setPen( cg.background() );
 	    if (flags & Style_Horizontal) {
@@ -1257,7 +1257,7 @@ void LightStyleV3::drawComplexControl( TQ_ComplexControl control,
 		drawPrimitive( PE_Panel, p, ceData, elementFlags, frame, cg, flags | Style_Sunken );
 
 	    if ((controls & SC_SpinWidgetUp) && up.isValid()) {
-		TQ_PrimitiveElement pe = PE_SpinWidgetUp;
+		PrimitiveElement pe = PE_SpinWidgetUp;
 		if ( ceData.spinWidgetData.buttonSymbols == TQSpinWidget::PlusMinus )
 		    pe = PE_SpinWidgetPlus;
 
@@ -1275,7 +1275,7 @@ void LightStyleV3::drawComplexControl( TQ_ComplexControl control,
 	    }
 
 	    if ((controls & SC_SpinWidgetDown) && down.isValid()) {
-		TQ_PrimitiveElement pe = PE_SpinWidgetDown;
+		PrimitiveElement pe = PE_SpinWidgetDown;
 		if ( ceData.spinWidgetData.buttonSymbols == TQSpinWidget::PlusMinus )
 		    pe = PE_SpinWidgetMinus;
 
@@ -1854,7 +1854,7 @@ TQSize LightStyleV3::sizeFromContents( ContentsType contents,
     return ret;
 }
 
-int LightStyleV3::styleHint( TQ_StyleHint stylehint,
+int LightStyleV3::styleHint( StyleHint stylehint,
 			   const TQStyleControlElementData &ceData,
 			   ControlElementFlags elementFlags,
 			   const TQStyleOption &option,
diff --git a/tdestyles/light/lightstyle-v3.h b/tdestyles/light/lightstyle-v3.h
index 345b30144..5379e7e76 100644
--- a/tdestyles/light/lightstyle-v3.h
+++ b/tdestyles/light/lightstyle-v3.h
@@ -48,7 +48,7 @@ public:
 
     void polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr );
 
-    void drawPrimitive(TQ_PrimitiveElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &,
+    void drawPrimitive(PrimitiveElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &,
 		       SFlags = Style_Default,
 		       const TQStyleOption & = TQStyleOption::Default ) const;
 
@@ -76,7 +76,7 @@ public:
     TQSize sizeFromContents(ContentsType, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQSize &,
 			   const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 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;
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;
 
diff --git a/tdeui/kbugreport.cpp b/tdeui/kbugreport.cpp
index 1fccd9f61..bd7559f42 100644
--- a/tdeui/kbugreport.cpp
+++ b/tdeui/kbugreport.cpp
@@ -122,7 +122,7 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const TDEAboutData *abou
                                         parent );
     connect( m_configureEmail, TQT_SIGNAL( clicked() ), this,
              TQT_SLOT( slotConfigureEmail() ) );
-    glay->addMultiCellWidget( m_configureEmail, 0, 2, 2, 2, (TQ_Alignment)(AlignTop|AlignRight) );
+    glay->addMultiCellWidget( m_configureEmail, 0, 2, 2, 2, (Qt::AlignmentFlags)(AlignTop|AlignRight) );
 
     // To
     qwtstr = i18n( "The email address this bug report is sent to." );
diff --git a/tdeui/kpassdlg.cpp b/tdeui/kpassdlg.cpp
index 38f63484f..1d3805881 100644
--- a/tdeui/kpassdlg.cpp
+++ b/tdeui/kpassdlg.cpp
@@ -230,12 +230,12 @@ void KPasswordDialog::init()
 	lbl->setPixmap(pix);
 	lbl->setAlignment(AlignHCenter|AlignVCenter);
 	lbl->setFixedSize(lbl->sizeHint());
-	m_pGrid->addWidget(lbl, 0, 0, (TQ_Alignment)AlignCenter);
+	m_pGrid->addWidget(lbl, 0, 0, (Qt::AlignmentFlags)AlignCenter);
     }
 
     m_pHelpLbl = new TQLabel(m_pMain);
     m_pHelpLbl->setAlignment(AlignLeft|AlignVCenter|WordBreak);
-    m_pGrid->addWidget(m_pHelpLbl, 0, 2, (TQ_Alignment)AlignLeft);
+    m_pGrid->addWidget(m_pHelpLbl, 0, 2, (Qt::AlignmentFlags)AlignLeft);
     m_pGrid->addRowSpacing(1, 10);
     m_pGrid->setRowStretch(1, 12);
 
@@ -248,7 +248,7 @@ void KPasswordDialog::init()
     lbl->setAlignment(AlignLeft|AlignVCenter);
     lbl->setText(i18n("&Password:"));
     lbl->setFixedSize(lbl->sizeHint());
-    m_pGrid->addWidget(lbl, 7, 0, (TQ_Alignment)AlignLeft);
+    m_pGrid->addWidget(lbl, 7, 0, (Qt::AlignmentFlags)AlignLeft);
 
     TQHBoxLayout *h_lay = new TQHBoxLayout();
     m_pGrid->addLayout(h_lay, 7, 2);
@@ -278,8 +278,8 @@ void KPasswordDialog::init()
 	    m_keepWarnLbl->hide();
 	}
 	connect(cb, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotKeep(bool)));
-	m_pGrid->addWidget(cb, 9, 2, (TQ_Alignment)(AlignLeft|AlignVCenter));
-//	m_pGrid->addWidget(m_keepWarnLbl, 13, 2, (TQ_Alignment)(AlignLeft|AlignVCenter));
+	m_pGrid->addWidget(cb, 9, 2, (Qt::AlignmentFlags)(AlignLeft|AlignVCenter));
+//	m_pGrid->addWidget(m_keepWarnLbl, 13, 2, (Qt::AlignmentFlags)(AlignLeft|AlignVCenter));
 	m_pGrid->addMultiCellWidget(m_keepWarnLbl, 13, 13, 0, 3);
     } else if (m_Type == NewPassword) {
 	m_pGrid->addRowSpacing(8, 10);
@@ -287,7 +287,7 @@ void KPasswordDialog::init()
 	lbl->setAlignment(AlignLeft|AlignVCenter);
 	lbl->setText(i18n("&Verify:"));
 	lbl->setFixedSize(lbl->sizeHint());
-	m_pGrid->addWidget(lbl, 9, 0, (TQ_Alignment)AlignLeft);
+	m_pGrid->addWidget(lbl, 9, 0, (Qt::AlignmentFlags)AlignLeft);
 
 	h_lay = new TQHBoxLayout();
 	m_pGrid->addLayout(h_lay, 9, 2);
@@ -381,12 +381,12 @@ void KPasswordDialog::addLine(TQString key, TQString value)
     TQLabel *lbl = new TQLabel(key, m_pMain);
     lbl->setAlignment(AlignLeft|AlignTop);
     lbl->setFixedSize(lbl->sizeHint());
-    m_pGrid->addWidget(lbl, m_Row+2, 0, (TQ_Alignment)AlignLeft);
+    m_pGrid->addWidget(lbl, m_Row+2, 0, (Qt::AlignmentFlags)AlignLeft);
 
     lbl = new TQLabel(value, m_pMain);
     lbl->setAlignment(AlignTop|WordBreak);
     lbl->setFixedSize(275, lbl->heightForWidth(275));
-    m_pGrid->addWidget(lbl, m_Row+2, 2, (TQ_Alignment)AlignLeft);
+    m_pGrid->addWidget(lbl, m_Row+2, 2, (Qt::AlignmentFlags)AlignLeft);
     ++m_Row;
 }
 
diff --git a/tdeui/kswitchlanguagedialog.cpp b/tdeui/kswitchlanguagedialog.cpp
index 626c62c3e..207d93a0d 100644
--- a/tdeui/kswitchlanguagedialog.cpp
+++ b/tdeui/kswitchlanguagedialog.cpp
@@ -323,12 +323,12 @@ void KSwitchLanguageDialogPrivate::addLanguageButton(const TQString & languageCo
     int numRows = languagesLayout->numRows();
     
     TQLabel *languageLabel = new TQLabel(labelText, page);
-    languagesLayout->addWidget( languageLabel, numRows + 1, 1, (TQ_Alignment)TQt::AlignAuto );
-    languagesLayout->addWidget( languageButton, numRows + 1, 2, (TQ_Alignment)TQt::AlignAuto );
+    languagesLayout->addWidget( languageLabel, numRows + 1, 1, (Qt::AlignmentFlags)TQt::AlignAuto );
+    languagesLayout->addWidget( languageButton, numRows + 1, 2, (Qt::AlignmentFlags)TQt::AlignAuto );
     
     if (primaryLanguage == false)
     {
-        languagesLayout->addWidget( removeButton, numRows + 1, 3, (TQ_Alignment)TQt::AlignAuto );
+        languagesLayout->addWidget( removeButton, numRows + 1, 3, (Qt::AlignmentFlags)TQt::AlignAuto );
         
         languageRowData.setRowWidgets(
             languageLabel,
diff --git a/tdeui/tdeaboutdialog.cpp b/tdeui/tdeaboutdialog.cpp
index f403feb88..9d572f824 100644
--- a/tdeui/tdeaboutdialog.cpp
+++ b/tdeui/tdeaboutdialog.cpp
@@ -227,8 +227,8 @@ void TDEAboutContributor::updateLayout( void )
       {
 	if( mShowHeader )
 	{
-	  gbox->addWidget( TQT_TQWIDGET(mLabel[i]), r, 0, (TQ_Alignment)AlignLeft );
-	  gbox->addWidget( TQT_TQWIDGET(mText[i]), r, 1, (TQ_Alignment)AlignLeft  );
+	  gbox->addWidget( TQT_TQWIDGET(mLabel[i]), r, 0, (Qt::AlignmentFlags)AlignLeft );
+	  gbox->addWidget( TQT_TQWIDGET(mText[i]), r, 1, (Qt::AlignmentFlags)AlignLeft  );
 	  mLabel[i]->show();
 	  mText[i]->show();
 	}
@@ -237,11 +237,11 @@ void TDEAboutContributor::updateLayout( void )
 	  mLabel[i]->hide();
 	  if( !i )
 	  {
-	    gbox->addMultiCellWidget( TQT_TQWIDGET(mText[i]), r, r, 0, 1, (TQ_Alignment)AlignLeft );
+	    gbox->addMultiCellWidget( TQT_TQWIDGET(mText[i]), r, r, 0, 1, (Qt::AlignmentFlags)AlignLeft );
 	  }
 	  else
 	  {
-	    gbox->addWidget( TQT_TQWIDGET(mText[i]), r, 1, (TQ_Alignment)AlignLeft  );
+	    gbox->addWidget( TQT_TQWIDGET(mText[i]), r, 1, (Qt::AlignmentFlags)AlignLeft  );
 	  }
 	  mText[i]->show();
 	}