diff options
Diffstat (limited to 'tdeui')
| -rw-r--r-- | tdeui/kdockwidget.cpp | 14 | ||||
| -rw-r--r-- | tdeui/kswitchlanguagedialog.cpp | 2 | ||||
| -rw-r--r-- | tdeui/kxmlguibuilder.cpp | 46 | ||||
| -rw-r--r-- | tdeui/tdeaction.cpp | 46 | ||||
| -rw-r--r-- | tdeui/tdeactionclasses.cpp | 66 | ||||
| -rw-r--r-- | tdeui/tdeactioncollection.cpp | 4 | ||||
| -rw-r--r-- | tdeui/tdecompletionbox.cpp | 2 | ||||
| -rw-r--r-- | tdeui/tests/kdockwidgettest.cpp | 4 |
8 files changed, 92 insertions, 92 deletions
diff --git a/tdeui/kdockwidget.cpp b/tdeui/kdockwidget.cpp index 7e5e6bd64..fcf960aa8 100644 --- a/tdeui/kdockwidget.cpp +++ b/tdeui/kdockwidget.cpp @@ -932,7 +932,7 @@ KDockWidget *KDockWidget::findNearestDockWidget(DockPosition pos) if (neighbor==this) return (static_cast<KDockWidget*>(TQT_TQWIDGET(parent()->parent()))->findNearestDockWidget(pos)); else - if (neighbor->getWidget() && (::tqqt_cast<KDockTabGroup*>(neighbor->getWidget()))) + if (neighbor->getWidget() && (::tqt_cast<KDockTabGroup*>(neighbor->getWidget()))) return (KDockWidget*)(((KDockTabGroup*)neighbor->getWidget())->page(0)); else return neighbor; @@ -1238,7 +1238,7 @@ void KDockWidget::setForcedFixedWidth(int w) setFixedWidth(w); if (!parent()) return; if (parent()->inherits("KDockSplitter")) - ::tqqt_cast<KDockSplitter*>(parent())->setForcedFixedWidth(this,w); + ::tqt_cast<KDockSplitter*>(parent())->setForcedFixedWidth(this,w); } void KDockWidget::setForcedFixedHeight(int h) @@ -1247,7 +1247,7 @@ void KDockWidget::setForcedFixedHeight(int h) setFixedHeight(h); if (!parent()) return; if (parent()->inherits("KDockSplitter")) - ::tqqt_cast<KDockSplitter*>(parent())->setForcedFixedHeight(this,h); + ::tqt_cast<KDockSplitter*>(parent())->setForcedFixedHeight(this,h); } int KDockWidget::forcedFixedWidth() @@ -1270,7 +1270,7 @@ void KDockWidget::restoreFromForcedFixedSize() setMaximumHeight(32000); if (!parent()) return; if (parent()->inherits("KDockSplitter")) - ::tqqt_cast<KDockSplitter*>(parent())->restoreFromForcedFixedSize(this); + ::tqt_cast<KDockSplitter*>(parent())->restoreFromForcedFixedSize(this); } void KDockWidget::toDesktop() @@ -3179,7 +3179,7 @@ void KDockContainer::activateOverlapMode(int nonOverlapSize) { m_overlapMode=true; if (parentDockWidget() && parentDockWidget()->parent()) { kdDebug(282)<<"KDockContainer::activateOverlapMode: recalculating sizes"<<endl; - KDockSplitter *sp= ::tqqt_cast<KDockSplitter*>(parentDockWidget()-> + KDockSplitter *sp= ::tqt_cast<KDockSplitter*>(parentDockWidget()-> parent()); if (sp) sp->resizeEvent(0); @@ -3191,7 +3191,7 @@ void KDockContainer::deactivateOverlapMode() { m_overlapMode=false; if (parentDockWidget() && parentDockWidget()->parent()) { kdDebug(282)<<"KDockContainer::deactivateOverlapMode: recalculating sizes"<<endl; - KDockSplitter *sp= ::tqqt_cast<KDockSplitter*>(parentDockWidget()-> + KDockSplitter *sp= ::tqt_cast<KDockSplitter*>(parentDockWidget()-> parent()); if (sp) sp->resizeEvent(0); @@ -3280,7 +3280,7 @@ void KDockContainer::prepareSave(TQStringList &names) TQWidget *KDockTabGroup::transientTo() { TQWidget *tT=0; for (int i=0;i<count();i++) { - KDockWidget *dw=::tqqt_cast<KDockWidget*>(page(i)); + KDockWidget *dw=::tqt_cast<KDockWidget*>(page(i)); TQWidget *tmp; if ((tmp=dw->transientTo())) { if (!tT) tT=tmp; diff --git a/tdeui/kswitchlanguagedialog.cpp b/tdeui/kswitchlanguagedialog.cpp index a3c8af485..8e49af496 100644 --- a/tdeui/kswitchlanguagedialog.cpp +++ b/tdeui/kswitchlanguagedialog.cpp @@ -150,7 +150,7 @@ void KSwitchLanguageDialog::removeButtonClicked() return; } - KPushButton *removeButton = const_cast<KPushButton*>(::tqqt_cast<const KPushButton*>(signalSender)); + KPushButton *removeButton = const_cast<KPushButton*>(::tqt_cast<const KPushButton*>(signalSender)); if (removeButton == NULL) { diff --git a/tdeui/kxmlguibuilder.cpp b/tdeui/kxmlguibuilder.cpp index b02ed5b08..5774be8c0 100644 --- a/tdeui/kxmlguibuilder.cpp +++ b/tdeui/kxmlguibuilder.cpp @@ -117,7 +117,7 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ if ( element.tagName().lower() == d->tagMainWindow ) { TDEMainWindow *mainwindow = 0; - if ( ::tqqt_cast<TDEMainWindow *>( d->m_widget ) ) + if ( ::tqt_cast<TDEMainWindow *>( d->m_widget ) ) mainwindow = static_cast<TDEMainWindow *>(d->m_widget); return mainwindow; @@ -127,7 +127,7 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ { KMenuBar *bar; - if ( ::tqqt_cast<TDEMainWindow *>( d->m_widget ) ) + if ( ::tqt_cast<TDEMainWindow *>( d->m_widget ) ) bar = static_cast<TDEMainWindow *>(d->m_widget)->menuBar(); else bar = new KMenuBar( d->m_widget ); @@ -145,7 +145,7 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ // And we don't want to set the parent for a standalone popupmenu, // otherwise its shortcuts appear. TQWidget* p = parent; - while ( p && !::tqqt_cast<TDEMainWindow *>( p ) ) + while ( p && !::tqt_cast<TDEMainWindow *>( p ) ) p = p->parentWidget(); TQCString name = element.attribute( d->attrName ).utf8(); @@ -181,14 +181,14 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ pix = SmallIconSet( icon, 16, instance ); } - if ( parent && ::tqqt_cast<KMenuBar *>( parent ) ) + if ( parent && ::tqt_cast<KMenuBar *>( parent ) ) { if ( !icon.isEmpty() ) id = static_cast<KMenuBar *>(parent)->insertItem( pix, i18nText, popup, -1, index ); else id = static_cast<KMenuBar *>(parent)->insertItem( i18nText, popup, -1, index ); } - else if ( parent && ::tqqt_cast<TQPopupMenu *>( parent ) ) + else if ( parent && ::tqt_cast<TQPopupMenu *>( parent ) ) { if ( !icon.isEmpty() ) id = static_cast<TQPopupMenu *>(parent)->insertItem( pix, i18nText, popup, -1, index ); @@ -211,7 +211,7 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ bar = new TDEToolBar( d->m_widget, name, honor, false ); } - if ( ::tqqt_cast<TDEMainWindow *>( d->m_widget ) ) + if ( ::tqt_cast<TDEMainWindow *>( d->m_widget ) ) { if ( d->m_client && !d->m_client->xmlFile().isEmpty() ) bar->setXMLGUIClient( d->m_client ); @@ -224,7 +224,7 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ if ( element.tagName().lower() == d->tagStatusBar ) { - if ( ::tqqt_cast<TDEMainWindow *>( d->m_widget ) ) + if ( ::tqt_cast<TDEMainWindow *>( d->m_widget ) ) { TDEMainWindow *mainWin = static_cast<TDEMainWindow *>(d->m_widget); mainWin->statusBar()->show(); @@ -241,26 +241,26 @@ void KXMLGUIBuilder::removeContainer( TQWidget *container, TQWidget *parent, TQD { // Warning parent can be 0L - if ( ::tqqt_cast<TQPopupMenu *>( container ) ) + if ( ::tqt_cast<TQPopupMenu *>( container ) ) { if ( parent ) { - if ( ::tqqt_cast<KMenuBar *>( parent ) ) + if ( ::tqt_cast<KMenuBar *>( parent ) ) static_cast<KMenuBar *>(parent)->removeItem( id ); - else if ( ::tqqt_cast<TQPopupMenu *>( parent ) ) + else if ( ::tqt_cast<TQPopupMenu *>( parent ) ) static_cast<TQPopupMenu *>(parent)->removeItem( id ); } delete container; } - else if ( ::tqqt_cast<TDEToolBar *>( container ) ) + else if ( ::tqt_cast<TDEToolBar *>( container ) ) { TDEToolBar *tb = static_cast<TDEToolBar *>( container ); tb->saveState( element ); delete tb; } - else if ( ::tqqt_cast<KMenuBar *>( container ) ) + else if ( ::tqt_cast<KMenuBar *>( container ) ) { KMenuBar *mb = static_cast<KMenuBar *>( container ); mb->hide(); @@ -269,9 +269,9 @@ void KXMLGUIBuilder::removeContainer( TQWidget *container, TQWidget *parent, TQD // sure that TQMainWindow::d->mb does not point to a deleted // menubar object. } - else if ( ::tqqt_cast<KStatusBar *>( container ) ) + else if ( ::tqt_cast<KStatusBar *>( container ) ) { - if ( ::tqqt_cast<TDEMainWindow *>( d->m_widget ) ) + if ( ::tqt_cast<TDEMainWindow *>( d->m_widget ) ) container->hide(); else delete static_cast<KStatusBar *>(container); @@ -291,7 +291,7 @@ int KXMLGUIBuilder::createCustomElement( TQWidget *parent, int index, const TQDo { if ( element.tagName().lower() == d->tagSeparator ) { - if ( ::tqqt_cast<TQPopupMenu *>( parent ) ) + if ( ::tqt_cast<TQPopupMenu *>( parent ) ) { // Don't insert multiple separators in a row TQPopupMenu *menu = static_cast<TQPopupMenu *>(parent); @@ -317,9 +317,9 @@ int KXMLGUIBuilder::createCustomElement( TQWidget *parent, int index, const TQDo else return menu->insertSeparator( index ); } - else if ( ::tqqt_cast<TQMenuBar *>( parent ) ) + else if ( ::tqt_cast<TQMenuBar *>( parent ) ) return static_cast<TQMenuBar *>(parent)->insertSeparator( index ); - else if ( ::tqqt_cast<TDEToolBar *>( parent ) ) + else if ( ::tqt_cast<TDEToolBar *>( parent ) ) { TDEToolBar *bar = static_cast<TDEToolBar *>( parent ); @@ -351,12 +351,12 @@ int KXMLGUIBuilder::createCustomElement( TQWidget *parent, int index, const TQDo } else if ( element.tagName().lower() == d->tagTearOffHandle ) { - if ( ::tqqt_cast<TQPopupMenu *>( parent ) && TDEGlobalSettings::insertTearOffHandle()) + if ( ::tqt_cast<TQPopupMenu *>( parent ) && TDEGlobalSettings::insertTearOffHandle()) return static_cast<TQPopupMenu *>(parent)->insertTearOffHandle( -1, index ); } else if ( element.tagName().lower() == d->tagMenuTitle ) { - if ( ::tqqt_cast<TDEPopupMenu *>( parent ) ) + if ( ::tqt_cast<TDEPopupMenu *>( parent ) ) { TQString i18nText; TQCString text = element.text().utf8(); @@ -389,11 +389,11 @@ int KXMLGUIBuilder::createCustomElement( TQWidget *parent, int index, const TQDo void KXMLGUIBuilder::removeCustomElement( TQWidget *parent, int id ) { - if ( ::tqqt_cast<TQPopupMenu *>( parent ) ) + if ( ::tqt_cast<TQPopupMenu *>( parent ) ) static_cast<TQPopupMenu *>(parent)->removeItem( id ); - else if ( ::tqqt_cast<TQMenuBar *>( parent ) ) + else if ( ::tqt_cast<TQMenuBar *>( parent ) ) static_cast<TQMenuBar *>(parent)->removeItem( id ); - else if ( ::tqqt_cast<TDEToolBar *>( parent ) ) + else if ( ::tqt_cast<TDEToolBar *>( parent ) ) static_cast<TDEToolBar *>(parent)->removeItemDelayed( id ); } @@ -421,7 +421,7 @@ void KXMLGUIBuilder::setBuilderInstance( TDEInstance *instance ) void KXMLGUIBuilder::finalizeGUI( KXMLGUIClient * ) { - if ( !d->m_widget || !::tqqt_cast<TDEMainWindow *>( d->m_widget ) ) + if ( !d->m_widget || !::tqt_cast<TDEMainWindow *>( d->m_widget ) ) return; #if 0 TDEToolBar *toolbar = 0; diff --git a/tdeui/tdeaction.cpp b/tdeui/tdeaction.cpp index fe9b0644b..bf818fc03 100644 --- a/tdeui/tdeaction.cpp +++ b/tdeui/tdeaction.cpp @@ -515,11 +515,11 @@ void TDEAction::updateShortcut( int i ) int id = itemId( i ); TQWidget* w = container( i ); - if ( ::tqqt_cast<TQPopupMenu *>( w ) ) { + if ( ::tqt_cast<TQPopupMenu *>( w ) ) { TQPopupMenu* menu = static_cast<TQPopupMenu*>(w); updateShortcut( menu, id ); } - else if ( ::tqqt_cast<TQMenuBar *>( w ) ) + else if ( ::tqt_cast<TQMenuBar *>( w ) ) static_cast<TQMenuBar*>(w)->setAccel( d->m_cut.keyCodeQt(), id ); } @@ -616,7 +616,7 @@ void TDEAction::updateToolTip( int i ) { TQWidget *w = container( i ); - if ( ::tqqt_cast<TDEToolBar *>( w ) ) + if ( ::tqt_cast<TDEToolBar *>( w ) ) TQToolTip::add( static_cast<TDEToolBar*>(w)->getWidget( itemId( i ) ), d->toolTip() ); } @@ -649,7 +649,7 @@ int TDEAction::plug( TQWidget *w, int index ) plugShortcut(); - if ( ::tqqt_cast<TQPopupMenu *>( w ) ) + if ( ::tqt_cast<TQPopupMenu *>( w ) ) { TQPopupMenu* menu = static_cast<TQPopupMenu*>( w ); int id; @@ -693,7 +693,7 @@ int TDEAction::plug( TQWidget *w, int index ) return d->m_containers.count() - 1; } - else if ( ::tqqt_cast<TDEToolBar *>( w ) ) + else if ( ::tqt_cast<TDEToolBar *>( w ) ) { TDEToolBar *bar = static_cast<TDEToolBar *>( w ); @@ -749,17 +749,17 @@ void TDEAction::unplug( TQWidget *w ) return; int id = itemId( i ); - if ( ::tqqt_cast<TQPopupMenu *>( w ) ) + if ( ::tqt_cast<TQPopupMenu *>( w ) ) { TQPopupMenu *menu = static_cast<TQPopupMenu *>( w ); menu->removeItem( id ); } - else if ( ::tqqt_cast<TDEToolBar *>( w ) ) + else if ( ::tqt_cast<TDEToolBar *>( w ) ) { TDEToolBar *bar = static_cast<TDEToolBar *>( w ); bar->removeItemDelayed( id ); } - else if ( ::tqqt_cast<TQMenuBar *>( w ) ) + else if ( ::tqt_cast<TQMenuBar *>( w ) ) { TQMenuBar *bar = static_cast<TQMenuBar *>( w ); bar->removeItem( id ); @@ -863,11 +863,11 @@ void TDEAction::updateEnabled( int i ) { TQWidget *w = container( i ); - if ( ::tqqt_cast<TQPopupMenu *>( w ) ) + if ( ::tqt_cast<TQPopupMenu *>( w ) ) static_cast<TQPopupMenu*>(w)->setItemEnabled( itemId( i ), d->isEnabled() ); - else if ( ::tqqt_cast<TQMenuBar *>( w ) ) + else if ( ::tqt_cast<TQMenuBar *>( w ) ) static_cast<TQMenuBar*>(w)->setItemEnabled( itemId( i ), d->isEnabled() ); - else if ( ::tqqt_cast<TDEToolBar *>( w ) ) + else if ( ::tqt_cast<TDEToolBar *>( w ) ) static_cast<TDEToolBar*>(w)->setItemEnabled( itemId( i ), d->isEnabled() ); } @@ -909,18 +909,18 @@ void TDEAction::updateText( int i ) { TQWidget *w = container( i ); - if ( ::tqqt_cast<TQPopupMenu *>( w ) ) { + if ( ::tqt_cast<TQPopupMenu *>( w ) ) { int id = itemId( i ); static_cast<TQPopupMenu*>(w)->changeItem( id, d->text() ); if (!d->m_cut.isNull()) updateShortcut( static_cast<TQPopupMenu*>(w), id ); } - else if ( ::tqqt_cast<TQMenuBar *>( w ) ) + else if ( ::tqt_cast<TQMenuBar *>( w ) ) static_cast<TQMenuBar*>(w)->changeItem( itemId( i ), d->text() ); - else if ( ::tqqt_cast<TDEToolBar *>( w ) ) + else if ( ::tqt_cast<TDEToolBar *>( w ) ) { TQWidget *button = static_cast<TDEToolBar *>(w)->getWidget( itemId( i ) ); - if ( ::tqqt_cast<TDEToolBarButton *>( button ) ) + if ( ::tqt_cast<TDEToolBarButton *>( button ) ) static_cast<TDEToolBarButton *>(button)->setText( d->plainText() ); } } @@ -949,15 +949,15 @@ void TDEAction::updateIcon( int id ) { TQWidget* w = container( id ); - if ( ::tqqt_cast<TQPopupMenu *>( w ) ) { + if ( ::tqt_cast<TQPopupMenu *>( w ) ) { int itemId_ = itemId( id ); static_cast<TQPopupMenu*>(w)->changeItem( itemId_, d->iconSet( TDEIcon::Small ), d->text() ); if (!d->m_cut.isNull()) updateShortcut( static_cast<TQPopupMenu*>(w), itemId_ ); } - else if ( ::tqqt_cast<TQMenuBar *>( w ) ) + else if ( ::tqt_cast<TQMenuBar *>( w ) ) static_cast<TQMenuBar*>(w)->changeItem( itemId( id ), d->iconSet( TDEIcon::Small ), d->text() ); - else if ( ::tqqt_cast<TDEToolBar *>( w ) ) + else if ( ::tqt_cast<TDEToolBar *>( w ) ) static_cast<TDEToolBar *>(w)->setButtonIcon( itemId( id ), d->iconName() ); } @@ -980,16 +980,16 @@ void TDEAction::updateIconSet( int id ) { TQWidget *w = container( id ); - if ( ::tqqt_cast<TQPopupMenu *>( w ) ) + if ( ::tqt_cast<TQPopupMenu *>( w ) ) { int itemId_ = itemId( id ); static_cast<TQPopupMenu*>(w)->changeItem( itemId_, d->iconSet(), d->text() ); if (!d->m_cut.isNull()) updateShortcut( static_cast<TQPopupMenu*>(w), itemId_ ); } - else if ( ::tqqt_cast<TQMenuBar *>( w ) ) + else if ( ::tqt_cast<TQMenuBar *>( w ) ) static_cast<TQMenuBar*>(w)->changeItem( itemId( id ), d->iconSet(), d->text() ); - else if ( ::tqqt_cast<TDEToolBar *>( w ) ) + else if ( ::tqt_cast<TDEToolBar *>( w ) ) { if ( icon().isEmpty() && d->hasIcon() ) // only if there is no named icon ( scales better ) static_cast<TDEToolBar *>(w)->setButtonIconSet( itemId( id ), d->iconSet() ); @@ -1112,7 +1112,7 @@ void TDEAction::slotActivated() const TQObject *senderObj = sender(); if ( senderObj ) { - if ( ::tqqt_cast<TDEAccelPrivate *>( senderObj ) ) + if ( ::tqt_cast<TDEAccelPrivate *>( senderObj ) ) emit activated( TDEAction::AccelActivation, TQt::NoButton ); } emit activated(); @@ -1124,7 +1124,7 @@ void TDEAction::slotActivated() // only called by QPopupMenus, we plugged us in. void TDEAction::slotPopupActivated() { - if( ::tqqt_cast<TQSignal *>(sender())) + if( ::tqt_cast<TQSignal *>(sender())) { int id = dynamic_cast<const TQSignal *>(sender())->value().toInt(); int pos = findContainer(id); diff --git a/tdeui/tdeactionclasses.cpp b/tdeui/tdeactionclasses.cpp index 5bea6cdaa..3fff45564 100644 --- a/tdeui/tdeactionclasses.cpp +++ b/tdeui/tdeactionclasses.cpp @@ -137,7 +137,7 @@ TDEToggleAction::~TDEToggleAction() int TDEToggleAction::plug( TQWidget* widget, int index ) { - if ( !::tqqt_cast<TQPopupMenu *>( widget ) && !::tqqt_cast<TDEToolBar *>( widget ) ) + if ( !::tqt_cast<TQPopupMenu *>( widget ) && !::tqt_cast<TDEToolBar *>( widget ) ) { kdWarning() << "Can not plug TDEToggleAction in " << widget->className() << endl; return -1; @@ -149,7 +149,7 @@ int TDEToggleAction::plug( TQWidget* widget, int index ) if ( _index == -1 ) return _index; - if ( ::tqqt_cast<TDEToolBar *>( widget ) ) { + if ( ::tqt_cast<TDEToolBar *>( widget ) ) { TDEToolBar *bar = static_cast<TDEToolBar *>( widget ); bar->setToggle( itemId( _index ), true ); @@ -180,7 +180,7 @@ void TDEToggleAction::setChecked( bool c ) if ( !list.isEmpty() ) { TQObjectListIt it( list ); for( ; it.current(); ++it ) { - if ( ::tqqt_cast<TDEToggleAction *>( it.current() ) && it.current() != this && + if ( ::tqt_cast<TDEToggleAction *>( it.current() ) && it.current() != this && static_cast<TDEToggleAction*>(it.current())->exclusiveGroup() == exclusiveGroup() ) { TDEToggleAction *a = static_cast<TDEToggleAction*>(it.current()); if( a->isChecked() ) { @@ -197,7 +197,7 @@ void TDEToggleAction::updateChecked( int id ) { TQWidget *w = container( id ); - if ( ::tqqt_cast<TQPopupMenu *>( w ) ) { + if ( ::tqt_cast<TQPopupMenu *>( w ) ) { TQPopupMenu* pm = static_cast<TQPopupMenu*>(w); int itemId_ = itemId( id ); if ( !d->m_checkedGuiItem ) @@ -219,12 +219,12 @@ void TDEToggleAction::updateChecked( int id ) updateShortcut( pm, itemId_ ); } } - else if ( ::tqqt_cast<TQMenuBar *>( w ) ) // not handled in plug... + else if ( ::tqt_cast<TQMenuBar *>( w ) ) // not handled in plug... static_cast<TQMenuBar*>(w)->setItemChecked( itemId( id ), d->m_checked ); - else if ( ::tqqt_cast<TDEToolBar *>( w ) ) + else if ( ::tqt_cast<TDEToolBar *>( w ) ) { TQWidget* r = static_cast<TDEToolBar*>( w )->getButton( itemId( id ) ); - if ( r && ::tqqt_cast<TDEToolBarButton *>( r ) ) { + if ( r && ::tqt_cast<TDEToolBarButton *>( r ) ) { static_cast<TDEToolBar*>( w )->setButton( itemId( id ), d->m_checked ); if ( d->m_checkedGuiItem && d->m_checkedGuiItem->hasIcon() ) { const KGuiItem* gui = d->m_checked ? d->m_checkedGuiItem : &guiItem(); @@ -324,7 +324,7 @@ void TDERadioAction::slotActivated() { const TQObject *senderObj = sender(); - if ( !senderObj || !::tqqt_cast<const TDEToolBarButton *>( senderObj ) ) + if ( !senderObj || !::tqt_cast<const TDEToolBarButton *>( senderObj ) ) return; const_cast<TDEToolBarButton *>( static_cast<const TDEToolBarButton *>( senderObj ) )->on( true ); @@ -537,10 +537,10 @@ void TDESelectAction::changeItem( int id, int index, const TQString& text) return; TQWidget* w = container( id ); - if ( ::tqqt_cast<TDEToolBar *>( w ) ) + if ( ::tqt_cast<TDEToolBar *>( w ) ) { TQWidget* r = (static_cast<TDEToolBar*>( w ))->getWidget( itemId( id ) ); - if ( ::tqqt_cast<TQComboBox *>( r ) ) + if ( ::tqt_cast<TQComboBox *>( r ) ) { TQComboBox *b = static_cast<TQComboBox*>( r ); b->changeItem(text, index ); @@ -587,9 +587,9 @@ void TDESelectAction::updateCurrentItem( int id ) return; TQWidget* w = container( id ); - if ( ::tqqt_cast<TDEToolBar *>( w ) ) { + if ( ::tqt_cast<TDEToolBar *>( w ) ) { TQWidget* r = static_cast<TDEToolBar*>( w )->getWidget( itemId( id ) ); - if ( ::tqqt_cast<TQComboBox *>( r ) ) { + if ( ::tqt_cast<TQComboBox *>( r ) ) { TQComboBox *b = static_cast<TQComboBox*>( r ); b->setCurrentItem( d->m_current ); } @@ -604,9 +604,9 @@ int TDESelectAction::comboWidth() const void TDESelectAction::updateComboWidth( int id ) { TQWidget* w = container( id ); - if ( ::tqqt_cast<TDEToolBar *>( w ) ) { + if ( ::tqt_cast<TDEToolBar *>( w ) ) { TQWidget* r = static_cast<TDEToolBar*>( w )->getWidget( itemId( id ) ); - if ( ::tqqt_cast<TQComboBox *>( r ) ) { + if ( ::tqt_cast<TQComboBox *>( r ) ) { TQComboBox *cb = static_cast<TQComboBox*>( r ); cb->setMinimumWidth( d->m_comboWidth ); cb->setMaximumWidth( d->m_comboWidth ); @@ -618,9 +618,9 @@ void TDESelectAction::updateItems( int id ) { kdDebug(129) << "TDEAction::updateItems( " << id << ", lst )" << endl; // remove -- ellis TQWidget* w = container( id ); - if ( ::tqqt_cast<TDEToolBar *>( w ) ) { + if ( ::tqt_cast<TDEToolBar *>( w ) ) { TQWidget* r = static_cast<TDEToolBar*>( w )->getWidget( itemId( id ) ); - if ( ::tqqt_cast<TQComboBox *>( r ) ) { + if ( ::tqt_cast<TQComboBox *>( r ) ) { TQComboBox *cb = static_cast<TQComboBox*>( r ); cb->clear(); TQStringList lst = comboItems(); @@ -641,7 +641,7 @@ int TDESelectAction::plug( TQWidget *widget, int index ) if (kapp && !kapp->authorizeTDEAction(name())) return -1; kdDebug(129) << "TDESelectAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis - if ( ::tqqt_cast<TQPopupMenu *>( widget) ) + if ( ::tqt_cast<TQPopupMenu *>( widget) ) { // Create the PopupMenu and store it in m_menu (void)popupMenu(); @@ -665,7 +665,7 @@ int TDESelectAction::plug( TQWidget *widget, int index ) return containerCount() - 1; } - else if ( ::tqqt_cast<TDEToolBar *>( widget ) ) + else if ( ::tqt_cast<TDEToolBar *>( widget ) ) { TDEToolBar* bar = static_cast<TDEToolBar*>( widget ); int id_ = TDEAction::getToolButtonID(); @@ -697,7 +697,7 @@ int TDESelectAction::plug( TQWidget *widget, int index ) return containerCount() - 1; } - else if ( ::tqqt_cast<TQMenuBar *>( widget ) ) + else if ( ::tqt_cast<TQMenuBar *>( widget ) ) { // Create the PopupMenu and store it in m_menu (void)popupMenu(); @@ -754,9 +754,9 @@ void TDESelectAction::clear() void TDESelectAction::updateClear( int id ) { TQWidget* w = container( id ); - if ( ::tqqt_cast<TDEToolBar *>( w ) ) { + if ( ::tqt_cast<TDEToolBar *>( w ) ) { TQWidget* r = static_cast<TDEToolBar*>( w )->getWidget( itemId( id ) ); - if ( ::tqqt_cast<TQComboBox *>( r ) ) { + if ( ::tqt_cast<TQComboBox *>( r ) ) { TQComboBox *b = static_cast<TQComboBox*>( r ); b->clear(); } @@ -1272,7 +1272,7 @@ int TDERecentFilesAction::plug( TQWidget *widget, int index ) return -1; // This is very related to TDEActionMenu::plug. // In fact this class could be an interesting base class for TDEActionMenu - if ( ::tqqt_cast<TDEToolBar *>( widget ) ) + if ( ::tqt_cast<TDEToolBar *>( widget ) ) { TDEToolBar *bar = (TDEToolBar *)widget; @@ -1526,7 +1526,7 @@ int TDEFontAction::plug( TQWidget *w, int index ) { if (kapp && !kapp->authorizeTDEAction(name())) return -1; - if ( ::tqqt_cast<TDEToolBar *>( w ) ) + if ( ::tqt_cast<TDEToolBar *>( w ) ) { TDEToolBar* bar = static_cast<TDEToolBar*>( w ); int id_ = TDEAction::getToolButtonID(); @@ -1796,7 +1796,7 @@ int TDEActionMenu::plug( TQWidget* widget, int index ) if (kapp && !kapp->authorizeTDEAction(name())) return -1; kdDebug(129) << "TDEActionMenu::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis - if ( ::tqqt_cast<TQPopupMenu *>( widget ) ) + if ( ::tqt_cast<TQPopupMenu *>( widget ) ) { TQPopupMenu* menu = static_cast<TQPopupMenu*>( widget ); int id; @@ -1816,7 +1816,7 @@ int TDEActionMenu::plug( TQWidget* widget, int index ) return containerCount() - 1; } - else if ( ::tqqt_cast<TDEToolBar *>( widget ) ) + else if ( ::tqt_cast<TDEToolBar *>( widget ) ) { TDEToolBar *bar = static_cast<TDEToolBar *>( widget ); @@ -1858,7 +1858,7 @@ int TDEActionMenu::plug( TQWidget* widget, int index ) return containerCount() - 1; } - else if ( ::tqqt_cast<TQMenuBar *>( widget ) ) + else if ( ::tqt_cast<TQMenuBar *>( widget ) ) { TQMenuBar *bar = static_cast<TQMenuBar *>( widget ); @@ -1943,7 +1943,7 @@ int TDEToolBarPopupAction::plug( TQWidget *widget, int index ) return -1; // This is very related to TDEActionMenu::plug. // In fact this class could be an interesting base class for TDEActionMenu - if ( ::tqqt_cast<TDEToolBar *>( widget ) ) + if ( ::tqt_cast<TDEToolBar *>( widget ) ) { TDEToolBar *bar = (TDEToolBar *)widget; @@ -2055,7 +2055,7 @@ void TDEToggleToolBarAction::setChecked( bool c ) m_toolBar->hide(); } TQMainWindow* mw = m_toolBar->mainWindow(); - if ( mw && ::tqqt_cast<TDEMainWindow *>( mw ) ) + if ( mw && ::tqt_cast<TDEMainWindow *>( mw ) ) static_cast<TDEMainWindow *>( mw )->setSettingsDirty(); } TDEToggleAction::setChecked( c ); @@ -2153,7 +2153,7 @@ int KWidgetAction::plug( TQWidget* w, int index ) if (kapp && !kapp->authorizeTDEAction(name())) return -1; - if ( !::tqqt_cast<TDEToolBar *>( w ) ) { + if ( !::tqt_cast<TDEToolBar *>( w ) ) { kdError() << "KWidgetAction::plug: KWidgetAction must be plugged into TDEToolBar." << endl; return -1; } @@ -2217,7 +2217,7 @@ TDEActionSeparator::~TDEActionSeparator() int TDEActionSeparator::plug( TQWidget *widget, int index ) { - if ( ::tqqt_cast<TQPopupMenu *>( widget) ) + if ( ::tqt_cast<TQPopupMenu *>( widget) ) { TQPopupMenu* menu = static_cast<TQPopupMenu*>( widget ); @@ -2228,7 +2228,7 @@ int TDEActionSeparator::plug( TQWidget *widget, int index ) return containerCount() - 1; } - else if ( ::tqqt_cast<TQMenuBar *>( widget ) ) + else if ( ::tqt_cast<TQMenuBar *>( widget ) ) { TQMenuBar *menuBar = static_cast<TQMenuBar *>( widget ); @@ -2240,7 +2240,7 @@ int TDEActionSeparator::plug( TQWidget *widget, int index ) return containerCount() - 1; } - else if ( ::tqqt_cast<TDEToolBar *>( widget ) ) + else if ( ::tqt_cast<TDEToolBar *>( widget ) ) { TDEToolBar *toolBar = static_cast<TDEToolBar *>( widget ); @@ -2285,7 +2285,7 @@ int TDEPasteTextAction::plug( TQWidget *widget, int index ) { if (kapp && !kapp->authorizeTDEAction(name())) return -1; - if ( ::tqqt_cast<TDEToolBar *>( widget ) ) + if ( ::tqt_cast<TDEToolBar *>( widget ) ) { TDEToolBar *bar = (TDEToolBar *)widget; diff --git a/tdeui/tdeactioncollection.cpp b/tdeui/tdeactioncollection.cpp index 3e78c01b0..d4d9576f5 100644 --- a/tdeui/tdeactioncollection.cpp +++ b/tdeui/tdeactioncollection.cpp @@ -501,14 +501,14 @@ void TDEActionCollection::connectHighlight( TQWidget *container, TDEAction *acti { actionList = new TQPtrList<TDEAction>; - if ( ::tqqt_cast<TQPopupMenu *>( container ) ) + if ( ::tqt_cast<TQPopupMenu *>( container ) ) { connect( container, TQT_SIGNAL( highlighted( int ) ), this, TQT_SLOT( slotMenuItemHighlighted( int ) ) ); connect( container, TQT_SIGNAL( aboutToHide() ), this, TQT_SLOT( slotMenuAboutToHide() ) ); } - else if ( ::tqqt_cast<TDEToolBar *>( container ) ) + else if ( ::tqt_cast<TDEToolBar *>( container ) ) { connect( container, TQT_SIGNAL( highlighted( int, bool ) ), this, TQT_SLOT( slotToolBarButtonHighlighted( int, bool ) ) ); diff --git a/tdeui/tdecompletionbox.cpp b/tdeui/tdecompletionbox.cpp index 62ca3130e..ca3017b44 100644 --- a/tdeui/tdecompletionbox.cpp +++ b/tdeui/tdecompletionbox.cpp @@ -234,7 +234,7 @@ bool TDECompletionBox::eventFilter( TQObject *o, TQEvent *e ) if ( !rect().contains( ev->pos() )) // this widget hide(); - if ( !d->emitSelected && currentItem() && !::tqqt_cast<TQScrollBar*>(o) ) + if ( !d->emitSelected && currentItem() && !::tqt_cast<TQScrollBar*>(o) ) { emit highlighted( currentText() ); hide(); diff --git a/tdeui/tests/kdockwidgettest.cpp b/tdeui/tests/kdockwidgettest.cpp index aacac19a0..f27fd0b4e 100644 --- a/tdeui/tests/kdockwidgettest.cpp +++ b/tdeui/tests/kdockwidgettest.cpp @@ -101,7 +101,7 @@ DockApplication::DockApplication( const char* name ) l->setBackgroundColor(white); l->setMinimumSize(100,100); dock5->setWidget(l); - if (::tqqt_cast<KDockContainer*>(l)) tqDebug("KDockContainer created for dock 5"); + if (::tqt_cast<KDockContainer*>(l)) tqDebug("KDockContainer created for dock 5"); /*****************************************************/ /*****************************************************/ @@ -112,7 +112,7 @@ DockApplication::DockApplication( const char* name ) l->setBackgroundColor(white); l->setMinimumSize(100,100); dock6->setWidget(l); - if (::tqqt_cast<KDockContainer*>(l)) tqDebug("KDockContainer created for dock 6"); + if (::tqt_cast<KDockContainer*>(l)) tqDebug("KDockContainer created for dock 6"); /*****************************************************/ |