From 28edc0aa2ab09297288186f5bc15765eb7be58c0 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 24 Jan 2013 13:47:22 -0600
Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

---
 tdecore/kshortcutlist.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'tdecore/kshortcutlist.h')

diff --git a/tdecore/kshortcutlist.h b/tdecore/kshortcutlist.h
index ce8f408a1..497bfaf15 100644
--- a/tdecore/kshortcutlist.h
+++ b/tdecore/kshortcutlist.h
@@ -40,7 +40,7 @@ class KShortcut;
  * KAccelShortcutList and KStdAccel::ShortcutList. It gives
  * you an unified interface for accessing the accelerator lists
  * of KAccel (using KAccelShortcutList),
- * KGlobalAccel (using KAccelShortcutList), and
+ * TDEGlobalAccel (using KAccelShortcutList), and
  * KStdAccel (using KStdAccel::ShortcutList).
  *
  * @short Base class for accessing accelerator lists
@@ -189,11 +189,11 @@ class TDECORE_EXPORT KShortcutList
 
 class KAccel;
 class KAccelActions;
-class KGlobalAccel;
+class TDEGlobalAccel;
 
 /**
  * KShortcutList implementation to access KAccel and
- * KGlobalAccel lists.
+ * TDEGlobalAccel lists.
  */
 class TDECORE_EXPORT KAccelShortcutList : public KShortcutList
 {
@@ -206,10 +206,10 @@ class TDECORE_EXPORT KAccelShortcutList : public KShortcutList
 
         /**
 	 * Creates a new KShortcutList that accesses the given
-	 * KGlobalAccel.
+	 * TDEGlobalAccel.
 	 * @param accel the accelerators to access
 	 */
-	KAccelShortcutList( KGlobalAccel* accel );
+	KAccelShortcutList( TDEGlobalAccel* accel );
 
         /**
 	 * @internal
-- 
cgit v1.2.1