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/voices.h | |
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/voices.h')
-rw-r--r-- | khotkeys/shared/voices.h | 4 |
1 files changed, 2 insertions, 2 deletions
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; }; |