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

9 files changed, 26 insertions, 26 deletions

diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
index 5b2ac8a1a..814703b0f 100644
--- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
@@ -82,7 +82,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
 #endif
               itsConfig(KFI_UI_CFG_FILE)
 {
-    KGlobal::locale()->insertCatalogue(KFI_CATALOGUE);
+    TDEGlobal::locale()->insertCatalogue(KFI_CATALOGUE);
 
     TDEAboutData* about = new TDEAboutData("kcmfontinst",
          I18N_NOOP("TDE Font Installer"),
diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
index df1bbe746..df50e81a3 100644
--- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp
@@ -189,7 +189,7 @@ void CKFileFontView::slotActivate(TQListViewItem *item)
 void CKFileFontView::selected(TQListViewItem *item)
 {
     if (item && !(TDEApplication::keyboardMouseState() & (ShiftButton|ControlButton)) &&
-         KGlobalSettings::singleClick())
+         TDEGlobalSettings::singleClick())
     {
         const KFileItem *fi = ((CFontListViewItem*)item)->fileInfo();
 
@@ -632,7 +632,7 @@ void CFontListViewItem::init()
     CFontListViewItem::setPixmap(COL_NAME, itsInf->pixmap(KIcon::SizeSmall));
 
     setText(COL_NAME, itsInf->text());
-    setText(COL_SIZE, itsInf->isDir() ? "" : KGlobal::locale()->formatNumber(itsInf->size(), 0));
+    setText(COL_SIZE, itsInf->isDir() ? "" : TDEGlobal::locale()->formatNumber(itsInf->size(), 0));
     setText(COL_TYPE, itsInf->mimeComment());
 }
 
diff --git a/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp b/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp
index 112e3562b..a4f09cb56 100644
--- a/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp
+++ b/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp
@@ -268,7 +268,7 @@ namespace KFI
 KFileFontPlugin::KFileFontPlugin(TQObject *parent, const char *name, const TQStringList& args)
                : KFilePlugin(parent, name, args)
 {
-    KGlobal::locale()->insertCatalogue(KFI_CATALOGUE);
+    TDEGlobal::locale()->insertCatalogue(KFI_CATALOGUE);
 
     addMimeType("application/x-font-ttf"),
     addMimeType("application/x-font-type1");
diff --git a/kcontrol/kfontinst/kio/KioFonts.cpp b/kcontrol/kfontinst/kio/KioFonts.cpp
index 7421d1681..15531901f 100644
--- a/kcontrol/kfontinst/kio/KioFonts.cpp
+++ b/kcontrol/kfontinst/kio/KioFonts.cpp
@@ -1127,15 +1127,15 @@ void CKioFonts::put(const KURL &u, int mode, bool overwrite, bool resume)
             if(!Misc::dExists(itsFolders[destFolder].location))
             {
                 cmd+="mkdir ";
-                cmd+=TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location));
+                cmd+=TQFile::encodeName(TDEProcess::quote(itsFolders[destFolder].location));
                 cmd+=" && chmod 0755 ";
-                cmd+=TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location));
+                cmd+=TQFile::encodeName(TDEProcess::quote(itsFolders[destFolder].location));
                 cmd+=" && ";
             }
             cmd+="cp -f ";
-            cmd+=TQFile::encodeName(KProcess::quote(tmpFileC));
+            cmd+=TQFile::encodeName(TDEProcess::quote(tmpFileC));
             cmd+=" ";
-            cmd+=TQFile::encodeName(KProcess::quote(destC));
+            cmd+=TQFile::encodeName(TDEProcess::quote(destC));
             cmd+=" && chmod 0644 ";
             cmd+=destC;
 
@@ -1351,9 +1351,9 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite)
                     if(!Misc::dExists(itsFolders[destFolder].location))
                     {
                         cmd+="mkdir ";
-                        cmd+=TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location));
+                        cmd+=TQFile::encodeName(TDEProcess::quote(itsFolders[destFolder].location));
                         cmd+=" && chmod 0755 ";
-                        cmd+=TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location));
+                        cmd+=TQFile::encodeName(TDEProcess::quote(itsFolders[destFolder].location));
                         cmd+=" && ";
                     }
 
@@ -1363,9 +1363,9 @@ void CKioFonts::copy(const KURL &src, const KURL &d, int mode, bool overwrite)
                     for(; fIt!=fEnd; ++fIt)
                     {
                         cmd+="cp -f ";
-                        cmd+=TQFile::encodeName(KProcess::quote(fIt.key()));
+                        cmd+=TQFile::encodeName(TDEProcess::quote(fIt.key()));
                         cmd+=" ";
-                        cmd+=TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location+modifyName(fIt.data())));
+                        cmd+=TQFile::encodeName(TDEProcess::quote(itsFolders[destFolder].location+modifyName(fIt.data())));
                         int s=getSize(TQFile::encodeName(fIt.key()));
                         if(s>0)
                             size+=s;
@@ -1540,7 +1540,7 @@ void CKioFonts::rename(const KURL &src, const KURL &d, bool overwrite)
                                                  toSys=FOLDER_SYS==destFolder;
                 TQCString                         userId,
                                                  groupId,
