summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:43:14 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:43:14 -0600
commit79b21d47bce1ee428affc97534cd8b257232a871 (patch)
tree0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /doc
parent9a898d493f493adbc404f7223043c85f3817472b (diff)
downloadtdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz
tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'doc')
-rw-r--r--doc/kinfocenter/samba/index.docbook2
-rw-r--r--doc/ksplashml/index.docbook2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/kinfocenter/samba/index.docbook b/doc/kinfocenter/samba/index.docbook
index 37b14c48c..36df1da1b 100644
--- a/doc/kinfocenter/samba/index.docbook
+++ b/doc/kinfocenter/samba/index.docbook
@@ -188,7 +188,7 @@ often, or which user opened the most files or whatever.</para>
<title>Contributors</title>
<listitem><para>Conversion to kcontrol applet:</para>
<para>&Matthias.Hoelzer-Kluepfel; &Matthias.Hoelzer-Kluepfel.mail;</para></listitem>
-<listitem><para>Use of <classname>KProcess</classname> instead of popen, and more error checking:</para>
+<listitem><para>Use of <classname>TDEProcess</classname> instead of popen, and more error checking:</para>
<para>&David.Faure; &David.Faure.mail;</para></listitem>
<listitem><para>Conversion to kcmodule, added tab pages 2,3,4, bug
fixed:</para>
diff --git a/doc/ksplashml/index.docbook b/doc/ksplashml/index.docbook
index b461e26c7..15a826872 100644
--- a/doc/ksplashml/index.docbook
+++ b/doc/ksplashml/index.docbook
@@ -1154,7 +1154,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 );
}