TDE
/
tdesdk
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdesdk
0
0
Fork 0
Code Issues Releases Wiki Activity

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

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent 4071ae43ea
commit e6aaa3624c
102 changed files with 368 additions and 368 deletions
Show Stats Download Patch File Download Diff File

6
cervisia/ChangeLog
Unescape View File

@ -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>

2
cervisia/HACKING
Unescape View File

@ -53,7 +53,7 @@ public:
private:
int m_intVar;
KProcess* m_proc;
TDEProcess* m_proc;
};
}

10
cervisia/annotateview.cpp
Unescape View File

@ -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;
};

6
cervisia/cervisiapart.cpp
Unescape View File

@ -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()

2
cervisia/cervisiapart.kcfg
Unescape View File

@ -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" >

8
cervisia/cervisiashell.cpp
Unescape View File

@ -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);

20
cervisia/cvsservice/cvsjob.cpp
Unescape View File

@ -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);

6
cervisia/cvsservice/cvsjob.h
Unescape View File

@ -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;

48
cervisia/cvsservice/cvsservice.cpp
Unescape View File

@ -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());

2
cervisia/cvsservice/cvsserviceutils.cpp
Unescape View File

@ -34,7 +34,7 @@ TQString CvsServiceUtils::joinFileList(const TQStringList& files)
for( ; it != end; ++it )
{
result += KProcess::quote(*it);
result += TDEProcess::quote(*it);
result += " ";
}

2
cervisia/cvsservice/cvsserviceutils.h
Unescape View File

@ -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);

38
cervisia/cvsservice/sshagent.cpp
Unescape View File

@ -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?

8
cervisia/cvsservice/sshagent.h
Unescape View File

@ -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();

12
cervisia/diffdlg.cpp
Unescape View File

@ -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);
}
}

22
cervisia/diffview.cpp
Unescape View File

@ -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;
}

2
cervisia/historydlg.cpp
Unescape View File

@ -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);

4
cervisia/loginfo.cpp
Unescape View File

@ -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);
}

4
cervisia/logtree.cpp
Unescape View File

@ -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
{

2
cervisia/settingsdlg.cpp
Unescape View File

@ -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);
}

2
cervisia/tooltip.cpp
Unescape View File

@ -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);
}
}

6
cervisia/updateview_items.cpp
Unescape View File

@ -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);

4
kapptemplate/kapp/app.cpp
Unescape View File

@ -224,7 +224,7 @@ void ${APP_NAME}::filePrint()
void ${APP_NAME}::optionsConfigureToolbars()
{
// use the standard toolbar editor
saveMainWindowSettings( KGlobal::config(), autoSaveGroup() );
saveMainWindowSettings( TDEGlobal::config(), autoSaveGroup() );
KEditToolbar dlg(actionCollection());
connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(newToolbarConfig()));
dlg.exec();
@ -235,7 +235,7 @@ void ${APP_NAME}::newToolbarConfig()
// this slot is called when user clicks "Ok" or "Apply" in the toolbar editor.
// recreate our GUI, and re-apply the settings (e.g. "text under icons", etc.)
createGUI();
applyMainWindowSettings( KGlobal::config(), autoSaveGroup() );
applyMainWindowSettings( TDEGlobal::config(), autoSaveGroup() );
}
void ${APP_NAME}::optionsPreferences()

4
kapptemplate/kpartapp/app.cpp
Unescape View File

@ -132,7 +132,7 @@ void ${APP_NAME}::optionsConfigureKeys()
void ${APP_NAME}::optionsConfigureToolbars()
{
saveMainWindowSettings(KGlobal::config(), autoSaveGroup());
saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup());
// use the standard toolbar editor
KEditToolbar dlg(factory());
@ -143,7 +143,7 @@ void ${APP_NAME}::optionsConfigureToolbars()
void ${APP_NAME}::applyNewToolbarConfig()
{
applyMainWindowSettings(KGlobal::config(), autoSaveGroup());
applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup());
}
void ${APP_NAME}::fileOpen()

6
kbabel/addons/preview/pothumbcreator.cpp
Unescape View File