-                                                 destDir(TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location)));
+                                                 destDir(TQFile::encodeName(TDEProcess::quote(itsFolders[destFolder].location)));
 
                 userId.setNum(toSys ? 0 : getuid());
                 groupId.setNum(toSys ? 0 : getgid());
@@ -1548,7 +1548,7 @@ void CKioFonts::rename(const KURL &src, const KURL &d, bool overwrite)
                 for(; fIt!=fEnd; ++fIt)
                 {
                     TQCString cmd,
-                             destFile(TQFile::encodeName(KProcess::quote(itsFolders[destFolder].location+fIt.data())));
+                             destFile(TQFile::encodeName(TDEProcess::quote(itsFolders[destFolder].location+fIt.data())));
 
                     if(toSys && !Misc::dExists(itsFolders[destFolder].location))
                     {
@@ -1558,7 +1558,7 @@ void CKioFonts::rename(const KURL &src, const KURL &d, bool overwrite)
                     }
 
                     cmd+="mv -f ";
-                    cmd+=TQFile::encodeName(KProcess::quote(fIt.key()));
+                    cmd+=TQFile::encodeName(TDEProcess::quote(fIt.key()));
                     cmd+=" ";
                     cmd+=destFile;
                     cmd+=" && chmod -f 0644 ";
@@ -1631,7 +1631,7 @@ void CKioFonts::del(const KURL &url, bool)
 
                 modifiedDirs.add(Misc::getDir(file));
                 cmd+=" ";
-                cmd+=TQFile::encodeName(KProcess::quote(file));
+                cmd+=TQFile::encodeName(TDEProcess::quote(file));
 
                 KURL::List urls;
 
@@ -1645,7 +1645,7 @@ void CKioFonts::del(const KURL &url, bool)
                     for(uIt=urls.begin(); uIt!=uEnd; ++uIt)
                     {
                         cmd+=" ";
-                        cmd+=TQFile::encodeName(KProcess::quote((*uIt).path()));
+                        cmd+=TQFile::encodeName(TDEProcess::quote((*uIt).path()));
                     }
                 }
             }
@@ -1800,7 +1800,7 @@ void CKioFonts::createRootRefreshCmd(TQCString &cmd, const CDirList &dirs, bool
                 cmd+=" && kfontinst ";
                 cmd+=tmpCmd;
                 cmd+=" ";
-                cmd+=TQFile::encodeName(KProcess::quote(*it));
+                cmd+=TQFile::encodeName(TDEProcess::quote(*it));
             }
         }
     }
@@ -1809,7 +1809,7 @@ void CKioFonts::createRootRefreshCmd(TQCString &cmd, const CDirList &dirs, bool
         cmd+=" && kfontinst ";
         cmd+=itsNrsKfiParams;
         cmd+=" ";
-        cmd+=TQFile::encodeName(KProcess::quote(itsFolders[FOLDER_SYS].location));
+        cmd+=TQFile::encodeName(TDEProcess::quote(itsFolders[FOLDER_SYS].location));
     }
 }
 
@@ -2437,7 +2437,7 @@ void CKioFonts::createAfm(const TQString &file, bool nrs, const TQString &passwd
                 if(nrs)
                 {
                     TQCString cmd("pf2afm ");
-                    cmd+=TQFile::encodeName(KProcess::quote(name));
+                    cmd+=TQFile::encodeName(TDEProcess::quote(name));
                     doRootCmd(cmd, passwd);
                 }
                 else
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;
 }
diff --git a/kcontrol/kfontinst/thumbnail/FontThumbnail.cpp b/kcontrol/kfontinst/thumbnail/FontThumbnail.cpp
index 363ebe064..aaf85e940 100644
--- a/kcontrol/kfontinst/thumbnail/FontThumbnail.cpp
+++ b/kcontrol/kfontinst/thumbnail/FontThumbnail.cpp
@@ -49,7 +49,7 @@ namespace KFI
 
 CFontThumbnail::CFontThumbnail()
 {
-    KGlobal::locale()->insertCatalogue(KFI_CATALOGUE);
+    TDEGlobal::locale()->insertCatalogue(KFI_CATALOGUE);
 }
 
 bool CFontThumbnail::create(const TQString &path, int width, int height, TQImage &img)
diff --git a/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp b/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp
index 32f36f9e9..41d06984e 100644
--- a/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp
+++ b/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp
@@ -37,7 +37,7 @@ extern "C"
 {
     KDE_EXPORT void* init_libkfontviewpart()
     {
-        KGlobal::locale()->insertCatalogue("kfontinst");
+        TDEGlobal::locale()->insertCatalogue("kfontinst");
         return new KFI::CFontViewPartFactory;
     }
 }
diff --git a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp
index bbac01bc8..28dbd0f1f 100644
--- a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp
+++ b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp
@@ -100,7 +100,7 @@ void CFontViewerAppMainWindow::fileOpen()
 
 CFontViewerApp::CFontViewerApp()
 {
-    KGlobal::locale()->insertCatalogue(KFI_CATALOGUE);
+    TDEGlobal::locale()->insertCatalogue(KFI_CATALOGUE);
     setMainWidget(new CFontViewerAppMainWindow());
 }