diff options
Diffstat (limited to 'tdecore')
| -rw-r--r-- | tdecore/kaccel.cpp | 4 | ||||
| -rw-r--r-- | tdecore/kaccelmanager.cpp | 6 | ||||
| -rw-r--r-- | tdecore/kapplication.cpp | 2 | ||||
| -rw-r--r-- | tdecore/kglobalaccel_win.cpp | 6 | ||||
| -rw-r--r-- | tdecore/kglobalaccel_x11.cpp | 6 |
5 files changed, 12 insertions, 12 deletions
diff --git a/tdecore/kaccel.cpp b/tdecore/kaccel.cpp index 660cc4c29..52175e2eb 100644 --- a/tdecore/kaccel.cpp +++ b/tdecore/kaccel.cpp @@ -116,14 +116,14 @@ KAccelEventHandler::KAccelEventHandler() } #ifdef Q_WS_X11 -bool qt_try_modal( TQWidget *, XEvent * ); +bool tqt_try_modal( TQWidget *, XEvent * ); bool KAccelEventHandler::x11Event( XEvent* pEvent ) { if( TQWidget::keyboardGrabber() || !kapp->focusWidget() ) return false; - if ( !qt_try_modal(kapp->focusWidget(), pEvent) ) + if ( !tqt_try_modal(kapp->focusWidget(), pEvent) ) return false; if( pEvent->type == XKeyPress ) { diff --git a/tdecore/kaccelmanager.cpp b/tdecore/kaccelmanager.cpp index d9f0b5cda..d4387e652 100644 --- a/tdecore/kaccelmanager.cpp +++ b/tdecore/kaccelmanager.cpp @@ -321,7 +321,7 @@ void KAcceleratorManagerPrivate::manageWidget(TQWidget *w, Item *item) if (dynamic_cast<TQComboBox*>(w) || dynamic_cast<TQLineEdit*>(w) || dynamic_cast<TQTextEdit*>(w) || dynamic_cast<TQTextView*>(w) || - dynamic_cast<TQSpinBox*>(w) || static_cast<KMultiTabBar*>(w->qt_cast("KMultiTabBar"))) + dynamic_cast<TQSpinBox*>(w) || static_cast<KMultiTabBar*>(w->tqt_cast("KMultiTabBar"))) return; // now treat 'ordinary' widgets @@ -345,7 +345,7 @@ void KAcceleratorManagerPrivate::manageWidget(TQWidget *w, Item *item) if (tprop != -1) { const TQMetaProperty* p = w->metaObject()->property( tprop, true ); if ( p && p->isValid() ) - w->qt_property( tprop, 1, &variant ); + w->tqt_property( tprop, 1, &variant ); else tprop = -1; } @@ -355,7 +355,7 @@ void KAcceleratorManagerPrivate::manageWidget(TQWidget *w, Item *item) if (tprop != -1) { const TQMetaProperty* p = w->metaObject()->property( tprop, true ); if ( p && p->isValid() ) - w->qt_property( tprop, 1, &variant ); + w->tqt_property( tprop, 1, &variant ); } } diff --git a/tdecore/kapplication.cpp b/tdecore/kapplication.cpp index e7995d8b2..438a07a53 100644 --- a/tdecore/kapplication.cpp +++ b/tdecore/kapplication.cpp @@ -2220,7 +2220,7 @@ void KApplication::invokeEditSlot( const char *slot ) if( idx < 0 ) return; - object->qt_invoke( idx, 0 ); + object->tqt_invoke( idx, 0 ); } void KApplication::addKipcEventMask(int id) diff --git a/tdecore/kglobalaccel_win.cpp b/tdecore/kglobalaccel_win.cpp index a6c80bc1a..42175c5ba 100644 --- a/tdecore/kglobalaccel_win.cpp +++ b/tdecore/kglobalaccel_win.cpp @@ -315,7 +315,7 @@ void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& s if( slot_id >= 0 ) { QUObject o[2]; static_QUType_int.set(o+1,n); - const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, o ); + const_cast< TQObject* >( pAction->objSlotPtr())->tqt_invoke( slot_id, o ); } } else if( rexPassInfo.search( pAction->methodSlotPtr() ) ) { int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); @@ -324,12 +324,12 @@ void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& s static_QUType_QString.set(o+1,pAction->name()); static_QUType_QString.set(o+2,pAction->label()); static_QUType_ptr.set(o+3,&seq); - const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, o ); + const_cast< TQObject* >( pAction->objSlotPtr())->tqt_invoke( slot_id, o ); } } else { int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); if( slot_id >= 0 ) - const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, 0 ); + const_cast< TQObject* >( pAction->objSlotPtr())->tqt_invoke( slot_id, 0 ); } } diff --git a/tdecore/kglobalaccel_x11.cpp b/tdecore/kglobalaccel_x11.cpp index dd40792dd..4f73c4ffd 100644 --- a/tdecore/kglobalaccel_x11.cpp +++ b/tdecore/kglobalaccel_x11.cpp @@ -411,7 +411,7 @@ void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& s if( slot_id >= 0 ) { TQUObject o[2]; static_TQUType_int.set(o+1,n); - const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, o ); + const_cast< TQObject* >( pAction->objSlotPtr())->tqt_invoke( slot_id, o ); } } else if( rexPassInfo.search( pAction->methodSlotPtr() ) ) { int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); @@ -420,12 +420,12 @@ void KGlobalAccelPrivate::activate( KAccelAction* pAction, const KKeySequence& s static_TQUType_TQString.set(o+1,pAction->name()); static_TQUType_TQString.set(o+2,pAction->label()); static_TQUType_ptr.set(o+3,&seq); - const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, o ); + const_cast< TQObject* >( pAction->objSlotPtr())->tqt_invoke( slot_id, o ); } } else { int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true ); if( slot_id >= 0 ) - const_cast< TQObject* >( pAction->objSlotPtr())->qt_invoke( slot_id, 0 ); + const_cast< TQObject* >( pAction->objSlotPtr())->tqt_invoke( slot_id, 0 ); } } |