summaryrefslogtreecommitdiffstats
path: root/vcs
diff options
context:
space:
mode:
Diffstat (limited to 'vcs')
-rw-r--r--vcs/cvsservice/annotateview.cpp12
-rw-r--r--vcs/cvsservice/integrator/integratordlg.cpp16
-rw-r--r--vcs/perforce/commitdlg.h2
-rw-r--r--vcs/perforce/perforcepart.cpp4
-rw-r--r--vcs/subversion/integrator/svnintegratordlg.cpp2
-rw-r--r--vcs/subversion/subversion_core.cpp14
6 files changed, 25 insertions, 25 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;
diff --git a/vcs/perforce/commitdlg.h b/vcs/perforce/commitdlg.h
index 6ed69346..e9cdb1e1 100644
--- a/vcs/perforce/commitdlg.h
+++ b/vcs/perforce/commitdlg.h
@@ -19,7 +19,7 @@
#include <klistbox.h>
#include <kdialogbase.h>
-class KProcess;
+class TDEProcess;
class CommitDialog : public KDialogBase
{
diff --git a/vcs/perforce/perforcepart.cpp b/vcs/perforce/perforcepart.cpp
index 3220d33e..06d55ec9 100644
--- a/vcs/perforce/perforcepart.cpp
+++ b/vcs/perforce/perforcepart.cpp
@@ -136,7 +136,7 @@ void PerforcePart::execCommand( const TQString& cmd, const TQString& filename )
TQString name = fi.fileName();
TQString command("cd ");
- command += KProcess::quote(dir);
+ command += TDEProcess::quote(dir);
command += " && p4 " + cmd + " ";
command += name;
@@ -204,7 +204,7 @@ void PerforcePart::update( const TQString& filename )
}
TQString command("cd ");
- command += KProcess::quote(dir);
+ command += TDEProcess::quote(dir);
command += " && p4 sync ";
command += name;
diff --git a/vcs/subversion/integrator/svnintegratordlg.cpp b/vcs/subversion/integrator/svnintegratordlg.cpp
index b197355b..0df43f4a 100644
--- a/vcs/subversion/integrator/svnintegratordlg.cpp
+++ b/vcs/subversion/integrator/svnintegratordlg.cpp
@@ -86,7 +86,7 @@ void SvnIntegratorDlg::accept()
}
}
//delete the template directory and checkout a fresh one from the server
- BlockingKProcess *rmproc = new BlockingKProcess();
+ BlockingTDEProcess *rmproc = new BlockingTDEProcess();
*rmproc << "rm";
*rmproc << "-f" << "-r" << m_projectLocation;
rmproc->start();
diff --git a/vcs/subversion/subversion_core.cpp b/vcs/subversion/subversion_core.cpp
index b8f90263..cba5aee4 100644
--- a/vcs/subversion/subversion_core.cpp
+++ b/vcs/subversion/subversion_core.cpp
@@ -180,16 +180,16 @@ void subversionCore::diff( const KURL::List& list, const TQString& where){
TQString ourCopy = tmpDir.name()+(*it).fileName();
- KProcess copy;
+ TDEProcess copy;
copy << "cp" << (*it).prettyURL(0,KURL::StripFileProtocol) << tmpDir.name();
- copy.start(KProcess::Block);
+ copy.start(TDEProcess::Block);
- KProcess patch;
+ TDEProcess patch;
patch.setWorkingDirectory(tmpDir.name());
patch << "patch" << "-R" << ourCopy << tmpPatch.name();
- patch.start(KProcess::Block, KProcess::All);
+ patch.start(TDEProcess::Block, TDEProcess::All);
- KProcess *p = new KProcess;
+ TDEProcess *p = new TDEProcess;
*p << "kompare" << ourCopy << (*it).prettyURL();
p->start();
}
@@ -203,7 +203,7 @@ void subversionCore::diff( const KURL::List& list, const TQString& where){
( *stream ) << ( *it2 ) << "\n";
}
tmp->close();
- KProcess *p = new KProcess;
+ TDEProcess *p = new TDEProcess;
*p << "kompare" << "-n" << "-o" << tmp->name();
p->start();
}
@@ -695,7 +695,7 @@ void subversionCore::slotDiffResult( KIO::Job * job )
( *stream ) << ( *it2 ) << "\n";
}
tmp->close();
- KProcess *p = new KProcess;
+ TDEProcess *p = new TDEProcess;
*p << "kompare" << "-n" << "-o" << tmp->name();
p->start();
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-14 05:33:22 +0000