summaryrefslogtreecommitdiffstats
path: root/cervisia
diff options
context:
space:
mode:
Diffstat (limited to 'cervisia')
-rw-r--r--cervisia/ChangeLog6
-rw-r--r--cervisia/HACKING2
-rw-r--r--cervisia/annotateview.cpp10
-rw-r--r--cervisia/cervisiapart.cpp6
-rw-r--r--cervisia/cervisiapart.kcfg2
-rw-r--r--cervisia/cervisiashell.cpp8
-rw-r--r--cervisia/cvsservice/cvsjob.cpp20
-rw-r--r--cervisia/cvsservice/cvsjob.h6
-rw-r--r--cervisia/cvsservice/cvsservice.cpp48
-rw-r--r--cervisia/cvsservice/cvsserviceutils.cpp2
-rw-r--r--cervisia/cvsservice/cvsserviceutils.h2
-rw-r--r--cervisia/cvsservice/sshagent.cpp38
-rw-r--r--cervisia/cvsservice/sshagent.h8
-rw-r--r--cervisia/diffdlg.cpp12
-rw-r--r--cervisia/diffview.cpp22
-rw-r--r--cervisia/historydlg.cpp2
-rw-r--r--cervisia/loginfo.cpp4
-rw-r--r--cervisia/logtree.cpp4
-rw-r--r--cervisia/settingsdlg.cpp2
-rw-r--r--cervisia/tooltip.cpp2
-rw-r--r--cervisia/updateview_items.cpp6
21 files changed, 106 insertions, 106 deletions
diff --git a/cervisia/ChangeLog b/cervisia/ChangeLog
index 13984ed9..eaa88397 100644
--- a/cervisia/ChangeLog
+++ b/cervisia/ChangeLog
@@ -605,7 +605,7 @@
* Use DCOP stubs to access the methods of the cvs DCOP service
* Added new method update() and checkout() to DCOP service
- * Use KProcess::operator<< instead of QString::operator+= to
+ * Use TDEProcess::operator<< instead of QString::operator+= to
build the command line
* Make CVS_SERVER configurable in DCOP service
(GUI is missing)
@@ -1054,7 +1054,7 @@
* Layout fix in Add Watch dialog
* Use bigger font in ChangeLog dialog, use
- KGlobalSettings::fixedFont() for KDE2
+ TDEGlobalSettings::fixedFont() for KDE2
2001-01-28 Bernd Gehrmann <bernd@physik.hu-berlin.de>
@@ -1117,7 +1117,7 @@
* Always use /bin/sh as shell
* When the progress dialog is canceled, kill the
underlying process instead of destroying the
- KProcess object. This avoids a (superfluous) warning
+ TDEProcess object. This avoids a (superfluous) warning
from KProcCtrl
* Removed Ok button from the dialog.
Patch by Guillaume Laurent <glaurent@telegraph-road.org>
diff --git a/cervisia/HACKING b/cervisia/HACKING
index dfa61cdd..de233c8a 100644
--- a/cervisia/HACKING
+++ b/cervisia/HACKING
@@ -53,7 +53,7 @@ public:
private:
int m_intVar;
- KProcess* m_proc;
+ TDEProcess* m_proc;
};
}
diff --git a/cervisia/annotateview.cpp b/cervisia/annotateview.cpp
index 6d99c573..bdbcf2a9 100644
--- a/cervisia/annotateview.cpp
+++ b/cervisia/annotateview.cpp
@@ -105,13 +105,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/cervisia/cervisiapart.cpp b/cervisia/cervisiapart.cpp
index 775b5220..931adefa 100644
--- a/cervisia/cervisiapart.cpp
+++ b/cervisia/cervisiapart.cpp
@@ -103,7 +103,7 @@ CervisiaPart::CervisiaPart( TQWidget *parentWidget, const char *widgetName,
, m_currentEditMenu(0)
, m_jobType(Unknown)
{
- KGlobal::locale()->insertCatalogue("cervisia");
+ TDEGlobal::locale()->insertCatalogue("cervisia");
setInstance( CervisiaFactory::instance() );
m_browserExt = new CervisiaBrowserExtension( this );
@@ -903,7 +903,7 @@ void CervisiaPart::slotUpdateToTag()
else
{
tagopt = "-D ";
- tagopt += KProcess::quote(l->date());
+ tagopt += TDEProcess::quote(l->date());
}
tagopt += " ";
updateSandbox(tagopt);
@@ -1914,7 +1914,7 @@ void CervisiaPart::guiActivateEvent(KParts::GUIActivateEvent* event)
CervisiaBrowserExtension::CervisiaBrowserExtension( CervisiaPart *p )
: KParts::BrowserExtension( p, "CervisiaBrowserExtension" )
{
- KGlobal::locale()->insertCatalogue("cervisia");
+ TDEGlobal::locale()->insertCatalogue("cervisia");
}
CervisiaBrowserExtension::~CervisiaBrowserExtension()
diff --git a/cervisia/cervisiapart.kcfg b/cervisia/cervisiapart.kcfg
index 6dea38cf..5c20fcf3 100644
--- a/cervisia/cervisiapart.kcfg
+++ b/cervisia/cervisiapart.kcfg
@@ -25,7 +25,7 @@
<default>#ff8282</default>
</entry>
<entry name="NotInCvsColor" key="NotInCvsColor" type="Color">
- <default code="true">KGlobalSettings::textColor()</default>
+ <default code="true">TDEGlobalSettings::textColor()</default>
</entry>
</group>
<group name="General" >
diff --git a/cervisia/cervisiashell.cpp b/cervisia/cervisiashell.cpp
index 2e3ec62f..125df1ba 100644
--- a/cervisia/cervisiashell.cpp
+++ b/cervisia/cervisiashell.cpp
@@ -159,7 +159,7 @@ void CervisiaShell::slotConfigureKeys()
void CervisiaShell::slotConfigureToolBars()
{
- saveMainWindowSettings( KGlobal::config(), autoSaveGroup() );
+ saveMainWindowSettings( TDEGlobal::config(), autoSaveGroup() );
KEditToolbar dlg( factory() );
connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig()));
dlg.exec();
@@ -167,7 +167,7 @@ void CervisiaShell::slotConfigureToolBars()
void CervisiaShell::slotNewToolbarConfig()
{
- applyMainWindowSettings( KGlobal::config(), autoSaveGroup() );
+ applyMainWindowSettings( TDEGlobal::config(), autoSaveGroup() );
}
bool CervisiaShell::queryExit()
@@ -203,7 +203,7 @@ void CervisiaShell::saveProperties(KConfig* config)
void CervisiaShell::readSettings()
{
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->setGroup("Session");
readProperties(config);
@@ -212,7 +212,7 @@ void CervisiaShell::readSettings()
void CervisiaShell::writeSettings()
{
- KConfig* config = KGlobal::config();
+ KConfig* config = TDEGlobal::config();
config->setGroup("Session");
saveProperties(config);
diff --git a/cervisia/cvsservice/cvsjob.cpp b/cervisia/cvsservice/cvsjob.cpp
index 3f4f06fe..24f42f48 100644
--- a/cervisia/cvsservice/cvsjob.cpp
+++ b/cervisia/cvsservice/cvsjob.cpp
@@ -31,12 +31,12 @@ struct CvsJob::Private
{
Private() : isRunning(false)
{
- childproc = new KProcess;
+ childproc = new TDEProcess;
childproc->setUseShell(true, "/bin/sh");
}
~Private() { delete childproc; }
- KProcess* childproc;
+ TDEProcess* childproc;
TQString server;
TQString rsh;
TQString directory;
@@ -176,17 +176,17 @@ bool CvsJob::execute()
if( !d->directory.isEmpty() )
d->childproc->setWorkingDirectory(d->directory);
- connect(d->childproc, TQT_SIGNAL(processExited(KProcess*)),
+ connect(d->childproc, TQT_SIGNAL(processExited(TDEProcess*)),
TQT_SLOT(slotProcessExited()));
- connect(d->childproc, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
- TQT_SLOT(slotReceivedStdout(KProcess*, char*, int)));
- connect(d->childproc, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
- TQT_SLOT(slotReceivedStderr(KProcess*, char*, int)) );
+ connect(d->childproc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+ TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int)));
+ connect(d->childproc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+ TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int)) );
kdDebug(8051) << "Execute cvs command: " << cvsCommand() << endl;
d->isRunning = true;
- return d->childproc->start(KProcess::NotifyOnExit, KProcess::AllOutput);
+ return d->childproc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput);
}
@@ -208,7 +208,7 @@ void CvsJob::slotProcessExited()
}
-void CvsJob::slotReceivedStdout(KProcess* proc, char* buffer, int buflen)
+void CvsJob::slotReceivedStdout(TDEProcess* proc, char* buffer, int buflen)
{
Q_UNUSED(proc);
@@ -221,7 +221,7 @@ void CvsJob::slotReceivedStdout(KProcess* proc, char* buffer, int buflen)
}
-void CvsJob::slotReceivedStderr(KProcess* proc, char* buffer, int buflen)
+void CvsJob::slotReceivedStderr(TDEProcess* proc, char* buffer, int buflen)
{
Q_UNUSED(proc);
diff --git a/cervisia/cvsservice/cvsjob.h b/cervisia/cvsservice/cvsjob.h
index d01feabc..3fde9b48 100644
--- a/cervisia/cvsservice/cvsjob.h
+++ b/cervisia/cvsservice/cvsjob.h
@@ -26,7 +26,7 @@
#include <tqstringlist.h>
#include <dcopobject.h>
-class KProcess;
+class TDEProcess;
class KDE_EXPORT CvsJob : public TQObject, public DCOPObject
@@ -72,8 +72,8 @@ k_dcop_signals:
private slots:
void slotProcessExited();
- void slotReceivedStdout(KProcess* proc, char* buffer, int buflen);
- void slotReceivedStderr(KProcess* proc, char* buffer, int buflen);
+ void slotReceivedStdout(TDEProcess* proc, char* buffer, int buflen);
+ void slotReceivedStderr(TDEProcess* proc, char* buffer, int buflen);
private:
struct Private;
diff --git a/cervisia/cvsservice/cvsservice.cpp b/cervisia/cvsservice/cvsservice.cpp
index aa64bb4b..ce69caf5 100644
--- a/cervisia/cvsservice/cvsservice.cpp
+++ b/cervisia/cvsservice/cvsservice.cpp
@@ -167,7 +167,7 @@ DCOPRef CvsService::annotate(const TQString& fileName, const TQString& revision)
// assemble the command line
// (cvs log [FILE] && cvs annotate [-r rev] [FILE])
- TQString quotedName = KProcess::quote(fileName);
+ TQString quotedName = TDEProcess::quote(fileName);
TQString cvsClient = d->repository->cvsClient();
*job << "(" << cvsClient << "log" << quotedName << "&&"
@@ -199,7 +199,7 @@ DCOPRef CvsService::checkout(const TQString& workingDir, const TQString& reposit
// cd [DIRECTORY] && cvs -d [REPOSITORY] checkout [-r tag] [-P] [MODULE]
d->singleCvsJob->clearCvsCommand();
- *d->singleCvsJob << "cd" << KProcess::quote(workingDir) << "&&"
+ *d->singleCvsJob << "cd" << TDEProcess::quote(workingDir) << "&&"
<< repo.cvsClient()
<< "-d" << repository
<< "checkout";
@@ -229,7 +229,7 @@ DCOPRef CvsService::checkout(const TQString& workingDir, const TQString& reposit
// cd [DIRECTORY] && cvs -d [REPOSITORY] co [-r tag] [-P] [-d alias] [MODULE]
d->singleCvsJob->clearCvsCommand();
- *d->singleCvsJob << "cd" << KProcess::quote(workingDir) << "&&"
+ *d->singleCvsJob << "cd" << TDEProcess::quote(workingDir) << "&&"
<< repo.cvsClient()
<< "-d" << repository;
if( exportOnly)
@@ -265,7 +265,7 @@ DCOPRef CvsService::checkout(const TQString& workingDir, const TQString& reposit
// cd [DIRECTORY] && cvs -d [REPOSITORY] co [-r tag] [-P] [-d alias] [MODULE]
d->singleCvsJob->clearCvsCommand();
- *d->singleCvsJob << "cd" << KProcess::quote(workingDir) << "&&"
+ *d->singleCvsJob << "cd" << TDEProcess::quote(workingDir) << "&&"
<< repo.cvsClient()
<< "-d" << repository;
if( exportOnly)
@@ -305,7 +305,7 @@ DCOPRef CvsService::commit(const TQStringList& files, const TQString& commitMess
if( !recursive )
*d->singleCvsJob << "-l";
- *d->singleCvsJob << "-m" << KProcess::quote(commitMessage)
+ *d->singleCvsJob << "-m" << TDEProcess::quote(commitMessage)
<< CvsServiceUtils::joinFileList(files) << REDIRECT_STDERR;
return d->setupNonConcurrentJob();
@@ -321,9 +321,9 @@ DCOPRef CvsService::createRepository(const TQString& repository)
// cvs -d [REPOSITORY] init
d->singleCvsJob->clearCvsCommand();
- *d->singleCvsJob << "mkdir -p" << KProcess::quote(repository) << "&&"
+ *d->singleCvsJob << "mkdir -p" << TDEProcess::quote(repository) << "&&"
<< d->repository->cvsClient()
- << "-d" << KProcess::quote(repository)
+ << "-d" << TDEProcess::quote(repository)
<< "init";
return d->setupNonConcurrentJob();
@@ -348,7 +348,7 @@ DCOPRef CvsService::createTag(const TQStringList& files, const TQString& tag,
if( force )
*d->singleCvsJob << "-F";
- *d->singleCvsJob << KProcess::quote(tag)
+ *d->singleCvsJob << TDEProcess::quote(tag)
<< CvsServiceUtils::joinFileList(files);
return d->setupNonConcurrentJob();
@@ -373,7 +373,7 @@ DCOPRef CvsService::deleteTag(const TQStringList& files, const TQString& tag,
if( force )
*d->singleCvsJob << "-F";
- *d->singleCvsJob << KProcess::quote(tag)
+ *d->singleCvsJob << TDEProcess::quote(tag)
<< CvsServiceUtils::joinFileList(files);
return d->setupNonConcurrentJob();
@@ -392,7 +392,7 @@ DCOPRef CvsService::downloadCvsIgnoreFile(const TQString& repository,
// cvs -d [REPOSITORY] -q checkout -p CVSROOT/cvsignore > [OUTPUTFILE]
*job << repo.cvsClient() << "-d" << repository
<< "-q checkout -p CVSROOT/cvsignore >"
- << KProcess::quote(outputFile);
+ << TDEProcess::quote(outputFile);
// return a DCOP reference to the cvs job
return DCOPRef(d->appId, job->objId());
@@ -414,9 +414,9 @@ DCOPRef CvsService::downloadRevision(const TQString& fileName,
*job << d->repository->cvsClient() << "update -p";
if( !revision.isEmpty() )
- *job << "-r" << KProcess::quote(revision);
+ *job << "-r" << TDEProcess::quote(revision);
- *job << KProcess::quote(fileName) << ">" << KProcess::quote(outputFile);
+ *job << TDEProcess::quote(fileName) << ">" << TDEProcess::quote(outputFile);
// return a DCOP reference to the cvs job
return DCOPRef(d->appId, job->objId());
@@ -439,11 +439,11 @@ DCOPRef CvsService::downloadRevision(const TQString& fileName,
// cvs update -p -r [REVA] [FILE] > [OUTPUTFILEA] ;
// cvs update -p -r [REVB] [FILE] > [OUTPUTFILEB]
*job << d->repository->cvsClient() << "update -p"
- << "-r" << KProcess::quote(revA)
- << KProcess::quote(fileName) << ">" << KProcess::quote(outputFileA)
+ << "-r" << TDEProcess::quote(revA)
+ << TDEProcess::quote(fileName) << ">" << TDEProcess::quote(outputFileA)
<< ";" << d->repository->cvsClient() << "update -p"
- << "-r" << KProcess::quote(revB)
- << KProcess::quote(fileName) << ">" << KProcess::quote(outputFileB);
+ << "-r" << TDEProcess::quote(revB)
+ << TDEProcess::quote(fileName) << ">" << TDEProcess::quote(outputFileB);
// return a DCOP reference to the cvs job
return DCOPRef(d->appId, job->objId());
@@ -476,12 +476,12 @@ DCOPRef CvsService::diff(const TQString& fileName, const TQString& revA,
<< format;
if( !revA.isEmpty() )
- *job << "-r" << KProcess::quote(revA);
+ *job << "-r" << TDEProcess::quote(revA);
if( !revB.isEmpty() )
- *job << "-r" << KProcess::quote(revB);
+ *job << "-r" << TDEProcess::quote(revB);
- *job << KProcess::quote(fileName);
+ *job << TDEProcess::quote(fileName);
// return a DCOP reference to the cvs job
return DCOPRef(d->appId, job->objId());
@@ -550,7 +550,7 @@ DCOPRef CvsService::import(const TQString& workingDir, const TQString& repositor
// assemble the command line
d->singleCvsJob->clearCvsCommand();
- *d->singleCvsJob << "cd" << KProcess::quote(workingDir) << "&&"
+ *d->singleCvsJob << "cd" << TDEProcess::quote(workingDir) << "&&"
<< repo.cvsClient()
<< "-d" << repository
<< "import";
@@ -560,7 +560,7 @@ DCOPRef CvsService::import(const TQString& workingDir, const TQString& repositor
const TQString ignore = ignoreList.stripWhiteSpace();
if( !ignore.isEmpty() )
- *d->singleCvsJob << "-I" << KProcess::quote(ignore);
+ *d->singleCvsJob << "-I" << TDEProcess::quote(ignore);
TQString logMessage = comment.stripWhiteSpace();
logMessage.prepend("\"");
@@ -587,7 +587,7 @@ DCOPRef CvsService::import(const TQString& workingDir, const TQString& repositor
// assemble the command line
d->singleCvsJob->clearCvsCommand();
- *d->singleCvsJob << "cd" << KProcess::quote(workingDir) << "&&"
+ *d->singleCvsJob << "cd" << TDEProcess::quote(workingDir) << "&&"
<< repo.cvsClient()
<< "-d" << repository
<< "import";
@@ -600,7 +600,7 @@ DCOPRef CvsService::import(const TQString& workingDir, const TQString& repositor
const TQString ignore = ignoreList.stripWhiteSpace();
if( !ignore.isEmpty() )
- *d->singleCvsJob << "-I" << KProcess::quote(ignore);
+ *d->singleCvsJob << "-I" << TDEProcess::quote(ignore);
TQString logMessage = comment.stripWhiteSpace();
logMessage.prepend("\"");
@@ -639,7 +639,7 @@ DCOPRef CvsService::log(const TQString& fileName)
// assemble the command line
// cvs log [FILE]
- *job << d->repository->cvsClient() << "log" << KProcess::quote(fileName);
+ *job << d->repository->cvsClient() << "log" << TDEProcess::quote(fileName);
// return a DCOP reference to the cvs job
return DCOPRef(d->appId, job->objId());
diff --git a/cervisia/cvsservice/cvsserviceutils.cpp b/cervisia/cvsservice/cvsserviceutils.cpp
index 33585f49..b08c4357 100644
--- a/cervisia/cvsservice/cvsserviceutils.cpp
+++ b/cervisia/cvsservice/cvsserviceutils.cpp
@@ -34,7 +34,7 @@ TQString CvsServiceUtils::joinFileList(const TQStringList& files)
for( ; it != end; ++it )
{
- result += KProcess::quote(*it);
+ result += TDEProcess::quote(*it);
result += " ";
}
diff --git a/cervisia/cvsservice/cvsserviceutils.h b/cervisia/cvsservice/cvsserviceutils.h
index 145746d5..7e47bf5b 100644
--- a/cervisia/cvsservice/cvsserviceutils.h
+++ b/cervisia/cvsservice/cvsserviceutils.h
@@ -30,7 +30,7 @@ namespace CvsServiceUtils
/**
* Joins a list of file names to one TQString and quotes
- * each name properly for usage with KProcess.
+ * each name properly for usage with TDEProcess.
*/
TQString joinFileList(const TQStringList& files);
diff --git a/cervisia/cvsservice/sshagent.cpp b/cervisia/cvsservice/sshagent.cpp
index b620cc98..7590b757 100644
--- a/cervisia/cvsservice/sshagent.cpp
+++ b/cervisia/cvsservice/sshagent.cpp
@@ -91,7 +91,7 @@ bool SshAgent::addSshIdentities()
return false;
// add identities to ssh-agent
- KProcess proc;
+ TDEProcess proc;
proc.setEnvironment("SSH_AGENT_PID", m_pid);
proc.setEnvironment("SSH_AUTH_SOCK", m_authSock);
@@ -99,12 +99,12 @@ bool SshAgent::addSshIdentities()
proc << "ssh-add";
- connect(&proc, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
- TQT_SLOT(slotReceivedStdout(KProcess*, char*, int)));
- connect(&proc, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
- TQT_SLOT(slotReceivedStderr(KProcess*, char*, int)));
+ connect(&proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+ TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int)));
+ connect(&proc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+ TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int)));
- proc.start(KProcess::DontCare, KProcess::AllOutput);
+ proc.start(TDEProcess::DontCare, TDEProcess::AllOutput);
// wait for process to finish
// TODO CL use timeout?
@@ -123,17 +123,17 @@ void SshAgent::killSshAgent()
if( !m_isRunning || !m_isOurAgent )
return;
- KProcess proc;
+ TDEProcess proc;
proc << "kill" << m_pid;
- proc.start(KProcess::DontCare, KProcess::NoCommunication);
+ proc.start(TDEProcess::DontCare, TDEProcess::NoCommunication);
kdDebug(8051) << "SshAgent::killSshAgent(): killed pid = " << m_pid << endl;
}
-void SshAgent::slotProcessExited(KProcess*)
+void SshAgent::slotProcessExited(TDEProcess*)
{
kdDebug(8051) << "SshAgent::slotProcessExited(): ENTER" << endl;
@@ -187,7 +187,7 @@ void SshAgent::slotProcessExited(KProcess*)
}
-void SshAgent::slotReceivedStdout(KProcess* proc, char* buffer, int buflen)
+void SshAgent::slotReceivedStdout(TDEProcess* proc, char* buffer, int buflen)
{
Q_UNUSED(proc);
@@ -198,7 +198,7 @@ void SshAgent::slotReceivedStdout(KProcess* proc, char* buffer, int buflen)
}
-void SshAgent::slotReceivedStderr(KProcess* proc, char* buffer, int buflen)
+void SshAgent::slotReceivedStderr(TDEProcess* proc, char* buffer, int buflen)
{
Q_UNUSED(proc);
@@ -213,18 +213,18 @@ bool SshAgent::startSshAgent()
{
kdDebug(8051) << "SshAgent::startSshAgent(): ENTER" << endl;
- KProcess proc;
+ TDEProcess proc;
proc << "ssh-agent";
- connect(&proc, TQT_SIGNAL(processExited(KProcess*)),
- TQT_SLOT(slotProcessExited(KProcess*)));
- connect(&proc, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
- TQT_SLOT(slotReceivedStdout(KProcess*, char*, int)));
- connect(&proc, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
- TQT_SLOT(slotReceivedStderr(KProcess*, char*, int)) );
+ connect(&proc, TQT_SIGNAL(processExited(TDEProcess*)),
+ TQT_SLOT(slotProcessExited(TDEProcess*)));
+ connect(&proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+ TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int)));
+ connect(&proc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+ TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int)) );
- proc.start(KProcess::NotifyOnExit, KProcess::All);
+ proc.start(TDEProcess::NotifyOnExit, TDEProcess::All);
// wait for process to finish
// TODO CL use timeout?
diff --git a/cervisia/cvsservice/sshagent.h b/cervisia/cvsservice/sshagent.h
index 5276f827..b99b47d1 100644
--- a/cervisia/cvsservice/sshagent.h
+++ b/cervisia/cvsservice/sshagent.h
@@ -25,7 +25,7 @@
#include <tqstring.h>
#include <tqstringlist.h>
-class KProcess;
+class TDEProcess;
class SshAgent : public TQObject
@@ -46,9 +46,9 @@ public:
TQString authSock() const { return m_authSock; }
private slots:
- void slotProcessExited(KProcess*);
- void slotReceivedStdout(KProcess* proc, char* buffer, int buflen);
- void slotReceivedStderr(KProcess* proc, char* buffer, int buflen);
+ void slotProcessExited(TDEProcess*);
+ void slotReceivedStdout(TDEProcess* proc, char* buffer, int buflen);
+ void slotReceivedStderr(TDEProcess* proc, char* buffer, int buflen);
private:
bool startSshAgent();
diff --git a/cervisia/diffdlg.cpp b/cervisia/diffdlg.cpp
index 720d3706..993f4f6c 100644
--- a/cervisia/diffdlg.cpp
+++ b/cervisia/diffdlg.cpp
@@ -374,9 +374,9 @@ void DiffDialog::callExternalDiff(const TQString& extdiff, CvsService_stub* serv
if( !service->ok() )
return;
- extcmdline += KProcess::quote(revAFilename);
+ extcmdline += TDEProcess::quote(revAFilename);
extcmdline += " ";
- extcmdline += KProcess::quote(revBFilename);
+ extcmdline += TDEProcess::quote(revBFilename);
}
else
{
@@ -386,9 +386,9 @@ void DiffDialog::callExternalDiff(const TQString& extdiff, CvsService_stub* serv
if( !service->ok() )
return;
- extcmdline += KProcess::quote(revAFilename);
+ extcmdline += TDEProcess::quote(revAFilename);
extcmdline += " ";
- extcmdline += KProcess::quote(TQFileInfo(fileName).absFilePath());
+ extcmdline += TDEProcess::quote(TQFileInfo(fileName).absFilePath());
}
ProgressDialog dlg(this, "Diff", job, "diff");
@@ -396,10 +396,10 @@ void DiffDialog::callExternalDiff(const TQString& extdiff, CvsService_stub* serv
{
// call external diff application
// TODO CL maybe use system()?
- KProcess proc;
+ TDEProcess proc;
proc.setUseShell(true, "/bin/sh");
proc << extcmdline;
- proc.start(KProcess::DontCare);
+ proc.start(TDEProcess::DontCare);
}
}
diff --git a/cervisia/diffview.cpp b/cervisia/diffview.cpp
index 4d973372..90e82516 100644
--- a/cervisia/diffview.cpp
+++ b/cervisia/diffview.cpp
@@ -319,8 +319,8 @@ void DiffView::paintCell(TQPainter *p, int row, int col)
TQFont oldFont(p->font());
if (item->type==Separator)
{
- backgroundColor = KGlobalSettings::highlightColor();
- p->setPen(KGlobalSettings::highlightedTextColor());
+ backgroundColor = TDEGlobalSettings::highlightColor();
+ p->setPen(TDEGlobalSettings::highlightedTextColor());
inverted = false;
align = AlignLeft;
innerborder = 0;
@@ -332,8 +332,8 @@ void DiffView::paintCell(TQPainter *p, int row, int col)
}
else if (col == 0 && linenos)
{
- backgroundColor = KGlobalSettings::highlightColor();
- p->setPen(KGlobalSettings::highlightedTextColor());
+ backgroundColor = TDEGlobalSettings::highlightColor();
+ p->setPen(TDEGlobalSettings::highlightedTextColor());
inverted = false;
align = AlignLeft;
innerborder = 0;
@@ -344,8 +344,8 @@ void DiffView::paintCell(TQPainter *p, int row, int col)
}
else if (marker && (col == 0 || col == 1))
{
- backgroundColor = KGlobalSettings::alternateBackgroundColor();
- p->setPen(KGlobalSettings::textColor());
+ backgroundColor = TDEGlobalSettings::alternateBackgroundColor();
+ p->setPen(TDEGlobalSettings::textColor());
inverted = false;
align = AlignRight;
innerborder = BORDER;
@@ -359,8 +359,8 @@ void DiffView::paintCell(TQPainter *p, int row, int col)
(item->type==Change)? diffChangeColor
: (item->type==Insert)? diffInsertColor
: (item->type==Delete)? diffDeleteColor
- : (item->type==Neutral)? KGlobalSettings::alternateBackgroundColor() : KGlobalSettings::baseColor();
- p->setPen(KGlobalSettings::textColor());
+ : (item->type==Neutral)? TDEGlobalSettings::alternateBackgroundColor() : TDEGlobalSettings::baseColor();
+ p->setPen(TDEGlobalSettings::textColor());
inverted = item->inverted;
align = AlignLeft;
innerborder = 0;
@@ -370,7 +370,7 @@ void DiffView::paintCell(TQPainter *p, int row, int col)
if (inverted)
{
p->setPen(backgroundColor);
- backgroundColor = KGlobalSettings::textColor();
+ backgroundColor = TDEGlobalSettings::textColor();
TQFont f(oldFont);
f.setBold(true);
p->setFont(f);
@@ -450,7 +450,7 @@ void DiffZoomWidget::paintEvent(TQPaintEvent *)
const TQByteArray& lineTypes(diffview->compressedContent());
TQPixmap pixbuf(width(), scrollBarGroove.height());
- pixbuf.fill(KGlobalSettings::baseColor());
+ pixbuf.fill(TDEGlobalSettings::baseColor());
TQPainter p(&pixbuf, this);
if (const unsigned int numberOfLines = lineTypes.size())
@@ -482,7 +482,7 @@ void DiffZoomWidget::paintEvent(TQPaintEvent *)
break;
case ' ':
case 'N':
- color = KGlobalSettings::alternateBackgroundColor();
+ color = TDEGlobalSettings::alternateBackgroundColor();
break;
}
diff --git a/cervisia/historydlg.cpp b/cervisia/historydlg.cpp
index 4beb15c0..20e95d37 100644
--- a/cervisia/historydlg.cpp
+++ b/cervisia/historydlg.cpp
@@ -102,7 +102,7 @@ TQString HistoryItem::text(int col) const
switch (col)
{
case Date:
- sText = KGlobal::locale()->formatDateTime(m_date);
+ sText = TDEGlobal::locale()->formatDateTime(m_date);
break;
default:
sText = TQListViewItem::text(col);
diff --git a/cervisia/loginfo.cpp b/cervisia/loginfo.cpp
index b97ff1f0..07468ae7 100644
--- a/cervisia/loginfo.cpp
+++ b/cervisia/loginfo.cpp
@@ -106,9 +106,9 @@ TQString LogInfo::createToolTipText(bool showTime) const
TQString LogInfo::dateTimeToString(bool showTime, bool shortFormat) const
{
if( showTime )
- return KGlobal::locale()->formatDateTime(m_dateTime, shortFormat);
+ return TDEGlobal::locale()->formatDateTime(m_dateTime, shortFormat);
else
- return KGlobal::locale()->formatDate(m_dateTime.date(), shortFormat);
+ return TDEGlobal::locale()->formatDate(m_dateTime.date(), shortFormat);
}
diff --git a/cervisia/logtree.cpp b/cervisia/logtree.cpp
index 95bf9035..57d635ca 100644
--- a/cervisia/logtree.cpp
+++ b/cervisia/logtree.cpp
@@ -399,8 +399,8 @@ void LogTreeView::paintRevisionCell(TQPainter *p,
// The box itself
if (selected)
{
- p->fillRect(rect, KGlobalSettings::highlightColor());
- p->setPen(KGlobalSettings::highlightedTextColor());
+ p->fillRect(rect, TDEGlobalSettings::highlightColor());
+ p->setPen(TDEGlobalSettings::highlightedTextColor());
}
else
{
diff --git a/cervisia/settingsdlg.cpp b/cervisia/settingsdlg.cpp
index c6e39bf9..b5923964 100644
--- a/cervisia/settingsdlg.cpp
+++ b/cervisia/settingsdlg.cpp
@@ -51,7 +51,7 @@ namespace
// helper method to load icons for configuration pages
inline TQPixmap LoadIcon(const char* iconName)
{
- KIconLoader* loader = KGlobal::instance()->iconLoader();
+ KIconLoader* loader = TDEGlobal::instance()->iconLoader();
return loader->loadIcon(TQString::fromLatin1(iconName), KIcon::NoGroup,
KIcon::SizeMedium);
}
diff --git a/cervisia/tooltip.cpp b/cervisia/tooltip.cpp
index 728945ca..5cd34b89 100644
--- a/cervisia/tooltip.cpp
+++ b/cervisia/tooltip.cpp
@@ -50,7 +50,7 @@ void ToolTip::maybeTip(const TQPoint& pos)
text = truncateLines(text,
font(),
parentWidget()->mapToGlobal(pos),
- KGlobalSettings::desktopGeometry(parentWidget()));
+ TDEGlobalSettings::desktopGeometry(parentWidget()));
tip(rect, text);
}
}
diff --git a/cervisia/updateview_items.cpp b/cervisia/updateview_items.cpp
index 360e137c..34204ca8 100644
--- a/cervisia/updateview_items.cpp
+++ b/cervisia/updateview_items.cpp
@@ -571,7 +571,7 @@ void UpdateFileItem::setRevTag(const TQString& rev, const TQString& tag)
const TQDateTime tagDateTimeLocal(tagDateTimeUtc.addSecs(localUtcOffset));
- m_entry.m_tag = KGlobal::locale()->formatDateTime(tagDateTimeLocal);
+ m_entry.m_tag = TDEGlobal::locale()->formatDateTime(tagDateTimeLocal);
}
else
m_entry.m_tag = tag;
@@ -709,7 +709,7 @@ TQString UpdateFileItem::text(int column) const
break;
case Timestamp:
if (entry().m_dateTime.isValid())
- result = KGlobal::locale()->formatDateTime(entry().m_dateTime);
+ result = TDEGlobal::locale()->formatDateTime(entry().m_dateTime);
break;
}
@@ -754,7 +754,7 @@ void UpdateFileItem::paintCell(TQPainter *p,
const TQFont oldFont(p->font());
TQColorGroup mycg(cg);
- if (color.isValid() && color != KGlobalSettings::textColor())
+ if (color.isValid() && color != TDEGlobalSettings::textColor())
{
TQFont myFont(oldFont);
myFont.setBold(true);
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-09 11:02:20 +0000