summaryrefslogtreecommitdiffstats
path: root/tde-i18n-fr/docs
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:40:06 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:40:06 -0600
commit885d90404a23b3a5036d64d99920cb8f7874bdd5 (patch)
treebd876b447715b3987c7b6c2c77ca04b3d870e515 /tde-i18n-fr/docs
parentfbd0d7aacf83e98be86e714d220941dc7b5c5e0b (diff)
downloadtde-i18n-885d90404a23b3a5036d64d99920cb8f7874bdd5.tar.gz
tde-i18n-885d90404a23b3a5036d64d99920cb8f7874bdd5.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'tde-i18n-fr/docs')
-rw-r--r--tde-i18n-fr/docs/tdebase/kinfocenter/samba/index.docbook2
-rw-r--r--tde-i18n-fr/docs/tdebase/ksplashml/index.docbook2
-rw-r--r--tde-i18n-fr/docs/tdevelop/kdearch/index.docbook12
3 files changed, 8 insertions, 8 deletions
diff --git a/tde-i18n-fr/docs/tdebase/kinfocenter/samba/index.docbook b/tde-i18n-fr/docs/tdebase/kinfocenter/samba/index.docbook
index b1066f5dfca..4a49727c8de 100644
--- a/tde-i18n-fr/docs/tdebase/kinfocenter/samba/index.docbook
+++ b/tde-i18n-fr/docs/tdebase/kinfocenter/samba/index.docbook
@@ -265,7 +265,7 @@
<listitem
><para
>Utilisation de <classname
->KProcess</classname
+>TDEProcess</classname
> au lieu de popen et plus de recherche d'erreurs :</para>
<para
>&David.Faure; &David.Faure.mail;</para
diff --git a/tde-i18n-fr/docs/tdebase/ksplashml/index.docbook b/tde-i18n-fr/docs/tdebase/ksplashml/index.docbook
index 8647a78c304..045149635f4 100644
--- a/tde-i18n-fr/docs/tdebase/ksplashml/index.docbook
+++ b/tde-i18n-fr/docs/tdebase/ksplashml/index.docbook
@@ -1387,7 +1387,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-fr/docs/tdevelop/kdearch/index.docbook b/tde-i18n-fr/docs/tdevelop/kdearch/index.docbook
index cc238fb378d..ca1a3199879 100644
--- a/tde-i18n-fr/docs/tdevelop/kdearch/index.docbook
+++ b/tde-i18n-fr/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
>Accès pratique aux réglages non spécifiques à une application. </para>
@@ -295,8 +295,8 @@
<listitem
><formalpara
><title
-><ulink url="kdeapi:tdecore/KProcess"
->KProcess</ulink
+><ulink url="kdeapi:tdecore/TDEProcess"
+>TDEProcess</ulink
></title>
<para
>Invoque et contrôle les processus enfants. </para>
@@ -454,7 +454,7 @@
<listitem
><formalpara
><title
-><ulink url="kdeapi:tdecore/KGlobalAccel"
+><ulink url="kdeapi:tdecore/TDEGlobalAccel"
></ulink
></title>
<para
@@ -3386,7 +3386,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 "