Drop TQT_BASE_OBJECT* defines

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

5 files changed, 15 insertions, 15 deletions

diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp
index 230c992d..918b8958 100644
--- a/korganizer/kdatenavigator.cpp
+++ b/korganizer/kdatenavigator.cpp
@@ -288,7 +288,7 @@ bool KDateNavigator::eventFilter( TQObject *o, TQEvent *e )
   if ( e->type() == TQEvent::MouseButtonPress ) {
     int i;
     for( i = 0; i < 6; ++i ) {
-      if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(mWeeknos[ i ]) ) {
+      if ( o == mWeeknos[ i ] ) {
         TQDate weekstart = mDayMatrix->getDate( i * 7 );
         emit weekClicked( weekstart );
         break;
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index b242c306..7ced83b3 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -396,7 +396,7 @@ bool KOAgenda::eventFilter ( TQObject *object, TQEvent *event )
     case ( TQEvent::Leave ):
       if ( !mActionItem )
         setCursor( arrowCursor );
-      if ( TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(viewport()) )
+      if ( object == viewport() )
         emit leaveAgenda();
       return true;
 
@@ -422,7 +422,7 @@ bool KOAgenda::eventFilter_drag( TQObject *object, TQDropEvent *de )
 {
 #ifndef KORG_NODND
   TQPoint viewportPos;
-  if ( TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(viewport()) && TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(this) ) {
+  if ( object != viewport() && object != this ) {
     viewportPos = TQT_TQWIDGET( object )->mapToParent( de->pos() );
   } else {
     viewportPos = de->pos();
@@ -462,7 +462,7 @@ bool KOAgenda::eventFilter_drag( TQObject *object, TQDropEvent *de )
           // FIXME: This is a bad hack, as the viewportToContents seems to be off by
           // 2000 (which is the left upper corner of the viewport). It works correctly
           // for agendaItems.
-          if ( TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(this)  ) {
+          if ( object == this  ) {
             pos = viewportPos + TQPoint( contentsX(), contentsY() );
           } else {
             pos = viewportToContents( viewportPos );
@@ -565,7 +565,7 @@ bool KOAgenda::eventFilter_wheel ( TQObject *object, TQWheelEvent *e )
   TQPoint viewportPos;
   bool accepted=false;
   if  ( ( e->state() & ShiftButton) == ShiftButton ) {
-    if ( TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(viewport()) ) {
+    if ( object != viewport() ) {
       viewportPos = ( (TQWidget *) object )->mapToParent( e->pos() );
     } else {
       viewportPos = e->pos();
@@ -579,7 +579,7 @@ bool KOAgenda::eventFilter_wheel ( TQObject *object, TQWheelEvent *e )
   }
 
   if  ( ( e->state() & ControlButton ) == ControlButton ){
-    if ( TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(viewport()) ) {
+    if ( object != viewport() ) {
       viewportPos = ( (TQWidget *)object )->mapToParent( e->pos() );
     } else {
       viewportPos = e->pos();
@@ -597,7 +597,7 @@ bool KOAgenda::eventFilter_wheel ( TQObject *object, TQWheelEvent *e )
 bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me)
 {
   TQPoint viewportPos;
-  if (TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(viewport())) {
+  if (object != viewport()) {
     viewportPos = ((TQWidget *)object)->mapToParent(me->pos());
   } else {
     viewportPos = me->pos();
@@ -606,7 +606,7 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me)
   switch (me->type())  {
     case TQEvent::MouseButtonPress:
 //      kdDebug(5850) << "koagenda: filtered button press" << endl;
-      if (TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(viewport())) {
+      if (object != viewport()) {
         if (me->button() == Qt::RightButton) {
           mClickedItem = dynamic_cast<KOAgendaItem *>(object);
           if (mClickedItem) {
@@ -683,7 +683,7 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me)
       // avoid an offset of a few pixels. Don't ask me why...
       TQPoint indicatorPos = gridToContents(contentsToGrid(
                                           viewportToContents( viewportPos )));
-      if (TQT_BASE_OBJECT(object) != TQT_BASE_OBJECT(viewport())) {
+      if (object != viewport()) {
         KOAgendaItem *moveItem = dynamic_cast<KOAgendaItem *>(object);
         if (moveItem && !moveItem->incidence()->isReadOnly() ) {
           if (!mActionItem)
@@ -722,7 +722,7 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me)
       break; }
 
     case TQEvent::MouseButtonDblClick:
-      if (TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(viewport())) {
+      if (object == viewport()) {
         selectItem(0);
         TQPair<ResourceCalendar *, TQString>p = mCalendarView->viewSubResourceCalendar();
         emit newEventSignal( p.first, p.second );
diff --git a/korganizer/koattendeeeditor.cpp b/korganizer/koattendeeeditor.cpp
index d95618c8..8d831e07 100644
--- a/korganizer/koattendeeeditor.cpp
+++ b/korganizer/koattendeeeditor.cpp
@@ -537,7 +537,7 @@ void KOAttendeeEditor::declineForMe()
 
 bool KOAttendeeEditor::eventFilter(TQObject *watched, TQEvent *ev)
 {
-  if ( watched && TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(mNameEdit) && ev->type() == TQEvent::FocusIn &&
+  if ( watched && watched == mNameEdit && ev->type() == TQEvent::FocusIn &&
        currentAttendee() == 0 ) {
     addNewAttendee();
   }
diff --git a/korganizer/koeditorfreebusy.cpp b/korganizer/koeditorfreebusy.cpp
index 88c5414b..7eec3b71 100644
--- a/korganizer/koeditorfreebusy.cpp
+++ b/korganizer/koeditorfreebusy.cpp
@@ -983,7 +983,7 @@ void KOEditorFreeBusy::slotOrganizerChanged(const TQString & newOrganizer)
 
 bool KOEditorFreeBusy::eventFilter( TQObject *watched, TQEvent *event )
 {
-  if ( TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(mGanttView->timeHeaderWidget()) &&
+  if ( watched == mGanttView->timeHeaderWidget() &&
        event->type() >= TQEvent::MouseButtonPress && event->type() <= TQEvent::MouseMove ) {
     return true;
   } else {
diff --git a/korganizer/multiagendaview.cpp b/korganizer/multiagendaview.cpp
index f36109dc..63c559bf 100644
--- a/korganizer/multiagendaview.cpp
+++ b/korganizer/multiagendaview.cpp
@@ -464,12 +464,12 @@ bool MultiAgendaView::eventFilter(TQObject * obj, TQEvent * event)
     if ( (event->type() == TQEvent::MouseMove && TDEGlobalSettings::opaqueResize())
            || event->type() == TQEvent::MouseButtonRelease ) {
       FOREACH_VIEW( agenda ) {
-        if ( TQT_BASE_OBJECT(agenda->splitter()) == TQT_BASE_OBJECT(obj->parent()) )
+        if ( agenda->splitter() == obj->parent() )
           mLastMovedSplitter = agenda->splitter();
       }
-      if ( TQT_BASE_OBJECT(mLeftSplitter )== TQT_BASE_OBJECT(obj->parent()) )
+      if ( mLeftSplitter == obj->parent() )
         mLastMovedSplitter = mLeftSplitter;
-      else if ( TQT_BASE_OBJECT(mRightSplitter) == TQT_BASE_OBJECT(obj->parent()) )
+      else if ( mRightSplitter == obj->parent() )
         mLastMovedSplitter = mRightSplitter;
       TQTimer::singleShot( 0, this, TQT_SLOT(resizeSplitters()) );
     }