Enable compilation with TQt for Qt4 3.4.0 TP2

This should not break compatibility with TQt for Qt3; if it does please fix it ASAP!


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

1 files changed, 6 insertions, 6 deletions

diff --git a/kicker/kicker/core/container_button.cpp b/kicker/kicker/core/container_button.cpp
index bb0249843..0cd7d6f19 100644
--- a/kicker/kicker/core/container_button.cpp
+++ b/kicker/kicker/core/container_button.cpp
@@ -215,7 +215,7 @@ void ButtonContainer::dragButton(const TQPixmap icon)
 
 bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e)
 {
-    if (o == _button && e->type() == TQEvent::MouseButtonPress)
+    if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_button) && e->type() == TQEvent::MouseButtonPress)
     {
         static bool sentinal = false;
 
@@ -225,10 +225,10 @@ bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e)
         }
 
         sentinal = true;
-        TQMouseEvent* me = static_cast<TQMouseEvent*>(e);
+        TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
         switch (me->button())
         {
-        case MidButton:
+        case Qt::MidButton:
         {
             if (isImmutable())
             {
@@ -242,7 +242,7 @@ bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e)
             return true;
         }
 
-        case RightButton:
+        case Qt::RightButton:
         {
             if (!kapp->authorizeKAction("kicker_rmb") ||
                 isImmutable())
@@ -252,8 +252,8 @@ bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e)
 
             TQPopupMenu* menu = opMenu();
             connect( menu, TQT_SIGNAL( aboutToHide() ), this, TQT_SLOT( slotMenuClosed() ) );
-            TQPoint pos = KickerLib::popupPosition(popupDirection(), menu, this,
-                                                  (orientation() == Horizontal) ?
+            TQPoint pos = KickerLib::popupPosition(popupDirection(), menu, TQT_TQWIDGET(this),
+                                                  (orientation() == Qt::Horizontal) ?
                                                    TQPoint(0, 0) : me->pos());
 
             Kicker::the()->setInsertionPoint(me->globalPos());