diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-12-21 11:50:29 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-12-21 19:38:32 +0900 |
commit | 9e553028bac0f0d934926318a7b13aa4d8474b27 (patch) | |
tree | 363c971f334f9b91813928c97867a113f34431d5 /lib/compatibility | |
parent | 13d63148446745909c8ba4b1b68f99e4291cf0cd (diff) | |
download | tdewebdev-9e553028bac0f0d934926318a7b13aa4d8474b27.tar.gz tdewebdev-9e553028bac0f0d934926318a7b13aa4d8474b27.zip |
Replace various '#define' strings - part 6
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'lib/compatibility')
6 files changed, 31 insertions, 31 deletions
diff --git a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp index 344adc57..1189b0f3 100644 --- a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp +++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp @@ -222,7 +222,7 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name ) #ifdef BORDERLESS_WINDOWS setCursor(TQCursor(ArrowCursor)); #endif - d = new KDockWidgetHeaderPrivate( TQT_TQOBJECT(this) ); + d = new KDockWidgetHeaderPrivate( this ); layout = new TQHBoxLayout( this ); layout->setResizeMode( TQLayout::Minimum ); @@ -504,7 +504,7 @@ KDockWidget::KDockWidget( KDockManager* dockManager, const char* name, const TQP layout->setResizeMode( TQLayout::Minimum ); manager = dockManager; - manager->childDock->append( TQT_TQOBJECT(this) ); + manager->childDock->append( this ); installEventFilter( manager ); eDocking = DockFullDocking; @@ -568,8 +568,8 @@ KDockWidget::~KDockWidget() } } emit iMBeingClosed(); - if (manager->d) manager->d->containerDocks.remove(TQT_TQOBJECT(this)); - manager->childDock->remove( TQT_TQOBJECT(this) ); + if (manager->d) manager->d->containerDocks.remove(this); + manager->childDock->remove( this ); delete pix; delete d; // destroy private data d=0; @@ -934,7 +934,7 @@ KDockWidget *KDockWidget::findNearestDockWidget(DockPosition pos) static_cast<KDockWidget*>(((KDockSplitter*)(parent()))->getLast()); if (neighbor==this) - return (static_cast<KDockWidget*>(TQT_TQWIDGET(parent()->parent()))->findNearestDockWidget(pos)); + return (static_cast<KDockWidget*>(parent()->parent())->findNearestDockWidget(pos)); else if (neighbor->getWidget() && (neighbor->getWidget()->tqt_cast("KDockTabGroup"))) return (KDockWidget*)(((KDockTabGroup*)neighbor->getWidget())->page(0)); @@ -942,7 +942,7 @@ KDockWidget *KDockWidget::findNearestDockWidget(DockPosition pos) return neighbor; } else - return (static_cast<KDockWidget*>(TQT_TQWIDGET(parent()->parent()))->findNearestDockWidget(pos)); + return (static_cast<KDockWidget*>(parent()->parent())->findNearestDockWidget(pos)); return 0; } @@ -1450,7 +1450,7 @@ void KDockWidget::setWidget( TQWidget* mw ) if (dc) { d->isContainer=true; - manager->d->containerDocks.append(TQT_TQOBJECT(this)); + manager->d->containerDocks.append(this); } else { @@ -1844,8 +1844,8 @@ KDockWidget* KDockManager::findDockWidgetAt( const TQPoint& pos ) } w = p; } - if ( tqt_find_obj_child( TQT_TQOBJECT(w), "KDockSplitter", "_dock_split_" ) ) return 0L; - if ( tqt_find_obj_child( TQT_TQOBJECT(w), "KDockTabGroup", "_dock_tab" ) ) return 0L; + if ( tqt_find_obj_child( w, "KDockSplitter", "_dock_split_" ) ) return 0L; + if ( tqt_find_obj_child( w, "KDockTabGroup", "_dock_tab" ) ) return 0L; if (dynamic_cast<KDockContainer*>(w)) return 0L; if (!childDockWidgetList) return 0L; @@ -2461,7 +2461,7 @@ void KDockManager::removeFromAutoCreateList(KDockWidget* pDockWidget) { if (!autoCreateDock) return; autoCreateDock->setAutoDelete(false); - autoCreateDock->removeRef(TQT_TQOBJECT(pDockWidget)); + autoCreateDock->removeRef(pDockWidget); autoCreateDock->setAutoDelete(true); } @@ -2834,7 +2834,7 @@ KDockWidget* KDockManager::getDockWidgetFromName( const TQString& dockName ) if ( autoCreateDock ){ kdDebug(282)<<"Autocreating dock: "<<dockName<<endl; autoCreate = new KDockWidget( this, dockName.latin1(), TQPixmap(TQString("")) ); - autoCreateDock->append( TQT_TQOBJECT(autoCreate) ); + autoCreateDock->append( autoCreate ); } return autoCreate; } diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp index 15960b40..73542532 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp @@ -1095,7 +1095,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) break; case TQEvent::MouseButtonPress: { - if ( !hasParent( TQT_TQOBJECT(m_pClient), TQT_TQOBJECT(obj) ) ) + if ( !hasParent( m_pClient, obj ) ) { bool bIsSecondClick = false; if ( m_timeMeasure.elapsed() <= TQApplication::doubleClickInterval() ) @@ -1139,7 +1139,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) break; case TQEvent::Resize: { - if ( ( ( TQWidget* ) TQT_TQOBJECT(obj) == m_pClient ) && ( m_state == Normal ) ) + if ( ( ( TQWidget* ) obj == m_pClient ) && ( m_state == Normal ) ) { TQResizeEvent* re = ( TQResizeEvent* ) e; int captionHeight = m_pCaption->heightHint(); @@ -1154,7 +1154,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) { // if we lost a child we uninstall ourself as event filter for the lost // child and its children - TQObject* pLostChild = TQT_TQOBJECT(( ( TQChildEvent* ) e )->child()); + TQObject* pLostChild = ( ( TQChildEvent* ) e )->child(); if ( ( pLostChild != 0L ) /*&& (pLostChild->inherits("TQWidget"))*/ ) { TQObjectList* list = pLostChild->queryList(); @@ -1176,10 +1176,10 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) // if we got a new child we install ourself as event filter for the new // child and its children (as we did when we got our client). // XXX see linkChildren() and focus policy stuff - TQObject* pNewChild = TQT_TQOBJECT(( ( TQChildEvent* ) e ) ->child()); + TQObject* pNewChild = ( ( TQChildEvent* ) e ) ->child(); if ( ( pNewChild != 0L ) && ::tqt_cast<TQWidget*>( pNewChild ) ) { - TQWidget * pNewWidget = TQT_TQWIDGET( pNewChild ); + TQWidget * pNewWidget = static_cast<TQWidget*>( pNewChild ); TQObjectList *list = pNewWidget->queryList( "TQWidget" ); list->insert( 0, pNewChild ); // add the new child to the list too, just to save code TQObjectListIt it( *list ); // iterate over all new child widgets diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp index 9b67ccbb..11056c57 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp @@ -565,7 +565,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e ) { // if we lost a child we uninstall ourself as event filter for the lost // child and its children - TQObject * pLostChild = TQT_TQOBJECT(( ( TQChildEvent* ) e ) ->child()); + TQObject * pLostChild = ( ( TQChildEvent* ) e ) ->child(); if ( ( pLostChild != 0L ) && ( pLostChild->isWidgetType() ) ) { TQObjectList * list = pLostChild->queryList( "TQWidget" ); @@ -595,7 +595,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e ) // if we got a new child and we are attached to the MDI system we // install ourself as event filter for the new child and its children // (as we did when we were added to the MDI system). - TQObject * pNewChild = TQT_TQOBJECT(( ( TQChildEvent* ) e ) ->child()); + TQObject * pNewChild = ( ( TQChildEvent* ) e ) ->child(); if ( ( pNewChild != 0L ) && ( pNewChild->isWidgetType() ) ) { TQWidget * pNewWidget = ( TQWidget* ) pNewChild; diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp index 7a47b5a3..558f11c0 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp @@ -277,7 +277,7 @@ bool KMdiDockContainer::eventFilter( TQObject *obj, TQEvent *event ) } m_dockManager = w->dockManager(); - m_dragPanel = TQT_TQOBJECT(hdr->dragPanel()); + m_dragPanel = hdr->dragPanel(); if ( m_dragPanel ) m_movingState = WaitingForMoveStart; diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp index 15303006..5261525a 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp @@ -152,18 +152,18 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c this, TQT_SLOT( mdiModeHasBeenChangedTo( KMdi::MdiMode ) ) ); m_gotoToolDockMenu = new TDEActionMenu( i18n( "Tool &Docks" ), actionCollection(), "tdemdi_tooldock_menu" ); - m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Top Dock" ), ALT + CTRL + SHIFT + Key_T, TQT_TQOBJECT(this), TQT_SIGNAL( toggleTop() ), + m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Top Dock" ), ALT + CTRL + SHIFT + Key_T, this, TQT_SIGNAL( toggleTop() ), actionCollection(), "tdemdi_activate_top" ) ); - m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Left Dock" ), ALT + CTRL + SHIFT + Key_L, TQT_TQOBJECT(this), TQT_SIGNAL( toggleLeft() ), + m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Left Dock" ), ALT + CTRL + SHIFT + Key_L, this, TQT_SIGNAL( toggleLeft() ), actionCollection(), "tdemdi_activate_left" ) ); - m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Right Dock" ), ALT + CTRL + SHIFT + Key_R, TQT_TQOBJECT(this), TQT_SIGNAL( toggleRight() ), + m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Right Dock" ), ALT + CTRL + SHIFT + Key_R, this, TQT_SIGNAL( toggleRight() ), actionCollection(), "tdemdi_activate_right" ) ); - m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Bottom Dock" ), ALT + CTRL + SHIFT + Key_B, TQT_TQOBJECT(this), TQT_SIGNAL( toggleBottom() ), + m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Bottom Dock" ), ALT + CTRL + SHIFT + Key_B, this, TQT_SIGNAL( toggleBottom() ), actionCollection(), "tdemdi_activate_bottom" ) ); m_gotoToolDockMenu->insert( new TDEActionSeparator( actionCollection(), "tdemdi_goto_menu_separator" ) ); - m_gotoToolDockMenu->insert( new TDEAction( i18n( "Previous Tool View" ), ALT + CTRL + Key_Left, TQT_TQOBJECT(m_mdiMainFrm), TQT_SLOT( prevToolViewInDock() ), + m_gotoToolDockMenu->insert( new TDEAction( i18n( "Previous Tool View" ), ALT + CTRL + Key_Left, m_mdiMainFrm, TQT_SLOT( prevToolViewInDock() ), actionCollection(), "tdemdi_prev_toolview" ) ); - m_gotoToolDockMenu->insert( new TDEAction( i18n( "Next Tool View" ), ALT + CTRL + Key_Right, TQT_TQOBJECT(m_mdiMainFrm), TQT_SLOT( nextToolViewInDock() ), + m_gotoToolDockMenu->insert( new TDEAction( i18n( "Next Tool View" ), ALT + CTRL + Key_Right, m_mdiMainFrm, TQT_SLOT( nextToolViewInDock() ), actionCollection(), "tdemdi_next_toolview" ) ); actionCollection() ->readShortcutSettings( "Shortcuts", kapp->config() ); diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp index 6c11c26b..74a4a9ca 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp @@ -224,7 +224,7 @@ KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMod #else 0, #endif - TQT_TQOBJECT(this), TQT_SLOT(closeActiveView()), actionCollection(), "window_close"); + this, TQT_SLOT(closeActiveView()), actionCollection(), "window_close"); // the MDI view taskbar createTaskBar(); @@ -1297,7 +1297,7 @@ void KMdiMainFrm::findRootDockWidgets( TQPtrList<KDockWidget>* rootDockWidgetLis KDockWidget* dockWindow = 0L; /* pDockW */ KDockWidget* rootDockWindow = 0L; /* pRootDockWindow */ KDockWidget* undockCandidate = 0L; /* pUndockCandidate */ - TQWidget* pW = TQT_TQWIDGET( ( *it ) ); + TQWidget* pW = static_cast<TQWidget*>( ( *it ) ); // find the oldest ancestor of the current dockwidget that can be undocked while ( !pW->isTopLevel() ) @@ -1905,7 +1905,7 @@ void KMdiMainFrm::findToolViewsDockedToMain( TQPtrList<KDockWidget>* list, KDock KDockWidget* widget = mainDock->findNearestDockWidget( dprtmw ); if ( widget && widget->parentDockTabGroup() ) { - widget = static_cast<KDockWidget*>( TQT_TQWIDGET(widget->parentDockTabGroup() ->parent()) ); + widget = static_cast<KDockWidget*>( widget->parentDockTabGroup() ->parent() ); if ( widget ) { @@ -1937,7 +1937,7 @@ void KMdiMainFrm::setupToolViewsForIDEALMode() KDockWidget *mainDock = getMainDockWidget(); KDockWidget *w = mainDock; if ( mainDock->parentDockTabGroup() ) - w = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup()->parent()) ); + w = static_cast<KDockWidget*>( mainDock->parentDockTabGroup()->parent() ); TQPtrList<KDockWidget> leftReparentWidgets; TQPtrList<KDockWidget> rightReparentWidgets; @@ -1945,7 +1945,7 @@ void KMdiMainFrm::setupToolViewsForIDEALMode() TQPtrList<KDockWidget> topReparentWidgets; if ( mainDock->parentDockTabGroup() ) - mainDock = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup() ->parent()) ); + mainDock = static_cast<KDockWidget*>( mainDock->parentDockTabGroup() ->parent() ); findToolViewsDockedToMain( &leftReparentWidgets, KDockWidget::DockLeft ); findToolViewsDockedToMain( &rightReparentWidgets, KDockWidget::DockRight ); @@ -2143,7 +2143,7 @@ void KMdiMainFrm::idealToolViewsToStandardTabs( TQStringList widgetNames, KDockW KDockWidget * mainDock = getMainDockWidget(); if ( mainDock->parentDockTabGroup() ) { - mainDock = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup() ->parent()) ); + mainDock = static_cast<KDockWidget*>( mainDock->parentDockTabGroup() ->parent() ); } if ( widgetNames.count() > 0 ) |