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

2 files changed, 14 insertions, 14 deletions

diff --git a/vcs/cvsservice/annotateview.cpp b/vcs/cvsservice/annotateview.cpp
index bd8014d8..cd878508 100644
--- a/vcs/cvsservice/annotateview.cpp
+++ b/vcs/cvsservice/annotateview.cpp
@@ -89,7 +89,7 @@ TQString AnnotateViewItem::text(int col) const
     case AuthorColumn:
         return (m_revision + TQChar(' ') + m_author);
     case DateColumn:
-        return KGlobal::locale()->formatDate(m_logDate.date(), true);
+        return TDEGlobal::locale()->formatDate(m_logDate.date(), true);
     case ContentColumn:
         return m_content;
     default:
@@ -107,13 +107,13 @@ void AnnotateViewItem::paintCell(TQPainter *p, const TQColorGroup &, int col, in
     switch (col)
     {
     case LineNumberColumn:
-        backgroundColor = KGlobalSettings::highlightColor();
-        p->setPen(KGlobalSettings::highlightedTextColor());
+        backgroundColor = TDEGlobalSettings::highlightColor();
+        p->setPen(TDEGlobalSettings::highlightedTextColor());
         break;
     default:
-        backgroundColor = m_odd ? KGlobalSettings::baseColor()
-                                : KGlobalSettings::alternateBackgroundColor();
-        p->setPen(KGlobalSettings::textColor());
+        backgroundColor = m_odd ? TDEGlobalSettings::baseColor()
+                                : TDEGlobalSettings::alternateBackgroundColor();
+        p->setPen(TDEGlobalSettings::textColor());
         break;
     };
 
diff --git a/vcs/cvsservice/integrator/integratordlg.cpp b/vcs/cvsservice/integrator/integratordlg.cpp
index 42ddff6e..6df262b0 100644
--- a/vcs/cvsservice/integrator/integratordlg.cpp
+++ b/vcs/cvsservice/integrator/integratordlg.cpp
@@ -74,10 +74,10 @@ void IntegratorDlg::init_clicked()
     if (dlg.exec() == TQDialog::Accepted)
     {
         TQString url = initDlg->location->url();
-        KProcess *proc = new KProcess();
+        TDEProcess *proc = new TDEProcess();
         *proc << "cvs";
         *proc << "-d" << url << "init";
-        proc->start(KProcess::Block);
+        proc->start(TDEProcess::Block);
         if (!proc->normalExit())
             KMessageBox::error(this, i18n("cvs init did not exit normally. Please check if cvs is installed and works correctly."), i18n("Init CVS Repository"));
         else if (proc->exitStatus() != 0)
@@ -118,13 +118,13 @@ void IntegratorDlg::accept()
     if (!createModule->isChecked())
         return;
 
-    KProcess *proc = new KProcess();
+    TDEProcess *proc = new TDEProcess();
     proc->setWorkingDirectory(m_projectLocation);
     *proc << "cvs";
     *proc << "-d" << repository->currentText() << "import"
         << "-m" << TQString("\"%1\"").arg(comment->text()) << module->text()
         << vendorTag->text() << releaseTag->text();
-    proc->start(KProcess::Block);
+    proc->start(TDEProcess::Block);
     if (!proc->normalExit())
         KMessageBox::error(this, i18n("cvs import did not exit normally. Please check if cvs is installed and works correctly."), i18n("Init CVS Repository"));
     else if (proc->exitStatus() != 0)
@@ -138,17 +138,17 @@ void IntegratorDlg::accept()
         kdDebug() << "Up is: " << up << endl;
 
         //delete sources in project dir
-        KProcess *rmproc = new KProcess();
+        TDEProcess *rmproc = new TDEProcess();
         *rmproc << "rm";
         *rmproc << "-f" << "-r" << m_projectLocation;
-        rmproc->start(KProcess::Block);
+        rmproc->start(TDEProcess::Block);
 
         //checkout sources from cvs
-        KProcess *coproc = new KProcess();
+        TDEProcess *coproc = new TDEProcess();
         coproc->setWorkingDirectory(up);
         *coproc << "cvs";
         *coproc << "-d" << repository->currentText() << "checkout" << "-d" << m_projectName << module->text();
-        coproc->start(KProcess::Block);
+        coproc->start(TDEProcess::Block);
     }
 
 /*    TQCString appId;