TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


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

1 files changed, 11 insertions, 11 deletions

diff --git a/kget/droptarget.cpp b/kget/droptarget.cpp
index eeea1486..419de737 100644
--- a/kget/droptarget.cpp
+++ b/kget/droptarget.cpp
@@ -39,13 +39,13 @@
 
 #include "kmainwidget.h"
 #include <tqcursor.h>
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xos.h>
 #include <X11/extensions/shape.h>
 #undef Bool
-#undef Status
+#undef tqStatus
 #endif
 #include "settings.h"
 #include "droptarget.h"
@@ -77,10 +77,10 @@ DropTarget::DropTarget(KMainWindow * mainWin):TQWidget()
 
     // setup pixmaps
 
-    if (!bgnd.mask())
-        kdError(5001) << "Drop target pixmap has no mask!\n";
+    if (!bgnd.tqmask())
+        kdError(5001) << "Drop target pixmap has no tqmask!\n";
     else
-        mask = *bgnd.mask();
+        tqmask = *bgnd.tqmask();
 
     setBackgroundPixmap( bgnd );
 
@@ -118,7 +118,7 @@ DropTarget::~DropTarget()
 void
 DropTarget::mousePressEvent(TQMouseEvent * e)
 {
-    if (e->button() == LeftButton)
+    if (e->button() == Qt::LeftButton)
     {
         // toggleMinimizeRestore ();
 //        oldX = 0;
@@ -127,14 +127,14 @@ DropTarget::mousePressEvent(TQMouseEvent * e)
         dx = TQCursor::pos().x() - pos().x();
         dy = TQCursor::pos().y() - pos().y();
     }
-    else if (e->button() == RightButton)
+    else if (e->button() == Qt::RightButton)
     {
         popupMenu->setItemEnabled(pop_Min, kmain->isVisible());
         popupMenu->setItemEnabled(pop_Max, kmain->isHidden());
 
         popupMenu->popup(TQCursor::pos());
     }
-    else if (e->button() == MidButton)
+    else if (e->button() == Qt::MidButton)
     {
         kmain->slotPasteTransfer();
     }
@@ -143,8 +143,8 @@ DropTarget::mousePressEvent(TQMouseEvent * e)
 
 void DropTarget::resizeEvent(TQResizeEvent *)
 {
-#ifdef Q_WS_X11
-    XShapeCombineMask(x11Display(), winId(), ShapeBounding, 0, 0, mask.handle(), ShapeSet);
+#ifdef TQ_WS_X11
+    XShapeCombineMask(x11Display(), winId(), ShapeBounding, 0, 0, tqmask.handle(), ShapeSet);
 #endif
 }
 
@@ -224,7 +224,7 @@ void DropTarget::mouseReleaseEvent(TQMouseEvent *)
 /** No descriptions */
 void DropTarget::mouseDoubleClickEvent(TQMouseEvent * e)
 {
-    if (e->button() == LeftButton)
+    if (e->button() == Qt::LeftButton)
         toggleMinimizeRestore();
 }