diff options
Diffstat (limited to 'kmdi')
39 files changed, 311 insertions, 311 deletions
diff --git a/kmdi/kmdi/dockcontainer.cpp b/kmdi/kmdi/dockcontainer.cpp index 1761e86cd..3455fe1e8 100644 --- a/kmdi/kmdi/dockcontainer.cpp +++ b/kmdi/kmdi/dockcontainer.cpp @@ -90,7 +90,7 @@ DockContainer::DockContainer(TQWidget *parent, TQWidget *win, int position, int m_ws=new TQWidgetStack(this); - m_ws->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding)); + m_ws->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding)); if ( (position==KDockWidget::DockLeft) || (position==KDockWidget::DockTop)) { @@ -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)) { (static_cast<KDockWidgetHeader*>(w->getHeader()->qt_cast("KDockWidgetHeader")))->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) { @@ -181,8 +181,8 @@ void DockContainer::insertWidget (KDockWidget *dwdg, TQPixmap pixmap, const TQSt m_revMap.insert(tab,w); - if (((KDockWidget*)tqparentWidget())->mayBeShow()) - ((KDockWidget*)tqparentWidget())->dockBack(); + if (((KDockWidget*)parentWidget())->mayBeShow()) + ((KDockWidget*)parentWidget())->dockBack(); if (w->getHeader()->qt_cast("KDockWidgetHeader")) { @@ -298,7 +298,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]; @@ -337,13 +337,13 @@ void DockContainer::changeOverlapMode() void DockContainer::hideIfNeeded() { kdDebug(760)<<"************************* hideIfNeeded *************************"<<endl; if (!itemNames.count()) - ((KDockWidget*)tqparentWidget())->undock(); + ((KDockWidget*)parentWidget())->undock(); } 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 @@ -356,7 +356,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)) { (static_cast<KDockWidgetHeader*>(w->getHeader()->qt_cast("KDockWidgetHeader")))->removeButton(m_overlapButtons[w]); m_overlapButtons.remove(w); } @@ -365,14 +365,14 @@ void DockContainer::removeWidget(KDockWidget* dwdg) tabCaptions.remove(w->name()); tabTooltips.remove(w->name()); if (!itemNames.count()) - ((KDockWidget*)tqparentWidget())->undock(); + ((KDockWidget*)parentWidget())->undock(); } 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]; @@ -631,7 +631,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; @@ -643,7 +643,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; @@ -655,4 +655,4 @@ void DockContainer::nextToolView() { } -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kmdi/kmdi/dockcontainer.h b/kmdi/kmdi/dockcontainer.h index 7a1c8ae9d..ac27f8644 100644 --- a/kmdi/kmdi/dockcontainer.h +++ b/kmdi/kmdi/dockcontainer.h @@ -141,4 +141,4 @@ class DockContainer: public TQWidget, public KDockContainer #endif -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kmdi/kmdi/guiclient.cpp b/kmdi/kmdi/guiclient.cpp index d034db948..882916f30 100644 --- a/kmdi/kmdi/guiclient.cpp +++ b/kmdi/kmdi/guiclient.cpp @@ -68,7 +68,7 @@ GUIClient::GUIClient (KMDI::MainWindow* mdiMainFrm,const char* name) if ( domDocument().documentElement().isNull() ) { - TQString completeDescription = TQString::tqfromLatin1( guiDescription ).arg( actionListName ); + TQString completeDescription = TQString::fromLatin1( guiDescription ).arg( actionListName ); setXML( completeDescription, false /*merge*/ ); } @@ -227,4 +227,4 @@ void ToggleToolViewAction::slotWidgetDestroyed() } -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kmdi/kmdi/guiclient.h b/kmdi/kmdi/guiclient.h index 196da3fd6..c3784fe6e 100644 --- a/kmdi/kmdi/guiclient.h +++ b/kmdi/kmdi/guiclient.h @@ -100,4 +100,4 @@ class ToggleToolViewAction:public KToggleAction #endif -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kmdi/kmdi/mainwindow.cpp b/kmdi/kmdi/mainwindow.cpp index 6976887de..d6e332780 100644 --- a/kmdi/kmdi/mainwindow.cpp +++ b/kmdi/kmdi/mainwindow.cpp @@ -97,8 +97,8 @@ namespace KMDI { //============ constructor ============// -MainWindow::MainWindow(TQWidget* tqparentWidget, const char* name) - : KParts::DockMainWindow( tqparentWidget, name) +MainWindow::MainWindow(TQWidget* parentWidget, const char* name) + : KParts::DockMainWindow( parentWidget, name) , m_toolViews (new TQMap<TQWidget*,KMDI::ToolViewAccessor*>) , d(new KMDIPrivate::MainWindowPrivate()) { @@ -156,19 +156,19 @@ void MainWindow::setupToolViews () w=static_cast<KDockWidget*>(mainDock->parentDockTabGroup()->parent()); } - TQPtrList<KDockWidget> leftRetqparentWidgets; - TQPtrList<KDockWidget> rightRetqparentWidgets; - TQPtrList<KDockWidget> bottomRetqparentWidgets; - TQPtrList<KDockWidget> topRetqparentWidgets; + TQPtrList<KDockWidget> leftReparentWidgets; + TQPtrList<KDockWidget> rightReparentWidgets; + TQPtrList<KDockWidget> bottomReparentWidgets; + TQPtrList<KDockWidget> topReparentWidgets; if (mainDock->parentDockTabGroup()) { mainDock=static_cast<KDockWidget*>(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); @@ -220,10 +220,10 @@ void MainWindow::setupToolViews () 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); dockManager->setSpecialRightDockContainer(m_rightContainer); @@ -273,7 +273,7 @@ KMDI::ToolViewAccessor *MainWindow::addToolWindow( TQWidget* pWnd, KDockWidget:: pWnd=pDW; } - TQRect r=pWnd->tqgeometry(); + TQRect r=pWnd->geometry(); KMDI::ToolViewAccessor *mtva=new KMDI::ToolViewAccessor(this,pWnd,tabToolTip,(tabCaption==0)?pWnd->caption():tabCaption); m_toolViews->insert(tvta,mtva); @@ -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]); } } @@ -370,14 +370,14 @@ void MainWindow::dockToolViewsIntoContainers(TQPtrList<KDockWidget>& widgetsToRe } } -void MainWindow::tqfindToolViewsDockedToMain(TQPtrList<KDockWidget>* list,KDockWidget::DockPosition dprtmw) { +void MainWindow::findToolViewsDockedToMain(TQPtrList<KDockWidget>* list,KDockWidget::DockPosition dprtmw) { KDockWidget *mainDock=getMainDockWidget(); if (mainDock->parentDockTabGroup()) { mainDock=dynamic_cast<KDockWidget*>(mainDock->parentDockTabGroup()->parent()); // FIXME: will likely crash below due to unchecked cast } - KDockWidget* widget=mainDock->tqfindNearestDockWidget(dprtmw); + KDockWidget* widget=mainDock->findNearestDockWidget(dprtmw); if (widget) { if (widget->parentDockTabGroup()) { widget=static_cast<KDockWidget*>(widget->parentDockTabGroup()->parent()); @@ -448,4 +448,4 @@ void MainWindow::nextToolViewInDock() { } -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kmdi/kmdi/mainwindow.h b/kmdi/kmdi/mainwindow.h index d0003e579..d7351a330 100644 --- a/kmdi/kmdi/mainwindow.h +++ b/kmdi/kmdi/mainwindow.h @@ -79,7 +79,7 @@ class KMDI_EXPORT MainWindow : public KParts::DockMainWindow /** * Constructor. */ - MainWindow ( TQWidget* tqparentWidget, const char* name = ""); + MainWindow ( TQWidget* parentWidget, const char* name = ""); /** * Destructor. @@ -141,7 +141,7 @@ class KMDI_EXPORT MainWindow : public KParts::DockMainWindow void collapseOverlapContainers(); protected: - void tqfindToolViewsDockedToMain(TQPtrList<KDockWidget>* list,KDockWidget::DockPosition dprtmw); + void findToolViewsDockedToMain(TQPtrList<KDockWidget>* list,KDockWidget::DockPosition dprtmw); void dockToolViewsIntoContainers(TQPtrList<KDockWidget>& widgetsToReparent,KDockWidget *container); private: @@ -196,4 +196,4 @@ class KMDI_EXPORT MainWindow : public KParts::DockMainWindow #endif //_MainWindow_H_ -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kmdi/kmdi/tabwidget.cpp b/kmdi/kmdi/tabwidget.cpp index 98a756cd6..0d21bd2ea 100644 --- a/kmdi/kmdi/tabwidget.cpp +++ b/kmdi/kmdi/tabwidget.cpp @@ -182,7 +182,7 @@ void TabWidget::insertTab ( TQWidget * child, const TQString & label, int index) KTabWidget::insertTab(child,label,index); showPage(child); maybeShow(); - tabBar()->tqrepaint(); + tabBar()->repaint(); } void TabWidget::insertTab ( TQWidget * child, const TQIconSet & iconset, const TQString & label, int index ) @@ -190,7 +190,7 @@ void TabWidget::insertTab ( TQWidget * child, const TQIconSet & iconset, const T KTabWidget::insertTab(child,iconset,label,index); showPage(child); maybeShow(); - tabBar()->tqrepaint(); + tabBar()->repaint(); } void TabWidget::insertTab ( TQWidget * child, TQTab * tab, int index) @@ -198,7 +198,7 @@ void TabWidget::insertTab ( TQWidget * child, TQTab * tab, int index) KTabWidget::insertTab(child,tab,index); showPage(child); maybeShow(); - tabBar()->tqrepaint(); + tabBar()->repaint(); } void TabWidget::removePage ( TQWidget * w ) @@ -281,4 +281,4 @@ KMDI::TabWidgetVisibility TabWidget::tabWidgetVisibility( ) const } -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kmdi/kmdi/tabwidget.h b/kmdi/kmdi/tabwidget.h index d44d4bd4a..04e8f3c20 100644 --- a/kmdi/kmdi/tabwidget.h +++ b/kmdi/kmdi/tabwidget.h @@ -112,4 +112,4 @@ class KMDI_EXPORT TabWidget : public KTabWidget #endif -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kmdi/kmdi/toolviewaccessor.cpp b/kmdi/kmdi/toolviewaccessor.cpp index 01523a423..21f621ec5 100644 --- a/kmdi/kmdi/toolviewaccessor.cpp +++ b/kmdi/kmdi/toolviewaccessor.cpp @@ -184,16 +184,16 @@ void ToolViewAccessor::place(KDockWidget::DockPosition pos, TQWidget* pTargetWnd // this is not inheriting TQWidget*, its plain impossible that this condition is true //if (pTargetWnd == this) DockToOurself = true; if (!DockToOurself) if(pTargetWnd != 0L) { - pTargetDock = mdiMainFrm->dockManager->tqfindWidgetParentDock( pTargetWnd); + pTargetDock = mdiMainFrm->dockManager->findWidgetParentDock( pTargetWnd); if (!pTargetDock) { - if (pTargetWnd->tqparentWidget()) { - pTargetDock = mdiMainFrm->dockManager->tqfindWidgetParentDock( pTargetWnd->tqparentWidget()); + if (pTargetWnd->parentWidget()) { + pTargetDock = mdiMainFrm->dockManager->findWidgetParentDock( pTargetWnd->parentWidget()); } } } /* if (!pTargetDock || pTargetWnd == mdiMainFrm->getMainDockWidget()) { if (mdiMainFrm->m_managedDockPositionMode && (mdiMainFrm->m_pMdi || mdiMainFrm->m_documentTabWidget)) { - KDockWidget *dw1=pTargetDock->tqfindNearestDockWidget(pos); + KDockWidget *dw1=pTargetDock->findNearestDockWidget(pos); if (dw1) pCover->manualDock(dw1,KDockWidget::DockCenter,percent); else @@ -220,4 +220,4 @@ void ToolViewAccessor::show() { } -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kmdi/kmdi/toolviewaccessor.h b/kmdi/kmdi/toolviewaccessor.h index d92da19a8..180ba56a3 100644 --- a/kmdi/kmdi/toolviewaccessor.h +++ b/kmdi/kmdi/toolviewaccessor.h @@ -37,7 +37,7 @@ namespace KMDI { class MainWindow; -class ToolViewAccessor : public TQObject +class ToolViewAccessor : public QObject { Q_OBJECT @@ -85,4 +85,4 @@ protected: #endif //_KMDITOOLVIEWACCESSOR_H_ -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kmdi/kmdi/toolviewaccessor_p.h b/kmdi/kmdi/toolviewaccessor_p.h index ab349e3ab..71ffb286a 100644 --- a/kmdi/kmdi/toolviewaccessor_p.h +++ b/kmdi/kmdi/toolviewaccessor_p.h @@ -55,6 +55,6 @@ class ToolViewAccessorPrivate #endif -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kmdi/kmdichildarea.cpp b/kmdi/kmdichildarea.cpp index 8d28b3091..923b55372 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::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(); } @@ -240,7 +240,7 @@ void KMdiChildArea::resizeEvent( TQResizeEvent* e ) height() + child->m_pCaption->heightHint() + KMDI_CHILDFRM_SEPARATOR + KMDI_CHILDFRM_DOUBLE_BORDER ); } - tqlayoutMinimizedChildren(); + layoutMinimizedChildren(); TQWidget::resizeEvent( e ); } @@ -318,8 +318,8 @@ TQPoint KMdiChildArea::getCascadePoint( int indexOfWindow ) void KMdiChildArea::childMinimized( KMdiChildFrm *minimizedChild, bool wasMaximized ) { - //can't tqfind the child in our list, so we don't care. - if ( m_pZ->tqfindRef( minimizedChild ) == -1 ) + //can't find the child in our list, so we don't care. + if ( m_pZ->findRef( minimizedChild ) == -1 ) { kdDebug( 760 ) << k_funcinfo << "child was minimized but wasn't in our list!" << endl; return; @@ -420,10 +420,10 @@ void KMdiChildArea::cascadeMaximized() childFrm->move( pnt ); TQSize curSize( width() - pnt.x(), height() - pnt.y() ); - if ( ( childFrm->tqminimumSize().width() > curSize.width() ) || - ( childFrm->tqminimumSize().height() > curSize.height() ) ) + if ( ( childFrm->minimumSize().width() > curSize.width() ) || + ( childFrm->minimumSize().height() > curSize.height() ) ) { - childFrm->resize( childFrm->tqminimumSize() ); + childFrm->resize( childFrm->minimumSize() ); } else childFrm->resize( curSize ); @@ -607,7 +607,7 @@ void KMdiChildArea::tileAnodine() return ; int numCols = int( sqrt( ( double ) numVisible ) ); // set columns to square root of visible count - // create an array to form grid tqlayout + // create an array to form grid layout int *numRows = new int[ numCols ]; int numCurCol = 0; @@ -720,7 +720,7 @@ void KMdiChildArea::tileVertically() } -void KMdiChildArea::tqlayoutMinimizedChildren() +void KMdiChildArea::layoutMinimizedChildren() { int posX = 0; int posY = height(); @@ -738,7 +738,7 @@ void KMdiChildArea::tqlayoutMinimizedChildren() } child->move( posX, posY - child->height() ); - posX = child->tqgeometry().right(); + posX = child->geometry().right(); } } } @@ -786,4 +786,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/kmdi/kmdichildarea.h b/kmdi/kmdichildarea.h index dac64cff4..37ce3336f 100644 --- a/kmdi/kmdichildarea.h +++ b/kmdi/kmdichildarea.h @@ -154,31 +154,31 @@ public: /** * Sets the MDI childframe window caption font - * A retqlayout does not occur when using this function + * A relayout does not occur when using this function */ void setMdiCaptionFont( const TQFont &fnt ); /** * Sets the foreground color of the active MDI childframe window caption - * A retqlayout does not occur when using this function + * A relayout does not occur when using this function */ void setMdiCaptionActiveForeColor( const TQColor &clr ); /** * Sets the background color of the active MDI childframe window captions - * A retqlayout does not occur when using this function + * A relayout does not occur when using this function */ void setMdiCaptionActiveBackColor( const TQColor &clr ); /** * Sets the foreground color of inactive MDI childframe window captions - * A retqlayout does not occur when using this function + * A relayout does not occur when using this function */ void setMdiCaptionInactiveForeColor( const TQColor &clr ); /** * Sets the background color of inactive MDI childframe window captions - * A retqlayout does not occur when using this function + * A relayout does not occur when using this function */ void setMdiCaptionInactiveBackColor( const TQColor &clr ); @@ -237,9 +237,9 @@ public slots: void tileVertically(); /** - * Position and tqlayout the minimized child frames + * Position and layout the minimized child frames */ - void tqlayoutMinimizedChildren(); + void layoutMinimizedChildren(); protected: @@ -249,7 +249,7 @@ protected: void tileAllInternal( int maxWnds ); /** - * Automatically resizes a maximized MDI view and tqlayouts the positions of minimized MDI views. + * Automatically resizes a maximized MDI view and layouts the positions of minimized MDI views. */ virtual void resizeEvent( TQResizeEvent * ); diff --git a/kmdi/kmdichildfrm.cpp b/kmdi/kmdichildfrm.cpp index e663a33ea..f471cf6c3 100644 --- a/kmdi/kmdichildfrm.cpp +++ b/kmdi/kmdichildfrm.cpp @@ -278,7 +278,7 @@ void KMdiChildFrm::mouseMoveEvent( TQMouseEvent *e ) if ( !m_pClient ) return; - if ( m_pClient->tqminimumSize() == m_pClient->tqmaximumSize() ) + if ( m_pClient->minimumSize() == m_pClient->maximumSize() ) return; if ( m_bResizing ) @@ -286,7 +286,7 @@ void KMdiChildFrm::mouseMoveEvent( TQMouseEvent *e ) if ( !( e->state() & RightButton ) && !( e->state() & MidButton ) ) { // same as: if no button or left button pressed - TQPoint p = tqparentWidget()->mapFromGlobal( e->globalPos() ); + TQPoint p = parentWidget()->mapFromGlobal( e->globalPos() ); resizeWindow( m_iResizeCorner, p.x(), p.y() ); } else @@ -329,11 +329,11 @@ void KMdiChildFrm::resizeWindow( int resizeCorner, int xPos, int yPos ) // it could be the client forces the childframe to enlarge its minimum size if ( m_pClient ) { - minWidth = m_pClient->tqminimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER; - minHeight = m_pClient->tqminimumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER + + minWidth = m_pClient->minimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER; + minHeight = m_pClient->minimumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER + m_pCaption->heightHint() + KMDI_CHILDFRM_SEPARATOR; - maxWidth = m_pClient->tqmaximumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER; - maxHeight = m_pClient->tqmaximumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER + + maxWidth = m_pClient->maximumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER; + maxHeight = m_pClient->maximumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER + m_pCaption->heightHint() + KMDI_CHILDFRM_SEPARATOR; } @@ -521,22 +521,22 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ ) case Maximized: m_pClient->m_stateChanged = true; m_state = state; - // client min / max size / tqlayout behavior don't change + // client min / max size / layout behavior don't change // set frame max size indirectly by setting the clients max size to // it's current value (calls setMaxSize() of frame) - m_pClient->setMaximumSize( m_pClient->tqmaximumSize().width(), m_pClient->tqmaximumSize().height() ); + m_pClient->setMaximumSize( m_pClient->maximumSize().width(), m_pClient->maximumSize().height() ); m_pMaximize->setPixmap( *m_pMaxButtonPixmap ); setGeometry( m_restoredRect ); break; case Minimized: m_pClient->m_stateChanged = true; m_state = state; - // restore client min / max size / tqlayout behavior + // restore client min / max size / layout behavior m_pClient->setMinimumSize( m_oldClientMinSize.width(), m_oldClientMinSize.height() ); m_pClient->setMaximumSize( m_oldClientMaxSize.width(), m_oldClientMaxSize.height() ); - if ( m_pClient->tqlayout() != 0L ) + if ( m_pClient->layout() != 0L ) { - m_pClient->tqlayout() ->setResizeMode( m_oldLayoutResizeMode ); + m_pClient->layout() ->setResizeMode( m_oldLayoutResizeMode ); } m_pMinimize->setPixmap( *m_pMinButtonPixmap ); m_pMaximize->setPixmap( *m_pMaxButtonPixmap ); @@ -555,12 +555,12 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ ) { m_pClient->m_stateChanged = true; m_state = state; - // restore client min / max size / tqlayout behavior + // restore client min / max size / layout behavior m_pClient->setMinimumSize( m_oldClientMinSize.width(), m_oldClientMinSize.height() ); m_pClient->setMaximumSize( m_oldClientMaxSize.width(), m_oldClientMaxSize.height() ); - if ( m_pClient->tqlayout() != 0L ) + if ( m_pClient->layout() != 0L ) { - m_pClient->tqlayout() ->setResizeMode( m_oldLayoutResizeMode ); + m_pClient->layout() ->setResizeMode( m_oldLayoutResizeMode ); } setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX ); // reset to maximize-captionbar @@ -581,7 +581,7 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ ) { m_pClient->m_stateChanged = true; m_state = state; - // client min / max size / tqlayout behavior don't change + // client min / max size / layout behavior don't change setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX ); m_pMaximize->setPixmap( *m_pRestoreButtonPixmap ); int nFrameWidth = KMDI_CHILDFRM_DOUBLE_BORDER; @@ -590,7 +590,7 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ ) TQRect maximizedFrmRect( -m_pClient->x(), -m_pClient->y(), m_pManager->width() + nFrameWidth, m_pManager->height() + nFrameHeight ); - if ( tqgeometry() != maximizedFrmRect ) + if ( geometry() != maximizedFrmRect ) { setGeometry( maximizedFrmRect ); } @@ -607,18 +607,18 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ ) case Maximized: m_pClient->m_stateChanged = true; m_state = state; - // save client min / max size / tqlayout behavior - m_oldClientMinSize = m_pClient->tqminimumSize(); - m_oldClientMaxSize = m_pClient->tqmaximumSize(); - if ( m_pClient->tqlayout() != 0L ) + // save client min / max size / layout behavior + m_oldClientMinSize = m_pClient->minimumSize(); + m_oldClientMaxSize = m_pClient->maximumSize(); + if ( m_pClient->layout() != 0L ) { - m_oldLayoutResizeMode = m_pClient->tqlayout() ->resizeMode(); + m_oldLayoutResizeMode = m_pClient->layout() ->resizeMode(); } m_pClient->setMinimumSize( 0, 0 ); m_pClient->setMaximumSize( 0, 0 ); - if ( m_pClient->tqlayout() != 0L ) + if ( m_pClient->layout() != 0L ) { - m_pClient->tqlayout() ->setResizeMode( TQLayout::FreeResize ); + m_pClient->layout() ->setResizeMode( TQLayout::FreeResize ); } switchToMinimizeLayout(); m_pManager->childMinimized( this, true ); @@ -626,19 +626,19 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ ) case Normal: m_pClient->m_stateChanged = true; m_state = state; - // save client min / max size / tqlayout behavior - m_oldClientMinSize = m_pClient->tqminimumSize(); - m_oldClientMaxSize = m_pClient->tqmaximumSize(); - if ( m_pClient->tqlayout() != 0L ) + // save client min / max size / layout behavior + m_oldClientMinSize = m_pClient->minimumSize(); + m_oldClientMaxSize = m_pClient->maximumSize(); + if ( m_pClient->layout() != 0L ) { - m_oldLayoutResizeMode = m_pClient->tqlayout() ->resizeMode(); + m_oldLayoutResizeMode = m_pClient->layout() ->resizeMode(); } - m_restoredRect = tqgeometry(); + m_restoredRect = geometry(); m_pClient->setMinimumSize( 0, 0 ); m_pClient->setMaximumSize( 0, 0 ); - if ( m_pClient->tqlayout() != 0L ) + if ( m_pClient->layout() != 0L ) { - m_pClient->tqlayout() ->setResizeMode( TQLayout::FreeResize ); + m_pClient->layout() ->setResizeMode( TQLayout::FreeResize ); } switchToMinimizeLayout(); m_pManager->childMinimized( this, false ); @@ -694,7 +694,7 @@ void KMdiChildFrm::setCaption( const TQString& text ) void KMdiChildFrm::enableClose( bool bEnable ) { m_pClose->setEnabled( bEnable ); - m_pClose->tqrepaint( false ); + m_pClose->repaint( false ); } //============ setIcon ==================// @@ -779,8 +779,8 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize ) { //reparent to this widget , no flags , point , show it TQPoint pnt2( KMDI_CHILDFRM_BORDER, clientYPos ); - TQSize mincs = w->tqminimumSize(); - TQSize maxcs = w->tqmaximumSize(); + TQSize mincs = w->minimumSize(); + TQSize maxcs = w->maximumSize(); w->setMinimumSize( 0, 0 ); w->setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX ); @@ -798,11 +798,11 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize ) TQObject::connect( m_pClient, TQT_SIGNAL( mdiParentNowMaximized( bool ) ), m_pManager, TQT_SIGNAL( nowMaximized( bool ) ) ); if ( m_pClient->minimumWidth() > m_pManager->m_defaultChildFrmSize.width() ) - setMinimumWidth( m_pClient->tqminimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER ); + setMinimumWidth( m_pClient->minimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER ); if ( m_pClient->minimumHeight() > m_pManager->m_defaultChildFrmSize.height() ) { - setMinimumHeight( m_pClient->tqminimumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER + + setMinimumHeight( m_pClient->minimumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER + m_pCaption->heightHint() + KMDI_CHILDFRM_SEPARATOR ); } } @@ -826,8 +826,8 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset ) if ( focusedChildWidget != 0 ) nameOfFocusedWidget = focusedChildWidget->name(); - TQSize mins = m_pClient->tqminimumSize(); - TQSize maxs = m_pClient->tqmaximumSize(); + TQSize mins = m_pClient->minimumSize(); + TQSize maxs = m_pClient->maximumSize(); m_pClient->reparent( 0, 0, mapToGlobal( pos() ) - pos() + positionOffset, isVisible() ); m_pClient->setMinimumSize( mins.width(), mins.height() ); m_pClient->setMaximumSize( maxs.width(), maxs.height() ); @@ -842,7 +842,7 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset ) { // for each found object... TQWidget * widg = ( TQWidget* ) obj; ++it; - FocusPolicy* pFocPol = pFocPolDict->tqfind( widg->name() ); // remember the focus policy from before the reparent + 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<FocusPolicy>* pFocPolDict ) { // for each found object... TQWidget* widg = ( TQWidget* ) obj; ++it; - FocusPolicy* pFocPol = pFocPolDict->tqfind( widg->name() ); // remember the focus policy from before the reparent + FocusPolicy* pFocPol = pFocPolDict->find( widg->name() ); // remember the focus policy from before the reparent if ( pFocPol != 0 ) widg->setFocusPolicy( *pFocPol ); @@ -1105,7 +1105,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) { // in case we didn't click on the icon button TQFocusEvent focusEvent( TQFocusEvent::FocusIn ); - TQApplication::sendEvent( tqApp->mainWidget(), &focusEvent ); + TQApplication::sendEvent( qApp->mainWidget(), &focusEvent ); if ( m_pClient ) { m_pClient->updateTimeStamp(); @@ -1284,9 +1284,9 @@ void KMdiChildFrm::showSystemMenu() TQRect iconGeom; if ( KMdiMainFrm::frameDecorOfAttachedViews() == KMdi::Win95Look ) - iconGeom = m_pWinIcon->tqgeometry(); + iconGeom = m_pWinIcon->geometry(); else - iconGeom = m_pUnixIcon->tqgeometry(); + iconGeom = m_pUnixIcon->geometry(); popupmenuPosition = TQPoint( iconGeom.x(), iconGeom.y() + captionHeight() + KMDI_CHILDFRM_BORDER ); systemMenu() ->popup( mapToGlobal( popupmenuPosition ) ); @@ -1308,7 +1308,7 @@ void KMdiChildFrm::switchToMinimizeLayout() resize( 300, minimumHeight() ); // positioning - m_pManager->tqlayoutMinimizedChildren(); + m_pManager->layoutMinimizedChildren(); } void KMdiChildFrm::slot_resizeViaSystemMenu() @@ -1394,7 +1394,7 @@ void KMdiChildFrm::redecorateButtons() TQRect KMdiChildFrm::mdiAreaContentsRect() const { - TQFrame * p = ( TQFrame* ) tqparentWidget(); + TQFrame * p = ( TQFrame* ) parentWidget(); if ( p ) { return p->contentsRect(); @@ -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/kmdi/kmdichildfrm.h b/kmdi/kmdichildfrm.h index 88bea1f80..23435479e 100644 --- a/kmdi/kmdichildfrm.h +++ b/kmdi/kmdichildfrm.h @@ -124,7 +124,7 @@ class KMdiChildFrmPrivate; //============================================================================== /** * @short Internal class. - * It's an MDI child frame widget. It tqcontains a view widget and a frame caption. Usually you derive from its view. + * It's an MDI child frame widget. It contains a view widget and a frame caption. Usually you derive from its view. */ //------------------------------------------------------------------------------ class KMDI_EXPORT KMdiChildFrm : public QFrame @@ -245,12 +245,12 @@ public: TQRect mdiAreaContentsRect() const; /** - * Returns the tqgeometry that will be restored by calling restore(). + * Returns the geometry that will be restored by calling restore(). */ TQRect restoreGeometry() const; /** - * Sets the tqgeometry that will be restored by calling restore(). + * Sets the geometry that will be restored by calling restore(). */ void setRestoreGeometry( const TQRect& newRestGeo ); @@ -306,7 +306,7 @@ protected: /** * Reimplemented from the base class. - * Resizes the captionbar, retqlayouts the position of the system buttons, + * Resizes the captionbar, relayouts the position of the system buttons, * and calls resize for its embedded KMdiChildView with the proper size */ virtual void resizeEvent( TQResizeEvent * ); @@ -352,7 +352,7 @@ protected: virtual bool eventFilter( TQObject*, TQEvent* ); /** - * Calculates the new tqgeometry from the new mouse position given as parameters + * Calculates the new geometry from the new mouse position given as parameters * and calls KMdiChildFrm::setGeometry */ void resizeWindow( int resizeCorner, int x, int y ); @@ -443,4 +443,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/kmdi/kmdichildfrmcaption.cpp b/kmdi/kmdichildfrmcaption.cpp index d9b412f35..65d348f30 100644 --- a/kmdi/kmdichildfrmcaption.cpp +++ b/kmdi/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 ( !m_pParent->m_pManager->rect().tqcontains( relMousePosInChildArea ) ) + if ( !m_pParent->m_pManager->rect().contains( relMousePosInChildArea ) ) { if ( relMousePosInChildArea.x() < 0 ) relMousePosInChildArea.rx() = 0; @@ -163,7 +163,7 @@ void KMdiChildFrmCaption::mouseMoveEvent( TQMouseEvent *e ) TQPoint mousePosInChildArea = relMousePosInChildArea - m_offset; // set new child frame position - tqparentWidget() ->move( mousePosInChildArea ); + parentWidget() ->move( mousePosInChildArea ); } //=============== setActive ===============// @@ -182,7 +182,7 @@ void KMdiChildFrmCaption::setActive( bool bActive ) m_pParent->m_pManager->m_captionInactiveBackColor ); m_bActive = bActive; - tqrepaint( false ); + repaint( false ); } //=============== setCaption ===============// @@ -190,7 +190,7 @@ void KMdiChildFrmCaption::setActive( bool bActive ) void KMdiChildFrmCaption::setCaption( const TQString& text ) { m_szCaption = text; - tqrepaint( false ); + repaint( false ); } //============== heightHint ===============// @@ -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/kmdi/kmdichildfrmcaption.h b/kmdi/kmdichildfrmcaption.h index 6a2e731df..1bc47ac1f 100644 --- a/kmdi/kmdichildfrmcaption.h +++ b/kmdi/kmdichildfrmcaption.h @@ -142,4 +142,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/kmdi/kmdichildview.cpp b/kmdi/kmdichildview.cpp index 94ee99710..37414fe0a 100644 --- a/kmdi/kmdichildview.cpp +++ b/kmdi/kmdichildview.cpp @@ -44,8 +44,8 @@ //============ KMdiChildView ============// -KMdiChildView::KMdiChildView( const TQString& caption, TQWidget* tqparentWidget, const char* name, WFlags f ) - : TQWidget( tqparentWidget, name, f ) +KMdiChildView::KMdiChildView( const TQString& caption, TQWidget* parentWidget, const char* name, WFlags f ) + : TQWidget( parentWidget, name, f ) , m_focusedChildWidget( 0L ) , m_firstFocusableChildWidget( 0L ) , m_lastFocusableChildWidget( 0L ) @@ -73,8 +73,8 @@ KMdiChildView::KMdiChildView( const TQString& caption, TQWidget* tqparentWidget, //============ KMdiChildView ============// -KMdiChildView::KMdiChildView( TQWidget* tqparentWidget, const char* name, WFlags f ) - : TQWidget( tqparentWidget, name, f ) +KMdiChildView::KMdiChildView( TQWidget* parentWidget, const char* name, WFlags f ) + : TQWidget( parentWidget, name, f ) , m_focusedChildWidget( 0L ) , m_firstFocusableChildWidget( 0L ) , m_lastFocusableChildWidget( 0L ) @@ -108,14 +108,14 @@ void KMdiChildView::trackIconAndCaptionChanges( TQWidget *view ) } -//============== internal tqgeometry ==============// +//============== internal geometry ==============// TQRect KMdiChildView::internalGeometry() const { if ( mdiParent() ) { // is attached // get the client area coordinates inside the MDI child frame - TQRect posInFrame = tqgeometry(); + TQRect posInFrame = geometry(); // map these values to the parent of the MDI child frame // (this usually is the MDI child area) and return TQPoint ptTopLeft = mdiParent() ->mapToParent( posInFrame.topLeft() ); @@ -124,14 +124,14 @@ TQRect KMdiChildView::internalGeometry() const } else { - TQRect geo = tqgeometry(); + TQRect geo = geometry(); TQRect frameGeo = externalGeometry(); return TQRect( frameGeo.x(), frameGeo.y(), geo.width(), geo.height() ); - // return tqgeometry(); + // return geometry(); } } -//============== set internal tqgeometry ==============// +//============== set internal geometry ==============// void KMdiChildView::setInternalGeometry( const TQRect& newGeometry ) { @@ -143,7 +143,7 @@ void KMdiChildView::setInternalGeometry( const TQRect& newGeometry ) int nFrameSizeTop = geo.y() - frameGeo.y(); int nFrameSizeLeft = geo.x() - frameGeo.x(); - // create the new tqgeometry that is accepted by the TQWidget::setGeometry() method + // create the new geometry that is accepted by the TQWidget::setGeometry() method TQRect newGeoQt; newGeoQt.setX( newGeometry.x() - nFrameSizeLeft ); newGeoQt.setY( newGeometry.y() - nFrameSizeTop ); @@ -153,7 +153,7 @@ void KMdiChildView::setInternalGeometry( const TQRect& newGeometry ) // newGeoQt.setWidth(newGeometry.width()+KMDI_MDI_CHILDFRM_DOUBLE_BORDER); // newGeoQt.setHeight(newGeometry.height()+mdiParent()->captionHeight()+KMDI_MDI_CHILDFRM_DOUBLE_BORDER); - // set the tqgeometry + // set the geometry mdiParent()->setGeometry( newGeoQt ); } else @@ -164,7 +164,7 @@ void KMdiChildView::setInternalGeometry( const TQRect& newGeometry ) int nFrameSizeTop = geo.y() - frameGeo.y(); int nFrameSizeLeft = geo.x() - frameGeo.x(); - // create the new tqgeometry that is accepted by the TQWidget::setGeometry() method + // create the new geometry that is accepted by the TQWidget::setGeometry() method TQRect newGeoQt; newGeoQt.setX( newGeometry.x() - nFrameSizeLeft ); @@ -173,19 +173,19 @@ void KMdiChildView::setInternalGeometry( const TQRect& newGeometry ) newGeoQt.setWidth( newGeometry.width() ); newGeoQt.setHeight( newGeometry.height() ); - // set the tqgeometry + // set the geometry setGeometry( newGeoQt ); } } -//============== external tqgeometry ==============// +//============== external geometry ==============// TQRect KMdiChildView::externalGeometry() const { return mdiParent() ? mdiParent()->frameGeometry() : frameGeometry(); } -//============== set external tqgeometry ==============// +//============== set external geometry ==============// void KMdiChildView::setExternalGeometry( const TQRect& newGeometry ) { @@ -203,7 +203,7 @@ void KMdiChildView::setExternalGeometry( const TQRect& newGeometry ) int nFrameSizeTop = geo.y() - frameGeo.y(); int nFrameSizeLeft = geo.x() - frameGeo.x(); - // create the new tqgeometry that is accepted by the TQWidget::setGeometry() method + // create the new geometry that is accepted by the TQWidget::setGeometry() method // not attached => the window system makes the frame TQRect newGeoQt; newGeoQt.setX( newGeometry.x() + nFrameSizeLeft ); @@ -211,7 +211,7 @@ void KMdiChildView::setExternalGeometry( const TQRect& newGeometry ) newGeoQt.setWidth( newGeometry.width() - nTotalFrameWidth ); newGeoQt.setHeight( newGeometry.height() - nTotalFrameHeight ); - // set the tqgeometry + // set the geometry setGeometry( newGeoQt ); } } @@ -278,7 +278,7 @@ TQRect KMdiChildView::restoreGeometry() if ( mdiParent() ) return mdiParent() ->restoreGeometry(); else //FIXME not really supported, may be we must use Windows or X11 funtions - return tqgeometry(); + return geometry(); } //============== setRestoreGeometry ================// @@ -546,7 +546,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e ) if ( obj->isWidgetType() ) { TQObjectList * list = queryList( "TQWidget" ); - if ( list->tqfind( obj ) != -1 ) + if ( list->find( obj ) != -1 ) m_focusedChildWidget = ( TQWidget* ) obj; delete list; // delete the list, not the objects @@ -771,4 +771,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/kmdi/kmdichildview.h b/kmdi/kmdichildview.h index b2e44361f..656c17fd7 100644 --- a/kmdi/kmdichildview.h +++ b/kmdi/kmdichildview.h @@ -71,14 +71,14 @@ class KMdiChildViewPrivate; * KMdiChildView* pMDICover = new KMdiChildView( pNewView->caption()); * pMDICover->setIcon(icon); * m_MDICoverList.append( pMDICover); - * TQBoxLayout* pLayout = new TQHBoxLayout( pMDICover, 0, -1, "tqlayout"); + * TQBoxLayout* pLayout = new TQHBoxLayout( pMDICover, 0, -1, "layout"); * pNewView->reparent( pMDICover, TQPoint(0,0)); * pLayout->addWidget( pNewView); * pMDICover->setName( pNewView->name()); * // 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()); * @@ -182,13 +182,13 @@ public: /** * Constructor */ - KMdiChildView( const TQString& caption, TQWidget* tqparentWidget = 0L, const char* name = 0L, WFlags f = 0 ); + KMdiChildView( const TQString& caption, TQWidget* parentWidget = 0L, const char* name = 0L, WFlags f = 0 ); /** * Constructor * sets "Unnamed" as default caption */ - KMdiChildView( TQWidget* tqparentWidget = 0L, const char* name = 0L, WFlags f = 0 ); + KMdiChildView( TQWidget* parentWidget = 0L, const char* name = 0L, WFlags f = 0 ); /** * Destructor @@ -196,7 +196,7 @@ public: ~KMdiChildView(); /** - * This method does the same as focusInEvent(). That's why it is a tqreplacement for the setFocus() call. It makes + * This method does the same as focusInEvent(). That's why it is a replacement for the setFocus() call. It makes * sense if you for instance want to focus (I mean raise and activate) this view although the real focus is * in another toplevel widget. focusInEvent() will never get called in that case and your setFocus() call for this * widget would fail without any effect. @@ -270,12 +270,12 @@ public: bool isMaximized() const; /** - * Returns the tqgeometry of this MDI child window as TQWidget::tqgeometry() does. + * Returns the geometry of this MDI child window as TQWidget::geometry() does. */ TQRect internalGeometry() const; /** - * Sets the tqgeometry of the client area of this MDI child window. The + * Sets the geometry of the client area of this MDI child window. The * top left position of the argument is the position of the top left point * of the client area in its parent coordinates and the arguments width * and height is the width and height of the client area. Please note: This @@ -284,12 +284,12 @@ public: void setInternalGeometry( const TQRect& newGeomety ); /** - * Returns the frame tqgeometry of this window or of the parent if there is any... + * Returns the frame geometry of this window or of the parent if there is any... */ TQRect externalGeometry() const; /** - * Sets the tqgeometry of the frame of this MDI child window. The top left + * Sets the geometry of the frame of this MDI child window. The top left * position of the argument is the position of the top left point of the * frame in its parent coordinates and the arguments width and height is * the width and height of the widget frame. Please note: This differs @@ -315,12 +315,12 @@ public: virtual void maximize( bool bAnimate ); /** - * Returns the tqgeometry that will be restored by calling restore(). + * Returns the geometry that will be restored by calling restore(). */ TQRect restoreGeometry(); /** - * Sets the tqgeometry that will be restored by calling restore(). + * Sets the geometry that will be restored by calling restore(). */ void setRestoreGeometry( const TQRect& newRestGeo ); @@ -358,7 +358,7 @@ public: */ inline void updateTimeStamp() { - m_time.setDate( TQDate::tqcurrentDate() ); + m_time.setDate( TQDate::currentDate() ); m_time.setTime( TQTime::currentTime() ); } @@ -603,7 +603,7 @@ private: inline KMdiChildFrm *KMdiChildView::mdiParent() const { - TQWidget * pw = tqparentWidget(); + TQWidget * pw = parentWidget(); if ( pw != 0L ) if ( pw->inherits( "KMdiChildFrm" ) ) return ( KMdiChildFrm * ) pw; @@ -612,4 +612,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/kmdi/kmdidefines.h b/kmdi/kmdidefines.h index fc1227eee..16be290a6 100644 --- a/kmdi/kmdidefines.h +++ b/kmdi/kmdidefines.h @@ -66,7 +66,7 @@ namespace KMdi /** * standard is: show normal, attached, visible, document view (not toolview). Maximize, Minimize, Hide adds * appropriately. Detach adds a view that appears toplevel, ToolWindow adds the view as tool view. - * That means it is stay-on-top and toplevel. UseKMdiSizeHint should use the restore tqgeometry of the + * That means it is stay-on-top and toplevel. UseKMdiSizeHint should use the restore geometry of the * latest current top childframe but is not supported yet. */ StandardAdd = 0, diff --git a/kmdi/kmdidockcontainer.cpp b/kmdi/kmdidockcontainer.cpp index fed6147a8..df82a4e6c 100644 --- a/kmdi/kmdidockcontainer.cpp +++ b/kmdi/kmdidockcontainer.cpp @@ -70,9 +70,9 @@ KMdiDockContainer::KMdiDockContainer( TQWidget *parent, TQWidget *win, int posit if ( m_horizontal ) - l = new TQVBoxLayout( this ); //vertical tqlayout for top and bottom docks + l = new TQVBoxLayout( this ); //vertical layout for top and bottom docks else - l = new TQHBoxLayout( this ); //horizontal tqlayout for left and right docks + l = new TQHBoxLayout( this ); //horizontal layout for left and right docks l->setAutoAdd( false ); @@ -104,9 +104,9 @@ KMdiDockContainer::KMdiDockContainer( TQWidget *parent, TQWidget *win, int posit m_ws = new TQWidgetStack( this ); - m_ws->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); + m_ws->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); - //tqlayout the tabbar + //layout the tabbar if ( position == KDockWidget::DockLeft || position == KDockWidget::DockTop ) { //add the tabbar then the widget stack @@ -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 ); @@ -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 ) { @@ -204,8 +204,8 @@ void KMdiDockContainer::insertWidget ( KDockWidget *dwdg, TQPixmap pixmap, const m_map.insert( w, tab ); m_revMap.insert( tab, w ); - if ( ( ( KDockWidget* ) tqparentWidget() ) ->mayBeShow() ) - ( ( KDockWidget* ) tqparentWidget() ) ->dockBack(); + if ( ( ( KDockWidget* ) parentWidget() ) ->mayBeShow() ) + ( ( KDockWidget* ) parentWidget() ) ->dockBack(); if ( w->getHeader()->qt_cast( "KDockWidgetHeader" ) ) { @@ -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 ]; @@ -362,14 +362,14 @@ void KMdiDockContainer::hideIfNeeded() if ( itemNames.count() == 0 ) { kdDebug( 760 ) << k_funcinfo << "Hiding the dock container" << endl; - ( ( KDockWidget* ) tqparentWidget() )->undock(); + ( ( KDockWidget* ) parentWidget() )->undock(); } } 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 ) ) { ( static_cast<KDockWidgetHeader*>( w->getHeader() ->qt_cast( "KDockWidgetHeader" ) ) )->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 ]; @@ -818,7 +818,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 ; @@ -839,7 +839,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 ; @@ -856,4 +856,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/kmdi/kmdidockcontainer.h b/kmdi/kmdidockcontainer.h index 389703b14..cb0d6e4ce 100644 --- a/kmdi/kmdidockcontainer.h +++ b/kmdi/kmdidockcontainer.h @@ -164,4 +164,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/kmdi/kmdidocumentviewtabwidget.cpp b/kmdi/kmdidocumentviewtabwidget.cpp index d49712e48..90b618e47 100644 --- a/kmdi/kmdidocumentviewtabwidget.cpp +++ b/kmdi/kmdidocumentviewtabwidget.cpp @@ -54,7 +54,7 @@ void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, const TQString & l KTabWidget::insertTab( child, label, index ); showPage( child ); TQTimer::singleShot(0, this, TQT_SLOT(maybeShow())); - tabBar() ->tqrepaint(); + tabBar() ->repaint(); } void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, const TQIconSet & iconset, const TQString & label, int index ) @@ -62,7 +62,7 @@ void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, const TQIconSet & KTabWidget::insertTab( child, iconset, label, index ); showPage( child ); TQTimer::singleShot(0, this, TQT_SLOT(maybeShow())); - tabBar() ->tqrepaint(); + tabBar() ->repaint(); } void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, TQTab * tab, int index ) @@ -70,7 +70,7 @@ void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, TQTab * tab, int i KTabWidget::insertTab( child, tab, index ); showPage( child ); TQTimer::singleShot(0, this, TQT_SLOT(maybeShow())); - tabBar() ->tqrepaint(); + tabBar() ->repaint(); } void KMdiDocumentViewTabWidget::removePage ( TQWidget * w ) @@ -140,9 +140,9 @@ KMdi::TabWidgetVisibility KMdiDocumentViewTabWidget::tabWidgetVisibility( ) } -#ifndef NO_INCLUDE_TQMOCFILES +#ifndef NO_INCLUDE_MOCFILES #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/kmdi/kmdidocumentviewtabwidget.h b/kmdi/kmdidocumentviewtabwidget.h index 8485c57a1..d731a9a03 100644 --- a/kmdi/kmdidocumentviewtabwidget.h +++ b/kmdi/kmdidocumentviewtabwidget.h @@ -121,5 +121,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/kmdi/kmdifocuslist.cpp b/kmdi/kmdifocuslist.cpp index 683b58c06..fe907aab8 100644 --- a/kmdi/kmdifocuslist.cpp +++ b/kmdi/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/kmdi/kmdifocuslist.h b/kmdi/kmdifocuslist.h index fad27e07c..71e2f05cb 100644 --- a/kmdi/kmdifocuslist.h +++ b/kmdi/kmdifocuslist.h @@ -23,7 +23,7 @@ #include <tqwidget.h> #include <kdelibs_export.h> -class KMDI_EXPORT KMdiFocusList: public TQObject +class KMDI_EXPORT KMdiFocusList: public QObject { Q_OBJECT public: @@ -39,4 +39,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/kmdi/kmdiguiclient.cpp b/kmdi/kmdiguiclient.cpp index 3e40a3846..6279253bc 100644 --- a/kmdi/kmdiguiclient.cpp +++ b/kmdi/kmdiguiclient.cpp @@ -128,7 +128,7 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c if ( domDocument().documentElement().isNull() ) { - TQString completeDescription = TQString::tqfromLatin1( guiDescription ) + TQString completeDescription = TQString::fromLatin1( guiDescription ) .arg( actionListName ); setXML( completeDescription, false /*merge*/ ); @@ -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/kmdi/kmdiguiclient.h b/kmdi/kmdiguiclient.h index 00280db93..9c9634314 100644 --- a/kmdi/kmdiguiclient.h +++ b/kmdi/kmdiguiclient.h @@ -143,4 +143,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/kmdi/kmdiiterator.h b/kmdi/kmdiiterator.h index ef7ee52a3..6bb6f7eac 100644 --- a/kmdi/kmdiiterator.h +++ b/kmdi/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/kmdi/kmdilistiterator.h b/kmdi/kmdilistiterator.h index 10444d8ff..9e788b28e 100644 --- a/kmdi/kmdilistiterator.h +++ b/kmdi/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/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<KMdiChildView*> children; for ( KMdiChildView * w = m_pDocumentViews->first();w;w = m_pDocumentViews->next() ) children.append( w ); @@ -303,7 +303,7 @@ KMdiMainFrm::~KMdiMainFrm() TQValueListIterator<KMdiChildView*> 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<KMdiChildView> 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<KMdiChildView*> 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<KDockWidget>* rootDockWidgetList, TQValueList<TQRect>* positionList ) +/** find the root dockwidgets and store their geometry */ +void KMdiMainFrm::findRootDockWidgets( TQPtrList<KDockWidget>* rootDockWidgetList, TQValueList<TQRect>* positionList ) { //nothing is valid if ( !rootDockWidgetList && !positionList ) @@ -1293,7 +1293,7 @@ void KMdiMainFrm::tqfindRootDockWidgets( TQPtrList<KDockWidget>* rootDockWidgetL KDockWidget* undockCandidate = 0L; /* pUndockCandidate */ TQWidget* pW = static_cast<TQWidget*>( ( *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<KDockWidget*>( pW ) || pW->inherits( "KDockWidget_Compat::KDockWidget" ) ) @@ -1302,7 +1302,7 @@ void KMdiMainFrm::tqfindRootDockWidgets( TQPtrList<KDockWidget>* 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<KDockWidget> rootDockWidgetList; TQValueList<TQRect> 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<KDockWidget>& widgetsTo } } -void KMdiMainFrm::tqfindToolViewsDockedToMain( TQPtrList<KDockWidget>* list, KDockWidget::DockPosition dprtmw ) +void KMdiMainFrm::findToolViewsDockedToMain( TQPtrList<KDockWidget>* list, KDockWidget::DockPosition dprtmw ) { KDockWidget* mainDock = getMainDockWidget(); if ( mainDock->parentDockTabGroup() ) @@ -1896,7 +1896,7 @@ void KMdiMainFrm::tqfindToolViewsDockedToMain( TQPtrList<KDockWidget>* list, KDo return; } - KDockWidget* widget = mainDock->tqfindNearestDockWidget( dprtmw ); + KDockWidget* widget = mainDock->findNearestDockWidget( dprtmw ); if ( widget && widget->parentDockTabGroup() ) { widget = static_cast<KDockWidget*>( widget->parentDockTabGroup() ->parent() ); @@ -1933,18 +1933,18 @@ void KMdiMainFrm::setupToolViewsForIDEALMode() if ( mainDock->parentDockTabGroup() ) w = static_cast<KDockWidget*>( mainDock->parentDockTabGroup()->parent() ); - TQPtrList<KDockWidget> leftRetqparentWidgets; - TQPtrList<KDockWidget> rightRetqparentWidgets; - TQPtrList<KDockWidget> bottomRetqparentWidgets; - TQPtrList<KDockWidget> topRetqparentWidgets; + TQPtrList<KDockWidget> leftReparentWidgets; + TQPtrList<KDockWidget> rightReparentWidgets; + TQPtrList<KDockWidget> bottomReparentWidgets; + TQPtrList<KDockWidget> topReparentWidgets; if ( mainDock->parentDockTabGroup() ) mainDock = static_cast<KDockWidget*>( 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<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; @@ -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; diff --git a/kmdi/kmdimainfrm.h b/kmdi/kmdimainfrm.h index 3468c1995..47ca34b9f 100644 --- a/kmdi/kmdimainfrm.h +++ b/kmdi/kmdimainfrm.h @@ -78,7 +78,7 @@ public: /** * \short Base class for all your special main frames. * - * It tqcontains the child frame area (QMainWindow's central widget) and a child view taskbar + * It contains the child frame area (QMainWindow's central widget) and a child view taskbar * for switching the MDI views. Most methods are virtual functions for later overriding. * * Basically, this class provides functionality for docking/undocking view windows and @@ -98,7 +98,7 @@ public: * * \code * MyMainWindow mainframe; - * tqApp->setMainWidget(&mainframe); + * qApp->setMainWidget(&mainframe); * mainframe->addWindow(view1); // put it under MDI control * mainframe->addWindow(view2); * \endcode @@ -142,7 +142,7 @@ public: * use fakeSDIApplication() to fake it and isFakingSDIApplication() to query whether or not an SDI * interface is being faked. * - * You can dynamically change the tqshape of the attached MDI views using setFrameDecorOfAttachedViews(). + * You can dynamically change the shape of the attached MDI views using setFrameDecorOfAttachedViews(). * * Additionally, here's a hint how to restore the mainframe's settings from config file: * \code @@ -188,7 +188,7 @@ public: * - expandHorizontal() - expand all the windows to use the most amount of horizontal space * * activateView(KMdiChildView*) and activateView(int index) set the appropriate MDI child view as the active - * one. It will be raised, will get an active MDI frame and will get the focus. Call activeView() to tqfind out what the + * one. It will be raised, will get an active MDI frame and will get the focus. Call activeView() to find out what the * current MDI view is. * * Use detachWindow() and attachWindow() for docking the MDI views to desktop and back. @@ -296,7 +296,7 @@ private: // methods public: - KMdiMainFrm( TQWidget* tqparentWidget, const char* name = "", KMdi::MdiMode mdiMode = KMdi::ChildframeMode, WFlags flags = WType_TopLevel | WDestructiveClose ); + KMdiMainFrm( TQWidget* parentWidget, const char* name = "", KMdi::MdiMode mdiMode = KMdi::ChildframeMode, WFlags flags = WType_TopLevel | WDestructiveClose ); virtual ~KMdiMainFrm(); /** @@ -345,7 +345,7 @@ public: /** * Returns the KMdiChildView belonging to the given caption string. */ - KMdiChildView * tqfindWindow( const TQString& caption ); + KMdiChildView * findWindow( const TQString& caption ); enum ExistsAs {DocumentView, ToolView, AnyView}; /** @@ -411,7 +411,7 @@ public: } /** - * Returns a popup menu that tqcontains the MDI controlled view list. + * Returns a popup menu that contains the MDI controlled view list. * Additionally, this menu provides some placing actions for these views. * Usually, you insert this popup menu in your main menubar as "Window" menu. */ @@ -474,7 +474,7 @@ public: bool isFakingSDIApplication() const { return m_bSDIApplication; } virtual bool eventFilter( TQObject *obj, TQEvent *e ); - void tqfindRootDockWidgets( TQPtrList<KDockWidget>* pRootDockWidgetList, TQValueList<TQRect>* pPositionList ); + void findRootDockWidgets( TQPtrList<KDockWidget>* pRootDockWidgetList, TQValueList<TQRect>* pPositionList ); /** We're switching something.*/ void setSwitching( const bool switching ) { m_bSwitching = switching; } @@ -532,7 +532,7 @@ public slots: /** * Adds a KMdiChildView to the MDI system. The main frame takes control of it. * \param pWnd the parent view. - * \param rectNormal Sets the tqgeometry for this child view + * \param rectNormal Sets the geometry for this child view * \param flags the flags for the view such as: * \li whether the view should be attached or detached. * \li whether the view should be shown or hidden @@ -570,7 +570,7 @@ public slots: * Removes a KMdiChildView from the MDI system and from the main frame`s control. * Note: The view will be deleted! */ - virtual void closeWindow( KMdiChildView *pWnd, bool tqlayoutTaskBar = true ); + virtual void closeWindow( KMdiChildView *pWnd, bool layoutTaskBar = true ); /** * Switches the KMdiTaskBar on and off. @@ -763,7 +763,7 @@ protected: */ void blockClearingOfWindowMenu( bool bBlocked ) { m_bClearingOfWindowMenuBlocked = bBlocked; } - void tqfindToolViewsDockedToMain( TQPtrList<KDockWidget>* list, KDockWidget::DockPosition dprtmw ); + void findToolViewsDockedToMain( TQPtrList<KDockWidget>* list, KDockWidget::DockPosition dprtmw ); void dockToolViewsIntoContainers( TQPtrList<KDockWidget>& widgetsToReparent, KDockWidget *container ); TQStringList prepareIdealToTabs( KDockWidget* container ); void idealToolViewsToStandardTabs( TQStringList widgetNames, KDockWidget::DockPosition pos, int sizee ); @@ -876,4 +876,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/kmdi/kmdinulliterator.h b/kmdi/kmdinulliterator.h index ff671af4a..3c976caac 100644 --- a/kmdi/kmdinulliterator.h +++ b/kmdi/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/kmdi/kmditaskbar.cpp b/kmdi/kmditaskbar.cpp index 6beecb24e..71c3de454 100644 --- a/kmdi/kmditaskbar.cpp +++ b/kmdi/kmditaskbar.cpp @@ -102,7 +102,7 @@ void KMdiTaskBarButton::fitText( const TQString& origStr, int newWidth ) { TQButton::setText( m_actualText ); - int actualWidth = tqsizeHint().width(); + int actualWidth = sizeHint().width(); int realLetterCount = origStr.length(); int newLetterCount = ( newWidth * realLetterCount ) / actualWidth; int w = newWidth + 1; @@ -144,7 +144,7 @@ KMdiTaskBar::KMdiTaskBar( KMdiMainFrm *parent, TQMainWindow::ToolBarDock dock ) : KToolBar( parent, "KMdiTaskBar", /*honor_style*/ false, /*readConfig*/ true ) , m_pCurrentFocusedWindow( 0 ) , m_pStretchSpace( 0 ) - , m_tqlayoutIsPending( false ) + , m_layoutIsPending( false ) , m_bSwitchedOn( false ) { m_pFrm = parent; @@ -175,12 +175,12 @@ KMdiTaskBarButton * KMdiTaskBar::addWinButton( KMdiChildView *win_ptr ) TQObject::connect( b, TQT_SIGNAL( clicked( KMdiChildView* ) ), this, TQT_SLOT( setActiveButton( KMdiChildView* ) ) ); TQObject::connect( b, TQT_SIGNAL( leftMouseButtonClicked( KMdiChildView* ) ), m_pFrm, TQT_SLOT( activateView( KMdiChildView* ) ) ); TQObject::connect( b, TQT_SIGNAL( rightMouseButtonClicked( KMdiChildView* ) ), m_pFrm, TQT_SLOT( taskbarButtonRightClicked( KMdiChildView* ) ) ); - TQObject::connect( b, TQT_SIGNAL( buttonTextChanged( int ) ), this, TQT_SLOT( tqlayoutTaskBar( int ) ) ); + TQObject::connect( b, TQT_SIGNAL( buttonTextChanged( int ) ), this, TQT_SLOT( layoutTaskBar( int ) ) ); m_pButtonList->append( b ); b->setToggleButton( true ); b->setText( win_ptr->tabCaption() ); - tqlayoutTaskBar(); + layoutTaskBar(); m_pStretchSpace = new TQLabel( this, "empty" ); m_pStretchSpace->setText( "" ); @@ -202,7 +202,7 @@ void KMdiTaskBar::removeWinButton( KMdiChildView *win_ptr, bool haveToLayoutTask { m_pButtonList->removeRef( b ); if ( haveToLayoutTaskBar ) - tqlayoutTaskBar(); + layoutTaskBar(); } if ( m_pButtonList->count() == 0 ) { @@ -303,11 +303,11 @@ void KMdiTaskBar::setActiveButton( KMdiChildView *win_ptr ) } } -void KMdiTaskBar::tqlayoutTaskBar( int taskBarWidth ) +void KMdiTaskBar::layoutTaskBar( int taskBarWidth ) { - if ( m_tqlayoutIsPending ) + if ( m_layoutIsPending ) return ; - m_tqlayoutIsPending = true; + m_layoutIsPending = true; if ( !taskBarWidth ) // no width is given @@ -337,16 +337,16 @@ void KMdiTaskBar::tqlayoutTaskBar( int taskBarWidth ) // if there's enough space, use actual width int buttonCount = m_pButtonList->count(); int tbHandlePixel; - tbHandlePixel = style().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent, this ); - int buttonAreaWidth = taskBarWidth - tbHandlePixel - style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, this ) - 5; - if ( ( ( allButtonsWidthHint ) <= buttonAreaWidth ) || ( width() < tqparentWidget() ->width() ) ) + tbHandlePixel = style().pixelMetric( TQStyle::PM_DockWindowHandleExtent, this ); + int buttonAreaWidth = taskBarWidth - tbHandlePixel - style().pixelMetric( TQStyle::PM_DefaultFrameWidth, this ) - 5; + if ( ( ( allButtonsWidthHint ) <= buttonAreaWidth ) || ( width() < parentWidget() ->width() ) ) { for ( b = m_pButtonList->first();b;b = m_pButtonList->next() ) { b->setText( b->actualText() ); - if ( b->width() != b->tqsizeHint().width() ) + if ( b->width() != b->sizeHint().width() ) { - b->setFixedWidth( b->tqsizeHint().width() ); + b->setFixedWidth( b->sizeHint().width() ); b->show(); } } @@ -372,19 +372,19 @@ void KMdiTaskBar::tqlayoutTaskBar( int taskBarWidth ) } } } - m_tqlayoutIsPending = false; + m_layoutIsPending = false; } void KMdiTaskBar::resizeEvent( TQResizeEvent* rse ) { - if ( !m_tqlayoutIsPending ) + if ( !m_layoutIsPending ) { if ( m_pButtonList->count() != 0 ) { - tqlayoutTaskBar( rse->size().width() ); + layoutTaskBar( rse->size().width() ); } } 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/kmdi/kmditaskbar.h b/kmdi/kmditaskbar.h index a97159135..39c4efa2e 100644 --- a/kmdi/kmditaskbar.h +++ b/kmdi/kmditaskbar.h @@ -87,7 +87,7 @@ signals: */ void rightMouseButtonClicked( KMdiChildView* ); /** - * Emitted when the button text has changed. Internally connected with KMdiTaskBar::tqlayoutTaskBar + * Emitted when the button text has changed. Internally connected with KMdiTaskBar::layoutTaskBar */ void buttonTextChanged( int ); public slots: @@ -171,7 +171,7 @@ public: }; protected: /** - * Reimplemented from its base class to call tqlayoutTaskBar, additionally. + * Reimplemented from its base class to call layoutTaskBar, additionally. */ void resizeEvent( TQResizeEvent* ); protected slots: @@ -182,7 +182,7 @@ protected slots: * fixed width and show() is called for each one. * If one drags the taskbar to a vertical orientation, the button width is set to 80 pixel. */ - void tqlayoutTaskBar( int taskBarWidth = 0 ); + void layoutTaskBar( int taskBarWidth = 0 ); public slots: /** * Pushes the desired taskbar button down (switch on), the old one is released (switched off). @@ -207,7 +207,7 @@ protected: * A stretchable widget used as 'space' at the end of a half filled taskbar */ TQLabel* m_pStretchSpace; - bool m_tqlayoutIsPending; + bool m_layoutIsPending; bool m_bSwitchedOn; private: @@ -215,5 +215,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/kmdi/kmditoolviewaccessor.cpp b/kmdi/kmditoolviewaccessor.cpp index 17eb2a44f..1d2cce946 100644 --- a/kmdi/kmditoolviewaccessor.cpp +++ b/kmdi/kmditoolviewaccessor.cpp @@ -219,12 +219,12 @@ void KMdiToolViewAccessor::place( KDockWidget::DockPosition pos, TQWidget* pTarg if ( !DockToOurself ) if ( pTargetWnd != 0L ) { - pTargetDock = mdiMainFrm->dockManager->tqfindWidgetParentDock( pTargetWnd ); + pTargetDock = mdiMainFrm->dockManager->findWidgetParentDock( pTargetWnd ); if ( !pTargetDock ) { - if ( pTargetWnd->tqparentWidget() ) + if ( pTargetWnd->parentWidget() ) { - pTargetDock = mdiMainFrm->dockManager->tqfindWidgetParentDock( pTargetWnd->tqparentWidget() ); + pTargetDock = mdiMainFrm->dockManager->findWidgetParentDock( pTargetWnd->parentWidget() ); } } } @@ -232,7 +232,7 @@ void KMdiToolViewAccessor::place( KDockWidget::DockPosition pos, TQWidget* pTarg { if ( mdiMainFrm->m_managedDockPositionMode && ( mdiMainFrm->m_pMdi || mdiMainFrm->m_documentTabWidget ) ) { - KDockWidget * dw1 = pTargetDock->tqfindNearestDockWidget( pos ); + KDockWidget * dw1 = pTargetDock->findNearestDockWidget( pos ); if ( dw1 ) pCover->manualDock( dw1, KDockWidget::DockCenter, percent ); else @@ -262,8 +262,8 @@ void KMdiToolViewAccessor::show() } -#ifndef NO_INCLUDE_TQMOCFILES +#ifndef NO_INCLUDE_MOCFILES #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/kmdi/kmditoolviewaccessor.h b/kmdi/kmditoolviewaccessor.h index 346100478..28241ea3b 100644 --- a/kmdi/kmditoolviewaccessor.h +++ b/kmdi/kmditoolviewaccessor.h @@ -35,7 +35,7 @@ class KMDIGUIClient; } -class KMDI_EXPORT KMdiToolViewAccessor : public TQObject +class KMDI_EXPORT KMdiToolViewAccessor : public QObject { Q_OBJECT @@ -82,5 +82,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/kmdi/test/hello.cpp b/kmdi/test/hello.cpp index e6d86eea9..d92233ea6 100644 --- a/kmdi/test/hello.cpp +++ b/kmdi/test/hello.cpp @@ -18,8 +18,8 @@ Constructs a Hello widget. Starts a 40 ms animation timer. */ -Hello::Hello( const char *title, const char *text, TQWidget *tqparentWidget ) - : KMdiChildView(title, tqparentWidget), t(text), b(0) +Hello::Hello( const char *title, const char *text, TQWidget *parentWidget ) + : KMdiChildView(title, parentWidget), t(text), b(0) { TQTimer *timer = new TQTimer(this); TQObject::connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(animate()) ); @@ -36,7 +36,7 @@ Hello::Hello( const char *title, const char *text, TQWidget *tqparentWidget ) void Hello::animate() { b = (b + 1) & 15; - tqrepaint( false ); + repaint( false ); } @@ -49,7 +49,7 @@ void Hello::animate() void Hello::mouseReleaseEvent( TQMouseEvent *e ) { - if ( rect().tqcontains( e->pos() ) ) + if ( rect().contains( e->pos() ) ) emit clicked(); } diff --git a/kmdi/test/hello.h b/kmdi/test/hello.h index 762318d87..808d25b90 100644 --- a/kmdi/test/hello.h +++ b/kmdi/test/hello.h @@ -22,7 +22,7 @@ class Hello : public KMdiChildView { Q_OBJECT public: - Hello( const char *title, const char *text, TQWidget* tqparentWidget = 0 ); + Hello( const char *title, const char *text, TQWidget* parentWidget = 0 ); signals: void clicked(); protected: |