Drop TQT_BASE_OBJECT* defines

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 0fc56f21d45249a473d20555ff3071d3b16bee54)

9 files changed, 18 insertions, 18 deletions

diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp
index d7b8268aa..536d62065 100644
--- a/kicker/applets/clock/clock.cpp
+++ b/kicker/applets/clock/clock.cpp
@@ -1675,7 +1675,7 @@ void ClockApplet::wheelEvent(TQWheelEvent* e)
 // catch the mouse clicks of our child widgets
 bool ClockApplet::eventFilter( TQObject *o, TQEvent *e )
 {
-    if (( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_clock->widget()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_date) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_dayOfWeek)) &&
+    if (( o == _clock->widget() || o == _date || o == _dayOfWeek) &&
         e->type() == TQEvent::MouseButtonPress )
     {
         mousePressEvent(TQT_TQMOUSEEVENT(e) );
diff --git a/kicker/applets/lockout/lockout.cpp b/kicker/applets/lockout/lockout.cpp
index d4c14c9db..75533202c 100644
--- a/kicker/applets/lockout/lockout.cpp
+++ b/kicker/applets/lockout/lockout.cpp
@@ -196,7 +196,7 @@ bool Lockout::eventFilter( TQObject *o, TQEvent *e )
         TQMouseEvent *me = TQT_TQMOUSEEVENT( e );
         if( me->button() == Qt::RightButton )
         {
-            if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(lockButton) )
+            if( o == lockButton )
             {
                 TQPopupMenu *popup = new TQPopupMenu();
 
@@ -219,7 +219,7 @@ bool Lockout::eventFilter( TQObject *o, TQEvent *e )
 
                 return true;
             }
-            else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(logoutButton) )
+            else if ( o == logoutButton )
             {
                 TQPopupMenu *popup = new TQPopupMenu();
 
diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp
index e9f42e18a..6d3355769 100644
--- a/kicker/applets/minipager/pagerbutton.cpp
+++ b/kicker/applets/minipager/pagerbutton.cpp
@@ -747,7 +747,7 @@ void KMiniPagerButton::slotToggled( bool b )
 
 bool KMiniPagerButton::eventFilter( TQObject *o, TQEvent * e)
 {
-    if (o && TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_lineEdit) &&
+    if (o && o == m_lineEdit &&
         (e->type() == TQEvent::FocusOut || e->type() == TQEvent::Hide))
     {
         m_pager->twin()->setDesktopName( m_desktop, m_lineEdit->text() );
diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp
index 97b71d1b2..2fa4910cf 100644
--- a/kicker/applets/systemtray/systemtrayapplet.cpp
+++ b/kicker/applets/systemtray/systemtrayapplet.cpp
@@ -833,7 +833,7 @@ int SystemTrayApplet::maxIconHeight() const
 
 bool SystemTrayApplet::eventFilter(TQObject* watched, TQEvent* e)
 {
-    if (TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(m_expandButton))
+    if (watched == m_expandButton)
     {
         TQPoint p;
         if (e->type() == TQEvent::ContextMenu)
diff --git a/kicker/kicker/core/applethandle.cpp b/kicker/kicker/core/applethandle.cpp
index 1836102be..d00ef13d9 100644
--- a/kicker/kicker/core/applethandle.cpp
+++ b/kicker/kicker/core/applethandle.cpp
@@ -220,7 +220,7 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e)
 
         return TQWidget::eventFilter( o, e );
     }
-    else if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_dragBar))
+    else if (o == m_dragBar)
     {
         if (e->type() == TQEvent::MouseButtonPress)
         {
diff --git a/kicker/kicker/core/container_button.cpp b/kicker/kicker/core/container_button.cpp
index 40f479308..ac4c46733 100644
--- a/kicker/kicker/core/container_button.cpp
+++ b/kicker/kicker/core/container_button.cpp
@@ -225,7 +225,7 @@ void ButtonContainer::dragButton(const TQPixmap icon)
 
 bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e)
 {
-    if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_button) && e->type() == TQEvent::MouseButtonPress)
+    if (o == _button && e->type() == TQEvent::MouseButtonPress)
     {
         static bool sentinal = false;
 
diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp
index 222b768ad..89878a50d 100644
--- a/kicker/kicker/core/containerarea.cpp
+++ b/kicker/kicker/core/containerarea.cpp
@@ -1201,7 +1201,7 @@ void ContainerArea::dropEvent(TQDropEvent *ev)
         }
 
         TQObject *parent = ev->source() ? ev->source()->parent() : 0;
-        while (parent && (TQT_BASE_OBJECT(parent) != TQT_BASE_OBJECT(this)))
+        while (parent && (parent != this))
         {
             parent = parent->parent();
         }
@@ -1387,7 +1387,7 @@ bool ContainerArea::eventFilter(TQObject* o, TQEvent* e)
     // which contain a ContainerArea can react to layout changes of its
     // contents. For example: If an applets grows, the top level widget may
     // want to grow as well.
-    if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_contents))
+    if (o == m_contents)
     {
         if (e->type() == TQEvent::LayoutHint)
         {
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index 19d834e3c..500a1c5a2 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -489,7 +489,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
         }
 
         while (receiver) {
-            if (TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_tabBar) && (e->type()!=TQEvent::MouseMove || KickerSettings::kickoffSwitchTabsOnHover() ) ) {
+            if (receiver == m_tabBar && (e->type()!=TQEvent::MouseMove || KickerSettings::kickoffSwitchTabsOnHover() ) ) {
                 TQTab* s = m_tabBar->selectTab(m_tabBar->mapFromGlobal(p));
                 if (s && s->identifier() == ApplicationsTab)
                     raiseWidget = m_browserView;
@@ -509,8 +509,8 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
 
             /* we do not want hover activation for the search line edit as this can be
              * pretty disturbing */
-            if ( (TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_searchPixmap) ||
-                 ( ( TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_searchLabel) || TQT_BASE_OBJECT(receiver)==TQT_BASE_OBJECT(m_kcommand->lineEdit()) ) &&
+            if ( (receiver == m_searchPixmap ||
+                 ( ( receiver == m_searchLabel || receiver==m_kcommand->lineEdit() ) &&
                  ( e->type() == TQEvent::KeyPress || e->type() == TQEvent::Wheel
                    || e->type() == TQEvent::MouseButtonPress ) ) ) &&
                     !m_isShowing) {
@@ -666,7 +666,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
         r = true;
     }
 
-    if (e->type() == TQEvent::Enter && TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_stacker))
+    if (e->type() == TQEvent::Enter && receiver == m_stacker)
     {
         TQRect r(m_stacker->mapToGlobal(TQPoint(-8,-32)), m_stacker->size());
         r.setSize(r.size()+TQSize(16,128));
@@ -2800,7 +2800,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
 
     m_popupMenu->insertTitle(SmallIcon(kitem->icon()),kitem->title());
 
-     if (TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_favoriteView))
+     if (source==m_favoriteView)
      {
          hasEntries = true;
          m_popupMenu->insertItem(SmallIconSet("remove"),
@@ -2832,7 +2832,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
          }
      }
 
-     if (TQT_BASE_OBJECT_CONST(source)!=TQT_BASE_OBJECT(m_exitView)) {
+     if (source!=m_exitView) {
         if (m_popupService || (!m_popupPath.path.startsWith("kicker:/") && !m_popupPath.path.startsWith("system:/") && !m_popupPath.path.startsWith("kaddressbook:/"))) {
             if (hasEntries)
                 m_popupMenu->insertSeparator();
@@ -2872,7 +2872,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
                i18n("Put Into Run Dialog"), PutIntoRunDialog);
             }
         }
-        if (TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_searchResultsWidget) || ((TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_favoriteView) || TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_recentlyView) || TQT_BASE_OBJECT_CONST(source) == TQT_BASE_OBJECT(m_systemView)) && !m_popupService && !m_popupPath.path.startsWith("kicker:/")) ) {
+        if (source==m_searchResultsWidget || ((source==m_favoriteView || source==m_recentlyView || source == m_systemView) && !m_popupService && !m_popupPath.path.startsWith("kicker:/")) ) {
             TQString uri;
             if (m_popupService)
                 uri = locate("apps", m_popupService->desktopEntryPath());
@@ -2909,7 +2909,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
         }
     }
 
-    if (TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_recentlyView)) {
+    if (source==m_recentlyView) {
        m_popupMenu->insertSeparator();
        if (m_popupService)
          m_popupMenu->insertItem(SmallIconSet("history_clear"),
diff --git a/kicker/libkicker/panner.cpp b/kicker/libkicker/panner.cpp
index ec06b30c9..580d0e088 100644
--- a/kicker/libkicker/panner.cpp
+++ b/kicker/libkicker/panner.cpp
@@ -336,7 +336,7 @@ void Panner::ensureVisible( int x, int y, int xmargin, int ymargin )
 
 bool Panner::eventFilter( TQObject *obj, TQEvent *e )
 {
-    if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(_viewport) || TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(_clipper) ) 
+    if ( obj == _viewport || obj == _clipper ) 
     {
         switch ( e->type() ) 
         {