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

Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent 773793eead
commit 07a23b0645
28 changed files with 115 additions and 115 deletions
Show Stats Download Patch File Download Diff File

4
ChangeLog
Unescape View File

@ -83,7 +83,7 @@ version 0.12.0
* fix: let user select if them want to checkout/export external declarations, too. * fix: let user select if them want to checkout/export external declarations, too.
version 0.11.2 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 <path>") * fix: since subversion 1.4 tdesvn made an error when making simple diff on commandline ("tdesvn exec diff <path>")
* fix: tdevelop always gives a file:/// uri for locals, kio_ksvn has to check if this is a working copy uri * 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. and transform it to uri without protocoll if yes.
@ -217,7 +217,7 @@ version 0.7.1
* more help written * more help written
* context menus may setup depending on kde version tdesvn is compiled against * context menus may setup depending on kde version tdesvn is compiled against
* KIO now full working * 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 * will only compile against subversion 1.2 or newer - subversion 1.1 makes no sense anymore
* fix: check for compiler with -fvisibility flag * fix: check for compiler with -fvisibility flag

2
Helperstuff/BuildService/tdesvn.spec.in
Unescape View File

@ -54,7 +54,7 @@ Group: Development/Tools
Summary: A kde-kio integration for subversion based on tdesvn Summary: A kde-kio integration for subversion based on tdesvn
%description kiosvn %description kiosvn
KIO integration (KIO::svn) based on tdesvn alternative protocol name. KIO integration (TDEIO::svn) based on tdesvn alternative protocol name.
%package devel %package devel
Group: Development/Libraries Group: Development/Libraries

12
doc/en/index.docbook
Unescape View File

@ -375,7 +375,7 @@ Deleting items is always recursive. Eg., when you delete a folder all subitems w
<sect1 id="working-with-repositories"> <sect1 id="working-with-repositories">
<title>Working on repositories</title> <title>Working on repositories</title>
<para> <para>
Simple repository browsing may done within &konqi; &krus; or similar filebrowsers: Open a URL with protocol described in <xref linkend="tdesvn-features" xreflabel="Features" /> (the variants starting with &quot;k&quot;) and them will display the content. So simple operations like copy, move and delete may work. When appending a query &quot;?rev=&lt;xxx&gt;&quot; the listing comes from a specific revision. Format of revision-query is described in <xref linkend="revision-syntax" />, some more information about KIO::ksvn are in <xref linkend="tdesvn-kio" /> Simple repository browsing may done within &konqi; &krus; or similar filebrowsers: Open a URL with protocol described in <xref linkend="tdesvn-features" xreflabel="Features" /> (the variants starting with &quot;k&quot;) and them will display the content. So simple operations like copy, move and delete may work. When appending a query &quot;?rev=&lt;xxx&gt;&quot; the listing comes from a specific revision. Format of revision-query is described in <xref linkend="revision-syntax" />, some more information about TDEIO::ksvn are in <xref linkend="tdesvn-kio" />
</para> </para>
<para> <para>
All work except &quot;Copy&quot; may only done when browsing at revision HEAD. All work except &quot;Copy&quot; 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
</para> </para>
<para> <para>
<example> <example>
<title>Retrieving differences between revions using KDiff3 and KIO::ksvn</title> <title>Retrieving differences between revions using KDiff3 and TDEIO::ksvn</title>
<programlisting> <programlisting>
kdiff3 \ kdiff3 \
ksvn://anonsvn.kde.org/home/kde/trunk/KDE/arts?rev=423127 \ 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
</sect2> </sect2>
</sect1> </sect1>
<sect1 id="kio-svn-special"> <sect1 id="kio-svn-special">
<title>Programmers information about KIO::ksvn</title> <title>Programmers information about TDEIO::ksvn</title>
<para> <para>
<note><para>You may skip this if not interested in KIO programming.</para></note> <note><para>You may skip this if not interested in KIO programming.</para></note>
KIO::ksvn::special knows the following operations, these are made almost equal in call to the current existing in KIO from tdesdk 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::KIO::svn. so, for instance, tdevelop may use it if tdesdk isn't installed but uses tdesvn::TDEIO::svn.
</para> </para>
<sect2> <sect2>
<title>Commandlist</title> <title>Commandlist</title>
<para> <para>
<table id="kio-svn-special-commands"> <table id="kio-svn-special-commands">
<title>Command overview for KIO::ksvn::special</title> <title>Command overview for TDEIO::ksvn::special</title>
<tgroup cols="4"> <tgroup cols="4">
<thead> <thead>

12
doc/nl/index.docbook
Unescape View File

