diff options
Diffstat (limited to 'kmdi')
| -rw-r--r-- | kmdi/kmdi/mainwindow.cpp | 6 | ||||
| -rw-r--r-- | kmdi/kmdichildfrm.cpp | 2 | ||||
| -rw-r--r-- | kmdi/kmdimainfrm.cpp | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/kmdi/kmdi/mainwindow.cpp b/kmdi/kmdi/mainwindow.cpp index eb2382f08..6df34d9fa 100644 --- a/kmdi/kmdi/mainwindow.cpp +++ b/kmdi/kmdi/mainwindow.cpp @@ -153,7 +153,7 @@ void MainWindow::setupToolViews () KDockWidget *w=mainDock; if (mainDock->parentDockTabGroup()) { - w=static_cast<KDockWidget*>(mainDock->parentDockTabGroup()->parent()); + w=static_cast<KDockWidget*>(TQT_TQWIDGET(mainDock->parentDockTabGroup()->parent())); } TQPtrList<KDockWidget> leftReparentWidgets; @@ -162,7 +162,7 @@ void MainWindow::setupToolViews () TQPtrList<KDockWidget> topReparentWidgets; if (mainDock->parentDockTabGroup()) { - mainDock=static_cast<KDockWidget*>(mainDock->parentDockTabGroup()->parent()); + mainDock=static_cast<KDockWidget*>(TQT_TQWIDGET(mainDock->parentDockTabGroup()->parent())); } findToolViewsDockedToMain(&leftReparentWidgets,KDockWidget::DockLeft); @@ -380,7 +380,7 @@ void MainWindow::findToolViewsDockedToMain(TQPtrList<KDockWidget>* list,KDockWid KDockWidget* widget=mainDock->findNearestDockWidget(dprtmw); if (widget) { if (widget->parentDockTabGroup()) { - widget=static_cast<KDockWidget*>(widget->parentDockTabGroup()->parent()); + widget=static_cast<KDockWidget*>(TQT_TQWIDGET(widget->parentDockTabGroup()->parent())); } if (widget) { diff --git a/kmdi/kmdichildfrm.cpp b/kmdi/kmdichildfrm.cpp index 4e57649c7..8221082b5 100644 --- a/kmdi/kmdichildfrm.cpp +++ b/kmdi/kmdichildfrm.cpp @@ -775,7 +775,7 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize ) delete list; // delete the list, not the objects //Reparent if needed - if ( w->parent() != this ) + if ( TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(this) ) { //reparent to this widget , no flags , point , show it TQPoint pnt2( KMDI_CHILDFRM_BORDER, clientYPos ); diff --git a/kmdi/kmdimainfrm.cpp b/kmdi/kmdimainfrm.cpp index 46ba7870f..8fd8530f3 100644 --- a/kmdi/kmdimainfrm.cpp +++ b/kmdi/kmdimainfrm.cpp @@ -1899,7 +1899,7 @@ void KMdiMainFrm::findToolViewsDockedToMain( TQPtrList<KDockWidget>* list, KDock KDockWidget* widget = mainDock->findNearestDockWidget( dprtmw ); if ( widget && widget->parentDockTabGroup() ) { - widget = static_cast<KDockWidget*>( widget->parentDockTabGroup() ->parent() ); + widget = static_cast<KDockWidget*>( TQT_TQWIDGET(widget->parentDockTabGroup() ->parent()) ); if ( widget ) { @@ -1931,7 +1931,7 @@ void KMdiMainFrm::setupToolViewsForIDEALMode() KDockWidget *mainDock = getMainDockWidget(); KDockWidget *w = mainDock; if ( mainDock->parentDockTabGroup() ) - w = static_cast<KDockWidget*>( mainDock->parentDockTabGroup()->parent() ); + w = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup()->parent()) ); TQPtrList<KDockWidget> leftReparentWidgets; TQPtrList<KDockWidget> rightReparentWidgets; @@ -1939,7 +1939,7 @@ void KMdiMainFrm::setupToolViewsForIDEALMode() TQPtrList<KDockWidget> topReparentWidgets; if ( mainDock->parentDockTabGroup() ) - mainDock = static_cast<KDockWidget*>( mainDock->parentDockTabGroup() ->parent() ); + mainDock = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup() ->parent()) ); findToolViewsDockedToMain( &leftReparentWidgets, KDockWidget::DockLeft ); findToolViewsDockedToMain( &rightReparentWidgets, KDockWidget::DockRight ); @@ -2137,7 +2137,7 @@ void KMdiMainFrm::idealToolViewsToStandardTabs( TQStringList widgetNames, KDockW KDockWidget * mainDock = getMainDockWidget(); if ( mainDock->parentDockTabGroup() ) { - mainDock = static_cast<KDockWidget*>( mainDock->parentDockTabGroup() ->parent() ); + mainDock = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup() ->parent()) ); } if ( widgetNames.count() > 0 ) |