From 07a23b0645f0dd3d0a9ded1742cd1e6e202002fd Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:14:23 -0600 Subject: [PATCH] Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- ChangeLog | 4 +- Helperstuff/BuildService/tdesvn.spec.in | 2 +- doc/en/index.docbook | 12 ++--- doc/nl/index.docbook | 12 ++--- src/README | 2 +- src/helpers/ktranslateurl.cpp | 2 +- src/kiosvn/kiobytestream.h | 6 +-- src/kiosvn/kiolistener.cpp | 6 +-- src/kiosvn/kiolistener.h | 6 +-- src/kiosvn/kiosvn.cpp | 70 ++++++++++++------------- src/kiosvn/kiosvn.h | 8 +-- src/ksvnwidgets/logmsg_impl.cpp | 10 ++-- src/settings/tdesvn_part.kcfg | 2 +- src/svnfrontend/graphtree/drawparams.h | 2 +- src/svnfrontend/svnactions.cpp | 4 +- src/svnfrontend/svnactions.h | 2 +- src/svnfrontend/svnfiletip.cpp | 4 +- src/svnfrontend/svnfiletip.h | 2 +- src/svnfrontend/svnlogdlgimp.cpp | 8 +-- src/svnfrontend/tdesvnfilelist.cpp | 22 ++++---- src/svnfrontend/tdesvnfilelist.h | 6 +-- src/tdesvn.cpp | 12 ++--- src/tdesvn.h | 6 +-- src/tdesvn_part.cpp | 4 +- src/tdesvnview.cpp | 4 +- src/urldlg.cpp | 8 +-- tdesvn.spec | 2 +- tdesvn.spec.in | 2 +- 28 files changed, 115 insertions(+), 115 deletions(-) diff --git a/ChangeLog b/ChangeLog index 05d6c7a..07bfed0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -83,7 +83,7 @@ version 0.12.0 * fix: let user select if them want to checkout/export external declarations, too. version 0.11.2 - * missing KIO::special functions implemented (update/add/del) + * missing TDEIO::special functions implemented (update/add/del) * fix: since subversion 1.4 tdesvn made an error when making simple diff on commandline ("tdesvn exec diff ") * fix: tdevelop always gives a file:/// uri for locals, kio_ksvn has to check if this is a working copy uri and transform it to uri without protocoll if yes. @@ -217,7 +217,7 @@ version 0.7.1 * more help written * context menus may setup depending on kde version tdesvn is compiled against * KIO now full working - * KIO::special started for integration into other software + * TDEIO::special started for integration into other software * will only compile against subversion 1.2 or newer - subversion 1.1 makes no sense anymore * fix: check for compiler with -fvisibility flag diff --git a/Helperstuff/BuildService/tdesvn.spec.in b/Helperstuff/BuildService/tdesvn.spec.in index 3b90f62..55405f6 100644 --- a/Helperstuff/BuildService/tdesvn.spec.in +++ b/Helperstuff/BuildService/tdesvn.spec.in @@ -54,7 +54,7 @@ Group: Development/Tools Summary: A kde-kio integration for subversion based on tdesvn %description kiosvn -KIO integration (KIO::svn) based on tdesvn alternative protocol name. +KIO integration (TDEIO::svn) based on tdesvn alternative protocol name. %package devel Group: Development/Libraries diff --git a/doc/en/index.docbook b/doc/en/index.docbook index 43a3fab..e33077d 100644 --- a/doc/en/index.docbook +++ b/doc/en/index.docbook @@ -375,7 +375,7 @@ Deleting items is always recursive. Eg., when you delete a folder all subitems w Working on repositories -Simple repository browsing may done within &konqi; &krus; or similar filebrowsers: Open a URL with protocol described in (the variants starting with "k") and them will display the content. So simple operations like copy, move and delete may work. When appending a query "?rev=<xxx>" the listing comes from a specific revision. Format of revision-query is described in , some more information about KIO::ksvn are in +Simple repository browsing may done within &konqi; &krus; or similar filebrowsers: Open a URL with protocol described in (the variants starting with "k") and them will display the content. So simple operations like copy, move and delete may work. When appending a query "?rev=<xxx>" the listing comes from a specific revision. Format of revision-query is described in , some more information about TDEIO::ksvn are in All work except "Copy" may only done when browsing at revision HEAD. @@ -831,7 +831,7 @@ Every &kde; based application may use these protocols. So it would be possible t -Retrieving differences between revions using KDiff3 and KIO::ksvn +Retrieving differences between revions using KDiff3 and TDEIO::ksvn kdiff3 \ ksvn://anonsvn.kde.org/home/kde/trunk/KDE/arts?rev=423127 \ @@ -845,17 +845,17 @@ Let kdiff3 print all differences between two revisions. Note! Using this within -Programmers information about KIO::ksvn +Programmers information about TDEIO::ksvn You may skip this if not interested in KIO programming. -KIO::ksvn::special knows the following operations, these are made almost equal in call to the current existing in KIO from tdesdk -so, for instance, tdevelop may use it if tdesdk isn't installed but uses tdesvn::KIO::svn. +TDEIO::ksvn::special knows the following operations, these are made almost equal in call to the current existing in KIO from tdesdk +so, for instance, tdevelop may use it if tdesdk isn't installed but uses tdesvn::TDEIO::svn. Commandlist -Command overview for KIO::ksvn::special +Command overview for TDEIO::ksvn::special diff --git a/doc/nl/index.docbook b/doc/nl/index.docbook index 96644d2..128ea66 100644 --- a/doc/nl/index.docbook +++ b/doc/nl/index.docbook @@ -371,7 +371,7 @@ Items verwijderen is altijd recursief. B.V.,wanneer een map verwijderd wordt, da Werken met repositories -Eenvoudig bladeren door de repository kan gedaan worden met &konqi; &krus; of vergelijkbare bestandsbeheerders: Open een URL met een protocool zoals beschreven in (Alle varianten die starten met "k") en zij zullen de inhoud tonen. Hierdoor kunnen eenvoudige opdrachten zoals kopieren, verplaatsen en verwijderen uitgevoerd worden. Wanneer het volgende filter "?rev=<xxx>" wordt ingesteld, zijn alleen de gegevens van een specifiek revisie te zien. De syntax van een revisie-filter wordt beschreven in , lees meer over KIO::ksvn in +Eenvoudig bladeren door de repository kan gedaan worden met &konqi; &krus; of vergelijkbare bestandsbeheerders: Open een URL met een protocool zoals beschreven in (Alle varianten die starten met "k") en zij zullen de inhoud tonen. Hierdoor kunnen eenvoudige opdrachten zoals kopieren, verplaatsen en verwijderen uitgevoerd worden. Wanneer het volgende filter "?rev=<xxx>" wordt ingesteld, zijn alleen de gegevens van een specifiek revisie te zien. De syntax van een revisie-filter wordt beschreven in , lees meer over TDEIO::ksvn in Alle opdrachten behalve "Kopieren" kunnen alleen uitgevoerd worden in de revisie HEAD. @@ -741,7 +741,7 @@ Elke op &kde; gebaseerde programma kan deze protocools gebruiken. Het is daarom -Het verschil verkrijgen tussen twee revisies door gebruik van kDiff3 en KIO::ksvn +Het verschil verkrijgen tussen twee revisies door gebruik van kDiff3 en TDEIO::ksvn kdiff3 \ ksvn://anonsvn.kde.org/home/kde/trunk/KDE/arts?rev=423127 \ @@ -755,17 +755,17 @@ Laat kdiff3 alle verschillen tussen twee revisie's tonen. Letop! Gebruik hiervan -Informatie over KIO::ksvn voor programmeurs +Informatie over TDEIO::ksvn voor programmeurs U kunt dit gedeelte overslaan indien U niet geïnterreseerd bent in KIO-programmeren. -KIO::ksvn::special kent de volgende opdrachten, ze zijn in aanroep bijna gelijk gemaakt aan de huidige bestaande in KIO van kdesk -dus, bijvoorbeeld, tdevelop kan het gebruiken als kdesk niet is geïnstalleerd in de vorm van tdesvn::KIO::svn. +TDEIO::ksvn::special kent de volgende opdrachten, ze zijn in aanroep bijna gelijk gemaakt aan de huidige bestaande in KIO van kdesk +dus, bijvoorbeeld, tdevelop kan het gebruiken als kdesk niet is geïnstalleerd in de vorm van tdesvn::TDEIO::svn. Overzicht met commando's
-Commando overzicht voor KIO::ksvn::special +Commando overzicht voor TDEIO::ksvn::special diff --git a/src/README b/src/README index 318bd72..69e9ac5 100644 --- a/src/README +++ b/src/README @@ -42,7 +42,7 @@ For more details, consult : http://devel-home.kde.org/~larrosa/tutorial/p9.html http://developer.kde.org/documentation/tutorials/xmlui/preface.html -* Use KConfig XT to create your configuration dialogs and make +* Use TDEConfig XT to create your configuration dialogs and make them more maintainable. For more details, consult : diff --git a/src/helpers/ktranslateurl.cpp b/src/helpers/ktranslateurl.cpp index b4d776f..037de88 100644 --- a/src/helpers/ktranslateurl.cpp +++ b/src/helpers/ktranslateurl.cpp @@ -96,7 +96,7 @@ KURL KTranslateUrl::findSystemBase(const TQString&filename) = dir.entryList( TQDir::Files | TQDir::Readable ); - KIO::UDSEntry entry; + TDEIO::UDSEntry entry; TQStringList::ConstIterator name = filenames.begin(); TQStringList::ConstIterator endf = filenames.end(); diff --git a/src/kiosvn/kiobytestream.h b/src/kiosvn/kiobytestream.h index 808277c..ce22af5 100644 --- a/src/kiosvn/kiobytestream.h +++ b/src/kiosvn/kiobytestream.h @@ -33,7 +33,7 @@ class StreamWrittenCb public: StreamWrittenCb(){} virtual ~StreamWrittenCb(){} - virtual void streamWritten(const KIO::filesize_t current) = 0; + virtual void streamWritten(const TDEIO::filesize_t current) = 0; virtual void streamPushData(TQByteArray)=0; virtual void streamSendMime(KMimeMagicResult*mt)=0; virtual void streamTotalSizeNull()=0; @@ -52,11 +52,11 @@ public: virtual bool isOk() const; virtual long write(const char* data, const unsigned long max); - KIO::filesize_t written(){return m_Written;} + TDEIO::filesize_t written(){return m_Written;} protected: StreamWrittenCb*m_Cb; - KIO::filesize_t m_Written; + TDEIO::filesize_t m_Written; bool m_mimeSend; TQString m_Filename; TQByteArray array; diff --git a/src/kiosvn/kiolistener.cpp b/src/kiosvn/kiolistener.cpp index 16ff6e4..e270c21 100644 --- a/src/kiosvn/kiolistener.cpp +++ b/src/kiosvn/kiolistener.cpp @@ -24,9 +24,9 @@ #include #include -namespace KIO { +namespace TDEIO { -KioListener::KioListener(KIO::kio_svnProtocol*_par) +KioListener::KioListener(TDEIO::kio_svnProtocol*_par) : svn::ContextListener(),m_notifyCounter(0),m_External(false),m_HasChanges(false),m_FirstTxDelta(false),m_Canceld(false) { par = _par; @@ -405,4 +405,4 @@ void KioListener::contextProgress(long long int cur, long long int max) } } -} // namespace KIO +} // namespace TDEIO diff --git a/src/kiosvn/kiolistener.h b/src/kiosvn/kiolistener.h index ffb2b04..8156b43 100644 --- a/src/kiosvn/kiolistener.h +++ b/src/kiosvn/kiolistener.h @@ -23,7 +23,7 @@ #include "context_listener.hpp" #include "pwstorage.h" -namespace KIO { +namespace TDEIO { class SlaveBase; class kio_svnProtocol; @@ -33,7 +33,7 @@ namespace KIO { class KioListener : public svn::ContextListener { public: - KioListener(KIO::kio_svnProtocol*_par); + KioListener(TDEIO::kio_svnProtocol*_par); virtual ~KioListener(); /* context-listener methods */ @@ -69,7 +69,7 @@ public: void setCancel(bool value){m_Canceld=value;} private: - KIO::kio_svnProtocol *par; + TDEIO::kio_svnProtocol *par; protected: unsigned int m_notifyCounter; diff --git a/src/kiosvn/kiosvn.cpp b/src/kiosvn/kiosvn.cpp index 45c2c0d..dfae81b 100644 --- a/src/kiosvn/kiosvn.cpp +++ b/src/kiosvn/kiosvn.cpp @@ -62,7 +62,7 @@ #include #include -namespace KIO +namespace TDEIO { class KioSvnData @@ -173,14 +173,14 @@ int kdemain(int argc, char **argv) exit(-1); } - KIO::kio_svnProtocol slave(argv[2], argv[3]); + TDEIO::kio_svnProtocol slave(argv[2], argv[3]); slave.dispatchLoop(); kdDebug(7101) << "*** kio_ksvn Done" << endl; return 0; } -namespace KIO +namespace TDEIO { /*! \fn kio_svnProtocol::listDir (const KURL&url) @@ -199,10 +199,10 @@ void kio_svnProtocol::listDir(const KURL&url) } catch (const svn::ClientException&e) { TQString ex = e.msg(); kdDebug()<name().isEmpty()) { @@ -238,7 +238,7 @@ void kio_svnProtocol::stat(const KURL& url) } catch (const svn::ClientException&e) { TQString ex = e.msg(); kdDebug()<m_Svnclient->mkdir(p,getDefaultLog()); }catch (const svn::ClientException&e) { - error( KIO::ERR_SLAVE_DEFINED,e.msg()); + error( TDEIO::ERR_SLAVE_DEFINED,e.msg()); } kdDebug()<<"kio_svn::mkdir finished " << url << endl; finished(); @@ -316,7 +316,7 @@ void kio_svnProtocol::mkdir(const KURL::List &urls, int) try { m_pData->m_Svnclient->mkdir(svn::Targets(p),getDefaultLog()); } catch (const svn::ClientException&e) { - error(KIO::ERR_SLAVE_DEFINED,e.msg()); + error(TDEIO::ERR_SLAVE_DEFINED,e.msg()); return; } finished(); @@ -330,7 +330,7 @@ void kio_svnProtocol::rename(const KURL&src,const KURL&target,bool force) try { m_pData->m_Svnclient->move(makeSvnUrl(src),makeSvnUrl(target),force); }catch (const svn::ClientException&e) { - error( KIO::ERR_SLAVE_DEFINED,e.msg()); + error( TDEIO::ERR_SLAVE_DEFINED,e.msg()); } kdDebug()<<"kio_svn::rename finished" << endl; finished(); @@ -350,7 +350,7 @@ void kio_svnProtocol::copy(const KURL&src,const KURL&dest,int permissions,bool o try { m_pData->m_Svnclient->copy(makeSvnUrl(src),rev,makeSvnUrl(dest)); }catch (const svn::ClientException&e) { - error( KIO::ERR_SLAVE_DEFINED,e.msg()); + error( TDEIO::ERR_SLAVE_DEFINED,e.msg()); } m_pData->dispProgress=false; kdDebug()<<"kio_svn::copy finished" << endl; @@ -373,7 +373,7 @@ void kio_svnProtocol::del(const KURL&src,bool isfile) } catch (const svn::ClientException&e) { TQString ex = e.msg(); kdDebug()<m_Svnclient->update(pathes, where,svn::DepthInfinity,false,false,true); } catch (const svn::ClientException&e) { - error(KIO::ERR_SLAVE_DEFINED,e.msg()); + error(TDEIO::ERR_SLAVE_DEFINED,e.msg()); } } @@ -661,7 +661,7 @@ void kio_svnProtocol::status(const KURL&wc,bool cR,bool rec) // rec all up noign dlist = m_pData->m_Svnclient->status(wc.path(),rec?svn::DepthInfinity:svn::DepthEmpty,false,cR,false,where); } catch (const svn::ClientException&e) { - error(KIO::ERR_SLAVE_DEFINED,e.msg()); + error(TDEIO::ERR_SLAVE_DEFINED,e.msg()); return; } kdDebug()<<"Status got " << dlist.count() << " entries." << endl; @@ -719,7 +719,7 @@ void kio_svnProtocol::commit(const KURL::List&url) try { nnum = m_pData->m_Svnclient->commit(svn::Targets(targets),msg,svn::DepthInfinity,false); } catch (const svn::ClientException&e) { - error(KIO::ERR_SLAVE_DEFINED,e.msg()); + error(TDEIO::ERR_SLAVE_DEFINED,e.msg()); } for (unsigned j=0;jm_Svnclient->checkout(_src.url(),_target,where,peg,svn::DepthInfinity,false,false); } catch (const svn::ClientException&e) { - error(KIO::ERR_SLAVE_DEFINED,e.msg()); + error(TDEIO::ERR_SLAVE_DEFINED,e.msg()); } } @@ -764,7 +764,7 @@ void kio_svnProtocol::svnlog(int revstart,const TQString&revstringstart,int reve try { logs = m_pData->m_Svnclient->log(makeSvnUrl(urls[j]),start,end,svn::Revision::UNDEFINED,true,true,0); } catch (const svn::ClientException&e) { - error(KIO::ERR_SLAVE_DEFINED,e.msg()); + error(TDEIO::ERR_SLAVE_DEFINED,e.msg()); break; } if (!logs) { @@ -811,7 +811,7 @@ void kio_svnProtocol::revert(const KURL::List&l) try { m_pData->m_Svnclient->revert(target,svn::DepthEmpty); } catch (const svn::ClientException&e) { - error(KIO::ERR_SLAVE_DEFINED,e.msg()); + error(TDEIO::ERR_SLAVE_DEFINED,e.msg()); } } @@ -822,7 +822,7 @@ void kio_svnProtocol::wc_switch(const KURL&wc,const KURL&target,bool rec,int rev try { m_pData->m_Svnclient->doSwitch(wc_path,makeSvnUrl(target.url()),where,rec?svn::DepthInfinity:svn::DepthFiles); } catch (const svn::ClientException&e) { - error(KIO::ERR_SLAVE_DEFINED,e.msg()); + error(TDEIO::ERR_SLAVE_DEFINED,e.msg()); } } @@ -844,7 +844,7 @@ void kio_svnProtocol::diff(const KURL&uri1,const KURL&uri2,int rnum1,const TQStr ex = m_pData->m_Svnclient->diff(svn::Path(tdir.name()), u1,u2,svn::Path(),r1, r2,rec?svn::DepthInfinity:svn::DepthEmpty,false,false,false); } catch (const svn::ClientException&e) { - error(KIO::ERR_SLAVE_DEFINED,e.msg()); + error(TDEIO::ERR_SLAVE_DEFINED,e.msg()); return; } TQString out = TQString::FROMUTF8(ex); @@ -862,7 +862,7 @@ void kio_svnProtocol::import(const KURL& repos, const KURL& wc) TQString path = wc.path(); m_pData->m_Svnclient->import(svn::Path(path),target,TQString(),svn::DepthInfinity,false,false); } catch (const svn::ClientException&e) { - error(KIO::ERR_SLAVE_DEFINED,e.msg()); + error(TDEIO::ERR_SLAVE_DEFINED,e.msg()); return; } finished(); @@ -875,7 +875,7 @@ void kio_svnProtocol::add(const KURL& wc) /* rec */ m_pData->m_Svnclient->add(svn::Path(path),svn::DepthInfinity); } catch (const svn::ClientException&e) { - error(KIO::ERR_SLAVE_DEFINED,e.msg()); + error(TDEIO::ERR_SLAVE_DEFINED,e.msg()); return; } finished(); @@ -890,7 +890,7 @@ void kio_svnProtocol::wc_delete(const KURL::List&l) try { m_pData->m_Svnclient->remove(svn::Targets(p),false); } catch (const svn::ClientException&e) { - error(KIO::ERR_SLAVE_DEFINED,e.msg()); + error(TDEIO::ERR_SLAVE_DEFINED,e.msg()); return; } finished(); @@ -902,13 +902,13 @@ void kio_svnProtocol::wc_resolve(const KURL&url,bool recurse) svn::Depth depth=recurse?svn::DepthInfinity:svn::DepthEmpty; m_pData->m_Svnclient->resolve(url.path(),depth); } catch (const svn::ClientException&e) { - error(KIO::ERR_SLAVE_DEFINED,e.msg()); + error(TDEIO::ERR_SLAVE_DEFINED,e.msg()); return; } finished(); } -void kio_svnProtocol::streamWritten(const KIO::filesize_t current) +void kio_svnProtocol::streamWritten(const TDEIO::filesize_t current) { processedSize(current); } @@ -951,4 +951,4 @@ TQString kio_svnProtocol::getDefaultLog() return res; } -} // namespace KIO +} // namespace TDEIO diff --git a/src/kiosvn/kiosvn.h b/src/kiosvn/kiosvn.h index 5132a4e..413a6a5 100644 --- a/src/kiosvn/kiosvn.h +++ b/src/kiosvn/kiosvn.h @@ -33,7 +33,7 @@ #include #include -namespace KIO +namespace TDEIO { class KioSvnData; @@ -41,7 +41,7 @@ class KioSvnData; /** @author Rajko Albrecht */ -class kio_svnProtocol : public KIO::SlaveBase,public StreamWrittenCb +class kio_svnProtocol : public TDEIO::SlaveBase,public StreamWrittenCb { public: kio_svnProtocol(const TQCString &pool_socket, const TQCString &app_socket); @@ -95,7 +95,7 @@ public: }; void contextProgress(long long int current, long long int max); - virtual void streamWritten(const KIO::filesize_t current); + virtual void streamWritten(const TDEIO::filesize_t current); virtual void streamPushData(TQByteArray); virtual void streamSendMime(KMimeMagicResult*mt); virtual void streamTotalSizeNull(); @@ -107,7 +107,7 @@ protected: private: KioSvnData*m_pData; - bool createUDSEntry( const TQString& filename, const TQString& user, long long int size, bool isdir, time_t mtime, KIO::UDSEntry& entry); + bool createUDSEntry( const TQString& filename, const TQString& user, long long int size, bool isdir, time_t mtime, TDEIO::UDSEntry& entry); TQString makeSvnUrl(const KURL&url,bool check_wc=true); bool checkWc(const KURL&url); bool getLogMsg(TQString&); diff --git a/src/ksvnwidgets/logmsg_impl.cpp b/src/ksvnwidgets/logmsg_impl.cpp index 0c4505f..f93cbec 100644 --- a/src/ksvnwidgets/logmsg_impl.cpp +++ b/src/ksvnwidgets/logmsg_impl.cpp @@ -221,7 +221,7 @@ void Logmsg_impl::initHistory() { if (smax_message_history==0xFFFF) { smax_message_history = Kdesvnsettings::max_log_messages(); - KConfigGroup cs(Kdesvnsettings::self()->config(),"log_messages"); + TDEConfigGroup cs(Kdesvnsettings::self()->config(),"log_messages"); TQString s = TQString(); unsigned int current = 0; TQString key = TQString("log_%0").arg(current); @@ -268,7 +268,7 @@ void Logmsg_impl::saveHistory(bool canceld) if (sLogHistory.size()>smax_message_history) { sLogHistory.erase(sLogHistory.fromLast()); } - KConfigGroup cs(Kdesvnsettings::self()->config(),"log_messages"); + TDEConfigGroup cs(Kdesvnsettings::self()->config(),"log_messages"); for (unsigned int i = 0; i < sLogHistory.size();++i) { cs.writeEntry(TQString("log_%0").arg(i),sLogHistory[i]); } @@ -641,11 +641,11 @@ void Logmsg_impl::insertFile() insertFile(_url.path()); } else { TQString tmpFile; - if( KIO::NetAccess::download(_url, tmpFile, this) ) { + if( TDEIO::NetAccess::download(_url, tmpFile, this) ) { insertFile( tmpFile ); - KIO::NetAccess::removeTempFile( tmpFile ); + TDEIO::NetAccess::removeTempFile( tmpFile ); } else { - KMessageBox::error(this, KIO::NetAccess::lastErrorString() ); + KMessageBox::error(this, TDEIO::NetAccess::lastErrorString() ); } } } diff --git a/src/settings/tdesvn_part.kcfg b/src/settings/tdesvn_part.kcfg index 3754d4a..a275b03 100644 --- a/src/settings/tdesvn_part.kcfg +++ b/src/settings/tdesvn_part.kcfg @@ -243,7 +243,7 @@ false - + Revision made with tdesvn KIO. diff --git a/src/svnfrontend/graphtree/drawparams.h b/src/svnfrontend/graphtree/drawparams.h index 0244620..966541d 100644 --- a/src/svnfrontend/graphtree/drawparams.h +++ b/src/svnfrontend/graphtree/drawparams.h @@ -43,7 +43,7 @@ class TQPopupMenu; class TQString; -class KConfigGroup; +class TDEConfigGroup; /** diff --git a/src/svnfrontend/svnactions.cpp b/src/svnfrontend/svnactions.cpp index dcc754d..a36b9ef 100644 --- a/src/svnfrontend/svnactions.cpp +++ b/src/svnfrontend/svnactions.cpp @@ -126,7 +126,7 @@ public: for (it=m_tempdirlist.begin();it!=m_tempdirlist.end();++it) { for (TQStringList::iterator it2 = (*it).begin(); it2 != (*it).end();++it2) { - KIO::NetAccess::del((*it2),0); + TDEIO::NetAccess::del((*it2),0); } } delete m_Svnclient; @@ -1068,7 +1068,7 @@ void SvnActions::procClosed(TDEProcess*proc) if ( (it=m_Data->m_tempdirlist.find(proc))!=m_Data->m_tempdirlist.end()) { for (TQStringList::iterator it2 = (*it).begin(); it2 != (*it).end();++it2) { - KIO::NetAccess::del((*it2),0); + TDEIO::NetAccess::del((*it2),0); } m_Data->m_tempdirlist.erase(it); } diff --git a/src/svnfrontend/svnactions.h b/src/svnfrontend/svnactions.h index e208181..4342ea5 100644 --- a/src/svnfrontend/svnactions.h +++ b/src/svnfrontend/svnactions.h @@ -53,7 +53,7 @@ namespace svn { class InfoEntry; } -namespace KIO { +namespace TDEIO { class Job; } diff --git a/src/svnfrontend/svnfiletip.cpp b/src/svnfrontend/svnfiletip.cpp index 283e084..cc99182 100644 --- a/src/svnfrontend/svnfiletip.cpp +++ b/src/svnfrontend/svnfiletip.cpp @@ -268,10 +268,10 @@ void SvnFileTip::startDelayed() KFileItemList oneItem; oneItem.append( m_svnitem->fileItem() ); - m_previewJob = KIO::filePreview( oneItem, 256, 256, 64, 70, true, true, 0); + m_previewJob = TDEIO::filePreview( oneItem, 256, 256, 64, 70, true, true, 0); connect( m_previewJob, TQT_SIGNAL( gotPreview( const KFileItem *, const TQPixmap & ) ), this, TQT_SLOT( gotPreview( const KFileItem *, const TQPixmap & ) ) ); - connect( m_previewJob, TQT_SIGNAL( result( KIO::Job * ) ), + connect( m_previewJob, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( gotPreviewResult() ) ); } diff --git a/src/svnfrontend/svnfiletip.h b/src/svnfrontend/svnfiletip.h index 59ce063..2c20dcd 100644 --- a/src/svnfrontend/svnfiletip.h +++ b/src/svnfrontend/svnfiletip.h @@ -90,7 +90,7 @@ public: int m_num; TQScrollView* m_view; SvnItem* m_svnitem; - KIO::PreviewJob* m_previewJob; + TDEIO::PreviewJob* m_previewJob; TQRect m_rect; TQTimer* m_timer; }; diff --git a/src/svnfrontend/svnlogdlgimp.cpp b/src/svnfrontend/svnlogdlgimp.cpp index 9cbc7e3..d3a7910 100644 --- a/src/svnfrontend/svnlogdlgimp.cpp +++ b/src/svnfrontend/svnlogdlgimp.cpp @@ -206,7 +206,7 @@ SvnLogDlgImp::SvnLogDlgImp(SvnActions*ac,TQWidget *parent, const char *name,bool m_ChangedList->hide(); } m_Actions = ac; - KConfigGroup cs(Kdesvnsettings::self()->config(), groupName); + TDEConfigGroup cs(Kdesvnsettings::self()->config(), groupName); TQString t1 = cs.readEntry("logsplitter",TQString()); if (!t1.isEmpty()) { TQTextStream st2(&t1,IO_ReadOnly); @@ -228,7 +228,7 @@ SvnLogDlgImp::~SvnLogDlgImp() st1 << *m_rightSplitter; TQTextStream st2(&t2,IO_WriteOnly); st2 << *m_centralSplitter; - KConfigGroup cs(Kdesvnsettings::self()->config(), groupName); + TDEConfigGroup cs(Kdesvnsettings::self()->config(), groupName); cs.writeEntry("right_logsplitter",t1); cs.writeEntry("logsplitter",t2); cs.writeEntry("laststate",m_ChangedList->isHidden()); @@ -442,7 +442,7 @@ void SvnLogDlgImp::saveSize() { int scnum = TQApplication::desktop()->screenNumber(parentWidget()); TQRect desk = TQApplication::desktop()->screenGeometry(scnum); - KConfigGroupSaver cs(Kdesvnsettings::self()->config(), groupName); + TDEConfigGroupSaver cs(Kdesvnsettings::self()->config(), groupName); TQSize sizeToSave = size(); Kdesvnsettings::self()->config()->writeEntry( TQString::fromLatin1("Width %1").arg( desk.width()), TQString::number( sizeToSave.width()), true, false); @@ -457,7 +457,7 @@ TQSize SvnLogDlgImp::dialogSize() TQRect desk = TQApplication::desktop()->screenGeometry(scnum); w = sizeHint().width(); h = sizeHint().height(); - KConfigGroupSaver cs(Kdesvnsettings::self()->config(), groupName); + TDEConfigGroupSaver cs(Kdesvnsettings::self()->config(), groupName); w = Kdesvnsettings::self()->config()->readNumEntry( TQString::fromLatin1("Width %1").arg( desk.width()), w ); h = Kdesvnsettings::self()->config()->readNumEntry( TQString::fromLatin1("Height %1").arg( desk.height()), h ); return( TQSize( w, h ) ); diff --git a/src/svnfrontend/tdesvnfilelist.cpp b/src/svnfrontend/tdesvnfilelist.cpp index 496d958..a765807 100644 --- a/src/svnfrontend/tdesvnfilelist.cpp +++ b/src/svnfrontend/tdesvnfilelist.cpp @@ -1813,9 +1813,9 @@ void tdesvnfilelist::slotDropped(TQDropEvent* event,TQListViewItem*item) slotImportIntoDir(urlList[0],tdir,fi.isDir()); } else { //m_pList->stopScan(); - KIO::Job * job = 0L; - job = KIO::copy(urlList,tdir); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ),TQT_SLOT( slotCopyFinished( KIO::Job * ) ) ); + TDEIO::Job * job = 0L; + job = TDEIO::copy(urlList,tdir); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),TQT_SLOT( slotCopyFinished( TDEIO::Job * ) ) ); dispDummy(); event->acceptAction(); return; @@ -1937,9 +1937,9 @@ void tdesvnfilelist::slotCat() /*! - \fn tdesvnfilelist::slotCopyFinished( KIO::Job *) + \fn tdesvnfilelist::slotCopyFinished( TDEIO::Job *) */ -void tdesvnfilelist::slotCopyFinished( KIO::Job * job) +void tdesvnfilelist::slotCopyFinished( TDEIO::Job * job) { if (m_pList->m_DirWatch) { m_pList->m_DirWatch->startScan(false); @@ -1953,8 +1953,8 @@ void tdesvnfilelist::slotCopyFinished( KIO::Job * job) } // always just connect a CopyJob here!!!! if (ok) { - KURL::List lst = static_cast(job)->srcURLs(); - KURL turl = static_cast(job)->destURL(); + KURL::List lst = static_cast(job)->srcURLs(); + KURL turl = static_cast(job)->destURL(); TQString base = turl.path(1); KURL::List::iterator iter; TQValueList tmp; @@ -2004,8 +2004,8 @@ void tdesvnfilelist::slotDelete() return; } if (kioList.count()>0) { - KIO::Job*aJob = KIO::del(kioList); - connect(aJob,TQT_SIGNAL(result (KIO::Job *)),this,TQT_SLOT(slotDeleteFinished(KIO::Job*))); + TDEIO::Job*aJob = TDEIO::del(kioList); + connect(aJob,TQT_SIGNAL(result (TDEIO::Job *)),this,TQT_SLOT(slotDeleteFinished(TDEIO::Job*))); dispDummy(); } if (m_deletePerfect && items.size()>0) { @@ -2016,9 +2016,9 @@ void tdesvnfilelist::slotDelete() } /*! - \fn tdesvnfilelist::slotDeleteFinished(KIO::Job*) + \fn tdesvnfilelist::slotDeleteFinished(TDEIO::Job*) */ -void tdesvnfilelist::slotDeleteFinished(KIO::Job*job) +void tdesvnfilelist::slotDeleteFinished(TDEIO::Job*job) { if (job) { tqApp->exit_loop(); diff --git a/src/svnfrontend/tdesvnfilelist.h b/src/svnfrontend/tdesvnfilelist.h index 6f9a6fb..7de4d08 100644 --- a/src/svnfrontend/tdesvnfilelist.h +++ b/src/svnfrontend/tdesvnfilelist.h @@ -40,7 +40,7 @@ class KDialogBase; class KdesvnFileListPrivate; class SvnActions; -namespace KIO { +namespace TDEIO { class Job; } @@ -169,8 +169,8 @@ protected slots: virtual void slotDisplayLastDiff(); /* callback slots */ - virtual void slotCopyFinished( KIO::Job *); - virtual void slotDeleteFinished(KIO::Job*); + virtual void slotCopyFinished( TDEIO::Job *); + virtual void slotDeleteFinished(TDEIO::Job*); virtual void _openURL(const TQString&); virtual void _dirwatchTimeout(); virtual void _propListTimeout(); diff --git a/src/tdesvn.cpp b/src/tdesvn.cpp index 543755b..0b2a6cd 100644 --- a/src/tdesvn.cpp +++ b/src/tdesvn.cpp @@ -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(TDEGlobal::config(),"startup"); + TDEConfigGroup cs(TDEGlobal::config(),"startup"); toggletemp->setChecked(cs.readBoolEntry("load_last_on_start",false)); connect(toggletemp,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotLoadLast(bool))); } @@ -268,7 +268,7 @@ void tdesvn::fileClose() } } -void tdesvn::saveProperties(KConfig *config) +void tdesvn::saveProperties(TDEConfig *config) { // the 'config' object points to the session managed // config file. anything you write here will be available @@ -283,7 +283,7 @@ void tdesvn::saveProperties(KConfig *config) } } -void tdesvn::readProperties(KConfig *config) +void tdesvn::readProperties(TDEConfig *config) { // the 'config' object points to the session managed // config file. this function is automatically called whenever @@ -411,7 +411,7 @@ void tdesvn::optionsConfigureKeys() bool tdesvn::queryExit() { if (m_part) { - KConfigGroup cs(TDEGlobal::config(),"startup"); + TDEConfigGroup 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(TDEGlobal::config(),"startup"); + TDEConfigGroup 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(TDEGlobal::config(),"startup"); + TDEConfigGroup cs(TDEGlobal::config(),"startup"); cs.writeEntry("load_last_on_start",how); } diff --git a/src/tdesvn.h b/src/tdesvn.h index d6011ed..d3f80b4 100644 --- a/src/tdesvn.h +++ b/src/tdesvn.h @@ -67,14 +67,14 @@ protected: * This function is called when it is time for the app to save its * properties for session management purposes. */ - void saveProperties(KConfig *); + void saveProperties(TDEConfig *); /** - * This function is called when this app is restored. The KConfig + * This function is called when this app is restored. The TDEConfig * object points to the session management config file that was saved * with @ref saveProperties */ - void readProperties(KConfig *); + void readProperties(TDEConfig *); virtual bool queryExit(); void enableClose(bool how); diff --git a/src/tdesvn_part.cpp b/src/tdesvn_part.cpp index c171b7d..ded660f 100644 --- a/src/tdesvn_part.cpp +++ b/src/tdesvn_part.cpp @@ -344,10 +344,10 @@ void tdesvnPart::appHelpActivated() */ void tdesvnPart::slotShowSettings() { - if (KConfigDialog::showDialog("tdesvnpart_settings")) { + if (TDEConfigDialog::showDialog("tdesvnpart_settings")) { return; } - KConfigDialog *dialog = new KConfigDialog(widget(), + TDEConfigDialog *dialog = new TDEConfigDialog(widget(), "tdesvnpart_settings", Kdesvnsettings::self(), KDialogBase::IconList); diff --git a/src/tdesvnview.cpp b/src/tdesvnview.cpp index a4787c8..912b788 100644 --- a/src/tdesvnview.cpp +++ b/src/tdesvnview.cpp @@ -94,7 +94,7 @@ tdesvnView::tdesvnView(KActionCollection*aCollection,TQWidget *parent,const char connect(m_flist,TQT_SIGNAL(sigUrlChanged( const TQString& )),this,TQT_SLOT(slotUrlChanged(const TQString&))); connect(m_flist,TQT_SIGNAL(sigCacheStatus(TQ_LONG,TQ_LONG)),this,TQT_SLOT(fillCacheStatus(TQ_LONG,TQ_LONG))); connect(this,TQT_SIGNAL(sigMakeBaseDirs()),m_flist,TQT_SLOT(slotMkBaseDirs())); - KConfigGroup cs(Kdesvnsettings::self()->config(),"tdesvn-mainlayout"); + TDEConfigGroup cs(Kdesvnsettings::self()->config(),"tdesvn-mainlayout"); TQString t1 = cs.readEntry("split1",TQString()); if (!t1.isEmpty()) { TQTextStream st1(&t1,IO_ReadOnly); @@ -116,7 +116,7 @@ void tdesvnView::slotAppendLog(const TQString& text) tdesvnView::~tdesvnView() { - KConfigGroup cs(Kdesvnsettings::self()->config(),"tdesvn-mainlayout"); + TDEConfigGroup cs(Kdesvnsettings::self()->config(),"tdesvn-mainlayout"); TQString t1,t2; TQTextStream st1(&t1,IO_WriteOnly); st1 << *m_Splitter; diff --git a/src/urldlg.cpp b/src/urldlg.cpp index a88eaef..e7cc60d 100644 --- a/src/urldlg.cpp +++ b/src/urldlg.cpp @@ -54,8 +54,8 @@ void UrlDlg::init_dlg() KHistoryCombo * combo = new KHistoryCombo(0,"history_combo"); combo->setDuplicatesEnabled(false); - KConfig *kc = TDEGlobal::config(); - KConfigGroupSaver ks( kc, TQString::fromLatin1("Open-repository settings") ); + TDEConfig *kc = TDEGlobal::config(); + TDEConfigGroupSaver ks( kc, TQString::fromLatin1("Open-repository settings") ); int max = kc->readNumEntry( TQString::fromLatin1("Maximum history"), 15 ); combo->setMaxCount( max ); TQStringList list = kc->readListEntry( TQString::fromLatin1("History") ); @@ -87,8 +87,8 @@ void UrlDlg::accept() KHistoryCombo *combo = static_cast(urlRequester_->comboBox()); if (combo) { combo->addToHistory(urlRequester_->url()); - KConfig *kc = TDEGlobal::config(); - KConfigGroupSaver ks(kc, TQString::fromLatin1("Open-repository settings")); + TDEConfig *kc = TDEGlobal::config(); + TDEConfigGroupSaver ks(kc, TQString::fromLatin1("Open-repository settings")); kc->writeEntry(TQString::fromLatin1("History"), combo->historyItems()); kc->sync(); } diff --git a/tdesvn.spec b/tdesvn.spec index b056c06..d13a4f8 100644 --- a/tdesvn.spec +++ b/tdesvn.spec @@ -27,7 +27,7 @@ Group: Development/Tools Summary: A kde-kio integration for subversion based on tdesvn %description kiosvn -KIO integration (KIO::svn) based on tdesvn alternative protocol name. +KIO integration (TDEIO::svn) based on tdesvn alternative protocol name. %package devel Group: Development/Libraries diff --git a/tdesvn.spec.in b/tdesvn.spec.in index d5a404b..01df37e 100644 --- a/tdesvn.spec.in +++ b/tdesvn.spec.in @@ -27,7 +27,7 @@ Group: Development/Tools Summary: A kde-kio integration for subversion based on tdesvn %description kiosvn -KIO integration (KIO::svn) based on tdesvn alternative protocol name. +KIO integration (TDEIO::svn) based on tdesvn alternative protocol name. %package devel Group: Development/Libraries