summaryrefslogtreecommitdiffstats
path: root/lib/compatibility/tdemdi
diff options
context:
space:
mode:
Diffstat (limited to 'lib/compatibility/tdemdi')
-rw-r--r--lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp16
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp4
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp10
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp8
4 files changed, 19 insertions, 19 deletions
diff --git a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp
index adba273f..6cdbc897 100644
--- a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp
@@ -125,7 +125,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
@@ -782,7 +782,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 );
@@ -803,7 +803,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);
@@ -1433,7 +1433,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);
}
@@ -1489,13 +1489,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() );
}
@@ -2162,7 +2162,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;
@@ -2497,7 +2497,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/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp
index d68322a6..21c8c9fe 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp
@@ -112,7 +112,7 @@ void KMdiChildArea::destroyChild( KMdiChildFrm *child, bool focusTop )
bool wasMaximized = ( child->state() == KMdiChildFrm::Maximized );
// destroy the old one
- TQT_BASE_OBJECT_NAME::disconnect( child );
+ TQObject::disconnect( child );
child->blockSignals( true );
m_pZ->setAutoDelete( false );
m_pZ->removeRef( child );
@@ -144,7 +144,7 @@ void KMdiChildArea::destroyChildButNotItsView( KMdiChildFrm* child, bool focusTo
bool wasMaximized = ( child->state() == KMdiChildFrm::Maximized );
// destroy the old one
- TQT_BASE_OBJECT_NAME::disconnect( child );
+ TQObject::disconnect( child );
child->unsetClient();
m_pZ->setAutoDelete( false );
m_pZ->removeRef( child );
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp
index a0885b0a..4c9461f8 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/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) == m_pWinIcon ) || ( TQT_BASE_OBJECT(obj) == m_pUnixIcon ) ) && bIsSecondClick ) )
+ if ( !( ( ( obj == m_pWinIcon ) || ( obj == m_pUnixIcon ) ) && bIsSecondClick ) )
{
// in case we didn't click on the icon button
TQFocusEvent* pFE = new TQFocusEvent( 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) ) || ( 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/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp
index d832fe81..84948205 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp
@@ -492,7 +492,7 @@ void KMdiChildView::slot_childDestroyed()
// if we lost a child we uninstall ourself as event filter for the lost
// child and its children
- const TQObject * pLostChild = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(TQT_BASE_OBJECT_NAME::sender()));
+ const TQObject * pLostChild = TQObject::sender();
if ( pLostChild && ( pLostChild->isWidgetType() ) )
{
TQObjectList* list = ( ( TQObject* ) ( pLostChild ) ) ->queryList( "TQWidget" );
@@ -628,14 +628,14 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
if ( e->type() == TQEvent::IconChange )
{
// tqDebug("KMDiChildView:: TQEvent:IconChange intercepted\n");
- if ( TQT_BASE_OBJECT(obj) == this )
+ if ( obj == this )
iconUpdated( this, icon() ? ( *icon() ) : TQPixmap() );
- else if ( TQT_BASE_OBJECT(obj) == 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() );
}
}