Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

2 files changed, 3 insertions, 3 deletions

diff --git a/kcontrol/kfontinst/lib/FcEngine.cpp b/kcontrol/kfontinst/lib/FcEngine.cpp
index 44d180fd2..3c2320588 100644
--- a/kcontrol/kfontinst/lib/FcEngine.cpp
+++ b/kcontrol/kfontinst/lib/FcEngine.cpp
@@ -579,7 +579,7 @@ bool CFcEngine::draw(const KURL &url, int w, int h, TQPixmap &pix, int faceNo, b
                     if(1==itsSizes.size())
                         title=i18n("%1 [1 pixel]", "%1 [%n pixels]", itsSizes[0]).arg(title);
 
-                    painter.setFont(KGlobalSettings::generalFont());
+                    painter.setFont(TDEGlobalSettings::generalFont());
                     painter.setPen(Qt::black);
                     y=painter.fontMetrics().height();
                     drawText(painter, x, y, w-offset, title);
diff --git a/kcontrol/kfontinst/lib/Misc.cpp b/kcontrol/kfontinst/lib/Misc.cpp
index 1e779b514..fe6054cd5 100644
--- a/kcontrol/kfontinst/lib/Misc.cpp
+++ b/kcontrol/kfontinst/lib/Misc.cpp
@@ -133,7 +133,7 @@ bool createDir(const TQString &dir)
 
 bool doCmd(const TQString &cmd, const TQString &p1, const TQString &p2, const TQString &p3)
 {
-    KProcess proc;
+    TDEProcess proc;
 
     proc << cmd;
 
@@ -144,7 +144,7 @@ bool doCmd(const TQString &cmd, const TQString &p1, const TQString &p2, const TQ
     if(!p3.isEmpty())
         proc << p3;
 
-    proc.start(KProcess::Block);
+    proc.start(TDEProcess::Block);
 
     return proc.normalExit() && proc.exitStatus()==0;
 }