summaryrefslogtreecommitdiffstats
path: root/doc/kdearch
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:51:01 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:51:01 -0600
commitb9e542d0c805e9adee3a67e44532d5321032e21e (patch)
treee82d85b9035cc2ca322911e8a6e38a3bd8b1d431 /doc/kdearch
parent7a392a04059bd904dab4c78910a6d34aa0b37798 (diff)
downloadtdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.tar.gz
tdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'doc/kdearch')
-rw-r--r--doc/kdearch/index.docbook8
1 files changed, 4 insertions, 4 deletions
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 "