diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /khotkeys/shared/input.cpp | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'khotkeys/shared/input.cpp')
| -rw-r--r-- | khotkeys/shared/input.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 )); |