From f7670c198945adc3b95ad69a959fe5f8ae55b493 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 24 Feb 2011 20:07:57 +0000 Subject: Runtime object naming repaired in kdewebdev NOTE: runtime object naming still needs to be checked for stray "Q*" strings git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1222551 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- lib/compatibility/kmdi/qextmdi/kdockwidget.cpp | 4 ++-- lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp | 14 +++++++------- lib/compatibility/kmdi/qextmdi/kmdichildview.cpp | 10 +++++----- lib/compatibility/kmdi/qextmdi/kmdifocuslist.cpp | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) (limited to 'lib/compatibility/kmdi') diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp b/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp index 89417231..32a5eaf0 100644 --- a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp +++ b/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp @@ -1680,7 +1680,7 @@ void KDockManager::activate() obj->show(); } } - if ( !main->inherits("TQDialog") ) main->show(); + if ( !main->inherits(TQDIALOG_OBJECT_NAME_STRING) ) main->show(); } bool KDockManager::eventFilter( TQObject *obj, TQEvent *event ) @@ -3044,7 +3044,7 @@ void KDockArea::resizeEvent(TQResizeEvent *rsize) #ifndef NO_KDE2 // kdDebug(282)<<"KDockArea::resize"<* pFocPolDict = new TQDict; pFocPolDict->setAutoDelete( true ); - TQObjectList *list = m_pClient->queryList( "TQWidget" ); + TQObjectList *list = m_pClient->queryList( TQWIDGET_OBJECT_NAME_STRING ); TQObjectListIt it( *list ); // iterate over the buttons TQObject * obj; int i = 1; @@ -833,7 +833,7 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset ) m_pClient->setMaximumSize( maxs.width(), maxs.height() ); // remember the focus policies using the dictionary and reset them - TQObjectList *list = m_pClient->queryList( "TQWidget" ); + TQObjectList *list = m_pClient->queryList( TQWIDGET_OBJECT_NAME_STRING ); TQObjectListIt it( *list ); // iterate over all child widgets of child frame TQObject * obj; TQWidget* firstFocusableChildWidget = 0; @@ -887,7 +887,7 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset ) void KMdiChildFrm::linkChildren( TQDict* pFocPolDict ) { // reset the focus policies for all widgets in the view (take them from the dictionary) - TQObjectList* list = m_pClient->queryList( "TQWidget" ); + TQObjectList* list = m_pClient->queryList( TQWIDGET_OBJECT_NAME_STRING ); TQObjectListIt it( *list ); // iterate over all child widgets of child frame TQObject* obj; while ( ( obj = it.current() ) != 0 ) @@ -899,7 +899,7 @@ void KMdiChildFrm::linkChildren( TQDict* pFocPolDict ) if ( pFocPol != 0 ) widg->setFocusPolicy( *pFocPol ); - if ( !( widg->inherits( "TQPopupMenu" ) ) ) + if ( !( widg->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) ) ) widg->installEventFilter( this ); } @@ -936,7 +936,7 @@ TQDict* KMdiChildFrm::unlinkChildren() TQDict* pFocPolDict = new TQDict; pFocPolDict->setAutoDelete( true ); - TQObjectList *list = m_pClient->queryList( "TQWidget" ); + TQObjectList *list = m_pClient->queryList( TQWIDGET_OBJECT_NAME_STRING ); TQObjectListIt it( *list ); // iterate over all child widgets of child frame TQObject * obj; int i = 1; @@ -1155,7 +1155,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) // if we lost a child we uninstall ourself as event filter for the lost // child and its children TQObject* pLostChild = ( ( TQChildEvent* ) e )->child(); - if ( ( pLostChild != 0L ) /*&& (pLostChild->inherits("TQWidget"))*/ ) + if ( ( pLostChild != 0L ) /*&& (pLostChild->inherits(TQWIDGET_OBJECT_NAME_STRING))*/ ) { TQObjectList* list = pLostChild->queryList(); list->insert( 0, pLostChild ); // add the lost child to the list too, just to save code @@ -1180,7 +1180,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) if ( ( pNewChild != 0L ) && ::qt_cast( pNewChild ) ) { TQWidget * pNewWidget = static_cast( pNewChild ); - TQObjectList *list = pNewWidget->queryList( "TQWidget" ); + TQObjectList *list = pNewWidget->queryList( TQWIDGET_OBJECT_NAME_STRING ); list->insert( 0, pNewChild ); // add the new child to the list too, just to save code TQObjectListIt it( *list ); // iterate over all new child widgets TQObject * obj; diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildview.cpp b/lib/compatibility/kmdi/qextmdi/kmdichildview.cpp index 8fe116e1..57c0bea4 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildview.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdichildview.cpp @@ -495,7 +495,7 @@ void KMdiChildView::slot_childDestroyed() const TQObject * pLostChild = TQObject::sender(); if ( pLostChild && ( pLostChild->isWidgetType() ) ) { - TQObjectList* list = ( ( TQObject* ) ( pLostChild ) ) ->queryList( "TQWidget" ); + TQObjectList* list = ( ( TQObject* ) ( pLostChild ) ) ->queryList( TQWIDGET_OBJECT_NAME_STRING ); list->insert( 0, pLostChild ); // add the lost child to the list too, just to save code TQObjectListIt it( *list ); // iterate over all lost child widgets TQObject* obj; @@ -544,7 +544,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e ) { if ( obj->isWidgetType() ) { - TQObjectList * list = queryList( "TQWidget" ); + TQObjectList * list = queryList( TQWIDGET_OBJECT_NAME_STRING ); if ( list->find( obj ) != -1 ) m_focusedChildWidget = ( TQWidget* ) obj; @@ -568,7 +568,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e ) TQObject * pLostChild = ( ( TQChildEvent* ) e ) ->child(); if ( ( pLostChild != 0L ) && ( pLostChild->isWidgetType() ) ) { - TQObjectList * list = pLostChild->queryList( "TQWidget" ); + TQObjectList * list = pLostChild->queryList( TQWIDGET_OBJECT_NAME_STRING ); list->insert( 0, pLostChild ); // add the lost child to the list too, just to save code TQObjectListIt it( *list ); // iterate over all lost child widgets TQObject * o; @@ -601,7 +601,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e ) TQWidget * pNewWidget = ( TQWidget* ) pNewChild; if ( pNewWidget->testWFlags( Qt::WType_Dialog | Qt::WShowModal ) ) return false; - TQObjectList *list = pNewWidget->queryList( "TQWidget" ); + TQObjectList *list = pNewWidget->queryList( TQWIDGET_OBJECT_NAME_STRING ); list->insert( 0, pNewChild ); // add the new child to the list too, just to save code TQObjectListIt it( *list ); // iterate over all new child widgets TQObject * o; @@ -646,7 +646,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e ) /** Switches interposing in event loop of all current child widgets off. */ void KMdiChildView::removeEventFilterForAllChildren() { - TQObjectList* list = queryList( "TQWidget" ); + TQObjectList* list = queryList( TQWIDGET_OBJECT_NAME_STRING ); TQObjectListIt it( *list ); // iterate over all child widgets TQObject* obj; while ( ( obj = it.current() ) != 0 ) diff --git a/lib/compatibility/kmdi/qextmdi/kmdifocuslist.cpp b/lib/compatibility/kmdi/qextmdi/kmdifocuslist.cpp index 471b9895..2e9b7700 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdifocuslist.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdifocuslist.cpp @@ -34,7 +34,7 @@ void KMdiFocusList::addWidgetTree( TQWidget* w ) w->setFocusPolicy( TQWidget::ClickFocus ); kdDebug( 760 ) << "KMdiFocusList::addWidgetTree: adding toplevel" << endl; connect( w, TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( objectHasBeenDestroyed( TQObject* ) ) ); - TQObjectList *l = w->queryList( "TQWidget" ); + TQObjectList *l = w->queryList( TQWIDGET_OBJECT_NAME_STRING ); TQObjectListIt it( *l ); TQObject *obj; while ( ( obj = it.current() ) != 0 ) -- cgit v1.2.1