diff options
Diffstat (limited to 'lib/compatibility/kmdi')
21 files changed, 218 insertions, 218 deletions
diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp b/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp index fdb463dc..38af2a94 100644 --- a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp +++ b/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp @@ -324,7 +324,7 @@ void KDockWidgetHeader::setDragPanel( KDockWidgetHeaderDrag* nd ) delete drag; drag = nd; - if (drag->tqparentWidget()!=this) { + if (drag->parentWidget()!=this) { drag->reparent(this,TQPoint(0,0)); } @@ -354,7 +354,7 @@ void KDockWidgetHeader::setDragPanel( KDockWidgetHeaderDrag* nd ) void KDockWidgetHeader::addButton(KDockButton_Private* btn) { if (!btn) return; - if (btn->tqparentWidget()!=this) { + if (btn->parentWidget()!=this) { btn->reparent(this,TQPoint(0,0)); } btn->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height()); @@ -385,7 +385,7 @@ void KDockWidgetHeader::addButton(KDockButton_Private* btn) { } void KDockWidgetHeader::removeButton(KDockButton_Private* btn) { - if (btn->tqparentWidget()==this) { + if (btn->parentWidget()==this) { if (d->btns.tqcontainsRef(btn)) d->btns.removeRef(btn); delete btn; } @@ -533,10 +533,10 @@ void KDockWidget::setPixmap(const TQPixmap& pixmap) { delete pix; pix=new TQPixmap(pixmap); setIcon(*pix); - KDockTabGroup *dtg=tqparentDockTabGroup(); + KDockTabGroup *dtg=parentDockTabGroup(); if (dtg) dtg->changeTab(this,pixmap,dtg->tabLabel(this)); - TQWidget *contWid=tqparentDockContainer(); + TQWidget *contWid=parentDockContainer(); if (contWid) { KDockContainer *x = dynamic_cast<KDockContainer*>(contWid); if (x) { @@ -859,7 +859,7 @@ void KDockWidget::show() void KDockWidget::setDockWindowType (NET::WindowType windowType) { d->windowType = windowType; - applyToWidget( tqparentWidget(), TQPoint(0,0) ); + applyToWidget( parentWidget(), TQPoint(0,0) ); } #endif @@ -868,7 +868,7 @@ void KDockWidget::setDockWindowTransient (TQWidget *tqparent, bool transientEnab { d->_parent = tqparent; d->transient = transientEnabled; - applyToWidget( tqparentWidget(), TQPoint(0,0) ); + applyToWidget( parentWidget(), TQPoint(0,0) ); } TQWidget *KDockWidget::transientTo() { @@ -899,13 +899,13 @@ bool KDockWidget::event( TQEvent *event ) emit manager->change(); break; case TQEvent::CaptionChange: - if ( tqparentWidget() ){ + if ( parentWidget() ){ if ( tqparent()->inherits("KDockSplitter") ){ ((KDockSplitter*)(tqparent()))->updateName(); } - if ( tqparentDockTabGroup() ){ - setDockTabName( tqparentDockTabGroup() ); - tqparentDockTabGroup()->setTabLabel( this, tabPageLabel() ); + if ( parentDockTabGroup() ){ + setDockTabName( parentDockTabGroup() ); + parentDockTabGroup()->setTabLabel( this, tabPageLabel() ); } } break; @@ -983,8 +983,8 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos, // kdDebug(282)<<"KDockWidget::manualDock(): success = false (2)"<<endl; } - if ( tqparent() && !tqparent()->inherits("KDockSplitter") && !tqparentDockTabGroup() && - !(dynamic_cast<KDockContainer*>(tqparent())) && !tqparentDockContainer()){ + if ( tqparent() && !tqparent()->inherits("KDockSplitter") && !parentDockTabGroup() && + !(dynamic_cast<KDockContainer*>(tqparent())) && !parentDockContainer()){ // kdDebug(282)<<"KDockWidget::manualDock(): success = false (3)"<<endl; // kdDebug(282)<<tqparent()->name()<<endl; succes = false; @@ -1021,28 +1021,28 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos, } // kdDebug(282)<<"Looking for KDockTabGroup"<<endl; - KDockTabGroup* tqparentTab = target->tqparentDockTabGroup(); - if ( tqparentTab ){ + KDockTabGroup* parentTab = target->parentDockTabGroup(); + if ( parentTab ){ // add to existing TabGroup - applyToWidget( tqparentTab ); - tqparentTab->insertTab( this, icon() ? *icon() : TQPixmap(), + applyToWidget( parentTab ); + parentTab->insertTab( this, icon() ? *icon() : TQPixmap(), tabPageLabel(), tabIndex ); - TQWidget *wantTransient=tqparentTab->transientTo(); + TQWidget *wantTransient=parentTab->transientTo(); target->setDockWindowTransient(wantTransient,wantTransient); - setDockTabName( tqparentTab ); + setDockTabName( parentTab ); if( !toolTipStr.isEmpty()) - tqparentTab->setTabToolTip( this, toolTipStr); + parentTab->setTabToolTip( this, toolTipStr); currentDockPos = KDockWidget::DockCenter; emit manager->change(); - return (KDockWidget*)tqparentTab->tqparent(); + return (KDockWidget*)parentTab->tqparent(); } else { // kdDebug(282)<<"Looking for KDockContainer"<<endl; - TQWidget *contWid=target->tqparentDockContainer(); + TQWidget *contWid=target->parentDockContainer(); if (!contWid) contWid=target->widget; if (contWid) { @@ -1060,21 +1060,21 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos, cont->insertWidget( this, icon() ? *icon() : TQPixmap(), tabPageLabel(), tabIndex ); setLatestKDockContainer(contWid); -// setDockTabName( tqparentTab ); +// setDockTabName( parentTab ); if( !toolTipStr.isEmpty()) cont->setToolTip( this, toolTipStr); currentDockPos = KDockWidget::DockCenter; emit manager->change(); - return (KDockWidget*)(cont->tqparentDockWidget()); + return (KDockWidget*)(cont->parentDockWidget()); } } } // create a new dockwidget that will contain the target and this - TQWidget* tqparentDock = target->tqparentWidget(); - KDockWidget* newDock = new KDockWidget( manager, "tempName", TQPixmap(TQString("")), tqparentDock ); + TQWidget* parentDock = target->parentWidget(); + KDockWidget* newDock = new KDockWidget( manager, "tempName", TQPixmap(TQString("")), parentDock ); newDock->currentDockPos = target->currentDockPos; if ( dockPos == KDockWidget::DockCenter ){ @@ -1084,9 +1084,9 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos, } newDock->eDocking = (target->eDocking & eDocking) & (~(int)KDockWidget::DockCenter); - newDock->applyToWidget( tqparentDock ); + newDock->applyToWidget( parentDock ); - if ( !tqparentDock ){ + if ( !parentDock ){ // dock to a toplevel dockwidget means newDock is toplevel now newDock->move( target->frameGeometry().topLeft() ); newDock->resize( target->tqgeometry().size() ); @@ -1178,9 +1178,9 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos, panner->show(); } - if ( tqparentDock ){ - if ( tqparentDock->inherits("KDockSplitter") ){ - KDockSplitter* sp = (KDockSplitter*)tqparentDock; + if ( parentDock ){ + if ( parentDock->inherits("KDockSplitter") ){ + KDockSplitter* sp = (KDockSplitter*)parentDock; sp->deactivate(); if ( sp->getFirst() == target ) sp->activate( newDock, 0L ); @@ -1197,18 +1197,18 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos, return newDock; } -KDockTabGroup* KDockWidget::tqparentDockTabGroup() const +KDockTabGroup* KDockWidget::parentDockTabGroup() const { if ( !tqparent() ) return 0L; - TQWidget* candidate = tqparentWidget()->tqparentWidget(); + TQWidget* candidate = parentWidget()->parentWidget(); if ( candidate && candidate->inherits("KDockTabGroup") ) return (KDockTabGroup*)candidate; return 0L; } -TQWidget *KDockWidget::tqparentDockContainer() const +TQWidget *KDockWidget::parentDockContainer() const { if (!tqparent()) return 0L; - TQWidget* candidate = tqparentWidget()->tqparentWidget(); + TQWidget* candidate = parentWidget()->parentWidget(); if (candidate && dynamic_cast<KDockContainer*>(candidate)) return candidate; return 0L; } @@ -1276,8 +1276,8 @@ void KDockWidget::undock() manager->d->dragRect = TQRect (); manager->drawDragRectangle (); - TQWidget* tqparentW = tqparentWidget(); - if ( !tqparentW ){ + TQWidget* parentW = parentWidget(); + if ( !parentW ){ hide(); if (!d->blockHasUndockedSignal) emit hasUndocked(); @@ -1290,70 +1290,70 @@ void KDockWidget::undock() manager->blockSignals(true); manager->undockProcess = true; - bool isV = tqparentW->isVisibleToTLW(); + bool isV = parentW->isVisibleToTLW(); //UNDOCK HAS TO BE IMPLEMENTED CORRECTLY :) - KDockTabGroup* tqparentTab = tqparentDockTabGroup(); - if ( tqparentTab ){ - d->index = tqparentTab->indexOf( this); // memorize the page position in the tab widget - tqparentTab->removePage( this ); + KDockTabGroup* parentTab = parentDockTabGroup(); + if ( parentTab ){ + d->index = parentTab->indexOf( this); // memorize the page position in the tab widget + parentTab->removePage( this ); /* - TQWidget *wantTransient=tqparentTab->transientTo(); + TQWidget *wantTransient=parentTab->transientTo(); target->setDockWindowTransient(wantTransient,wantTransient); */ - setFormerBrotherDockWidget((KDockWidget*)tqparentTab->page(0)); + setFormerBrotherDockWidget((KDockWidget*)parentTab->page(0)); applyToWidget( 0L ); - if ( tqparentTab->count() == 1 ){ + if ( parentTab->count() == 1 ){ // last subdock widget in the tab control - KDockWidget* lastTab = (KDockWidget*)tqparentTab->page(0); - tqparentTab->removePage( lastTab ); -/* TQWidget *wantTransient=tqparentTab->transientTo(); + KDockWidget* lastTab = (KDockWidget*)parentTab->page(0); + parentTab->removePage( lastTab ); +/* TQWidget *wantTransient=parentTab->transientTo(); target->setDockWindowTransient(wantTransient,wantTransient);*/ lastTab->applyToWidget( 0L ); - lastTab->move( tqparentTab->mapToGlobal(tqparentTab->frameGeometry().topLeft()) ); + lastTab->move( parentTab->mapToGlobal(parentTab->frameGeometry().topLeft()) ); // KDockTabGroup always have a tqparent that is a KDockWidget - KDockWidget* tqparentOfTab = (KDockWidget*)tqparentTab->tqparent(); - delete tqparentTab; // KDockTabGroup + KDockWidget* parentOfTab = (KDockWidget*)parentTab->tqparent(); + delete parentTab; // KDockTabGroup - TQWidget* tqparentOfDockWidget = tqparentOfTab->tqparentWidget(); - if ( !tqparentOfDockWidget ){ + TQWidget* parentOfDockWidget = parentOfTab->parentWidget(); + if ( !parentOfDockWidget ){ if ( isV ) lastTab->show(); } else { - if ( tqparentOfDockWidget->inherits("KDockSplitter") ){ - KDockSplitter* split = (KDockSplitter*)tqparentOfDockWidget; + if ( parentOfDockWidget->inherits("KDockSplitter") ){ + KDockSplitter* split = (KDockSplitter*)parentOfDockWidget; lastTab->applyToWidget( split ); split->deactivate(); - if ( split->getFirst() == tqparentOfTab ){ + if ( split->getFirst() == parentOfTab ){ split->activate( lastTab ); if ( ((KDockWidget*)split->tqparent())->splitterOrientation ==Qt::Vertical ) - emit ((KDockWidget*)split->getAnother(tqparentOfTab))->docking( tqparentOfTab, KDockWidget::DockLeft ); + emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockLeft ); else - emit ((KDockWidget*)split->getAnother(tqparentOfTab))->docking( tqparentOfTab, KDockWidget::DockTop ); + emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockTop ); } else { split->activate( 0L, lastTab ); if ( ((KDockWidget*)split->tqparent())->splitterOrientation ==Qt::Vertical ) - emit ((KDockWidget*)split->getAnother(tqparentOfTab))->docking( tqparentOfTab, KDockWidget::DockRight ); + emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockRight ); else - emit ((KDockWidget*)split->getAnother(tqparentOfTab))->docking( tqparentOfTab, KDockWidget::DockBottom ); + emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockBottom ); } split->show(); } else { - lastTab->applyToWidget( tqparentOfDockWidget ); + lastTab->applyToWidget( parentOfDockWidget ); } lastTab->show(); } manager->blockSignals(false); - emit manager->replaceDock( tqparentOfTab, lastTab ); - lastTab->currentDockPos = tqparentOfTab->currentDockPos; - emit tqparentOfTab->iMBeingClosed(); + emit manager->replaceDock( parentOfTab, lastTab ); + lastTab->currentDockPos = parentOfTab->currentDockPos; + emit parentOfTab->iMBeingClosed(); manager->blockSignals(true); - delete tqparentOfTab; + delete parentOfTab; } else { - setDockTabName( tqparentTab ); + setDockTabName( parentTab ); } } else { /*********************************************************************************************/ @@ -1366,41 +1366,41 @@ void KDockWidget::undock() KDockContainer* dc = dynamic_cast<KDockContainer*>(d->container.operator->()); if (dc) { dc->undockWidget(this); - setFormerBrotherDockWidget(dc->tqparentDockWidget()); + setFormerBrotherDockWidget(dc->parentDockWidget()); } applyToWidget( 0L ); } if (!undockedFromContainer) { /*********************************************************************************************/ - if ( tqparentW->inherits("KDockSplitter") ){ - KDockSplitter* tqparentSplitterOfDockWidget = (KDockSplitter*)tqparentW; - d->splitPosInPercent = tqparentSplitterOfDockWidget->separatorPos(); + if ( parentW->inherits("KDockSplitter") ){ + KDockSplitter* parentSplitterOfDockWidget = (KDockSplitter*)parentW; + d->splitPosInPercent = parentSplitterOfDockWidget->separatorPos(); - KDockWidget* secondWidget = (KDockWidget*)tqparentSplitterOfDockWidget->getAnother( this ); - KDockWidget* group = (KDockWidget*)tqparentSplitterOfDockWidget->tqparentWidget(); + KDockWidget* secondWidget = (KDockWidget*)parentSplitterOfDockWidget->getAnother( this ); + KDockWidget* group = (KDockWidget*)parentSplitterOfDockWidget->parentWidget(); setFormerBrotherDockWidget(secondWidget); applyToWidget( 0L ); group->hide(); - if ( !group->tqparentWidget() ){ + if ( !group->parentWidget() ){ secondWidget->applyToWidget( 0L, group->frameGeometry().topLeft() ); secondWidget->resize( group->width(), group->height() ); } else { - TQWidget* obj = group->tqparentWidget(); + TQWidget* obj = group->parentWidget(); secondWidget->applyToWidget( obj ); if ( obj->inherits("KDockSplitter") ){ - KDockSplitter* tqparentOfGroup = (KDockSplitter*)obj; - tqparentOfGroup->deactivate(); + KDockSplitter* parentOfGroup = (KDockSplitter*)obj; + parentOfGroup->deactivate(); - if ( tqparentOfGroup->getFirst() == group ) - tqparentOfGroup->activate( secondWidget ); + if ( parentOfGroup->getFirst() == group ) + parentOfGroup->activate( secondWidget ); else - tqparentOfGroup->activate( 0L, secondWidget ); + parentOfGroup->activate( 0L, secondWidget ); } } secondWidget->currentDockPos = group->currentDockPos; secondWidget->formerDockPos = group->formerDockPos; - delete tqparentSplitterOfDockWidget; + delete parentSplitterOfDockWidget; manager->blockSignals(false); emit manager->replaceDock( group, secondWidget ); emit group->iMBeingClosed(); @@ -1475,13 +1475,13 @@ void KDockWidget::setDockTabName( KDockTabGroup* tab ) listOfCaption.remove( listOfCaption.length()-1, 1 ); listOfName.remove( listOfName.length()-1, 1 ); - tab->tqparentWidget()->setName( listOfName.utf8() ); - tab->tqparentWidget()->setCaption( listOfCaption ); + tab->parentWidget()->setName( listOfName.utf8() ); + tab->parentWidget()->setCaption( listOfCaption ); - tab->tqparentWidget()->tqrepaint( false ); // KDockWidget->tqrepaint - if ( tab->tqparentWidget()->tqparent() ) - if ( tab->tqparentWidget()->tqparent()->inherits("KDockSplitter") ) - ((KDockSplitter*)(tab->tqparentWidget()->tqparent()))->updateName(); + tab->parentWidget()->tqrepaint( false ); // KDockWidget->tqrepaint + if ( tab->parentWidget()->tqparent() ) + if ( tab->parentWidget()->tqparent()->inherits("KDockSplitter") ) + ((KDockSplitter*)(tab->parentWidget()->tqparent()))->updateName(); } bool KDockWidget::mayBeHide() const @@ -1514,11 +1514,11 @@ void KDockWidget::changeHideShowState() void KDockWidget::makeDockVisible() { - if ( tqparentDockTabGroup() ){ - tqparentDockTabGroup()->showPage( this ); + if ( parentDockTabGroup() ){ + parentDockTabGroup()->showPage( this ); } - if (tqparentDockContainer()) { - TQWidget *contWid=tqparentDockContainer(); + if (parentDockContainer()) { + TQWidget *contWid=parentDockContainer(); KDockContainer *x = dynamic_cast<KDockContainer*>(contWid); if (x) { x->showWidget(this); @@ -1526,11 +1526,11 @@ void KDockWidget::makeDockVisible() } if ( isVisible() ) return; - TQWidget* p = tqparentWidget(); + TQWidget* p = parentWidget(); while ( p ){ if ( !p->isVisible() ) p->show(); - p = p->tqparentWidget(); + p = p->parentWidget(); } if( !tqparent() ) // is undocked dockBack(); @@ -1676,7 +1676,7 @@ void KDockManager::activate() while ( (obj=(KDockWidget*)it.current()) ) { ++it; if ( obj->widget ) obj->widget->show(); - if ( !obj->tqparentDockTabGroup() ){ + if ( !obj->parentDockTabGroup() ){ obj->show(); } } @@ -1847,7 +1847,7 @@ KDockWidget* KDockManager::findDockWidgetAt( const TQPoint& pos ) if (!childDockWidgetList) return 0L; if ( childDockWidgetList->tqfind(w) != -1 ) return 0L; - if ( currentDragWidget->isGroup && ((KDockWidget*)w)->tqparentDockTabGroup() ) return 0L; + if ( currentDragWidget->isGroup && ((KDockWidget*)w)->parentDockTabGroup() ) return 0L; KDockWidget* www = (KDockWidget*)w; if ( www->sDocking == (int)KDockWidget::DockNone ) return 0L; @@ -1931,9 +1931,9 @@ void KDockManager::startDrag( KDockWidget* w ) || ( w->currentDockPos == KDockWidget::DockTop) || ( w->currentDockPos == KDockWidget::DockBottom)) { w->prevSideDockPosBeforeDrag = w->currentDockPos; - if ( w->tqparentWidget()->inherits("KDockSplitter") ){ - KDockSplitter* tqparentSplitterOfDockWidget = (KDockSplitter*)(w->tqparentWidget()); - w->d->splitPosInPercent = tqparentSplitterOfDockWidget->separatorPos(); + if ( w->parentWidget()->inherits("KDockSplitter") ){ + KDockSplitter* parentSplitterOfDockWidget = (KDockSplitter*)(w->parentWidget()); + w->d->splitPosInPercent = parentSplitterOfDockWidget->separatorPos(); } } @@ -1949,7 +1949,7 @@ void KDockManager::dragMove( KDockWidget* dw, TQPoint pos ) KDockWidget::DockPosition oldPos = curPos; TQSize r = dw->widget->size(); - if ( dw->tqparentDockTabGroup() ){ + if ( dw->parentDockTabGroup() ){ curPos = KDockWidget::DockCenter; if ( oldPos != curPos ) { d->dragRect.setRect( p.x()+2, p.y()+2, r.width()-4, r.height()-4 ); @@ -3118,10 +3118,10 @@ KDockContainer::~KDockContainer(){ void KDockContainer::activateOverlapMode(int nonOverlapSize) { m_nonOverlapSize=nonOverlapSize; m_overlapMode=true; - if (tqparentDockWidget()) { - if (tqparentDockWidget()->tqparent()) { + if (parentDockWidget()) { + if (parentDockWidget()->tqparent()) { kdDebug(282)<<"KDockContainer::activateOverlapMode: recalculating sizes"<<endl; - KDockSplitter *sp= static_cast<KDockSplitter*>(tqparentDockWidget()-> + KDockSplitter *sp= static_cast<KDockSplitter*>(parentDockWidget()-> tqparent()->qt_cast("KDockSplitter")); if (sp) sp->resizeEvent(0); } @@ -3131,10 +3131,10 @@ void KDockContainer::activateOverlapMode(int nonOverlapSize) { void KDockContainer::deactivateOverlapMode() { if (!m_overlapMode) return; m_overlapMode=false; - if (tqparentDockWidget()) { - if (tqparentDockWidget()->tqparent()) { + if (parentDockWidget()) { + if (parentDockWidget()->tqparent()) { kdDebug(282)<<"KDockContainer::deactivateOverlapMode: recalculating sizes"<<endl; - KDockSplitter *sp= static_cast<KDockSplitter*>(tqparentDockWidget()-> + KDockSplitter *sp= static_cast<KDockSplitter*>(parentDockWidget()-> tqparent()->qt_cast("KDockSplitter")); if (sp) sp->resizeEvent(0); } @@ -3152,7 +3152,7 @@ bool KDockContainer::dockDragMove(KDockWidget*, TQMouseEvent *) { return false;} bool KDockContainer::dockDragLeave(KDockWidget*, TQMouseEvent *) { return false;} -KDockWidget *KDockContainer::tqparentDockWidget(){return 0;} +KDockWidget *KDockContainer::parentDockWidget(){return 0;} TQStringList KDockContainer::containedWidgets() const { TQStringList tmp; diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget.h b/lib/compatibility/kmdi/qextmdi/kdockwidget.h index 8fffb002..5d0bbe86 100644 --- a/lib/compatibility/kmdi/qextmdi/kdockwidget.h +++ b/lib/compatibility/kmdi/qextmdi/kdockwidget.h @@ -632,10 +632,10 @@ public: /** * @return the tqparent widget of this if it inherits class KDockTabGroup */ - KDockTabGroup* tqparentDockTabGroup() const; + KDockTabGroup* parentDockTabGroup() const; /// @since 3.1 - TQWidget *tqparentDockContainer() const; + TQWidget *parentDockContainer() const; #ifndef NO_KDE2 @@ -946,7 +946,7 @@ public: #ifndef NO_KDE2 /** * Saves the current state of the dockmanager and of all controlled widgets. - * State means here to save the tqgeometry, visibility, tqparents, internal object names, orientation, + * State means here to save the tqgeometry, visibility, parents, internal object names, orientation, * separator positions, dockwidget-group information, tab widget states (if it is a tab group) and * last but not least some necessary things for recovering the dockmainwindow state. * diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget_p.h b/lib/compatibility/kmdi/qextmdi/kdockwidget_p.h index 39c9ffe1..637831f3 100644 --- a/lib/compatibility/kmdi/qextmdi/kdockwidget_p.h +++ b/lib/compatibility/kmdi/qextmdi/kdockwidget_p.h @@ -45,7 +45,7 @@ class KDEUI_EXPORT KDockContainer public: KDockContainer(); virtual ~KDockContainer(); - virtual KDockWidget *tqparentDockWidget(); + virtual KDockWidget *parentDockWidget(); virtual void insertWidget (KDockWidget *, TQPixmap, const TQString &, int &); virtual void showWidget(KDockWidget *); virtual void removeWidget(KDockWidget*); diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp b/lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp index f428783a..19a88368 100644 --- a/lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp +++ b/lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp @@ -490,15 +490,15 @@ void KDockSplitter::updateName() if ( !initialised ) return; TQString new_name = TQString( child0->name() ) + "," + child1->name(); - tqparentWidget()->setName( new_name.latin1() ); - tqparentWidget()->setCaption( child0->caption() + "," + child1->caption() ); - tqparentWidget()->tqrepaint( false ); + parentWidget()->setName( new_name.latin1() ); + parentWidget()->setCaption( child0->caption() + "," + child1->caption() ); + parentWidget()->tqrepaint( false ); - ((KDockWidget*)tqparentWidget())->firstName = child0->name(); - ((KDockWidget*)tqparentWidget())->lastName = child1->name(); - ((KDockWidget*)tqparentWidget())->splitterOrientation = m_orientation; + ((KDockWidget*)parentWidget())->firstName = child0->name(); + ((KDockWidget*)parentWidget())->lastName = child1->name(); + ((KDockWidget*)parentWidget())->splitterOrientation = m_orientation; - TQWidget* p = tqparentWidget()->tqparentWidget(); + TQWidget* p = parentWidget()->parentWidget(); if ( p && p->inherits("KDockSplitter" ) ) ((KDockSplitter*)p)->updateName(); } diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp b/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp index da7ede0d..063c76ba 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp @@ -244,7 +244,7 @@ void KMdiChildArea::resizeEvent( TQResizeEvent* e ) height() + child->m_pCaption->heightHint() + KMDI_CHILDFRM_SEPARATOR + KMDI_CHILDFRM_DOUBLE_BORDER ); } - tqlayoutMinimizedChildren(); + layoutMinimizedChildren(); TQWidget::resizeEvent( e ); } @@ -724,7 +724,7 @@ void KMdiChildArea::tileVertically() } -void KMdiChildArea::tqlayoutMinimizedChildren() +void KMdiChildArea::layoutMinimizedChildren() { int posX = 0; int posY = height(); diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildarea.h b/lib/compatibility/kmdi/qextmdi/kmdichildarea.h index ef1495e7..45df1eff 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildarea.h +++ b/lib/compatibility/kmdi/qextmdi/kmdichildarea.h @@ -242,7 +242,7 @@ public slots: /** * Position and tqlayout the minimized child frames */ - void tqlayoutMinimizedChildren(); + void layoutMinimizedChildren(); protected: @@ -252,7 +252,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/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp b/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp index d4926546..ed26a9e5 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp +++ b/lib/compatibility/kmdi/qextmdi/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 @@ -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(); diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.h b/lib/compatibility/kmdi/qextmdi/kmdichildfrm.h index 535804e8..21ea562f 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.h +++ b/lib/compatibility/kmdi/qextmdi/kmdichildfrm.h @@ -194,14 +194,14 @@ public: ~KMdiChildFrm(); /** - * Retqparents the widget w to this KMdiChildFrm (if this is not already done) + * Reparents the widget w to this KMdiChildFrm (if this is not already done) * Installs an event filter to catch focus events. * Resizes this mdi child in a way that the child fits perfectly in. */ void setClient( KMdiChildView *w, bool bAutomaticResize = false ); /** - * Retqparents the client widget to 0 (desktop), moves with an offset from the original position + * Reparents the client widget to 0 (desktop), moves with an offset from the original position * Removes the event filter. */ void unsetClient( TQPoint positionOffset = TQPoint( 0, 0 ) ); @@ -308,7 +308,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 * ); diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.cpp b/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.cpp index add999e9..744ceb19 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.cpp +++ b/lib/compatibility/kmdi/qextmdi/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/lib/compatibility/kmdi/qextmdi/kmdichildview.cpp b/lib/compatibility/kmdi/qextmdi/kmdichildview.cpp index 02400c4d..ae39849c 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildview.cpp +++ b/lib/compatibility/kmdi/qextmdi/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/lib/compatibility/kmdi/qextmdi/kmdichildview.h b/lib/compatibility/kmdi/qextmdi/kmdichildview.h index 298b2198..e7d04768 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdichildview.h +++ b/lib/compatibility/kmdi/qextmdi/kmdichildview.h @@ -183,13 +183,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 @@ -604,7 +604,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/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp index ff24a983..28b42bc8 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp @@ -156,26 +156,26 @@ void KMdiDockContainer::init() if ( !m_horizontal ) { kdDebug( 760 ) << k_funcinfo << "Horizontal tabbar. Setting forced fixed width." << endl; - tqparentDockWidget()->setForcedFixedWidth( m_tb->width() ); + parentDockWidget()->setForcedFixedWidth( m_tb->width() ); activateOverlapMode( m_tb->width() ); } else { kdDebug( 760 ) << k_funcinfo << "Vertical tabbar. Setting forced fixed height." << endl; - tqparentDockWidget()->setForcedFixedHeight( m_tb->height() ); + parentDockWidget()->setForcedFixedHeight( m_tb->height() ); activateOverlapMode( m_tb->height() ); } // try to restore splitter size - if ( tqparentDockWidget() && tqparentDockWidget()->tqparent() ) + if ( parentDockWidget() && parentDockWidget()->tqparent() ) { - KDockSplitter * sp = static_cast<KDockSplitter*>( tqparentDockWidget()->tqparent()->qt_cast( "KDockSplitter" ) ); + KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget()->tqparent()->qt_cast( "KDockSplitter" ) ); if ( sp ) sp->setSeparatorPosX( m_separatorPos ); } } -KDockWidget* KMdiDockContainer::tqparentDockWidget() +KDockWidget* KMdiDockContainer::parentDockWidget() { return ( ( KDockWidget* ) tqparent() ); } @@ -201,8 +201,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" ) ) { @@ -359,7 +359,7 @@ void KMdiDockContainer::hideIfNeeded() if ( itemNames.count() == 0 ) { kdDebug( 760 ) << k_funcinfo << "Hiding the dock container" << endl; - ( ( KDockWidget* ) tqparentWidget() )->undock(); + ( ( KDockWidget* ) parentWidget() )->undock(); } } @@ -421,14 +421,14 @@ void KMdiDockContainer::tabClicked( int t ) { kdDebug( 760 ) << k_funcinfo << "Showing widgetstack for tab just clicked" << endl; m_ws->show(); - tqparentDockWidget()->restoreFromForcedFixedSize(); + parentDockWidget()->restoreFromForcedFixedSize(); } if ( !m_ws->widget( t ) ) { kdDebug( 760 ) << k_funcinfo << "Widget tab was clicked for is not in our stack" << endl; kdDebug( 760 ) << k_funcinfo << "Docking it back in" << endl; - m_revMap[t]->manualDock( tqparentDockWidget(), KDockWidget::DockCenter, 20 ); + m_revMap[t]->manualDock( parentDockWidget(), KDockWidget::DockCenter, 20 ); if ( call_makeVisible ) m_revMap[t]->makeDockVisible(); m_tabSwitching = false; @@ -462,9 +462,9 @@ void KMdiDockContainer::tabClicked( int t ) { kdDebug( 760 ) << k_funcinfo << "Tab " << t << " was just deactiviated" << endl; // try save splitter position - if ( tqparentDockWidget() && tqparentDockWidget()->tqparent() ) + if ( parentDockWidget() && parentDockWidget()->tqparent() ) { - KDockSplitter * sp = static_cast<KDockSplitter*>( tqparentDockWidget()->tqparent()->qt_cast( "KDockSplitter" ) ); + KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget()->tqparent()->qt_cast( "KDockSplitter" ) ); if ( sp ) m_separatorPos = sp->separatorPos(); } @@ -484,9 +484,9 @@ void KMdiDockContainer::tabClicked( int t ) kdDebug( 760 ) << k_funcinfo << "Fixed Width:" << m_tb->width() << endl; if ( !m_horizontal ) - tqparentDockWidget()->setForcedFixedWidth( m_tb->width() ); // strange why it worked before at all + parentDockWidget()->setForcedFixedWidth( m_tb->width() ); // strange why it worked before at all else - tqparentDockWidget()->setForcedFixedHeight( m_tb->height() ); // strange why it worked before at all + parentDockWidget()->setForcedFixedHeight( m_tb->height() ); // strange why it worked before at all } m_tabSwitching = false; } @@ -589,9 +589,9 @@ void KMdiDockContainer::load( TQDomElement& dockEl ) TQPtrListIterator<KMultiTabBarTab> it1( *tl ); m_ws->hide(); if ( !m_horizontal ) - tqparentDockWidget()->setForcedFixedWidth( m_tb->width() ); + parentDockWidget()->setForcedFixedWidth( m_tb->width() ); else - tqparentDockWidget()->setForcedFixedHeight( m_tb->height() ); + parentDockWidget()->setForcedFixedHeight( m_tb->height() ); for ( ;it1.current() != 0;++it1 ) m_tb->setTab( it1.current() ->id(), false ); @@ -633,9 +633,9 @@ void KMdiDockContainer::save( KConfig* cfg, const TQString& group_or_prefix ) cfg->writeEntry( "overlapMode", "false" ); // try to save the splitter position - if ( tqparentDockWidget() && tqparentDockWidget() ->tqparent() ) + if ( parentDockWidget() && parentDockWidget() ->tqparent() ) { - KDockSplitter * sp = static_cast<KDockSplitter*>( tqparentDockWidget() -> + KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget() -> tqparent() ->qt_cast( "KDockSplitter" ) ); if ( sp ) cfg->writeEntry( "separatorPos", m_separatorPos ); @@ -714,9 +714,9 @@ void KMdiDockContainer::load( KConfig* cfg, const TQString& group_or_prefix ) TQPtrListIterator<KMultiTabBarTab> it1( *tl ); m_ws->hide(); if ( !m_horizontal ) - tqparentDockWidget() ->setForcedFixedWidth( m_tb->width() ); + parentDockWidget() ->setForcedFixedWidth( m_tb->width() ); else - tqparentDockWidget() ->setForcedFixedHeight( m_tb->height() ); + parentDockWidget() ->setForcedFixedHeight( m_tb->height() ); for ( ;it1.current() != 0;++it1 ) { m_tb->setTab( it1.current() ->id(), false ); diff --git a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.h b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.h index 3806194e..eb984d0d 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.h +++ b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.h @@ -44,7 +44,7 @@ public: virtual ~KMdiDockContainer(); /** Get the KDockWidget that is our tqparent */ - KDockWidget *tqparentDockWidget(); + KDockWidget *parentDockWidget(); /** * Add a widget to this container diff --git a/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp b/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp index 8c4c10ca..bc3d764a 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp @@ -82,8 +82,8 @@ void ToggleToolViewAction::anDWChanged() setChecked( false ); else if ( ( !isChecked() ) && m_dw->mayBeHide() ) setChecked( true ); - else if ( isChecked() && ( m_dw->tqparentDockTabGroup() && - ( ( static_cast<KDockWidget*>( m_dw->tqparentDockTabGroup() -> + else if ( isChecked() && ( m_dw->parentDockTabGroup() && + ( ( static_cast<KDockWidget*>( m_dw->parentDockTabGroup() -> tqparent() ->qt_cast( "KDockWidget" ) ) ) ->mayBeShow() ) ) ) setChecked( false ); } diff --git a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp b/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp index a9f5e7f7..259b814f 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp @@ -135,8 +135,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 ) @@ -298,7 +298,7 @@ void KMdiMainFrm::setStandardMDIMenuEnabled( bool showModeMenu ) //============ ~KMdiMainFrm ============// KMdiMainFrm::~KMdiMainFrm() { - //save the tqchildren first to a list, as removing tqinvalidates our iterator + //save the tqchildren first to a list, as removing invalidates our iterator TQValueList<KMdiChildView*> tqchildren; for ( KMdiChildView * w = m_pDocumentViews->first();w;w = m_pDocumentViews->next() ) tqchildren.append( w ); @@ -395,7 +395,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 ; @@ -410,7 +410,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 ); } @@ -631,7 +631,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 ); @@ -776,12 +776,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 ) @@ -829,7 +829,7 @@ void KMdiMainFrm::removeWindowFromMdi( KMdiChildView *pWnd ) } //============== closeWindow ==============// -void KMdiMainFrm::closeWindow( KMdiChildView *pWnd, bool tqlayoutTaskBar ) +void KMdiMainFrm::closeWindow( KMdiChildView *pWnd, bool layoutTaskBar ) { if ( !pWnd ) return ; @@ -840,7 +840,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 ) ) @@ -878,12 +878,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 ) @@ -1238,7 +1238,7 @@ bool KMdiMainFrm::eventFilter( TQObject * /*obj*/, TQEvent *e ) */ void KMdiMainFrm::closeAllViews() { - //save the tqchildren first to a list, as removing tqinvalidates our iterator + //save the tqchildren first to a list, as removing invalidates our iterator TQValueList<KMdiChildView*> tqchildren; for ( KMdiChildView * w = m_pDocumentViews->first();w;w = m_pDocumentViews->next() ) { @@ -1306,7 +1306,7 @@ void KMdiMainFrm::findRootDockWidgets( TQPtrList<KDockWidget>* rootDockWidgetLis if ( undockCandidate->enableDocking() != KDockWidget::DockNone ) rootDockWindow = undockCandidate; } - pW = pW->tqparentWidget(); + pW = pW->parentWidget(); } if ( rootDockWindow ) @@ -1399,7 +1399,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 tqparent widget ( which i expect we wouldn't ) //make sure we take into account the size of the docks provided by @@ -1560,7 +1560,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 ); @@ -1666,7 +1666,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 ); @@ -1692,7 +1692,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 ); @@ -1888,9 +1888,9 @@ void KMdiMainFrm::dockToolViewsIntoContainers( TQPtrList<KDockWidget>& widgetsTo void KMdiMainFrm::findToolViewsDockedToMain( TQPtrList<KDockWidget>* list, KDockWidget::DockPosition dprtmw ) { KDockWidget* mainDock = getMainDockWidget(); - if ( mainDock->tqparentDockTabGroup() ) + if ( mainDock->parentDockTabGroup() ) { - mainDock = dynamic_cast<KDockWidget*>( mainDock->tqparentDockTabGroup()->tqparent() ); + mainDock = dynamic_cast<KDockWidget*>( mainDock->parentDockTabGroup()->tqparent() ); // FIXME: will likely crash below due to unchecked cast } @@ -1901,9 +1901,9 @@ void KMdiMainFrm::findToolViewsDockedToMain( TQPtrList<KDockWidget>* list, KDock } KDockWidget* widget = mainDock->findNearestDockWidget( dprtmw ); - if ( widget && widget->tqparentDockTabGroup() ) + if ( widget && widget->parentDockTabGroup() ) { - widget = static_cast<KDockWidget*>( TQT_TQWIDGET(widget->tqparentDockTabGroup() ->tqparent()) ); + widget = static_cast<KDockWidget*>( TQT_TQWIDGET(widget->parentDockTabGroup() ->tqparent()) ); if ( widget ) { @@ -1934,21 +1934,21 @@ void KMdiMainFrm::setupToolViewsForIDEALMode() KDockWidget *mainDock = getMainDockWidget(); KDockWidget *w = mainDock; - if ( mainDock->tqparentDockTabGroup() ) - w = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->tqparentDockTabGroup()->tqparent()) ); + if ( mainDock->parentDockTabGroup() ) + w = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup()->tqparent()) ); - 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->tqparentDockTabGroup() ) - mainDock = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->tqparentDockTabGroup() ->tqparent()) ); + if ( mainDock->parentDockTabGroup() ) + mainDock = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup() ->tqparent()) ); - 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 ); @@ -2000,10 +2000,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 ); @@ -2082,7 +2082,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 ); @@ -2105,7 +2105,7 @@ void KMdiMainFrm::finishIDEAlMode( bool full ) } else { - pParent = pParent->tqparentWidget(); + pParent = pParent->parentWidget(); } } while ( pParent && !pDockW ); @@ -2139,9 +2139,9 @@ void KMdiMainFrm::idealToolViewsToStandardTabs( TQStringList widgetNames, KDockW Q_UNUSED( size ) KDockWidget * mainDock = getMainDockWidget(); - if ( mainDock->tqparentDockTabGroup() ) + if ( mainDock->parentDockTabGroup() ) { - mainDock = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->tqparentDockTabGroup() ->tqparent()) ); + mainDock = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup() ->tqparent()) ); } if ( widgetNames.count() > 0 ) @@ -2167,7 +2167,7 @@ void KMdiMainFrm::idealToolViewsToStandardTabs( TQStringList widgetNames, KDockW } #if 0 - TQWidget *wid = dwpd->tqparentDockTabGroup(); + TQWidget *wid = dwpd->parentDockTabGroup(); if ( !wid ) wid = dwpd; wid->setGeometry( 0, 0, 20, 20 ); @@ -2266,10 +2266,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/lib/compatibility/kmdi/qextmdi/kmdimainfrm.h b/lib/compatibility/kmdi/qextmdi/kmdimainfrm.h index 6f94451e..7200c941 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.h +++ b/lib/compatibility/kmdi/qextmdi/kmdimainfrm.h @@ -297,7 +297,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(); /** @@ -564,7 +564,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. diff --git a/lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp b/lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp index f99f5b76..192717bb 100644 --- a/lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp @@ -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,7 +303,7 @@ void KMdiTaskBar::setActiveButton( KMdiChildView *win_ptr ) } } -void KMdiTaskBar::tqlayoutTaskBar( int taskBarWidth ) +void KMdiTaskBar::layoutTaskBar( int taskBarWidth ) { if ( m_layoutIsPending ) return ; @@ -339,7 +339,7 @@ void KMdiTaskBar::tqlayoutTaskBar( 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() ) { @@ -381,7 +381,7 @@ void KMdiTaskBar::resizeEvent( TQResizeEvent* rse ) { if ( m_pButtonList->count() != 0 ) { - tqlayoutTaskBar( rse->size().width() ); + layoutTaskBar( rse->size().width() ); } } KToolBar::resizeEvent( rse ); diff --git a/lib/compatibility/kmdi/qextmdi/kmditaskbar.h b/lib/compatibility/kmdi/qextmdi/kmditaskbar.h index 2de377cb..e4ec2f8b 100644 --- a/lib/compatibility/kmdi/qextmdi/kmditaskbar.h +++ b/lib/compatibility/kmdi/qextmdi/kmditaskbar.h @@ -88,7 +88,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: @@ -173,7 +173,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: @@ -184,7 +184,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). diff --git a/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.cpp b/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.cpp index af304edf..a2dd531a 100644 --- a/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.cpp +++ b/lib/compatibility/kmdi/qextmdi/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/lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp b/lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp index 3ad39b1c..dcff6236 100644 --- a/lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp @@ -446,13 +446,13 @@ void KMultiTabBarButton::setStyle(KMultiTabBar::KMultiTabBarStyle style) void KMultiTabBarButton::hideEvent( TQHideEvent* he) { TQPushButton::hideEvent(he); - KMultiTabBar *tb=dynamic_cast<KMultiTabBar*>(tqparentWidget()); + KMultiTabBar *tb=dynamic_cast<KMultiTabBar*>(parentWidget()); if (tb) tb->updateSeparator(); } void KMultiTabBarButton::showEvent( TQShowEvent* he) { TQPushButton::showEvent(he); - KMultiTabBar *tb=dynamic_cast<KMultiTabBar*>(tqparentWidget()); + KMultiTabBar *tb=dynamic_cast<KMultiTabBar*>(parentWidget()); if (tb) tb->updateSeparator(); } diff --git a/lib/compatibility/kmdi/qextmdi/ktabbar.cpp b/lib/compatibility/kmdi/qextmdi/ktabbar.cpp index 6ca33c2d..9c7075cc 100644 --- a/lib/compatibility/kmdi/qextmdi/ktabbar.cpp +++ b/lib/compatibility/kmdi/qextmdi/ktabbar.cpp @@ -48,7 +48,7 @@ KTabBar::KTabBar( TQWidget *tqparent, const char *name ) mActivateDragSwitchTabTimer = new TQTimer( this ); connect( mActivateDragSwitchTabTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( activateDragSwitchTab() ) ); - connect(this, TQT_SIGNAL(tqlayoutChanged()), TQT_SLOT(onLayoutChange())); + connect(this, TQT_SIGNAL(layoutChanged()), TQT_SLOT(onLayoutChange())); } KTabBar::~KTabBar() |