diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-15 19:11:41 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-15 19:11:41 +0000 |
commit | 374d939d8af431477ce2601815f0ba121b66871c (patch) | |
tree | ad878478dcc0bedf51e3cffb2ed611ada422b290 /kmdi | |
parent | f9279733bf71e446933b46f40cbe9c9b9f57b778 (diff) | |
download | tdelibs-374d939d8af431477ce2601815f0ba121b66871c.tar.gz tdelibs-374d939d8af431477ce2601815f0ba121b66871c.zip |
Allow kdelibs to function correctly with TQt for Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1220926 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmdi')
-rw-r--r-- | kmdi/kmdi/dockcontainer.cpp | 10 | ||||
-rw-r--r-- | kmdi/kmdi/guiclient.cpp | 6 | ||||
-rw-r--r-- | kmdi/kmdi/mainwindow.cpp | 6 | ||||
-rw-r--r-- | kmdi/kmdi/toolviewaccessor.cpp | 2 | ||||
-rw-r--r-- | kmdi/kmdidockcontainer.cpp | 10 | ||||
-rw-r--r-- | kmdi/kmdiguiclient.cpp | 6 | ||||
-rw-r--r-- | kmdi/kmdimainfrm.cpp | 12 | ||||
-rw-r--r-- | kmdi/kmditoolviewaccessor.cpp | 2 |
8 files changed, 27 insertions, 27 deletions
diff --git a/kmdi/kmdi/dockcontainer.cpp b/kmdi/kmdi/dockcontainer.cpp index eb8518a4a..6302a8406 100644 --- a/kmdi/kmdi/dockcontainer.cpp +++ b/kmdi/kmdi/dockcontainer.cpp @@ -246,7 +246,7 @@ bool DockContainer::eventFilter( TQObject *obj, TQEvent *event ) switch ( event->type() ){ case TQEvent::MouseButtonPress: { - KDockWidget * w=m_revMap[dynamic_cast<KMultiTabBarTab*>(obj)->id()]; + KDockWidget * w=m_revMap[tqt_dynamic_cast<KMultiTabBarTab*>(obj)->id()]; if (!w) { kdDebug()<<"NoWidget"<<endl; break; @@ -307,7 +307,7 @@ void DockContainer::showWidget(KDockWidget *w) { void DockContainer::changeOverlapMode() { - const KDockButton_Private *btn=dynamic_cast<const KDockButton_Private*>(sender()); + const KDockButton_Private *btn=tqt_dynamic_cast<const KDockButton_Private*>(sender()); kdDebug(760)<<"DockContainer::changeOverlapMode: button=="<<btn<<endl; @@ -612,7 +612,7 @@ void DockContainer::toggle() { if (m_tb->isTabRaised(oldtab)) { m_tb->setTab(oldtab,false); tabClicked(oldtab); - // KMDI::MainWindow *mainFrm = dynamic_cast<KMDI::MainWindow*>(m_mainWin); + // KMDI::MainWindow *mainFrm = tqt_dynamic_cast<KMDI::MainWindow*>(m_mainWin); // if (mainFrm && mainFrm->activeWindow() ) // TODO // mainFrm->activeWindow()->setFocus(); @@ -633,7 +633,7 @@ void DockContainer::prevToolView() { if (pos==-1) return; pos--; if (pos<0) pos=tabs->count()-1; - KMultiTabBarTab *tab=tabs->at(pos); + KMultiTabBarTab *tab=tabs->tqat(pos); if (!tab) return; //can never happen here, but who knows m_tb->setTab(tab->id(),true); tabClicked(tab->id()); @@ -645,7 +645,7 @@ void DockContainer::nextToolView() { if (pos==-1) return; pos++; if (pos>=(int)tabs->count()) pos=0; - KMultiTabBarTab *tab=tabs->at(pos); + KMultiTabBarTab *tab=tabs->tqat(pos); if (!tab) return; //can never happen here, but who knows m_tb->setTab(tab->id(),true); tabClicked(tab->id()); diff --git a/kmdi/kmdi/guiclient.cpp b/kmdi/kmdi/guiclient.cpp index 6d61f16e3..935378d08 100644 --- a/kmdi/kmdi/guiclient.cpp +++ b/kmdi/kmdi/guiclient.cpp @@ -100,7 +100,7 @@ GUIClient::~GUIClient() { // actionCollection()->writeShortcutSettings( "KMDI Shortcuts", kapp->config() ); for (uint i=0;i<m_toolViewActions.count();i++) - disconnect(m_toolViewActions.at(i),0,this,0); + disconnect(m_toolViewActions.tqat(i),0,this,0); m_toolViewActions.setAutoDelete( false ); m_toolViewActions.clear(); @@ -119,7 +119,7 @@ void GUIClient::setupActions() if (m_toolViewActions.count()<3) { for (uint i=0;i<m_toolViewActions.count();i++) - addList.append(m_toolViewActions.at(i)); + addList.append(m_toolViewActions.tqat(i)); } else addList.append(m_toolMenu); @@ -146,7 +146,7 @@ void GUIClient::addToolView(KMDI::ToolViewAccessor* mtva) cfg->setGroup( _grp ); KAction *a=new ToggleToolViewAction(i18n("Show %1").arg(mtva->wrappedWidget()->caption()), - /*TQString::null*/sc,dynamic_cast<KDockWidget*>(mtva->wrapperWidget()), + /*TQString::null*/sc,tqt_dynamic_cast<KDockWidget*>(mtva->wrapperWidget()), m_mdiMainFrm,actionCollection(), aname.latin1() ); ((ToggleToolViewAction*)a)->setCheckedState(TQString(i18n("Hide %1").arg(mtva->wrappedWidget()->caption()))); diff --git a/kmdi/kmdi/mainwindow.cpp b/kmdi/kmdi/mainwindow.cpp index 26044879e..ac45fc3a5 100644 --- a/kmdi/kmdi/mainwindow.cpp +++ b/kmdi/kmdi/mainwindow.cpp @@ -327,7 +327,7 @@ void MainWindow::setToolViewStyle(int flag) bool toolviewExists = false; TQMap<TQWidget*,KMDI::ToolViewAccessor*>::Iterator it; for (it = m_toolViews->begin(); it != m_toolViews->end(); ++it) { - KDockWidget *dockWidget = dynamic_cast<KDockWidget*>(it.data()->wrapperWidget()); + KDockWidget *dockWidget = tqt_dynamic_cast<KDockWidget*>(it.data()->wrapperWidget()); if (dockWidget) { if (flag == KMDI::IconOnly) { @@ -373,7 +373,7 @@ void MainWindow::dockToolViewsIntoContainers(TQPtrList<KDockWidget>& widgetsToRe void MainWindow::findToolViewsDockedToMain(TQPtrList<KDockWidget>* list,KDockWidget::DockPosition dprtmw) { KDockWidget *mainDock=getMainDockWidget(); if (mainDock->parentDockTabGroup()) { - mainDock=dynamic_cast<KDockWidget*>(mainDock->parentDockTabGroup()->parent()); + mainDock=tqt_dynamic_cast<KDockWidget*>(mainDock->parentDockTabGroup()->parent()); // FIXME: will likely crash below due to unchecked cast } @@ -384,7 +384,7 @@ void MainWindow::findToolViewsDockedToMain(TQPtrList<KDockWidget>* list,KDockWid } if (widget) { - KDockTabGroup *tg=dynamic_cast<KDockTabGroup*>(widget-> + KDockTabGroup *tg=tqt_dynamic_cast<KDockTabGroup*>(widget-> getWidget()); if (tg) { kdDebug(760)<<"KDockTabGroup found"<<endl; diff --git a/kmdi/kmdi/toolviewaccessor.cpp b/kmdi/kmdi/toolviewaccessor.cpp index 2ff4f972a..0a35ba25f 100644 --- a/kmdi/kmdi/toolviewaccessor.cpp +++ b/kmdi/kmdi/toolviewaccessor.cpp @@ -37,7 +37,7 @@ ToolViewAccessor::ToolViewAccessor( KMDI::MainWindow *parent, TQWidget *widgetTo mdiMainFrm=parent; d=new KMDIPrivate::ToolViewAccessorPrivate(); if (widgetToWrap->inherits("KDockWidget")) { - d->widgetContainer=dynamic_cast<KDockWidget*>(widgetToWrap); + d->widgetContainer=tqt_dynamic_cast<KDockWidget*>(widgetToWrap); d->widget=d->widgetContainer->getWidget(); } else { d->widget=widgetToWrap; diff --git a/kmdi/kmdidockcontainer.cpp b/kmdi/kmdidockcontainer.cpp index 8198541fe..9720c5214 100644 --- a/kmdi/kmdidockcontainer.cpp +++ b/kmdi/kmdidockcontainer.cpp @@ -252,7 +252,7 @@ bool KMdiDockContainer::eventFilter( TQObject *obj, TQEvent *event ) { case TQEvent::MouseButtonPress: { - KMultiTabBarTab* kmtbTab = dynamic_cast<KMultiTabBarTab*>( obj ); + KMultiTabBarTab* kmtbTab = tqt_dynamic_cast<KMultiTabBarTab*>( obj ); if ( !kmtbTab ) { kdDebug(760) << k_funcinfo << "Got a mouse button press but we have no tab" << endl; @@ -332,7 +332,7 @@ void KMdiDockContainer::showWidget( KDockWidget *w ) void KMdiDockContainer::changeOverlapMode() { - const KDockButton_Private * btn = dynamic_cast<const KDockButton_Private*>( sender() ); + const KDockButton_Private * btn = tqt_dynamic_cast<const KDockButton_Private*>( sender() ); if ( !btn ) return ; @@ -794,7 +794,7 @@ void KMdiDockContainer::toggle() kdDebug( 760 ) << k_funcinfo << "lowering tab" << endl; m_tb->setTab( oldtab, false ); tabClicked( oldtab ); - KMdiMainFrm *mainFrm = dynamic_cast<KMdiMainFrm*>( m_mainWin ); + KMdiMainFrm *mainFrm = tqt_dynamic_cast<KMdiMainFrm*>( m_mainWin ); if ( mainFrm && mainFrm->activeWindow() ) mainFrm->activeWindow()->setFocus(); } @@ -826,7 +826,7 @@ void KMdiDockContainer::prevToolView() if ( pos < 0 ) pos = tabs->count() - 1; - KMultiTabBarTab *tab = tabs->at( pos ); + KMultiTabBarTab *tab = tabs->tqat( pos ); if ( !tab ) return ; //can never happen here, but who knows @@ -847,7 +847,7 @@ void KMdiDockContainer::nextToolView() if ( pos >= ( int ) tabs->count() ) pos = 0; - KMultiTabBarTab *tab = tabs->at( pos ); + KMultiTabBarTab *tab = tabs->tqat( pos ); if ( !tab ) return ; //can never happen here, but who knows diff --git a/kmdi/kmdiguiclient.cpp b/kmdi/kmdiguiclient.cpp index cebeafc4f..a34df98f6 100644 --- a/kmdi/kmdiguiclient.cpp +++ b/kmdi/kmdiguiclient.cpp @@ -174,7 +174,7 @@ KMDIGUIClient::~KMDIGUIClient() // actionCollection()->writeShortcutSettings( "KMDI Shortcuts", kapp->config() ); for ( uint i = 0;i < m_toolViewActions.count();i++ ) - disconnect( m_toolViewActions.at( i ), 0, this, 0 ); + disconnect( m_toolViewActions.tqat( i ), 0, this, 0 ); m_toolViewActions.setAutoDelete( false ); m_toolViewActions.clear(); @@ -230,7 +230,7 @@ void KMDIGUIClient::setupActions() TQPtrList<KAction> addList; if ( m_toolViewActions.count() < 3 ) for ( uint i = 0;i < m_toolViewActions.count();i++ ) - addList.append( m_toolViewActions.at( i ) ); + addList.append( m_toolViewActions.tqat( i ) ); else addList.append( m_toolMenu ); if ( m_mdiMode == KMdi::IDEAlMode ) @@ -258,7 +258,7 @@ void KMDIGUIClient::addToolView( KMdiToolViewAccessor* mtva ) sc = KShortcut( cfg->readEntry( aname, "" ) ); cfg->setGroup( _grp ); KAction *a = new ToggleToolViewAction( i18n( "Show %1" ).arg( mtva->wrappedWidget() ->caption() ), - /*TQString::null*/sc, dynamic_cast<KDockWidget*>( mtva->wrapperWidget() ), + /*TQString::null*/sc, tqt_dynamic_cast<KDockWidget*>( mtva->wrapperWidget() ), m_mdiMainFrm, actionCollection(), aname.latin1() ); #if KDE_IS_VERSION(3,2,90) diff --git a/kmdi/kmdimainfrm.cpp b/kmdi/kmdimainfrm.cpp index fe6c374f1..487f9c2b2 100644 --- a/kmdi/kmdimainfrm.cpp +++ b/kmdi/kmdimainfrm.cpp @@ -1777,7 +1777,7 @@ void KMdiMainFrm::setToolviewStyle( int flag ) TQMap<TQWidget*, KMdiToolViewAccessor*>::Iterator it; for ( it = m_pToolViews->begin(); it != m_pToolViews->end(); ++it ) { - KDockWidget *dockWidget = dynamic_cast<KDockWidget*>( it.data()->wrapperWidget() ); + KDockWidget *dockWidget = tqt_dynamic_cast<KDockWidget*>( it.data()->wrapperWidget() ); if ( dockWidget ) { switch ( flag ) @@ -1886,7 +1886,7 @@ void KMdiMainFrm::findToolViewsDockedToMain( TQPtrList<KDockWidget>* list, KDock KDockWidget* mainDock = getMainDockWidget(); if ( mainDock->parentDockTabGroup() ) { - mainDock = dynamic_cast<KDockWidget*>( mainDock->parentDockTabGroup()->parent() ); + mainDock = tqt_dynamic_cast<KDockWidget*>( mainDock->parentDockTabGroup()->parent() ); // FIXME: will likely crash below due to unchecked cast } @@ -1903,7 +1903,7 @@ void KMdiMainFrm::findToolViewsDockedToMain( TQPtrList<KDockWidget>* list, KDock if ( widget ) { - KDockTabGroup* tg = dynamic_cast<KDockTabGroup*>( widget->getWidget() ); + KDockTabGroup* tg = tqt_dynamic_cast<KDockTabGroup*>( widget->getWidget() ); if ( tg ) { kdDebug(760) << k_funcinfo << "KDockTabGroup found" << endl; @@ -2118,7 +2118,7 @@ void KMdiMainFrm::finishIDEAlMode( bool full ) TQStringList KMdiMainFrm::prepareIdealToTabs( KDockWidget* container ) { - KDockContainer * pDW = dynamic_cast<KDockContainer*>( container->getWidget() ); + KDockContainer * pDW = tqt_dynamic_cast<KDockContainer*>( container->getWidget() ); TQStringList widgetNames = ( ( KMdiDockContainer* ) pDW ) ->containedWidgets(); for ( TQStringList::iterator it = widgetNames.begin();it != widgetNames.end();++it ) { @@ -2733,7 +2733,7 @@ void KMdiMainFrm::windowMenuItemActivated( int id ) if ( id < 100 ) return ; id -= 100; - KMdiChildView *pView = m_pDocumentViews->at( id ); + KMdiChildView *pView = m_pDocumentViews->tqat( id ); if ( !pView ) return ; if ( pView->isMinimized() ) @@ -2759,7 +2759,7 @@ void KMdiMainFrm::dockMenuItemActivated( int id ) if ( id < 100 ) return ; id -= 100; - KMdiChildView *pView = m_pDocumentViews->at( id ); + KMdiChildView *pView = m_pDocumentViews->tqat( id ); if ( !pView ) return ; if ( pView->isMinimized() ) diff --git a/kmdi/kmditoolviewaccessor.cpp b/kmdi/kmditoolviewaccessor.cpp index 954ca3e4a..f12caba05 100644 --- a/kmdi/kmditoolviewaccessor.cpp +++ b/kmdi/kmditoolviewaccessor.cpp @@ -36,7 +36,7 @@ KMdiToolViewAccessor::KMdiToolViewAccessor( KMdiMainFrm *parent, TQWidget *widge d = new KMdiToolViewAccessorPrivate(); if ( widgetToWrap->inherits( "KDockWidget" ) ) { - d->widgetContainer = dynamic_cast<KDockWidget*>( widgetToWrap ); + d->widgetContainer = tqt_dynamic_cast<KDockWidget*>( widgetToWrap ); d->widget = d->widgetContainer->getWidget(); } else |