From 10308be19ef7fa44699562cc75946e7ea1fdf6b9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 7 Jan 2011 03:45:53 +0000 Subject: Revert automated changes Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kmdi/kmdimainfrm.cpp | 130 +++++++++++++++++++++++++-------------------------- 1 file changed, 65 insertions(+), 65 deletions(-) (limited to 'kmdi/kmdimainfrm.cpp') diff --git a/kmdi/kmdimainfrm.cpp b/kmdi/kmdimainfrm.cpp index 1db7b17b1..e62b61cb2 100644 --- a/kmdi/kmdimainfrm.cpp +++ b/kmdi/kmdimainfrm.cpp @@ -136,8 +136,8 @@ public: }; //============ constructor ============// -KMdiMainFrm::KMdiMainFrm( TQWidget* tqparentWidget, const char* name, KMdi::MdiMode mdiMode, WFlags flags ) - : KParts::DockMainWindow( tqparentWidget, name, flags ) +KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMode mdiMode, WFlags flags ) + : KParts::DockMainWindow( parentWidget, name, flags ) , m_mdiMode( KMdi::UndefinedMode ) , m_pMdi( 0L ) , m_pTaskBar( 0L ) @@ -294,7 +294,7 @@ void KMdiMainFrm::setStandardMDIMenuEnabled( bool showModeMenu ) //============ ~KMdiMainFrm ============// KMdiMainFrm::~KMdiMainFrm() { - //save the children first to a list, as removing tqinvalidates our iterator + //save the children first to a list, as removing invalidates our iterator TQValueList children; for ( KMdiChildView * w = m_pDocumentViews->first();w;w = m_pDocumentViews->next() ) children.append( w ); @@ -303,7 +303,7 @@ KMdiMainFrm::~KMdiMainFrm() TQValueListIterator childIt; for ( childIt = children.begin(); childIt != children.end(); ++childIt ) { - closeWindow( *childIt, false ); // without re-tqlayout taskbar! + closeWindow( *childIt, false ); // without re-layout taskbar! } emit lastChildViewClosed(); @@ -391,7 +391,7 @@ void KMdiMainFrm::slot_toggleTaskBar() void KMdiMainFrm::resizeEvent( TQResizeEvent *e ) { - if ( ( m_mdiMode == KMdi::ToplevelMode ) && !tqparentWidget() ) + if ( ( m_mdiMode == KMdi::ToplevelMode ) && !parentWidget() ) { if ( e->oldSize().height() != e->size().height() ) return ; @@ -406,7 +406,7 @@ void KMdiMainFrm::resizeEvent( TQResizeEvent *e ) void KMdiMainFrm::setMinimumSize( int minw, int minh ) { - if ( ( m_mdiMode == KMdi::ToplevelMode ) && !tqparentWidget() ) + if ( ( m_mdiMode == KMdi::ToplevelMode ) && !parentWidget() ) return ; DockMainWindow::setMinimumSize( minw, minh ); } @@ -419,7 +419,7 @@ KMdiChildView* KMdiMainFrm::createWrapper( TQWidget *view, const TQString& name, KMdiChildView* pMDICover = new KMdiChildView( name /*caption*/, 0L /*parent*/, name.latin1() ); - TQBoxLayout* pLayout = new TQHBoxLayout( pMDICover, 0, -1, "tqlayout" ); + TQBoxLayout* pLayout = new TQHBoxLayout( pMDICover, 0, -1, "layout" ); view->reparent( pMDICover, TQPoint( 0, 0 ) ); pLayout->addWidget( view ); // pMDICover->setName(name); @@ -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 ] ); } @@ -582,7 +582,7 @@ KMdiToolViewAccessor *KMdiMainFrm::addToolWindow( TQWidget* pWnd, KDockWidget::D pWnd = pDW; } - TQRect r = pWnd->tqgeometry(); + TQRect r = pWnd->geometry(); KMdiToolViewAccessor *mtva = new KMdiToolViewAccessor( this, pWnd, tabToolTip, ( tabCaption == 0 ) ? pWnd->caption() : tabCaption ); m_pToolViews->insert( tvta, mtva ); @@ -610,7 +610,7 @@ void KMdiMainFrm::attachWindow( KMdiChildView *pWnd, bool bShow, bool bAutomatic TQRect frameGeo = pWnd->frameGeometry(); TQPoint topLeftScreen = pWnd->mapToGlobal( TQPoint( 0, 0 ) ); TQPoint topLeftMdiChildArea = m_pMdi->mapFromGlobal( topLeftScreen ); - TQRect childAreaGeo = m_pMdi->tqgeometry(); + TQRect childAreaGeo = m_pMdi->geometry(); if ( topLeftMdiChildArea.x() < 0 || topLeftMdiChildArea.y() < 0 || ( topLeftMdiChildArea.x() + frameGeo.width() > childAreaGeo.width() ) || ( topLeftMdiChildArea.y() + frameGeo.height() > childAreaGeo.height() ) ) @@ -627,7 +627,7 @@ void KMdiMainFrm::attachWindow( KMdiChildView *pWnd, bool bShow, bool bAutomatic lpC->setClient( pWnd, bAutomaticResize ); lpC->setFocus(); pWnd->youAreAttached( lpC ); - if ( ( m_mdiMode == KMdi::ToplevelMode ) && !tqparentWidget() ) + if ( ( m_mdiMode == KMdi::ToplevelMode ) && !parentWidget() ) { setMinimumHeight( m_oldMainFrmMinHeight ); setMaximumHeight( m_oldMainFrmMaxHeight ); @@ -639,7 +639,7 @@ void KMdiMainFrm::attachWindow( KMdiChildView *pWnd, bool bShow, bool bAutomatic m_pMdi->manageChild( lpC, false, bCascade ); if ( m_pMdi->topChild() && m_pMdi->topChild() ->isMaximized() ) { - TQRect r = lpC->tqgeometry(); + TQRect r = lpC->geometry(); lpC->setGeometry( -lpC->m_pClient->x(), -lpC->m_pClient->y(), m_pMdi->width() + KMDI_CHILDFRM_DOUBLE_BORDER, m_pMdi->height() + lpC->captionHeight() + KMDI_CHILDFRM_SEPARATOR + KMDI_CHILDFRM_DOUBLE_BORDER ); @@ -701,7 +701,7 @@ void KMdiMainFrm::detachWindow( KMdiChildView *pWnd, bool bShow ) #ifdef Q_WS_X11 if ( mdiMode() == KMdi::ToplevelMode ) { - XSetTransientForHint( qt_xdisplay(), pWnd->winId(), tqtopLevelWidget() ->winId() ); + XSetTransientForHint( qt_xdisplay(), pWnd->winId(), topLevelWidget() ->winId() ); } #endif @@ -711,7 +711,7 @@ void KMdiMainFrm::detachWindow( KMdiChildView *pWnd, bool bShow ) #ifdef Q_WS_X11 if ( mdiMode() == KMdi::ToplevelMode ) { - XSetTransientForHint( qt_xdisplay(), pWnd->winId(), tqtopLevelWidget() ->winId() ); + XSetTransientForHint( qt_xdisplay(), pWnd->winId(), topLevelWidget() ->winId() ); } #endif @@ -772,12 +772,12 @@ void KMdiMainFrm::removeWindowFromMdi( KMdiChildView *pWnd ) m_pDockbaseOfTabPage = m_pDockbaseAreaOfDocumentViews; m_pClose->hide(); } - KDockWidget* pDockW = ( KDockWidget* ) pWnd->tqparentWidget(); + KDockWidget* pDockW = ( KDockWidget* ) pWnd->parentWidget(); pWnd->reparent( 0L, TQPoint( 0, 0 ) ); pDockW->setWidget( 0L ); if ( pDockW == m_pDockbaseOfTabPage ) { - TQTabWidget * pTab = ( TQTabWidget* ) pDockW->tqparentWidget() ->tqparentWidget(); + TQTabWidget * pTab = ( TQTabWidget* ) pDockW->parentWidget() ->parentWidget(); int cnt = pTab->count(); m_pDockbaseOfTabPage = ( KDockWidget* ) pTab->page( cnt - 2 ); if ( pDockW == m_pDockbaseOfTabPage ) @@ -825,7 +825,7 @@ void KMdiMainFrm::removeWindowFromMdi( KMdiChildView *pWnd ) } //============== closeWindow ==============// -void KMdiMainFrm::closeWindow( KMdiChildView *pWnd, bool tqlayoutTaskBar ) +void KMdiMainFrm::closeWindow( KMdiChildView *pWnd, bool layoutTaskBar ) { if ( !pWnd ) return ; @@ -836,7 +836,7 @@ void KMdiMainFrm::closeWindow( KMdiChildView *pWnd, bool tqlayoutTaskBar ) if ( m_pTaskBar ) { - m_pTaskBar->removeWinButton( pWnd, tqlayoutTaskBar ); + m_pTaskBar->removeWinButton( pWnd, layoutTaskBar ); } if ( ( m_mdiMode == KMdi::TabPageMode ) || ( m_mdiMode == KMdi::IDEAlMode ) ) @@ -874,12 +874,12 @@ void KMdiMainFrm::closeWindow( KMdiChildView *pWnd, bool tqlayoutTaskBar ) m_pClose->hide(); } #if 0 - KDockWidget* pDockW = ( KDockWidget* ) pWnd->tqparentWidget(); + KDockWidget* pDockW = ( KDockWidget* ) pWnd->parentWidget(); pWnd->reparent( 0L, TQPoint( 0, 0 ) ); pDockW->setWidget( 0L ); if ( pDockW == m_pDockbaseOfTabPage ) { - TQTabWidget * pTab = ( TQTabWidget* ) pDockW->tqparentWidget() ->tqparentWidget(); + TQTabWidget * pTab = ( TQTabWidget* ) pDockW->parentWidget() ->parentWidget(); int cnt = pTab->count(); m_pDockbaseOfTabPage = ( KDockWidget* ) pTab->page( cnt - 2 ); if ( pDockW == m_pDockbaseOfTabPage ) @@ -936,8 +936,8 @@ void KMdiMainFrm::closeWindow( KMdiChildView *pWnd, bool tqlayoutTaskBar ) } } -//================== tqfindWindow =================// -KMdiChildView* KMdiMainFrm::tqfindWindow( const TQString& caption ) +//================== findWindow =================// +KMdiChildView* KMdiMainFrm::findWindow( const TQString& caption ) { TQPtrListIterator it( *m_pDocumentViews ); for ( ; ( *it ); ++it ) @@ -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; @@ -1234,7 +1234,7 @@ bool KMdiMainFrm::eventFilter( TQObject * /*obj*/, TQEvent *e ) */ void KMdiMainFrm::closeAllViews() { - //save the children first to a list, as removing tqinvalidates our iterator + //save the children first to a list, as removing invalidates our iterator TQValueList children; for ( KMdiChildView * w = m_pDocumentViews->first();w;w = m_pDocumentViews->next() ) { @@ -1269,8 +1269,8 @@ void KMdiMainFrm::closeActiveView() m_pCurrentWindow->close(); } -/** tqfind the root dockwidgets and store their tqgeometry */ -void KMdiMainFrm::tqfindRootDockWidgets( TQPtrList* rootDockWidgetList, TQValueList* positionList ) +/** find the root dockwidgets and store their geometry */ +void KMdiMainFrm::findRootDockWidgets( TQPtrList* rootDockWidgetList, TQValueList* positionList ) { //nothing is valid if ( !rootDockWidgetList && !positionList ) @@ -1293,7 +1293,7 @@ void KMdiMainFrm::tqfindRootDockWidgets( TQPtrList* rootDockWidgetL KDockWidget* undockCandidate = 0L; /* pUndockCandidate */ TQWidget* pW = static_cast( ( *it ) ); - // tqfind the oldest ancestor of the current dockwidget that can be undocked + // find the oldest ancestor of the current dockwidget that can be undocked while ( !pW->isTopLevel() ) { if ( ::qt_cast( pW ) || pW->inherits( "KDockWidget_Compat::KDockWidget" ) ) @@ -1302,7 +1302,7 @@ void KMdiMainFrm::tqfindRootDockWidgets( TQPtrList* rootDockWidgetL if ( undockCandidate->enableDocking() != KDockWidget::DockNone ) rootDockWindow = undockCandidate; } - pW = pW->tqparentWidget(); + pW = pW->parentWidget(); } if ( rootDockWindow ) @@ -1353,7 +1353,7 @@ void KMdiMainFrm::switchToToplevelMode() const int frameBorderWidth = 7; // @todo: Can we / do we need to ask the window manager? setUndockPositioningOffset( TQPoint( 0, ( m_pTaskBar ? m_pTaskBar->height() : 0 ) + frameBorderWidth ) ); - // 1.) select the dockwidgets to be undocked and store their tqgeometry + // 1.) select the dockwidgets to be undocked and store their geometry TQPtrList rootDockWidgetList; TQValueList positionList; @@ -1368,7 +1368,7 @@ void KMdiMainFrm::switchToToplevelMode() break; case KMdi::IDEAlMode: finishIDEAlMode(); - tqfindRootDockWidgets( &rootDockWidgetList, &positionList ); + findRootDockWidgets( &rootDockWidgetList, &positionList ); break; default: break; //do nothing @@ -1395,7 +1395,7 @@ void KMdiMainFrm::switchToToplevelMode() setMainDockWidget( m_pDockbaseAreaOfDocumentViews ); } // TQApplication::sendPostedEvents(); //why do we need to empty the event queue? - if ( !tqparentWidget() ) + if ( !parentWidget() ) { //if we don't have a parent widget ( which i expect we wouldn't ) //make sure we take into account the size of the docks provided by @@ -1466,8 +1466,8 @@ void KMdiMainFrm::switchToChildframeMode() if ( m_mdiMode == KMdi::TabPageMode ) { kdDebug(760) << k_funcinfo << "finishing tab page mode" << endl; - // select the dockwidgets to be undocked and store their tqgeometry - tqfindRootDockWidgets( &rootDockWidgetList, &positionList ); + // select the dockwidgets to be undocked and store their geometry + findRootDockWidgets( &rootDockWidgetList, &positionList ); kdDebug(760) << k_funcinfo << "Found " << rootDockWidgetList.count() << " widgets to undock" << endl; // undock all these found oldest ancestors (being KDockWidgets) @@ -1486,8 +1486,8 @@ void KMdiMainFrm::switchToChildframeMode() kdDebug(760) << k_funcinfo << "finishing ideal mode" << endl; finishIDEAlMode( false ); - // select the dockwidgets to be undocked and store their tqgeometry - tqfindRootDockWidgets( &rootDockWidgetList, &positionList ); + // select the dockwidgets to be undocked and store their geometry + findRootDockWidgets( &rootDockWidgetList, &positionList ); kdDebug(760) << k_funcinfo << "Found " << rootDockWidgetList.count() << " widgets to undock" << endl; // undock all these found oldest ancestors (being KDockWidgets) @@ -1556,7 +1556,7 @@ void KMdiMainFrm::switchToChildframeMode() if ( !pView->isToolView() ) pView->show(); } - if ( ( oldMdiMode == KMdi::ToplevelMode ) && !tqparentWidget() ) + if ( ( oldMdiMode == KMdi::ToplevelMode ) && !parentWidget() ) { setMinimumHeight( m_oldMainFrmMinHeight ); setMaximumHeight( m_oldMainFrmMaxHeight ); @@ -1659,10 +1659,10 @@ void KMdiMainFrm::finishTabPageMode() if ( pView->isToolView() ) continue; kdDebug(760) << "KMdiMainFrm::finishTabPageMode: in loop" << endl; - TQSize mins = pView->tqminimumSize(); - TQSize maxs = pView->tqmaximumSize(); + TQSize mins = pView->minimumSize(); + TQSize maxs = pView->maximumSize(); TQSize sz = pView->size(); - TQWidget* pParent = pView->tqparentWidget(); + TQWidget* pParent = pView->parentWidget(); TQPoint p( pParent->mapToGlobal( pParent->pos() ) - pParent->pos() + m_undockPositioningOffset ); m_documentTabWidget->removePage( pView ); pView->reparent( 0, 0, p ); @@ -1688,7 +1688,7 @@ void KMdiMainFrm::finishTabPageMode() void KMdiMainFrm::setupTabbedDocumentViewSpace() { // resize to childframe mode size of the mainwindow if we were in toplevel mode - if ( ( m_mdiMode == KMdi::ToplevelMode ) && !tqparentWidget() ) + if ( ( m_mdiMode == KMdi::ToplevelMode ) && !parentWidget() ) { setMinimumHeight( m_oldMainFrmMinHeight ); setMaximumHeight( m_oldMainFrmMaxHeight ); @@ -1881,7 +1881,7 @@ void KMdiMainFrm::dockToolViewsIntoContainers( TQPtrList& widgetsTo } } -void KMdiMainFrm::tqfindToolViewsDockedToMain( TQPtrList* list, KDockWidget::DockPosition dprtmw ) +void KMdiMainFrm::findToolViewsDockedToMain( TQPtrList* list, KDockWidget::DockPosition dprtmw ) { KDockWidget* mainDock = getMainDockWidget(); if ( mainDock->parentDockTabGroup() ) @@ -1896,7 +1896,7 @@ void KMdiMainFrm::tqfindToolViewsDockedToMain( TQPtrList* list, KDo return; } - KDockWidget* widget = mainDock->tqfindNearestDockWidget( dprtmw ); + KDockWidget* widget = mainDock->findNearestDockWidget( dprtmw ); if ( widget && widget->parentDockTabGroup() ) { widget = static_cast( widget->parentDockTabGroup() ->parent() ); @@ -1933,18 +1933,18 @@ void KMdiMainFrm::setupToolViewsForIDEALMode() if ( mainDock->parentDockTabGroup() ) w = static_cast( mainDock->parentDockTabGroup()->parent() ); - TQPtrList leftRetqparentWidgets; - TQPtrList rightRetqparentWidgets; - TQPtrList bottomRetqparentWidgets; - TQPtrList topRetqparentWidgets; + TQPtrList leftReparentWidgets; + TQPtrList rightReparentWidgets; + TQPtrList bottomReparentWidgets; + TQPtrList topReparentWidgets; if ( mainDock->parentDockTabGroup() ) mainDock = static_cast( mainDock->parentDockTabGroup() ->parent() ); - tqfindToolViewsDockedToMain( &leftRetqparentWidgets, KDockWidget::DockLeft ); - tqfindToolViewsDockedToMain( &rightRetqparentWidgets, KDockWidget::DockRight ); - tqfindToolViewsDockedToMain( &bottomRetqparentWidgets, KDockWidget::DockBottom ); - tqfindToolViewsDockedToMain( &topRetqparentWidgets, KDockWidget::DockTop ); + findToolViewsDockedToMain( &leftReparentWidgets, KDockWidget::DockLeft ); + findToolViewsDockedToMain( &rightReparentWidgets, KDockWidget::DockRight ); + findToolViewsDockedToMain( &bottomReparentWidgets, KDockWidget::DockBottom ); + findToolViewsDockedToMain( &topReparentWidgets, KDockWidget::DockTop ); mainDock->setEnableDocking( KDockWidget::DockNone ); //::DockCorner); mainDock->setDockSite( KDockWidget::DockCorner ); @@ -1996,10 +1996,10 @@ void KMdiMainFrm::setupToolViewsForIDEALMode() m_topContainer->setDockSite( KDockWidget::DockCenter ); m_bottomContainer->setDockSite( KDockWidget::DockCenter ); - dockToolViewsIntoContainers( leftRetqparentWidgets, m_leftContainer ); - dockToolViewsIntoContainers( rightRetqparentWidgets, m_rightContainer ); - dockToolViewsIntoContainers( bottomRetqparentWidgets, m_bottomContainer ); - dockToolViewsIntoContainers( topRetqparentWidgets, m_topContainer ); + dockToolViewsIntoContainers( leftReparentWidgets, m_leftContainer ); + dockToolViewsIntoContainers( rightReparentWidgets, m_rightContainer ); + dockToolViewsIntoContainers( bottomReparentWidgets, m_bottomContainer ); + dockToolViewsIntoContainers( topReparentWidgets, m_topContainer ); dockManager->setSpecialLeftDockContainer( m_leftContainer ); @@ -2075,10 +2075,10 @@ void KMdiMainFrm::finishIDEAlMode( bool full ) KMdiChildView* pView = it.current(); if ( pView->isToolView() ) continue; - TQSize mins = pView->tqminimumSize(); - TQSize maxs = pView->tqmaximumSize(); + TQSize mins = pView->minimumSize(); + TQSize maxs = pView->maximumSize(); TQSize sz = pView->size(); - TQWidget* pParent = pView->tqparentWidget(); + TQWidget* pParent = pView->parentWidget(); TQPoint p( pParent->mapToGlobal( pParent->pos() ) - pParent->pos() + m_undockPositioningOffset ); pView->reparent( 0, 0, p ); pView->reparent( 0, 0, p ); @@ -2086,7 +2086,7 @@ void KMdiMainFrm::finishIDEAlMode( bool full ) pView->setMinimumSize( mins.width(), mins.height() ); pView->setMaximumSize( maxs.width(), maxs.height() ); KDockWidget* pDockW = 0L; - // tqfind the oldest ancestor of the current dockwidget that can be undocked + // find the oldest ancestor of the current dockwidget that can be undocked do { if ( pParent->inherits( "KDockWidget" ) || pParent->inherits( "KDockWidget_Compat::KDockWidget" ) ) @@ -2101,7 +2101,7 @@ void KMdiMainFrm::finishIDEAlMode( bool full ) } else { - pParent = pParent->tqparentWidget(); + pParent = pParent->parentWidget(); } } while ( pParent && !pDockW ); @@ -2262,10 +2262,10 @@ void KMdiMainFrm::setSysButtonsAtMenuPosition() { if ( m_pMainMenuBar == 0L ) return ; - if ( m_pMainMenuBar->tqparentWidget() == 0L ) + if ( m_pMainMenuBar->parentWidget() == 0L ) return ; - int menuW = m_pMainMenuBar->tqparentWidget() ->width(); + int menuW = m_pMainMenuBar->parentWidget() ->width(); int h; int y; if ( frameDecorOfAttachedViews() == KMdi::Win95Look ) @@ -2357,7 +2357,7 @@ void KMdiMainFrm::activateFirstWin() return ; TQDateTime current = activeWindow() ->getTimeStamp(); - TQMap::iterator pos( m.tqfind( current ) ); + TQMap::iterator pos( m.find( current ) ); TQMap::iterator newPos = pos; if ( pos != m.end() ) { @@ -2390,7 +2390,7 @@ void KMdiMainFrm::activateLastWin() return ; TQDateTime current = activeWindow() ->getTimeStamp(); - TQMap::iterator pos( m.tqfind( current ) ); + TQMap::iterator pos( m.find( current ) ); if ( pos != m.begin() ) { --pos; @@ -2934,4 +2934,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; -- cgit v1.2.1