TDE
/
tdesvn
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdesvn
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 f4899658cb
commit 773793eead
23 changed files with 105 additions and 105 deletions
Show Stats Download Patch File Download Diff File

6
src/commandline_part.cpp
Unescape View File

@ -26,10 +26,10 @@
commandline_part::commandline_part(TQObject *parent, const char *name,TDECmdLineArgs *args) commandline_part::commandline_part(TQObject *parent, const char *name,TDECmdLineArgs *args)
: TQObject(parent, name) : TQObject(parent, name)
{ {
KGlobal::locale()->insertCatalogue("tdesvn"); TDEGlobal::locale()->insertCatalogue("tdesvn");
TDEInstance * inst = tdesvnPartFactory::instance(); TDEInstance * inst = tdesvnPartFactory::instance();
KGlobal::locale()->insertCatalogue(inst->instanceName()); TDEGlobal::locale()->insertCatalogue(inst->instanceName());
KGlobal::dirs()->addResourceType( inst->instanceName() + "data", TDEGlobal::dirs()->addResourceType( inst->instanceName() + "data",
KStandardDirs::kde_default("data")+ TQString::fromLatin1( inst->instanceName() ) + '/' ); KStandardDirs::kde_default("data")+ TQString::fromLatin1( inst->instanceName() ) + '/' );

6
src/helpers/ktranslateurl.cpp
Unescape View File

@ -48,9 +48,9 @@ KURL KTranslateUrl::translateSystemUrl(const KURL&_url)
if (proto!="system") { if (proto!="system") {
return _url; return _url;
} }
KGlobal::dirs()->addResourceType("system_entries", TDEGlobal::dirs()->addResourceType("system_entries",
KStandardDirs::kde_default("data") + "systemview"); KStandardDirs::kde_default("data") + "systemview");
TQStringList dirList = KGlobal::dirs()->resourceDirs("system_entries"); TQStringList dirList = TDEGlobal::dirs()->resourceDirs("system_entries");
if (!parseURL(_url,name,path)) { if (!parseURL(_url,name,path)) {
return _url; return _url;
} }
@ -83,7 +83,7 @@ bool KTranslateUrl::parseURL(const KURL&url,TQString&name,TQString&path)
KURL KTranslateUrl::findSystemBase(const TQString&filename) KURL KTranslateUrl::findSystemBase(const TQString&filename)
{ {
TQStringList dirList = KGlobal::dirs()->resourceDirs("system_entries"); TQStringList dirList = TDEGlobal::dirs()->resourceDirs("system_entries");
TQStringList::ConstIterator dirpath = dirList.begin(); TQStringList::ConstIterator dirpath = dirList.begin();
TQStringList::ConstIterator end = dirList.end(); TQStringList::ConstIterator end = dirList.end();

38
src/helpers/sshagent.cpp
Unescape View File

@ -112,7 +112,7 @@ bool SshAgent::addSshIdentities(bool force)
} }
// add identities to ssh-agent // add identities to ssh-agent
KProcess proc; TDEProcess proc;
proc.setEnvironment("SSH_AGENT_PID", m_pid); proc.setEnvironment("SSH_AGENT_PID", m_pid);
proc.setEnvironment("SSH_AUTH_SOCK", m_authSock); proc.setEnvironment("SSH_AUTH_SOCK", m_authSock);
@ -134,12 +134,12 @@ bool SshAgent::addSshIdentities(bool force)
proc << "ssh-add"; proc << "ssh-add";
connect(&proc, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), connect(&proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
TQT_SLOT(slotReceivedStdout(KProcess*, char*, int))); TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int)));
connect(&proc, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), connect(&proc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
TQT_SLOT(slotReceivedStderr(KProcess*, 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 // wait for process to finish
// TODO CL use timeout? // TODO CL use timeout?
@ -155,15 +155,15 @@ void SshAgent::killSshAgent()
if( !m_isRunning || !m_isOurAgent ) if( !m_isRunning || !m_isOurAgent )
return; return;
KProcess proc; TDEProcess proc;
proc << "kill" << m_pid; proc << "kill" << m_pid;
proc.start(KProcess::DontCare, KProcess::NoCommunication); proc.start(TDEProcess::DontCare, TDEProcess::NoCommunication);
} }
void SshAgent::slotProcessExited(KProcess*) void SshAgent::slotProcessExited(TDEProcess*)
{ {
TQRegExp cshPidRx("setenv SSH_AGENT_PID (\\d*);"); TQRegExp cshPidRx("setenv SSH_AGENT_PID (\\d*);");
TQRegExp cshSockRx("setenv SSH_AUTH_SOCK (.*);"); TQRegExp cshSockRx("setenv SSH_AUTH_SOCK (.*);");
@ -214,7 +214,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); Q_UNUSED(proc);
@ -223,7 +223,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); Q_UNUSED(proc);
@ -234,18 +234,18 @@ void SshAgent::slotReceivedStderr(KProcess* proc, char* buffer, int buflen)
bool SshAgent::startSshAgent() bool SshAgent::startSshAgent()
{ {
KProcess proc; TDEProcess proc;
proc << "ssh-agent"; proc << "ssh-agent";
connect(&proc, TQT_SIGNAL(processExited(KProcess*)), connect(&proc, TQT_SIGNAL(processExited(TDEProcess*)),
TQT_SLOT(slotProcessExited(KProcess*))); TQT_SLOT(slotProcessExited(TDEProcess*)));
connect(&proc, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), connect(&proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
TQT_SLOT(slotReceivedStdout(KProcess*, char*, int))); TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int)));
connect(&proc, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), connect(&proc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
TQT_SLOT(slotReceivedStderr(KProcess*, 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 // wait for process to finish
// TODO CL use timeout? // TODO CL use timeout?

8
src/helpers/sshagent.h
Unescape View File

@ -25,7 +25,7 @@
#include <tqstring.h> #include <tqstring.h>
#include <tqstringlist.h> #include <tqstringlist.h>
class KProcess; class TDEProcess;
class SshAgent : public TQObject class SshAgent : public TQObject
@ -46,9 +46,9 @@ public:
TQString authSock() const { return m_authSock; } TQString authSock() const { return m_authSock; }
private slots: private slots:
void slotProcessExited(KProcess*); void slotProcessExited(TDEProcess*);
void slotReceivedStdout(KProcess* proc, char* buffer, int buflen); void slotReceivedStdout(TDEProcess* proc, char* buffer, int buflen);
void slotReceivedStderr(KProcess* proc, char* buffer, int buflen); void slotReceivedStderr(TDEProcess* proc, char* buffer, int buflen);
private: private:
bool startSshAgent(); bool startSshAgent();

2
src/helpers/sub2qt.cpp
Unescape View File

@ -42,7 +42,7 @@ TQString sub2qt::apr_time2qtString(apr_time_t _time)
TQString sub2qt::DateTime2qtString(const svn::DateTime&_time) TQString sub2qt::DateTime2qtString(const svn::DateTime&_time)
{ {
return KGlobal::locale()->formatDateTime(_time); return TDEGlobal::locale()->formatDateTime(_time);
} }
}; };

2
src/kiosvn/kiosvn.cpp
Unescape View File

@ -142,7 +142,7 @@ kio_svnProtocol::kio_svnProtocol(const TQCString &pool_socket, const TQCString &
: SlaveBase("kio_ksvn", pool_socket, app_socket),StreamWrittenCb() : SlaveBase("kio_ksvn", pool_socket, app_socket),StreamWrittenCb()
{ {
m_pData=new KioSvnData(this); m_pData=new KioSvnData(this);
KGlobal::locale()->insertCatalogue("tdesvn"); TDEGlobal::locale()->insertCatalogue("tdesvn");
} }
kio_svnProtocol::~kio_svnProtocol() kio_svnProtocol::~kio_svnProtocol()

2
src/ksvnwidgets/diffbrowser.cpp
Unescape View File

@ -42,7 +42,7 @@ DiffBrowser::DiffBrowser(TQWidget*parent,const char*name)
: KTextBrowser( parent, name) : KTextBrowser( parent, name)
{ {
setTextFormat(TQt::PlainText); setTextFormat(TQt::PlainText);
setFont(KGlobalSettings::fixedFont()); setFont(TDEGlobalSettings::fixedFont());
m_Data = new DiffBrowserData; m_Data = new DiffBrowserData;
setWordWrap(TQTextEdit::NoWrap); setWordWrap(TQTextEdit::NoWrap);

2
src/ksvnwidgets/diffsyntax.cpp
Unescape View File

@ -42,7 +42,7 @@ int DiffSyntax::highlightParagraph ( const TQString & aText, int endStateOfLastP
static TQRegExp a("^\\w+:\\s.*$"); static TQRegExp a("^\\w+:\\s.*$");
static TQRegExp b("^\\W+$"); static TQRegExp b("^\\W+$");
TQColor c(0,0,0); TQColor c(0,0,0);
TQFont f(KGlobalSettings::fixedFont()); TQFont f(TDEGlobalSettings::fixedFont());
int ret = 0; int ret = 0;
if (endStateOfLastPara == 1) { if (endStateOfLastPara == 1) {
ret = 2; ret = 2;

2
src/ksvnwidgets/encodingselector_impl.cpp
Unescape View File

@ -27,7 +27,7 @@
EncodingSelector_impl::EncodingSelector_impl(const TQString&cur,TQWidget *parent, const char *name) EncodingSelector_impl::EncodingSelector_impl(const TQString&cur,TQWidget *parent, const char *name)
:EncodingSelector(parent, name) :EncodingSelector(parent, name)
{ {
m_encodingList->insertStringList( KGlobal::charsets()->availableEncodingNames()); m_encodingList->insertStringList( TDEGlobal::charsets()->availableEncodingNames());
for (int j = 1;j<m_encodingList->count();++j ) { for (int j = 1;j<m_encodingList->count();++j ) {
if(m_encodingList->text(j)==cur) { if(m_encodingList->text(j)==cur) {

12
src/svnfrontend/blamedisplay_impl.cpp
Unescape View File

@ -145,7 +145,7 @@ BlameDisplayItem::BlameDisplayItem(KListView*lv,BlameDisplayItem*it,const svn::A
int BlameDisplayItem::width (const TQFontMetrics & fm, const TQListView * lv, int c ) const int BlameDisplayItem::width (const TQFontMetrics & fm, const TQListView * lv, int c ) const
{ {
if (c == COL_LINE) { if (c == COL_LINE) {
return KListViewItem::width(TQFontMetrics(KGlobalSettings::fixedFont()),lv,c)+2*BORDER; return KListViewItem::width(TQFontMetrics(TDEGlobalSettings::fixedFont()),lv,c)+2*BORDER;
} }
return KListViewItem::width(fm,lv,c)+2*BORDER; return KListViewItem::width(fm,lv,c)+2*BORDER;
} }
@ -156,7 +156,7 @@ void BlameDisplayItem::display()
setText(COL_REV,TQString("%1").arg(m_Content.revision())); setText(COL_REV,TQString("%1").arg(m_Content.revision()));
setText(COL_AUT,m_Content.tAuthor()); setText(COL_AUT,m_Content.tAuthor());
if (m_Content.date().isValid()) { if (m_Content.date().isValid()) {
setText(COL_DATE,KGlobal::locale()->formatDateTime(m_Content.date())); setText(COL_DATE,TDEGlobal::locale()->formatDateTime(m_Content.date()));
} }
} }
@ -190,14 +190,14 @@ void BlameDisplayItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colum
/* don't copy string */ /* don't copy string */
const TQString & str = text(column);; const TQString & str = text(column);;
if (column == COL_LINE) { if (column == COL_LINE) {
p->setFont(KGlobalSettings::fixedFont()); p->setFont(TDEGlobalSettings::fixedFont());
} }
TQColorGroup _cg = cg; TQColorGroup _cg = cg;
TQColor _bgColor; TQColor _bgColor;
if (column==COL_LINENR || isSelected()) { if (column==COL_LINENR || isSelected()) {
_bgColor = KGlobalSettings::highlightColor(); _bgColor = TDEGlobalSettings::highlightColor();
p->setPen(KGlobalSettings::highlightedTextColor()); p->setPen(TDEGlobalSettings::highlightedTextColor());
} else { } else {
if (Kdesvnsettings::self()->colored_blame()) { if (Kdesvnsettings::self()->colored_blame()) {
_bgColor = cb->rev2color(m_Content.revision()); _bgColor = cb->rev2color(m_Content.revision());
@ -415,7 +415,7 @@ void BlameDisplay_impl::showCommit(BlameDisplayItem*bit)
KDialogBase::Close); KDialogBase::Close);
TQWidget* Dialog1Layout = dlg->makeVBoxMainWidget(); TQWidget* Dialog1Layout = dlg->makeVBoxMainWidget();
KTextBrowser*ptr = new KTextBrowser(Dialog1Layout); KTextBrowser*ptr = new KTextBrowser(Dialog1Layout);
ptr->setFont(KGlobalSettings::fixedFont()); ptr->setFont(TDEGlobalSettings::fixedFont());
ptr->setWordWrap(TQTextEdit::NoWrap); ptr->setWordWrap(TQTextEdit::NoWrap);
ptr->setText(text); ptr->setText(text);
dlg->resize(dlg->configDialogSize(*(Kdesvnsettings::self()->config()),"simplelog_display")); dlg->resize(dlg->configDialogSize(*(Kdesvnsettings::self()->config()),"simplelog_display"));

2
src/svnfrontend/editproperty_impl.cpp
Unescape View File

@ -117,7 +117,7 @@ EditProperty_impl::EditProperty_impl(TQWidget *parent, const char *name)
"second expression is used to extract the bare bug ID from that string."); "second expression is used to extract the bare bug ID from that string.");
m_NameEdit->setAutoCompletion(true); m_NameEdit->setAutoCompletion(true);
m_NameEdit->setCompletionMode(KGlobalSettings::CompletionPopupAuto); m_NameEdit->setCompletionMode(TDEGlobalSettings::CompletionPopupAuto);
m_NameEdit->setDuplicatesEnabled(false); m_NameEdit->setDuplicatesEnabled(false);
m_NameEdit->setHistoryItems(fileProperties, true); m_NameEdit->setHistoryItems(fileProperties, true);
isDir = false; isDir = false;

2
src/svnfrontend/filelistviewitem.cpp
Unescape View File

@ -191,7 +191,7 @@ void FileListViewItem::update()
} }
setText(COL_STATUS,infoText()); setText(COL_STATUS,infoText());
setText(COL_LAST_AUTHOR,cmtAuthor()); setText(COL_LAST_AUTHOR,cmtAuthor());
setText(COL_LAST_DATE,KGlobal::locale()->formatDateTime(fullDate())); setText(COL_LAST_DATE,TDEGlobal::locale()->formatDateTime(fullDate()));
setText(COL_LAST_REV,TQString("%1").arg(cmtRev())); setText(COL_LAST_REV,TQString("%1").arg(cmtRev()));
setText(COL_IS_LOCKED,lockOwner()); setText(COL_IS_LOCKED,lockOwner());
} }

2
src/svnfrontend/fronthelpers/propertyitem.cpp
Unescape View File

@ -40,7 +40,7 @@ bool PropertyListViewItem::different()const
void PropertyListViewItem::deleteIt() void PropertyListViewItem::deleteIt()
{ {
m_deleted = true; m_deleted = true;
setPixmap(0,KGlobal::iconLoader()->loadIcon("cancel",KIcon::Desktop,16)); setPixmap(0,TDEGlobal::iconLoader()->loadIcon("cancel",KIcon::Desktop,16));
} }
void PropertyListViewItem::unDeleteIt() void PropertyListViewItem::unDeleteIt()

14
src/svnfrontend/graphtree/revgraphview.cpp
Unescape View File

@ -162,12 +162,12 @@ void RevGraphView::endInsert()
viewport()->setUpdatesEnabled(true); viewport()->setUpdatesEnabled(true);
} }
void RevGraphView::readDotOutput(KProcess*,char * buffer,int buflen) void RevGraphView::readDotOutput(TDEProcess*,char * buffer,int buflen)
{ {
dotOutput+=TQString::fromLocal8Bit(buffer, buflen); dotOutput+=TQString::fromLocal8Bit(buffer, buflen);
} }
void RevGraphView::dotExit(KProcess*p) void RevGraphView::dotExit(TDEProcess*p)
{ {
if (p!=renderProcess)return; if (p!=renderProcess)return;
// remove line breaks when lines to long // remove line breaks when lines to long
@ -491,14 +491,14 @@ void RevGraphView::dumpRevtree()
} }
} }
*stream << "}\n"<<flush; *stream << "}\n"<<flush;
renderProcess = new KProcess(); renderProcess = new TDEProcess();
renderProcess->setEnvironment("LANG","C"); renderProcess->setEnvironment("LANG","C");
*renderProcess << "dot"; *renderProcess << "dot";
*renderProcess << dotTmpFile->name() << "-Tplain"; *renderProcess << dotTmpFile->name() << "-Tplain";
connect(renderProcess,TQT_SIGNAL(processExited(KProcess*)),this,TQT_SLOT(dotExit(KProcess*))); connect(renderProcess,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(dotExit(TDEProcess*)));
connect(renderProcess,TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), connect(renderProcess,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
this,TQT_SLOT(readDotOutput(KProcess*,char*,int)) ); this,TQT_SLOT(readDotOutput(TDEProcess*,char*,int)) );
if (!renderProcess->start(KProcess::NotifyOnExit,KProcess::Stdout)) { if (!renderProcess->start(TDEProcess::NotifyOnExit,TDEProcess::Stdout)) {
TQString arguments; TQString arguments;
for (unsigned c=0;c<renderProcess->args().count();++c) { for (unsigned c=0;c<renderProcess->args().count();++c) {
arguments+=TQString(" %1").arg(renderProcess->args()[c].data()); arguments+=TQString(" %1").arg(renderProcess->args()[c].data());

8
src/svnfrontend/graphtree/revgraphview.h
Unescape View File

@ -30,7 +30,7 @@ namespace svn {
} }
class KTempFile; class KTempFile;
class KProcess; class TDEProcess;
class RevisionTree; class RevisionTree;
class GraphTreeLabel; class GraphTreeLabel;
class GraphViewTip; class GraphViewTip;
@ -98,8 +98,8 @@ public slots:
virtual void slotClientException(const TQString&what); virtual void slotClientException(const TQString&what);
protected slots: protected slots:
virtual void readDotOutput(KProcess * proc,char * buffer,int buflen); virtual void readDotOutput(TDEProcess * proc,char * buffer,int buflen);
virtual void dotExit(KProcess*); virtual void dotExit(TDEProcess*);
protected: protected:
TQCanvas*m_Canvas; TQCanvas*m_Canvas;
@ -109,7 +109,7 @@ protected:
TQObject*m_Listener; TQObject*m_Listener;
KTempFile*dotTmpFile; KTempFile*dotTmpFile;
TQString dotOutput; TQString dotOutput;
KProcess*renderProcess; TDEProcess*renderProcess;
trevTree m_Tree; trevTree m_Tree;
TQColor getBgColor(const TQString&nodeName)const; TQColor getBgColor(const TQString&nodeName)const;
bool isStart(const TQString&nodeName)const; bool isStart(const TQString&nodeName)const;

60
src/svnfrontend/svnactions.cpp
Unescape View File

@ -116,7 +116,7 @@ public:
delete m_LogDialog; delete m_LogDialog;
} }
TQMap<KProcess*,TQStringList>::iterator it; TQMap<TDEProcess*,TQStringList>::iterator it;
for (it=m_tempfilelist.begin();it!=m_tempfilelist.end();++it) { for (it=m_tempfilelist.begin();it!=m_tempfilelist.end();++it) {
for (TQStringList::iterator it2 = (*it).begin(); for (TQStringList::iterator it2 = (*it).begin();
it2 != (*it).end();++it2) { it2 != (*it).end();++it2) {
@ -180,8 +180,8 @@ public:
/// \todo as persistent cache (sqlite?) /// \todo as persistent cache (sqlite?)
helpers::itemCache<svn::InfoEntry> m_InfoCache; helpers::itemCache<svn::InfoEntry> m_InfoCache;
TQMap<KProcess*,TQStringList> m_tempfilelist; TQMap<TDEProcess*,TQStringList> m_tempfilelist;
TQMap<KProcess*,TQStringList> m_tempdirlist; TQMap<TDEProcess*,TQStringList> m_tempdirlist;
TQTimer m_ThreadCheckTimer; TQTimer m_ThreadCheckTimer;
TQTimer m_UpdateCheckTimer; TQTimer m_UpdateCheckTimer;
@ -601,7 +601,7 @@ void SvnActions::slotMakeCat(const svn::Revision&start, const TQString&what, con
if (co.size()) { if (co.size()) {
KDialogBase*dlg = createDialog(&ptr,TQString(i18n("Content of %1")).arg(disp),false,"cat_display_dlg"); KDialogBase*dlg = createDialog(&ptr,TQString(i18n("Content of %1")).arg(disp),false,"cat_display_dlg");
if (dlg) { if (dlg) {
ptr->setFont(KGlobalSettings::fixedFont()); ptr->setFont(TDEGlobalSettings::fixedFont());
ptr->setWordWrap(TQTextEdit::NoWrap); ptr->setWordWrap(TQTextEdit::NoWrap);
ptr->setText(TQString::FROMUTF8(co,co.size())); ptr->setText(TQString::FROMUTF8(co,co.size()));
dlg->exec(); dlg->exec();
@ -1036,16 +1036,16 @@ bool SvnActions::makeCommit(const svn::Targets&targets)
} }
/*! /*!
\fn SvnActions::wroteStdin(KProcess*) \fn SvnActions::wroteStdin(TDEProcess*)
*/ */
void SvnActions::wroteStdin(KProcess*proc) void SvnActions::wroteStdin(TDEProcess*proc)
{ {
if (!proc) return; if (!proc) return;
kdDebug()<<"void SvnActions::wroteStdin(KProcess*proc)"<<endl; kdDebug()<<"void SvnActions::wroteStdin(TDEProcess*proc)"<<endl;
proc->closeStdin(); proc->closeStdin();
} }
void SvnActions::receivedStderr(KProcess*proc,char*buff,int len) void SvnActions::receivedStderr(TDEProcess*proc,char*buff,int len)
{ {
if (!proc || !buff || len == 0) { if (!proc || !buff || len == 0) {
return; return;
@ -1054,10 +1054,10 @@ void SvnActions::receivedStderr(KProcess*proc,char*buff,int len)
emit sendNotify(msg); emit sendNotify(msg);
} }
void SvnActions::procClosed(KProcess*proc) void SvnActions::procClosed(TDEProcess*proc)
{ {
if (!proc) return; if (!proc) return;
TQMap<KProcess*,TQStringList>::iterator it; TQMap<TDEProcess*,TQStringList>::iterator it;
if ( (it=m_Data->m_tempfilelist.find(proc))!=m_Data->m_tempfilelist.end()) { if ( (it=m_Data->m_tempfilelist.find(proc))!=m_Data->m_tempfilelist.end()) {
for (TQStringList::iterator it2 = (*it).begin(); for (TQStringList::iterator it2 = (*it).begin();
it2 != (*it).end();++it2) { it2 != (*it).end();++it2) {
@ -1183,7 +1183,7 @@ void SvnActions::makeDiffExternal(const TQString&p1,const svn::Revision&start,co
} }
} }
} }
KProcess*proc = new KProcess(); TDEProcess*proc = new TDEProcess();
for ( TQStringList::Iterator it = wlist.begin();it!=wlist.end();++it) { for ( TQStringList::Iterator it = wlist.begin();it!=wlist.end();++it) {
if (*it=="%1") { if (*it=="%1") {
*proc<<first; *proc<<first;
@ -1193,10 +1193,10 @@ void SvnActions::makeDiffExternal(const TQString&p1,const svn::Revision&start,co
*proc << *it; *proc << *it;
} }
} }
connect(proc,TQT_SIGNAL(processExited(KProcess*)),this,TQT_SLOT(procClosed(KProcess*))); connect(proc,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(procClosed(TDEProcess*)));
connect(proc,TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),this,TQT_SLOT(receivedStderr(KProcess*,char*,int))); connect(proc,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),this,TQT_SLOT(receivedStderr(TDEProcess*,char*,int)));
connect(proc,TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),this,TQT_SLOT(receivedStderr(KProcess*,char*,int))); connect(proc,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),this,TQT_SLOT(receivedStderr(TDEProcess*,char*,int)));
if (proc->start(m_Data->runblocked?KProcess::Block:KProcess::NotifyOnExit,KProcess::All)) { if (proc->start(m_Data->runblocked?TDEProcess::Block:TDEProcess::NotifyOnExit,TDEProcess::All)) {
if (!m_Data->runblocked) { if (!m_Data->runblocked) {
if (!isDir) { if (!isDir) {
tfile2.setAutoDelete(false); tfile2.setAutoDelete(false);
@ -1321,11 +1321,11 @@ void SvnActions::makeNorecDiff(const TQString&p1,const svn::Revision&r1,const TQ
void SvnActions::dispDiff(const TQByteArray&ex) void SvnActions::dispDiff(const TQByteArray&ex)
{ {
TQString what = Kdesvnsettings::external_diff_display(); TQString what = Kdesvnsettings::external_diff_display();
int r = KProcess::Stdin|KProcess::Stderr; int r = TDEProcess::Stdin|TDEProcess::Stderr;
if (Kdesvnsettings::use_external_diff() && (what.find("%1")==-1 || what.find("%2")==-1)) { if (Kdesvnsettings::use_external_diff() && (what.find("%1")==-1 || what.find("%2")==-1)) {
TQStringList wlist = TQStringList::split(" ",what); TQStringList wlist = TQStringList::split(" ",what);
KProcess*proc = new KProcess(); TDEProcess*proc = new TDEProcess();
bool fname_used = false; bool fname_used = false;
KTempFile tfile; KTempFile tfile;
tfile.setAutoDelete(false); tfile.setAutoDelete(false);
@ -1342,12 +1342,12 @@ void SvnActions::dispDiff(const TQByteArray&ex)
} }
} }
connect(proc,TQT_SIGNAL(processExited(KProcess*)),this,TQT_SLOT(procClosed(KProcess*))); connect(proc,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(procClosed(TDEProcess*)));
connect(proc,TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),this,TQT_SLOT(receivedStderr(KProcess*,char*,int))); connect(proc,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),this,TQT_SLOT(receivedStderr(TDEProcess*,char*,int)));
if (!fname_used) { if (!fname_used) {
connect(proc,TQT_SIGNAL(wroteStdin(KProcess*)),this,TQT_SLOT(wroteStdin(KProcess*))); connect(proc,TQT_SIGNAL(wroteStdin(TDEProcess*)),this,TQT_SLOT(wroteStdin(TDEProcess*)));
} }
if (proc->start(KProcess::NotifyOnExit,fname_used?KProcess::Stderr:(KProcess::Communication)r)) { if (proc->start(TDEProcess::NotifyOnExit,fname_used?TDEProcess::Stderr:(TDEProcess::Communication)r)) {
if (!fname_used) proc->writeStdin(ex,ex.size()); if (!fname_used) proc->writeStdin(ex,ex.size());
else m_Data->m_tempfilelist[proc].append(tfile.name()); else m_Data->m_tempfilelist[proc].append(tfile.name());
return; return;
@ -1924,7 +1924,7 @@ void SvnActions::slotResolve(const TQString&p)
return; return;
} }
KProcess*proc = new KProcess(); TDEProcess*proc = new TDEProcess();
for ( TQStringList::Iterator it = wlist.begin();it!=wlist.end();++it) { for ( TQStringList::Iterator it = wlist.begin();it!=wlist.end();++it) {
if (*it=="%o"||*it=="%l") { if (*it=="%o"||*it=="%l") {
*proc<<(base+"/"+i1.conflictOld()); *proc<<(base+"/"+i1.conflictOld());
@ -1938,10 +1938,10 @@ void SvnActions::slotResolve(const TQString&p)
*proc << *it; *proc << *it;
} }
} }
connect(proc,TQT_SIGNAL(processExited(KProcess*)),this,TQT_SLOT(procClosed(KProcess*))); connect(proc,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(procClosed(TDEProcess*)));
connect(proc,TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),this,TQT_SLOT(receivedStderr(KProcess*,char*,int))); connect(proc,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),this,TQT_SLOT(receivedStderr(TDEProcess*,char*,int)));
connect(proc,TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),this,TQT_SLOT(receivedStderr(KProcess*,char*,int))); connect(proc,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),this,TQT_SLOT(receivedStderr(TDEProcess*,char*,int)));
if (proc->start(m_Data->runblocked?KProcess::Block:KProcess::NotifyOnExit,KProcess::All)) { if (proc->start(m_Data->runblocked?TDEProcess::Block:TDEProcess::NotifyOnExit,TDEProcess::All)) {
return; return;
} else { } else {
emit sendNotify(i18n("Resolve-process could not started, check command.")); emit sendNotify(i18n("Resolve-process could not started, check command."));
@ -2076,7 +2076,7 @@ void SvnActions::slotMergeExternal(const TQString&_src1,const TQString&_src2, co
} }
TQString edisp = Kdesvnsettings::external_merge_program(); TQString edisp = Kdesvnsettings::external_merge_program();
TQStringList wlist = TQStringList::split(" ",edisp); TQStringList wlist = TQStringList::split(" ",edisp);
KProcess*proc = new KProcess(); TDEProcess*proc = new TDEProcess();
for ( TQStringList::Iterator it = wlist.begin();it!=wlist.end();++it) { for ( TQStringList::Iterator it = wlist.begin();it!=wlist.end();++it) {
if (*it=="%s1") { if (*it=="%s1") {
*proc<<first; *proc<<first;
@ -2088,9 +2088,9 @@ void SvnActions::slotMergeExternal(const TQString&_src1,const TQString&_src2, co
*proc << *it; *proc << *it;
} }
} }
connect(proc,TQT_SIGNAL(processExited(KProcess*)),this,TQT_SLOT(procClosed(KProcess*))); connect(proc,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(procClosed(TDEProcess*)));
connect(proc,TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),this,TQT_SLOT(receivedStderr(KProcess*,char*,int))); connect(proc,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),this,TQT_SLOT(receivedStderr(TDEProcess*,char*,int)));
if (proc->start(m_Data->runblocked?KProcess::Block:KProcess::NotifyOnExit,KProcess::Stderr)) { if (proc->start(m_Data->runblocked?TDEProcess::Block:TDEProcess::NotifyOnExit,TDEProcess::Stderr)) {
if (!m_Data->runblocked) { if (!m_Data->runblocked) {
tdir1.setAutoDelete(false); tdir1.setAutoDelete(false);
m_Data->m_tempdirlist[proc].append(tdir1.name()); m_Data->m_tempdirlist[proc].append(tdir1.name());

8
src/svnfrontend/svnactions.h
Unescape View File

@ -41,7 +41,7 @@ class KDialog;
class KDialogBase; class KDialogBase;
class TQDialog; class TQDialog;
class CContextListener; class CContextListener;
class KProcess; class TDEProcess;
class SvnActionsData; class SvnActionsData;
class CheckModifiedThread; class CheckModifiedThread;
class CheckUpdatesThread; class CheckUpdatesThread;
@ -245,11 +245,11 @@ signals:
void sigCacheStatus(TQ_LONG,TQ_LONG); void sigCacheStatus(TQ_LONG,TQ_LONG);
protected slots: protected slots:
virtual void wroteStdin(KProcess*); virtual void wroteStdin(TDEProcess*);
virtual void procClosed(KProcess*); virtual void procClosed(TDEProcess*);
virtual void checkModthread(); virtual void checkModthread();
virtual void checkUpdateThread(); virtual void checkUpdateThread();
virtual void receivedStderr(KProcess*,char*,int); virtual void receivedStderr(TDEProcess*,char*,int);
}; };
#endif #endif

2
src/svnfrontend/svnfiletip.cpp
Unescape View File

@ -137,7 +137,7 @@ void SvnFileTip::reposition()
// 4+: none // 4+: none
m_corner = 0; m_corner = 0;
// should the tooltip be shown to the left or to the right of the ivi ? // should the tooltip be shown to the left or to the right of the ivi ?
TQRect desk = KGlobalSettings::desktopGeometry(rect.center()); TQRect desk = TDEGlobalSettings::desktopGeometry(rect.center());
if (rect.center().x() + width() > desk.right()) if (rect.center().x() + width() > desk.right())
{ {
// to the left // to the left

2
src/svnfrontend/tdesvnfilelist.cpp
Unescape View File

@ -2686,7 +2686,7 @@ void tdesvnfilelist::contentsMouseMoveEvent( TQMouseEvent *e )
vp.setY( itemRect( item ).y() ); vp.setY( itemRect( item ).y() );
TQRect rect( viewportToContents( vp ), TQSize(20, item->height()) ); TQRect rect( viewportToContents( vp ), TQSize(20, item->height()) );
m_pList->m_fileTip->setItem( static_cast<SvnItem*>(item), rect, item->pixmap(0)); m_pList->m_fileTip->setItem( static_cast<SvnItem*>(item), rect, item->pixmap(0));
m_pList->m_fileTip->setPreview(KGlobalSettings::showFilePreview(item->fullName())/*&&isWorkingCopy()*/ m_pList->m_fileTip->setPreview(TDEGlobalSettings::showFilePreview(item->fullName())/*&&isWorkingCopy()*/
&&Kdesvnsettings::display_previews_in_file_tips()); &&Kdesvnsettings::display_previews_in_file_tips());
setShowToolTips(false); setShowToolTips(false);
} else { } else {

20
src/tdesvn.cpp
Unescape View File

@ -212,7 +212,7 @@ void tdesvn::load(const KURL& url,bool addRescent)
} }
} }
if (rac) { if (rac) {
rac->saveEntries(KGlobal::config(),"recent_files"); rac->saveEntries(TDEGlobal::config(),"recent_files");
} }
} }
} }
@ -230,7 +230,7 @@ void tdesvn::setupActions()
if (rac) if (rac)
{ {
rac->setMaxItems(8); rac->setMaxItems(8);
rac->loadEntries(KGlobal::config(),"recent_files"); rac->loadEntries(TDEGlobal::config(),"recent_files");
rac->setText(i18n("Recent opened URLs")); rac->setText(i18n("Recent opened URLs"));
} }
@ -243,7 +243,7 @@ void tdesvn::setupActions()
toggletemp = new KToggleAction(i18n("Load last opened URL on start"),KShortcut(), toggletemp = new KToggleAction(i18n("Load last opened URL on start"),KShortcut(),
actionCollection(),"toggle_load_last_url"); actionCollection(),"toggle_load_last_url");
toggletemp->setToolTip(i18n("Reload last opened url if no one is given on commandline")); toggletemp->setToolTip(i18n("Reload last opened url if no one is given on commandline"));
KConfigGroup cs(KGlobal::config(),"startup"); KConfigGroup cs(TDEGlobal::config(),"startup");
toggletemp->setChecked(cs.readBoolEntry("load_last_on_start",false)); toggletemp->setChecked(cs.readBoolEntry("load_last_on_start",false));
connect(toggletemp,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotLoadLast(bool))); connect(toggletemp,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotLoadLast(bool)));
} }
@ -361,12 +361,12 @@ void tdesvn::optionsConfigureToolbars()
{ {
#if defined(TDE_MAKE_VERSION) #if defined(TDE_MAKE_VERSION)
# if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0) # if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0)
saveMainWindowSettings(KGlobal::config(), autoSaveGroup()); saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup());
# else # else
saveMainWindowSettings(KGlobal::config() ); saveMainWindowSettings(TDEGlobal::config() );
# endif # endif
#else #else
saveMainWindowSettings(KGlobal::config() ); saveMainWindowSettings(TDEGlobal::config() );
#endif #endif
// use the standard toolbar editor // use the standard toolbar editor
@ -384,7 +384,7 @@ void tdesvn::applyNewToolbarConfig()
{ {
#if defined(TDE_MAKE_VERSION) #if defined(TDE_MAKE_VERSION)
# if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0) # if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0)
applyMainWindowSettings(KGlobal::config(), autoSaveGroup()); applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup());
# else # else
applyMainWindowSettings(tdesvnPart::config()); applyMainWindowSettings(tdesvnPart::config());
# endif # endif
@ -411,7 +411,7 @@ void tdesvn::optionsConfigureKeys()
bool tdesvn::queryExit() bool tdesvn::queryExit()
{ {
if (m_part) { if (m_part) {
KConfigGroup cs(KGlobal::config(),"startup"); KConfigGroup cs(TDEGlobal::config(),"startup");
#if KDE_IS_VERSION(3,1,3) #if KDE_IS_VERSION(3,1,3)
cs.writePathEntry("lastURL", m_part->url().prettyURL()); cs.writePathEntry("lastURL", m_part->url().prettyURL());
#else #else
@ -427,7 +427,7 @@ bool tdesvn::queryExit()
*/ */
void tdesvn::checkReload() void tdesvn::checkReload()
{ {
KConfigGroup cs(KGlobal::config(),"startup"); KConfigGroup cs(TDEGlobal::config(),"startup");
if (!cs.readBoolEntry("load_last_on_start",false)) if (!cs.readBoolEntry("load_last_on_start",false))
return; return;
@ -443,7 +443,7 @@ void tdesvn::checkReload()
*/ */
void tdesvn::slotLoadLast(bool how) void tdesvn::slotLoadLast(bool how)
{ {
KConfigGroup cs(KGlobal::config(),"startup"); KConfigGroup cs(TDEGlobal::config(),"startup");
cs.writeEntry("load_last_on_start",how); cs.writeEntry("load_last_on_start",how);
} }

4
src/tdesvn_part.cpp
Unescape View File

@ -76,7 +76,7 @@ tdesvnPart::tdesvnPart(TQWidget *parentWidget, const char *widgetName,
void tdesvnPart::init( TQWidget *parentWidget, const char *widgetName,bool full) void tdesvnPart::init( TQWidget *parentWidget, const char *widgetName,bool full)
{ {
m_aboutDlg = 0; m_aboutDlg = 0;
KGlobal::locale()->insertCatalogue("tdesvn"); TDEGlobal::locale()->insertCatalogue("tdesvn");
// we need an instance // we need an instance
setInstance( tdesvnPartFactory::instance() ); setInstance( tdesvnPartFactory::instance() );
m_browserExt = new KdesvnBrowserExtension( this ); m_browserExt = new KdesvnBrowserExtension( this );
@ -285,7 +285,7 @@ bool tdesvnPart::closeURL()
KdesvnBrowserExtension::KdesvnBrowserExtension( tdesvnPart *p ) KdesvnBrowserExtension::KdesvnBrowserExtension( tdesvnPart *p )
: KParts::BrowserExtension( p, "KdesvnBrowserExtension" ) : KParts::BrowserExtension( p, "KdesvnBrowserExtension" )
{ {
KGlobal::locale()->insertCatalogue("tdesvn"); TDEGlobal::locale()->insertCatalogue("tdesvn");
} }
KdesvnBrowserExtension::~KdesvnBrowserExtension() KdesvnBrowserExtension::~KdesvnBrowserExtension()

2
src/tdesvnd/tdesvnd_dcop.cpp
Unescape View File

@ -108,7 +108,7 @@ IListener::~IListener()
tdesvnd_dcop::tdesvnd_dcop(const TQCString&name) : KDEDModule(name) tdesvnd_dcop::tdesvnd_dcop(const TQCString&name) : KDEDModule(name)
{ {
KGlobal::locale()->insertCatalogue("tdesvn"); TDEGlobal::locale()->insertCatalogue("tdesvn");
m_Listener=new IListener(this); m_Listener=new IListener(this);
} }

4
src/urldlg.cpp
Unescape View File

@ -54,7 +54,7 @@ void UrlDlg::init_dlg()
KHistoryCombo * combo = new KHistoryCombo(0,"history_combo"); KHistoryCombo * combo = new KHistoryCombo(0,"history_combo");
combo->setDuplicatesEnabled(false); combo->setDuplicatesEnabled(false);
KConfig *kc = KGlobal::config(); KConfig *kc = TDEGlobal::config();
KConfigGroupSaver ks( kc, TQString::fromLatin1("Open-repository settings") ); KConfigGroupSaver ks( kc, TQString::fromLatin1("Open-repository settings") );
int max = kc->readNumEntry( TQString::fromLatin1("Maximum history"), 15 ); int max = kc->readNumEntry( TQString::fromLatin1("Maximum history"), 15 );
combo->setMaxCount( max ); combo->setMaxCount( max );
@ -87,7 +87,7 @@ void UrlDlg::accept()
KHistoryCombo *combo = static_cast<KHistoryCombo*>(urlRequester_->comboBox()); KHistoryCombo *combo = static_cast<KHistoryCombo*>(urlRequester_->comboBox());
if (combo) { if (combo) {
combo->addToHistory(urlRequester_->url()); combo->addToHistory(urlRequester_->url());
KConfig *kc = KGlobal::config(); KConfig *kc = TDEGlobal::config();
KConfigGroupSaver ks(kc, TQString::fromLatin1("Open-repository settings")); KConfigGroupSaver ks(kc, TQString::fromLatin1("Open-repository settings"));
kc->writeEntry(TQString::fromLatin1("History"), combo->historyItems()); kc->writeEntry(TQString::fromLatin1("History"), combo->historyItems());
kc->sync(); kc->sync();

Write Preview
Loading…
Cancel
Save