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

---
 extra/kde342/kaccelaction.h   | 2 +-
 extra/kde342/kaccelbase.h     | 2 +-
 extra/kde342/ktoolbarbutton.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'extra/kde342')

diff --git a/extra/kde342/kaccelaction.h b/extra/kde342/kaccelaction.h
index 6515034..6d34b4f 100644
--- a/extra/kde342/kaccelaction.h
+++ b/extra/kde342/kaccelaction.h
@@ -65,7 +65,7 @@ class KConfigBase;
  * \endcode
  * @short An accelerator action
  * @see KAccel
- * @see KGlobalAccel
+ * @see TDEGlobalAccel
  * @see KKeyChooser
  * @see KKeyDialog
  */
diff --git a/extra/kde342/kaccelbase.h b/extra/kde342/kaccelbase.h
index b66e566..d9038d5 100644
--- a/extra/kde342/kaccelbase.h
+++ b/extra/kde342/kaccelbase.h
@@ -166,7 +166,7 @@ class TDECORE_EXPORT KAccelBase
 	/**
 	 * Read all key associations from @p config, or (if @p config
 	 * is zero) from the application's configuration file
-	 * KGlobal::config().
+	 * TDEGlobal::config().
 	 *
 	 * The group in which the configuration is stored can be
 	 * set with setConfigGroup().
diff --git a/extra/kde342/ktoolbarbutton.h b/extra/kde342/ktoolbarbutton.h
index 98f8476..2508411 100644
--- a/extra/kde342/ktoolbarbutton.h
+++ b/extra/kde342/ktoolbarbutton.h
@@ -60,7 +60,7 @@ public:
    */
   KToolBarButton(const TQString& icon, int id, TQWidget *parent,
                  const char *name=0L, const TQString &txt=TQString::null,
-                 TDEInstance *_instance = KGlobal::instance());
+                 TDEInstance *_instance = TDEGlobal::instance());
 
   /**
    * Construct a button with an existing pixmap.  It is not
-- 
cgit v1.2.3