Rename additional members for tqt3

pull/1/head
Timothy Pearson 13 years ago
parent ec0e060d33
commit 3cc20ba270

@ -274,18 +274,18 @@ bool QExtFileInfo::internalCopy(const KURL& src, const KURL& target, int permiss
} }
void qt_enter_modal( TQWidget *widget ); void tqt_enter_modal( TQWidget *widget );
void qt_leave_modal( TQWidget *widget ); void tqt_leave_modal( TQWidget *widget );
void QExtFileInfo::enter_loop() void QExtFileInfo::enter_loop()
{ {
TQWidget dummy(0,0,WType_Dialog | WShowModal); TQWidget dummy(0,0,WType_Dialog | WShowModal);
dummy.setFocusPolicy( TQ_NoFocus ); dummy.setFocusPolicy( TQ_NoFocus );
qt_enter_modal(&dummy); tqt_enter_modal(&dummy);
// kdDebug(24000)<<"QExtFileInfo::enter_loop:before tqApp->enter_loop()"<<endl; // kdDebug(24000)<<"QExtFileInfo::enter_loop:before tqApp->enter_loop()"<<endl;
tqApp->enter_loop(); tqApp->enter_loop();
// kdDebug(24000)<<"QExtFileInfo::enter_loop:after tqApp->enter_loop()"<<endl; // kdDebug(24000)<<"QExtFileInfo::enter_loop:after tqApp->enter_loop()"<<endl;
qt_leave_modal(&dummy); tqt_leave_modal(&dummy);
} }
void QExtFileInfo::slotResult( KIO::Job * job ) void QExtFileInfo::slotResult( KIO::Job * job )

