summaryrefslogtreecommitdiffstats
path: root/doc/kdearch
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:23:50 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:23:50 -0600
commit3a044decb0a5d7be822c888b2d5374573d7df96e (patch)
treeddf4681e0233c25203fc927596aa7b3bdb5f2efa /doc/kdearch
parent5c0390ebaa2be82d8684af5a6bc2b16740f4cc1b (diff)
downloadtdevelop-3a044decb0a5d7be822c888b2d5374573d7df96e.tar.gz
tdevelop-3a044decb0a5d7be822c888b2d5374573d7df96e.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'doc/kdearch')
-rw-r--r--doc/kdearch/index.docbook4
1 files changed, 2 insertions, 2 deletions
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) {