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 /twin/twinbindings.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 'twin/twinbindings.cpp')
| -rw-r--r-- | twin/twinbindings.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/twin/twinbindings.cpp b/twin/twinbindings.cpp index f1c47cda0..5e468d34b 100644 --- a/twin/twinbindings.cpp +++ b/twin/twinbindings.cpp @@ -160,7 +160,7 @@ DEF( I18N_NOOP("Desktop Screenshot"), CTRL+Qt::Key_Print, WIN+Qt::Key_Print, slotGrabDesktop() ); #ifdef IN_KWIN { - KGlobalAccel* keys = disable_shortcuts_keys; + TDEGlobalAccel* keys = disable_shortcuts_keys; #endif DEF( I18N_NOOP("Block Global Shortcuts"), 0, 0, slotDisableGlobalShortcuts()); #ifdef IN_KWIN |