Drop TQT_BASE_OBJECT* defines

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

12 files changed, 43 insertions, 43 deletions

diff --git a/kommander/editor/actiondnd.cpp b/kommander/editor/actiondnd.cpp
index 87a55c9f..1f73a8e0 100644
--- a/kommander/editor/actiondnd.cpp
+++ b/kommander/editor/actiondnd.cpp
@@ -225,13 +225,13 @@ bool QDesignerToolBar::eventFilter( TQObject *o, TQEvent *e )
     if ( !o || !e || o->inherits( "TQDockWindowHandle" ) || o->inherits( "TQDockWindowTitleBar" ) )
 	return TQToolBar::eventFilter( o, e );
 
-    if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) && e->type() == TQEvent::MouseButtonPress &&
+    if ( o == this && e->type() == TQEvent::MouseButtonPress &&
 	 ( ( TQMouseEvent*)e )->button() == Qt::LeftButton ) {
 	mousePressEvent( (TQMouseEvent*)e );
 	return true;
     }
 
-    if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) )
+    if ( o == this )
 	return TQToolBar::eventFilter( o, e );
 
     if ( e->type() == TQEvent::MouseButtonPress ) {
diff --git a/kommander/editor/command.cpp b/kommander/editor/command.cpp
index adc74084..89a214b6 100644
--- a/kommander/editor/command.cpp
+++ b/kommander/editor/command.cpp
@@ -430,7 +430,7 @@ void SetPropertyCommand::execute()
     if ( isResetCommand ) {
 	MetaDataBase::setPropertyChanged( widget, propName, false );
 	if ( WidgetFactory::resetProperty( widget, propName ) ) {
-	    if ( !formWindow()->isWidgetSelected( widget ) && TQT_BASE_OBJECT(widget) != TQT_BASE_OBJECT(formWindow()) )
+	    if ( !formWindow()->isWidgetSelected( widget ) && widget != formWindow() )
 		formWindow()->selectWidget( widget );
 	    if ( editor->widget() != widget )
 		editor->setWidget( widget, formWindow() );
diff --git a/kommander/editor/connectioneditorimpl.cpp b/kommander/editor/connectioneditorimpl.cpp
index aa1c9f61..98286498 100644
--- a/kommander/editor/connectioneditorimpl.cpp
+++ b/kommander/editor/connectioneditorimpl.cpp
@@ -92,9 +92,9 @@ static const char *const ignore_signals[] = {
 ConnectionEditor::ConnectionEditor(TQWidget* parent, TQObject* sndr, TQObject* rcvr, FormWindow* fw)
   : ConnectionEditorBase(parent, 0, true), m_formWindow(fw)
 {
-  if (!rcvr || TQT_BASE_OBJECT(rcvr) == TQT_BASE_OBJECT(m_formWindow))
+  if (!rcvr || rcvr == m_formWindow)
     rcvr = TQT_TQOBJECT(m_formWindow->mainContainer());
-  if (!sndr || TQT_BASE_OBJECT(sndr) == TQT_BASE_OBJECT(m_formWindow))
+  if (!sndr || sndr == m_formWindow)
     sndr = TQT_TQOBJECT(m_formWindow->mainContainer());
   m_sender = sndr;
   m_receiver = rcvr;
@@ -279,7 +279,7 @@ void ConnectionEditor::senderChanged(const TQString& s)
   for (TQStrListIterator it(p_sigs); it.current(); ++it)
     if (!isSignalIgnored(it.current()) && !signalBox->findItem(it.current(), TQt::ExactMatch))
       signalBox->insertItem(it.current());
-  if (TQT_BASE_OBJECT(m_sender) == TQT_BASE_OBJECT(m_formWindow->mainContainer()))
+  if (m_sender == m_formWindow->mainContainer())
     signalBox->insertStringList(MetaDataBase::signalList(TQT_TQOBJECT(m_formWindow)));
   signalBox->sort();
   signalBox->setCurrentItem(signalBox->firstItem());
diff --git a/kommander/editor/formwindow.cpp b/kommander/editor/formwindow.cpp
index 68bfab0f..b8daf492 100644
--- a/kommander/editor/formwindow.cpp
+++ b/kommander/editor/formwindow.cpp
@@ -362,7 +362,7 @@ void FormWindow::insertWidget()
       TQObject *o = it.current();
       ++it;
       if (o->isWidgetType() && ((TQWidget*)o)->isVisibleTo(this) &&
-          insertedWidgets.find((TQWidget*)o) && TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(w))
+          insertedWidgets.find((TQWidget*)o) && o != w)
       {
         TQRect r2(((TQWidget*)o)->pos(), ((TQWidget*)o)->size());
         if (r.contains(r2))
@@ -798,7 +798,7 @@ void FormWindow::handleMouseMove(TQMouseEvent *e, TQWidget *w)
     if (newReceiver && (newReceiver->inherits("TQLayoutWidget")
         || newReceiver->inherits("Spacer")))
       newReceiver = (TQWidget*)connectReceiver;
-    drawRecRect = TQT_BASE_OBJECT(newReceiver) != TQT_BASE_OBJECT(connectReceiver);
+    drawRecRect = newReceiver != connectReceiver;
     currentConnectPos = mapFromGlobal(e->globalPos());
     if (newReceiver && (isMainContainer(TQT_TQOBJECT(newReceiver))
         || insertedWidgets.find(newReceiver)) && !isCentralWidget(TQT_TQOBJECT(newReceiver)))
@@ -2274,7 +2274,7 @@ bool FormWindow::unify(TQObject *w, TQString &s, bool changeIt)
     int num  = 1;
     TQPtrDictIterator<TQWidget> it(insertedWidgets);
     for (; it.current();)
-      if (TQT_BASE_OBJECT(it.current()) != TQT_BASE_OBJECT(w) && !qstrcmp(it.current()->name(), s.latin1()))
+      if (it.current() != w && !qstrcmp(it.current()->name(), s.latin1()))
       {
         found = true;
         if (!changeIt)
@@ -2489,7 +2489,7 @@ TQWidget *FormWindow::containerAt(const TQPoint &pos, TQWidget *notParentOf)
 
 bool FormWindow::isMainContainer(TQObject *w) const
 {
-  return w && w->isWidgetType() && (TQT_BASE_OBJECT(w) == this || TQT_BASE_OBJECT(w) == TQT_BASE_OBJECT(mainContainer()));
+  return w && w->isWidgetType() && (w == this || w == mainContainer());
 }
 
 void FormWindow::setMainContainer(TQWidget *w)
@@ -2497,7 +2497,7 @@ void FormWindow::setMainContainer(TQWidget *w)
   bool resetPropertyWidget = isMainContainer(propertyWidget);
   if (mContainer)
     insertedWidgets.remove(mContainer);
-  if (TQT_BASE_OBJECT(propertyWidget) == TQT_BASE_OBJECT(mContainer))
+  if (propertyWidget == mContainer)
     propertyWidget = 0;
   delete mContainer;
   mContainer = w;
@@ -2567,7 +2567,7 @@ bool FormWindow::isCentralWidget(TQObject *w) const
 {
   if (!mainContainer()->inherits("TQMainWindow"))
     return false;
-  return TQT_BASE_OBJECT(w) == TQT_BASE_OBJECT(((TQMainWindow*)mainContainer())->centralWidget());
+  return w == ((TQMainWindow*)mainContainer())->centralWidget();
 }
 
 TQObject *FormWindow::connectableObject(TQObject *w, TQObject *)
diff --git a/kommander/editor/layout.cpp b/kommander/editor/layout.cpp
index 026b39f4..4fe32309 100644
--- a/kommander/editor/layout.cpp
+++ b/kommander/editor/layout.cpp
@@ -306,7 +306,7 @@ void HorizontalLayout::doLayout()
     TQHBoxLayout *layout = (TQHBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::HBox );
 
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
-	if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) )
+	if ( needReparent && w->parent() != layoutBase )
 	    w->reparent( layoutBase, 0, TQPoint( 0, 0 ), false );
 	if ( !useSplitter ) {
 	    if ( qstrcmp( w->className(), "Spacer" ) == 0 )
@@ -370,7 +370,7 @@ void VerticalLayout::doLayout()
     TQVBoxLayout *layout = (TQVBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::VBox );
 
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
-	if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) )
+	if ( needReparent && w->parent() != layoutBase )
 	    w->reparent( layoutBase, 0, TQPoint( 0, 0 ), false );
 	if ( !useSplitter ) {
 	    if ( qstrcmp( w->className(), "Spacer" ) == 0 )
@@ -742,7 +742,7 @@ void GridLayout::doLayout()
     int r, c, rs, cs;
     for ( w = widgets.first(); w; w = widgets.next() ) {
 	if ( grid->locateWidget( w, r, c, rs, cs) ) {
-	    if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) )
+	    if ( needReparent && w->parent() != layoutBase )
 		w->reparent( layoutBase, 0, TQPoint( 0, 0 ), false );
 	    if ( rs * cs == 1 ) {
 		layout->addWidget( w, r, c, w->inherits( "Spacer" ) ? ( (Spacer*)w )->alignment() : 0 );
diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp
index 5ff1b6fb..4fbc4ff5 100644
--- a/kommander/editor/mainwindow.cpp
+++ b/kommander/editor/mainwindow.cpp
@@ -705,25 +705,25 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e)
     case TQEvent::Close:
       break;
     case TQEvent::DragEnter:
-      if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(qWorkspace()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(workspace()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(workspace()->viewport())) {
+      if (o == qWorkspace() || o == workspace() || o == workspace()->viewport()) {
         workspace()->contentsDragEnterEvent((TQDragEnterEvent*)e);
         return true;
       }
       break;
     case TQEvent::DragMove:
-      if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(qWorkspace()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(workspace()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(workspace()->viewport())) {
+      if (o == qWorkspace() || o == workspace() || o == workspace()->viewport()) {
         workspace()->contentsDragMoveEvent((TQDragMoveEvent*)e);
         return true;
       }
       break;
     case TQEvent::Drop:
-      if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(qWorkspace()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(workspace()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(workspace()->viewport())) {
+      if (o == qWorkspace() || o == workspace() || o == workspace()->viewport()) {
         workspace()->contentsDropEvent((TQDropEvent*)e);
         return true;
       }
       break;
     case TQEvent::Show:
-      if (TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(this))
+      if (o != this)
         break;
       if (((TQShowEvent*)e)->spontaneous())
         break;
diff --git a/kommander/editor/mainwindowactions.cpp b/kommander/editor/mainwindowactions.cpp
index e5fa0050..477f065d 100644
--- a/kommander/editor/mainwindowactions.cpp
+++ b/kommander/editor/mainwindowactions.cpp
@@ -786,7 +786,7 @@ void MainWindow::fileCreateTemplate()
 
 void MainWindow::createNewTemplate()
 {
-  CreateTemplate *dia = (CreateTemplate *) TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->parent();
+  CreateTemplate *dia = (CreateTemplate *) sender()->parent();
   TQString fn = dia->editName->text();
   TQString cn = dia->listClass->currentText();
   if (fn.isEmpty() || cn.isEmpty())
diff --git a/kommander/editor/propertyeditor.cpp b/kommander/editor/propertyeditor.cpp
index eb74a660..bdcc563a 100644
--- a/kommander/editor/propertyeditor.cpp
+++ b/kommander/editor/propertyeditor.cpp
@@ -2781,7 +2781,7 @@ bool PropertyList::addPropertyItem( PropertyItem *&item, const TQCString &name,
     case TQVariant::CString:
 	item = new PropertyTextItem( this, item, 0,
 				     name, name == "name" &&
-				     TQT_BASE_OBJECT(editor->widget()) == TQT_BASE_OBJECT(editor->formWindow()->mainContainer()),
+				     editor->widget() == editor->formWindow()->mainContainer(),
 				     false, true );
 	break;
     case TQVariant::Bool:
@@ -2917,10 +2917,10 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e )
 	return true;
 
     PropertyItem *i = (PropertyItem*)currentItem();
-    if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(this) &&e->type() == TQEvent::KeyPress ) {
+    if ( o != this &&e->type() == TQEvent::KeyPress ) {
 	TQKeyEvent *ke = (TQKeyEvent*)e;
 	if ( ( ke->key() == Key_Up || ke->key() == Key_Down ) &&
-	( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(this) || TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(viewport()) ) &&
+	( o != this || o != viewport() ) &&
 	     !( ke->state() & ControlButton ) ) {
 	    TQApplication::sendEvent( this, (TQKeyEvent*)e );
 	    return true;
@@ -2942,7 +2942,7 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e )
 	}
     } else if ( e->type() == TQEvent::FocusOut && o->inherits( "TQLineEdit" ) && editor->formWindow() ) {
 	TQTimer::singleShot( 100, editor->formWindow()->commandHistory(), TQT_SLOT( checkCompressedCommand() ) );
-    } else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(viewport()) ) {
+    } else if ( o == viewport() ) {
 	TQMouseEvent *me;
 	PropertyListItem* i;
 	switch ( e->type() ) {
@@ -2992,7 +2992,7 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e )
 	default:
 	    break;
 	}
-    } else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(header()) ) {
+    } else if ( o == header() ) {
 	if ( e->type() == TQEvent::ContextMenu ) {
 	    ((TQContextMenuEvent *)e)->accept();
 	    TQPopupMenu menu( 0 );
diff --git a/kommander/editor/qcompletionedit.cpp b/kommander/editor/qcompletionedit.cpp
index 6a7cb2a9..66c9663f 100644
--- a/kommander/editor/qcompletionedit.cpp
+++ b/kommander/editor/qcompletionedit.cpp
@@ -90,7 +90,7 @@ void QCompletionEdit::updateListBox()
 
 bool QCompletionEdit::eventFilter( TQObject *o, TQEvent *e )
 {
-    if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(popup) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(listbox) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(listbox->viewport()) ) {
+    if ( o == popup || o == listbox || o == listbox->viewport() ) {
 	if ( e->type() == TQEvent::KeyPress ) {
 	    TQKeyEvent *ke = (TQKeyEvent*)e;
 	    if ( ke->key() == Key_Enter || ke->key() == Key_Return || ke->key() == Key_Tab ) {
@@ -133,7 +133,7 @@ bool QCompletionEdit::eventFilter( TQObject *o, TQEvent *e )
 	    emit chosen( text() );
 	    return true;
 	}
-    } else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) ) {
+    } else if ( o == this ) {
 	if ( e->type() == TQEvent::KeyPress ) {
 	    TQKeyEvent *ke = (TQKeyEvent*)e;
 	    if ( ke->key() == Key_Up ||
diff --git a/kommander/editor/resource.cpp b/kommander/editor/resource.cpp
index e2f636a1..c33cf46d 100644
--- a/kommander/editor/resource.cpp
+++ b/kommander/editor/resource.cpp
@@ -571,7 +571,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea
 	const char* className = WidgetFactory::classNameOf( obj );
 	if ( obj->isA( "CustomWidget" ) )
 	    usedCustomWidgets << TQString( className );
-	if ( TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(formwindow) && !formwindow->widgets()->find( (TQWidget*)obj ) )
+	if ( obj != formwindow && !formwindow->widgets()->find( (TQWidget*)obj ) )
 	    return; // we don't know anything about this thing
 
 	TQString attributes;
@@ -984,7 +984,7 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent )
 	changed << "margin" << "spacing";
     }
 
-    if ( TQT_BASE_OBJECT(w) == TQT_BASE_OBJECT(formwindow->mainContainer()) ) {
+    if ( w == formwindow->mainContainer() ) {
 	if ( changed.findIndex( "geometry" ) == -1 )
 	    changed << "geometry";
 	if ( changed.findIndex( "caption" ) == -1 )
@@ -994,7 +994,7 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent )
     if ( changed.isEmpty() )
 	    return;
 
-    bool inLayout = TQT_BASE_OBJECT(w) != TQT_BASE_OBJECT(formwindow->mainContainer()) && !copying && w->isWidgetType() && ( (TQWidget*)w )->parentWidget() &&
+    bool inLayout = w != formwindow->mainContainer() && !copying && w->isWidgetType() && ( (TQWidget*)w )->parentWidget() &&
 		    WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout;
 
     TQStrList lst = w->metaObject()->propertyNames( !w->inherits( "Spacer" ) );
@@ -1099,9 +1099,9 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant
 	num = value.toInt();
 	if ( w && w->inherits( "TQLayout" ) ) {
 	    if ( name == "spacing" )
-		num = MetaDataBase::spacing( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) ) ) );
+		num = MetaDataBase::spacing( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( TQT_TQLAYOUT(w) ) ) );
 	    else if ( name == "margin" )
-		num = MetaDataBase::margin( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) ) ) );
+		num = MetaDataBase::margin( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( TQT_TQLAYOUT(w) ) ) );
 	}
 	ts << makeIndent( indent ) << "<number>" << TQString::number( num ) << "</number>" << endl;
 	break;
@@ -1117,9 +1117,9 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant
 	unum = value.toUInt();
 	if ( w && w->inherits( "TQLayout" ) ) {
 	    if ( name == "spacing" )
-		num = MetaDataBase::spacing( WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) ) );
+		num = MetaDataBase::spacing( WidgetFactory::layoutParent( TQT_TQLAYOUT(w) ) );
 	    else if ( name == "margin" )
-		num = MetaDataBase::margin( WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) ) );
+		num = MetaDataBase::margin( WidgetFactory::layoutParent( TQT_TQLAYOUT(w) ) );
 	}
 	ts << makeIndent( indent ) << "<number>" << TQString::number( unum ) << "</number>" << endl;
 	break;
