From 1dcbbe821d337f155c5835aa372db3cadcc31ed8 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 9 Jul 2011 02:23:29 +0000 Subject: Remove the tq in front of these incorrectly TQt4-converted methods/data members: tqrepaint[...] tqinvalidate[...] tqparent[...] tqmask[...] tqlayout[...] tqalignment[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kmdi/kmdi/dockcontainer.cpp | 8 +++--- kmdi/kmdi/mainwindow.cpp | 28 +++++++++--------- kmdi/kmdi/mainwindow.h | 2 +- kmdi/kmdi/toolviewaccessor.cpp | 4 +-- kmdi/kmdichildfrm.cpp | 4 +-- kmdi/kmdichildfrmcaption.cpp | 2 +- kmdi/kmdichildview.cpp | 8 +++--- kmdi/kmdichildview.h | 6 ++-- kmdi/kmdidockcontainer.cpp | 6 ++-- kmdi/kmdimainfrm.cpp | 64 +++++++++++++++++++++--------------------- kmdi/kmdimainfrm.h | 2 +- kmdi/kmditaskbar.cpp | 2 +- kmdi/kmditoolviewaccessor.cpp | 4 +-- kmdi/test/hello.cpp | 4 +-- kmdi/test/hello.h | 2 +- 15 files changed, 73 insertions(+), 73 deletions(-) (limited to 'kmdi') diff --git a/kmdi/kmdi/dockcontainer.cpp b/kmdi/kmdi/dockcontainer.cpp index 6302a8406..6ac025c7f 100644 --- a/kmdi/kmdi/dockcontainer.cpp +++ b/kmdi/kmdi/dockcontainer.cpp @@ -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 (::tqqt_cast(w->getHeader())) { @@ -335,7 +335,7 @@ void DockContainer::changeOverlapMode() void DockContainer::hideIfNeeded() { kdDebug(760)<<"************************* hideIfNeeded *************************"<undock(); + ((KDockWidget*)parentWidget())->undock(); } void DockContainer::removeWidget(KDockWidget* dwdg) @@ -363,7 +363,7 @@ 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) diff --git a/kmdi/kmdi/mainwindow.cpp b/kmdi/kmdi/mainwindow.cpp index ac45fc3a5..aea04fa01 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) , d(new KMDIPrivate::MainWindowPrivate()) { @@ -156,19 +156,19 @@ void MainWindow::setupToolViews () 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()); } - findToolViewsDockedToMain(&leftRetqparentWidgets,KDockWidget::DockLeft); - findToolViewsDockedToMain(&rightRetqparentWidgets,KDockWidget::DockRight); - findToolViewsDockedToMain(&bottomRetqparentWidgets,KDockWidget::DockBottom); - findToolViewsDockedToMain(&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); diff --git a/kmdi/kmdi/mainwindow.h b/kmdi/kmdi/mainwindow.h index 597bc15f5..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. diff --git a/kmdi/kmdi/toolviewaccessor.cpp b/kmdi/kmdi/toolviewaccessor.cpp index 0a35ba25f..c0d191ff4 100644 --- a/kmdi/kmdi/toolviewaccessor.cpp +++ b/kmdi/kmdi/toolviewaccessor.cpp @@ -186,8 +186,8 @@ void ToolViewAccessor::place(KDockWidget::DockPosition pos, TQWidget* pTargetWnd if (!DockToOurself) if(pTargetWnd != 0L) { pTargetDock = mdiMainFrm->dockManager->findWidgetParentDock( pTargetWnd); if (!pTargetDock) { - if (pTargetWnd->tqparentWidget()) { - pTargetDock = mdiMainFrm->dockManager->findWidgetParentDock( pTargetWnd->tqparentWidget()); + if (pTargetWnd->parentWidget()) { + pTargetDock = mdiMainFrm->dockManager->findWidgetParentDock( pTargetWnd->parentWidget()); } } } diff --git a/kmdi/kmdichildfrm.cpp b/kmdi/kmdichildfrm.cpp index 97f5f246c..63bdc5a24 100644 --- a/kmdi/kmdichildfrm.cpp +++ b/kmdi/kmdichildfrm.cpp @@ -286,7 +286,7 @@ void KMdiChildFrm::mouseMoveEvent( TQMouseEvent *e ) if ( !( e->state() & Qt::RightButton ) && !( e->state() & Qt::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 @@ -1394,7 +1394,7 @@ void KMdiChildFrm::redecorateButtons() TQRect KMdiChildFrm::mdiAreaContentsRect() const { - TQFrame * p = ( TQFrame* ) tqparentWidget(); + TQFrame * p = ( TQFrame* ) parentWidget(); if ( p ) { return p->contentsRect(); diff --git a/kmdi/kmdichildfrmcaption.cpp b/kmdi/kmdichildfrmcaption.cpp index eb64c9395..f14b03e6f 100644 --- a/kmdi/kmdichildfrmcaption.cpp +++ b/kmdi/kmdichildfrmcaption.cpp @@ -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 ===============// diff --git a/kmdi/kmdichildview.cpp b/kmdi/kmdichildview.cpp index ee64bf159..9c1d18c7b 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 ) diff --git a/kmdi/kmdichildview.h b/kmdi/kmdichildview.h index e02325e79..1c1f2a1cf 100644 --- a/kmdi/kmdichildview.h +++ b/kmdi/kmdichildview.h @@ -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 @@ -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; diff --git a/kmdi/kmdidockcontainer.cpp b/kmdi/kmdidockcontainer.cpp index 9720c5214..caf335a85 100644 --- a/kmdi/kmdidockcontainer.cpp +++ b/kmdi/kmdidockcontainer.cpp @@ -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 ( ::tqqt_cast(w->getHeader()) ) { @@ -362,7 +362,7 @@ void KMdiDockContainer::hideIfNeeded() if ( itemNames.count() == 0 ) { kdDebug( 760 ) << k_funcinfo << "Hiding the dock container" << endl; - ( ( KDockWidget* ) tqparentWidget() )->undock(); + ( ( KDockWidget* ) parentWidget() )->undock(); } } diff --git a/kmdi/kmdimainfrm.cpp b/kmdi/kmdimainfrm.cpp index 487f9c2b2..36c743bf8 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 ); @@ -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 ); } @@ -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 ); @@ -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 ) @@ -874,12 +874,12 @@ void KMdiMainFrm::closeWindow( KMdiChildView *pWnd, bool layoutTaskBar ) 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 ) @@ -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() ) { @@ -1302,7 +1302,7 @@ void KMdiMainFrm::findRootDockWidgets( TQPtrList* rootDockWidgetLis if ( undockCandidate->enableDocking() != KDockWidget::DockNone ) rootDockWindow = undockCandidate; } - pW = pW->tqparentWidget(); + pW = pW->parentWidget(); } if ( rootDockWindow ) @@ -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 @@ -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 ); @@ -1662,7 +1662,7 @@ void KMdiMainFrm::finishTabPageMode() TQSize mins = pView->tqminimumSize(); TQSize maxs = pView->tqmaximumSize(); 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 ); @@ -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() ); - findToolViewsDockedToMain( &leftRetqparentWidgets, KDockWidget::DockLeft ); - findToolViewsDockedToMain( &rightRetqparentWidgets, KDockWidget::DockRight ); - findToolViewsDockedToMain( &bottomRetqparentWidgets, KDockWidget::DockBottom ); - findToolViewsDockedToMain( &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 ); @@ -2078,7 +2078,7 @@ void KMdiMainFrm::finishIDEAlMode( bool full ) TQSize mins = pView->tqminimumSize(); TQSize maxs = pView->tqmaximumSize(); 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 ); @@ -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 ) diff --git a/kmdi/kmdimainfrm.h b/kmdi/kmdimainfrm.h index e38797d75..f6fecbb9c 100644 --- a/kmdi/kmdimainfrm.h +++ b/kmdi/kmdimainfrm.h @@ -296,7 +296,7 @@ private: // methods public: - KMdiMainFrm( TQWidget* tqparentWidget, const char* name = "", KMdi::MdiMode mdiMode = KMdi::ChildframeMode, WFlags flags = (WFlags)(WType_TopLevel | WDestructiveClose) ); + KMdiMainFrm( TQWidget* parentWidget, const char* name = "", KMdi::MdiMode mdiMode = KMdi::ChildframeMode, WFlags flags = (WFlags)(WType_TopLevel | WDestructiveClose) ); virtual ~KMdiMainFrm(); /** diff --git a/kmdi/kmditaskbar.cpp b/kmdi/kmditaskbar.cpp index 9a412acb5..20034480f 100644 --- a/kmdi/kmditaskbar.cpp +++ b/kmdi/kmditaskbar.cpp @@ -343,7 +343,7 @@ void KMdiTaskBar::layoutTaskBar( int taskBarWidth ) int tbHandlePixel; tbHandlePixel = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent, this ); int buttonAreaWidth = taskBarWidth - tbHandlePixel - tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, this ) - 5; - if ( ( ( allButtonsWidthHint ) <= buttonAreaWidth ) || ( width() < tqparentWidget() ->width() ) ) + if ( ( ( allButtonsWidthHint ) <= buttonAreaWidth ) || ( width() < parentWidget() ->width() ) ) { for ( b = m_pButtonList->first();b;b = m_pButtonList->next() ) { diff --git a/kmdi/kmditoolviewaccessor.cpp b/kmdi/kmditoolviewaccessor.cpp index f12caba05..fa8a35f74 100644 --- a/kmdi/kmditoolviewaccessor.cpp +++ b/kmdi/kmditoolviewaccessor.cpp @@ -222,9 +222,9 @@ void KMdiToolViewAccessor::place( KDockWidget::DockPosition pos, TQWidget* pTarg pTargetDock = mdiMainFrm->dockManager->findWidgetParentDock( pTargetWnd ); if ( !pTargetDock ) { - if ( pTargetWnd->tqparentWidget() ) + if ( pTargetWnd->parentWidget() ) { - pTargetDock = mdiMainFrm->dockManager->findWidgetParentDock( pTargetWnd->tqparentWidget() ); + pTargetDock = mdiMainFrm->dockManager->findWidgetParentDock( pTargetWnd->parentWidget() ); } } } diff --git a/kmdi/test/hello.cpp b/kmdi/test/hello.cpp index a560a8902..e00a4d705 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()) ); 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: -- cgit v1.2.3