@ -371,7 +371,7 @@ Items verwijderen is altijd recursief. B.V.,wanneer een map verwijderd wordt, da
<sect1 id="working-with-repositories"> <sect1 id="working-with-repositories">
<title>Werken met repositories</title> <title>Werken met repositories</title>
<para> <para>
Eenvoudig bladeren door de repository kan gedaan worden met &konqi; &krus; of vergelijkbare bestandsbeheerders: Open een URL met een protocool zoals beschreven in <xref linkend="tdesvn-features" xreflabel="Features" /> (Alle varianten die starten met &quot;k&quot;) en zij zullen de inhoud tonen. Hierdoor kunnen eenvoudige opdrachten zoals kopieren, verplaatsen en verwijderen uitgevoerd worden. Wanneer het volgende filter &quot;?rev=&lt;xxx&gt;&quot; wordt ingesteld, zijn alleen de gegevens van een specifiek revisie te zien. De syntax van een revisie-filter wordt beschreven in <xref linkend="revision-syntax" />, lees meer over KIO::ksvn in <xref linkend="tdesvn-kio" /> Eenvoudig bladeren door de repository kan gedaan worden met &konqi; &krus; of vergelijkbare bestandsbeheerders: Open een URL met een protocool zoals beschreven in <xref linkend="tdesvn-features" xreflabel="Features" /> (Alle varianten die starten met &quot;k&quot;) en zij zullen de inhoud tonen. Hierdoor kunnen eenvoudige opdrachten zoals kopieren, verplaatsen en verwijderen uitgevoerd worden. Wanneer het volgende filter &quot;?rev=&lt;xxx&gt;&quot; wordt ingesteld, zijn alleen de gegevens van een specifiek revisie te zien. De syntax van een revisie-filter wordt beschreven in <xref linkend="revision-syntax" />, lees meer over TDEIO::ksvn in <xref linkend="tdesvn-kio" />
</para> </para>
<para> <para>
Alle opdrachten behalve &quot;Kopieren&quot; kunnen alleen uitgevoerd worden in de revisie HEAD. Alle opdrachten behalve &quot;Kopieren&quot; kunnen alleen uitgevoerd worden in de revisie HEAD.
@ -741,7 +741,7 @@ Elke op &kde; gebaseerde programma kan deze protocools gebruiken. Het is daarom
</para> </para>
<para> <para>
<example> <example>
<title>Het verschil verkrijgen tussen twee revisies door gebruik van kDiff3 en KIO::ksvn</title> <title>Het verschil verkrijgen tussen twee revisies door gebruik van kDiff3 en TDEIO::ksvn</title>
<programlisting> <programlisting>
kdiff3 \ kdiff3 \
ksvn://anonsvn.kde.org/home/kde/trunk/KDE/arts?rev=423127 \ 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
</sect2> </sect2>
</sect1> </sect1>
<sect1 id="kio-svn-special"> <sect1 id="kio-svn-special">
<title>Informatie over KIO::ksvn voor programmeurs</title> <title>Informatie over TDEIO::ksvn voor programmeurs</title>
<para> <para>
<note><para>U kunt dit gedeelte overslaan indien U niet geïnterreseerd bent in KIO-programmeren.</para></note> <note><para>U kunt dit gedeelte overslaan indien U niet geïnterreseerd bent in KIO-programmeren.</para></note>
KIO::ksvn::special kent de volgende opdrachten, ze zijn in aanroep bijna gelijk gemaakt aan de huidige bestaande in KIO van kdesk 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::KIO::svn. dus, bijvoorbeeld, tdevelop kan het gebruiken als kdesk niet is geïnstalleerd in de vorm van tdesvn::TDEIO::svn.
</para> </para>
<sect2> <sect2>
<title>Overzicht met commando's</title> <title>Overzicht met commando's</title>
<para> <para>
<table id="kio-svn-special-commands"> <table id="kio-svn-special-commands">
<title>Commando overzicht voor KIO::ksvn::special</title> <title>Commando overzicht voor TDEIO::ksvn::special</title>
<tgroup cols="4"> <tgroup cols="4">
<thead> <thead>

2
src/README
Unescape View File

@ -42,7 +42,7 @@ For more details, consult :
http://devel-home.kde.org/~larrosa/tutorial/p9.html http://devel-home.kde.org/~larrosa/tutorial/p9.html
http://developer.kde.org/documentation/tutorials/xmlui/preface.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. them more maintainable.
For more details, consult : For more details, consult :

2
src/helpers/ktranslateurl.cpp
Unescape View File

@ -96,7 +96,7 @@ KURL KTranslateUrl::findSystemBase(const TQString&filename)
= dir.entryList( TQDir::Files | TQDir::Readable ); = dir.entryList( TQDir::Files | TQDir::Readable );
KIO::UDSEntry entry; TDEIO::UDSEntry entry;
TQStringList::ConstIterator name = filenames.begin(); TQStringList::ConstIterator name = filenames.begin();
TQStringList::ConstIterator endf = filenames.end(); TQStringList::ConstIterator endf = filenames.end();

6
src/kiosvn/kiobytestream.h
Unescape View File

@ -33,7 +33,7 @@ class StreamWrittenCb
public: public:
StreamWrittenCb(){} StreamWrittenCb(){}
virtual ~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 streamPushData(TQByteArray)=0;
virtual void streamSendMime(KMimeMagicResult*mt)=0; virtual void streamSendMime(KMimeMagicResult*mt)=0;
virtual void streamTotalSizeNull()=0; virtual void streamTotalSizeNull()=0;
@ -52,11 +52,11 @@ public:
virtual bool isOk() const; virtual bool isOk() const;
virtual long write(const char* data, const unsigned long max); 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: protected:
StreamWrittenCb*m_Cb; StreamWrittenCb*m_Cb;
KIO::filesize_t m_Written; TDEIO::filesize_t m_Written;
bool m_mimeSend; bool m_mimeSend;
TQString m_Filename; TQString m_Filename;
TQByteArray array; TQByteArray array;

6
src/kiosvn/kiolistener.cpp
Unescape View File

@ -24,9 +24,9 @@
#include <klocale.h> #include <klocale.h>
#include <dcopclient.h> #include <dcopclient.h>
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) : svn::ContextListener(),m_notifyCounter(0),m_External(false),m_HasChanges(false),m_FirstTxDelta(false),m_Canceld(false)
{ {
par = _par; par = _par;
@ -405,4 +405,4 @@ void KioListener::contextProgress(long long int cur, long long int max)
} }
} }
} // namespace KIO } // namespace TDEIO

6
src/kiosvn/kiolistener.h
Unescape View File

