diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-10-02 02:23:08 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-10-02 02:23:08 +0000 |
| commit | bfb063893534c33acd9abd340c80979205dc82f9 (patch) | |
| tree | 75f450e2d7a85066bbff654b0a8f014e240197aa /kdeui | |
| parent | ccb3b5e486e55a0b014cbc3357c209c3d822ed47 (diff) | |
| download | tdelibs-bfb063893534c33acd9abd340c80979205dc82f9.tar.gz tdelibs-bfb063893534c33acd9abd340c80979205dc82f9.zip | |
[CRITICAL] Repair borken rendering due to incorrect inherited object logic
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1181768 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 | 2 | ||||
| -rw-r--r-- | kdeui/ktoolbar.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/kdeui/kactionselector.cpp b/kdeui/kactionselector.cpp index a34582d35..9bbf52dbf 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( "TQListBox" ) ) + else if ( o->inherits( "QListBox" ) ) { switch ( ((TQKeyEvent*)e)->key() ) { diff --git a/kdeui/kcompletionbox.cpp b/kdeui/kcompletionbox.cpp index 68f5f6343..ed75ecd21 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->parent() ) && - combo->inherits("TQComboBox") ) + combo->inherits("QComboBox") ) { const TQComboBox* cb = static_cast<const TQComboBox*>(combo); diff --git a/kdeui/kdockwidget.cpp b/kdeui/kdockwidget.cpp index 33ba5e362..462c616f3 100644 --- a/kdeui/kdockwidget.cpp +++ b/kdeui/kdockwidget.cpp @@ -1699,7 +1699,7 @@ void KDockManager::activate() obj->show(); } } - if ( !main->inherits("TQDialog") ) main->show(); + if ( !main->inherits("QDialog") ) main->show(); } bool KDockManager::eventFilter( TQObject *obj, TQEvent *event ) diff --git a/kdeui/ktoolbar.cpp b/kdeui/ktoolbar.cpp index 6f3eddba2..79607099a 100644 --- a/kdeui/ktoolbar.cpp +++ b/kdeui/ktoolbar.cpp @@ -2231,7 +2231,7 @@ void KToolBar::slotContextAboutToHide() TQPtrListIterator<TQWidget> it( widgets ); TQWidget *wdg; while ( ( wdg = it.current() ) != 0 ) { - if ( wdg->inherits( "TQToolButton" ) ) + if ( wdg->inherits( "QToolButton" ) ) static_cast<TQToolButton*>( wdg )->setDown( false ); ++it; } |