From 79b21d47bce1ee428affc97534cd8b257232a871 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:43:14 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kxkb/kxkb.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kxkb/kxkb.h') 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; }; -- cgit v1.2.1