diff options
Diffstat (limited to 'lib/compatibility/kmdi')
27 files changed, 63 insertions, 63 deletions
diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp b/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp index 38af2a94..0e63ed8a 100644 --- a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp +++ b/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp @@ -358,7 +358,7 @@ void KDockWidgetHeader::addButton(KDockButton_Private* btn) { btn->reparent(this,TQPoint(0,0)); } btn->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height()); - if (!d->btns.tqcontainsRef(btn)) d->btns.append(btn); + if (!d->btns.containsRef(btn)) d->btns.append(btn); btn->show(); @@ -386,7 +386,7 @@ void KDockWidgetHeader::addButton(KDockButton_Private* btn) { void KDockWidgetHeader::removeButton(KDockButton_Private* btn) { if (btn->parentWidget()==this) { - if (d->btns.tqcontainsRef(btn)) d->btns.removeRef(btn); + if (d->btns.containsRef(btn)) d->btns.removeRef(btn); delete btn; } } @@ -1841,12 +1841,12 @@ KDockWidget* KDockManager::findDockWidgetAt( const TQPoint& pos ) } w = p; } - if ( qt_tqfind_obj_child( TQT_TQOBJECT(w), "KDockSplitter", "_dock_split_" ) ) return 0L; - if ( qt_tqfind_obj_child( TQT_TQOBJECT(w), "KDockTabGroup", "_dock_tab" ) ) return 0L; + if ( qt_find_obj_child( TQT_TQOBJECT(w), "KDockSplitter", "_dock_split_" ) ) return 0L; + if ( qt_find_obj_child( TQT_TQOBJECT(w), "KDockTabGroup", "_dock_tab" ) ) return 0L; if (dynamic_cast<KDockContainer*>(w)) return 0L; if (!childDockWidgetList) return 0L; - if ( childDockWidgetList->tqfind(w) != -1 ) return 0L; + if ( childDockWidgetList->find(w) != -1 ) return 0L; if ( currentDragWidget->isGroup && ((KDockWidget*)w)->parentDockTabGroup() ) return 0L; KDockWidget* www = (KDockWidget*)w; @@ -1892,7 +1892,7 @@ void KDockManager::findChildDockWidget( TQWidget*& ww, const TQWidget* p, const while ( it.current() ) { if ( it.current()->isWidgetType() ) { w = (TQWidget*)it.current(); - if ( w->isVisible() && w->tqgeometry().tqcontains(pos) ) { + if ( w->isVisible() && w->tqgeometry().contains(pos) ) { if ( w->inherits("KDockWidget") ) ww = w; findChildDockWidget( ww, w, w->mapFromParent(pos) ); return; @@ -2176,8 +2176,8 @@ void KDockManager::writeConfig(TQDomElement &base) TQStringList::Iterator nListIt=nList.begin(); while ( nListIt!=nList.end() ) { KDockWidget *obj = getDockWidgetFromName( *nListIt); - if ((obj->isGroup && (!obj->d->isContainer)) && (nameList.tqfind( obj->firstName.latin1() ) == -1 - || nameList.tqfind(obj->lastName.latin1()) == -1)) { + if ((obj->isGroup && (!obj->d->isContainer)) && (nameList.find( obj->firstName.latin1() ) == -1 + || nameList.find(obj->lastName.latin1()) == -1)) { // Skip until tqchildren are saved (why?) ++nListIt; // nList.next(); @@ -2524,7 +2524,7 @@ void KDockManager::writeConfig( KConfig* c, TQString group ) } /*************************************************************************************************/ if ( obj->isGroup ){ - if ( (findList.tqfind( obj->firstName ) != findList.end()) && (findList.tqfind( obj->lastName ) != findList.end() )){ + if ( (findList.find( obj->firstName ) != findList.end()) && (findList.find( obj->lastName ) != findList.end() )){ c->writeEntry( cname+":type", "GROUP"); if ( !obj->tqparent() ){ @@ -2547,9 +2547,9 @@ void KDockManager::writeConfig( KConfig* c, TQString group ) } else { /*************************************************************************************************/ //debug(" Skip %s", nList.current()); - //if ( findList.tqfind( obj->firstName ) == -1 ) + //if ( findList.find( obj->firstName ) == -1 ) // debug(" ? Not found %s", obj->firstName); - //if ( findList.tqfind( obj->lastName ) == -1 ) + //if ( findList.find( obj->lastName ) == -1 ) // debug(" ? Not found %s", obj->lastName); ++nListIt; // if ( !nList.current() ) nList.first(); diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp b/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp index 063c76ba..63a860e7 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp +++ b/lib/compatibility/kmdi/qextmdi/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::tqfind* moves current() to the found item + //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; @@ -790,4 +790,4 @@ void KMdiChildArea::getCaptionColors( const TQPalette& /*pal*/, TQColor& activeB inactiveFG = KGlobalSettings::inactiveTextColor(); } -// kate: space-indent off; tqreplace-tabs off; tab-width 4; indent-mode csands; +// kate: space-indent off; replace-tabs off; tab-width 4; indent-mode csands; diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp b/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp index ed26a9e5..b57b93a8 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp +++ b/lib/compatibility/kmdi/qextmdi/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 ); @@ -1406,4 +1406,4 @@ TQRect KMdiChildFrm::mdiAreaContentsRect() const } } -// kate: indent-mode csands; tab-width 4; space-indent off; tqreplace-tabs off; +// kate: indent-mode csands; tab-width 4; space-indent off; replace-tabs off; diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.h b/lib/compatibility/kmdi/qextmdi/kmdichildfrm.h index 21ea562f..c808e088 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.h +++ b/lib/compatibility/kmdi/qextmdi/kmdichildfrm.h @@ -445,4 +445,4 @@ private: #endif //_KMDICHILDFRM_H_ -// kate: space-indent off; tqreplace-tabs off; tab-width 4; indent-mode csands; +// kate: space-indent off; replace-tabs off; tab-width 4; indent-mode csands; diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.cpp b/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.cpp index 744ceb19..3bebc235 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.cpp @@ -146,7 +146,7 @@ void KMdiChildFrmCaption::mouseMoveEvent( TQMouseEvent *e ) TQPoint relMousePosInChildArea = m_pParent->m_pManager->mapFromGlobal( e->globalPos() ); // mouse out of child area? stop child frame dragging - if ( !TQT_TQRECT_OBJECT(m_pParent->m_pManager->rect()).tqcontains( relMousePosInChildArea ) ) + if ( !TQT_TQRECT_OBJECT(m_pParent->m_pManager->rect()).contains( relMousePosInChildArea ) ) { if ( relMousePosInChildArea.x() < 0 ) relMousePosInChildArea.rx() = 0; @@ -319,4 +319,4 @@ void KMdiChildFrmCaption::slot_moveViaSystemMenu() m_offset = mapFromGlobal( TQCursor::pos() ); } -// kate: space-indent off; tqreplace-tabs off; indent-mode csands; tab-width 4; +// kate: space-indent off; replace-tabs off; indent-mode csands; tab-width 4; diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.h b/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.h index b3c8d88a..fde6d3b7 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.h +++ b/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.h @@ -143,4 +143,4 @@ private: #endif //_KMDICAPTION_H_ -// kate: space-indent off; tqreplace-tabs off; indent-mode csands; tab-width 4; +// kate: space-indent off; replace-tabs off; indent-mode csands; tab-width 4; diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildview.cpp b/lib/compatibility/kmdi/qextmdi/kmdichildview.cpp index ae39849c..94670ce8 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildview.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdichildview.cpp @@ -545,7 +545,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 @@ -770,4 +770,4 @@ void KMdiChildView::raise() TQWidget::raise(); } -// kate: space-indent off; tqreplace-tabs off; indent-mode csands; tab-width 4; +// kate: space-indent off; replace-tabs off; indent-mode csands; tab-width 4; diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildview.h b/lib/compatibility/kmdi/qextmdi/kmdichildview.h index e7d04768..1530a155 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildview.h +++ b/lib/compatibility/kmdi/qextmdi/kmdichildview.h @@ -78,7 +78,7 @@ class KMdiChildViewPrivate; * // captions * TQString shortName = pNewView->caption(); * int length = shortName.length(); - * shortName = shortName.right(length - (shortName.tqfindRev('/') +1)); + * shortName = shortName.right(length - (shortName.findRev('/') +1)); * pMDICover->setTabCaption( shortName); * pMDICover->setCaption(pNewView->caption()); * @@ -613,4 +613,4 @@ inline KMdiChildFrm *KMdiChildView::mdiParent() const #endif //_KMDICHILDVIEW_H_ -// kate: space-indent off; tqreplace-tabs off; indent-mode csands; tab-width 4; +// kate: space-indent off; replace-tabs off; indent-mode csands; tab-width 4; diff --git a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp index 28b42bc8..3041834e 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp +++ b/lib/compatibility/kmdi/qextmdi/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 ) ) { ( static_cast<KDockWidgetHeader*>( w->getHeader()->qt_cast( "KDockWidgetHeader" ) ) )->removeButton( m_overlapButtons[w] ); m_overlapButtons.remove( w ); @@ -185,7 +185,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 ) { @@ -319,7 +319,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 ]; @@ -366,7 +366,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; @@ -382,7 +382,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 ) ) { ( static_cast<KDockWidgetHeader*>( w->getHeader() ->qt_cast( "KDockWidgetHeader" ) ) )->removeButton( m_overlapButtons[ w ] ); m_overlapButtons.remove( w ); @@ -398,7 +398,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 ]; @@ -815,7 +815,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 ; @@ -836,7 +836,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 ; @@ -853,4 +853,4 @@ void KMdiDockContainer::nextToolView() tabClicked( tab->id() ); } -// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands; +// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands; diff --git a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.h b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.h index eb984d0d..1767922c 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.h +++ b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.h @@ -165,4 +165,4 @@ signals: #endif -// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands; +// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands; diff --git a/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.cpp b/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.cpp index c595700e..9259a34b 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.cpp @@ -148,5 +148,5 @@ KMdi::TabWidgetVisibility KMdiDocumentViewTabWidget::tabWidgetVisibility( ) #include "kmdidocumentviewtabwidget.moc" #endif -// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands; +// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands; diff --git a/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.h b/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.h index f3d3346b..10a9a182 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.h +++ b/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.h @@ -120,5 +120,5 @@ signals: #endif -// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands; +// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands; diff --git a/lib/compatibility/kmdi/qextmdi/kmdifocuslist.cpp b/lib/compatibility/kmdi/qextmdi/kmdifocuslist.cpp index ff9ff0b4..cc6b8535 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdifocuslist.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdifocuslist.cpp @@ -67,4 +67,4 @@ void KMdiFocusList::objectHasBeenDestroyed( TQObject * o ) m_list.remove( w ); } -// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands; +// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands; diff --git a/lib/compatibility/kmdi/qextmdi/kmdifocuslist.h b/lib/compatibility/kmdi/qextmdi/kmdifocuslist.h index a816fc4f..68db1656 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdifocuslist.h +++ b/lib/compatibility/kmdi/qextmdi/kmdifocuslist.h @@ -40,4 +40,4 @@ private: }; #endif -// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands; +// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands; diff --git a/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp b/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp index bc3d764a..54b885d5 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp @@ -317,4 +317,4 @@ void KMDIGUIClient::mdiModeHasBeenChangedTo( KMdi::MdiMode mode ) } -// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands; +// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands; diff --git a/lib/compatibility/kmdi/qextmdi/kmdiguiclient.h b/lib/compatibility/kmdi/qextmdi/kmdiguiclient.h index 13491db3..6f784992 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdiguiclient.h +++ b/lib/compatibility/kmdi/qextmdi/kmdiguiclient.h @@ -145,4 +145,4 @@ protected slots: } #endif -// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands; +// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands; diff --git a/lib/compatibility/kmdi/qextmdi/kmdiiterator.h b/lib/compatibility/kmdi/qextmdi/kmdiiterator.h index 52ae39dd..75fb980a 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdiiterator.h +++ b/lib/compatibility/kmdi/qextmdi/kmdiiterator.h @@ -47,5 +47,5 @@ protected: ; #endif // _KMDIITERATOR_H_ -// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands; +// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands; diff --git a/lib/compatibility/kmdi/qextmdi/kmdilistiterator.h b/lib/compatibility/kmdi/qextmdi/kmdilistiterator.h index 5236b389..f65872fe 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdilistiterator.h +++ b/lib/compatibility/kmdi/qextmdi/kmdilistiterator.h @@ -57,5 +57,5 @@ private: }; #endif // _KMDILISTITERATOR_H_ -// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands; +// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands; diff --git a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp b/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp index 259b814f..92624120 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp @@ -557,7 +557,7 @@ KMdiToolViewAccessor *KMdiMainFrm::createToolWindow() void KMdiMainFrm::deleteToolWindow( TQWidget* pWnd ) { - if ( m_pToolViews->tqcontains( pWnd ) ) + if ( m_pToolViews->contains( pWnd ) ) deleteToolWindow( ( *m_pToolViews ) [ pWnd ] ); } @@ -963,13 +963,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; @@ -2361,7 +2361,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() ) { @@ -2394,7 +2394,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; @@ -2938,4 +2938,4 @@ KTabWidget * KMdiMainFrm::tabWidget() const #include "kmdimainfrm.moc" // vim: ts=2 sw=2 et -// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands; +// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands; diff --git a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.h b/lib/compatibility/kmdi/qextmdi/kmdimainfrm.h index 7200c941..1d4842d7 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.h +++ b/lib/compatibility/kmdi/qextmdi/kmdimainfrm.h @@ -870,4 +870,4 @@ signals: #endif //_KMDIMAINFRM_H_ -// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands; +// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands; diff --git a/lib/compatibility/kmdi/qextmdi/kmdinulliterator.h b/lib/compatibility/kmdi/qextmdi/kmdinulliterator.h index 3e0e1268..be75ebe8 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdinulliterator.h +++ b/lib/compatibility/kmdi/qextmdi/kmdinulliterator.h @@ -45,5 +45,5 @@ public: }; #endif // _KMDINULLITERATOR_H_ -// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands; +// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands; diff --git a/lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp b/lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp index 192717bb..eaf15892 100644 --- a/lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp @@ -387,4 +387,4 @@ void KMdiTaskBar::resizeEvent( TQResizeEvent* rse ) KToolBar::resizeEvent( rse ); } -// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands; +// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands; diff --git a/lib/compatibility/kmdi/qextmdi/kmditaskbar.h b/lib/compatibility/kmdi/qextmdi/kmditaskbar.h index e4ec2f8b..7c7891a0 100644 --- a/lib/compatibility/kmdi/qextmdi/kmditaskbar.h +++ b/lib/compatibility/kmdi/qextmdi/kmditaskbar.h @@ -217,5 +217,5 @@ private: }; #endif //_KMDITASKBAR_H_ -// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands; +// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands; diff --git a/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.cpp b/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.cpp index a2dd531a..c43fdf53 100644 --- a/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.cpp @@ -265,5 +265,5 @@ void KMdiToolViewAccessor::show() #ifndef NO_INCLUDE_TQMOCFILES #include "kmditoolviewaccessor.moc" #endif -// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands; +// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands; diff --git a/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.h b/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.h index bb21bbcb..f4dd40d9 100644 --- a/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.h +++ b/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.h @@ -83,5 +83,5 @@ protected: #endif //_KMDITOOLVIEWACCESSOR_H_ -// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands; +// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands; diff --git a/lib/compatibility/kmdi/qextmdi/ktabbar.cpp b/lib/compatibility/kmdi/qextmdi/ktabbar.cpp index 9c7075cc..87701e9c 100644 --- a/lib/compatibility/kmdi/qextmdi/ktabbar.cpp +++ b/lib/compatibility/kmdi/qextmdi/ktabbar.cpp @@ -76,7 +76,7 @@ void KTabBar::setTabEnabled( int id, bool enabled ) if ( t->isEnabled() ) { r = r.unite( t->rect() ); - tablist->append( tablist->take( tablist->tqfindRef( t ) ) ); + tablist->append( tablist->take( tablist->findRef( t ) ) ); emit selected( t->identifier() ); } } @@ -181,7 +181,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e ) } rect.moveLeft( t->rect().left() + 2 + xoff ); rect.moveTop( t->rect().center().y()-pixmap.height()/2 + yoff ); - if ( rect.tqcontains( e->pos() ) ) { + if ( rect.contains( e->pos() ) ) { if ( mHoverCloseButton ) { if ( mHoverCloseButtonTab == t ) return; @@ -299,7 +299,7 @@ void KTabBar::setTabColor( int id, const TQColor& color ) const TQColor &KTabBar::tabColor( int id ) const { - if ( mTabColors.tqcontains( id ) ) + if ( mTabColors.contains( id ) ) return mTabColors[id]; return tqcolorGroup().foreground(); @@ -311,7 +311,7 @@ int KTabBar::insertTab( TQTab *t, int index ) if ( mTabCloseActivatePrevious && count() > 2 ) { TQPtrList<TQTab> *tablist = tabList(); - tablist->insert( count()-2, tablist->take( tablist->tqfindRef( t ) ) ); + tablist->insert( count()-2, tablist->take( tablist->findRef( t ) ) ); } return res; @@ -358,7 +358,7 @@ void KTabBar::paintLabel( TQPainter *p, const TQRect& br, flags |= TQStyle::Style_HasFocus; TQColorGroup cg( tqcolorGroup() ); - if ( mTabColors.tqcontains( t->identifier() ) ) + if ( mTabColors.contains( t->identifier() ) ) cg.setColor( TQColorGroup::Foreground, mTabColors[t->identifier()] ); tqstyle().tqdrawControl( TQStyle::CE_TabBarLabel, p, this, r, diff --git a/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp b/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp index eab93b48..b12152b4 100644 --- a/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp +++ b/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp @@ -284,7 +284,7 @@ void KTabWidget::updateTab( int index ) setTabToolTip( page( index ), title ); title = KStringHandler::rsqueeze( title, d->m_CurrentMaxLength ).leftJustify( d->m_minLength, ' ' ); - title.tqreplace( '&', "&&" ); + title.replace( '&', "&&" ); if ( TQTabWidget::label( index ) != title ) TQTabWidget::setTabLabel( page( index ), title ); |