diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-02 06:46:49 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-02 06:46:49 +0000 |
| commit | b5fb39eb73302856329affac603779129a545abd (patch) | |
| tree | d07172449a51f48bbc62681653f71aa1287abd7d /kdeui | |
| parent | 1c4e273a42588ec915cb94f7b1ceeed2468c9f07 (diff) | |
| download | tdelibs-b5fb39eb73302856329affac603779129a545abd.tar.gz tdelibs-b5fb39eb73302856329affac603779129a545abd.zip | |
Change most kdelibs inherits() functions to use the new object name define system
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1226839 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdeui')
| -rw-r--r-- | kdeui/kactionselector.cpp | 2 | ||||
| -rw-r--r-- | kdeui/kcompletionbox.cpp | 2 | ||||
| -rw-r--r-- | kdeui/kdockwidget.cpp | 4 | ||||
| -rw-r--r-- | kdeui/ktoolbar.cpp | 2 | ||||
| -rw-r--r-- | kdeui/ktoolbarbutton.cpp | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/kdeui/kactionselector.cpp b/kdeui/kactionselector.cpp index 056045906..8923cbd4f 100644 --- a/kdeui/kactionselector.cpp +++ b/kdeui/kactionselector.cpp @@ -392,7 +392,7 @@ bool KActionSelector::eventFilter( TQObject *o, TQEvent *e ) } return true; } - else if ( o->inherits( "QListBox" ) ) + else if ( o->inherits( TQLISTBOX_OBJECT_NAME_STRING ) ) { switch ( ((TQKeyEvent*)e)->key() ) { diff --git a/kdeui/kcompletionbox.cpp b/kdeui/kcompletionbox.cpp index 1349b7d8c..4f025803b 100644 --- a/kdeui/kcompletionbox.cpp +++ b/kdeui/kcompletionbox.cpp @@ -343,7 +343,7 @@ TQRect KCompletionBox::calculateGeometry() const // to adjust it. Do that here as well, for consistency const TQObject* combo; if ( d->m_parent && (combo = d->m_parent->tqparent() ) && - combo->inherits("QComboBox") ) + combo->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) ) { const TQComboBox* cb = static_cast<const TQComboBox*>(TQT_TQWIDGET_CONST(combo)); diff --git a/kdeui/kdockwidget.cpp b/kdeui/kdockwidget.cpp index 7375a25e9..006c822ad 100644 --- a/kdeui/kdockwidget.cpp +++ b/kdeui/kdockwidget.cpp @@ -1699,7 +1699,7 @@ void KDockManager::activate() obj->show(); } } - if ( !main->inherits("QDialog") ) main->show(); + if ( !main->inherits(TQDIALOG_OBJECT_NAME_STRING) ) main->show(); } bool KDockManager::eventFilter( TQObject *obj, TQEvent *event ) @@ -3105,7 +3105,7 @@ void KDockArea::resizeEvent(TQResizeEvent *rsize) #ifndef NO_KDE2 // kdDebug(282)<<"KDockArea::resize"<<endl; #endif - TQObjectList *list=queryList("QWidget",0,false); + TQObjectList *list=queryList(TQWIDGET_OBJECT_NAME_STRING,0,false); TQObjectListIt it( *list ); // iterate over the buttons TQObject *obj; diff --git a/kdeui/ktoolbar.cpp b/kdeui/ktoolbar.cpp index 456acc438..90a17a486 100644 --- a/kdeui/ktoolbar.cpp +++ b/kdeui/ktoolbar.cpp @@ -2236,7 +2236,7 @@ void KToolBar::slotContextAboutToHide() TQPtrListIterator<TQWidget> it( widgets ); TQWidget *wdg; while ( ( wdg = it.current() ) != 0 ) { - if ( wdg->inherits( "QToolButton" ) ) + if ( wdg->inherits( TQTOOLBUTTON_OBJECT_NAME_STRING ) ) static_cast<TQToolButton*>( wdg )->setDown( false ); ++it; } diff --git a/kdeui/ktoolbarbutton.cpp b/kdeui/ktoolbarbutton.cpp index e5dd0c736..7df04fa70 100644 --- a/kdeui/ktoolbarbutton.cpp +++ b/kdeui/ktoolbarbutton.cpp @@ -298,7 +298,7 @@ void KToolBarButton::setIconSet( const TQIconSet &iconset ) // remove? void KToolBarButton::setPixmap( const TQPixmap &pixmap ) { - if( pixmap.isNull()) // called by QToolButton + if( pixmap.isNull()) // called by TQToolButton { TQToolButton::setPixmap( pixmap ); return; |