diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/commandline_part.cpp | 6 | ||||
-rw-r--r-- | src/helpers/ktranslateurl.cpp | 6 | ||||
-rw-r--r-- | src/helpers/sshagent.cpp | 38 | ||||
-rw-r--r-- | src/helpers/sshagent.h | 8 | ||||
-rw-r--r-- | src/helpers/sub2qt.cpp | 2 | ||||
-rw-r--r-- | src/kiosvn/kiosvn.cpp | 2 | ||||
-rw-r--r-- | src/ksvnwidgets/diffbrowser.cpp | 2 | ||||
-rw-r--r-- | src/ksvnwidgets/diffsyntax.cpp | 2 | ||||
-rw-r--r-- | src/ksvnwidgets/encodingselector_impl.cpp | 2 | ||||
-rw-r--r-- | src/svnfrontend/blamedisplay_impl.cpp | 12 | ||||
-rw-r--r-- | src/svnfrontend/editproperty_impl.cpp | 2 | ||||
-rw-r--r-- | src/svnfrontend/filelistviewitem.cpp | 2 | ||||
-rw-r--r-- | src/svnfrontend/fronthelpers/propertyitem.cpp | 2 | ||||
-rw-r--r-- | src/svnfrontend/graphtree/revgraphview.cpp | 14 | ||||
-rw-r--r-- | src/svnfrontend/graphtree/revgraphview.h | 8 | ||||
-rw-r--r-- | src/svnfrontend/svnactions.cpp | 60 | ||||
-rw-r--r-- | src/svnfrontend/svnactions.h | 8 | ||||
-rw-r--r-- | src/svnfrontend/svnfiletip.cpp | 2 | ||||
-rw-r--r-- | src/svnfrontend/tdesvnfilelist.cpp | 2 | ||||
-rw-r--r-- | src/tdesvn.cpp | 20 | ||||
-rw-r--r-- | src/tdesvn_part.cpp | 4 | ||||
-rw-r--r-- | src/tdesvnd/tdesvnd_dcop.cpp | 2 | ||||
-rw-r--r-- | src/urldlg.cpp | 4 |
23 files changed, 105 insertions, 105 deletions
diff --git a/src/commandline_part.cpp b/src/commandline_part.cpp index 27d7178..52ca370 100644 --- a/src/commandline_part.cpp +++ b/src/commandline_part.cpp @@ -26,10 +26,10 @@ commandline_part::commandline_part(TQObject *parent, const char *name,TDECmdLineArgs *args) : TQObject(parent, name) { - KGlobal::locale()->insertCatalogue("tdesvn"); + TDEGlobal::locale()->insertCatalogue("tdesvn"); TDEInstance * inst = tdesvnPartFactory::instance(); - KGlobal::locale()->insertCatalogue(inst->instanceName()); - KGlobal::dirs()->addResourceType( inst->instanceName() + "data", + TDEGlobal::locale()->insertCatalogue(inst->instanceName()); + TDEGlobal::dirs()->addResourceType( inst->instanceName() + "data", KStandardDirs::kde_default("data")+ TQString::fromLatin1( inst->instanceName() ) + '/' ); diff --git a/src/helpers/ktranslateurl.cpp b/src/helpers/ktranslateurl.cpp index 004eeb2..b4d776f 100644 --- a/src/helpers/ktranslateurl.cpp +++ b/src/helpers/ktranslateurl.cpp @@ -48,9 +48,9 @@ KURL KTranslateUrl::translateSystemUrl(const KURL&_url) if (proto!="system") { return _url; } - KGlobal::dirs()->addResourceType("system_entries", + TDEGlobal::dirs()->addResourceType("system_entries", KStandardDirs::kde_default("data") + "systemview"); - TQStringList dirList = KGlobal::dirs()->resourceDirs("system_entries"); + TQStringList dirList = TDEGlobal::dirs()->resourceDirs("system_entries"); if (!parseURL(_url,name,path)) { return _url; } @@ -83,7 +83,7 @@ bool KTranslateUrl::parseURL(const KURL&url,TQString&name,TQString&path) 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 end = dirList.end(); diff --git a/src/helpers/sshagent.cpp b/src/helpers/sshagent.cpp index a83024f..4d36214 100644 --- a/src/helpers/sshagent.cpp +++ b/src/helpers/sshagent.cpp @@ -112,7 +112,7 @@ bool SshAgent::addSshIdentities(bool force) } // add identities to ssh-agent - KProcess proc; + TDEProcess proc; proc.setEnvironment("SSH_AGENT_PID", m_pid); proc.setEnvironment("SSH_AUTH_SOCK", m_authSock); @@ -134,12 +134,12 @@ bool SshAgent::addSshIdentities(bool force) 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? @@ -155,15 +155,15 @@ 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); } -void SshAgent::slotProcessExited(KProcess*) +void SshAgent::slotProcessExited(TDEProcess*) { TQRegExp cshPidRx("setenv SSH_AGENT_PID (\\d*);"); 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); @@ -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); @@ -234,18 +234,18 @@ void SshAgent::slotReceivedStderr(KProcess* proc, char* buffer, int buflen) bool SshAgent::startSshAgent() { - KProcess proc; + TDEProcess proc; proc << "ssh-agent"; - connect(&proc, TQT_SIGNAL(processExited(KProcess*)), - TQT_SLOT(slotProcessExited(KProcess*))); - connect(&proc, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), - TQT_SLOT(slotReceivedStdout(KProcess*, char*, int))); - connect(&proc, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), - TQT_SLOT(slotReceivedStderr(KProcess*, char*, int)) ); + connect(&proc, TQT_SIGNAL(processExited(TDEProcess*)), + TQT_SLOT(slotProcessExited(TDEProcess*))); + connect(&proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); + connect(&proc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int)) ); - proc.start(KProcess::NotifyOnExit, KProcess::All); + proc.start(TDEProcess::NotifyOnExit, TDEProcess::All); // wait for process to finish // TODO CL use timeout? diff --git a/src/helpers/sshagent.h b/src/helpers/sshagent.h index ad6a5d9..cc78cae 100644 --- a/src/helpers/sshagent.h +++ b/src/helpers/sshagent.h @@ -25,7 +25,7 @@ #include <tqstring.h> #include <tqstringlist.h> -class KProcess; +class TDEProcess; class SshAgent : public TQObject @@ -46,9 +46,9 @@ public: TQString authSock() const { return m_authSock; } private slots: - void slotProcessExited(KProcess*); - void slotReceivedStdout(KProcess* proc, char* buffer, int buflen); - void slotReceivedStderr(KProcess* proc, char* buffer, int buflen); + void slotProcessExited(TDEProcess*); + void slotReceivedStdout(TDEProcess* proc, char* buffer, int buflen); + void slotReceivedStderr(TDEProcess* proc, char* buffer, int buflen); private: bool startSshAgent(); diff --git a/src/helpers/sub2qt.cpp b/src/helpers/sub2qt.cpp index abe699c..cc18b4e 100644 --- a/src/helpers/sub2qt.cpp +++ b/src/helpers/sub2qt.cpp @@ -42,7 +42,7 @@ TQString sub2qt::apr_time2qtString(apr_time_t _time) TQString sub2qt::DateTime2qtString(const svn::DateTime&_time) { - return KGlobal::locale()->formatDateTime(_time); + return TDEGlobal::locale()->formatDateTime(_time); } }; diff --git a/src/kiosvn/kiosvn.cpp b/src/kiosvn/kiosvn.cpp index df38d3b..45c2c0d 100644 --- a/src/kiosvn/kiosvn.cpp +++ b/src/kiosvn/kiosvn.cpp @@ -142,7 +142,7 @@ kio_svnProtocol::kio_svnProtocol(const TQCString &pool_socket, const TQCString & : SlaveBase("kio_ksvn", pool_socket, app_socket),StreamWrittenCb() { m_pData=new KioSvnData(this); - KGlobal::locale()->insertCatalogue("tdesvn"); + TDEGlobal::locale()->insertCatalogue("tdesvn"); } kio_svnProtocol::~kio_svnProtocol() diff --git a/src/ksvnwidgets/diffbrowser.cpp b/src/ksvnwidgets/diffbrowser.cpp index 5e71787..0c6c9a5 100644 --- a/src/ksvnwidgets/diffbrowser.cpp +++ b/src/ksvnwidgets/diffbrowser.cpp @@ -42,7 +42,7 @@ DiffBrowser::DiffBrowser(TQWidget*parent,const char*name) : KTextBrowser( parent, name) { setTextFormat(TQt::PlainText); - setFont(KGlobalSettings::fixedFont()); + setFont(TDEGlobalSettings::fixedFont()); m_Data = new DiffBrowserData; setWordWrap(TQTextEdit::NoWrap); diff --git a/src/ksvnwidgets/diffsyntax.cpp b/src/ksvnwidgets/diffsyntax.cpp index 77d2381..60a95de 100644 --- a/src/ksvnwidgets/diffsyntax.cpp +++ b/src/ksvnwidgets/diffsyntax.cpp @@ -42,7 +42,7 @@ int DiffSyntax::highlightParagraph ( const TQString & aText, int endStateOfLastP static TQRegExp a("^\\w+:\\s.*$"); static TQRegExp b("^\\W+$"); TQColor c(0,0,0); - TQFont f(KGlobalSettings::fixedFont()); + TQFont f(TDEGlobalSettings::fixedFont()); int ret = 0; if (endStateOfLastPara == 1) { ret = 2; diff --git a/src/ksvnwidgets/encodingselector_impl.cpp b/src/ksvnwidgets/encodingselector_impl.cpp index 3017581..265b1eb 100644 --- a/src/ksvnwidgets/encodingselector_impl.cpp +++ b/src/ksvnwidgets/encodingselector_impl.cpp @@ -27,7 +27,7 @@ EncodingSelector_impl::EncodingSelector_impl(const TQString&cur,TQWidget *parent, const char *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 ) { if(m_encodingList->text(j)==cur) { diff --git a/src/svnfrontend/blamedisplay_impl.cpp b/src/svnfrontend/blamedisplay_impl.cpp index 873d9c1..6eccfa0 100644 --- a/src/svnfrontend/blamedisplay_impl.cpp +++ b/src/svnfrontend/blamedisplay_impl.cpp @@ -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 { 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; } @@ -156,7 +156,7 @@ void BlameDisplayItem::display() setText(COL_REV,TQString("%1").arg(m_Content.revision())); setText(COL_AUT,m_Content.tAuthor()); 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 */ const TQString & str = text(column);; if (column == COL_LINE) { - p->setFont(KGlobalSettings::fixedFont()); + p->setFont(TDEGlobalSettings::fixedFont()); } TQColorGroup _cg = cg; TQColor _bgColor; if (column==COL_LINENR || isSelected()) { - _bgColor = KGlobalSettings::highlightColor(); - p->setPen(KGlobalSettings::highlightedTextColor()); + _bgColor = TDEGlobalSettings::highlightColor(); + p->setPen(TDEGlobalSettings::highlightedTextColor()); } else { if (Kdesvnsettings::self()->colored_blame()) { _bgColor = cb->rev2color(m_Content.revision()); @@ -415,7 +415,7 @@ void BlameDisplay_impl::showCommit(BlameDisplayItem*bit) KDialogBase::Close); TQWidget* Dialog1Layout = dlg->makeVBoxMainWidget(); KTextBrowser*ptr = new KTextBrowser(Dialog1Layout); - ptr->setFont(KGlobalSettings::fixedFont()); + ptr->setFont(TDEGlobalSettings::fixedFont()); ptr->setWordWrap(TQTextEdit::NoWrap); ptr->setText(text); dlg->resize(dlg->configDialogSize(*(Kdesvnsettings::self()->config()),"simplelog_display")); diff --git a/src/svnfrontend/editproperty_impl.cpp b/src/svnfrontend/editproperty_impl.cpp index 9c5ffba..dad19a8 100644 --- a/src/svnfrontend/editproperty_impl.cpp +++ b/src/svnfrontend/editproperty_impl.cpp @@ -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."); m_NameEdit->setAutoCompletion(true); - m_NameEdit->setCompletionMode(KGlobalSettings::CompletionPopupAuto); + m_NameEdit->setCompletionMode(TDEGlobalSettings::CompletionPopupAuto); m_NameEdit->setDuplicatesEnabled(false); m_NameEdit->setHistoryItems(fileProperties, true); isDir = false; diff --git a/src/svnfrontend/filelistviewitem.cpp b/src/svnfrontend/filelistviewitem.cpp index 812ee69..ba13f27 100644 --- a/src/svnfrontend/filelistviewitem.cpp +++ b/src/svnfrontend/filelistviewitem.cpp @@ -191,7 +191,7 @@ void FileListViewItem::update() } setText(COL_STATUS,infoText()); 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_IS_LOCKED,lockOwner()); } diff --git a/src/svnfrontend/fronthelpers/propertyitem.cpp b/src/svnfrontend/fronthelpers/propertyitem.cpp index 3539fd7..adf16d0 100644 --- a/src/svnfrontend/fronthelpers/propertyitem.cpp +++ b/src/svnfrontend/fronthelpers/propertyitem.cpp @@ -40,7 +40,7 @@ bool PropertyListViewItem::different()const void PropertyListViewItem::deleteIt() { m_deleted = true; - setPixmap(0,KGlobal::iconLoader()->loadIcon("cancel",KIcon::Desktop,16)); + setPixmap(0,TDEGlobal::iconLoader()->loadIcon("cancel",KIcon::Desktop,16)); } void PropertyListViewItem::unDeleteIt() diff --git a/src/svnfrontend/graphtree/revgraphview.cpp b/src/svnfrontend/graphtree/revgraphview.cpp index 494c73a..fec18ba 100644 --- a/src/svnfrontend/graphtree/revgraphview.cpp +++ b/src/svnfrontend/graphtree/revgraphview.cpp @@ -162,12 +162,12 @@ void RevGraphView::endInsert() viewport()->setUpdatesEnabled(true); } -void RevGraphView::readDotOutput(KProcess*,char * buffer,int buflen) +void RevGraphView::readDotOutput(TDEProcess*,char * buffer,int buflen) { dotOutput+=TQString::fromLocal8Bit(buffer, buflen); } -void RevGraphView::dotExit(KProcess*p) +void RevGraphView::dotExit(TDEProcess*p) { if (p!=renderProcess)return; // remove line breaks when lines to long @@ -491,14 +491,14 @@ void RevGraphView::dumpRevtree() } } *stream << "}\n"<<flush; - renderProcess = new KProcess(); + renderProcess = new TDEProcess(); renderProcess->setEnvironment("LANG","C"); *renderProcess << "dot"; *renderProcess << dotTmpFile->name() << "-Tplain"; - connect(renderProcess,TQT_SIGNAL(processExited(KProcess*)),this,TQT_SLOT(dotExit(KProcess*))); - connect(renderProcess,TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), - this,TQT_SLOT(readDotOutput(KProcess*,char*,int)) ); - if (!renderProcess->start(KProcess::NotifyOnExit,KProcess::Stdout)) { + connect(renderProcess,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(dotExit(TDEProcess*))); + connect(renderProcess,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + this,TQT_SLOT(readDotOutput(TDEProcess*,char*,int)) ); + if (!renderProcess->start(TDEProcess::NotifyOnExit,TDEProcess::Stdout)) { TQString arguments; for (unsigned c=0;c<renderProcess->args().count();++c) { arguments+=TQString(" %1").arg(renderProcess->args()[c].data()); diff --git a/src/svnfrontend/graphtree/revgraphview.h b/src/svnfrontend/graphtree/revgraphview.h index f0b39c7..d8d1972 100644 --- a/src/svnfrontend/graphtree/revgraphview.h +++ b/src/svnfrontend/graphtree/revgraphview.h @@ -30,7 +30,7 @@ namespace svn { } class KTempFile; -class KProcess; +class TDEProcess; class RevisionTree; class GraphTreeLabel; class GraphViewTip; @@ -98,8 +98,8 @@ public slots: virtual void slotClientException(const TQString&what); protected slots: - virtual void readDotOutput(KProcess * proc,char * buffer,int buflen); - virtual void dotExit(KProcess*); + virtual void readDotOutput(TDEProcess * proc,char * buffer,int buflen); + virtual void dotExit(TDEProcess*); protected: TQCanvas*m_Canvas; @@ -109,7 +109,7 @@ protected: TQObject*m_Listener; KTempFile*dotTmpFile; TQString dotOutput; - KProcess*renderProcess; + TDEProcess*renderProcess; trevTree m_Tree; TQColor getBgColor(const TQString&nodeName)const; bool isStart(const TQString&nodeName)const; diff --git a/src/svnfrontend/svnactions.cpp b/src/svnfrontend/svnactions.cpp index 729a8b9..dcc754d 100644 --- a/src/svnfrontend/svnactions.cpp +++ b/src/svnfrontend/svnactions.cpp @@ -116,7 +116,7 @@ public: delete m_LogDialog; } - TQMap<KProcess*,TQStringList>::iterator it; + TQMap<TDEProcess*,TQStringList>::iterator it; for (it=m_tempfilelist.begin();it!=m_tempfilelist.end();++it) { for (TQStringList::iterator it2 = (*it).begin(); it2 != (*it).end();++it2) { @@ -180,8 +180,8 @@ public: /// \todo as persistent cache (sqlite?) helpers::itemCache<svn::InfoEntry> m_InfoCache; - TQMap<KProcess*,TQStringList> m_tempfilelist; - TQMap<KProcess*,TQStringList> m_tempdirlist; + TQMap<TDEProcess*,TQStringList> m_tempfilelist; + TQMap<TDEProcess*,TQStringList> m_tempdirlist; TQTimer m_ThreadCheckTimer; TQTimer m_UpdateCheckTimer; @@ -601,7 +601,7 @@ void SvnActions::slotMakeCat(const svn::Revision&start, const TQString&what, con if (co.size()) { KDialogBase*dlg = createDialog(&ptr,TQString(i18n("Content of %1")).arg(disp),false,"cat_display_dlg"); if (dlg) { - ptr->setFont(KGlobalSettings::fixedFont()); + ptr->setFont(TDEGlobalSettings::fixedFont()); ptr->setWordWrap(TQTextEdit::NoWrap); ptr->setText(TQString::FROMUTF8(co,co.size())); 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; - kdDebug()<<"void SvnActions::wroteStdin(KProcess*proc)"<<endl; + kdDebug()<<"void SvnActions::wroteStdin(TDEProcess*proc)"<<endl; 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) { return; @@ -1054,10 +1054,10 @@ void SvnActions::receivedStderr(KProcess*proc,char*buff,int len) emit sendNotify(msg); } -void SvnActions::procClosed(KProcess*proc) +void SvnActions::procClosed(TDEProcess*proc) { 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()) { for (TQStringList::iterator it2 = (*it).begin(); 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) { if (*it=="%1") { *proc<<first; @@ -1193,10 +1193,10 @@ void SvnActions::makeDiffExternal(const TQString&p1,const svn::Revision&start,co *proc << *it; } } - connect(proc,TQT_SIGNAL(processExited(KProcess*)),this,TQT_SLOT(procClosed(KProcess*))); - connect(proc,TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),this,TQT_SLOT(receivedStderr(KProcess*,char*,int))); - connect(proc,TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),this,TQT_SLOT(receivedStderr(KProcess*,char*,int))); - if (proc->start(m_Data->runblocked?KProcess::Block:KProcess::NotifyOnExit,KProcess::All)) { + connect(proc,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(procClosed(TDEProcess*))); + connect(proc,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),this,TQT_SLOT(receivedStderr(TDEProcess*,char*,int))); + connect(proc,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),this,TQT_SLOT(receivedStderr(TDEProcess*,char*,int))); + if (proc->start(m_Data->runblocked?TDEProcess::Block:TDEProcess::NotifyOnExit,TDEProcess::All)) { if (!m_Data->runblocked) { if (!isDir) { 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) { 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)) { TQStringList wlist = TQStringList::split(" ",what); - KProcess*proc = new KProcess(); + TDEProcess*proc = new TDEProcess(); bool fname_used = false; KTempFile tfile; 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(receivedStderr(KProcess*,char*,int)),this,TQT_SLOT(receivedStderr(KProcess*,char*,int))); + connect(proc,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(procClosed(TDEProcess*))); + connect(proc,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),this,TQT_SLOT(receivedStderr(TDEProcess*,char*,int))); 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()); else m_Data->m_tempfilelist[proc].append(tfile.name()); return; @@ -1924,7 +1924,7 @@ void SvnActions::slotResolve(const TQString&p) return; } - KProcess*proc = new KProcess(); + TDEProcess*proc = new TDEProcess(); for ( TQStringList::Iterator it = wlist.begin();it!=wlist.end();++it) { if (*it=="%o"||*it=="%l") { *proc<<(base+"/"+i1.conflictOld()); @@ -1938,10 +1938,10 @@ void SvnActions::slotResolve(const TQString&p) *proc << *it; } } - connect(proc,TQT_SIGNAL(processExited(KProcess*)),this,TQT_SLOT(procClosed(KProcess*))); - connect(proc,TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),this,TQT_SLOT(receivedStderr(KProcess*,char*,int))); - connect(proc,TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),this,TQT_SLOT(receivedStderr(KProcess*,char*,int))); - if (proc->start(m_Data->runblocked?KProcess::Block:KProcess::NotifyOnExit,KProcess::All)) { + connect(proc,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(procClosed(TDEProcess*))); + connect(proc,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),this,TQT_SLOT(receivedStderr(TDEProcess*,char*,int))); + connect(proc,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),this,TQT_SLOT(receivedStderr(TDEProcess*,char*,int))); + if (proc->start(m_Data->runblocked?TDEProcess::Block:TDEProcess::NotifyOnExit,TDEProcess::All)) { return; } else { 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(); TQStringList wlist = TQStringList::split(" ",edisp); - KProcess*proc = new KProcess(); + TDEProcess*proc = new TDEProcess(); for ( TQStringList::Iterator it = wlist.begin();it!=wlist.end();++it) { if (*it=="%s1") { *proc<<first; @@ -2088,9 +2088,9 @@ void SvnActions::slotMergeExternal(const TQString&_src1,const TQString&_src2, co *proc << *it; } } - connect(proc,TQT_SIGNAL(processExited(KProcess*)),this,TQT_SLOT(procClosed(KProcess*))); - connect(proc,TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),this,TQT_SLOT(receivedStderr(KProcess*,char*,int))); - if (proc->start(m_Data->runblocked?KProcess::Block:KProcess::NotifyOnExit,KProcess::Stderr)) { + connect(proc,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(procClosed(TDEProcess*))); + connect(proc,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),this,TQT_SLOT(receivedStderr(TDEProcess*,char*,int))); + if (proc->start(m_Data->runblocked?TDEProcess::Block:TDEProcess::NotifyOnExit,TDEProcess::Stderr)) { if (!m_Data->runblocked) { tdir1.setAutoDelete(false); m_Data->m_tempdirlist[proc].append(tdir1.name()); diff --git a/src/svnfrontend/svnactions.h b/src/svnfrontend/svnactions.h index ded8477..e208181 100644 --- a/src/svnfrontend/svnactions.h +++ b/src/svnfrontend/svnactions.h @@ -41,7 +41,7 @@ class KDialog; class KDialogBase; class TQDialog; class CContextListener; -class KProcess; +class TDEProcess; class SvnActionsData; class CheckModifiedThread; class CheckUpdatesThread; @@ -245,11 +245,11 @@ signals: void sigCacheStatus(TQ_LONG,TQ_LONG); protected slots: - virtual void wroteStdin(KProcess*); - virtual void procClosed(KProcess*); + virtual void wroteStdin(TDEProcess*); + virtual void procClosed(TDEProcess*); virtual void checkModthread(); virtual void checkUpdateThread(); - virtual void receivedStderr(KProcess*,char*,int); + virtual void receivedStderr(TDEProcess*,char*,int); }; #endif diff --git a/src/svnfrontend/svnfiletip.cpp b/src/svnfrontend/svnfiletip.cpp index 7f4c857..283e084 100644 --- a/src/svnfrontend/svnfiletip.cpp +++ b/src/svnfrontend/svnfiletip.cpp @@ -137,7 +137,7 @@ void SvnFileTip::reposition() // 4+: none m_corner = 0; // 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()) { // to the left diff --git a/src/svnfrontend/tdesvnfilelist.cpp b/src/svnfrontend/tdesvnfilelist.cpp index 46ab4b8..496d958 100644 --- a/src/svnfrontend/tdesvnfilelist.cpp +++ b/src/svnfrontend/tdesvnfilelist.cpp @@ -2686,7 +2686,7 @@ void tdesvnfilelist::contentsMouseMoveEvent( TQMouseEvent *e ) vp.setY( itemRect( item ).y() ); 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->setPreview(KGlobalSettings::showFilePreview(item->fullName())/*&&isWorkingCopy()*/ + m_pList->m_fileTip->setPreview(TDEGlobalSettings::showFilePreview(item->fullName())/*&&isWorkingCopy()*/ &&Kdesvnsettings::display_previews_in_file_tips()); setShowToolTips(false); } else { diff --git a/src/tdesvn.cpp b/src/tdesvn.cpp index 565684e..543755b 100644 --- a/src/tdesvn.cpp +++ b/src/tdesvn.cpp @@ -212,7 +212,7 @@ void tdesvn::load(const KURL& url,bool addRescent) } } if (rac) { - rac->saveEntries(KGlobal::config(),"recent_files"); + rac->saveEntries(TDEGlobal::config(),"recent_files"); } } } @@ -230,7 +230,7 @@ void tdesvn::setupActions() if (rac) { rac->setMaxItems(8); - rac->loadEntries(KGlobal::config(),"recent_files"); + rac->loadEntries(TDEGlobal::config(),"recent_files"); rac->setText(i18n("Recent opened URLs")); } @@ -243,7 +243,7 @@ void tdesvn::setupActions() toggletemp = new KToggleAction(i18n("Load last opened URL on start"),KShortcut(), actionCollection(),"toggle_load_last_url"); 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)); connect(toggletemp,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotLoadLast(bool))); } @@ -361,12 +361,12 @@ void tdesvn::optionsConfigureToolbars() { #if defined(TDE_MAKE_VERSION) # if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0) - saveMainWindowSettings(KGlobal::config(), autoSaveGroup()); + saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); # else - saveMainWindowSettings(KGlobal::config() ); + saveMainWindowSettings(TDEGlobal::config() ); # endif #else - saveMainWindowSettings(KGlobal::config() ); + saveMainWindowSettings(TDEGlobal::config() ); #endif // use the standard toolbar editor @@ -384,7 +384,7 @@ void tdesvn::applyNewToolbarConfig() { #if defined(TDE_MAKE_VERSION) # if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0) - applyMainWindowSettings(KGlobal::config(), autoSaveGroup()); + applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); # else applyMainWindowSettings(tdesvnPart::config()); # endif @@ -411,7 +411,7 @@ void tdesvn::optionsConfigureKeys() bool tdesvn::queryExit() { if (m_part) { - KConfigGroup cs(KGlobal::config(),"startup"); + KConfigGroup cs(TDEGlobal::config(),"startup"); #if KDE_IS_VERSION(3,1,3) cs.writePathEntry("lastURL", m_part->url().prettyURL()); #else @@ -427,7 +427,7 @@ bool tdesvn::queryExit() */ void tdesvn::checkReload() { - KConfigGroup cs(KGlobal::config(),"startup"); + KConfigGroup cs(TDEGlobal::config(),"startup"); if (!cs.readBoolEntry("load_last_on_start",false)) return; @@ -443,7 +443,7 @@ void tdesvn::checkReload() */ void tdesvn::slotLoadLast(bool how) { - KConfigGroup cs(KGlobal::config(),"startup"); + KConfigGroup cs(TDEGlobal::config(),"startup"); cs.writeEntry("load_last_on_start",how); } diff --git a/src/tdesvn_part.cpp b/src/tdesvn_part.cpp index 2a66471..c171b7d 100644 --- a/src/tdesvn_part.cpp +++ b/src/tdesvn_part.cpp @@ -76,7 +76,7 @@ tdesvnPart::tdesvnPart(TQWidget *parentWidget, const char *widgetName, void tdesvnPart::init( TQWidget *parentWidget, const char *widgetName,bool full) { m_aboutDlg = 0; - KGlobal::locale()->insertCatalogue("tdesvn"); + TDEGlobal::locale()->insertCatalogue("tdesvn"); // we need an instance setInstance( tdesvnPartFactory::instance() ); m_browserExt = new KdesvnBrowserExtension( this ); @@ -285,7 +285,7 @@ bool tdesvnPart::closeURL() KdesvnBrowserExtension::KdesvnBrowserExtension( tdesvnPart *p ) : KParts::BrowserExtension( p, "KdesvnBrowserExtension" ) { - KGlobal::locale()->insertCatalogue("tdesvn"); + TDEGlobal::locale()->insertCatalogue("tdesvn"); } KdesvnBrowserExtension::~KdesvnBrowserExtension() diff --git a/src/tdesvnd/tdesvnd_dcop.cpp b/src/tdesvnd/tdesvnd_dcop.cpp index fde8fd0..9b4d598 100644 --- a/src/tdesvnd/tdesvnd_dcop.cpp +++ b/src/tdesvnd/tdesvnd_dcop.cpp @@ -108,7 +108,7 @@ IListener::~IListener() tdesvnd_dcop::tdesvnd_dcop(const TQCString&name) : KDEDModule(name) { - KGlobal::locale()->insertCatalogue("tdesvn"); + TDEGlobal::locale()->insertCatalogue("tdesvn"); m_Listener=new IListener(this); } diff --git a/src/urldlg.cpp b/src/urldlg.cpp index a58cf5d..a88eaef 100644 --- a/src/urldlg.cpp +++ b/src/urldlg.cpp @@ -54,7 +54,7 @@ void UrlDlg::init_dlg() KHistoryCombo * combo = new KHistoryCombo(0,"history_combo"); combo->setDuplicatesEnabled(false); - KConfig *kc = KGlobal::config(); + KConfig *kc = TDEGlobal::config(); KConfigGroupSaver ks( kc, TQString::fromLatin1("Open-repository settings") ); int max = kc->readNumEntry( TQString::fromLatin1("Maximum history"), 15 ); combo->setMaxCount( max ); @@ -87,7 +87,7 @@ void UrlDlg::accept() KHistoryCombo *combo = static_cast<KHistoryCombo*>(urlRequester_->comboBox()); if (combo) { combo->addToHistory(urlRequester_->url()); - KConfig *kc = KGlobal::config(); + KConfig *kc = TDEGlobal::config(); KConfigGroupSaver ks(kc, TQString::fromLatin1("Open-repository settings")); kc->writeEntry(TQString::fromLatin1("History"), combo->historyItems()); kc->sync(); |