TDE
/
tdelibs
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs
0
0
Fork 0
Code Issues Releases Wiki Activity

Drop TQT_BASE_OBJECT* defines

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/220/head
Michele Calgaro 1 year ago
parent 23278d2593
commit 48b07a0ff1
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
33 changed files with 64 additions and 64 deletions
Show Stats Download Patch File Download Diff File

2
interfaces/terminal/test/main.cpp
Unescape View File

@ -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 );

6
kate/part/katecodecompletion.cpp
Unescape View File

@ -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 )

4
kate/part/katesupercursor.cpp
Unescape View File

@ -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

2
kate/part/kateviewinternal.cpp
Unescape View File

@ -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())

2
kate/plugins/isearch/ISearchPlugin.cpp
Unescape View File

@ -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 ) {

2
libtdescreensaver/tdescreensaver.cpp
Unescape View File

@ -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;
}

2
tdeabc/ldapconfigwidget.cpp
Unescape View File

@ -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 );
}

10
tdecore/kgenericfactory.tcc
Unescape View File

@ -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 ));
}
};

2
tdehtml/ecma/kjs_debugwin.cpp
Unescape View File

@ -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;

2
tdehtml/rendering/render_form.cpp
Unescape View File

@ -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;

2
tdehtml/tdehtmlview.cpp
Unescape View File

@ -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) {

4
tdeio/tdefile/kcombiview.cpp
Unescape View File

@ -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();
}

2
tdeio/tdefile/kurlrequester.cpp
Unescape View File

@ -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

2
tdeio/tdefile/tdediroperator.cpp
Unescape View File

@ -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);
}

2
tdeio/tdefile/tdefilefiltercombo.cpp
Unescape View File

@ -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();
}

2
tdeio/tdefile/tdefileiconview.cpp
Unescape View File

@ -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 )

2
tdemdi/tdemdi/dockcontainer.cpp
Unescape View File

@ -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)

10
tdemdi/tdemdichildfrm.cpp
Unescape View File

@ -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() )

6
tdemdi/tdemdichildview.cpp
Unescape View File

@ -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() );
}
}

2
tdeui/kcolordialog.cpp
Unescape View File

@ -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:

2
tdeui/kcursor.cpp
Unescape View File

@ -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() )
{

16
tdeui/kdockwidget.cpp
Unescape View File

@ -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() );
}

2
tdeui/kjanuswidget.cpp
Unescape View File

@ -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) );
}

2
tdeui/klineedit.cpp
Unescape View File

@ -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 )

6
tdeui/ksyntaxhighlighter.cpp
Unescape View File

@ -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() ) {

2
tdeui/ktip.cpp
Unescape View File

@ -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();

12
tdeui/qxembed.cpp
Unescape View File

@ -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));

2
tdeui/tdeactionclasses.cpp
Unescape View File

@ -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())

2
tdeui/tdecompletionbox.cpp
Unescape View File

@ -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 );

8
tdeui/tdemenubar.cpp
Unescape View File

@ -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() )

2
tdeui/tdepassivepopupstack.cpp
Unescape View File

@ -104,4 +104,4 @@ void TDEPassivePopupStackContainer::popupDestroyed(TQObject* object) {
}
}
#include "tdepassivepopupstack.moc"
#include "tdepassivepopupstack.moc"

2
tdeui/tdetoolbarbutton.cpp
Unescape View File

@ -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

2
tdeui/tests/tdeactiontest.cpp
Unescape View File

@ -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);

Write Preview
Loading…
Cancel
Save