summaryrefslogtreecommitdiffstats
path: root/tdeui
diff options
context:
space:
mode:
Diffstat (limited to 'tdeui')
-rw-r--r--tdeui/kcolordialog.cpp2
-rw-r--r--tdeui/kcursor.cpp2
-rw-r--r--tdeui/kdockwidget.cpp16
-rw-r--r--tdeui/kjanuswidget.cpp2
-rw-r--r--tdeui/klineedit.cpp2
-rw-r--r--tdeui/ksyntaxhighlighter.cpp6
-rw-r--r--tdeui/ktip.cpp2
-rw-r--r--tdeui/qxembed.cpp12
-rw-r--r--tdeui/tdeactionclasses.cpp2
-rw-r--r--tdeui/tdecompletionbox.cpp2
-rw-r--r--tdeui/tdemenubar.cpp8
-rw-r--r--tdeui/tdepassivepopupstack.cpp2
-rw-r--r--tdeui/tdetoolbarbutton.cpp2
-rw-r--r--tdeui/tests/tdeactiontest.cpp2
14 files changed, 31 insertions, 31 deletions
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 92afc91fd..faa98f7d0 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);
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-05 05:14:04 +0000