@ -324,17 +324,17 @@ bool PoThumbCreator::create(const TQString &path, int width, int height, TQImage
TQPixmap kbabelPix;
if(pix.width() < 80)
{
kbabelPix = KGlobal::iconLoader()->loadIcon("kbabel"
kbabelPix = TDEGlobal::iconLoader()->loadIcon("kbabel"
,KIcon::Small,16,KIcon::DefaultState,0,true);
}
else if(pix.width() < 150)
{
kbabelPix = KGlobal::iconLoader()->loadIcon("kbabel"
kbabelPix = TDEGlobal::iconLoader()->loadIcon("kbabel"
,KIcon::Desktop,32,KIcon::DefaultState,0,true);
}
else
{
kbabelPix = KGlobal::iconLoader()->loadIcon("kbabel"
kbabelPix = TDEGlobal::iconLoader()->loadIcon("kbabel"
,KIcon::Desktop,48,KIcon::DefaultState,0,true);
}

6
kbabel/catalogmanager/catalogmanager.cpp
Unescape View File

@ -214,7 +214,7 @@ void CatalogManager::init()
void CatalogManager::setupActions()
{
KGlobal::iconLoader()->addAppDir("kbabel");
TDEGlobal::iconLoader()->addAppDir("kbabel");
KAction *action;
@ -1169,13 +1169,13 @@ bool CatalogManager::queryClose()
void CatalogManager::saveView()
{
saveMainWindowSettings( KGlobal::config(), "View");
saveMainWindowSettings( TDEGlobal::config(), "View");
}
void CatalogManager::restoreView()
{
applyMainWindowSettings( KGlobal::config(), "View");
applyMainWindowSettings( TDEGlobal::config(), "View");
KToggleAction * toggle = (KToggleAction*)actionCollection()->
action(KStdAction::stdName(KStdAction::ShowStatusbar));

46
kbabel/catalogmanager/catalogmanagerview.cpp
Unescape View File

@ -221,7 +221,7 @@ CatalogManagerView::CatalogManagerView(KBabel::Project::Ptr project, TQWidget* p
connect( svnhandler, TQT_SIGNAL( signalFilesCommitted( const TQStringList& ) ),
this, TQT_SLOT( updateFiles( const TQStringList& ) ) );
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
restoreView(config);
_dictBox->readSettings(_project->config());
@ -237,7 +237,7 @@ CatalogManagerView::~CatalogManagerView()
if(_settings.killCmdOnExit)
{
KProcess* proc;
TDEProcess* proc;
for ( proc=_pendingProcesses.first(); proc != 0; proc=_pendingProcesses.next() )
{
proc->kill(SIGKILL);
@ -715,7 +715,7 @@ void CatalogManagerView::markedStatistics()
void CatalogManagerView::showStatistics( CatManListItem *i, TQStringList &childrenList )
{
KLocale *locale = KGlobal::locale();
KLocale *locale = TDEGlobal::locale();
TQString msg;
int totalPackages=0;
@ -1617,18 +1617,18 @@ void CatalogManagerView::slotDirCommand(int index)
kdDebug(KBABEL_CATMAN) << cmd << endl;
KProcess* proc = new KShellProcess();
TDEProcess* proc = new KShellProcess();
_pendingProcesses.append(proc);
connect( proc,TQT_SIGNAL( processExited(KProcess *) ), this
,TQT_SLOT( processEnded(KProcess*) ) );
connect( proc,TQT_SIGNAL( receivedStdout(KProcess*,char*,int) ), this
,TQT_SLOT( showOutput(KProcess*,char*,int) ) );
connect( proc,TQT_SIGNAL( receivedStderr(KProcess*,char*,int) ), this
,TQT_SLOT( showOutput(KProcess*,char*,int) ) );
connect( proc,TQT_SIGNAL( processExited(TDEProcess *) ), this
,TQT_SLOT( processEnded(TDEProcess*) ) );
connect( proc,TQT_SIGNAL( receivedStdout(TDEProcess*,char*,int) ), this
,TQT_SLOT( showOutput(TDEProcess*,char*,int) ) );
connect( proc,TQT_SIGNAL( receivedStderr(TDEProcess*,char*,int) ), this
,TQT_SLOT( showOutput(TDEProcess*,char*,int) ) );
*proc << "cd" << item->poFile() << ";" << cmd;
proc->start(KProcess::NotifyOnExit,KProcess::AllOutput);
proc->start(TDEProcess::NotifyOnExit,TDEProcess::AllOutput);
}
}
@ -1650,18 +1650,18 @@ void CatalogManagerView::slotFileCommand(int index)
kdDebug(KBABEL_CATMAN) << cmd << endl;
KProcess* proc = new KShellProcess();
TDEProcess* proc = new KShellProcess();
_pendingProcesses.append(proc);
connect( proc,TQT_SIGNAL( processExited(KProcess *) ), this
,TQT_SLOT( processEnded(KProcess*) ) );
connect( proc,TQT_SIGNAL( receivedStdout(KProcess*,char*,int) ), this
,TQT_SLOT( showOutput(KProcess*,char*,int) ) );
connect( proc,TQT_SIGNAL( receivedStderr(KProcess*,char*,int) ), this
,TQT_SLOT( showOutput(KProcess*,char*,int) ) );
connect( proc,TQT_SIGNAL( processExited(TDEProcess *) ), this
,TQT_SLOT( processEnded(TDEProcess*) ) );
connect( proc,TQT_SIGNAL( receivedStdout(TDEProcess*,char*,int) ), this
,TQT_SLOT( showOutput(TDEProcess*,char*,int) ) );
connect( proc,TQT_SIGNAL( receivedStderr(TDEProcess*,char*,int) ), this
,TQT_SLOT( showOutput(TDEProcess*,char*,int) ) );
*proc << "cd" << parent->poFile() << ";" << cmd;
proc->start(KProcess::NotifyOnExit,KProcess::AllOutput);
proc->start(TDEProcess::NotifyOnExit,TDEProcess::AllOutput);
}
}
@ -2517,7 +2517,7 @@ void CatalogManagerView::contentsMouseMoveEvent(TQMouseEvent* event)
{
if(event->state() & Qt::LeftButton)
{
const int delay = KGlobalSettings::dndEventDelay();
const int delay = TDEGlobalSettings::dndEventDelay();
if(TQABS( event->pos().x() - _pressPos.x() ) >= delay ||
TQABS( event->pos().y() - _pressPos.y() ) >= delay)
{
@ -2532,7 +2532,7 @@ void CatalogManagerView::contentsMouseMoveEvent(TQMouseEvent* event)
uri.append(TQUriDrag::localFileToUri(item->potFile()));
TQUriDrag* drag = new TQUriDrag(uri,this);
TQPixmap icon=KGlobal::iconLoader()->loadIcon("txt",KIcon::Desktop);
TQPixmap icon=TDEGlobal::iconLoader()->loadIcon("txt",KIcon::Desktop);
drag->setPixmap(icon,TQPoint(icon.width()/2,icon.height()/2));
drag->drag();
}
@ -2593,13 +2593,13 @@ void CatalogManagerView::deleteDirItem(TQString relDir)
void CatalogManagerView::processEnded(KProcess* proc)
void CatalogManagerView::processEnded(TDEProcess* proc)
{
_pendingProcesses.removeRef(proc);
}
void CatalogManagerView::showOutput(KProcess*, char *buffer, int buflen)
void CatalogManagerView::showOutput(TDEProcess*, char *buffer, int buflen)
{
const TQCString output(buffer,buflen+1);

6
kbabel/catalogmanager/catalogmanagerview.h
Unescape View File

@ -365,8 +365,8 @@ protected slots:
void slotFileCommand(int);
private slots:
void showOutput(KProcess *proc, char *buffer, int buflen);
void processEnded(KProcess *proc);
void showOutput(TDEProcess *proc, char *buffer, int buflen);
void processEnded(TDEProcess *proc);
void columnClicked(TQListViewItem * item, const TQPoint & pnt, int c);
void slotToggleCVSOrSVNColumn( bool );
@ -432,7 +432,7 @@ private:
bool _stopSearch;
int _updateNesting;
TQPtrList<KProcess> _pendingProcesses;
TQPtrList<TDEProcess> _pendingProcesses;
TQTextEdit* _logView;
KDialogBase* _logWindow;

4
kbabel/catalogmanager/findinfilesdialog.cpp
Unescape View File

@ -156,7 +156,7 @@ void FindInFilesDialog::setReplaceOpts(ReplaceOptions options)
void FindInFilesDialog::readSettings()
{
KConfig* config = KGlobal::config();
KConfig* config = TDEGlobal::config();
if(isReplaceDialog()) {
KConfigGroupSaver cgs(config,"ReplaceDialog");
@ -201,7 +201,7 @@ void FindInFilesDialog::readSettings()
void FindInFilesDialog::saveSettings()
{
KConfig* config = KGlobal::config();
KConfig* config = TDEGlobal::config();
if(isReplaceDialog()) {
KConfigGroupSaver cgs(config,"ReplaceDialog");

32
kbabel/catalogmanager/libcvs/cvsdialog.cpp
Unescape View File

@ -120,7 +120,7 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config
// The last encoding will be added at the top of the list, when the seetings will be read.
encodingList << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
encodingList << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->mimeName() );
encodingList += KGlobal::charsets()->descriptiveEncodingNames();
encodingList += TDEGlobal::charsets()->descriptiveEncodingNames();
m_encodingComboBox->insertStringList( encodingList );
connect( oldMessages, TQT_SIGNAL( activated( int ) ),
@ -217,10 +217,10 @@ void CVSDialog::slotExecuteCommand( )
// Nothing to do here.
if ( _commandLine.isEmpty( ) ) return;
kdDebug() << "Preparing KProcess" << endl;
kdDebug() << "Preparing TDEProcess" << endl;
// Create a new shell process
p = new KProcess;
p = new TDEProcess;
p->setUseShell( true, "/bin/sh" );
if ( _cmd == CVS::Commit ) {
@ -239,7 +239,7 @@ void CVSDialog::slotExecuteCommand( )
return;
}
m_encoding = KGlobal::charsets()->encodingForName( m_encodingComboBox->currentText() );
m_encoding = TDEGlobal::charsets()->encodingForName( m_encodingComboBox->currentText() );
TQTextCodec* codec = TQTextCodec::codecForName( m_encoding.utf8() );
if ( !codec )
@ -282,7 +282,7 @@ void CVSDialog::slotExecuteCommand( )
}
// Change the command line to have the real name of the temporary file
_commandLine.replace( "@LOG@FILE@", KProcess::quote( m_tempFile->name() ) );
_commandLine.replace( "@LOG@FILE@", TDEProcess::quote( m_tempFile->name() ) );
// Update the list of log messages
if ( !msg.isEmpty() ) {
@ -298,19 +298,19 @@ void CVSDialog::slotExecuteCommand( )
}
}
// Set the KProcess' command line.
// Set the TDEProcess' command line.
*p << _commandLine;
connect( p, TQT_SIGNAL( receivedStdout( KProcess*, char*, int ) ),
this, TQT_SLOT ( slotProcessStdout( KProcess*, char*, int ) ) );
connect( p, TQT_SIGNAL( receivedStderr( KProcess*, char*, int ) ),
this, TQT_SLOT ( slotProcessStderr( KProcess*, char*, int ) ) );
connect( p, TQT_SIGNAL( processExited( KProcess* ) ),
this, TQT_SLOT( slotProcessExited( KProcess* ) ) );
connect( p, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ),
this, TQT_SLOT ( slotProcessStdout( TDEProcess*, char*, int ) ) );
connect( p, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ),
this, TQT_SLOT ( slotProcessStderr( TDEProcess*, char*, int ) ) );
connect( p, TQT_SIGNAL( processExited( TDEProcess* ) ),
this, TQT_SLOT( slotProcessExited( TDEProcess* ) ) );
output->append( i18n( "[ Starting command ]" ) );
if ( p->start( KProcess::NotifyOnExit, KProcess::Communication( KProcess::AllOutput ) ) ) {
if ( p->start( TDEProcess::NotifyOnExit, TDEProcess::Communication( TDEProcess::AllOutput ) ) ) {
// Disable the main button (and the log edit if in commit mode) to
// indicate activity.
mainBtn->setEnabled( false );
@ -323,7 +323,7 @@ void CVSDialog::slotExecuteCommand( )
}
}
void CVSDialog::slotProcessStdout( KProcess*, char * buffer, int len )
void CVSDialog::slotProcessStdout( TDEProcess*, char * buffer, int len )
{
output->append( TQString::fromLocal8Bit( buffer, len ) );
// Set the cursor's position at the end of the output.
@ -334,7 +334,7 @@ void CVSDialog::slotProcessStdout( KProcess*, char * buffer, int len )
_statusOutput += TQString::fromLocal8Bit( buffer, len );
}
void CVSDialog::slotProcessStderr( KProcess*, char * buffer, int len )
void CVSDialog::slotProcessStderr( TDEProcess*, char * buffer, int len )
{
// If an error occurs while executing the command display stderr in
// another color.
@ -345,7 +345,7 @@ void CVSDialog::slotProcessStderr( KProcess*, char * buffer, int len )
output->setCursorPosition( output->lines( ), 0 );
}
void CVSDialog::slotProcessExited( KProcess * p )
void CVSDialog::slotProcessExited( TDEProcess * p )
{
if ( p->exitStatus( ) )
output->append( i18n( "[ Exited with status %1 ]" ).arg( p->exitStatus( ) ) );

10
kbabel/catalogmanager/libcvs/cvsdialog.h
Unescape View File

@ -48,7 +48,7 @@ class TQString;
class TQStringList;
class TQTextEdit;
// Forwarding KDE classes
class KProcess;
class TDEProcess;
class KTempFile;
class KComboBox;
@ -113,11 +113,11 @@ class CVSDialog : public KDialog
/** Slot for executing the CVS Command. */
void slotExecuteCommand( );
/** Slot for processing the stdout of the CVS Command. */
void slotProcessStdout( KProcess*, char * buffer, int len );
void slotProcessStdout( TDEProcess*, char * buffer, int len );
/** Slot for processing the stderr of the CVS Command. */
void slotProcessStderr( KProcess*, char * buffer, int len );
void slotProcessStderr( TDEProcess*, char * buffer, int len );
/** Slot for post-processing after the CVS command is fninished. */
void slotProcessExited( KProcess * p );
void slotProcessExited( TDEProcess * p );
/// Slot for combox having been activated
void slotComboActivated( int );
@ -132,7 +132,7 @@ class CVSDialog : public KDialog
TQTextEdit * output;
TQCheckBox * autoAddBox;
KProcess * p;
TDEProcess * p;
TQString _commandLine;
TQString _addCommand;

8
kbabel/catalogmanager/libcvs/cvshandler.cpp
Unescape View File

@ -197,8 +197,8 @@ void CVSHandler::execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStr
return;
}
// ### FIXME: instead of making a TQString, use KProcess directly, so that it cares about quoting.
// ### FIXME: use KProcess::setWorkingDirectory instead of using "cd" (therefore allowing to use KProcess without a shell.)
// ### FIXME: instead of making a TQString, use TDEProcess directly, so that it cares about quoting.
// ### FIXME: use TDEProcess::setWorkingDirectory instead of using "cd" (therefore allowing to use TDEProcess without a shell.)
// it's a dir
TQString command( "cd " + filename + " && cvs " );
switch ( cmd ) {
@ -230,8 +230,8 @@ void CVSHandler::execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStr
return;
}
// ### FIXME: instead of making a TQString, use KProcess directly, so that it cares about quoting.
// ### FIXME: use KProcess::setWorkingDirectory instead of using "cd" (therefore allowing to use KProcess without a shell.)
// ### FIXME: instead of making a TQString, use TDEProcess directly, so that it cares about quoting.
// ### FIXME: use TDEProcess::setWorkingDirectory instead of using "cd" (therefore allowing to use TDEProcess without a shell.)
TQString command("cd " + (templates ? _potBaseDir : _poBaseDir) + " && cvs ");
switch ( cmd ) {
case CVS::Update:

28
kbabel/catalogmanager/libsvn/svndialog.cpp
Unescape View File

@ -213,10 +213,10 @@ void SVNDialog::slotExecuteCommand( )
// Nothing to do here.
if ( _commandLine.isEmpty( ) ) return;
kdDebug() << "Preparing KProcess" << endl;
kdDebug() << "Preparing TDEProcess" << endl;
// Create a new shell process
p = new KProcess;
p = new TDEProcess;
p->setUseShell( true, "/bin/sh" );
if ( _cmd == SVN::Commit ) {
@ -261,7 +261,7 @@ void SVNDialog::slotExecuteCommand( )
}
// Change the command line to have the real name of the temporary file
_commandLine.replace( "@LOG@FILE@", KProcess::quote( m_tempFile->name() ) );
_commandLine.replace( "@LOG@FILE@", TDEProcess::quote( m_tempFile->name() ) );
// Update the list of log messages
if ( !msg.isEmpty() ) {
@ -277,19 +277,19 @@ void SVNDialog::slotExecuteCommand( )
}
}
// Set the KProcess' command line.
// Set the TDEProcess' command line.
*p << _commandLine;
connect( p, TQT_SIGNAL( receivedStdout( KProcess*, char*, int ) ),
this, TQT_SLOT ( slotProcessStdout( KProcess*, char*, int ) ) );
connect( p, TQT_SIGNAL( receivedStderr( KProcess*, char*, int ) ),
this, TQT_SLOT ( slotProcessStderr( KProcess*, char*, int ) ) );
connect( p, TQT_SIGNAL( processExited( KProcess* ) ),
this, TQT_SLOT( slotProcessExited( KProcess* ) ) );
connect( p, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ),
this, TQT_SLOT ( slotProcessStdout( TDEProcess*, char*, int ) ) );
connect( p, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ),
this, TQT_SLOT ( slotProcessStderr( TDEProcess*, char*, int ) ) );
connect( p, TQT_SIGNAL( processExited( TDEProcess* ) ),
this, TQT_SLOT( slotProcessExited( TDEProcess* ) ) );
output->append( i18n( "[ Starting command ]" ) );
if ( p->start( KProcess::NotifyOnExit, KProcess::Communication( KProcess::AllOutput ) ) ) {
if ( p->start( TDEProcess::NotifyOnExit, TDEProcess::Communication( TDEProcess::AllOutput ) ) ) {
// Disable the main button (and the log edit if in commit mode) to
// indicate activity.
mainBtn->setEnabled( false );
@ -302,7 +302,7 @@ void SVNDialog::slotExecuteCommand( )
}
}
void SVNDialog::slotProcessStdout( KProcess*, char * buffer, int len )
void SVNDialog::slotProcessStdout( TDEProcess*, char * buffer, int len )
{
output->append( TQString::fromLocal8Bit( buffer, len ) );
// Set the cursor's position at the end of the output.
@ -313,7 +313,7 @@ void SVNDialog::slotProcessStdout( KProcess*, char * buffer, int len )
_statusOutput += TQString::fromLocal8Bit( buffer, len );
}
void SVNDialog::slotProcessStderr( KProcess*, char * buffer, int len )
void SVNDialog::slotProcessStderr( TDEProcess*, char * buffer, int len )
{
// If an error occurs while executing the command display stderr in
// another color.
@ -324,7 +324,7 @@ void SVNDialog::slotProcessStderr( KProcess*, char * buffer, int len )
output->setCursorPosition( output->lines( ), 0 );
}
void SVNDialog::slotProcessExited( KProcess * p )
void SVNDialog::slotProcessExited( TDEProcess * p )
{
if ( p->exitStatus( ) )
output->append( i18n( "[ Exited with status %1 ]" ).arg( p->exitStatus( ) ) );

10
kbabel/catalogmanager/libsvn/svndialog.h
Unescape View File

@ -48,7 +48,7 @@ class TQString;
class TQStringList;
class TQTextEdit;
// Forwarding KDE classes
class KProcess;
class TDEProcess;
class KTempFile;
class KSharedConfig;
@ -112,11 +112,11 @@ class SVNDialog : public KDialog
/** Slot for executing the SVN Command. */
void slotExecuteCommand( );
/** Slot for processing the stdout of the SVN Command. */
void slotProcessStdout( KProcess*, char * buffer, int len );
void slotProcessStdout( TDEProcess*, char * buffer, int len );
/** Slot for processing the stderr of the SVN Command. */
void slotProcessStderr( KProcess*, char * buffer, int len );
void slotProcessStderr( TDEProcess*, char * buffer, int len );
/** Slot for post-processing after the SVN command is fninished. */
void slotProcessExited( KProcess * p );
void slotProcessExited( TDEProcess * p );
/// Slot for combox having been activated
void slotComboActivated( int );
@ -131,7 +131,7 @@ class SVNDialog : public KDialog
TQTextEdit * output;
TQCheckBox * autoAddBox;
KProcess * p;
TDEProcess * p;
TQString _commandLine;
TQString _addCommand;

24
kbabel/catalogmanager/libsvn/svnhandler.cpp
Unescape View File

@ -132,12 +132,12 @@ SVNHandler::FileStatus SVNHandler::fstatus( const TQString& filename ) const
if ( !entries.exists() )
return NOT_IN_SVN;
KProcess proc;
TDEProcess proc;
SVNOutputCollector out( &proc );
proc << "svn" << "status" << "-v" << "--xml" << info.absFilePath();
if( !proc.start( KProcess::Block, KProcess::Stdout ) )
if( !proc.start( TDEProcess::Block, TDEProcess::Stdout ) )
return ERROR_IN_WC;
TQDomDocument doc;
@ -290,8 +290,8 @@ void SVNHandler::execSVNCommand( TQWidget* parent, SVN::Command cmd, const TQStr
return;
}
// ### TODO: instead of making a TQString, use KProcess directly, so that it cares about quoting.
// ### TODO: use KProcess::setWorkingDirectory instead of using "cd" (therefore allowing to use KProcess without a shell.)
// ### TODO: instead of making a TQString, use TDEProcess directly, so that it cares about quoting.
// ### TODO: use TDEProcess::setWorkingDirectory instead of using "cd" (therefore allowing to use TDEProcess without a shell.)
TQString command("cd " + (templates ? _potBaseDir : _poBaseDir) + " && svn ");
switch ( cmd ) {
case SVN::Update:
@ -503,23 +503,23 @@ bool SVNHandler::isConsideredModified( const FileStatus status ) const
return status == LOCALLY_MODIFIED || status == NOT_IN_SVN;
}
SVNOutputCollector::SVNOutputCollector( KProcess* p )
SVNOutputCollector::SVNOutputCollector( TDEProcess* p )
: m_process(0)
{
setProcess( p );
}
void SVNOutputCollector::setProcess( KProcess* p )
void SVNOutputCollector::setProcess( TDEProcess* p )
{
if( m_process )
m_process->disconnect( this );
m_process = p;
if( p ) {
connect( p, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
this, TQT_SLOT(slotGatherStdout(KProcess*, char*, int)) );
connect( p, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
this, TQT_SLOT(slotGatherStderr(KProcess*, char*, int)) );
connect( p, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
this, TQT_SLOT(slotGatherStdout(TDEProcess*, char*, int)) );
connect( p, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
this, TQT_SLOT(slotGatherStderr(TDEProcess*, char*, int)) );
}
m_gatheredOutput.truncate( 0 );
@ -527,13 +527,13 @@ void SVNOutputCollector::setProcess( KProcess* p )
m_stdoutOutput.truncate( 0 );
}
void SVNOutputCollector::slotGatherStderr( KProcess*, char* data, int len )
void SVNOutputCollector::slotGatherStderr( TDEProcess*, char* data, int len )
{
m_gatheredOutput.append( TQString::fromLocal8Bit( data, len ) );
m_stderrOutput.append( TQString::fromLocal8Bit( data, len ) );
}
void SVNOutputCollector::slotGatherStdout( KProcess*, char* data, int len )
void SVNOutputCollector::slotGatherStdout( TDEProcess*, char* data, int len )
{
m_gatheredOutput.append( TQString::fromLocal8Bit( data, len ) );
m_stdoutOutput.append( TQString::fromLocal8Bit( data, len ) );

10
kbabel/catalogmanager/libsvn/svnhandler.h
Unescape View File

@ -119,22 +119,22 @@ class SVNOutputCollector: public TQObject
public:
SVNOutputCollector( KProcess* );
void setProcess( KProcess* );
SVNOutputCollector( TDEProcess* );
void setProcess( TDEProcess* );
const TQString& getOutput() const { return m_gatheredOutput; }
const TQString& getStderr() const { return m_stderrOutput; }
const TQString& getStdout() const { return m_stdoutOutput; }
private slots:
void slotGatherStderr( KProcess*, char*, int );
void slotGatherStdout( KProcess*, char*, int );
void slotGatherStderr( TDEProcess*, char*, int );
void slotGatherStdout( TDEProcess*, char*, int );
private:
TQString m_gatheredOutput;
TQString m_stderrOutput;
TQString m_stdoutOutput;
KProcess* m_process;
TDEProcess* m_process;
};
#endif // SVNHANDLER_H

4
kbabel/catalogmanager/markpatterndialog.cpp
Unescape View File

@ -140,7 +140,7 @@ void MarkPatternDialog::slotRegexpButtonClicked( )
void MarkPatternDialog::restoreSettings( )
{
KConfig * config = KGlobal::config( );
KConfig * config = TDEGlobal::config( );
config->setGroup("MarkPatternDialog");
patternList = config->readListEntry("Patterns");
@ -160,7 +160,7 @@ void MarkPatternDialog::restoreSettings( )
void MarkPatternDialog::saveSettings( )
{
KConfig * config = KGlobal::config( );
KConfig * config = TDEGlobal::config( );
config->setGroup("MarkPatternDialog");
config->writeEntry("Patterns", patternList);

2
kbabel/catalogmanager/multiroughtransdlg.cpp
Unescape View File

@ -125,7 +125,7 @@ void MultiRoughTransDlg::showAllStatistics()
if( tt == 0 ) tt = 1;
int nothing=tt-ptc-etc;
KLocale *locale = KGlobal::locale();
KLocale *locale = TDEGlobal::locale();
TQString statMsg = i18n("Result of the translation:\n"
"Edited entries: %1\n"
"Exact translations: %2 (%3%)\n"

2
kbabel/common/catalog.cpp
Unescape View File

@ -1809,7 +1809,7 @@ TQString Catalog::dateTime() const
{
case Qt::LocalDate:
{
dateTimeString = KGlobal::locale()->formatDateTime( dt );
dateTimeString = TDEGlobal::locale()->formatDateTime( dt );
break;
}
case Qt::ISODate:

6
kbabel/common/catalogsettings.cpp
Unescape View File

@ -90,7 +90,7 @@ TQString KBabel::GNUPluralForms(const TQString& lang)
infile.close();
KProcess msginit;
TDEProcess msginit;
msginit << "msginit";
msginit
@ -103,7 +103,7 @@ TQString KBabel::GNUPluralForms(const TQString& lang)
<< "--no-translator"
<< "--no-wrap" ;
msginit.start( KProcess::Block );
msginit.start( TDEProcess::Block );
TQString res("");
@ -200,7 +200,7 @@ TQString Defaults::Identity::mailingList()
TQString Defaults::Identity::languageCode()
{
// first try to get the language from KDE settings
KLocale *locale = KGlobal::locale();
KLocale *locale = TDEGlobal::locale();
TQString lang;
if(locale)
{

28
kbabel/common/msgfmt.cpp
Unescape View File

@ -56,12 +56,12 @@ Msgfmt::Status Msgfmt::checkSyntax(TQString file,TQString& output, bool gnu)
Status stat=Ok;
// this method does not return the right retrun values at the moment :-(
KProcess proc;
TDEProcess proc;
connect(&proc,TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
this,TQT_SLOT(addToOutput(KProcess*,char *, int )));
connect(&proc,TQT_SIGNAL(receivedStderr(KProcess *, char *, int)),
this,TQT_SLOT(addToOutput(KProcess*,char *, int)));
connect(&proc,TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
this,TQT_SLOT(addToOutput(TDEProcess*,char *, int )));
connect(&proc,TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
this,TQT_SLOT(addToOutput(TDEProcess*,char *, int)));
// remove last output
_output="";
@ -74,7 +74,7 @@ Msgfmt::Status Msgfmt::checkSyntax(TQString file,TQString& output, bool gnu)
proc << "-vc";
}
if(!proc.start(KProcess::Block,KProcess::Stderr))
if(!proc.start(TDEProcess::Block,TDEProcess::Stderr))
{
stat=NoExecutable;
}
@ -97,21 +97,21 @@ Msgfmt::Status Msgfmt::checkSyntaxInDir(TQString dir,TQString regexp,TQString& o
Status stat=Ok;
// this method does not return the right return values at the moment :-(
KProcess proc;
TDEProcess proc;
proc.setUseShell(true);
connect(&proc,TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
this,TQT_SLOT(addToOutput(KProcess*,char *, int )));
connect(&proc,TQT_SIGNAL(receivedStderr(KProcess *, char *, int)),
this,TQT_SLOT(addToOutput(KProcess*,char *, int)));
connect(&proc,TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
this,TQT_SLOT(addToOutput(TDEProcess*,char *, int )));
connect(&proc,TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
this,TQT_SLOT(addToOutput(TDEProcess*,char *, int)));
// remove last output
_output="";
proc << "IFS='\n'; msgfmt --statistics -o /dev/null "
"$(find" << KProcess::quote(dir) << "-name" << KProcess::quote(regexp) << ")";
"$(find" << TDEProcess::quote(dir) << "-name" << TDEProcess::quote(regexp) << ")";
if(!proc.start(KProcess::Block,KProcess::Stderr))
if(!proc.start(TDEProcess::Block,TDEProcess::Stderr))
{
stat=NoExecutable;
}
@ -131,7 +131,7 @@ Msgfmt::Status Msgfmt::checkSyntaxInDir(TQString dir,TQString regexp,TQString& o
void Msgfmt::addToOutput(KProcess*,char *buffer, int buflen)
void Msgfmt::addToOutput(TDEProcess*,char *buffer, int buflen)
{
TQString newString = TQString::fromLocal8Bit(buffer, buflen);

4
kbabel/common/msgfmt.h
Unescape View File

@ -36,7 +36,7 @@
#include <tqobject.h>
#include <kdemacros.h>
class KProcess;
class TDEProcess;
class TQString;
namespace KBabel
@ -54,7 +54,7 @@ public:
Status checkSyntaxInDir(TQString dir,TQString regexp,TQString& output);
private slots:
void addToOutput(KProcess*,char *buffer, int buflen);
void addToOutput(TDEProcess*,char *buffer, int buflen);
private:
static TQString tempSaveName();

4
kbabel/common/projectsettings.cpp
Unescape View File

@ -46,7 +46,7 @@ TQString KBabel::Defaults::Spellcheck::ignoreURL()
{
TQString _ignoreURL;
KStandardDirs * dirs = KGlobal::dirs();
KStandardDirs * dirs = TDEGlobal::dirs();
if(dirs)
{
_ignoreURL = dirs->saveLocation("appdata");
@ -113,7 +113,7 @@ TQString KBabel::Defaults::CatalogManager::ignoreURL()
{
TQString _ignoreURL;
KStandardDirs * dirs = KGlobal::dirs();
KStandardDirs * dirs = TDEGlobal::dirs();
if(dirs)
{
_ignoreURL = dirs->saveLocation("appdata");

2
kbabel/common/tagextractor.cpp
Unescape View File

@ -42,7 +42,7 @@ using namespace KBabel;
TagExtractor::TagExtractor() : RegExpExtractor(TQStringList())
{
KConfig* config = KGlobal::config();
KConfig* config = TDEGlobal::config();
config->setGroup("Tags");

4
kbabel/commonui/finddialog.cpp
Unescape View File

@ -386,7 +386,7 @@ void FindDialog::setReplaceOpts(ReplaceOptions options)
void FindDialog::readSettings()
{
KConfig* config = KGlobal::config();
KConfig* config = TDEGlobal::config();
if(_replaceDlg) {
KConfigGroupSaver cgs(config,"ReplaceDialog");
@ -459,7 +459,7 @@ void FindDialog::readSettings()
void FindDialog::saveSettings()
{
KConfig* config = KGlobal::config();
KConfig* config = TDEGlobal::config();
if(_replaceDlg) {
KConfigGroupSaver cgs(config,"ReplaceDialog");

2
kbabel/commonui/projectwizard.cpp
Unescape View File

@ -54,7 +54,7 @@ ProjectWizard::ProjectWizard(TQWidget *parent,const char *name)
// fill the known language codes
KConfig all_languages("all_languages", true, false, "locale");
TQStringList lang_codes = KGlobal::locale()->allLanguagesTwoAlpha();
TQStringList lang_codes = TDEGlobal::locale()->allLanguagesTwoAlpha();
for (TQStringList::iterator it = lang_codes.begin();
it != lang_codes.end(); ++it)
{

6
kbabel/commonui/roughtransdlg.cpp
Unescape View File

@ -160,7 +160,7 @@ RoughTransDlg::RoughTransDlg(KBabelDictBox *dict, Catalog *cat
TQPtrList<ModuleInfo> moduleList = dict->moduleInfos();
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
KConfigGroupSaver gs(config,"RoughTranslation");
TQStringList selectedList=config->readListEntry("Selected");
if(selectedList.isEmpty())
@ -212,7 +212,7 @@ RoughTransDlg::RoughTransDlg(KBabelDictBox *dict, Catalog *cat
RoughTransDlg::~RoughTransDlg()
{
KConfig *config=KGlobal::config();
KConfig *config=TDEGlobal::config();
KConfigGroupSaver gs(config,"RoughTranslation");
config->writeEntry("Selected",dictChooser->selectedDicts());
@ -667,7 +667,7 @@ void RoughTransDlg::translate()
void RoughTransDlg::showStatistics()
{
int nothing=totalTried-partTransCounter-exactTransCounter;
KLocale *locale = KGlobal::locale();
KLocale *locale = TDEGlobal::locale();
TQString statMsg = i18n("Result of the translation:\n"
"Edited entries: %1\n"
"Exact translations: %2 (%3%)\n"

2
kbabel/commonui/toolaction.cpp
Unescape View File

@ -92,7 +92,7 @@ TQValueList<KDataToolInfo> ToolAction::validationTools()
{
TQValueList<KDataToolInfo> result;
TQValueList<KDataToolInfo> tools = KDataToolInfo::query("CatalogItem", "application/x-kbabel-catalogitem", KGlobal::instance());
TQValueList<KDataToolInfo> tools = KDataToolInfo::query("CatalogItem", "application/x-kbabel-catalogitem", TDEGlobal::instance());
for( TQValueList<KDataToolInfo>::ConstIterator entry = tools.begin(); entry != tools.end(); ++entry )
{

4
kbabel/kbabel/headereditor.cpp
Unescape View File

@ -84,7 +84,7 @@ HeaderEditor::~HeaderEditor()
void HeaderEditor::saveSettings()
{
KConfig* config = KGlobal::config();
KConfig* config = TDEGlobal::config();
KConfigGroupSaver saver(config, "HeaderEditor" );
@ -93,7 +93,7 @@ void HeaderEditor::saveSettings()
void HeaderEditor::restoreSettings()
{
KConfig* config = KGlobal::config();
KConfig* config = TDEGlobal::config();
KConfigGroupSaver saver(config, "HeaderEditor" );

8
kbabel/kbabel/kbabel.cpp
Unescape View File

@ -785,7 +785,7 @@ void KBabelMW::setupDynamicActions()
// query available tools
TQValueList<KDataToolInfo> allTools = KDataToolInfo::query
("CatalogItem", "application/x-kbabel-catalogitem", KGlobal::instance());
("CatalogItem", "application/x-kbabel-catalogitem", TDEGlobal::instance());
// skip read-only tools for single items
TQValueList<KDataToolInfo> modifyTools;
@ -819,7 +819,7 @@ void KBabelMW::setupDynamicActions()
// query available tools for whole catalog
allTools = KDataToolInfo::query
("Catalog", "application/x-kbabel-catalog", KGlobal::instance());
("Catalog", "application/x-kbabel-catalog", TDEGlobal::instance());
// skip read-only tools
entry = allTools.begin();
@ -1179,7 +1179,7 @@ void KBabelMW::optionsShowStatusbar(bool on)
void KBabelMW::optionsEditToolbars()
{
saveMainWindowSettings( KGlobal::config(), "View" );
saveMainWindowSettings( TDEGlobal::config(), "View" );
KEditToolbar dlg(actionCollection());
connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_TQOBJECT(this), TQT_SLOT(newToolbarConfig()));
dlg.exec();
@ -1188,7 +1188,7 @@ void KBabelMW::optionsEditToolbars()
void KBabelMW::newToolbarConfig()
{
createGUI(0);
applyMainWindowSettings( KGlobal::config(), "View" );
applyMainWindowSettings( TDEGlobal::config(), "View" );
}
void KBabelMW::optionsPreferences()

2
kbabel/kbabel/kbabel.kcfg
Unescape View File

@ -109,7 +109,7 @@
</entry>
<entry name="MsgFont" type="Font">
<label>Font for Messages</label>
<default code="true">KGlobalSettings::generalFont()</default>
<default code="true">TDEGlobalSettings::generalFont()</default>
</entry>
<entry name="OnFlySpellCheck" type="Bool">
<label>

6
kbabel/kbabel/kbabelview.cpp
Unescape View File

@ -2700,7 +2700,7 @@ void KBabelView::findInFile(TQCString fileSource, FindOptions options)
_showTryLaterBox=true;
// delete dontDisplayAgain from configuration
KConfig* config = KGlobal::config();
KConfig* config = TDEGlobal::config();
KConfigGroupSaver saver(config,"Notification Messages");
config->writeEntry("waitForNextFile",true);
@ -2729,7 +2729,7 @@ void KBabelView::replaceInFile(TQCString fileSource, KBabel::ReplaceOptions opti
_showTryLaterBox=true;
// delete dontDisplayAgain from configuration
KConfig* config = KGlobal::config();
KConfig* config = TDEGlobal::config();
KConfigGroupSaver saver(config,"Notification Messages");
config->writeEntry("waitForNextFile",true);
@ -3590,7 +3590,7 @@ void KBabelView::autoCheck(bool onlyWhenChanged)
TQString msg = "";
// ### TODO: whynot use i18n("context",text) directly?
KLocale* locale=KGlobal::locale();
KLocale* locale=TDEGlobal::locale();
for( TQStringList::iterator it=status.begin() ; it != status.end() ; ++it )
{

2
kbabel/kbabel/kbcataloglistview.cpp
Unescape View File

@ -44,7 +44,7 @@ KBCatalogListView::KBCatalogListView(KBCatalog* catalog, TQWidget *parent, KBabe
m_listview->addColumn(i18n("Id"));
m_listview->addColumn(i18n("Original String"));
m_listview->addColumn(i18n("Translated String"));
m_listview->setAlternateBackground(KGlobalSettings::alternateBackgroundColor());
m_listview->setAlternateBackground(TDEGlobalSettings::alternateBackgroundColor());
m_listview->setFullWidth(true);
m_listview->setAllColumnsShowFocus(true);
m_listview->resize(this->size());

4
kbabel/kbabel/kbhighlighting.cpp
Unescape View File

@ -60,7 +60,7 @@ KBabelHighlighter::KBabelHighlighter( TQTextEdit * edit, KSpell *spell ) : TQObj
regexps << "(\\\\[abfnrtv'\"\?\\\\])|(\\\\\\d+)|(\\\\x[\\dabcdef]+)";
colors.resize( 8 );
colors[Normal] = KGlobalSettings::textColor();
colors[Normal] = TDEGlobalSettings::textColor();
colors[Tag] = KBabelSettings::tagColor ();
colors[Entity] = KBabelSettings::tagColor ();
colors[CFormat] = KBabelSettings::cformatColor ();
@ -193,7 +193,7 @@ void KBabelHighlighter::setHasErrors( bool err )
void KBabelHighlighter::readSettings( )
{
// FIXME: does not care about different projects yet
KConfig * config = KGlobal::config( );
KConfig * config = TDEGlobal::config( );
config->setGroup( "Misc" );
TQString temp = config->readEntry( "AccelMarker", "&" );
accelMarker = temp[0];

4
kbabel/kbabel/mymultilineedit.cpp
Unescape View File

@ -599,9 +599,9 @@ MsgMultiLineEdit::MsgMultiLineEdit(int ID, KSpell* spell, TQWidget* parent,const
_highlightBg(false),
_spacePoints(false),
_bgColor(colorGroup().base().dark(110)),
_textColor(KGlobalSettings::textColor()),
_textColor(TDEGlobalSettings::textColor()),
_errorColor(TQt::red),
_currentColor(KGlobalSettings::textColor()),
_currentColor(TDEGlobalSettings::textColor()),
_whitespace(0),
_hlSyntax(true),
_quoteColor(TQt::darkGreen),

4
kbabel/kbabel/spelldlg.cpp
Unescape View File

@ -59,7 +59,7 @@ SpellDlg::SpellDlg(bool haveMarkedText,TQWidget *parent,const char *name)
{
_mainWidget->markedBtn->setEnabled(false);
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
KConfigGroupSaver cs(config,"SpellDlg");
TQString what=config->readEntry("Default","All");
@ -82,7 +82,7 @@ SpellDlg::~SpellDlg()
{
if(_mainWidget->defaultBtn->isChecked())
{
KConfig *config=KGlobal::config();
KConfig *config=TDEGlobal::config();
KConfigGroupSaver cs(config,"SpellDlg");
TQString what="All";

4
kbabel/kbabeldict/kbabeldict.cpp
Unescape View File

@ -73,14 +73,14 @@ KBabelDict::~KBabelDict()
void KBabelDict::saveConfig()
{
KConfig *config=KGlobal::config();
KConfig *config=TDEGlobal::config();
KConfigGroupSaver gs(config,"KBabelDict");
config->writeEntry("Preferences",view->prefVisible());
}
void KBabelDict::readConfig()
{
KConfig *config=KGlobal::config();
KConfig *config=TDEGlobal::config();
KConfigGroupSaver gs(config,"KBabelDict");
bool pref=config->readBoolEntry("Preferences",true);

12
kbabel/kbabeldict/kbabeldictbox.cpp
Unescape View File

@ -335,7 +335,7 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl )
#if 0
// try to find installed modules by looking into directories
// kbabeldict/modules and getting all files *.rc
TQStringList dirList = KGlobal::dirs()->findDirs("data"
TQStringList dirList = TDEGlobal::dirs()->findDirs("data"
,"kbabeldict/modules");
for ( TQStringList::Iterator it = dirList.begin(); it != dirList.end()
@ -372,7 +372,7 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl )
rcConfig.setGroup("SearchEngine");
TQStringList appList = rcConfig.readListEntry("Applications");
TDEInstance *inst = KGlobal::instance();
TDEInstance *inst = TDEGlobal::instance();
if(inst && !appList.isEmpty() && !appList.contains(inst->instanceName()))
{
continue;
@ -407,11 +407,11 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl )
}
}
kdDebug(KBABEL_SEARCH) << "Now using trader for " << KGlobal::instance()->instanceName() << endl;
kdDebug(KBABEL_SEARCH) << "Now using trader for " << TDEGlobal::instance()->instanceName() << endl;
// try to find installed modules by KTrader
KTrader::OfferList offers = KTrader::self()->query("KBabelDictModule",
"('"+KGlobal::instance()->instanceName()+"' in [Applications])");
"('"+TDEGlobal::instance()->instanceName()+"' in [Applications])");
for(KTrader::OfferList::ConstIterator it = offers.begin(); it != offers.end(); ++it )
{
@ -992,7 +992,7 @@ void KBabelDictBox::showResult(TQListViewItem *item)
{
if(info->lastChange.isValid())
{
dateLabel->setText(KGlobal::locale()->formatDate(
dateLabel->setText(TDEGlobal::locale()->formatDate(
info->lastChange.date(),true));
}
else
@ -1166,7 +1166,7 @@ void KBabelDictBox::nextInfo()
if(info->lastChange.isValid())
{
dateLabel->setText(KGlobal::locale()->formatDate(
dateLabel->setText(TDEGlobal::locale()->formatDate(
info->lastChange.date(),true));
}
else

4
kbabel/kbabeldict/kbabeldictview.cpp
Unescape View File

@ -129,7 +129,7 @@ KBabelDictView::KBabelDictView( TQWidget* parent, const char* name, WFlags fl )
tempLayout->addWidget(prefStack);
tempLayout->addStretch(1);
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
dictBox->readSettings(config);
dictBox->setAutoUpdateOptions(true);
@ -185,7 +185,7 @@ KBabelDictView::KBabelDictView( TQWidget* parent, const char* name, WFlags fl )
KBabelDictView::~KBabelDictView()
{
// no need to delete child widgets, TQt does it all for us
KConfig *config = KGlobal::config();
KConfig *config = TDEGlobal::config();
dictBox->saveSettings(config);
}

2
kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
Unescape View File

@ -1158,7 +1158,7 @@ KDBSearchEngine::readSettings (KConfigBase * config)
lang = config->readEntry ("Language", defaultLang);
TQString defaultDir;
KStandardDirs *dirs = KGlobal::dirs ();
KStandardDirs *dirs = TDEGlobal::dirs ();
if (dirs)
{
defaultDir = dirs->saveLocation ("data");

2
kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp
Unescape View File

@ -85,7 +85,7 @@ dbpw->ignoreLE->setText("&.:");
dbpw->autoAddCB_2->setChecked(true);
TQString defaultDir;
KStandardDirs * dirs = KGlobal::dirs();
KStandardDirs * dirs = TDEGlobal::dirs();
if(dirs)
{
defaultDir = dirs->saveLocation("data");

2
kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp
Unescape View File

@ -322,7 +322,7 @@ void KDBSearchEngine2::readSettings(KConfigBase *config)
{
/*TQString defaultDir;
KStandardDirs * dirs = KGlobal::dirs();
KStandardDirs * dirs = TDEGlobal::dirs();
if(dirs)
{
defaultDir = dirs->saveLocation("data");

2
kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp
Unescape View File

@ -53,7 +53,7 @@ emit restoreNow();
void KDB2PreferencesWidget::standard()
{
TQString defaultDir;
KStandardDirs * dirs = KGlobal::dirs();
KStandardDirs * dirs = TDEGlobal::dirs();
if(dirs)
{
defaultDir = dirs->saveLocation("data");

2
kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
Unescape View File

@ -74,7 +74,7 @@ PoCompendium::PoCompendium(TQObject *parent, const char *name)
initialized=false;
loading=false;
langCode = KGlobal::locale()->language();
langCode = TDEGlobal::locale()->language();
caseSensitive = false;
ignoreFuzzy=true;

2
kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
Unescape View File

@ -69,7 +69,7 @@ TmxCompendium::TmxCompendium(TQObject *parent, const char *name)
initialized=false;
loading=false;
langCode = KGlobal::locale()->language();
langCode = TDEGlobal::locale()->language();
caseSensitive = false;
wholeWords=true;

6
kbugbuster/backend/mailsender.cpp
Unescape View File

@ -61,15 +61,15 @@ bool MailSender::send(const TQString &fromName,const TQString &fromEmail,const T
if (command.isNull()) return false; // give up
command.append(TQString::fromLatin1(" -s "));
command.append(KProcess::quote(subject));
command.append(TDEProcess::quote(subject));
if (bcc) {
command.append(TQString::fromLatin1(" -b "));
command.append(KProcess::quote(from));
command.append(TDEProcess::quote(from));
}
command.append(" ");
command.append(KProcess::quote(to));
command.append(TDEProcess::quote(to));
needHeaders = false;
}

2
kbugbuster/gui/cwbugdetails.cpp
Unescape View File

@ -116,7 +116,7 @@ void CWBugDetails::setBug( const Bug &bug, const BugDetails &details )
text.append( borderBottomStyle + "\">" );
TQString sender = (*it).sender.fullName( true );
TQString date = KGlobal::locale()->formatDateTime( (*it).date, false );
TQString date = TDEGlobal::locale()->formatDateTime( (*it).date, false );
BugDetailsPart::List::ConstIterator it2 = it;
if ( ++it2 == bdp.end() )
text.append( "<a href=\"" + BugSystem::self()->server()->bugLink( bug ).url()

2
kbugbuster/gui/cwloadingwidget.cpp
Unescape View File

@ -125,7 +125,7 @@ void CWLoadingWidget::updatePixmap()
if( m_mode == TopFrame )
{
TQFont bigFont = TQFont( KGlobalSettings::generalFont().family(),
TQFont bigFont = TQFont( TDEGlobalSettings::generalFont().family(),
28, TQFont::Bold, true );
int xoffset = m_logoPixmap->width();

2
kbugbuster/gui/cwsearchwidget.cpp
Unescape View File

@ -46,7 +46,7 @@ CWSearchWidget::CWSearchWidget( TQWidget *parent , const char * name )
m_searchDescBtn->setEnabled( !m_searchDesc->text().isEmpty() );
m_searchBugNumberBtn->setEnabled( !m_searchBugNumber->text().isEmpty() );
// m_searchPackages->setCompletionMode( KGlobalSettings::CompletionAuto );
// m_searchPackages->setCompletionMode( TDEGlobalSettings::CompletionAuto );
}
CWSearchWidget::~CWSearchWidget()

2
kbugbuster/gui/packageselectdialog.cpp
Unescape View File

@ -62,7 +62,7 @@ PackageSelectDialog::PackageSelectDialog(TQWidget *parent,const char *name) :
TQT_SLOT( slotOk() ) );
mCompletion = new KCompletion;
mCompletion->setCompletionMode( KGlobalSettings::CompletionAuto );
mCompletion->setCompletionMode( TDEGlobalSettings::CompletionAuto );
mCompleteList = new PackageListView( topSplitter );
mCompleteList->addColumn( i18n("Name") );

2
kbugbuster/kresources/kcalresource_plugin.cpp
Unescape View File

@ -31,7 +31,7 @@ extern "C"
{
KDE_EXPORT void *init_kcal_bugzilla()
{
KGlobal::locale()->insertCatalogue( "kres_bugzilla" );
TDEGlobal::locale()->insertCatalogue( "kres_bugzilla" );
return new KRES::PluginFactory<KCalResource,KCalResourceConfig>();
}
}

4
kioslave/svn/svnhelper/kio_svn_helper.cpp
Unescape View File

@ -124,7 +124,7 @@ SvnHelper::SvnHelper():TDEApplication() {
( *stream ) << ( *it2 ) << "\n";
}
tmp->close();
KProcess *p = new KProcess;
TDEProcess *p = new TDEProcess;
*p << "kompare" << "-n" << "-o" << tmp->name();
p->start();
} else { //else do it with message box
@ -278,7 +278,7 @@ int main(int argc, char **argv) {
TDECmdLineArgs::init(argc, argv, "kio_svn_helper", I18N_NOOP("Subversion Helper"), "TDE frontend for SVN", "0.1");
TDECmdLineArgs::addCmdLineOptions( options );
KGlobal::locale()->setMainCatalogue("kio_svn");
TDEGlobal::locale()->setMainCatalogue("kio_svn");
TDEApplication::addCmdLineOptions();
if ( TDECmdLineArgs::parsedArgs()->count()==0 )

10
kmtrace/kde.excludes
Unescape View File

@ -34,11 +34,11 @@ k_bindtextdomain
_nl_find_domain
KIconTheme::list
KIconTheme::current
KGlobalSettings::toolBarFont
KGlobalSettings::menuFont
KGlobalSettings::fixedFont
KGlobalSettings::generalFont
KGlobalSettings::toolBarFont
TDEGlobalSettings::toolBarFont
TDEGlobalSettings::menuFont
TDEGlobalSettings::fixedFont
TDEGlobalSettings::generalFont
TDEGlobalSettings::toolBarFont
KImageIOFactory::self
objMap
# Some C functions that allocate data for initialisation

4
kmtrace/kmtrace.cpp
Unescape View File

@ -258,8 +258,8 @@ void lookupUnknownSymbols(const char *appname)
inputFile.close();
TQCString command;
command.sprintf("addr2line -e %s -f -C -s < %s > %s", appname,
TQFile::encodeName(KProcess::quote(inputFile.name())).data(),
TQFile::encodeName(KProcess::quote(outputFile.name())).data());
TQFile::encodeName(TDEProcess::quote(inputFile.name())).data(),
TQFile::encodeName(TDEProcess::quote(outputFile.name())).data());
system(command.data());
fInputFile = fopen(TQFile::encodeName(outputFile.name()), "r");
if (!fInputFile)

2
kompare/ChangeLog
Unescape View File

@ -270,7 +270,7 @@ Jul 15, 2002 : Otto Bruggeman
* Removed some code duplication
* Fixed diff output parsing with Common subdirectories in it
* Fixed Copyright years in the about box (thanks Carsten Niehaus)
* Removed the KShellProcess and replaced it with a KProcess
* Removed the KShellProcess and replaced it with a TDEProcess
Feb 18, 2002 : Otto Bruggeman
* Fixed scrolling with a wheel mouse in the kompare(list)view and

4
kompare/kompare_shell.cpp
Unescape View File

@ -472,7 +472,7 @@ void KompareShell::optionsConfigureKeys()
void KompareShell::optionsConfigureToolbars()
{
saveMainWindowSettings( KGlobal::config(), autoSaveGroup() );
saveMainWindowSettings( TDEGlobal::config(), autoSaveGroup() );
// use the standard toolbar editor
KEditToolbar dlg(factory());
connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(newToolbarConfig()));
@ -481,7 +481,7 @@ void KompareShell::optionsConfigureToolbars()
void KompareShell::newToolbarConfig()
{
applyMainWindowSettings( KGlobal::config(), autoSaveGroup() );
applyMainWindowSettings( TDEGlobal::config(), autoSaveGroup() );
}
#include "kompare_shell.moc"

2
kompare/komparenavtreepart/komparenavtreepart.cpp
Unescape View File

@ -682,7 +682,7 @@ KParts::Part* KompareNavTreePartFactory::createPartObject( TQWidget* parentWidge
// Create an instance of our Part
KompareNavTreePart* obj = new KompareNavTreePart( parentWidget, widgetName );
KGlobal::locale()->insertCatalogue("kompare");
TDEGlobal::locale()->insertCatalogue("kompare");
return obj;
}

2
kompare/libdialogpages/filespage.cpp
Unescape View File

@ -52,7 +52,7 @@ FilesPage::FilesPage( TQWidget* parent ) : PageBase( parent ), m_URLChanged( fal
m_thirdGB = new TQGroupBox( 1, Qt::Vertical, i18n( "Encoding" ), page );
m_encodingComboBox = new TQComboBox( false, m_thirdGB, "encoding_combobox" );
m_encodingComboBox->insertStringList( KGlobal::charsets()->availableEncodingNames() );
m_encodingComboBox->insertStringList( TDEGlobal::charsets()->availableEncodingNames() );
layout->addWidget( m_firstGB );
layout->addWidget( m_secondGB );

2
kompare/libdialogpages/viewpage.cpp
Unescape View File

@ -172,7 +172,7 @@ void ViewPage::setDefaults()
m_snolSpinBox->setValue ( 3 );
m_tabSpinBox->setValue ( 4 );
m_fontCombo->setCurrentFont ( KGlobalSettings::fixedFont().family() );
m_fontCombo->setCurrentFont ( TDEGlobalSettings::fixedFont().family() );
m_fontSizeSpinBox->setValue ( 10 );
}

2
kompare/libdialogpages/viewsettings.cpp
Unescape View File

@ -56,7 +56,7 @@ void ViewSettings::loadSettings( KConfig* config )
m_scrollNoOfLines = cfg.readNumEntry ( "ScrollNoOfLines", 3 );
m_tabToNumberOfSpaces = cfg.readNumEntry ( "TabToNumberOfSpaces", 4 );
TQFont stdFixed = KGlobalSettings::fixedFont();
TQFont stdFixed = TDEGlobalSettings::fixedFont();
stdFixed.setPointSize( 10 );
m_font = cfg.readFontEntry ( "TextFont", &stdFixed );
}

2
kompare/libdiff2/komparemodellist.cpp
Unescape View File

@ -417,7 +417,7 @@ void KompareModelList::setEncoding( const TQString& encoding )
else
{
kdDebug() << "Encoding : " << encoding << endl;
m_textCodec = KGlobal::charsets()->codecForName( encoding.latin1() );
m_textCodec = TDEGlobal::charsets()->codecForName( encoding.latin1() );
kdDebug() << "TextCodec: " << m_textCodec << endl;
if ( !m_textCodec )
m_textCodec = TQTextCodec::codecForLocale();

36
kompare/libdiff2/kompareprocess.cpp
Unescape View File

@ -31,7 +31,7 @@
#include "kompareprocess.h"
KompareProcess::KompareProcess( DiffSettings* diffSettings, enum Kompare::DiffMode mode, TQString source, TQString destination, TQString dir )
: KProcess(),
: TDEProcess(),
m_diffSettings( diffSettings ),
m_mode( mode ),
m_textDecoder( 0 )
@ -39,14 +39,14 @@ KompareProcess::KompareProcess( DiffSettings* diffSettings, enum Kompare::DiffMo
setUseShell( true );
// connect the stdout and stderr signals
connect( this, TQT_SIGNAL( receivedStdout( KProcess*, char*, int ) ),
TQT_SLOT ( slotReceivedStdout( KProcess*, char*, int ) ) );
connect( this, TQT_SIGNAL( receivedStderr( KProcess*, char*, int ) ),
TQT_SLOT ( slotReceivedStderr( KProcess*, char*, int ) ) );
connect( this, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ),
TQT_SLOT ( slotReceivedStdout( TDEProcess*, char*, int ) ) );
connect( this, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ),
TQT_SLOT ( slotReceivedStderr( TDEProcess*, char*, int ) ) );
// connect the signal that indicates that the proces has exited
connect( this, TQT_SIGNAL( processExited( KProcess* ) ),
TQT_SLOT ( slotProcessExited( KProcess* ) ) );
connect( this, TQT_SIGNAL( processExited( TDEProcess* ) ),
TQT_SLOT ( slotProcessExited( TDEProcess* ) ) );
*this << "LANG=C";
@ -66,8 +66,8 @@ KompareProcess::KompareProcess( DiffSettings* diffSettings, enum Kompare::DiffMo
// Write file names
*this << "--";
*this << KProcess::quote( constructRelativePath( dir, source ) );
*this << KProcess::quote( constructRelativePath( dir, destination ) );
*this << TDEProcess::quote( constructRelativePath( dir, source ) );
*this << TDEProcess::quote( constructRelativePath( dir, destination ) );
}
void KompareProcess::writeDefaultCommandLine()
@ -86,7 +86,7 @@ void KompareProcess::writeDefaultCommandLine()
void KompareProcess::writeCommandLine()
{
// load the executable into the KProcess
// load the executable into the TDEProcess
if ( m_diffSettings->m_diffProgram.isEmpty() )
{
kdDebug(8101) << "Using the first diff in the path..." << endl;
@ -157,7 +157,7 @@ void KompareProcess::writeCommandLine()
if ( m_diffSettings->m_ignoreRegExp && !m_diffSettings->m_ignoreRegExpText.isEmpty() )
{
*this << "-I " << KProcess::quote( m_diffSettings->m_ignoreRegExpText );
*this << "-I " << TDEProcess::quote( m_diffSettings->m_ignoreRegExpText );
}
if ( m_diffSettings->m_showCFunctionChange )
@ -192,13 +192,13 @@ void KompareProcess::writeCommandLine()
TQStringList::ConstIterator end = m_diffSettings->m_excludeFilePatternList.end();
for ( ; it != end; ++it )
{
*this << "-x" << KProcess::quote( *it );
*this << "-x" << TDEProcess::quote( *it );
}
}
if ( m_diffSettings->m_excludeFilesFile && !m_diffSettings->m_excludeFilesFileURL.isEmpty() )
{
*this << "-X" << KProcess::quote( m_diffSettings->m_excludeFilesFileURL );
*this << "-X" << TDEProcess::quote( m_diffSettings->m_excludeFilesFileURL );
}
}
@ -214,7 +214,7 @@ void KompareProcess::setEncoding( const TQString& encoding )
}
else
{
TQTextCodec* textCodec = KGlobal::charsets()->codecForName( encoding.latin1() );
TQTextCodec* textCodec = TDEGlobal::charsets()->codecForName( encoding.latin1() );
if ( textCodec )
m_textDecoder = textCodec->makeDecoder();
else
@ -226,7 +226,7 @@ void KompareProcess::setEncoding( const TQString& encoding )
}
}
void KompareProcess::slotReceivedStdout( KProcess* /* process */, char* buffer, int length )
void KompareProcess::slotReceivedStdout( TDEProcess* /* process */, char* buffer, int length )
{
// add all output to m_stdout
if ( m_textDecoder )
@ -235,7 +235,7 @@ void KompareProcess::slotReceivedStdout( KProcess* /* process */, char* buffer,
kdDebug(8101) << "KompareProcess::slotReceivedStdout : No decoder !!!" << endl;
}
void KompareProcess::slotReceivedStderr( KProcess* /* process */, char* buffer, int length )
void KompareProcess::slotReceivedStderr( TDEProcess* /* process */, char* buffer, int length )
{
// add all output to m_stderr
if ( m_textDecoder )
@ -253,10 +253,10 @@ bool KompareProcess::start()
cmdLine += "\"" + (*it) + "\" ";
kdDebug(8101) << cmdLine << endl;
#endif
return( KProcess::start( KProcess::NotifyOnExit, KProcess::AllOutput ) );
return( TDEProcess::start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) );
}
void KompareProcess::slotProcessExited( KProcess* /* proc */ )
void KompareProcess::slotProcessExited( TDEProcess* /* proc */ )
{
// exit status of 0: no differences
// 1: some differences

8
kompare/libdiff2/kompareprocess.h
Unescape View File

@ -28,7 +28,7 @@ class TQTextCodec;
class DiffSettings;
class KompareProcess : public KProcess, public KompareFunctions
class KompareProcess : public TDEProcess, public KompareFunctions
{
Q_OBJECT
@ -53,9 +53,9 @@ protected:
void writeCommandLine();
protected slots:
void slotReceivedStdout( KProcess*, char*, int );
void slotReceivedStderr( KProcess*, char*, int );
void slotProcessExited( KProcess* proc );
void slotReceivedStdout( TDEProcess*, char*, int );
void slotReceivedStderr( TDEProcess*, char*, int );
void slotProcessExited( TDEProcess* proc );
private:
DiffSettings* m_diffSettings;

2
kuiviewer/kuiviewer_part.cpp
Unescape View File

@ -59,7 +59,7 @@ KUIViewerPart::KUIViewerPart( TQWidget *parentWidget, const char *widgetName,
// we need an instance
setInstance( KUIViewerPartFactory::instance() );
KGlobal::locale()->insertCatalogue("kuiviewer");
TDEGlobal::locale()->insertCatalogue("kuiviewer");
// this should be your custom internal widget
m_widget = new TQVBox( parentWidget, widgetName );

4
scripts/fixheaders
Unescape View File

@ -44,8 +44,8 @@ $lastdir = '.';
'`stderr\' undeclared \(first use this function' => "stdio",
'invalid use of undefined type `class KConfig' => "kconfig",
'implicit declaration of function `int f?printf' => "stdio",
'no method `KGlobal::' => "kglobal",
'`KGlobal\' undeclared \(first use this function\)' => "kglobal",
'no method `TDEGlobal::' => "kglobal",
'`TDEGlobal\' undeclared \(first use this function\)' => "kglobal",
'implicit declaration of function `int locate\(\.\.\.\)' => "kstddirs",
'`locate\' undeclared \(first use this function\)' => "kstddirs",
'no matching function for call to `KStandardDirs' => "kstddirs",

44
tdecachegrind/tdecachegrind/toplevel.cpp
Unescape View File

@ -105,7 +105,7 @@ TopLevel::TopLevel(const char *name)
#endif
_statusbar->addWidget(_statusLabel, 1);
KConfig* kconfig = KGlobal::config();
KConfig* kconfig = TDEGlobal::config();
Configuration::readOptions( kconfig );
_openRecent->loadEntries( kconfig );
@ -201,7 +201,7 @@ void TopLevel::setupPartSelection(PartSelection* ps)
*/
void TopLevel::saveCurrentState(TQString postfix)
{
KConfig* kconfig = KGlobal::config();
KConfig* kconfig = TDEGlobal::config();
TQCString pf = postfix.ascii();
KConfigGroup psConfig(kconfig, TQCString("PartOverview")+pf);
@ -225,7 +225,7 @@ void TopLevel::saveTraceSettings()
{
TQString key = traceKey();
KConfigGroup pConfig(KGlobal::config(), TQCString("TracePositions"));
KConfigGroup pConfig(TDEGlobal::config(), TQCString("TracePositions"));
pConfig.writeEntry(TQString("CostType%1").arg(key),
_costType ? _costType->name() : TQString("?"));
pConfig.writeEntry(TQString("CostType2%1").arg(key),
@ -235,7 +235,7 @@ void TopLevel::saveTraceSettings()
if (!_data) return;
KConfigGroup aConfig(KGlobal::config(), TQCString("Layouts"));
KConfigGroup aConfig(TDEGlobal::config(), TQCString("Layouts"));
aConfig.writeEntry(TQString("Count%1").arg(key), _layoutCount);
aConfig.writeEntry(TQString("Current%1").arg(key), _layoutCurrent);
@ -253,7 +253,7 @@ void TopLevel::saveTraceSettings()
*/
void TopLevel::restoreCurrentState(TQString postfix)
{
KConfig* kconfig = KGlobal::config();
KConfig* kconfig = TDEGlobal::config();
TQStringList gList = kconfig->groupList();
TQCString pf = postfix.ascii();
@ -388,7 +388,7 @@ void TopLevel::createDocks()
#endif
// Restore QT Dock positions...
KConfigGroup dockConfig(KGlobal::config(), TQCString("Docks"));
KConfigGroup dockConfig(TDEGlobal::config(), TQCString("Docks"));
TQString str = dockConfig.readEntry("Position", TQString());
if (0) tqDebug("Docks/Position: '%s'", str.ascii());
if (str.isEmpty()) {
@ -1023,7 +1023,7 @@ void TopLevel::loadTrace(const KURL& url)
if(KIO::NetAccess::download( url, tmpFile )) {
#endif
_openRecent->addURL(url);
_openRecent->saveEntries( KGlobal::config() );
_openRecent->saveEntries( TDEGlobal::config() );
loadTrace(tmpFile);
KIO::NetAccess::removeTempFile( tmpFile );
@ -1072,7 +1072,7 @@ void TopLevel::addTrace(const KURL& url)
if(KIO::NetAccess::download( url, tmpFile )) {
#endif
_openRecent->addURL(url);
_openRecent->saveEntries( KGlobal::config() );
_openRecent->saveEntries( TDEGlobal::config() );
addTrace(tmpFile);
KIO::NetAccess::removeTempFile( tmpFile );
@ -1721,8 +1721,8 @@ void TopLevel::restoreTraceTypes()
{
TQString key = traceKey();
KConfigGroup cConfig(KGlobal::config(), TQCString("CurrentState"));
KConfigGroup pConfig(KGlobal::config(), TQCString("TracePositions"));
KConfigGroup cConfig(TDEGlobal::config(), TQCString("CurrentState"));
KConfigGroup pConfig(TDEGlobal::config(), TQCString("TracePositions"));
TQString groupType, costType, costType2;
groupType = pConfig.readEntry(TQString("GroupType%1").arg(key));
@ -1741,7 +1741,7 @@ void TopLevel::restoreTraceTypes()
if (!_costType && !_saCost->items().isEmpty())
costTypeSelected(_saCost->items().first());
KConfigGroup aConfig(KGlobal::config(), TQCString("Layouts"));
KConfigGroup aConfig(TDEGlobal::config(), TQCString("Layouts"));
_layoutCount = aConfig.readNumEntry(TQString("Count%1").arg(key), 0);
_layoutCurrent = aConfig.readNumEntry(TQString("Current%1").arg(key), 0);
if (_layoutCount == 0) layoutRestore();
@ -1760,7 +1760,7 @@ void TopLevel::restoreTraceSettings()
TQString key = traceKey();
KConfigGroup pConfig(KGlobal::config(), TQCString("TracePositions"));
KConfigGroup pConfig(TDEGlobal::config(), TQCString("TracePositions"));
TQString group = pConfig.readEntry(TQString("Group%1").arg(key));
if (!group.isEmpty()) setGroup(group);
@ -1781,7 +1781,7 @@ void TopLevel::restoreTraceSettings()
void TopLevel::layoutDuplicate()
{
// save current and allocate a new slot
_multiView->saveViewConfig(KGlobal::config(),
_multiView->saveViewConfig(TDEGlobal::config(),
TQString("Layout%1-MainView").arg(_layoutCurrent),
traceKey(), false);
_layoutCurrent = _layoutCount;
@ -1799,7 +1799,7 @@ void TopLevel::layoutRemove()
int from = _layoutCount-1;
if (_layoutCurrent == from) { _layoutCurrent--; from--; }
// restore from last and decrement count
_multiView->readViewConfig(KGlobal::config(),
_multiView->readViewConfig(TDEGlobal::config(),
TQString("Layout%1-MainView").arg(from),
traceKey(), false);
_layoutCount--;
@ -1811,7 +1811,7 @@ void TopLevel::layoutNext()
{
if (_layoutCount <2) return;
KConfig* config = KGlobal::config();
KConfig* config = TDEGlobal::config();
TQString key = traceKey();
_multiView->saveViewConfig(config,
@ -1832,7 +1832,7 @@ void TopLevel::layoutPrevious()
{
if (_layoutCount <2) return;
KConfig* config = KGlobal::config();
KConfig* config = TDEGlobal::config();
TQString key = traceKey();
_multiView->saveViewConfig(config,
@ -1851,7 +1851,7 @@ void TopLevel::layoutPrevious()
void TopLevel::layoutSave()
{
KConfig* config = KGlobal::config();
KConfig* config = TDEGlobal::config();
TQString key = traceKey();
_multiView->saveViewConfig(config,
@ -1878,7 +1878,7 @@ void TopLevel::layoutSave()
void TopLevel::layoutRestore()
{
KConfig* config = KGlobal::config();
KConfig* config = TDEGlobal::config();
KConfigGroup aConfig(config, TQCString("Layouts"));
_layoutCount = aConfig.readNumEntry("DefaultCount", 0);
_layoutCurrent = aConfig.readNumEntry("DefaultCurrent", 0);
@ -1963,12 +1963,12 @@ void TopLevel::updateStatusBar()
void TopLevel::configure()
{
if (ConfigDlg::configure(Configuration::config(), _data, this)) {
Configuration::saveOptions(KGlobal::config());
Configuration::saveOptions(TDEGlobal::config());
configChanged();
}
else
Configuration::readOptions(KGlobal::config());
Configuration::readOptions(TDEGlobal::config());
}
bool TopLevel::queryClose()
@ -1984,7 +1984,7 @@ bool TopLevel::queryExit()
Configuration::setShowPercentage(_showPercentage);
Configuration::setShowExpanded(_showExpanded);
Configuration::setShowCycles(_showCycles);
Configuration::saveOptions(KGlobal::config());
Configuration::saveOptions(TDEGlobal::config());
saveCurrentState(TQString());
@ -1994,7 +1994,7 @@ bool TopLevel::queryExit()
// Its already stored.
delete toolBar();
KConfigGroup dockConfig(KGlobal::config(), TQCString("Docks"));
KConfigGroup dockConfig(TDEGlobal::config(), TQCString("Docks"));
TQString str;
TQTextStream ts( &str, IO_WriteOnly );
ts << *this;

2
umbrello/umbrello/aligntoolbar.cpp
Unescape View File

@ -67,7 +67,7 @@ bool AlignToolBar::hasWidgetSmallerY(const UMLWidget* widget1, const UMLWidget*
}
void AlignToolBar::loadPixmaps() {
KStandardDirs* dirs = KGlobal::dirs();
KStandardDirs* dirs = TDEGlobal::dirs();
TQString dataDir = dirs->findResourceDir( "data", "umbrello/pics/object.png" );
dataDir += "/umbrello/pics/";

2
umbrello/umbrello/dialogs/assocgenpage.cpp
Unescape View File

@ -107,7 +107,7 @@ void AssocGenPage::constructWidget() {
m_pTypeCB->setCompletedItems(m_AssocTypeStrings);
m_pTypeCB->setCurrentText(currentTypeAsString);
m_pTypeCB->setDuplicatesEnabled(false);//only allow one of each type in box
m_pTypeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
m_pTypeCB->setCompletionMode( TDEGlobalSettings::CompletionPopup );
m_pDoc->setWordWrap(TQMultiLineEdit::WidgetWidth);
nameLayout->addWidget(m_pTypeCB, 1, 1);

4
umbrello/umbrello/dialogs/classgenpage.cpp
Unescape View File

@ -212,7 +212,7 @@ ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* parent, UMLObject* o) : TQWidget
// manage stereotypes
m_pStereoTypeCB -> setDuplicatesEnabled(false);//only allow one of each type in box
m_pStereoTypeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
m_pStereoTypeCB->setCompletionMode( TDEGlobalSettings::CompletionPopup );
insertStereotype (TQString("")); // an empty stereotype is the default
int defaultStereotype=0;
bool foundDefaultStereotype = false;
@ -338,7 +338,7 @@ ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* parent, UMLWidget* widget) : TQW
m_pNameLayout->addWidget(m_pStereoTypeCB, 1, 1);
m_pStereoTypeCB->setCurrentText( widget->getUMLObject()->getStereotype() );
m_pStereoTypeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
m_pStereoTypeCB->setCompletionMode( TDEGlobalSettings::CompletionPopup );
m_pInstanceL = new TQLabel(this);
m_pInstanceL->setText(i18n("Instance name:"));

4
umbrello/umbrello/dialogs/parmpropdlg.cpp
Unescape View File

@ -123,7 +123,7 @@ ParmPropDlg::ParmPropDlg(TQWidget * parent, UMLDoc * doc, UMLAttribute * a)
m_pTypeCB->setDuplicatesEnabled(false);//only allow one of each type in box
m_pTypeCB->setEditable(true);
m_pTypeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
m_pTypeCB->setCompletionMode( TDEGlobalSettings::CompletionPopup );
// m_pTypeCB->setAutoCompletion(false);
//add template parameters
@ -163,7 +163,7 @@ ParmPropDlg::ParmPropDlg(TQWidget * parent, UMLDoc * doc, UMLAttribute * a)
// manage stereotypes
m_pStereoTypeCB->setDuplicatesEnabled(false); //only allow one of each type in box
m_pStereoTypeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
m_pStereoTypeCB->setCompletionMode( TDEGlobalSettings::CompletionPopup );
insertStereotype (TQString("")); // an empty stereotype is the default
int defaultStereotype=0;
bool foundDefaultStereotype = false;

2
umbrello/umbrello/dialogs/selectopdlg.cpp
Unescape View File

@ -47,7 +47,7 @@ SelectOpDlg::SelectOpDlg(UMLView * parent, UMLClassifier * c)
mainLayout -> addWidget(m_pOpRB, 1, 0);
m_pOpCB = new KComboBox(m_pOpGB);
m_pOpCB->setCompletionMode( KGlobalSettings::CompletionPopup );
m_pOpCB->setCompletionMode( TDEGlobalSettings::CompletionPopup );
m_pOpCB->setDuplicatesEnabled(false);//only allow one of each type in box
mainLayout -> addWidget(m_pOpCB, 1, 1);

6
umbrello/umbrello/dialogs/settingsdlg.cpp
Unescape View File

@ -177,7 +177,7 @@ void SettingsDlg::setupGeneralPage() {
startupLayout -> addWidget( m_GeneralWidgets.startL, 2, 0 );
m_GeneralWidgets.diagramKB = new KComboBox( m_GeneralWidgets.startupGB );
m_GeneralWidgets.diagramKB->setCompletionMode( KGlobalSettings::CompletionPopup );
m_GeneralWidgets.diagramKB->setCompletionMode( TDEGlobalSettings::CompletionPopup );
startupLayout -> addWidget( m_GeneralWidgets.diagramKB, 2, 1 );
TQString diagrams [] = { i18n("No Diagram"), i18n("Class Diagram"),
@ -260,7 +260,7 @@ void SettingsDlg::setupClassPage() {
insertAttribScope( tr2i18n( "Private" ) );
insertAttribScope( tr2i18n( "Protected" ) );
m_ClassWidgets.m_pAttribScopeCB->setCurrentItem((m_pOptionState->classState.defaultAttributeScope - 200));
m_ClassWidgets.m_pAttribScopeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
m_ClassWidgets.m_pAttribScopeCB->setCompletionMode( TDEGlobalSettings::CompletionPopup );
scopeLayout -> addWidget( m_ClassWidgets.m_pAttribScopeCB, 0, 1 );
m_ClassWidgets.m_pOperationScopeCB = new KComboBox(m_ClassWidgets.scopeGB);
@ -268,7 +268,7 @@ void SettingsDlg::setupClassPage() {
insertOperationScope( tr2i18n( "Private" ) );
insertOperationScope( tr2i18n( "Protected" ) );
m_ClassWidgets.m_pOperationScopeCB->setCurrentItem((m_pOptionState->classState.defaultOperationScope - 200));
m_ClassWidgets.m_pOperationScopeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
m_ClassWidgets.m_pOperationScopeCB->setCompletionMode( TDEGlobalSettings::CompletionPopup );
scopeLayout -> addWidget( m_ClassWidgets.m_pOperationScopeCB, 1, 1 );
}

2
umbrello/umbrello/dialogs/umlattributedialog.cpp
Unescape View File

@ -112,7 +112,7 @@ void UMLAttributeDialog::setupDialog() {
m_pImplementationRB -> setChecked( true );
m_pTypeCB->setDuplicatesEnabled(false);//only allow one of each type in box
m_pTypeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
m_pTypeCB->setCompletionMode( TDEGlobalSettings::CompletionPopup );
//now add the Concepts
UMLClassifierList namesList( pDoc->getConcepts() );

4
umbrello/umbrello/dialogs/umlentityattributedialog.cpp
Unescape View File

@ -93,7 +93,7 @@ void UMLEntityAttributeDialog::setupDialog() {
valuesLayout->addWidget(m_pAttributesL, 7, 0);
m_pAttributesCB = new KComboBox(true, m_pValuesGB);
m_pAttributesCB->setCompletionMode( KGlobalSettings::CompletionPopup );
m_pAttributesCB->setCompletionMode( TDEGlobalSettings::CompletionPopup );
valuesLayout->addWidget(m_pAttributesCB, 7, 1);
m_pTypeL->setBuddy(m_pAttributesCB);
@ -134,7 +134,7 @@ void UMLEntityAttributeDialog::setupDialog() {
}
m_pTypeCB->setDuplicatesEnabled(false);//only allow one of each type in box
m_pTypeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
m_pTypeCB->setCompletionMode( TDEGlobalSettings::CompletionPopup );
// Add the data types.
UMLClassifierList dataTypes = pDoc->getDatatypes();

4
umbrello/umbrello/dialogs/umloperationdialog.cpp
Unescape View File

@ -159,7 +159,7 @@ void UMLOperationDialog::setupDialog() {
insertType( "void" );
m_pRtypeCB->setDuplicatesEnabled(false);//only allow one of each type in box
m_pRtypeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
m_pRtypeCB->setCompletionMode( TDEGlobalSettings::CompletionPopup );
// add template parameters
UMLClassifier *classifier = dynamic_cast<UMLClassifier*>(m_pOperation->parent());
@ -212,7 +212,7 @@ void UMLOperationDialog::setupDialog() {
// manage stereotypes
m_pStereoTypeCB -> setDuplicatesEnabled(false);//only allow one of each type in box
m_pStereoTypeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
m_pStereoTypeCB->setCompletionMode( TDEGlobalSettings::CompletionPopup );
insertStereotype (TQString("")); // an empty stereotype is the default
int defaultStereotype=0;
bool foundDefaultStereotype = false;

2
umbrello/umbrello/dialogs/umltemplatedialog.cpp
Unescape View File

@ -79,7 +79,7 @@ void UMLTemplateDialog::setupDialog() {
m_pTypeCB->setEditable(true);
m_pTypeCB->setDuplicatesEnabled(false);//only allow one of each type in box
m_pTypeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
m_pTypeCB->setCompletionMode( TDEGlobalSettings::CompletionPopup );
// m_pTypeCB->setAutoCompletion(true);
//work out which one to select

2
umbrello/umbrello/docgenerators/docbookgenerator.cpp
Unescape View File

@ -110,7 +110,7 @@ KIO::Job* DocbookGenerator::generateDocbookForProjectInto(const KURL& destDir)
int nbparams = 0;
params[nbparams] = NULL;
TQString xsltFile(KGlobal::dirs()->findResource("appdata","xmi2docbook.xsl"));
TQString xsltFile(TDEGlobal::dirs()->findResource("appdata","xmi2docbook.xsl"));
xmlSubstituteEntitiesDefault(1);
xmlLoadExtDtdDefaultValue = 1;

6
umbrello/umbrello/docgenerators/xhtmlgenerator.cpp
Unescape View File

@ -102,7 +102,7 @@ void XhtmlGenerator::slotDocbookToXhtml(KIO::Job * docbookJob)
int nbparams = 0;
params[nbparams] = NULL;
TQString xsltFileName(KGlobal::dirs()->findResource("appdata","docbook2xhtml.xsl"));
TQString xsltFileName(TDEGlobal::dirs()->findResource("appdata","docbook2xhtml.xsl"));
kDebug() << "XSLT file is'"<<xsltFileName<<"'" << endl;
TQFile xsltFile(xsltFileName);
xsltFile.open(IO_ReadOnly);
@ -110,7 +110,7 @@ void XhtmlGenerator::slotDocbookToXhtml(KIO::Job * docbookJob)
kDebug() << "XSLT is'"<<xslt<<"'" << endl;
xsltFile.close();
TQString localXsl = KGlobal::dirs()->findResource("data","ksgmltools2/docbook/xsl/html/docbook.xsl");
TQString localXsl = TDEGlobal::dirs()->findResource("data","ksgmltools2/docbook/xsl/html/docbook.xsl");
kDebug() << "Local xsl is'"<<localXsl<<"'" << endl;
if (!localXsl.isEmpty())
{
@ -154,7 +154,7 @@ void XhtmlGenerator::slotDocbookToXhtml(KIO::Job * docbookJob)
job->setAutoErrorHandlingEnabled(true);
connect (job, TQT_SIGNAL(result( KIO::Job* )), this, TQT_SLOT(slotHtmlCopyFinished( KIO::Job* )));
TQString cssFileName(KGlobal::dirs()->findResource("appdata","xmi.css"));
TQString cssFileName(TDEGlobal::dirs()->findResource("appdata","xmi.css"));
kDebug() << "CSS file is'"<<cssFileName<<"'" << endl;
KURL cssUrl = m_destDir;
cssUrl.addPath("xmi.css");

2
umbrello/umbrello/kstartuplogo.cpp
Unescape View File

@ -21,7 +21,7 @@ KStartupLogo::KStartupLogo(TQWidget * parent, const char *name)
: TQWidget(parent,name, TQt::WStyle_NoBorder | TQt::WStyle_Customize | TQt::WDestructiveClose )
,m_bReadyToHide(false) {
//pm.load(locate("appdata", "pics/startlogo.png"));
KStandardDirs * dirs = KGlobal::dirs();
KStandardDirs * dirs = TDEGlobal::dirs();
TQString dataDir = dirs -> findResourceDir("data", "umbrello/pics/object.png");
dataDir += "/umbrello/pics/";
TQPixmap pm(dataDir + "startlogo.png");

2
umbrello/umbrello/listpopupmenu.cpp
Unescape View File

@ -826,7 +826,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) {
m_pShow = 0;
m_pColor = 0;
KStandardDirs* dirs = KGlobal::dirs();
KStandardDirs* dirs = TDEGlobal::dirs();
TQString dataDir = dirs->findResourceDir("data", "umbrello/pics/object.png");
dataDir += "/umbrello/pics/";
m_pixmap[pm_Class] .load(dataDir+"class.png", "PNG");

2
umbrello/umbrello/refactoring/refactoringassistant.cpp
Unescape View File

@ -681,7 +681,7 @@ void RefactoringAssistant::movableDropEvent (TQListViewItem* parentItem, TQListV
void RefactoringAssistant::loadPixmaps()
{
KStandardDirs *dirs = KGlobal::dirs();
KStandardDirs *dirs = TDEGlobal::dirs();
TQString dataDir = dirs -> findResourceDir( "data", "umbrello/pics/object.png" );
dataDir += "/umbrello/pics/";

2
umbrello/umbrello/umllistview.cpp
Unescape View File

@ -1753,7 +1753,7 @@ TQPixmap & UMLListView::getPixmap(Uml::Icon_Type type) {
}
void UMLListView::loadPixmaps() {
KStandardDirs * dirs = KGlobal::dirs();
KStandardDirs * dirs = TDEGlobal::dirs();
TQString dataDir = dirs -> findResourceDir("data", "umbrello/pics/object.png");
dataDir += "/umbrello/pics/";

2
umbrello/umbrello/worktoolbar.cpp
Unescape View File

@ -289,7 +289,7 @@ void WorkToolBar::loadPixmaps() {
{ tbb_Initial_Activity, i18n("Initial Activity"), "initial_state.png" },
{ tbb_Coll_Message, i18n("Message"), "message-asynchronous.png" }
};
KStandardDirs * dirs = KGlobal::dirs();
KStandardDirs * dirs = TDEGlobal::dirs();
TQString dataDir = dirs->findResourceDir( "data", "umbrello/pics/object.png" );
dataDir += "/umbrello/pics/";
const size_t n_buttonInfos = sizeof(buttonInfo) / sizeof(ButtonInfo);

Write Preview
Loading…
Cancel
Save