From 3a044decb0a5d7be822c888b2d5374573d7df96e Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 22 Jan 2013 20:23:50 -0600
Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4

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

(limited to 'doc/kdearch')

diff --git a/doc/kdearch/index.docbook b/doc/kdearch/index.docbook
index 353bb436..f288f588 100644
--- a/doc/kdearch/index.docbook
+++ b/doc/kdearch/index.docbook
@@ -122,7 +122,7 @@ Makes sure only one instance of an application can run simultaneously.
 </para>
 </formalpara></listitem>
 
-<listitem><formalpara><title><ulink url="kdeapi:tdecore/KAboutData">KAboutData</ulink></title>
+<listitem><formalpara><title><ulink url="kdeapi:tdecore/TDEAboutData">TDEAboutData</ulink></title>
 <para>
 Holds information for the about box.
 </para>
@@ -3120,7 +3120,7 @@ extern "C" { int kdemain(int argc, char **argv); }
 int kdemain(int argc, char **argv)
 {
     KLocale::setMainCatalogue("tdelibs");
-    KInstance instance("kio_ftp");
+    TDEInstance instance("kio_ftp");
     (void) KGlobal::locale();
 
     if (argc != 4) {
-- 
cgit v1.2.1