diff options
-rw-r--r-- | kate/app/katefileselector.cpp | 2 | ||||
-rw-r--r-- | kicker/applets/clock/clock.cpp | 2 | ||||
-rw-r--r-- | kicker/applets/lockout/lockout.cpp | 4 | ||||
-rw-r--r-- | kicker/applets/minipager/pagerbutton.cpp | 2 | ||||
-rw-r--r-- | kicker/applets/systemtray/systemtrayapplet.cpp | 2 | ||||
-rw-r--r-- | kicker/kicker/core/applethandle.cpp | 2 | ||||
-rw-r--r-- | kicker/kicker/core/container_button.cpp | 2 | ||||
-rw-r--r-- | kicker/kicker/core/containerarea.cpp | 4 | ||||
-rw-r--r-- | kicker/kicker/ui/k_new_mnu.cpp | 16 | ||||
-rw-r--r-- | kicker/libkicker/panner.cpp | 2 | ||||
-rw-r--r-- | konqueror/konq_combo.cpp | 2 | ||||
-rw-r--r-- | konqueror/konq_frame.cpp | 4 | ||||
-rw-r--r-- | konqueror/konq_mainwindow.cpp | 2 | ||||
-rw-r--r-- | konqueror/konq_view.cpp | 4 | ||||
-rw-r--r-- | konsole/konsole/TEWidget.cpp | 2 | ||||
-rw-r--r-- | konsole/konsole/konsole.cpp | 2 | ||||
-rw-r--r-- | ksplashml/wndmain.cpp | 2 | ||||
-rw-r--r-- | twin/clients/b2/b2client.cpp | 2 | ||||
-rw-r--r-- | twin/clients/keramik/keramik.cpp | 2 | ||||
-rw-r--r-- | twin/clients/test/test.cpp | 2 | ||||
-rw-r--r-- | twin/events.cpp | 4 | ||||
-rw-r--r-- | twin/geometry.cpp | 2 | ||||
-rw-r--r-- | twin/kcmtwin/twinrules/detectwidget.cpp | 2 | ||||
-rw-r--r-- | twin/lib/kcommondecoration.cpp | 2 |
24 files changed, 36 insertions, 36 deletions
diff --git a/kate/app/katefileselector.cpp b/kate/app/katefileselector.cpp index 4bba68ded..b275ac7d7 100644 --- a/kate/app/katefileselector.cpp +++ b/kate/app/katefileselector.cpp @@ -485,7 +485,7 @@ bool KateFileSelector::eventFilter( TQObject* o, TQEvent *e ) And the popup is rather useless, if the paths are only partly visible. */ TQListBox *lb = cmbPath->listBox(); - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(lb) && e->type() == TQEvent::Show ) { + if ( o == lb && e->type() == TQEvent::Show ) { int add = lb->height() < lb->contentsHeight() ? lb->verticalScrollBar()->width() : 0; int w = TQMIN( mainwin->width(), lb->contentsWidth() + add ); lb->resize( w, lb->height() ); 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 67a32a3b1..8687fca0a 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() ) { diff --git a/konqueror/konq_combo.cpp b/konqueror/konq_combo.cpp index 850859b58..c1cbe734b 100644 --- a/konqueror/konq_combo.cpp +++ b/konqueror/konq_combo.cpp @@ -396,7 +396,7 @@ bool KonqCombo::eventFilter( TQObject *o, TQEvent *ev ) // Handle Ctrl+Del/Backspace etc better than the Qt widget, which always // jumps to the next whitespace. TQLineEdit *edit = lineEdit(); - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(edit) ) { + if ( o == edit ) { int type = ev->type(); if ( type == TQEvent::KeyPress ) { TQKeyEvent *e = TQT_TQKEYEVENT( ev ); diff --git a/konqueror/konq_frame.cpp b/konqueror/konq_frame.cpp index 0acf39b49..7a620f0fd 100644 --- a/konqueror/konq_frame.cpp +++ b/konqueror/konq_frame.cpp @@ -173,7 +173,7 @@ void KonqFrameStatusBar::splitFrameMenu() bool KonqFrameStatusBar::eventFilter(TQObject* o, TQEvent *e) { - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pStatusLabel) && e->type()==TQEvent::MouseButtonPress) + if (o == m_pStatusLabel && e->type()==TQEvent::MouseButtonPress) { emit clicked(); update(); @@ -181,7 +181,7 @@ bool KonqFrameStatusBar::eventFilter(TQObject* o, TQEvent *e) splitFrameMenu(); return true; } - else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) && e->type() == TQEvent::ApplicationPaletteChange ) + else if ( o == this && e->type() == TQEvent::ApplicationPaletteChange ) { unsetPalette(); updateActiveStatus(); diff --git a/konqueror/konq_mainwindow.cpp b/konqueror/konq_mainwindow.cpp index 770678c4e..2880fad8a 100644 --- a/konqueror/konq_mainwindow.cpp +++ b/konqueror/konq_mainwindow.cpp @@ -3462,7 +3462,7 @@ void KonqMainWindow::slotClearComboHistory() bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev) { if ( ( ev->type()==TQEvent::FocusIn || ev->type()==TQEvent::FocusOut ) && - m_combo && TQT_BASE_OBJECT(m_combo->lineEdit()) == TQT_BASE_OBJECT(obj) ) + m_combo && m_combo->lineEdit() == obj ) { //kdDebug(1202) << "KonqMainWindow::eventFilter " << obj << " " << obj->className() << " " << obj->name() << endl; diff --git a/konqueror/konq_view.cpp b/konqueror/konq_view.cpp index 9f7bef4d8..5a7ea1244 100644 --- a/konqueror/konq_view.cpp +++ b/konqueror/konq_view.cpp @@ -1256,7 +1256,7 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e ) if ( !m_pPart ) return false; // kdDebug() << "--" << obj->className() << "--" << e->type() << "--" << endl; - if ( e->type() == TQEvent::DragEnter && m_bURLDropHandling && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pPart->widget()) ) + if ( e->type() == TQEvent::DragEnter && m_bURLDropHandling && obj == m_pPart->widget() ) { TQDragEnterEvent *ev = static_cast<TQDragEnterEvent *>( e ); @@ -1277,7 +1277,7 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e ) delete children; } } - else if ( e->type() == TQEvent::Drop && m_bURLDropHandling && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pPart->widget()) ) + else if ( e->type() == TQEvent::Drop && m_bURLDropHandling && obj == m_pPart->widget() ) { TQDropEvent *ev = static_cast<TQDropEvent *>( e ); diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp index 026ee2df8..88b5c8dce 100644 --- a/konsole/konsole/TEWidget.cpp +++ b/konsole/konsole/TEWidget.cpp @@ -1938,7 +1938,7 @@ bool TEWidget::eventFilter( TQObject *obj, TQEvent *e ) TQT_TQKEYEVENT( e )->ignore(); return false; } - if ( TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(this) /* when embedded */ && TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(parent()) /* when standalone */ ) + if ( obj != this /* when embedded */ && obj != parent() /* when standalone */ ) return false; // not us if ( e->type() == TQEvent::KeyPress ) { diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp index 7f27a678e..3a182e682 100644 --- a/konsole/konsole/konsole.cpp +++ b/konsole/konsole/konsole.cpp @@ -984,7 +984,7 @@ void Konsole::makeTabWidget() bool Konsole::eventFilter( TQObject *o, TQEvent *ev ) { - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_newSessionButton)) + if (o == m_newSessionButton) { // Popup the menu when the left mousebutton is pressed and the mouse // is moved by a small distance. diff --git a/ksplashml/wndmain.cpp b/ksplashml/wndmain.cpp index c37c6e214..81d765a99 100644 --- a/ksplashml/wndmain.cpp +++ b/ksplashml/wndmain.cpp @@ -427,7 +427,7 @@ TQPtrList<Action> KSplash::actionList() bool KSplash::eventFilter( TQObject *o, TQEvent *e ) { - if ( ( e->type() == TQEvent::MouseButtonRelease ) && ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(mThemeEngine) ) ) + if ( ( e->type() == TQEvent::MouseButtonRelease ) && ( o == mThemeEngine ) ) { TQTimer::singleShot( 0, this, TQT_SLOT(close())); return TRUE; diff --git a/twin/clients/b2/b2client.cpp b/twin/clients/b2/b2client.cpp index 6c81660ee..49391e923 100644 --- a/twin/clients/b2/b2client.cpp +++ b/twin/clients/b2/b2client.cpp @@ -1179,7 +1179,7 @@ bool B2Client::drawbound(const TQRect& geom, bool clear) bool B2Client::eventFilter(TQObject *o, TQEvent *e) { - if (TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget())) + if (o != widget()) return false; switch (e->type()) { case TQEvent::Resize: diff --git a/twin/clients/keramik/keramik.cpp b/twin/clients/keramik/keramik.cpp index ded50a9d2..446199fa7 100644 --- a/twin/clients/keramik/keramik.cpp +++ b/twin/clients/keramik/keramik.cpp @@ -1796,7 +1796,7 @@ TQSize KeramikClient::minimumSize() const bool KeramikClient::eventFilter( TQObject* o, TQEvent* e ) { - if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget()) ) + if ( o != widget() ) return false; switch ( e->type() ) diff --git a/twin/clients/test/test.cpp b/twin/clients/test/test.cpp index e01d1d98e..ebfb00df1 100644 --- a/twin/clients/test/test.cpp +++ b/twin/clients/test/test.cpp @@ -100,7 +100,7 @@ TQSize Decoration::minimumSize() const bool Decoration::eventFilter( TQObject* o, TQEvent* e ) { - if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(widget())) + if( o == widget()) { switch( e->type()) { diff --git a/twin/events.cpp b/twin/events.cpp index c24d81c6f..e2e6b8d60 100644 --- a/twin/events.cpp +++ b/twin/events.cpp @@ -1079,7 +1079,7 @@ int qtToX11State( TQt::ButtonState state ) // for the decoration window cannot be (easily) intercepted as X11 events bool Client::eventFilter( TQObject* o, TQEvent* e ) { - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(shadowWidget)) + if (o == shadowWidget) { if (e->type() == TQEvent::MouseButtonRelease) { @@ -1291,7 +1291,7 @@ bool Client::eventFilter( TQObject* o, TQEvent* e ) } } if( decoration == NULL - || TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(decoration->widget())) + || o != decoration->widget()) return false; if( e->type() == TQEvent::MouseButtonPress ) { diff --git a/twin/geometry.cpp b/twin/geometry.cpp index 562e3cda0..2f9988e6b 100644 --- a/twin/geometry.cpp +++ b/twin/geometry.cpp @@ -2288,7 +2288,7 @@ class EatAllPaintEvents { protected: virtual bool eventFilter( TQObject* o, TQEvent* e ) - { return e->type() == TQEvent::Paint && TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(geometryTip); } + { return e->type() == TQEvent::Paint && o != geometryTip; } }; static EatAllPaintEvents* eater = 0; diff --git a/twin/kcmtwin/twinrules/detectwidget.cpp b/twin/kcmtwin/twinrules/detectwidget.cpp index a0f017f7d..9dbb29441 100644 --- a/twin/kcmtwin/twinrules/detectwidget.cpp +++ b/twin/kcmtwin/twinrules/detectwidget.cpp @@ -170,7 +170,7 @@ void DetectDialog::selectWindow() bool DetectDialog::eventFilter( TQObject* o, TQEvent* e ) { - if( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(grabber) ) + if( o != grabber ) return false; if( e->type() != TQEvent::MouseButtonRelease ) return false; diff --git a/twin/lib/kcommondecoration.cpp b/twin/lib/kcommondecoration.cpp index 0ada039b0..e1c74d5bc 100644 --- a/twin/lib/kcommondecoration.cpp +++ b/twin/lib/kcommondecoration.cpp @@ -844,7 +844,7 @@ void KCommonDecoration::updateWindowShape() bool KCommonDecoration::eventFilter( TQObject* o, TQEvent* e ) { - if( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget())) + if( o != widget()) return false; switch( e->type()) { |