diff options
33 files changed, 64 insertions, 64 deletions
diff --git a/interfaces/terminal/test/main.cpp b/interfaces/terminal/test/main.cpp index 29f01085e..bdf5b6764 100644 --- a/interfaces/terminal/test/main.cpp +++ b/interfaces/terminal/test/main.cpp @@ -17,7 +17,7 @@ Win::Win() { KLibFactory* factory = KLibLoader::self()->factory( "libkonsolepart" ); assert( factory ); - KParts::Part* p = static_cast<KParts::Part*>( factory->create( this, "tralala", "TQObject", "KParts::ReadOnlyPart" ) ); + KParts::Part* p = factory->create( this, "tralala", "TQObject", "KParts::ReadOnlyPart" ) ; setCentralWidget( p->widget() ); TerminalInterface* t = ::tqqt_cast<TerminalInterface*>( p ); diff --git a/kate/part/katecodecompletion.cpp b/kate/part/katecodecompletion.cpp index 275894483..e8e53f661 100644 --- a/kate/part/katecodecompletion.cpp +++ b/kate/part/katecodecompletion.cpp @@ -163,9 +163,9 @@ void KateCodeCompletion::showCompletionBox( bool KateCodeCompletion::eventFilter( TQObject *o, TQEvent *e ) { - if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(m_completionPopup) && - TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(m_completionListBox) && - TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(m_completionListBox->viewport()) ) + if ( o != m_completionPopup && + o != m_completionListBox && + o != m_completionListBox->viewport() ) return false; if( e->type() == TQEvent::Hide ) diff --git a/kate/part/katesupercursor.cpp b/kate/part/katesupercursor.cpp index b08888f57..1d47fcb4e 100644 --- a/kate/part/katesupercursor.cpp +++ b/kate/part/katesupercursor.cpp @@ -446,7 +446,7 @@ bool KateSuperRange::boundaryOn(uint lineNum) const void KateSuperRange::slotEvaluateChanged() { - if (sender() == static_cast<TQObject*>(m_start)) { + if (sender() == m_start) { if (m_evaluate) { if (!m_endChanged) { // Only one was changed @@ -484,7 +484,7 @@ void KateSuperRange::slotEvaluateChanged() void KateSuperRange::slotEvaluateUnChanged() { - if (sender() == static_cast<TQObject*>(m_start)) { + if (sender() == m_start) { if (m_evaluate) { if (m_endChanged) { // Only one changed diff --git a/kate/part/kateviewinternal.cpp b/kate/part/kateviewinternal.cpp index 5acb93bc8..91f827d91 100644 --- a/kate/part/kateviewinternal.cpp +++ b/kate/part/kateviewinternal.cpp @@ -2438,7 +2438,7 @@ bool KateViewInternal::isTargetSelected( const TQPoint& p ) bool KateViewInternal::eventFilter( TQObject *obj, TQEvent *e ) { - if (TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_lineScroll)) + if (obj == m_lineScroll) { // the second condition is to make sure a scroll on the vertical bar doesn't cause a horizontal scroll ;) if (e->type() == TQEvent::Wheel && m_lineScroll->minValue() != m_lineScroll->maxValue()) diff --git a/kate/plugins/isearch/ISearchPlugin.cpp b/kate/plugins/isearch/ISearchPlugin.cpp index 4ee93cb87..823c44bc7 100644 --- a/kate/plugins/isearch/ISearchPlugin.cpp +++ b/kate/plugins/isearch/ISearchPlugin.cpp @@ -204,7 +204,7 @@ void ISearchPluginView::setAutoWrap( bool autoWrap ) bool ISearchPluginView::eventFilter( TQObject* o, TQEvent* e ) { - if( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(m_combo->lineEdit()) ) + if( o != m_combo->lineEdit() ) return false; if( e->type() == TQEvent::FocusIn ) { diff --git a/libtdescreensaver/tdescreensaver.cpp b/libtdescreensaver/tdescreensaver.cpp index 30120b164..16449c189 100644 --- a/libtdescreensaver/tdescreensaver.cpp +++ b/libtdescreensaver/tdescreensaver.cpp @@ -90,7 +90,7 @@ void KScreenSaver::embed( TQWidget *w ) bool KScreenSaver::eventFilter( TQObject *o, TQEvent *e ) { // make sure events get to the original window owner - if ( d->owner && TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) ) { + if ( d->owner && o == this ) { TQApplication::sendEvent( d->owner, e ); return false; } diff --git a/tdeabc/ldapconfigwidget.cpp b/tdeabc/ldapconfigwidget.cpp index 2c2dfbe75..bc4b0ae5d 100644 --- a/tdeabc/ldapconfigwidget.cpp +++ b/tdeabc/ldapconfigwidget.cpp @@ -615,7 +615,7 @@ void LdapConfigWidget::setFlags( int flags ) obj = ch2.first(); while ( obj != 0 ) { widget = dynamic_cast<TQWidget*> (obj); - if ( widget && TQT_BASE_OBJECT(widget->parent()) == TQT_BASE_OBJECT(this) ) { + if ( widget && widget->parent() == this ) { mainLayout->remove( widget ); delete ( widget ); } diff --git a/tdecore/kgenericfactory.tcc b/tdecore/kgenericfactory.tcc index e7ba1c730..dda6ec487 100644 --- a/tdecore/kgenericfactory.tcc +++ b/tdecore/kgenericfactory.tcc @@ -150,7 +150,7 @@ namespace KDEPrivate const TQStringList &args, Type2Type<TQWidget> ) { - WidgetParentType *p = dynamic_cast<WidgetParentType *>( static_cast<TQT_BASE_OBJECT_NAME*>(parent) ); + WidgetParentType *p = dynamic_cast<WidgetParentType *>( parent ); if ( parent && !p ) return 0; return new Product( p, name, args ); @@ -160,7 +160,7 @@ namespace KDEPrivate TQObject *parent, const char *name, const TQStringList &args, Type2Type<TQObject> ) { - ParentType *p = dynamic_cast<ParentType *>( static_cast<TQT_BASE_OBJECT_NAME*>(parent) ); + ParentType *p = dynamic_cast<ParentType *>( parent ); if ( parent && !p ) return 0; return new Product( p, name, args ); @@ -179,9 +179,9 @@ namespace KDEPrivate const char *className, const TQStringList &args ) { - return static_cast<TQObject*>(static_cast<QObject*>(ConcreteFactory<Product, ParentType>::create( parentWidget, widgetName, - parent, name, className, - args ))); + return static_cast<TQObject*>(ConcreteFactory<Product, ParentType>::create( parentWidget, widgetName, + parent, name, className, + args )); } }; diff --git a/tdehtml/ecma/kjs_debugwin.cpp b/tdehtml/ecma/kjs_debugwin.cpp index 2e08f5ea8..fdcfe98ca 100644 --- a/tdehtml/ecma/kjs_debugwin.cpp +++ b/tdehtml/ecma/kjs_debugwin.cpp @@ -678,7 +678,7 @@ bool KJSDebugWin::eventFilter(TQObject *o, TQEvent *e) case TQEvent::Quit: while (o->parent()) o = TQT_TQOBJECT(o->parent()); - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this)) + if (o == this) return TQWidget::eventFilter(o,e); else return true; diff --git a/tdehtml/rendering/render_form.cpp b/tdehtml/rendering/render_form.cpp index 9d302bfc8..f251b7f3b 100644 --- a/tdehtml/rendering/render_form.cpp +++ b/tdehtml/rendering/render_form.cpp @@ -907,7 +907,7 @@ bool ComboBoxWidget::event(TQEvent *e) bool ComboBoxWidget::eventFilter(TQObject *dest, TQEvent *e) { - if (TQT_BASE_OBJECT(dest)==TQT_BASE_OBJECT(listBox()) && e->type()==TQEvent::KeyPress) + if (dest==listBox() && e->type()==TQEvent::KeyPress) { TQKeyEvent *ke = TQT_TQKEYEVENT(e); bool forward = false; diff --git a/tdehtml/tdehtmlview.cpp b/tdehtml/tdehtmlview.cpp index 06485d976..088e52174 100644 --- a/tdehtml/tdehtmlview.cpp +++ b/tdehtml/tdehtmlview.cpp @@ -1895,7 +1895,7 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e) TQWidget *view = viewport(); - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(view)) { + if (o == view) { // we need to install an event filter on all children of the viewport to // be able to get correct stacking of children within the document. if(e->type() == TQEvent::ChildInserted) { diff --git a/tdeio/tdefile/kcombiview.cpp b/tdeio/tdefile/kcombiview.cpp index 4c4f0cb06..23c78b53d 100644 --- a/tdeio/tdefile/kcombiview.cpp +++ b/tdeio/tdefile/kcombiview.cpp @@ -358,9 +358,9 @@ bool KCombiView::eventFilter( TQObject *o, TQEvent *e ) // only the focused view may have a selection if ( type == TQEvent::FocusIn ) { - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(left) ) + if ( o == left ) right->clearSelection(); - else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(right->widget()) ) + else if ( o == right->widget() ) left->clearSelection(); } diff --git a/tdeio/tdefile/kurlrequester.cpp b/tdeio/tdefile/kurlrequester.cpp index 64e25b93c..3d54b9c95 100644 --- a/tdeio/tdefile/kurlrequester.cpp +++ b/tdeio/tdefile/kurlrequester.cpp @@ -386,7 +386,7 @@ void KURLRequester::slotUpdateURL() bool KURLRequester::eventFilter( TQObject *obj, TQEvent *ev ) { - if ( ( TQT_BASE_OBJECT(d->edit) == TQT_BASE_OBJECT(obj) ) || ( TQT_BASE_OBJECT(d->combo) == TQT_BASE_OBJECT(obj) ) ) + if ( ( d->edit == obj ) || ( d->combo == obj ) ) { if (( ev->type() == TQEvent::FocusIn ) || ( ev->type() == TQEvent::FocusOut )) // Forward focusin/focusout events to the urlrequester; needed by file form element in tdehtml diff --git a/tdeio/tdefile/tdediroperator.cpp b/tdeio/tdefile/tdediroperator.cpp index c7dc845cc..a969179fe 100644 --- a/tdeio/tdefile/tdediroperator.cpp +++ b/tdeio/tdefile/tdediroperator.cpp @@ -1560,7 +1560,7 @@ void KDirOperator::resizeEvent( TQResizeEvent * ) if (m_fileView) m_fileView->widget()->resize( size() ); - if ( TQT_BASE_OBJECT(progress->parent()) == TQT_BASE_OBJECT(this) ) // might be reparented into a statusbar + if ( progress->parent() == this ) // might be reparented into a statusbar progress->move(2, height() - progress->height() -2); } diff --git a/tdeio/tdefile/tdefilefiltercombo.cpp b/tdeio/tdefile/tdefilefiltercombo.cpp index ed41f8f82..ba7621c89 100644 --- a/tdeio/tdefile/tdefilefiltercombo.cpp +++ b/tdeio/tdefile/tdefilefiltercombo.cpp @@ -179,7 +179,7 @@ void KFileFilterCombo::slotFilterChanged() bool KFileFilterCombo::eventFilter( TQObject *o, TQEvent *e ) { - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(lineEdit()) && e->type() == TQEvent::FocusOut ) { + if ( o == lineEdit() && e->type() == TQEvent::FocusOut ) { if ( currentText() != d->lastFilter ) emit filterChanged(); } diff --git a/tdeio/tdefile/tdefileiconview.cpp b/tdeio/tdefile/tdefileiconview.cpp index e2d726319..4d1fb8a1c 100644 --- a/tdeio/tdefile/tdefileiconview.cpp +++ b/tdeio/tdefile/tdefileiconview.cpp @@ -737,7 +737,7 @@ void KFileIconView::listingCompleted() // need to remove our tooltip, eventually bool KFileIconView::eventFilter( TQObject *o, TQEvent *e ) { - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(viewport()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) ) { + if ( o == viewport() || o == this ) { int type = e->type(); if ( type == TQEvent::Leave || type == TQEvent::FocusOut ) diff --git a/tdemdi/tdemdi/dockcontainer.cpp b/tdemdi/tdemdi/dockcontainer.cpp index efb10d734..f89867d73 100644 --- a/tdemdi/tdemdi/dockcontainer.cpp +++ b/tdemdi/tdemdi/dockcontainer.cpp @@ -233,7 +233,7 @@ void DockContainer::insertWidget (KDockWidget *dwdg, TQPixmap pixmap, const TQSt bool DockContainer::eventFilter( TQObject *obj, TQEvent *event ) { - if (TQT_BASE_OBJECT(obj)==TQT_BASE_OBJECT(m_tb)) { + if (obj==m_tb) { if ( (event->type()==TQEvent::Resize) && (m_ws->isHidden()) ) { TQSize size=((TQResizeEvent*)event)->size(); if (m_vertical) diff --git a/tdemdi/tdemdichildfrm.cpp b/tdemdi/tdemdichildfrm.cpp index 338f73ee4..bc5bf335f 100644 --- a/tdemdi/tdemdichildfrm.cpp +++ b/tdemdi/tdemdichildfrm.cpp @@ -775,7 +775,7 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize ) delete list; // delete the list, not the objects //Reparent if needed - if ( TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(this) ) + if ( w->parent() != this ) { //reparent to this widget , no flags , point , show it TQPoint pnt2( KMDI_CHILDFRM_BORDER, clientYPos ); @@ -1085,7 +1085,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) TQObject* pObj = obj; while ( ( pObj != 0L ) && !bIsChild ) { - bIsChild = ( TQT_BASE_OBJECT(pObj) == TQT_BASE_OBJECT(this) ); + bIsChild = ( pObj == this ); pObj = pObj->parent(); } // unset the resize cursor if the cursor moved from the frame into a inner widget @@ -1101,7 +1101,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) if ( m_timeMeasure.elapsed() <= TQApplication::doubleClickInterval() ) bIsSecondClick = true; // of a possible double click - if ( !( ( ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pWinIcon) ) || ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pUnixIcon) ) ) && bIsSecondClick ) ) + if ( !( ( ( obj == m_pWinIcon ) || ( obj == m_pUnixIcon ) ) && bIsSecondClick ) ) { // in case we didn't click on the icon button TQFocusEvent focusEvent( TQFocusEvent::FocusIn ); @@ -1112,7 +1112,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) m_pClient->activate(); } - if ( ( TQT_BASE_OBJECT(obj->parent()) != TQT_BASE_OBJECT(m_pCaption) ) && ( TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(m_pCaption) ) ) + if ( ( obj->parent() != m_pCaption ) && ( obj != m_pCaption ) ) { TQWidget* w = ( TQWidget* ) obj; if ( ( w->focusPolicy() == TQ_ClickFocus ) || ( w->focusPolicy() == TQ_StrongFocus ) ) @@ -1121,7 +1121,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) } } } - if ( ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pWinIcon) ) || ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pUnixIcon) ) ) + if ( ( obj == m_pWinIcon ) || ( obj == m_pUnixIcon ) ) { // in case we clicked on the icon button if ( m_timeMeasure.elapsed() > TQApplication::doubleClickInterval() ) diff --git a/tdemdi/tdemdichildview.cpp b/tdemdi/tdemdichildview.cpp index 19a0edfb2..487627b08 100644 --- a/tdemdi/tdemdichildview.cpp +++ b/tdemdi/tdemdichildview.cpp @@ -629,14 +629,14 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e ) if ( e->type() == TQEvent::IconChange ) { // tqDebug("KMDiChildView:: TQEvent:IconChange intercepted\n"); - if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(this) ) + if ( obj == this ) iconUpdated( this, icon() ? ( *icon() ) : TQPixmap() ); - else if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_trackChanges) ) + else if ( obj == m_trackChanges ) setIcon( m_trackChanges->icon() ? ( *( m_trackChanges->icon() ) ) : TQPixmap() ); } if ( e->type() == TQEvent::CaptionChange ) { - if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(this) ) + if ( obj == this ) captionUpdated( this, caption() ); } } diff --git a/tdeui/kcolordialog.cpp b/tdeui/kcolordialog.cpp index b37bcf42c..33b1a8a57 100644 --- a/tdeui/kcolordialog.cpp +++ b/tdeui/kcolordialog.cpp @@ -1187,7 +1187,7 @@ KColorDialog::~KColorDialog() bool KColorDialog::eventFilter( TQObject *obj, TQEvent *ev ) { - if ((TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(d->htmlName)) || (TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(d->hsSelector))) + if ((obj == d->htmlName) || (obj == d->hsSelector)) switch(ev->type()) { case TQEvent::DragEnter: diff --git a/tdeui/kcursor.cpp b/tdeui/kcursor.cpp index 17f523d86..7a13e791d 100644 --- a/tdeui/kcursor.cpp +++ b/tdeui/kcursor.cpp @@ -317,7 +317,7 @@ TQWidget* KCursorPrivateAutoHideEventFilter::actualWidget() const bool KCursorPrivateAutoHideEventFilter::eventFilter( TQObject *o, TQEvent *e ) { - Q_ASSERT( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_widget) ); + Q_ASSERT( o == m_widget ); switch ( e->type() ) { diff --git a/tdeui/kdockwidget.cpp b/tdeui/kdockwidget.cpp index 374d336fe..e57ff440d 100644 --- a/tdeui/kdockwidget.cpp +++ b/tdeui/kdockwidget.cpp @@ -122,7 +122,7 @@ void KDockMainWindow::setMainDockWidget( KDockWidget* mdw ) void KDockMainWindow::setView( TQWidget *view ) { if ( view->isA("KDockWidget") ){ - if ( TQT_BASE_OBJECT(view->parent()) != TQT_BASE_OBJECT(this) ) ((KDockWidget*)view)->applyToWidget( this ); + if ( view->parent() != this ) ((KDockWidget*)view)->applyToWidget( this ); } #ifndef NO_KDE2 @@ -778,7 +778,7 @@ void KDockWidget::updateHeader() setCursor(TQCursor(ArrowCursor)); #endif - if ( (TQT_BASE_OBJECT(parent()) == TQT_BASE_OBJECT(manager->main)) || isGroup || (eDocking == KDockWidget::DockNone) ){ + if ( (parent() == manager->main) || isGroup || (eDocking == KDockWidget::DockNone) ){ header->hide(); } else { header->setTopLevel( false ); @@ -799,7 +799,7 @@ void KDockWidget::updateHeader() void KDockWidget::applyToWidget( TQWidget* s, const TQPoint& p ) { - if ( TQT_BASE_OBJECT(parent()) != TQT_BASE_OBJECT(s) ) + if ( parent() != s ) { hide(); reparent(s, 0, TQPoint(0,0), false); @@ -1449,7 +1449,7 @@ void KDockWidget::setWidget( TQWidget* mw ) { if ( !mw ) return; - if ( TQT_BASE_OBJECT(mw->parent()) != TQT_BASE_OBJECT(this) ){ + if ( mw->parent() != this ){ mw->reparent(this, 0, TQPoint(0,0), false); } @@ -1505,13 +1505,13 @@ void KDockWidget::setDockTabName( KDockTabGroup* tab ) bool KDockWidget::mayBeHide() const { - bool f = (TQT_BASE_OBJECT(parent()) != TQT_BASE_OBJECT(manager->main)); + bool f = (parent() != manager->main); return ( !isGroup && !isTabGroup && f && isVisible() && ( eDocking != (int)KDockWidget::DockNone ) ); } bool KDockWidget::mayBeShow() const { - bool f = (TQT_BASE_OBJECT(parent()) != TQT_BASE_OBJECT(manager->main)); + bool f = (parent() != manager->main); return ( !isGroup && !isTabGroup && f && !isVisible() ); } @@ -2213,7 +2213,7 @@ void KDockManager::writeConfig(TQDomElement &base) TQObjectListIt it(*childDock); KDockWidget *obj1; while ( (obj1=(KDockWidget*)it.current()) ) { - if ( TQT_BASE_OBJECT(obj1->parent()) == TQT_BASE_OBJECT(main) ) + if ( obj1->parent() == main ) mainWidgetStr = TQString::fromLatin1(obj1->name()); nList.append(obj1->name()); ++it; @@ -2548,7 +2548,7 @@ void KDockManager::writeConfig( TDEConfig* c, TQString group ) ++it; //debug(" +Add subdock %s", obj->name()); nList.append( obj->name() ); - if ( TQT_BASE_OBJECT(obj->parent()) == TQT_BASE_OBJECT(main) ) + if ( obj->parent() == main ) c->writeEntry( "Main:view", obj->name() ); } diff --git a/tdeui/kjanuswidget.cpp b/tdeui/kjanuswidget.cpp index 03e375b6a..dceb2e745 100644 --- a/tdeui/kjanuswidget.cpp +++ b/tdeui/kjanuswidget.cpp @@ -536,7 +536,7 @@ bool KJanusWidget::setSwallowedWidget( TQWidget *widget ) } else { - if( TQT_BASE_OBJECT(widget->parent()) != TQT_BASE_OBJECT(mSwallowPage) ) + if( widget->parent() != mSwallowPage ) { widget->reparent( mSwallowPage, 0, TQPoint(0,0) ); } diff --git a/tdeui/klineedit.cpp b/tdeui/klineedit.cpp index 07fbc58b9..a2b9f65c2 100644 --- a/tdeui/klineedit.cpp +++ b/tdeui/klineedit.cpp @@ -1006,7 +1006,7 @@ void KLineEdit::dropEvent(TQDropEvent *e) bool KLineEdit::eventFilter( TQObject* o, TQEvent* ev ) { - if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) ) + if( o == this ) { KCursor::autoHideEventFilter( TQT_TQOBJECT(this), ev ); if ( ev->type() == TQEvent::AccelOverride ) diff --git a/tdeui/ksyntaxhighlighter.cpp b/tdeui/ksyntaxhighlighter.cpp index 9e63fc929..25c22222c 100644 --- a/tdeui/ksyntaxhighlighter.cpp +++ b/tdeui/ksyntaxhighlighter.cpp @@ -609,7 +609,7 @@ void KDictSpellingHighlighter::slotKSpellNotResponding() bool KDictSpellingHighlighter::eventFilter( TQObject *o, TQEvent *e) { - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(textEdit()) && (e->type() == TQEvent::FocusIn)) { + if (o == textEdit() && (e->type() == TQEvent::FocusIn)) { if ( d->globalConfig ) { TQString skey = spellKey(); if ( d->spell && d->spellKey != skey ) { @@ -619,7 +619,7 @@ bool KDictSpellingHighlighter::eventFilter( TQObject *o, TQEvent *e) } } - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(textEdit()) && (e->type() == TQEvent::KeyPress)) { + if (o == textEdit() && (e->type() == TQEvent::KeyPress)) { TQKeyEvent *k = TQT_TQKEYEVENT(e); d->autoReady = true; if (d->rehighlightRequest->isActive()) // try to stay out of the users way @@ -661,7 +661,7 @@ bool KDictSpellingHighlighter::eventFilter( TQObject *o, TQEvent *e) } } - else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(textEdit()->viewport()) && + else if ( o == textEdit()->viewport() && ( e->type() == TQEvent::MouseButtonPress )) { d->autoReady = true; if ( intraWordEditing() ) { diff --git a/tdeui/ktip.cpp b/tdeui/ktip.cpp index 1cc520640..79993d5fc 100644 --- a/tdeui/ktip.cpp +++ b/tdeui/ktip.cpp @@ -425,7 +425,7 @@ static TQString fixTip(TQString tip) bool KTipDialog::eventFilter(TQObject *o, TQEvent *e) { - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(mTipText) && e->type()== TQEvent::KeyPress && + if (o == mTipText && e->type()== TQEvent::KeyPress && (((TQKeyEvent *)e)->key() == Key_Return || ((TQKeyEvent *)e)->key() == Key_Space )) accept(); diff --git a/tdeui/qxembed.cpp b/tdeui/qxembed.cpp index 6ba25fff7..9a31d68e1 100644 --- a/tdeui/qxembed.cpp +++ b/tdeui/qxembed.cpp @@ -310,7 +310,7 @@ bool QXEmbedAppFilter::eventFilter( TQObject *o, TQEvent * e) // active and has just been given the Qt focus (L0614) or // because the widget already had the Qt focus and just became // active (L0615). - if ( TQT_BASE_OBJECT(tqApp->focusWidget()) == TQT_BASE_OBJECT(o) && + if ( tqApp->focusWidget() == o && ((QPublicWidget*)tqApp->focusWidget()->topLevelWidget())->topData()->embedded ) { TQFocusEvent* fe = (TQFocusEvent*) e; if ( obeyFocus || fe->reason() != TQFocusEvent::ActiveWindow /*|| fe->reason() == TQFocusEvent::Mouse || @@ -344,7 +344,7 @@ bool QXEmbedAppFilter::eventFilter( TQObject *o, TQEvent * e) } break; case TQEvent::KeyPress: - if (TQT_BASE_OBJECT(tqApp->focusWidget()) == TQT_BASE_OBJECT(o) && + if (tqApp->focusWidget() == o && ((QPublicWidget*)tqApp->focusWidget()->topLevelWidget())->topData()->embedded ) { // L0620: The following code replaces the Qt code that // handles focus focus changes with the tab key. See the @@ -810,7 +810,7 @@ bool QXEmbed::eventFilter( TQObject *o, TQEvent * e) switch ( e->type() ) { case TQEvent::WindowActivate: - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(topLevelWidget()) ) { + if ( o == topLevelWidget() ) { // L1310: Qt thinks the application window has just been activated. // Make sure the X11 focus is on the focus proxy window. See L0686. if ( !((QPublicWidget*) topLevelWidget())->topData()->embedded ) @@ -826,7 +826,7 @@ bool QXEmbed::eventFilter( TQObject *o, TQEvent * e) } break; case TQEvent::WindowDeactivate: - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(topLevelWidget()) ) { + if ( o == topLevelWidget() ) { if (d->xplain) // L1321: Activation has changed. Grab state might change. See L2800. checkGrab(); @@ -838,9 +838,9 @@ bool QXEmbed::eventFilter( TQObject *o, TQEvent * e) case TQEvent::Move: { TQWidget* pos = this; - while( TQT_BASE_OBJECT(pos) != TQT_BASE_OBJECT(o) && TQT_BASE_OBJECT(pos) != TQT_BASE_OBJECT(topLevelWidget())) + while( pos != o && pos != topLevelWidget()) pos = pos->parentWidget(); - if( TQT_BASE_OBJECT(pos) == TQT_BASE_OBJECT(o) ) { + if( pos == o ) { // L1390: Send fake configure notify events whenever the // global position of the client changes. See L2900. TQPoint globalPos = mapToGlobal(TQPoint(0,0)); diff --git a/tdeui/tdeactionclasses.cpp b/tdeui/tdeactionclasses.cpp index 7ef60189c..503782001 100644 --- a/tdeui/tdeactionclasses.cpp +++ b/tdeui/tdeactionclasses.cpp @@ -2103,7 +2103,7 @@ void TDEToggleFullScreenAction::setChecked( bool c ) bool TDEToggleFullScreenAction::eventFilter( TQObject* o, TQEvent* e ) { - if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(window) ) + if( o == window ) if( e->type() == TQEvent::WindowStateChange ) { if( window->isFullScreen() != isChecked()) diff --git a/tdeui/tdecompletionbox.cpp b/tdeui/tdecompletionbox.cpp index b0637c182..ee6fd1e57 100644 --- a/tdeui/tdecompletionbox.cpp +++ b/tdeui/tdecompletionbox.cpp @@ -109,7 +109,7 @@ bool TDECompletionBox::eventFilter( TQObject *o, TQEvent *e ) { int type = e->type(); - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->m_parent) ) { + if ( o == d->m_parent ) { if ( isVisible() ) { if ( type == TQEvent::KeyPress ) { TQKeyEvent *ev = TQT_TQKEYEVENT( e ); diff --git a/tdeui/tdemenubar.cpp b/tdeui/tdemenubar.cpp index 0a5fe0188..78fd8eb30 100644 --- a/tdeui/tdemenubar.cpp +++ b/tdeui/tdemenubar.cpp @@ -244,7 +244,7 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev) { if ( d->topLevel ) { - if ( parentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget()->topLevelWidget()) ) + if ( parentWidget() && obj == parentWidget()->topLevelWidget() ) { if( ev->type() == TQEvent::Resize ) return false; // ignore resizing of parent, TQMenuBar would try to adjust size @@ -257,7 +257,7 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev) // will update the state properly setTopLevelMenuInternal( d->topLevel ); } - if( parentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget()) && ev->type() == TQEvent::Reparent ) + if( parentWidget() && obj == parentWidget() && ev->type() == TQEvent::Reparent ) { #ifdef Q_WS_X11 XSetTransientForHint( tqt_xdisplay(), winId(), parentWidget()->topLevelWidget()->winId()); @@ -266,7 +266,7 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev) #endif setShown( parentWidget()->isTopLevel() || parentWidget()->isVisible()); } - if( parentWidget() && !parentWidget()->isTopLevel() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget())) + if( parentWidget() && !parentWidget()->isTopLevel() && obj == parentWidget()) { // if the parent is not toplevel, KMenuBar needs to match its visibility status if( ev->type() == TQEvent::Show ) { @@ -283,7 +283,7 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev) } else { - if( parentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget()->topLevelWidget())) + if( parentWidget() && obj == parentWidget()->topLevelWidget()) { if( ev->type() == TQEvent::WindowStateChange && !parentWidget()->topLevelWidget()->isFullScreen() ) diff --git a/tdeui/tdepassivepopupstack.cpp b/tdeui/tdepassivepopupstack.cpp index 9f116059f..aef49d15c 100644 --- a/tdeui/tdepassivepopupstack.cpp +++ b/tdeui/tdepassivepopupstack.cpp @@ -104,4 +104,4 @@ void TDEPassivePopupStackContainer::popupDestroyed(TQObject* object) { } } -#include "tdepassivepopupstack.moc"
\ No newline at end of file +#include "tdepassivepopupstack.moc" diff --git a/tdeui/tdetoolbarbutton.cpp b/tdeui/tdetoolbarbutton.cpp index 791b47db1..cf64f76a3 100644 --- a/tdeui/tdetoolbarbutton.cpp +++ b/tdeui/tdetoolbarbutton.cpp @@ -410,7 +410,7 @@ void TDEToolBarButton::enterEvent(TQEvent *) bool TDEToolBarButton::eventFilter(TQObject *o, TQEvent *ev) { - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this)) + if (o == this) { // Popup the menu when the left mousebutton is pressed and the mouse diff --git a/tdeui/tests/tdeactiontest.cpp b/tdeui/tests/tdeactiontest.cpp index e892bb306..676872e96 100644 --- a/tdeui/tests/tdeactiontest.cpp +++ b/tdeui/tests/tdeactiontest.cpp @@ -10,7 +10,7 @@ int main( int argc, char **argv ) { TDEApplication app( argc, argv, "tdeactiontest" ); - TDEActionCollection coll( static_cast<TQObject *>( 0 ) ); + TDEActionCollection coll( 0 ); TQGuardedPtr<TDEAction> action1 = new TDERadioAction("test",0, &coll); TQGuardedPtr<TDEAction> action2 = new TDERadioAction("test",0, &coll); |