diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
commit | 6e21bc798ba1066147d69dcc2d5c222ffafb9a90 (patch) | |
tree | 36613dfe2f86f8ccb96a30f3880507341228eeb0 /kmdi | |
parent | 1e9fe867b0def399c63c42f35e83c3575e91ff83 (diff) | |
download | tdelibs-6e21bc798ba1066147d69dcc2d5c222ffafb9a90.tar.gz tdelibs-6e21bc798ba1066147d69dcc2d5c222ffafb9a90.zip |
rename the following methods:
tqfind find
tqreplace replace
tqcontains contains
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmdi')
-rw-r--r-- | kmdi/kmdi/dockcontainer.cpp | 16 | ||||
-rw-r--r-- | kmdi/kmdi/mainwindow.cpp | 2 | ||||
-rw-r--r-- | kmdi/kmdichildarea.cpp | 6 | ||||
-rw-r--r-- | kmdi/kmdichildfrm.cpp | 4 | ||||
-rw-r--r-- | kmdi/kmdichildview.cpp | 2 | ||||
-rw-r--r-- | kmdi/kmdidockcontainer.cpp | 16 | ||||
-rw-r--r-- | kmdi/kmdimainfrm.cpp | 10 |
7 files changed, 28 insertions, 28 deletions
diff --git a/kmdi/kmdi/dockcontainer.cpp b/kmdi/kmdi/dockcontainer.cpp index 6ac025c7f..19b013d6b 100644 --- a/kmdi/kmdi/dockcontainer.cpp +++ b/kmdi/kmdi/dockcontainer.cpp @@ -118,7 +118,7 @@ DockContainer::~DockContainer() while (m_map.count()) { it = m_map.begin(); KDockWidget *w=it.key(); - if (m_overlapButtons.tqcontains(w)) { + if (m_overlapButtons.contains(w)) { (::tqqt_cast<KDockWidgetHeader*>(w->getHeader()))->removeButton(m_overlapButtons[w]); m_overlapButtons.remove(w); } @@ -164,7 +164,7 @@ void DockContainer::insertWidget (KDockWidget *dwdg, TQPixmap pixmap, const TQSt { KDockWidget* w = (KDockWidget*) dwdg; int tab; - bool alreadyThere=m_map.tqcontains(w); + bool alreadyThere=m_map.contains(w); if (alreadyThere) { @@ -296,7 +296,7 @@ bool DockContainer::eventFilter( TQObject *obj, TQEvent *event ) } void DockContainer::showWidget(KDockWidget *w) { - if (!m_map.tqcontains(w)) return; + if (!m_map.contains(w)) return; kdDebug()<<"KMDI::DockContainer::<showWidget"<<endl; int id=m_map[w]; @@ -341,7 +341,7 @@ void DockContainer::hideIfNeeded() { void DockContainer::removeWidget(KDockWidget* dwdg) { KDockWidget* w = (KDockWidget*) dwdg; - if (!m_map.tqcontains(w)) return; + if (!m_map.contains(w)) return; int id=m_map[w]; if (m_tb->isTabRaised(id)) { //why do we hide the tab if we're just going @@ -354,7 +354,7 @@ void DockContainer::removeWidget(KDockWidget* dwdg) m_ws->removeWidget(w); m_map.remove(w); m_revMap.remove(id); - if (m_overlapButtons.tqcontains(w)) { + if (m_overlapButtons.contains(w)) { (::tqqt_cast<KDockWidgetHeader*>(w->getHeader()))->removeButton(m_overlapButtons[w]); m_overlapButtons.remove(w); } @@ -370,7 +370,7 @@ void DockContainer::undockWidget(KDockWidget *dwdg) { KDockWidget* w = (KDockWidget*) dwdg; - if (!m_map.tqcontains(w)) + if (!m_map.contains(w)) return; int id=m_map[w]; @@ -629,7 +629,7 @@ void DockContainer::toggle() { void DockContainer::prevToolView() { TQPtrList<KMultiTabBarTab>* tabs=m_tb->tabs(); - int pos=tabs->tqfindRef(m_tb->tab(oldtab)); + int pos=tabs->findRef(m_tb->tab(oldtab)); if (pos==-1) return; pos--; if (pos<0) pos=tabs->count()-1; @@ -641,7 +641,7 @@ void DockContainer::prevToolView() { void DockContainer::nextToolView() { TQPtrList<KMultiTabBarTab>* tabs=m_tb->tabs(); - int pos=tabs->tqfindRef(m_tb->tab(oldtab)); + int pos=tabs->findRef(m_tb->tab(oldtab)); if (pos==-1) return; pos++; if (pos>=(int)tabs->count()) pos=0; diff --git a/kmdi/kmdi/mainwindow.cpp b/kmdi/kmdi/mainwindow.cpp index aea04fa01..eb2382f08 100644 --- a/kmdi/kmdi/mainwindow.cpp +++ b/kmdi/kmdi/mainwindow.cpp @@ -302,7 +302,7 @@ void MainWindow::deleteToolWindow( TQWidget* pWnd) if (!pWnd) return; - if (m_toolViews->tqcontains(pWnd)) { + if (m_toolViews->contains(pWnd)) { deleteToolWindow((*m_toolViews)[pWnd]); } } diff --git a/kmdi/kmdichildarea.cpp b/kmdi/kmdichildarea.cpp index 3360a0e60..491afc06b 100644 --- a/kmdi/kmdichildarea.cpp +++ b/kmdi/kmdichildarea.cpp @@ -75,11 +75,11 @@ void KMdiChildArea::manageChild( KMdiChildFrm* child, bool show, bool cascade ) KMdiChildFrm* top = topChild(); //remove old references. There can be more than one so we remove them all - if ( m_pZ->tqfindRef( child ) != -1 ) + if ( m_pZ->findRef( child ) != -1 ) { //TQPtrList::find* moves current() to the found item m_pZ->take(); - while ( m_pZ->tqfindNextRef( child ) != -1 ) + while ( m_pZ->findNextRef( child ) != -1 ) m_pZ->take(); } @@ -323,7 +323,7 @@ TQPoint KMdiChildArea::getCascadePoint( int indexOfWindow ) void KMdiChildArea::childMinimized( KMdiChildFrm *minimizedChild, bool wasMaximized ) { //can't find the child in our list, so we don't care. - if ( m_pZ->tqfindRef( minimizedChild ) == -1 ) + if ( m_pZ->findRef( minimizedChild ) == -1 ) { kdDebug( 760 ) << k_funcinfo << "child was minimized but wasn't in our list!" << endl; return; diff --git a/kmdi/kmdichildfrm.cpp b/kmdi/kmdichildfrm.cpp index 63bdc5a24..47bb7b49f 100644 --- a/kmdi/kmdichildfrm.cpp +++ b/kmdi/kmdichildfrm.cpp @@ -842,7 +842,7 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset ) { // for each found object... TQWidget * widg = ( TQWidget* ) obj; ++it; - TQ_FocusPolicy* pFocPol = pFocPolDict->tqfind( widg->name() ); // remember the focus policy from before the reparent + TQ_FocusPolicy* pFocPol = pFocPolDict->find( widg->name() ); // remember the focus policy from before the reparent if ( pFocPol ) widg->setFocusPolicy( *pFocPol ); @@ -894,7 +894,7 @@ void KMdiChildFrm::linkChildren( TQDict<TQ_FocusPolicy>* pFocPolDict ) { // for each found object... TQWidget* widg = ( TQWidget* ) obj; ++it; - TQ_FocusPolicy* pFocPol = pFocPolDict->tqfind( widg->name() ); // remember the focus policy from before the reparent + TQ_FocusPolicy* pFocPol = pFocPolDict->find( widg->name() ); // remember the focus policy from before the reparent if ( pFocPol != 0 ) widg->setFocusPolicy( *pFocPol ); diff --git a/kmdi/kmdichildview.cpp b/kmdi/kmdichildview.cpp index 9c1d18c7b..7b626d027 100644 --- a/kmdi/kmdichildview.cpp +++ b/kmdi/kmdichildview.cpp @@ -546,7 +546,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e ) if ( obj->isWidgetType() ) { TQObjectList * list = queryList( TQWIDGET_OBJECT_NAME_STRING ); - if ( list->tqfind( obj ) != -1 ) + if ( list->find( obj ) != -1 ) m_focusedChildWidget = ( TQWidget* ) obj; delete list; // delete the list, not the objects diff --git a/kmdi/kmdidockcontainer.cpp b/kmdi/kmdidockcontainer.cpp index caf335a85..6dc2a5cd0 100644 --- a/kmdi/kmdidockcontainer.cpp +++ b/kmdi/kmdidockcontainer.cpp @@ -138,7 +138,7 @@ KMdiDockContainer::~KMdiDockContainer() { it = m_map.begin(); KDockWidget *w = it.key(); - if ( m_overlapButtons.tqcontains( w ) ) + if ( m_overlapButtons.contains( w ) ) { ( ::tqqt_cast<KDockWidgetHeader*>( w->getHeader() ) )->removeButton( m_overlapButtons[w] ); m_overlapButtons.remove( w ); @@ -188,7 +188,7 @@ void KMdiDockContainer::insertWidget ( KDockWidget *dwdg, TQPixmap pixmap, const kdDebug( 760 ) << k_funcinfo << "Adding a dockwidget to the dock container" << endl; KDockWidget* w = dwdg; int tab; - bool alreadyThere = m_map.tqcontains( w ); + bool alreadyThere = m_map.contains( w ); if ( alreadyThere ) { @@ -322,7 +322,7 @@ bool KMdiDockContainer::eventFilter( TQObject *obj, TQEvent *event ) void KMdiDockContainer::showWidget( KDockWidget *w ) { - if ( !m_map.tqcontains( w ) ) + if ( !m_map.contains( w ) ) return ; int id = m_map[ w ]; @@ -369,7 +369,7 @@ void KMdiDockContainer::hideIfNeeded() void KMdiDockContainer::removeWidget( KDockWidget* dwdg ) { KDockWidget * w = dwdg; - if ( !m_map.tqcontains( w ) ) + if ( !m_map.contains( w ) ) return; //we don't have this widget in our container kdDebug( 760 ) << k_funcinfo << endl; @@ -385,7 +385,7 @@ void KMdiDockContainer::removeWidget( KDockWidget* dwdg ) m_ws->removeWidget( w ); m_map.remove( w ); m_revMap.remove( id ); - if ( m_overlapButtons.tqcontains( w ) ) + if ( m_overlapButtons.contains( w ) ) { ( ::tqqt_cast<KDockWidgetHeader*>( w->getHeader() ) )->removeButton( m_overlapButtons[ w ] ); m_overlapButtons.remove( w ); @@ -401,7 +401,7 @@ void KMdiDockContainer::undockWidget( KDockWidget *dwdg ) { KDockWidget * w = dwdg; - if ( !m_map.tqcontains( w ) ) + if ( !m_map.contains( w ) ) return ; int id = m_map[ w ]; @@ -817,7 +817,7 @@ void KMdiDockContainer::prevToolView() { kdDebug( 760 ) << k_funcinfo << endl; TQPtrList<KMultiTabBarTab>* tabs = m_tb->tabs(); - int pos = tabs->tqfindRef( m_tb->tab( oldtab ) ); + int pos = tabs->findRef( m_tb->tab( oldtab ) ); if ( pos == -1 ) return ; @@ -838,7 +838,7 @@ void KMdiDockContainer::nextToolView() { kdDebug( 760 ) << k_funcinfo << endl; TQPtrList<KMultiTabBarTab>* tabs = m_tb->tabs(); - int pos = tabs->tqfindRef( m_tb->tab( oldtab ) ); + int pos = tabs->findRef( m_tb->tab( oldtab ) ); if ( pos == -1 ) return ; diff --git a/kmdi/kmdimainfrm.cpp b/kmdi/kmdimainfrm.cpp index 36c743bf8..46ba7870f 100644 --- a/kmdi/kmdimainfrm.cpp +++ b/kmdi/kmdimainfrm.cpp @@ -553,7 +553,7 @@ KMdiToolViewAccessor *KMdiMainFrm::createToolWindow() void KMdiMainFrm::deleteToolWindow( TQWidget* pWnd ) { - if ( m_pToolViews->tqcontains( pWnd ) ) + if ( m_pToolViews->contains( pWnd ) ) deleteToolWindow( ( *m_pToolViews ) [ pWnd ] ); } @@ -959,13 +959,13 @@ bool KMdiMainFrm::windowExists( KMdiChildView *pWnd, ExistsAs as ) { if ( ( as == ToolView ) || ( as == AnyView ) ) { - if ( m_pToolViews->tqcontains( pWnd ) ) + if ( m_pToolViews->contains( pWnd ) ) return true; if ( as == ToolView ) return false; } - if ( m_pDocumentViews->tqfindRef( pWnd ) != -1 ) + if ( m_pDocumentViews->findRef( pWnd ) != -1 ) return true; return false; @@ -2357,7 +2357,7 @@ void KMdiMainFrm::activateFirstWin() return ; TQDateTime current = activeWindow() ->getTimeStamp(); - TQMap<TQDateTime, KMdiChildView*>::iterator pos( m.tqfind( current ) ); + TQMap<TQDateTime, KMdiChildView*>::iterator pos( m.find( current ) ); TQMap<TQDateTime, KMdiChildView*>::iterator newPos = pos; if ( pos != m.end() ) { @@ -2390,7 +2390,7 @@ void KMdiMainFrm::activateLastWin() return ; TQDateTime current = activeWindow() ->getTimeStamp(); - TQMap<TQDateTime, KMdiChildView*>::iterator pos( m.tqfind( current ) ); + TQMap<TQDateTime, KMdiChildView*>::iterator pos( m.find( current ) ); if ( pos != m.begin() ) { --pos; |