@ -23,7 +23,7 @@
#include "context_listener.hpp" #include "context_listener.hpp"
#include "pwstorage.h" #include "pwstorage.h"
namespace KIO { namespace TDEIO {
class SlaveBase; class SlaveBase;
class kio_svnProtocol; class kio_svnProtocol;
@ -33,7 +33,7 @@ namespace KIO {
class KioListener : public svn::ContextListener class KioListener : public svn::ContextListener
{ {
public: public:
KioListener(KIO::kio_svnProtocol*_par); KioListener(TDEIO::kio_svnProtocol*_par);
virtual ~KioListener(); virtual ~KioListener();
/* context-listener methods */ /* context-listener methods */
@ -69,7 +69,7 @@ public:
void setCancel(bool value){m_Canceld=value;} void setCancel(bool value){m_Canceld=value;}
private: private:
KIO::kio_svnProtocol *par; TDEIO::kio_svnProtocol *par;
protected: protected:
unsigned int m_notifyCounter; unsigned int m_notifyCounter;

70
src/kiosvn/kiosvn.cpp
Unescape View File

@ -62,7 +62,7 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <netdb.h> #include <netdb.h>
namespace KIO namespace TDEIO
{ {
class KioSvnData class KioSvnData
@ -173,14 +173,14 @@ int kdemain(int argc, char **argv)
exit(-1); exit(-1);
} }
KIO::kio_svnProtocol slave(argv[2], argv[3]); TDEIO::kio_svnProtocol slave(argv[2], argv[3]);
slave.dispatchLoop(); slave.dispatchLoop();
kdDebug(7101) << "*** kio_ksvn Done" << endl; kdDebug(7101) << "*** kio_ksvn Done" << endl;
return 0; return 0;
} }
namespace KIO namespace TDEIO
{ {
/*! /*!
\fn kio_svnProtocol::listDir (const KURL&url) \fn kio_svnProtocol::listDir (const KURL&url)
@ -199,10 +199,10 @@ void kio_svnProtocol::listDir(const KURL&url)
} catch (const svn::ClientException&e) { } catch (const svn::ClientException&e) {
TQString ex = e.msg(); TQString ex = e.msg();
kdDebug()<<ex<<endl; kdDebug()<<ex<<endl;
error(KIO::ERR_CANNOT_ENTER_DIRECTORY,ex); error(TDEIO::ERR_CANNOT_ENTER_DIRECTORY,ex);
return; return;
} }
KIO::UDSEntry entry; TDEIO::UDSEntry entry;
totalSize(dlist.size()); totalSize(dlist.size());
for (unsigned int i=0; i < dlist.size();++i) { for (unsigned int i=0; i < dlist.size();++i) {
if (!dlist[i] || dlist[i]->name().isEmpty()) { if (!dlist[i] || dlist[i]->name().isEmpty()) {
@ -238,7 +238,7 @@ void kio_svnProtocol::stat(const KURL& url)
} catch (const svn::ClientException&e) { } catch (const svn::ClientException&e) {
TQString ex = e.msg(); TQString ex = e.msg();
kdDebug()<<ex<<endl; kdDebug()<<ex<<endl;
error( KIO::ERR_SLAVE_DEFINED,ex); error( TDEIO::ERR_SLAVE_DEFINED,ex);
return; return;
} }
@ -248,7 +248,7 @@ void kio_svnProtocol::stat(const KURL& url)
return;*/ return;*/
} }
KIO::UDSEntry entry; TDEIO::UDSEntry entry;
TQDateTime dt; TQDateTime dt;
if (dummy) { if (dummy) {
createUDSEntry(url.filename(),"",0,true,dt.toTime_t(),entry); createUDSEntry(url.filename(),"",0,true,dt.toTime_t(),entry);
@ -281,7 +281,7 @@ void kio_svnProtocol::get(const KURL& url)
} catch (const svn::ClientException&e) { } catch (const svn::ClientException&e) {
TQString ex = e.msg(); TQString ex = e.msg();
kdDebug()<<ex<<endl; kdDebug()<<ex<<endl;
error( KIO::ERR_SLAVE_DEFINED,"Subversion error "+ex); error( TDEIO::ERR_SLAVE_DEFINED,"Subversion error "+ex);
finished(); finished();
return; return;
} }
@ -301,7 +301,7 @@ void kio_svnProtocol::mkdir(const KURL &url, int)
svn::Path p(makeSvnUrl(url)); svn::Path p(makeSvnUrl(url));
m_pData->m_Svnclient->mkdir(p,getDefaultLog()); m_pData->m_Svnclient->mkdir(p,getDefaultLog());
}catch (const svn::ClientException&e) { }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; kdDebug()<<"kio_svn::mkdir finished " << url << endl;
finished(); finished();
@ -316,7 +316,7 @@ void kio_svnProtocol::mkdir(const KURL::List &urls, int)
try { try {
m_pData->m_Svnclient->mkdir(svn::Targets(p),getDefaultLog()); m_pData->m_Svnclient->mkdir(svn::Targets(p),getDefaultLog());
} catch (const svn::ClientException&e) { } catch (const svn::ClientException&e) {
error(KIO::ERR_SLAVE_DEFINED,e.msg()); error(TDEIO::ERR_SLAVE_DEFINED,e.msg());
return; return;
} }
finished(); finished();
@ -330,7 +330,7 @@ void kio_svnProtocol::rename(const KURL&src,const KURL&target,bool force)
try { try {
m_pData->m_Svnclient->move(makeSvnUrl(src),makeSvnUrl(target),force); m_pData->m_Svnclient->move(makeSvnUrl(src),makeSvnUrl(target),force);
}catch (const svn::ClientException&e) { }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; kdDebug()<<"kio_svn::rename finished" << endl;
finished(); finished();
@ -350,7 +350,7 @@ void kio_svnProtocol::copy(const KURL&src,const KURL&dest,int permissions,bool o
try { try {
m_pData->m_Svnclient->copy(makeSvnUrl(src),rev,makeSvnUrl(dest)); m_pData->m_Svnclient->copy(makeSvnUrl(src),rev,makeSvnUrl(dest));
}catch (const svn::ClientException&e) { }catch (const svn::ClientException&e) {
error( KIO::ERR_SLAVE_DEFINED,e.msg()); error( TDEIO::ERR_SLAVE_DEFINED,e.msg());
} }
m_pData->dispProgress=false; m_pData->dispProgress=false;
kdDebug()<<"kio_svn::copy finished" << endl; kdDebug()<<"kio_svn::copy finished" << endl;
@ -373,7 +373,7 @@ void kio_svnProtocol::del(const KURL&src,bool isfile)
} catch (const svn::ClientException&e) { } catch (const svn::ClientException&e) {
TQString ex = e.msg(); TQString ex = e.msg();
kdDebug()<<ex<<endl; kdDebug()<<ex<<endl;
error( KIO::ERR_SLAVE_DEFINED,ex); error( TDEIO::ERR_SLAVE_DEFINED,ex);
} }
kdDebug()<<"kio_svn::del finished" << endl; kdDebug()<<"kio_svn::del finished" << endl;
finished(); finished();
@ -430,7 +430,7 @@ TQString kio_svnProtocol::makeSvnUrl(const KURL&url,bool check_Wc)
return res; return res;
} }
bool kio_svnProtocol::createUDSEntry( const TQString& filename, const TQString& user, long long int size, bool isdir, time_t mtime, KIO::UDSEntry& entry) bool kio_svnProtocol::createUDSEntry( const TQString& filename, const TQString& user, long long int size, bool isdir, time_t mtime, TDEIO::UDSEntry& entry)
{ {
#if 0 #if 0
kdDebug() << "MTime : " << ( long )mtime << endl; kdDebug() << "MTime : " << ( long )mtime << endl;
@ -438,29 +438,29 @@ bool kio_svnProtocol::createUDSEntry( const TQString& filename, const TQString&
kdDebug()<< "UDS Size: " << size << endl; kdDebug()<< "UDS Size: " << size << endl;
kdDebug()<< "UDS Dir: " << isdir << endl; kdDebug()<< "UDS Dir: " << isdir << endl;
#endif #endif
KIO::UDSAtom atom; TDEIO::UDSAtom atom;
atom.m_uds = KIO::UDS_NAME; atom.m_uds = TDEIO::UDS_NAME;
atom.m_str = filename; atom.m_str = filename;
entry.append( atom ); entry.append( atom );
atom.m_uds = KIO::UDS_FILE_TYPE; atom.m_uds = TDEIO::UDS_FILE_TYPE;
atom.m_long = isdir ? S_IFDIR : S_IFREG; atom.m_long = isdir ? S_IFDIR : S_IFREG;
entry.append( atom ); entry.append( atom );
atom.m_uds = KIO::UDS_ACCESS; atom.m_uds = TDEIO::UDS_ACCESS;
atom.m_long = isdir?0777:0666; atom.m_long = isdir?0777:0666;
entry.append(atom); entry.append(atom);
atom.m_uds = KIO::UDS_SIZE; atom.m_uds = TDEIO::UDS_SIZE;
atom.m_long = size; atom.m_long = size;
entry.append( atom ); entry.append( atom );
atom.m_uds = KIO::UDS_MODIFICATION_TIME; atom.m_uds = TDEIO::UDS_MODIFICATION_TIME;
atom.m_long = mtime; atom.m_long = mtime;
entry.append( atom ); entry.append( atom );
atom.m_uds = KIO::UDS_USER; atom.m_uds = TDEIO::UDS_USER;
atom.m_str = user; atom.m_str = user;
entry.append( atom ); entry.append( atom );
@ -649,7 +649,7 @@ void kio_svnProtocol::update(const KURL&url,int revnumber,const TQString&revkind
// sticky depth (last parameter) // sticky depth (last parameter)
m_pData->m_Svnclient->update(pathes, where,svn::DepthInfinity,false,false,true); m_pData->m_Svnclient->update(pathes, where,svn::DepthInfinity,false,false,true);
} catch (const svn::ClientException&e) { } 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 // rec all up noign
dlist = m_pData->m_Svnclient->status(wc.path(),rec?svn::DepthInfinity:svn::DepthEmpty,false,cR,false,where); dlist = m_pData->m_Svnclient->status(wc.path(),rec?svn::DepthInfinity:svn::DepthEmpty,false,cR,false,where);
} catch (const svn::ClientException&e) { } catch (const svn::ClientException&e) {
error(KIO::ERR_SLAVE_DEFINED,e.msg()); error(TDEIO::ERR_SLAVE_DEFINED,e.msg());
return; return;
} }
kdDebug()<<"Status got " << dlist.count() << " entries." << endl; kdDebug()<<"Status got " << dlist.count() << " entries." << endl;
@ -719,7 +719,7 @@ void kio_svnProtocol::commit(const KURL::List&url)
try { try {
nnum = m_pData->m_Svnclient->commit(svn::Targets(targets),msg,svn::DepthInfinity,false); nnum = m_pData->m_Svnclient->commit(svn::Targets(targets),msg,svn::DepthInfinity,false);
} catch (const svn::ClientException&e) { } catch (const svn::ClientException&e) {
error(KIO::ERR_SLAVE_DEFINED,e.msg()); error(TDEIO::ERR_SLAVE_DEFINED,e.msg());
} }
for (unsigned j=0;j<url.count();++j) { for (unsigned j=0;j<url.count();++j) {
TQString userstring; TQString userstring;
@ -749,7 +749,7 @@ void kio_svnProtocol::checkout(const KURL&src,const KURL&target,const int rev, c
KURL _src = makeSvnUrl(src); KURL _src = makeSvnUrl(src);
m_pData->m_Svnclient->checkout(_src.url(),_target,where,peg,svn::DepthInfinity,false,false); m_pData->m_Svnclient->checkout(_src.url(),_target,where,peg,svn::DepthInfinity,false,false);
} catch (const svn::ClientException&e) { } 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 { try {
logs = m_pData->m_Svnclient->log(makeSvnUrl(urls[j]),start,end,svn::Revision::UNDEFINED,true,true,0); logs = m_pData->m_Svnclient->log(makeSvnUrl(urls[j]),start,end,svn::Revision::UNDEFINED,true,true,0);
} catch (const svn::ClientException&e) { } catch (const svn::ClientException&e) {
error(KIO::ERR_SLAVE_DEFINED,e.msg()); error(TDEIO::ERR_SLAVE_DEFINED,e.msg());
break; break;
} }
if (!logs) { if (!logs) {
@ -811,7 +811,7 @@ void kio_svnProtocol::revert(const KURL::List&l)
try { try {
m_pData->m_Svnclient->revert(target,svn::DepthEmpty); m_pData->m_Svnclient->revert(target,svn::DepthEmpty);
} catch (const svn::ClientException&e) { } 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 { try {
m_pData->m_Svnclient->doSwitch(wc_path,makeSvnUrl(target.url()),where,rec?svn::DepthInfinity:svn::DepthFiles); m_pData->m_Svnclient->doSwitch(wc_path,makeSvnUrl(target.url()),where,rec?svn::DepthInfinity:svn::DepthFiles);
} catch (const svn::ClientException&e) { } 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()), ex = m_pData->m_Svnclient->diff(svn::Path(tdir.name()),
u1,u2,svn::Path(),r1, r2,rec?svn::DepthInfinity:svn::DepthEmpty,false,false,false); u1,u2,svn::Path(),r1, r2,rec?svn::DepthInfinity:svn::DepthEmpty,false,false,false);
} catch (const svn::ClientException&e) { } catch (const svn::ClientException&e) {
error(KIO::ERR_SLAVE_DEFINED,e.msg()); error(TDEIO::ERR_SLAVE_DEFINED,e.msg());
return; return;
} }
TQString out = TQString::FROMUTF8(ex); TQString out = TQString::FROMUTF8(ex);
@ -862,7 +862,7 @@ void kio_svnProtocol::import(const KURL& repos, const KURL& wc)
TQString path = wc.path(); TQString path = wc.path();
m_pData->m_Svnclient->import(svn::Path(path),target,TQString(),svn::DepthInfinity,false,false); m_pData->m_Svnclient->import(svn::Path(path),target,TQString(),svn::DepthInfinity,false,false);
} catch (const svn::ClientException&e) { } catch (const svn::ClientException&e) {
error(KIO::ERR_SLAVE_DEFINED,e.msg()); error(TDEIO::ERR_SLAVE_DEFINED,e.msg());
return; return;
} }
finished(); finished();
@ -875,7 +875,7 @@ void kio_svnProtocol::add(const KURL& wc)
/* rec */ /* rec */
m_pData->m_Svnclient->add(svn::Path(path),svn::DepthInfinity); m_pData->m_Svnclient->add(svn::Path(path),svn::DepthInfinity);
} catch (const svn::ClientException&e) { } catch (const svn::ClientException&e) {
error(KIO::ERR_SLAVE_DEFINED,e.msg()); error(TDEIO::ERR_SLAVE_DEFINED,e.msg());
return; return;
} }
finished(); finished();
@ -890,7 +890,7 @@ void kio_svnProtocol::wc_delete(const KURL::List&l)
try { try {
m_pData->m_Svnclient->remove(svn::Targets(p),false); m_pData->m_Svnclient->remove(svn::Targets(p),false);
} catch (const svn::ClientException&e) { } catch (const svn::ClientException&e) {
error(KIO::ERR_SLAVE_DEFINED,e.msg()); error(TDEIO::ERR_SLAVE_DEFINED,e.msg());
return; return;
} }
finished(); finished();
@ -902,13 +902,13 @@ void kio_svnProtocol::wc_resolve(const KURL&url,bool recurse)
svn::Depth depth=recurse?svn::DepthInfinity:svn::DepthEmpty; svn::Depth depth=recurse?svn::DepthInfinity:svn::DepthEmpty;
m_pData->m_Svnclient->resolve(url.path(),depth); m_pData->m_Svnclient->resolve(url.path(),depth);
} catch (const svn::ClientException&e) { } catch (const svn::ClientException&e) {
error(KIO::ERR_SLAVE_DEFINED,e.msg()); error(TDEIO::ERR_SLAVE_DEFINED,e.msg());
return; return;
} }
finished(); finished();
} }
void kio_svnProtocol::streamWritten(const KIO::filesize_t current) void kio_svnProtocol::streamWritten(const TDEIO::filesize_t current)
{ {
processedSize(current); processedSize(current);
} }
@ -951,4 +951,4 @@ TQString kio_svnProtocol::getDefaultLog()
return res; return res;
} }
} // namespace KIO } // namespace TDEIO

