diff options
Diffstat (limited to 'khotkeys/shared')
-rw-r--r-- | khotkeys/shared/actions.cpp | 4 | ||||
-rw-r--r-- | khotkeys/shared/input.cpp | 4 | ||||
-rw-r--r-- | khotkeys/shared/input.h | 4 | ||||
-rw-r--r-- | khotkeys/shared/khotkeysglobal.cpp | 2 | ||||
-rw-r--r-- | khotkeys/shared/voices.cpp | 2 | ||||
-rw-r--r-- | khotkeys/shared/voices.h | 4 |
6 files changed, 10 insertions, 10 deletions
diff --git a/khotkeys/shared/actions.cpp b/khotkeys/shared/actions.cpp index cb13893ca..e25b1c359 100644 --- a/khotkeys/shared/actions.cpp +++ b/khotkeys/shared/actions.cpp @@ -292,9 +292,9 @@ void Dcop_action::execute() } } kdDebug( 1217 ) << "DCOP call:" << app << ":" << obj << ":" << call << ":" << args_list << endl; - KProcess proc; + TDEProcess proc; proc << "dcop" << app << obj << call << args_list; - proc.start( KProcess::DontCare ); + proc.start( TDEProcess::DontCare ); } TQString Dcop_action::description() const diff --git a/khotkeys/shared/input.cpp b/khotkeys/shared/input.cpp index 10a52a554..25cc1c465 100644 --- a/khotkeys/shared/input.cpp +++ b/khotkeys/shared/input.cpp @@ -43,7 +43,7 @@ Kbd::Kbd( bool grabbing_enabled_P, TQObject* parent_P ) { assert( keyboard_handler == NULL ); keyboard_handler = this; - kga = new KGlobalAccel( NULL ); + kga = new TDEGlobalAccel( NULL ); kga->setEnabled( grabbing_enabled_P ); } @@ -122,7 +122,7 @@ void Kbd::ungrab_shortcut( const KShortcut& shortcut_P ) if( --grabs[ shortcut_P ] == 0 ) { #if 0 - // CHECKME workaround for KGlobalAccel::disconnectItem() not working + // CHECKME workaround for TDEGlobalAccel::disconnectItem() not working kga->setItemEnabled( ' ' + TQString::number( keycode_P ), false ); // kga->disconnectItem( ' ' + TQString::number( keycode_P ), NULL, NULL ); kga->removeItem( ' ' + TQString::number( keycode_P )); diff --git a/khotkeys/shared/input.h b/khotkeys/shared/input.h index f74368944..08b71b761 100644 --- a/khotkeys/shared/input.h +++ b/khotkeys/shared/input.h @@ -21,7 +21,7 @@ #include <X11/X.h> #include <fixx11h.h> -class KGlobalAccel; +class TDEGlobalAccel; namespace KHotKeys { @@ -60,7 +60,7 @@ class Kbd }; TQMap< Kbd_receiver*, Receiver_data > receivers; TQMap< KShortcut, int > grabs; - KGlobalAccel* kga; + TDEGlobalAccel* kga; }; class Mouse diff --git a/khotkeys/shared/khotkeysglobal.cpp b/khotkeys/shared/khotkeysglobal.cpp index 4c6b8360c..272c5c1c0 100644 --- a/khotkeys/shared/khotkeysglobal.cpp +++ b/khotkeys/shared/khotkeysglobal.cpp @@ -61,7 +61,7 @@ bool khotkeys_active() // "/opt/kde2/share/applnk/System/konsole.desktop" -> "System/konsole.desktop" TQString get_menu_entry_from_path( const TQString& path_P ) { - TQStringList dirs = KGlobal::dirs()->resourceDirs( "apps" ); + TQStringList dirs = TDEGlobal::dirs()->resourceDirs( "apps" ); for( TQStringList::ConstIterator it = dirs.begin(); it != dirs.end(); ++it ) diff --git a/khotkeys/shared/voices.cpp b/khotkeys/shared/voices.cpp index a6515fecf..07ab899f6 100644 --- a/khotkeys/shared/voices.cpp +++ b/khotkeys/shared/voices.cpp @@ -205,7 +205,7 @@ void Voice::set_shortcut( const KShortcut &shortcut) if( !_enabled ) return; if(!_kga) - _kga = new KGlobalAccel( this ); + _kga = new TDEGlobalAccel( this ); _kga->remove("voice"); _kga->insert( "voice", i18n("Voice"), TQString::null, shortcut, 0, this, TQT_SLOT(slot_key_pressed())) ; diff --git a/khotkeys/shared/voices.h b/khotkeys/shared/voices.h index 0f8496d8a..abb5858b2 100644 --- a/khotkeys/shared/voices.h +++ b/khotkeys/shared/voices.h @@ -16,7 +16,7 @@ class Sound; class TQTimer; -class KGlobalAccel; +class TDEGlobalAccel; namespace KHotKeys { @@ -70,7 +70,7 @@ class KDE_EXPORT Voice : public TQObject SoundRecorder *_recorder; KShortcut _shortcut; - KGlobalAccel *_kga; + TDEGlobalAccel *_kga; TQTimer *_timer; }; |