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-et/docs/tdebase/kinfocenter/samba/index.docbook |  2 +-
 tde-i18n-et/docs/tdebase/ksplashml/index.docbook         |  2 +-
 tde-i18n-et/docs/tdevelop/kdearch/index.docbook          | 12 ++++++------
 tde-i18n-et/docs/tdewebdev/kommander/extending.docbook   |  6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'tde-i18n-et/docs')

diff --git a/tde-i18n-et/docs/tdebase/kinfocenter/samba/index.docbook b/tde-i18n-et/docs/tdebase/kinfocenter/samba/index.docbook
index 8e0ab1dae84..35027eb62da 100644
--- a/tde-i18n-et/docs/tdebase/kinfocenter/samba/index.docbook
+++ b/tde-i18n-et/docs/tdebase/kinfocenter/samba/index.docbook
@@ -277,7 +277,7 @@
 <listitem
 ><para
 ><classname
->KProcess</classname
+>TDEProcess</classname
 >i kasutamine popeni asemel ja hulganisi vigade kontrolli:</para>
 <para
 >&David.Faure; &David.Faure.mail;</para
diff --git a/tde-i18n-et/docs/tdebase/ksplashml/index.docbook b/tde-i18n-et/docs/tdebase/ksplashml/index.docbook
index e04b8f6059d..2a35b270266 100644
--- a/tde-i18n-et/docs/tdebase/ksplashml/index.docbook
+++ b/tde-i18n-et/docs/tdebase/ksplashml/index.docbook
@@ -1403,7 +1403,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 );
 }
diff --git a/tde-i18n-et/docs/tdevelop/kdearch/index.docbook b/tde-i18n-et/docs/tdevelop/kdearch/index.docbook
index c6e2b4f217b..f3514e41350 100644
--- a/tde-i18n-et/docs/tdevelop/kdearch/index.docbook
+++ b/tde-i18n-et/docs/tdevelop/kdearch/index.docbook
@@ -237,8 +237,8 @@
 <listitem
 ><formalpara
 ><title
-><ulink url="kdeapi:tdecore/KGlobalSettings"
->KGlobalSettings</ulink
+><ulink url="kdeapi:tdecore/TDEGlobalSettings"
+>TDEGlobalSettings</ulink
 ></title>
 <para
 >Hõlpus ligipääs rakendusest otseselt mittesõltuvatele seadistustele. </para>
@@ -295,8 +295,8 @@
 <listitem
 ><formalpara
 ><title
-><ulink url="kdeapi:tdecore/KProcess"
->KProcess</ulink
+><ulink url="kdeapi:tdecore/TDEProcess"
+>TDEProcess</ulink
 ></title>
 <para
 >Kutsub välja ja juhib alamprotsesse. </para>
@@ -452,7 +452,7 @@
 <listitem
 ><formalpara
 ><title
-><ulink url="kdeapi:tdecore/KGlobalAccel"
+><ulink url="kdeapi:tdecore/TDEGlobalAccel"
 ></ulink
 ></title>
 <para
@@ -3362,7 +3362,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 "
diff --git a/tde-i18n-et/docs/tdewebdev/kommander/extending.docbook b/tde-i18n-et/docs/tdewebdev/kommander/extending.docbook
index 5f15e144ad4..1d25b1bd9cd 100644
--- a/tde-i18n-et/docs/tdewebdev/kommander/extending.docbook
+++ b/tde-i18n-et/docs/tdewebdev/kommander/extending.docbook
@@ -238,7 +238,7 @@ KomLineEdit::KomLineEdit(QWidget *a_parent, const char *a_name)
 <screen
 >if (KommanderWidget::inEditor)
   {
-    setPixmap(KGlobal::iconLoader()->loadIcon("iconname", KIcon::NoGroup, KIcon::SizeMedium));
+    setPixmap(TDEGlobal::iconLoader()->loadIcon("iconname", KIcon::NoGroup, KIcon::SizeMedium));
     setFrameStyle(QFrame::Box | QFrame::Plain);
     setLineWidth(1);
     setFixedSize(pixmap()->size());
@@ -307,7 +307,7 @@ public:
 <screen
 >MinuKomPlugin::MinuKomPlugin()
 {
-    addWidget( "KomLineEdit", "My Widget Group", i18n("A Kommander line edit widget") new QIconSet(KGlobal::iconLoader()->loadIcon("ikooninimi", KIcon::NoGroup, KIcon::SizeMedium)));
+    addWidget( "KomLineEdit", "My Widget Group", i18n("A Kommander line edit widget") new QIconSet(TDEGlobal::iconLoader()->loadIcon("ikooninimi", KIcon::NoGroup, KIcon::SizeMedium)));
     //add my other widgets here
 }
 </screen>
@@ -433,7 +433,7 @@ QWidget *WidgetFactory::createWidget( const QString &amp;className, QWidget *par
 >KomStdPlugin::KomStdPlugin()
 {
   ...
-  addWidget("MyWidgetName", group, "", new QIconSet(KGlobal::iconLoader()->loadIcon("iconname", KIcon::NoGroup, KIcon::SizeMedium)));
+  addWidget("MyWidgetName", group, "", new QIconSet(TDEGlobal::iconLoader()->loadIcon("iconname", KIcon::NoGroup, KIcon::SizeMedium)));
   ...
 }
 </screen>
-- 
cgit v1.2.1