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

---
 doc/kdearch/index.docbook | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'doc/kdearch')

diff --git a/doc/kdearch/index.docbook b/doc/kdearch/index.docbook
index f288f588..a3579f9d 100644
--- a/doc/kdearch/index.docbook
+++ b/doc/kdearch/index.docbook
@@ -161,7 +161,7 @@ Access to <literal>.desktop</literal> files.
 </para>
 </formalpara></listitem>
 
-<listitem><formalpara><title><ulink url="kdeapi:tdecore/KGlobalSettings">KGlobalSettings</ulink></title>
+<listitem><formalpara><title><ulink url="kdeapi:tdecore/TDEGlobalSettings">TDEGlobalSettings</ulink></title>
 <para>
 Convenient access to not application-specific settings.
 </para>
@@ -201,7 +201,7 @@ Interprocess communication - DCOP helper classes and subprocess invocation.
 
 <itemizedlist>
 
-<listitem><formalpara><title><ulink url="kdeapi:tdecore/KProcess">KProcess</ulink></title>
+<listitem><formalpara><title><ulink url="kdeapi:tdecore/TDEProcess">TDEProcess</ulink></title>
 <para>
 Invokes and controls child processes.
 </para>
@@ -297,7 +297,7 @@ Easy access to the common keyboard shortcut keys.
 </para>
 </formalpara></listitem>
 
-<listitem><formalpara><title><ulink url="kdeapi:tdecore/KGlobalAccel"></ulink></title>
+<listitem><formalpara><title><ulink url="kdeapi:tdecore/TDEGlobalAccel"></ulink></title>
 <para>
 Collection of system-wide keyboard shortcuts.
 </para>
@@ -3121,7 +3121,7 @@ int kdemain(int argc, char **argv)
 {
     KLocale::setMainCatalogue("tdelibs");
     TDEInstance instance("kio_ftp");
-    (void) KGlobal::locale();
+    (void) TDEGlobal::locale();
 
     if (argc != 4) {
         fprintf(stderr, "Usage: kio_ftp protocol "
-- 
cgit v1.2.1