From 3cc20ba270e575b110442d6d9d6af199114ea53d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 7 Mar 2012 21:20:39 -0600 Subject: Rename additional members for tqt3 --- kimagemapeditor/qextfileinfo.cpp | 8 ++++---- kommander/widget/myprocess.cpp | 8 ++++---- lib/compatibility/kmdi/qextmdi/kdockwidget.cpp | 18 +++++++++--------- lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp | 18 +++++++++--------- lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp | 2 +- lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp | 8 ++++---- lib/qextfileinfo.cpp | 8 ++++---- 7 files changed, 35 insertions(+), 35 deletions(-) diff --git a/kimagemapeditor/qextfileinfo.cpp b/kimagemapeditor/qextfileinfo.cpp index f1aac09e..3d25bc61 100644 --- a/kimagemapeditor/qextfileinfo.cpp +++ b/kimagemapeditor/qextfileinfo.cpp @@ -274,18 +274,18 @@ bool QExtFileInfo::internalCopy(const KURL& src, const KURL& target, int permiss } -void qt_enter_modal( TQWidget *widget ); -void qt_leave_modal( TQWidget *widget ); +void tqt_enter_modal( TQWidget *widget ); +void tqt_leave_modal( TQWidget *widget ); void QExtFileInfo::enter_loop() { TQWidget dummy(0,0,WType_Dialog | WShowModal); dummy.setFocusPolicy( TQ_NoFocus ); - qt_enter_modal(&dummy); + tqt_enter_modal(&dummy); // kdDebug(24000)<<"QExtFileInfo::enter_loop:before tqApp->enter_loop()"<enter_loop(); // kdDebug(24000)<<"QExtFileInfo::enter_loop:after tqApp->enter_loop()"<enter_loop(); - qt_leave_modal(&dummy); + tqt_leave_modal(&dummy); if (!m_output.isEmpty() && m_output[m_output.length()-1] == '\n') return m_output.left(m_output.length()-1); diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp b/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp index 6e88e010..71c2c9d1 100644 --- a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp +++ b/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp @@ -933,7 +933,7 @@ KDockWidget *KDockWidget::findNearestDockWidget(DockPosition pos) if (neighbor==this) return (static_cast(TQT_TQWIDGET(parent()->parent()))->findNearestDockWidget(pos)); else - if (neighbor->getWidget() && (neighbor->getWidget()->qt_cast("KDockTabGroup"))) + if (neighbor->getWidget() && (neighbor->getWidget()->tqt_cast("KDockTabGroup"))) return (KDockWidget*)(((KDockTabGroup*)neighbor->getWidget())->page(0)); else return neighbor; @@ -1220,7 +1220,7 @@ void KDockWidget::setForcedFixedWidth(int w) setFixedWidth(w); if (!parent()) return; if (parent()->inherits("KDockSplitter")) - static_cast(parent()->qt_cast("KDockSplitter"))->setForcedFixedWidth(this,w); + static_cast(parent()->tqt_cast("KDockSplitter"))->setForcedFixedWidth(this,w); } void KDockWidget::setForcedFixedHeight(int h) @@ -1229,7 +1229,7 @@ void KDockWidget::setForcedFixedHeight(int h) setFixedHeight(h); if (!parent()) return; if (parent()->inherits("KDockSplitter")) - static_cast(parent()->qt_cast("KDockSplitter"))->setForcedFixedHeight(this,h); + static_cast(parent()->tqt_cast("KDockSplitter"))->setForcedFixedHeight(this,h); } int KDockWidget::forcedFixedWidth() @@ -1251,7 +1251,7 @@ void KDockWidget::restoreFromForcedFixedSize() setMaximumHeight(32000); if (!parent()) return; if (parent()->inherits("KDockSplitter")) - static_cast(parent()->qt_cast("KDockSplitter"))->restoreFromForcedFixedSize(this); + static_cast(parent()->tqt_cast("KDockSplitter"))->restoreFromForcedFixedSize(this); } void KDockWidget::toDesktop() @@ -1841,8 +1841,8 @@ KDockWidget* KDockManager::findDockWidgetAt( const TQPoint& pos ) } w = p; } - if ( qt_find_obj_child( TQT_TQOBJECT(w), "KDockSplitter", "_dock_split_" ) ) return 0L; - if ( qt_find_obj_child( TQT_TQOBJECT(w), "KDockTabGroup", "_dock_tab" ) ) return 0L; + 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 (dynamic_cast(w)) return 0L; if (!childDockWidgetList) return 0L; @@ -3122,7 +3122,7 @@ void KDockContainer::activateOverlapMode(int nonOverlapSize) { if (parentDockWidget()->parent()) { kdDebug(282)<<"KDockContainer::activateOverlapMode: recalculating sizes"<(parentDockWidget()-> - parent()->qt_cast("KDockSplitter")); + parent()->tqt_cast("KDockSplitter")); if (sp) sp->resizeEvent(0); } } @@ -3135,7 +3135,7 @@ void KDockContainer::deactivateOverlapMode() { if (parentDockWidget()->parent()) { kdDebug(282)<<"KDockContainer::deactivateOverlapMode: recalculating sizes"<(parentDockWidget()-> - parent()->qt_cast("KDockSplitter")); + parent()->tqt_cast("KDockSplitter")); if (sp) sp->resizeEvent(0); } } @@ -3224,7 +3224,7 @@ void KDockContainer::prepareSave(TQStringList &names) TQWidget *KDockTabGroup::transientTo() { TQWidget *tT=0; for (int i=0;i(page(i)->qt_cast("KDockWidget")); + KDockWidget *dw=static_cast(page(i)->tqt_cast("KDockWidget")); TQWidget *tmp; if ((tmp=dw->transientTo())) { if (!tT) tT=tmp; diff --git a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp index 1aa8b50c..23190dec 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp @@ -140,7 +140,7 @@ KMdiDockContainer::~KMdiDockContainer() KDockWidget *w = it.key(); if ( m_overlapButtons.contains( w ) ) { - ( static_cast( w->getHeader()->qt_cast( "KDockWidgetHeader" ) ) )->removeButton( m_overlapButtons[w] ); + ( static_cast( w->getHeader()->tqt_cast( "KDockWidgetHeader" ) ) )->removeButton( m_overlapButtons[w] ); m_overlapButtons.remove( w ); } m_map.remove( w ); @@ -169,7 +169,7 @@ void KMdiDockContainer::init() // try to restore splitter size if ( parentDockWidget() && parentDockWidget()->parent() ) { - KDockSplitter * sp = static_cast( parentDockWidget()->parent()->qt_cast( "KDockSplitter" ) ); + KDockSplitter * sp = static_cast( parentDockWidget()->parent()->tqt_cast( "KDockSplitter" ) ); if ( sp ) sp->setSeparatorPosX( m_separatorPos ); } @@ -204,12 +204,12 @@ void KMdiDockContainer::insertWidget ( KDockWidget *dwdg, TQPixmap pixmap, const if ( ( ( KDockWidget* ) parentWidget() ) ->mayBeShow() ) ( ( KDockWidget* ) parentWidget() ) ->dockBack(); - if ( w->getHeader()->qt_cast( "KDockWidgetHeader" ) ) + if ( w->getHeader()->tqt_cast( "KDockWidgetHeader" ) ) { kdDebug( 760 ) << k_funcinfo << "The dockwidget we're adding has a header" << endl; kdDebug( 760 ) << k_funcinfo << "Adding our overlap mode button to it" << endl; - KDockWidgetHeader *hdr = static_cast( w->getHeader()->qt_cast( "KDockWidgetHeader" ) ); + KDockWidgetHeader *hdr = static_cast( w->getHeader()->tqt_cast( "KDockWidgetHeader" ) ); KDockButton_Private *btn = new KDockButton_Private( hdr, "OverlapButton" ); TQToolTip::add( btn, i18n( "Switch between overlap and side by side mode", "Overlap" ) ); @@ -269,7 +269,7 @@ bool KMdiDockContainer::eventFilter( TQObject *obj, TQEvent *event ) break; } - KDockWidgetHeader *hdr = static_cast( w->getHeader()->qt_cast( "KDockWidgetHeader" ) ); + KDockWidgetHeader *hdr = static_cast( w->getHeader()->tqt_cast( "KDockWidgetHeader" ) ); if ( !hdr ) { kdDebug(760) << "Wrong header type in KMdiDockContainer::eventFilter" << endl; @@ -384,7 +384,7 @@ void KMdiDockContainer::removeWidget( KDockWidget* dwdg ) m_revMap.remove( id ); if ( m_overlapButtons.contains( w ) ) { - ( static_cast( w->getHeader() ->qt_cast( "KDockWidgetHeader" ) ) )->removeButton( m_overlapButtons[ w ] ); + ( static_cast( w->getHeader() ->tqt_cast( "KDockWidgetHeader" ) ) )->removeButton( m_overlapButtons[ w ] ); m_overlapButtons.remove( w ); } KDockContainer::removeWidget( w ); @@ -439,7 +439,7 @@ void KMdiDockContainer::tabClicked( int t ) if ( m_ws->widget( t ) ) { m_ws->raiseWidget( t ); - KDockWidget * tmpDw = static_cast( m_ws->widget( t )->qt_cast( "KDockWidget" ) ); + KDockWidget * tmpDw = static_cast( m_ws->widget( t )->tqt_cast( "KDockWidget" ) ); if ( tmpDw ) { if ( tmpDw->getWidget() ) @@ -464,7 +464,7 @@ void KMdiDockContainer::tabClicked( int t ) // try save splitter position if ( parentDockWidget() && parentDockWidget()->parent() ) { - KDockSplitter * sp = static_cast( parentDockWidget()->parent()->qt_cast( "KDockSplitter" ) ); + KDockSplitter * sp = static_cast( parentDockWidget()->parent()->tqt_cast( "KDockSplitter" ) ); if ( sp ) m_separatorPos = sp->separatorPos(); } @@ -636,7 +636,7 @@ void KMdiDockContainer::save( KConfig* cfg, const TQString& group_or_prefix ) if ( parentDockWidget() && parentDockWidget() ->parent() ) { KDockSplitter * sp = static_cast( parentDockWidget() -> - parent() ->qt_cast( "KDockSplitter" ) ); + parent() ->tqt_cast( "KDockSplitter" ) ); if ( sp ) cfg->writeEntry( "separatorPos", m_separatorPos ); } diff --git a/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp b/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp index f27391c8..494f3bca 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp @@ -84,7 +84,7 @@ void ToggleToolViewAction::anDWChanged() setChecked( true ); else if ( isChecked() && ( m_dw->parentDockTabGroup() && ( ( static_cast( m_dw->parentDockTabGroup() -> - parent() ->qt_cast( "KDockWidget" ) ) ) ->mayBeShow() ) ) ) + parent() ->tqt_cast( "KDockWidget" ) ) ) ->mayBeShow() ) ) ) setChecked( false ); } diff --git a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp b/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp index b1b4342a..bfddac38 100644 --- a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp +++ b/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp @@ -1743,28 +1743,28 @@ void KMdiMainFrm::setIDEAlModeStyle( int flags ) d->m_styleIDEAlMode = flags; // see KMultiTabBar for the first 3 bits if ( m_leftContainer ) { - KMdiDockContainer * tmpL = ( KMdiDockContainer* ) ( m_leftContainer->getWidget()->qt_cast( "KMdiDockContainer" ) ); + KMdiDockContainer * tmpL = ( KMdiDockContainer* ) ( m_leftContainer->getWidget()->tqt_cast( "KMdiDockContainer" ) ); if ( tmpL ) tmpL->setStyle( flags ); } if ( m_rightContainer ) { - KMdiDockContainer * tmpR = ( KMdiDockContainer* ) ( m_rightContainer->getWidget()->qt_cast( "KMdiDockContainer" ) ); + KMdiDockContainer * tmpR = ( KMdiDockContainer* ) ( m_rightContainer->getWidget()->tqt_cast( "KMdiDockContainer" ) ); if ( tmpR ) tmpR->setStyle( flags ); } if ( m_topContainer ) { - KMdiDockContainer * tmpT = ( KMdiDockContainer* ) ( m_topContainer->getWidget()->qt_cast( "KMdiDockContainer" ) ); + KMdiDockContainer * tmpT = ( KMdiDockContainer* ) ( m_topContainer->getWidget()->tqt_cast( "KMdiDockContainer" ) ); if ( tmpT ) tmpT->setStyle( flags ); } if ( m_bottomContainer ) { - KMdiDockContainer * tmpB = ( KMdiDockContainer* ) ( m_bottomContainer->getWidget()->qt_cast( "KMdiDockContainer" ) ); + KMdiDockContainer * tmpB = ( KMdiDockContainer* ) ( m_bottomContainer->getWidget()->tqt_cast( "KMdiDockContainer" ) ); if ( tmpB ) tmpB->setStyle( flags ); } diff --git a/lib/qextfileinfo.cpp b/lib/qextfileinfo.cpp index 3f002ada..5fc380f9 100644 --- a/lib/qextfileinfo.cpp +++ b/lib/qextfileinfo.cpp @@ -434,18 +434,18 @@ bool QExtFileInfo::internalCopy(const KURL& src, const KURL& target, int permiss } -void qt_enter_modal( TQWidget *widget ); -void qt_leave_modal( TQWidget *widget ); +void tqt_enter_modal( TQWidget *widget ); +void tqt_leave_modal( TQWidget *widget ); void QExtFileInfo::enter_loop() { TQWidget dummy(0,0,WType_Dialog | WShowModal); dummy.setFocusPolicy( TQ_NoFocus ); - qt_enter_modal(&dummy); + tqt_enter_modal(&dummy); //kdDebug(24000)<<"QExtFileInfo::enter_loop:before tqApp->enter_loop()"<< endl; tqApp->enter_loop(); // kdDebug(24000)<<"QExtFileInfo::enter_loop:after tqApp->enter_loop()"<