diff options
Diffstat (limited to 'kdeui')
-rw-r--r-- | kdeui/kaboutdialog.cpp | 4 | ||||
-rw-r--r-- | kdeui/kaction.cpp | 2 | ||||
-rw-r--r-- | kdeui/kactionclasses.cpp | 2 | ||||
-rw-r--r-- | kdeui/kcommand.h | 2 | ||||
-rw-r--r-- | kdeui/kdialogbase.cpp | 6 | ||||
-rw-r--r-- | kdeui/kdockwidget.cpp | 48 | ||||
-rw-r--r-- | kdeui/kdockwidget_private.cpp | 14 | ||||
-rw-r--r-- | kdeui/kfontdialog.cpp | 4 | ||||
-rw-r--r-- | kdeui/kfontrequester.cpp | 2 | ||||
-rw-r--r-- | kdeui/khelpmenu.cpp | 2 | ||||
-rw-r--r-- | kdeui/kjanuswidget.cpp | 14 | ||||
-rw-r--r-- | kdeui/kjanuswidget.h | 4 | ||||
-rw-r--r-- | kdeui/kmainwindow.cpp | 4 | ||||
-rw-r--r-- | kdeui/kmenubar.cpp | 34 | ||||
-rw-r--r-- | kdeui/kpanelapplet.cpp | 2 | ||||
-rw-r--r-- | kdeui/kpanelapplet.h | 2 | ||||
-rw-r--r-- | kdeui/kpanelextension.cpp | 2 | ||||
-rw-r--r-- | kdeui/kpanelextension.h | 2 | ||||
-rw-r--r-- | kdeui/kpopupmenu.cpp | 2 | ||||
-rw-r--r-- | kdeui/ksystemtray.cpp | 20 | ||||
-rw-r--r-- | kdeui/ksystemtray.h | 4 | ||||
-rw-r--r-- | kdeui/ktabbar.cpp | 2 | ||||
-rw-r--r-- | kdeui/kurllabel.cpp | 4 | ||||
-rw-r--r-- | kdeui/kwhatsthismanager.cpp | 6 | ||||
-rw-r--r-- | kdeui/kxmlguibuilder.cpp | 2 | ||||
-rw-r--r-- | kdeui/kxmlguiclient.cpp | 2 | ||||
-rw-r--r-- | kdeui/qxembed.cpp | 2 |
27 files changed, 97 insertions, 97 deletions
diff --git a/kdeui/kaboutdialog.cpp b/kdeui/kaboutdialog.cpp index cd7c0fbb3..b4587dda5 100644 --- a/kdeui/kaboutdialog.cpp +++ b/kdeui/kaboutdialog.cpp @@ -451,7 +451,7 @@ void KAboutContainerBase::fontChange( const TQFont &/*oldFont*/ ) f.setBold( true ); mVersionLabel->setFont(f); mAuthorLabel->setFont(f); - mVersionLabel->tqparentWidget()->layout()->activate(); + mVersionLabel->parentWidget()->layout()->activate(); } update(); @@ -716,7 +716,7 @@ void KAboutContainerBase::setProduct( const TQString &appName, mAuthorLabel->hide(); } - mIconLabel->tqparentWidget()->layout()->activate(); + mIconLabel->parentWidget()->layout()->activate(); } diff --git a/kdeui/kaction.cpp b/kdeui/kaction.cpp index 2c5b5caec..3502f9d20 100644 --- a/kdeui/kaction.cpp +++ b/kdeui/kaction.cpp @@ -813,7 +813,7 @@ void KAction::plugMainWindowAccel( TQWidget *w ) // Note: tqtopLevelWidget() stops too early, we can't use it. TQWidget * tl = w; TQWidget * n; - while ( !tl->isDialog() && ( n = tl->tqparentWidget() ) ) // lookup parent and store + while ( !tl->isDialog() && ( n = tl->parentWidget() ) ) // lookup parent and store tl = n; KMainWindow * mw = tqt_dynamic_cast<KMainWindow *>(tl); // try to see if it's a kmainwindow diff --git a/kdeui/kactionclasses.cpp b/kdeui/kactionclasses.cpp index 2d926f971..9c5d201fb 100644 --- a/kdeui/kactionclasses.cpp +++ b/kdeui/kactionclasses.cpp @@ -2024,7 +2024,7 @@ int KToggleToolBarAction::plug( TQWidget* w, int index ) // Note: tqtopLevelWidget() stops too early, we can't use it. TQWidget * tl = w; TQWidget * n; - while ( !tl->isDialog() && ( n = tl->tqparentWidget() ) ) // lookup parent and store + while ( !tl->isDialog() && ( n = tl->parentWidget() ) ) // lookup parent and store tl = n; KMainWindow * mw = tqt_dynamic_cast<KMainWindow *>(tl); // try to see if it's a kmainwindow diff --git a/kdeui/kcommand.h b/kdeui/kcommand.h index a9b8e4f6c..97fa3c2e2 100644 --- a/kdeui/kcommand.h +++ b/kdeui/kcommand.h @@ -180,7 +180,7 @@ public: /** * Erases all the undo/redo history. - * Use this when reloading the data, for instance, since this tqinvalidates + * Use this when reloading the data, for instance, since this invalidates * all the commands. */ void clear(); diff --git a/kdeui/kdialogbase.cpp b/kdeui/kdialogbase.cpp index 264a9992e..655eff862 100644 --- a/kdeui/kdialogbase.cpp +++ b/kdeui/kdialogbase.cpp @@ -1113,7 +1113,7 @@ void KDialogBase::setDetailsWidget(TQWidget *detailsWidget) { delete d->detailsWidget; d->detailsWidget = detailsWidget; - if (d->detailsWidget->tqparentWidget() != this) + if (d->detailsWidget->parentWidget() != this) d->detailsWidget->reparent(this, TQPoint(0,0)); d->detailsWidget->hide(); if( mIsActivated ) @@ -1748,7 +1748,7 @@ TQSize KDialogBase::configDialogSize( KConfig& config, const TQString& groupName ) const { int w, h; - int scnum = TQApplication::desktop()->screenNumber(tqparentWidget()); + int scnum = TQApplication::desktop()->screenNumber(parentWidget()); TQRect desk = TQApplication::desktop()->screenGeometry(scnum); w = tqsizeHint().width(); @@ -1771,7 +1771,7 @@ void KDialogBase::saveDialogSize( const TQString& groupName, bool global ) void KDialogBase::saveDialogSize( KConfig& config, const TQString& groupName, bool global ) const { - int scnum = TQApplication::desktop()->screenNumber(tqparentWidget()); + int scnum = TQApplication::desktop()->screenNumber(parentWidget()); TQRect desk = TQApplication::desktop()->screenGeometry(scnum); KConfigGroupSaver cs(&config, groupName); diff --git a/kdeui/kdockwidget.cpp b/kdeui/kdockwidget.cpp index 006c822ad..f5dd09efc 100644 --- a/kdeui/kdockwidget.cpp +++ b/kdeui/kdockwidget.cpp @@ -323,7 +323,7 @@ void KDockWidgetHeader::setDragPanel( KDockWidgetHeaderDrag* nd ) delete drag; drag = nd; - if (drag->tqparentWidget()!=this) { + if (drag->parentWidget()!=this) { drag->reparent(this,TQPoint(0,0)); } @@ -351,7 +351,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()); @@ -382,7 +382,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; } @@ -858,7 +858,7 @@ void KDockWidget::show() void KDockWidget::setDockWindowType (NET::WindowType windowType) { d->windowType = windowType; - applyToWidget( tqparentWidget(), TQPoint(0,0) ); + applyToWidget( parentWidget(), TQPoint(0,0) ); } #endif @@ -867,7 +867,7 @@ void KDockWidget::setDockWindowTransient (TQWidget *parent, bool transientEnable { d->_parent = parent; d->transient = transientEnabled; - applyToWidget( tqparentWidget(), TQPoint(0,0) ); + applyToWidget( parentWidget(), TQPoint(0,0) ); } TQWidget *KDockWidget::transientTo() { @@ -898,7 +898,7 @@ bool KDockWidget::event( TQEvent *event ) emit manager->change(); break; case TQEvent::CaptionChange: - if ( tqparentWidget() ){ + if ( parentWidget() ){ if ( parent()->inherits("KDockSplitter") ){ ((KDockSplitter*)(parent()))->updateName(); } @@ -1091,7 +1091,7 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos, } // create a new dockwidget that will contain the target and this - TQWidget* parentDock = target->tqparentWidget(); + TQWidget* parentDock = target->parentWidget(); KDockWidget* newDock = new KDockWidget( manager, "tempName", TQPixmap(TQString("")), parentDock ); newDock->currentDockPos = target->currentDockPos; @@ -1218,7 +1218,7 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos, KDockTabGroup* KDockWidget::parentDockTabGroup() const { if ( !parent() ) return 0L; - TQWidget* candidate = tqparentWidget()->tqparentWidget(); + TQWidget* candidate = parentWidget()->parentWidget(); if ( candidate && candidate->inherits("KDockTabGroup") ) return (KDockTabGroup*)candidate; return 0L; } @@ -1226,7 +1226,7 @@ KDockTabGroup* KDockWidget::parentDockTabGroup() const TQWidget *KDockWidget::parentDockContainer() const { if (!parent()) return 0L; - TQWidget* candidate = tqparentWidget()->tqparentWidget(); + TQWidget* candidate = parentWidget()->parentWidget(); if (candidate && tqt_dynamic_cast<KDockContainer*>(candidate)) return candidate; return 0L; } @@ -1295,7 +1295,7 @@ void KDockWidget::undock() manager->d->dragRect = TQRect (); manager->drawDragRectangle (); - TQWidget* parentW = tqparentWidget(); + TQWidget* parentW = parentWidget(); if ( !parentW ){ hide(); if (!d->blockHasUndockedSignal) @@ -1337,7 +1337,7 @@ void KDockWidget::undock() KDockWidget* parentOfTab = (KDockWidget*)parentTab->parent(); delete parentTab; // KDockTabGroup - TQWidget* parentOfDockWidget = parentOfTab->tqparentWidget(); + TQWidget* parentOfDockWidget = parentOfTab->parentWidget(); if ( !parentOfDockWidget ){ if ( isV ) lastTab->show(); } else { @@ -1396,16 +1396,16 @@ void KDockWidget::undock() d->splitPosInPercent = parentSplitterOfDockWidget->separatorPosInPercent(); KDockWidget* secondWidget = (KDockWidget*)parentSplitterOfDockWidget->getAnother( this ); - KDockWidget* group = (KDockWidget*)parentSplitterOfDockWidget->tqparentWidget(); + 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* parentOfGroup = (KDockSplitter*)obj; @@ -1494,13 +1494,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()->parent() ) - if ( tab->tqparentWidget()->parent()->inherits("KDockSplitter") ) - ((KDockSplitter*)(tab->tqparentWidget()->parent()))->updateName(); + tab->parentWidget()->tqrepaint( false ); // KDockWidget->tqrepaint + if ( tab->parentWidget()->parent() ) + if ( tab->parentWidget()->parent()->inherits("KDockSplitter") ) + ((KDockSplitter*)(tab->parentWidget()->parent()))->updateName(); } bool KDockWidget::mayBeHide() const @@ -1545,11 +1545,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( !parent() ) // is undocked dockBack(); @@ -1948,8 +1948,8 @@ void KDockManager::startDrag( KDockWidget* w ) || ( w->currentDockPos == KDockWidget::DockTop) || ( w->currentDockPos == KDockWidget::DockBottom)) { w->prevSideDockPosBeforeDrag = w->currentDockPos; - if ( w->tqparentWidget()->inherits("KDockSplitter") ){ - KDockSplitter* parentSplitterOfDockWidget = (KDockSplitter*)(w->tqparentWidget()); + if ( w->parentWidget()->inherits("KDockSplitter") ){ + KDockSplitter* parentSplitterOfDockWidget = (KDockSplitter*)(w->parentWidget()); w->d->splitPosInPercent = parentSplitterOfDockWidget->separatorPosInPercent(); } } diff --git a/kdeui/kdockwidget_private.cpp b/kdeui/kdockwidget_private.cpp index 707a72f19..55ffc6229 100644 --- a/kdeui/kdockwidget_private.cpp +++ b/kdeui/kdockwidget_private.cpp @@ -585,15 +585,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/kdeui/kfontdialog.cpp b/kdeui/kfontdialog.cpp index c64892d8a..6aae075e2 100644 --- a/kdeui/kfontdialog.cpp +++ b/kdeui/kfontdialog.cpp @@ -711,11 +711,11 @@ void KFontChooser::showXLFDArea(bool show) { if( show ) { - xlfdEdit->tqparentWidget()->show(); + xlfdEdit->parentWidget()->show(); } else { - xlfdEdit->tqparentWidget()->hide(); + xlfdEdit->parentWidget()->hide(); } } diff --git a/kdeui/kfontrequester.cpp b/kdeui/kfontrequester.cpp index 748a0654d..293f9d546 100644 --- a/kdeui/kfontrequester.cpp +++ b/kdeui/kfontrequester.cpp @@ -72,7 +72,7 @@ void KFontRequester::setTitle( const TQString &title ) void KFontRequester::buttonClicked() { - int result = KFontDialog::getFont( m_selFont, m_onlyFixed, tqparentWidget() ); + int result = KFontDialog::getFont( m_selFont, m_onlyFixed, parentWidget() ); if ( result == KDialog::Accepted ) { diff --git a/kdeui/khelpmenu.cpp b/kdeui/khelpmenu.cpp index 5ab906a7c..663838fa8 100644 --- a/kdeui/khelpmenu.cpp +++ b/kdeui/khelpmenu.cpp @@ -307,7 +307,7 @@ void KHelpMenu::contextHelpActivated() TQWhatsThis::enterWhatsThisMode(); TQWidget* w = TQApplication::widgetAt( TQCursor::pos(), true ); while ( w && !w->isTopLevel() && !w->inherits("QXEmbed") ) - w = w->tqparentWidget(); + w = w->parentWidget(); #ifdef Q_WS_X11 if ( w && w->inherits("QXEmbed") ) (( QXEmbed*) w )->enterWhatsThisMode(); diff --git a/kdeui/kjanuswidget.cpp b/kdeui/kjanuswidget.cpp index 584a82c18..3605d492d 100644 --- a/kdeui/kjanuswidget.cpp +++ b/kdeui/kjanuswidget.cpp @@ -459,8 +459,8 @@ void KJanusWidget::addPageWidget( TQFrame *page, const TQStringList &items, TQString itemName = items.last(); IconListItem *item = new IconListItem( mIconList, pixmap, itemName ); mIconListToPageStack.insert(item, page); - mIconList->tqinvalidateHeight(); - mIconList->tqinvalidateWidth(); + mIconList->invalidateHeight(); + mIconList->invalidateWidth(); if (mIconList->isVisible()) mIconList->updateWidth(); @@ -686,7 +686,7 @@ int KJanusWidget::pageIndex( TQWidget *widget ) const // if( widget->isA(TQFRAME_OBJECT_NAME_STRING) ) { - return d->mPageToInt[widget->tqparentWidget()]; + return d->mPageToInt[widget->parentWidget()]; } else { @@ -714,8 +714,8 @@ void KJanusWidget::slotFontChanged() TQFont listFont( mIconList->font() ); listFont.setBold( true ); mIconList->setFont( listFont ); - mIconList->tqinvalidateHeight(); - mIconList->tqinvalidateWidth(); + mIconList->invalidateHeight(); + mIconList->invalidateWidth(); } } @@ -987,13 +987,13 @@ void KJanusWidget::IconListBox::updateWidth() } -void KJanusWidget::IconListBox::tqinvalidateHeight() +void KJanusWidget::IconListBox::invalidateHeight() { mHeightValid = false; } -void KJanusWidget::IconListBox::tqinvalidateWidth() +void KJanusWidget::IconListBox::invalidateWidth() { mWidthValid = false; } diff --git a/kdeui/kjanuswidget.h b/kdeui/kjanuswidget.h index 5f521612c..fc3eb2f27 100644 --- a/kdeui/kjanuswidget.h +++ b/kdeui/kjanuswidget.h @@ -77,8 +77,8 @@ class KDEUI_EXPORT KJanusWidget : public TQWidget IconListBox( TQWidget *parent=0, const char *name=0, WFlags f=0 ); void updateMinimumHeight(); void updateWidth(); - void tqinvalidateHeight(); - void tqinvalidateWidth(); + void invalidateHeight(); + void invalidateWidth(); void setShowAll( bool showAll ); protected: diff --git a/kdeui/kmainwindow.cpp b/kdeui/kmainwindow.cpp index 21b22f76b..1a605be18 100644 --- a/kdeui/kmainwindow.cpp +++ b/kdeui/kmainwindow.cpp @@ -901,7 +901,7 @@ void KMainWindow::finalizeGUI( bool force ) void KMainWindow::saveWindowSize( KConfig * config ) const { - int scnum = TQApplication::desktop()->screenNumber(tqparentWidget()); + int scnum = TQApplication::desktop()->screenNumber(parentWidget()); TQRect desk = TQApplication::desktop()->screenGeometry(scnum); int w, h; #if defined Q_WS_X11 @@ -937,7 +937,7 @@ void KMainWindow::restoreWindowSize( KConfig * config ) parseGeometry(true); } else { // restore the size - int scnum = TQApplication::desktop()->screenNumber(tqparentWidget()); + int scnum = TQApplication::desktop()->screenNumber(parentWidget()); TQRect desk = TQApplication::desktop()->screenGeometry(scnum); if ( d->defaultWindowSize.isNull() ) // only once d->defaultWindowSize = TQRect(desk.width(), width(), desk.height(), height()); // store default values diff --git a/kdeui/kmenubar.cpp b/kdeui/kmenubar.cpp index ed2702a9a..fcd56ddaa 100644 --- a/kdeui/kmenubar.cpp +++ b/kdeui/kmenubar.cpp @@ -167,8 +167,8 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level) top_level = true; d->wasTopLevel = top_level; - if( tqparentWidget() - && tqparentWidget()->tqtopLevelWidget()->isFullScreen()) + if( parentWidget() + && parentWidget()->tqtopLevelWidget()->isFullScreen()) top_level = false; if ( isTopLevelMenu() == top_level ) @@ -189,19 +189,19 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level) d->margin = margin(); d->fallback_mode = false; bool wasShown = !isHidden(); - reparent( tqparentWidget(), (WFlags)(WType_TopLevel | WStyle_Tool | WStyle_Customize | WStyle_NoBorder), TQPoint(0,0), false ); + reparent( parentWidget(), (WFlags)(WType_TopLevel | WStyle_Tool | WStyle_Customize | WStyle_NoBorder), TQPoint(0,0), false ); #ifdef Q_WS_X11 KWin::setType( winId(), NET::TopMenu ); - if( tqparentWidget()) - XSetTransientForHint( qt_xdisplay(), winId(), tqparentWidget()->tqtopLevelWidget()->winId()); + if( parentWidget()) + XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->tqtopLevelWidget()->winId()); #endif TQMenuBar::setFrameStyle( NoFrame ); TQMenuBar::setLineWidth( 0 ); TQMenuBar::setMargin( 0 ); updateFallbackSize(); d->min_size = TQSize( 0, 0 ); - if( tqparentWidget() && !tqparentWidget()->isTopLevel()) - setShown( tqparentWidget()->isVisible()); + if( parentWidget() && !parentWidget()->isTopLevel()) + setShown( parentWidget()->isVisible()); else if ( wasShown ) show(); } else @@ -217,8 +217,8 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level) setMinimumSize( 0, 0 ); setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX ); updateMenuBarSize(); - if ( tqparentWidget() ) - reparent( tqparentWidget(), TQPoint(0,0), !isHidden()); + if ( parentWidget() ) + reparent( parentWidget(), TQPoint(0,0), !isHidden()); } } @@ -244,7 +244,7 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev) { if ( d->topLevel ) { - if ( tqparentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(tqparentWidget()->tqtopLevelWidget()) ) + if ( parentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget()->tqtopLevelWidget()) ) { if( ev->type() == TQEvent::Resize ) return false; // ignore resizing of parent, TQMenuBar would try to adjust size @@ -257,21 +257,21 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev) // will update the state properly setTopLevelMenuInternal( d->topLevel ); } - if( tqparentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(tqparentWidget()) && ev->type() == TQEvent::Reparent ) + if( parentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget()) && ev->type() == TQEvent::Reparent ) { #ifdef Q_WS_X11 - XSetTransientForHint( qt_xdisplay(), winId(), tqparentWidget()->tqtopLevelWidget()->winId()); + XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->tqtopLevelWidget()->winId()); #else //TODO: WIN32? #endif - setShown( tqparentWidget()->isTopLevel() || tqparentWidget()->isVisible()); + setShown( parentWidget()->isTopLevel() || parentWidget()->isVisible()); } - if( tqparentWidget() && !tqparentWidget()->isTopLevel() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(tqparentWidget())) + if( parentWidget() && !parentWidget()->isTopLevel() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget())) { // if the parent is not toplevel, KMenuBar needs to match its visibility status if( ev->type() == TQEvent::Show ) { #ifdef Q_WS_X11 - XSetTransientForHint( qt_xdisplay(), winId(), tqparentWidget()->tqtopLevelWidget()->winId()); + XSetTransientForHint( qt_xdisplay(), winId(), parentWidget()->tqtopLevelWidget()->winId()); #else //TODO: WIN32? #endif @@ -283,10 +283,10 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev) } else { - if( tqparentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(tqparentWidget()->tqtopLevelWidget())) + if( parentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget()->tqtopLevelWidget())) { if( ev->type() == TQEvent::WindowStateChange - && !tqparentWidget()->tqtopLevelWidget()->isFullScreen() ) + && !parentWidget()->tqtopLevelWidget()->isFullScreen() ) setTopLevelMenuInternal( d->wasTopLevel ); } } diff --git a/kdeui/kpanelapplet.cpp b/kdeui/kpanelapplet.cpp index d592f35cc..152368b87 100644 --- a/kdeui/kpanelapplet.cpp +++ b/kdeui/kpanelapplet.cpp @@ -82,7 +82,7 @@ void KPanelApplet::tqsetAlignment( Alignment a ) { if( _tqalignment == a ) return; _tqalignment = a; - tqalignmentChange( a ); + alignmentChange( a ); } // FIXME: Remove implementation for KDE 4 diff --git a/kdeui/kpanelapplet.h b/kdeui/kpanelapplet.h index c53fb50ca..34adf910a 100644 --- a/kdeui/kpanelapplet.h +++ b/kdeui/kpanelapplet.h @@ -324,7 +324,7 @@ protected: * Reimplement this change handler in order to adjust the look of your * applet. **/ - virtual void tqalignmentChange( Alignment /*a*/ ) {} + virtual void alignmentChange( Alignment /*a*/ ) {} /** * Use this method to set the custom menu for this applet so that it can be shown diff --git a/kdeui/kpanelextension.cpp b/kdeui/kpanelextension.cpp index 0a5ee11a7..d3dc33c54 100644 --- a/kdeui/kpanelextension.cpp +++ b/kdeui/kpanelextension.cpp @@ -75,7 +75,7 @@ void KPanelExtension::tqsetAlignment( Alignment a ) { if( _tqalignment == a ) return; _tqalignment = a; - tqalignmentChange( a ); + alignmentChange( a ); } void KPanelExtension::setSize( Size size, int customSize ) diff --git a/kdeui/kpanelextension.h b/kdeui/kpanelextension.h index 486aa6fc5..d1131638d 100644 --- a/kdeui/kpanelextension.h +++ b/kdeui/kpanelextension.h @@ -309,7 +309,7 @@ protected: * Reimplement this change handler in order to adjust the look of your * applet. **/ - virtual void tqalignmentChange( Alignment ) {} + virtual void alignmentChange( Alignment ) {} /** * Use this method to set the custom menu for this extensions so that it can be shown diff --git a/kdeui/kpopupmenu.cpp b/kdeui/kpopupmenu.cpp index 6b63a951c..c4ef260e7 100644 --- a/kdeui/kpopupmenu.cpp +++ b/kdeui/kpopupmenu.cpp @@ -353,7 +353,7 @@ void KPopupMenu::keyPressEvent(TQKeyEvent* e) // therefore the lastHitIndex is valid i = d->lastHitIndex; } - } else if (key == Key_Backspace && tqparentMenu) { + } else if (key == Key_Backspace && parentMenu) { // backspace with no chars in the buffer... go back a menu. hide(); resetKeyboardVars(); diff --git a/kdeui/ksystemtray.cpp b/kdeui/ksystemtray.cpp index c9bebc47d..f0586ab28 100644 --- a/kdeui/ksystemtray.cpp +++ b/kdeui/ksystemtray.cpp @@ -77,13 +77,13 @@ KSystemTray::KSystemTray( TQWidget* parent, const char* name ) move( -1000, -1000 ); KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(maybeQuit()), d->actionCollection); - if (tqparentWidget()) + if (parentWidget()) { new KAction(i18n("Minimize"), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( minimizeRestoreAction() ), d->actionCollection, "minimizeRestore"); #ifdef Q_WS_X11 - KWin::WindowInfo info = KWin::windowInfo( tqparentWidget()->winId()); + KWin::WindowInfo info = KWin::windowInfo( parentWidget()->winId()); d->on_all_desktops = info.onAllDesktops(); #else d->on_all_desktops = false; @@ -152,9 +152,9 @@ void KSystemTray::mousePressEvent( TQMouseEvent *e ) case Qt::MidButton: // fall through case Qt::RightButton: - if ( tqparentWidget() ) { + if ( parentWidget() ) { KAction* action = d->actionCollection->action("minimizeRestore"); - if ( tqparentWidget()->isVisible() ) + if ( parentWidget()->isVisible() ) action->setText( i18n("&Minimize") ); else action->setText( i18n("&Restore") ); @@ -182,8 +182,8 @@ void KSystemTray::contextMenuAboutToShow( KPopupMenu* ) // entry is "minimize", otherwise it's "restore" void KSystemTray::minimizeRestoreAction() { - if ( tqparentWidget() ) { - bool restore = !( tqparentWidget()->isVisible() ); + if ( parentWidget() ) { + bool restore = !( parentWidget()->isVisible() ); minimizeRestore( restore ); } } @@ -207,9 +207,9 @@ void KSystemTray::maybeQuit() // KDE4: stop closing the parent widget? it results in complex application code // instead make applications connect to the quitSelected() signal - if (tqparentWidget()) + if (parentWidget()) { - tqparentWidget()->close(); + parentWidget()->close(); } else { @@ -237,7 +237,7 @@ void KSystemTray::setInactive() // (just like taskbar); otherwise hide it void KSystemTray::activateOrHide() { - TQWidget *pw = tqparentWidget(); + TQWidget *pw = parentWidget(); if ( !pw ) return; @@ -283,7 +283,7 @@ void KSystemTray::activateOrHide() void KSystemTray::minimizeRestore( bool restore ) { - TQWidget* pw = tqparentWidget(); + TQWidget* pw = parentWidget(); if( !pw ) return; #ifdef Q_WS_X11 diff --git a/kdeui/ksystemtray.h b/kdeui/ksystemtray.h index 0e22b1d6a..26e1b948a 100644 --- a/kdeui/ksystemtray.h +++ b/kdeui/ksystemtray.h @@ -163,7 +163,7 @@ protected: /** Reimplemented to provide the standard show/raise behavior - for the tqparentWidget() and the context menu. + for the parentWidget() and the context menu. Feel free to reimplement this if you need something special. */ @@ -171,7 +171,7 @@ protected: /** Reimplemented to provide the standard show/raise behavior - for the tqparentWidget() and the context menu. + for the parentWidget() and the context menu. Feel free to reimplement this if you need something special. */ diff --git a/kdeui/ktabbar.cpp b/kdeui/ktabbar.cpp index 18c5a03d6..8e2477e5f 100644 --- a/kdeui/ktabbar.cpp +++ b/kdeui/ktabbar.cpp @@ -48,7 +48,7 @@ KTabBar::KTabBar( TQWidget *parent, 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() diff --git a/kdeui/kurllabel.cpp b/kdeui/kurllabel.cpp index 884ff6a59..9846059ed 100644 --- a/kdeui/kurllabel.cpp +++ b/kdeui/kurllabel.cpp @@ -353,8 +353,8 @@ bool KURLLabel::event (TQEvent *e) { if (e && e->type() == TQEvent::ParentPaletteChange) { - // use tqparentWidget() unless you are a toplevel widget, then try qAapp - TQPalette p = tqparentWidget() ? tqparentWidget()->palette() : tqApp->palette(); + // use parentWidget() unless you are a toplevel widget, then try qAapp + TQPalette p = parentWidget() ? parentWidget()->palette() : tqApp->palette(); p.setBrush(TQColorGroup::Base, p.brush(TQPalette::Normal, TQColorGroup::Background)); p.setColor(TQColorGroup::Foreground, tqpalette().active().foreground()); setPalette(p); diff --git a/kdeui/kwhatsthismanager.cpp b/kdeui/kwhatsthismanager.cpp index 0ec05e5c4..b7873ed0e 100644 --- a/kdeui/kwhatsthismanager.cpp +++ b/kdeui/kwhatsthismanager.cpp @@ -52,8 +52,8 @@ TQString KWhatsThisUndefined::text (const TQPoint &) " describe the widget, you are welcome to <a href=\"submit" "-whatsthis\">send us your own \"What's This?\" help</a> for it."); TQString parent; - if (m_widget -> tqparentWidget ()) - parent = TQWhatsThis::textFor (m_widget -> tqparentWidget ()); + if (m_widget -> parentWidget ()) + parent = TQWhatsThis::textFor (m_widget -> parentWidget ()); if (parent != txt) if (! parent . isEmpty ()) return parent; @@ -68,7 +68,7 @@ bool KWhatsThisUndefined::clicked (const TQString& href) body . append ("Widget text: '" + (m_widget -> property ("text") . toString ()) + "'\n"); TQString dsc = TQString ("current --> ") + m_widget -> name (); dsc . append (TQString (" (") + m_widget -> className () + ")\n"); - for (w = m_widget; w && w != m_widget -> tqtopLevelWidget (); w = w -> tqparentWidget ()) { + for (w = m_widget; w && w != m_widget -> tqtopLevelWidget (); w = w -> parentWidget ()) { dsc . append (w -> name ()); dsc . append (TQString (" (") + w -> className () + ")\n"); } diff --git a/kdeui/kxmlguibuilder.cpp b/kdeui/kxmlguibuilder.cpp index e6412fa6d..123d85b2c 100644 --- a/kdeui/kxmlguibuilder.cpp +++ b/kdeui/kxmlguibuilder.cpp @@ -146,7 +146,7 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ // otherwise its shortcuts appear. TQWidget* p = parent; while ( p && !::tqqt_cast<KMainWindow *>( p ) ) - p = p->tqparentWidget(); + p = p->parentWidget(); TQCString name = element.attribute( d->attrName ).utf8(); diff --git a/kdeui/kxmlguiclient.cpp b/kdeui/kxmlguiclient.cpp index 150a5aa23..a20be86d6 100644 --- a/kdeui/kxmlguiclient.cpp +++ b/kdeui/kxmlguiclient.cpp @@ -269,7 +269,7 @@ bool KXMLGUIClient::mergeXML( TQDomElement &base, const TQDomElement &additive, // tag, in any event and just replace the old with the new if ( additive.attribute(attrNoMerge) == attrOne ) // ### use toInt() instead? (Simon) { - base.tqparentNode().tqreplaceChild(additive, base); + base.parentNode().tqreplaceChild(additive, base); return true; } diff --git a/kdeui/qxembed.cpp b/kdeui/qxembed.cpp index c08e012a4..794579cdb 100644 --- a/kdeui/qxembed.cpp +++ b/kdeui/qxembed.cpp @@ -839,7 +839,7 @@ bool QXEmbed::eventFilter( TQObject *o, TQEvent * e) { TQWidget* pos = this; while( TQT_BASE_OBJECT(pos) != TQT_BASE_OBJECT(o) && TQT_BASE_OBJECT(pos) != TQT_BASE_OBJECT(tqtopLevelWidget())) - pos = pos->tqparentWidget(); + pos = pos->parentWidget(); if( TQT_BASE_OBJECT(pos) == TQT_BASE_OBJECT(o) ) { // L1390: Send fake configure notify events whenever the // global position of the client changes. See L2900. |