@@ -1679,7 +1679,7 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD
     if ( !p ) {
 	MetaDataBase::setFakeProperty( obj, prop, v );
 	if ( obj->isWidgetType() ) {
-	    if ( prop == "database" && TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(toplevel) ) {
+	    if ( prop == "database" && obj != toplevel ) {
 		TQStringList lst = MetaDataBase::fakeProperty( obj, "database" ).toStringList();
 		if ( lst.count() > 2 )
 		    dbControls.insert( obj->name(), lst[ 2 ] );
@@ -1734,11 +1734,11 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD
     }
 
     if ( prop == "geometry" ) {
-	if ( TQT_BASE_OBJECT(obj) == toplevel ) {
+	if ( obj == toplevel ) {
 	    hadGeometry = true;
 	    toplevel->resize( v.toRect().size() );
 	    return;
-	} else if ( TQT_BASE_OBJECT(obj) == formwindow->mainContainer() ) {
+	} else if ( obj == formwindow->mainContainer() ) {
 	    hadGeometry = true;
 	    formwindow->resize( v.toRect().size() );
 	    return;
@@ -1762,7 +1762,7 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD
 	    formwindow->unify( TQT_TQOBJECT(obj), s, true );
 	    obj->setName( s.utf8() );
 	    return;
-	} else if ( formwindow && TQT_BASE_OBJECT(obj) == formwindow->mainContainer() ) {
+	} else if ( formwindow && obj == formwindow->mainContainer() ) {
 	    formwindow->setName( v.toCString() );
 	}
     }
@@ -2019,9 +2019,9 @@ void Resource::loadConnections( const TQDomElement &e )
 		n2 = n2.nextSibling().toElement();
 	    }
 	    if ( formwindow ) {
-		if ( TQT_BASE_OBJECT(conn.sender) == TQT_BASE_OBJECT(formwindow) )
+		if ( conn.sender == formwindow )
 		    conn.sender = TQT_TQOBJECT(formwindow->mainContainer());
-		if ( TQT_BASE_OBJECT(conn.receiver) == TQT_BASE_OBJECT(formwindow) )
+		if ( conn.receiver == formwindow )
 		    conn.receiver = TQT_TQOBJECT(formwindow->mainContainer());
 	    }
 	    if ( conn.sender && conn.receiver ) {
diff --git a/kommander/editor/widgetfactory.cpp b/kommander/editor/widgetfactory.cpp
index 3effc4e3..2e870a7f 100644
--- a/kommander/editor/widgetfactory.cpp
+++ b/kommander/editor/widgetfactory.cpp
@@ -188,7 +188,7 @@ int QDesignerTabWidget::count() const
 
 bool QDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e )
 {
-    if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(tabBar()) ) return false;
+    if ( o != tabBar() ) return false;
 
     switch ( e->type() ) {
     case TQEvent::MouseButtonPress: {
@@ -468,7 +468,7 @@ int EditorTabWidget::count() const
 
 bool EditorTabWidget::eventFilter( TQObject *o, TQEvent *e )
 {
-    if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(tabBar()) ) return false;
+    if ( o != tabBar() ) return false;
 
     switch ( e->type() ) {
     case TQEvent::MouseButtonPress: {
diff --git a/kommander/editor/workspace.cpp b/kommander/editor/workspace.cpp
index a14eac60..e03f4fda 100644
--- a/kommander/editor/workspace.cpp
+++ b/kommander/editor/workspace.cpp
@@ -720,7 +720,7 @@ void Workspace::rmbClicked( TQListViewItem *i, const TQPoint& pos )
 bool Workspace::eventFilter( TQObject *o, TQEvent * e )
 {
     // Reggie, on what type of events do we have to execute updateBufferEdit()
-    if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(bufferEdit) && e->type() != TQEvent::ChildRemoved )
+    if ( o == bufferEdit && e->type() != TQEvent::ChildRemoved )
   updateBufferEdit();
     return TQListView::eventFilter( o, e );
 }