8
src/kiosvn/kiosvn.h
Unescape View File

@ -33,7 +33,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <tqvaluelist.h> #include <tqvaluelist.h>
namespace KIO namespace TDEIO
{ {
class KioSvnData; class KioSvnData;
@ -41,7 +41,7 @@ class KioSvnData;
/** /**
@author Rajko Albrecht @author Rajko Albrecht
*/ */
class kio_svnProtocol : public KIO::SlaveBase,public StreamWrittenCb class kio_svnProtocol : public TDEIO::SlaveBase,public StreamWrittenCb
{ {
public: public:
kio_svnProtocol(const TQCString &pool_socket, const TQCString &app_socket); 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); 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 streamPushData(TQByteArray);
virtual void streamSendMime(KMimeMagicResult*mt); virtual void streamSendMime(KMimeMagicResult*mt);
virtual void streamTotalSizeNull(); virtual void streamTotalSizeNull();
@ -107,7 +107,7 @@ protected:
private: private:
KioSvnData*m_pData; 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); TQString makeSvnUrl(const KURL&url,bool check_wc=true);
bool checkWc(const KURL&url); bool checkWc(const KURL&url);
bool getLogMsg(TQString&); bool getLogMsg(TQString&);

10
src/ksvnwidgets/logmsg_impl.cpp
Unescape View File

@ -221,7 +221,7 @@ void Logmsg_impl::initHistory()
{ {
if (smax_message_history==0xFFFF) { if (smax_message_history==0xFFFF) {
smax_message_history = Kdesvnsettings::max_log_messages(); smax_message_history = Kdesvnsettings::max_log_messages();
KConfigGroup cs(Kdesvnsettings::self()->config(),"log_messages"); TDEConfigGroup cs(Kdesvnsettings::self()->config(),"log_messages");
TQString s = TQString(); TQString s = TQString();
unsigned int current = 0; unsigned int current = 0;
TQString key = TQString("log_%0").arg(current); TQString key = TQString("log_%0").arg(current);
@ -268,7 +268,7 @@ void Logmsg_impl::saveHistory(bool canceld)
if (sLogHistory.size()>smax_message_history) { if (sLogHistory.size()>smax_message_history) {
sLogHistory.erase(sLogHistory.fromLast()); 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) { for (unsigned int i = 0; i < sLogHistory.size();++i) {
cs.writeEntry(TQString("log_%0").arg(i),sLogHistory[i]); cs.writeEntry(TQString("log_%0").arg(i),sLogHistory[i]);
} }
@ -641,11 +641,11 @@ void Logmsg_impl::insertFile()
insertFile(_url.path()); insertFile(_url.path());
} else { } else {
TQString tmpFile; TQString tmpFile;
if( KIO::NetAccess::download(_url, tmpFile, this) ) { if( TDEIO::NetAccess::download(_url, tmpFile, this) ) {
insertFile( tmpFile ); insertFile( tmpFile );
KIO::NetAccess::removeTempFile( tmpFile ); TDEIO::NetAccess::removeTempFile( tmpFile );
} else { } else {
KMessageBox::error(this, KIO::NetAccess::lastErrorString() ); KMessageBox::error(this, TDEIO::NetAccess::lastErrorString() );
} }
} }
} }

2
src/settings/tdesvn_part.kcfg
Unescape View File

@ -243,7 +243,7 @@
</entry> </entry>
<entry key="kio_use_standard_logmsg" type="Bool" > <entry key="kio_use_standard_logmsg" type="Bool" >
<default>false</default> <default>false</default>
<label>KIO::svn operations uses a standard logmessage</label> <label>TDEIO::svn operations uses a standard logmessage</label>
</entry> </entry>
<entry key="kio_standard_logmsg" type="String"> <entry key="kio_standard_logmsg" type="String">
<default>Revision made with tdesvn KIO.</default> <default>Revision made with tdesvn KIO.</default>

2
src/svnfrontend/graphtree/drawparams.h
Unescape View File

@ -43,7 +43,7 @@
class TQPopupMenu; class TQPopupMenu;
class TQString; class TQString;
class KConfigGroup; class TDEConfigGroup;
/** /**

4
src/svnfrontend/svnactions.cpp
Unescape View File

@ -126,7 +126,7 @@ public:
for (it=m_tempdirlist.begin();it!=m_tempdirlist.end();++it) { for (it=m_tempdirlist.begin();it!=m_tempdirlist.end();++it) {
for (TQStringList::iterator it2 = (*it).begin(); for (TQStringList::iterator it2 = (*it).begin();
it2 != (*it).end();++it2) { it2 != (*it).end();++it2) {
KIO::NetAccess::del((*it2),0); TDEIO::NetAccess::del((*it2),0);
} }
} }
delete m_Svnclient; 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()) { if ( (it=m_Data->m_tempdirlist.find(proc))!=m_Data->m_tempdirlist.end()) {
for (TQStringList::iterator it2 = (*it).begin(); for (TQStringList::iterator it2 = (*it).begin();
it2 != (*it).end();++it2) { it2 != (*it).end();++it2) {
KIO::NetAccess::del((*it2),0); TDEIO::NetAccess::del((*it2),0);
} }
m_Data->m_tempdirlist.erase(it); m_Data->m_tempdirlist.erase(it);
} }

2
src/svnfrontend/svnactions.h
Unescape View File

@ -53,7 +53,7 @@ namespace svn {
class InfoEntry; class InfoEntry;
} }
namespace KIO { namespace TDEIO {
class Job; class Job;
} }

4
src/svnfrontend/svnfiletip.cpp
Unescape View File

@ -268,10 +268,10 @@ void SvnFileTip::startDelayed()
KFileItemList oneItem; KFileItemList oneItem;
oneItem.append( m_svnitem->fileItem() ); 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 & ) ), connect( m_previewJob, TQT_SIGNAL( gotPreview( const KFileItem *, const TQPixmap & ) ),
this, TQT_SLOT( 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() ) ); this, TQT_SLOT( gotPreviewResult() ) );
} }

2
src/svnfrontend/svnfiletip.h
Unescape View File

@ -90,7 +90,7 @@ public:
int m_num; int m_num;
TQScrollView* m_view; TQScrollView* m_view;
SvnItem* m_svnitem; SvnItem* m_svnitem;
KIO::PreviewJob* m_previewJob; TDEIO::PreviewJob* m_previewJob;
TQRect m_rect; TQRect m_rect;
TQTimer* m_timer; TQTimer* m_timer;
}; };

8
src/svnfrontend/svnlogdlgimp.cpp
Unescape View File

@ -206,7 +206,7 @@ SvnLogDlgImp::SvnLogDlgImp(SvnActions*ac,TQWidget *parent, const char *name,bool
m_ChangedList->hide(); m_ChangedList->hide();
} }
m_Actions = ac; m_Actions = ac;
KConfigGroup cs(Kdesvnsettings::self()->config(), groupName); TDEConfigGroup cs(Kdesvnsettings::self()->config(), groupName);
TQString t1 = cs.readEntry("logsplitter",TQString()); TQString t1 = cs.readEntry("logsplitter",TQString());
if (!t1.isEmpty()) { if (!t1.isEmpty()) {
TQTextStream st2(&t1,IO_ReadOnly); TQTextStream st2(&t1,IO_ReadOnly);
@ -228,7 +228,7 @@ SvnLogDlgImp::~SvnLogDlgImp()
st1 << *m_rightSplitter; st1 << *m_rightSplitter;
TQTextStream st2(&t2,IO_WriteOnly); TQTextStream st2(&t2,IO_WriteOnly);
st2 << *m_centralSplitter; st2 << *m_centralSplitter;
KConfigGroup cs(Kdesvnsettings::self()->config(), groupName); TDEConfigGroup cs(Kdesvnsettings::self()->config(), groupName);
cs.writeEntry("right_logsplitter",t1); cs.writeEntry("right_logsplitter",t1);
cs.writeEntry("logsplitter",t2); cs.writeEntry("logsplitter",t2);
cs.writeEntry("laststate",m_ChangedList->isHidden()); cs.writeEntry("laststate",m_ChangedList->isHidden());
@ -442,7 +442,7 @@ void SvnLogDlgImp::saveSize()
{ {
int scnum = TQApplication::desktop()->screenNumber(parentWidget()); int scnum = TQApplication::desktop()->screenNumber(parentWidget());
TQRect desk = TQApplication::desktop()->screenGeometry(scnum); TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
KConfigGroupSaver cs(Kdesvnsettings::self()->config(), groupName); TDEConfigGroupSaver cs(Kdesvnsettings::self()->config(), groupName);
TQSize sizeToSave = size(); TQSize sizeToSave = size();
Kdesvnsettings::self()->config()->writeEntry( TQString::fromLatin1("Width %1").arg( desk.width()), Kdesvnsettings::self()->config()->writeEntry( TQString::fromLatin1("Width %1").arg( desk.width()),
TQString::number( sizeToSave.width()), true, false); TQString::number( sizeToSave.width()), true, false);
@ -457,7 +457,7 @@ TQSize SvnLogDlgImp::dialogSize()
TQRect desk = TQApplication::desktop()->screenGeometry(scnum); TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
w = sizeHint().width(); w = sizeHint().width();
h = sizeHint().height(); 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 ); 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 ); h = Kdesvnsettings::self()->config()->readNumEntry( TQString::fromLatin1("Height %1").arg( desk.height()), h );
return( TQSize( w, h ) ); return( TQSize( w, h ) );

22
src/svnfrontend/tdesvnfilelist.cpp
Unescape View File

@ -1813,9 +1813,9 @@ void tdesvnfilelist::slotDropped(TQDropEvent* event,TQListViewItem*item)
slotImportIntoDir(urlList[0],tdir,fi.isDir()); slotImportIntoDir(urlList[0],tdir,fi.isDir());
} else { } else {
//m_pList->stopScan(); //m_pList->stopScan();
KIO::Job * job = 0L; TDEIO::Job * job = 0L;
job = KIO::copy(urlList,tdir); job = TDEIO::copy(urlList,tdir);
connect( job, TQT_SIGNAL( result( KIO::Job * ) ),TQT_SLOT( slotCopyFinished( KIO::Job * ) ) ); connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),TQT_SLOT( slotCopyFinished( TDEIO::Job * ) ) );
dispDummy(); dispDummy();
event->acceptAction(); event->acceptAction();
return; 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) { if (m_pList->m_DirWatch) {
m_pList->m_DirWatch->startScan(false); m_pList->m_DirWatch->startScan(false);
@ -1953,8 +1953,8 @@ void tdesvnfilelist::slotCopyFinished( KIO::Job * job)
} }
// always just connect a CopyJob here!!!! // always just connect a CopyJob here!!!!
if (ok) { if (ok) {
KURL::List lst = static_cast<KIO::CopyJob*>(job)->srcURLs(); KURL::List lst = static_cast<TDEIO::CopyJob*>(job)->srcURLs();
KURL turl = static_cast<KIO::CopyJob*>(job)->destURL(); KURL turl = static_cast<TDEIO::CopyJob*>(job)->destURL();
TQString base = turl.path(1); TQString base = turl.path(1);
KURL::List::iterator iter; KURL::List::iterator iter;
TQValueList<svn::Path> tmp; TQValueList<svn::Path> tmp;
@ -2004,8 +2004,8 @@ void tdesvnfilelist::slotDelete()
return; return;
} }
if (kioList.count()>0) { if (kioList.count()>0) {
KIO::Job*aJob = KIO::del(kioList); TDEIO::Job*aJob = TDEIO::del(kioList);
connect(aJob,TQT_SIGNAL(result (KIO::Job *)),this,TQT_SLOT(slotDeleteFinished(KIO::Job*))); connect(aJob,TQT_SIGNAL(result (TDEIO::Job *)),this,TQT_SLOT(slotDeleteFinished(TDEIO::Job*)));
dispDummy(); dispDummy();
} }
if (m_deletePerfect && items.size()>0) { 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) { if (job) {
tqApp->exit_loop(); tqApp->exit_loop();

6
src/svnfrontend/tdesvnfilelist.h
Unescape View File

@ -40,7 +40,7 @@ class KDialogBase;
class KdesvnFileListPrivate; class KdesvnFileListPrivate;
class SvnActions; class SvnActions;
namespace KIO { namespace TDEIO {
class Job; class Job;
} }
@ -169,8 +169,8 @@ protected slots:
virtual void slotDisplayLastDiff(); virtual void slotDisplayLastDiff();
/* callback slots */ /* callback slots */
virtual void slotCopyFinished( KIO::Job *); virtual void slotCopyFinished( TDEIO::Job *);
virtual void slotDeleteFinished(KIO::Job*); virtual void slotDeleteFinished(TDEIO::Job*);
virtual void _openURL(const TQString&); virtual void _openURL(const TQString&);
virtual void _dirwatchTimeout(); virtual void _dirwatchTimeout();
virtual void _propListTimeout(); virtual void _propListTimeout();

12
src/tdesvn.cpp
Unescape View File

@ -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(TDEGlobal::config(),"startup"); TDEConfigGroup 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)));
} }
@ -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 // the 'config' object points to the session managed
// config file. anything you write here will be available // 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 // the 'config' object points to the session managed
// config file. this function is automatically called whenever // config file. this function is automatically called whenever
@ -411,7 +411,7 @@ void tdesvn::optionsConfigureKeys()
bool tdesvn::queryExit() bool tdesvn::queryExit()
{ {
if (m_part) { if (m_part) {
KConfigGroup cs(TDEGlobal::config(),"startup"); TDEConfigGroup 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(TDEGlobal::config(),"startup"); TDEConfigGroup 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(TDEGlobal::config(),"startup"); TDEConfigGroup cs(TDEGlobal::config(),"startup");
cs.writeEntry("load_last_on_start",how); cs.writeEntry("load_last_on_start",how);
} }

6
src/tdesvn.h
Unescape View File

@ -67,14 +67,14 @@ protected:
* This function is called when it is time for the app to save its * This function is called when it is time for the app to save its
* properties for session management purposes. * 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 * object points to the session management config file that was saved
* with @ref saveProperties * with @ref saveProperties
*/ */
void readProperties(KConfig *); void readProperties(TDEConfig *);
virtual bool queryExit(); virtual bool queryExit();
void enableClose(bool how); void enableClose(bool how);

4
src/tdesvn_part.cpp
Unescape View File

@ -344,10 +344,10 @@ void tdesvnPart::appHelpActivated()
*/ */
void tdesvnPart::slotShowSettings() void tdesvnPart::slotShowSettings()
{ {
if (KConfigDialog::showDialog("tdesvnpart_settings")) { if (TDEConfigDialog::showDialog("tdesvnpart_settings")) {
return; return;
} }
KConfigDialog *dialog = new KConfigDialog(widget(), TDEConfigDialog *dialog = new TDEConfigDialog(widget(),
"tdesvnpart_settings", "tdesvnpart_settings",
Kdesvnsettings::self(), Kdesvnsettings::self(),
KDialogBase::IconList); KDialogBase::IconList);

4
src/tdesvnview.cpp
Unescape View File

@ -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(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(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())); 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()); TQString t1 = cs.readEntry("split1",TQString());
if (!t1.isEmpty()) { if (!t1.isEmpty()) {
TQTextStream st1(&t1,IO_ReadOnly); TQTextStream st1(&t1,IO_ReadOnly);
@ -116,7 +116,7 @@ void tdesvnView::slotAppendLog(const TQString& text)
tdesvnView::~tdesvnView() tdesvnView::~tdesvnView()
{ {
KConfigGroup cs(Kdesvnsettings::self()->config(),"tdesvn-mainlayout"); TDEConfigGroup cs(Kdesvnsettings::self()->config(),"tdesvn-mainlayout");
TQString t1,t2; TQString t1,t2;
TQTextStream st1(&t1,IO_WriteOnly); TQTextStream st1(&t1,IO_WriteOnly);
st1 << *m_Splitter; st1 << *m_Splitter;

8
src/urldlg.cpp
Unescape View File

@ -54,8 +54,8 @@ 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 = TDEGlobal::config(); TDEConfig *kc = TDEGlobal::config();
KConfigGroupSaver ks( kc, TQString::fromLatin1("Open-repository settings") ); TDEConfigGroupSaver 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 );
TQStringList list = kc->readListEntry( TQString::fromLatin1("History") ); TQStringList list = kc->readListEntry( TQString::fromLatin1("History") );
@ -87,8 +87,8 @@ 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 = TDEGlobal::config(); TDEConfig *kc = TDEGlobal::config();
KConfigGroupSaver ks(kc, TQString::fromLatin1("Open-repository settings")); TDEConfigGroupSaver 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();
} }

2
tdesvn.spec
Unescape View File

@ -27,7 +27,7 @@ Group: Development/Tools
Summary: A kde-kio integration for subversion based on tdesvn Summary: A kde-kio integration for subversion based on tdesvn
%description kiosvn %description kiosvn
KIO integration (KIO::svn) based on tdesvn alternative protocol name. KIO integration (TDEIO::svn) based on tdesvn alternative protocol name.
%package devel %package devel
Group: Development/Libraries Group: Development/Libraries

2
tdesvn.spec.in
Unescape View File

@ -27,7 +27,7 @@ Group: Development/Tools
Summary: A kde-kio integration for subversion based on tdesvn Summary: A kde-kio integration for subversion based on tdesvn
%description kiosvn %description kiosvn
KIO integration (KIO::svn) based on tdesvn alternative protocol name. KIO integration (TDEIO::svn) based on tdesvn alternative protocol name.
%package devel %package devel
Group: Development/Libraries Group: Development/Libraries

Write Preview
Loading…
Cancel
Save