@ -32,8 +32,8 @@ MyProcess::MyProcess(const KommanderWidget *a_atw)
{ {
} }
void qt_enter_modal(TQWidget *widget); void tqt_enter_modal(TQWidget *widget);
void qt_leave_modal(TQWidget *widget); void tqt_leave_modal(TQWidget *widget);
void MyProcess::setBlocking(bool blocking) void MyProcess::setBlocking(bool blocking)
{ {
@ -104,9 +104,9 @@ TQString MyProcess::run(const TQString& a_command, const TQString& a_shell)
TQWidget dummy(0, 0, WType_Dialog | WShowModal); TQWidget dummy(0, 0, WType_Dialog | WShowModal);
dummy.setFocusPolicy(TQ_NoFocus); dummy.setFocusPolicy(TQ_NoFocus);
m_loopStarted = true; m_loopStarted = true;
qt_enter_modal(&dummy); tqt_enter_modal(&dummy);
tqApp->enter_loop(); tqApp->enter_loop();
qt_leave_modal(&dummy); tqt_leave_modal(&dummy);
if (!m_output.isEmpty() && m_output[m_output.length()-1] == '\n') if (!m_output.isEmpty() && m_output[m_output.length()-1] == '\n')
return m_output.left(m_output.length()-1); return m_output.left(m_output.length()-1);

@ -933,7 +933,7 @@ KDockWidget *KDockWidget::findNearestDockWidget(DockPosition pos)
if (neighbor==this) if (neighbor==this)
return (static_cast<KDockWidget*>(TQT_TQWIDGET(parent()->parent()))->findNearestDockWidget(pos)); return (static_cast<KDockWidget*>(TQT_TQWIDGET(parent()->parent()))->findNearestDockWidget(pos));
else else
if (neighbor->getWidget() && (neighbor->getWidget()->qt_cast("KDockTabGroup"))) if (neighbor->getWidget() && (neighbor->getWidget()->tqt_cast("KDockTabGroup")))
return (KDockWidget*)(((KDockTabGroup*)neighbor->getWidget())->page(0)); return (KDockWidget*)(((KDockTabGroup*)neighbor->getWidget())->page(0));
else else
return neighbor; return neighbor;
@ -1220,7 +1220,7 @@ void KDockWidget::setForcedFixedWidth(int w)
setFixedWidth(w); setFixedWidth(w);
if (!parent()) return; if (!parent()) return;
if (parent()->inherits("KDockSplitter")) if (parent()->inherits("KDockSplitter"))
static_cast<KDockSplitter*>(parent()->qt_cast("KDockSplitter"))->setForcedFixedWidth(this,w); static_cast<KDockSplitter*>(parent()->tqt_cast("KDockSplitter"))->setForcedFixedWidth(this,w);
} }
void KDockWidget::setForcedFixedHeight(int h) void KDockWidget::setForcedFixedHeight(int h)
@ -1229,7 +1229,7 @@ void KDockWidget::setForcedFixedHeight(int h)
setFixedHeight(h); setFixedHeight(h);
if (!parent()) return; if (!parent()) return;
if (parent()->inherits("KDockSplitter")) if (parent()->inherits("KDockSplitter"))
static_cast<KDockSplitter*>(parent()->qt_cast("KDockSplitter"))->setForcedFixedHeight(this,h); static_cast<KDockSplitter*>(parent()->tqt_cast("KDockSplitter"))->setForcedFixedHeight(this,h);
} }
int KDockWidget::forcedFixedWidth() int KDockWidget::forcedFixedWidth()
@ -1251,7 +1251,7 @@ void KDockWidget::restoreFromForcedFixedSize()
setMaximumHeight(32000); setMaximumHeight(32000);
if (!parent()) return; if (!parent()) return;
if (parent()->inherits("KDockSplitter")) if (parent()->inherits("KDockSplitter"))
static_cast<KDockSplitter*>(parent()->qt_cast("KDockSplitter"))->restoreFromForcedFixedSize(this); static_cast<KDockSplitter*>(parent()->tqt_cast("KDockSplitter"))->restoreFromForcedFixedSize(this);
} }
void KDockWidget::toDesktop() void KDockWidget::toDesktop()
@ -1841,8 +1841,8 @@ KDockWidget* KDockManager::findDockWidgetAt( const TQPoint& pos )
} }
w = p; w = p;
} }
if ( qt_find_obj_child( TQT_TQOBJECT(w), "KDockSplitter", "_dock_split_" ) ) return 0L; if ( tqt_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), "KDockTabGroup", "_dock_tab" ) ) return 0L;
if (dynamic_cast<KDockContainer*>(w)) return 0L; if (dynamic_cast<KDockContainer*>(w)) return 0L;
if (!childDockWidgetList) return 0L; if (!childDockWidgetList) return 0L;
@ -3122,7 +3122,7 @@ void KDockContainer::activateOverlapMode(int nonOverlapSize) {
if (parentDockWidget()->parent()) { if (parentDockWidget()->parent()) {
kdDebug(282)<<"KDockContainer::activateOverlapMode: recalculating sizes"<<endl; kdDebug(282)<<"KDockContainer::activateOverlapMode: recalculating sizes"<<endl;
KDockSplitter *sp= static_cast<KDockSplitter*>(parentDockWidget()-> KDockSplitter *sp= static_cast<KDockSplitter*>(parentDockWidget()->
parent()->qt_cast("KDockSplitter")); parent()->tqt_cast("KDockSplitter"));
if (sp) sp->resizeEvent(0); if (sp) sp->resizeEvent(0);
} }
} }
@ -3135,7 +3135,7 @@ void KDockContainer::deactivateOverlapMode() {
if (parentDockWidget()->parent()) { if (parentDockWidget()->parent()) {
kdDebug(282)<<"KDockContainer::deactivateOverlapMode: recalculating sizes"<<endl; kdDebug(282)<<"KDockContainer::deactivateOverlapMode: recalculating sizes"<<endl;
KDockSplitter *sp= static_cast<KDockSplitter*>(parentDockWidget()-> KDockSplitter *sp= static_cast<KDockSplitter*>(parentDockWidget()->
parent()->qt_cast("KDockSplitter")); parent()->tqt_cast("KDockSplitter"));
if (sp) sp->resizeEvent(0); if (sp) sp->resizeEvent(0);
} }
} }
@ -3224,7 +3224,7 @@ void KDockContainer::prepareSave(TQStringList &names)
TQWidget *KDockTabGroup::transientTo() { TQWidget *KDockTabGroup::transientTo() {
TQWidget *tT=0; TQWidget *tT=0;
for (int i=0;i<count();i++) { for (int i=0;i<count();i++) {
KDockWidget *dw=static_cast<KDockWidget*>(page(i)->qt_cast("KDockWidget")); KDockWidget *dw=static_cast<KDockWidget*>(page(i)->tqt_cast("KDockWidget"));
TQWidget *tmp; TQWidget *tmp;
if ((tmp=dw->transientTo())) { if ((tmp=dw->transientTo())) {
if (!tT) tT=tmp; if (!tT) tT=tmp;

@ -140,7 +140,7 @@ KMdiDockContainer::~KMdiDockContainer()
KDockWidget *w = it.key(); KDockWidget *w = it.key();
if ( m_overlapButtons.contains( w ) ) if ( m_overlapButtons.contains( w ) )
{ {
( static_cast<KDockWidgetHeader*>( w->getHeader()->qt_cast( "KDockWidgetHeader" ) ) )->removeButton( m_overlapButtons[w] ); ( static_cast<KDockWidgetHeader*>( w->getHeader()->tqt_cast( "KDockWidgetHeader" ) ) )->removeButton( m_overlapButtons[w] );
m_overlapButtons.remove( w ); m_overlapButtons.remove( w );
} }
m_map.remove( w ); m_map.remove( w );
@ -169,7 +169,7 @@ void KMdiDockContainer::init()
// try to restore splitter size // try to restore splitter size
if ( parentDockWidget() && parentDockWidget()->parent() ) if ( parentDockWidget() && parentDockWidget()->parent() )
{ {
KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget()->parent()->qt_cast( "KDockSplitter" ) ); KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget()->parent()->tqt_cast( "KDockSplitter" ) );
if ( sp ) if ( sp )
sp->setSeparatorPosX( m_separatorPos ); sp->setSeparatorPosX( m_separatorPos );
} }
@ -204,12 +204,12 @@ void KMdiDockContainer::insertWidget ( KDockWidget *dwdg, TQPixmap pixmap, const
if ( ( ( KDockWidget* ) parentWidget() ) ->mayBeShow() ) if ( ( ( KDockWidget* ) parentWidget() ) ->mayBeShow() )
( ( KDockWidget* ) parentWidget() ) ->dockBack(); ( ( 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 << "The dockwidget we're adding has a header" << endl;
kdDebug( 760 ) << k_funcinfo << "Adding our overlap mode button to it" << endl; kdDebug( 760 ) << k_funcinfo << "Adding our overlap mode button to it" << endl;
KDockWidgetHeader *hdr = static_cast<KDockWidgetHeader*>( w->getHeader()->qt_cast( "KDockWidgetHeader" ) ); KDockWidgetHeader *hdr = static_cast<KDockWidgetHeader*>( w->getHeader()->tqt_cast( "KDockWidgetHeader" ) );
KDockButton_Private *btn = new KDockButton_Private( hdr, "OverlapButton" ); KDockButton_Private *btn = new KDockButton_Private( hdr, "OverlapButton" );
TQToolTip::add( btn, i18n( "Switch between overlap and side by side mode", "Overlap" ) ); 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; break;
} }
KDockWidgetHeader *hdr = static_cast<KDockWidgetHeader*>( w->getHeader()->qt_cast( "KDockWidgetHeader" ) ); KDockWidgetHeader *hdr = static_cast<KDockWidgetHeader*>( w->getHeader()->tqt_cast( "KDockWidgetHeader" ) );
if ( !hdr ) if ( !hdr )
{ {
kdDebug(760) << "Wrong header type in KMdiDockContainer::eventFilter" << endl; kdDebug(760) << "Wrong header type in KMdiDockContainer::eventFilter" << endl;
@ -384,7 +384,7 @@ void KMdiDockContainer::removeWidget( KDockWidget* dwdg )
m_revMap.remove( id ); m_revMap.remove( id );
if ( m_overlapButtons.contains( w ) ) if ( m_overlapButtons.contains( w ) )
{ {
( static_cast<KDockWidgetHeader*>( w->getHeader() ->qt_cast( "KDockWidgetHeader" ) ) )->removeButton( m_overlapButtons[ w ] ); ( static_cast<KDockWidgetHeader*>( w->getHeader() ->tqt_cast( "KDockWidgetHeader" ) ) )->removeButton( m_overlapButtons[ w ] );
m_overlapButtons.remove( w ); m_overlapButtons.remove( w );
} }
KDockContainer::removeWidget( w ); KDockContainer::removeWidget( w );
@ -439,7 +439,7 @@ void KMdiDockContainer::tabClicked( int t )
if ( m_ws->widget( t ) ) if ( m_ws->widget( t ) )
{ {
m_ws->raiseWidget( t ); m_ws->raiseWidget( t );
KDockWidget * tmpDw = static_cast<KDockWidget*>( m_ws->widget( t )->qt_cast( "KDockWidget" ) ); KDockWidget * tmpDw = static_cast<KDockWidget*>( m_ws->widget( t )->tqt_cast( "KDockWidget" ) );
if ( tmpDw ) if ( tmpDw )
{ {
if ( tmpDw->getWidget() ) if ( tmpDw->getWidget() )
@ -464,7 +464,7 @@ void KMdiDockContainer::tabClicked( int t )
// try save splitter position // try save splitter position
if ( parentDockWidget() && parentDockWidget()->parent() ) if ( parentDockWidget() && parentDockWidget()->parent() )
{ {
KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget()->parent()->qt_cast( "KDockSplitter" ) ); KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget()->parent()->tqt_cast( "KDockSplitter" ) );
if ( sp ) if ( sp )
m_separatorPos = sp->separatorPos(); m_separatorPos = sp->separatorPos();
} }
@ -636,7 +636,7 @@ void KMdiDockContainer::save( KConfig* cfg, const TQString& group_or_prefix )
if ( parentDockWidget() && parentDockWidget() ->parent() ) if ( parentDockWidget() && parentDockWidget() ->parent() )
{ {
KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget() -> KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget() ->
parent() ->qt_cast( "KDockSplitter" ) ); parent() ->tqt_cast( "KDockSplitter" ) );
if ( sp ) if ( sp )
cfg->writeEntry( "separatorPos", m_separatorPos ); cfg->writeEntry( "separatorPos", m_separatorPos );
} }

@ -84,7 +84,7 @@ void ToggleToolViewAction::anDWChanged()
setChecked( true ); setChecked( true );
else if ( isChecked() && ( m_dw->parentDockTabGroup() && else if ( isChecked() && ( m_dw->parentDockTabGroup() &&
( ( static_cast<KDockWidget*>( m_dw->parentDockTabGroup() -> ( ( static_cast<KDockWidget*>( m_dw->parentDockTabGroup() ->
parent() ->qt_cast( "KDockWidget" ) ) ) ->mayBeShow() ) ) ) parent() ->tqt_cast( "KDockWidget" ) ) ) ->mayBeShow() ) ) )
setChecked( false ); setChecked( false );
} }

@ -1743,28 +1743,28 @@ void KMdiMainFrm::setIDEAlModeStyle( int flags )
d->m_styleIDEAlMode = flags; // see KMultiTabBar for the first 3 bits d->m_styleIDEAlMode = flags; // see KMultiTabBar for the first 3 bits
if ( m_leftContainer ) if ( m_leftContainer )
{ {
KMdiDockContainer * tmpL = ( KMdiDockContainer* ) ( m_leftContainer->getWidget()->qt_cast( "KMdiDockContainer" ) ); KMdiDockContainer * tmpL = ( KMdiDockContainer* ) ( m_leftContainer->getWidget()->tqt_cast( "KMdiDockContainer" ) );
if ( tmpL ) if ( tmpL )
tmpL->setStyle( flags ); tmpL->setStyle( flags );
} }
if ( m_rightContainer ) if ( m_rightContainer )
{ {
KMdiDockContainer * tmpR = ( KMdiDockContainer* ) ( m_rightContainer->getWidget()->qt_cast( "KMdiDockContainer" ) ); KMdiDockContainer * tmpR = ( KMdiDockContainer* ) ( m_rightContainer->getWidget()->tqt_cast( "KMdiDockContainer" ) );
if ( tmpR ) if ( tmpR )
tmpR->setStyle( flags ); tmpR->setStyle( flags );
} }
if ( m_topContainer ) if ( m_topContainer )
{ {
KMdiDockContainer * tmpT = ( KMdiDockContainer* ) ( m_topContainer->getWidget()->qt_cast( "KMdiDockContainer" ) ); KMdiDockContainer * tmpT = ( KMdiDockContainer* ) ( m_topContainer->getWidget()->tqt_cast( "KMdiDockContainer" ) );
if ( tmpT ) if ( tmpT )
tmpT->setStyle( flags ); tmpT->setStyle( flags );
} }
if ( m_bottomContainer ) if ( m_bottomContainer )
{ {
KMdiDockContainer * tmpB = ( KMdiDockContainer* ) ( m_bottomContainer->getWidget()->qt_cast( "KMdiDockContainer" ) ); KMdiDockContainer * tmpB = ( KMdiDockContainer* ) ( m_bottomContainer->getWidget()->tqt_cast( "KMdiDockContainer" ) );
if ( tmpB ) if ( tmpB )
tmpB->setStyle( flags ); tmpB->setStyle( flags );
} }

@ -434,18 +434,18 @@ bool QExtFileInfo::internalCopy(const KURL& src, const KURL& target, int permiss
} }
void qt_enter_modal( TQWidget *widget ); void tqt_enter_modal( TQWidget *widget );
void qt_leave_modal( TQWidget *widget ); void tqt_leave_modal( TQWidget *widget );
void QExtFileInfo::enter_loop() void QExtFileInfo::enter_loop()
{ {
TQWidget dummy(0,0,WType_Dialog | WShowModal); TQWidget dummy(0,0,WType_Dialog | WShowModal);
dummy.setFocusPolicy( TQ_NoFocus ); dummy.setFocusPolicy( TQ_NoFocus );
qt_enter_modal(&dummy); tqt_enter_modal(&dummy);
//kdDebug(24000)<<"QExtFileInfo::enter_loop:before tqApp->enter_loop()"<< endl; //kdDebug(24000)<<"QExtFileInfo::enter_loop:before tqApp->enter_loop()"<< endl;
tqApp->enter_loop(); tqApp->enter_loop();
// kdDebug(24000)<<"QExtFileInfo::enter_loop:after tqApp->enter_loop()"<<endl; // kdDebug(24000)<<"QExtFileInfo::enter_loop:after tqApp->enter_loop()"<<endl;
qt_leave_modal(&dummy); tqt_leave_modal(&dummy);
} }
void QExtFileInfo::slotListResult(KIO::Job *job) void QExtFileInfo::slotListResult(KIO::Job *job)

Loading…
Cancel
Save