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

---
 tde-i18n-en_GB/docs/tdebase/kinfocenter/samba/index.docbook | 2 +-
 tde-i18n-en_GB/docs/tdebase/ksplashml/index.docbook         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'tde-i18n-en_GB')

diff --git a/tde-i18n-en_GB/docs/tdebase/kinfocenter/samba/index.docbook b/tde-i18n-en_GB/docs/tdebase/kinfocenter/samba/index.docbook
index d9e42c61b57..e7a4350478f 100644
--- a/tde-i18n-en_GB/docs/tdebase/kinfocenter/samba/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/kinfocenter/samba/index.docbook
@@ -279,7 +279,7 @@
 <listitem
 ><para
 >Use of <classname
->KProcess</classname
+>TDEProcess</classname
 > instead of popen, and more error checking:</para>
 <para
 >&David.Faure; &David.Faure.mail;</para
diff --git a/tde-i18n-en_GB/docs/tdebase/ksplashml/index.docbook b/tde-i18n-en_GB/docs/tdebase/ksplashml/index.docbook
index cdc4d8855e3..6fcfce7935d 100644
--- a/tde-i18n-en_GB/docs/tdebase/ksplashml/index.docbook
+++ b/tde-i18n-en_GB/docs/tdebase/ksplashml/index.docbook
@@ -1342,7 +1342,7 @@ void Theme2k::initUi()
   mText-&gt;setFixedHeight( 48 );
 
   setFixedSize( vbox-&gt;sizeHint() );
-  QRect rect(KGlobalSettings::splashScreenDesktopGeometry());
+  QRect rect(TDEGlobalSettings::splashScreenDesktopGeometry());
   move( rect.x() + (rect.width() - size().width())/2,
         rect.y() + (rect.height() - size().height())/2 );
 }
-- 
cgit v1.2.3