diff options
author | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kxkb/kxkb.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 'kxkb/kxkb.h')
-rw-r--r-- | kxkb/kxkb.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kxkb/kxkb.h b/kxkb/kxkb.h index fc05c620a..18949ba75 100644 --- a/kxkb/kxkb.h +++ b/kxkb/kxkb.h @@ -39,7 +39,7 @@ DESCRIPTION class XKBExtension; class XkbRules; -class KGlobalAccel; +class TDEGlobalAccel; class KWinModule; class LayoutMap; @@ -91,7 +91,7 @@ private: XKBExtension *m_extension; XkbRules *m_rules; KxkbLabelController *m_tray; - KGlobalAccel *keys; + TDEGlobalAccel *keys; KWinModule* kWinModule; bool m_forceSetXKBMap; }; |