Replace various tqtinterface's TQ_* defines with actual types

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

10 files changed, 30 insertions, 30 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 );