diff options
Diffstat (limited to 'tdeui/tdeshortcutdialog.cpp')
| -rw-r--r-- | tdeui/tdeshortcutdialog.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/tdeui/tdeshortcutdialog.cpp b/tdeui/tdeshortcutdialog.cpp index 4d95970b6..be0386dea 100644 --- a/tdeui/tdeshortcutdialog.cpp +++ b/tdeui/tdeshortcutdialog.cpp @@ -21,7 +21,7 @@ #include <tqvariant.h> -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #define XK_XKB_KEYS #define XK_MISCELLANY #include <X11/Xlib.h> // For x11Event() @@ -37,7 +37,7 @@ #undef FocusOut #undef FocusIn #endif -#elif defined(Q_WS_WIN) +#elif defined(TQ_WS_WIN) # include <kkeyserver.h> #endif @@ -91,21 +91,21 @@ TDEShortcutDialog::TDEShortcutDialog( const TDEShortcut& shortcut, bool bQtShort m_simple->m_btnClearShortcut->setPixmap( SmallIcon( "locationbar_erase" ) ); m_adv->m_btnClearPrimary->setPixmap( SmallIcon( "locationbar_erase" ) ); m_adv->m_btnClearAlternate->setPixmap( SmallIcon( "locationbar_erase" ) ); - connect(m_simple->m_btnClearShortcut, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotClearShortcut())); - connect(m_adv->m_btnClearPrimary, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotClearPrimary())); - connect(m_adv->m_btnClearAlternate, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotClearAlternate())); - - connect(m_adv->m_txtPrimary, TQT_SIGNAL(clicked()), - m_adv->m_btnPrimary, TQT_SLOT(animateClick())); - connect(m_adv->m_txtAlternate, TQT_SIGNAL(clicked()), - m_adv->m_btnAlternate, TQT_SLOT(animateClick())); - connect(m_adv->m_btnPrimary, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSelectPrimary())); - connect(m_adv->m_btnAlternate, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSelectAlternate())); + connect(m_simple->m_btnClearShortcut, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotClearShortcut())); + connect(m_adv->m_btnClearPrimary, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotClearPrimary())); + connect(m_adv->m_btnClearAlternate, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotClearAlternate())); + + connect(m_adv->m_txtPrimary, TQ_SIGNAL(clicked()), + m_adv->m_btnPrimary, TQ_SLOT(animateClick())); + connect(m_adv->m_txtAlternate, TQ_SIGNAL(clicked()), + m_adv->m_btnAlternate, TQ_SLOT(animateClick())); + connect(m_adv->m_btnPrimary, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSelectPrimary())); + connect(m_adv->m_btnAlternate, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSelectAlternate())); KGuiItem ok = KStdGuiItem::ok(); ok.setText( i18n( "OK" ) ); @@ -121,7 +121,7 @@ TDEShortcutDialog::TDEShortcutDialog( const TDEShortcut& shortcut, bool bQtShort s_showMore = TDEConfigGroup(TDEGlobal::config(), "General").readBoolEntry("ShowAlternativeShortcutConfig", s_showMore); updateDetails(); - #ifdef Q_WS_X11 + #ifdef TQ_WS_X11 kapp->installX11EventFilter( this ); // Allow button to capture X Key Events. #endif } @@ -276,7 +276,7 @@ void TDEShortcutDialog::slotMultiKeyMode( bool bOn ) } } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 /* we don't use the generic Qt code on X11 because it allows us to grab the keyboard so that all keypresses are seen */ @@ -387,7 +387,7 @@ void TDEShortcutDialog::x11KeyReleaseEvent( XEvent* pEvent ) updateShortcutDisplay(); } } -#elif defined(Q_WS_WIN) +#elif defined(TQ_WS_WIN) void TDEShortcutDialog::keyPressEvent( TQKeyEvent * e ) { kdDebug() << e->text() << " " << (int)e->text()[0].latin1()<< " " << (int)e->ascii() << endl; @@ -442,7 +442,7 @@ void TDEShortcutDialog::keyPressEvent( TQKeyEvent * e ) updateShortcutDisplay(); if( !m_adv->m_btnMultiKey->isChecked() ) - TQTimer::singleShot(500, this, TQT_SLOT(accept())); + TQTimer::singleShot(500, this, TQ_SLOT(accept())); } return; } @@ -520,7 +520,7 @@ void TDEShortcutDialog::keyPressed( KKey key ) updateShortcutDisplay(); if( !m_adv->m_btnMultiKey->isChecked() ) - TQTimer::singleShot(500, this, TQT_SLOT(accept())); + TQTimer::singleShot(500, this, TQ_SLOT(accept())); } #include "tdeshortcutdialog.moc" |