diff options
Diffstat (limited to 'vcs')
| -rw-r--r-- | vcs/subversion/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | vcs/subversion/Makefile.am | 8 | ||||
| -rw-r--r-- | vcs/subversion/kdevsvn+file.protocol | 2 | ||||
| -rw-r--r-- | vcs/subversion/kdevsvn+http.protocol | 2 | ||||
| -rw-r--r-- | vcs/subversion/kdevsvn+https.protocol | 2 | ||||
| -rw-r--r-- | vcs/subversion/kdevsvn+ssh.protocol | 2 | ||||
| -rw-r--r-- | vcs/subversion/kdevsvn+svn.protocol | 2 | ||||
| -rw-r--r-- | vcs/subversion/svn_tdeio.cpp (renamed from vcs/subversion/svn_kio.cpp) | 248 | ||||
| -rw-r--r-- | vcs/subversion/svn_tdeio.h (renamed from vcs/subversion/svn_kio.h) | 14 |
9 files changed, 143 insertions, 143 deletions
diff --git a/vcs/subversion/CMakeLists.txt b/vcs/subversion/CMakeLists.txt index 0e902488..fb51fe3d 100644 --- a/vcs/subversion/CMakeLists.txt +++ b/vcs/subversion/CMakeLists.txt @@ -59,11 +59,11 @@ tde_add_kpart( libkdevsubversion AUTOMOC ) -##### kio_kdevsvn (module) ###################### +##### tdeio_kdevsvn (module) ###################### -tde_add_kpart( kio_kdevsvn AUTOMOC +tde_add_kpart( tdeio_kdevsvn AUTOMOC SOURCES - svn_kio.cpp + svn_tdeio.cpp LINK tdeio-shared ${SVN_LIBRARIES} ${APR_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/vcs/subversion/Makefile.am b/vcs/subversion/Makefile.am index ce853943..ba5d6c0f 100644 --- a/vcs/subversion/Makefile.am +++ b/vcs/subversion/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util -I$(top_srcdi METASOURCES = AUTO -kde_module_LTLIBRARIES = libkdevsubversion.la kio_kdevsvn.la kded_kdevsvnd.la +kde_module_LTLIBRARIES = libkdevsubversion.la tdeio_kdevsvn.la kded_kdevsvnd.la libkdevsubversion_la_SOURCES = subversion_core.cpp subversion_fileinfo.cpp \ subversion_fileinfo.skel subversion_part.cpp subversion_widget.cpp subversiondiff.ui \ @@ -14,9 +14,9 @@ libkdevsubversion_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir) libkdevsubversion_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -kio_kdevsvn_la_SOURCES = svn_kio.cpp -kio_kdevsvn_la_LIBADD = $(LIB_KIO) -kio_kdevsvn_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) $(SVN_LIB) +tdeio_kdevsvn_la_SOURCES = svn_tdeio.cpp +tdeio_kdevsvn_la_LIBADD = $(LIB_KIO) +tdeio_kdevsvn_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) $(SVN_LIB) kded_kdevsvnd_la_SOURCES = commitdlg.cpp commitdlgbase.ui kdevsvnd.cpp \ kdevsvnd.skel kdevsvnd_widgets.cpp svnssltrustpromptbase.ui diff --git a/vcs/subversion/kdevsvn+file.protocol b/vcs/subversion/kdevsvn+file.protocol index 8ac6ec11..412c3800 100644 --- a/vcs/subversion/kdevsvn+file.protocol +++ b/vcs/subversion/kdevsvn+file.protocol @@ -1,5 +1,5 @@ [Protocol] -exec=kio_kdevsvn +exec=tdeio_kdevsvn protocol=kdevsvn+file input=none output=filesystem diff --git a/vcs/subversion/kdevsvn+http.protocol b/vcs/subversion/kdevsvn+http.protocol index 2c02d3d7..5a063b85 100644 --- a/vcs/subversion/kdevsvn+http.protocol +++ b/vcs/subversion/kdevsvn+http.protocol @@ -1,5 +1,5 @@ [Protocol] -exec=kio_kdevsvn +exec=tdeio_kdevsvn protocol=kdevsvn+http input=none output=filesystem diff --git a/vcs/subversion/kdevsvn+https.protocol b/vcs/subversion/kdevsvn+https.protocol index 82f9f22f..d064e575 100644 --- a/vcs/subversion/kdevsvn+https.protocol +++ b/vcs/subversion/kdevsvn+https.protocol @@ -1,5 +1,5 @@ [Protocol] -exec=kio_kdevsvn +exec=tdeio_kdevsvn protocol=kdevsvn+https input=none output=filesystem diff --git a/vcs/subversion/kdevsvn+ssh.protocol b/vcs/subversion/kdevsvn+ssh.protocol index efc67f6c..512b4a90 100644 --- a/vcs/subversion/kdevsvn+ssh.protocol +++ b/vcs/subversion/kdevsvn+ssh.protocol @@ -1,5 +1,5 @@ [Protocol] -exec=kio_kdevsvn +exec=tdeio_kdevsvn protocol=kdevsvn+ssh input=none output=filesystem diff --git a/vcs/subversion/kdevsvn+svn.protocol b/vcs/subversion/kdevsvn+svn.protocol index c4b56816..8f496854 100644 --- a/vcs/subversion/kdevsvn+svn.protocol +++ b/vcs/subversion/kdevsvn+svn.protocol @@ -1,5 +1,5 @@ [Protocol] -exec=kio_kdevsvn +exec=tdeio_kdevsvn protocol=kdevsvn+svn input=none output=filesystem diff --git a/vcs/subversion/svn_kio.cpp b/vcs/subversion/svn_tdeio.cpp index 1680595a..21ef2d2f 100644 --- a/vcs/subversion/svn_kio.cpp +++ b/vcs/subversion/svn_tdeio.cpp @@ -51,7 +51,7 @@ #include <kmimetype.h> #include <tqfile.h> -#include "svn_kio.h" +#include "svn_tdeio.h" #include <apr_portable.h> // #include "commitdlg.h" #include <ktextedit.h> @@ -115,9 +115,9 @@ compare_items_as_paths (const svn_sort__item_t*a, const svn_sort__item_t*b) { return svn_path_compare_paths ((const char *)a->key, (const char *)b->key); } -kio_svnProtocol::kio_svnProtocol(const TQCString &pool_socket, const TQCString &app_socket) - : SlaveBase("kio_svn", pool_socket, app_socket) { - kdDebug(9036) << "kio_svnProtocol::kio_svnProtocol()" << endl; +tdeio_svnProtocol::tdeio_svnProtocol(const TQCString &pool_socket, const TQCString &app_socket) + : SlaveBase("tdeio_svn", pool_socket, app_socket) { + kdDebug(9036) << "tdeio_svnProtocol::tdeio_svnProtocol()" << endl; m_counter = 0; @@ -131,25 +131,25 @@ kio_svnProtocol::kio_svnProtocol(const TQCString &pool_socket, const TQCString & svn_error_t *err = svn_client_create_context(&ctx, pool); if ( err ) { - kdDebug(9036) << "kio_svnProtocol::kio_svnProtocol() create_context ERROR" << endl; + kdDebug(9036) << "tdeio_svnProtocol::tdeio_svnProtocol() create_context ERROR" << endl; error( TDEIO::ERR_SLAVE_DEFINED, err->message ); return; } err = svn_config_ensure (NULL,pool); if ( err ) { - kdDebug(9036) << "kio_svnProtocol::kio_svnProtocol() configensure ERROR" << endl; + kdDebug(9036) << "tdeio_svnProtocol::tdeio_svnProtocol() configensure ERROR" << endl; error( TDEIO::ERR_SLAVE_DEFINED, err->message ); return; } svn_config_get_config (&ctx->config, NULL, pool); - ctx->log_msg_func = kio_svnProtocol::commitLogPrompt; + ctx->log_msg_func = tdeio_svnProtocol::commitLogPrompt; ctx->log_msg_baton = this; //pass this so that we can get a dcopClient from it //TODO ctx->cancel_func = NULL; // progress notifications - ctx->progress_func = kio_svnProtocol::progressCallback; + ctx->progress_func = tdeio_svnProtocol::progressCallback; ctx->progress_baton = this; apr_array_header_t *providers = apr_array_make(pool, 15, sizeof(svn_auth_provider_object_t *)); @@ -163,11 +163,11 @@ kio_svnProtocol::kio_svnProtocol(const TQCString &pool_socket, const TQCString & APR_ARRAY_PUSH(providers, svn_auth_provider_object_t*) = provider; //interactive prompt - svn_client_get_simple_prompt_provider (&provider,kio_svnProtocol::checkAuth,this,2,pool); + svn_client_get_simple_prompt_provider (&provider,tdeio_svnProtocol::checkAuth,this,2,pool); APR_ARRAY_PUSH(providers, svn_auth_provider_object_t*) = provider; //we always ask user+pass, no need for a user only question /* svn_client_get_username_prompt_provider - * (&provider,kio_svnProtocol::checkAuth,this,2,pool); + * (&provider,tdeio_svnProtocol::checkAuth,this,2,pool); APR_ARRAY_PUSH(providers, svn_auth_provider_object_t*) = provider;*/ //SSL disk cache, keep that one, because it does nothing bad :) @@ -179,25 +179,25 @@ kio_svnProtocol::kio_svnProtocol(const TQCString &pool_socket, const TQCString & APR_ARRAY_PUSH (providers, svn_auth_provider_object_t *) = provider; //SSL interactive prompt, where things get hard - svn_client_get_ssl_server_trust_prompt_provider (&provider, kio_svnProtocol::trustSSLPrompt, (void*)this, pool); + svn_client_get_ssl_server_trust_prompt_provider (&provider, tdeio_svnProtocol::trustSSLPrompt, (void*)this, pool); APR_ARRAY_PUSH (providers, svn_auth_provider_object_t *) = provider; - svn_client_get_ssl_client_cert_prompt_provider (&provider, kio_svnProtocol::clientCertSSLPrompt, (void*)this, 2, pool); + svn_client_get_ssl_client_cert_prompt_provider (&provider, tdeio_svnProtocol::clientCertSSLPrompt, (void*)this, 2, pool); APR_ARRAY_PUSH (providers, svn_auth_provider_object_t *) = provider; - svn_client_get_ssl_client_cert_pw_prompt_provider (&provider, kio_svnProtocol::clientCertPasswdPrompt, (void*)this, 2, pool); + svn_client_get_ssl_client_cert_pw_prompt_provider (&provider, tdeio_svnProtocol::clientCertPasswdPrompt, (void*)this, 2, pool); APR_ARRAY_PUSH (providers, svn_auth_provider_object_t *) = provider; svn_auth_open(&ctx->auth_baton, providers, pool); } -kio_svnProtocol::~kio_svnProtocol(){ - kdDebug(9036) << "kio_svnProtocol::~kio_svnProtocol()" << endl; +tdeio_svnProtocol::~tdeio_svnProtocol(){ + kdDebug(9036) << "tdeio_svnProtocol::~tdeio_svnProtocol()" << endl; svn_pool_destroy(pool); apr_terminate(); } -void kio_svnProtocol::initNotifier(bool is_checkout, bool is_export, bool suppress_final_line, apr_pool_t *spool) { +void tdeio_svnProtocol::initNotifier(bool is_checkout, bool is_export, bool suppress_final_line, apr_pool_t *spool) { m_counter=0;//reset counter - ctx->notify_func = kio_svnProtocol::notify; + ctx->notify_func = tdeio_svnProtocol::notify; struct notify_baton *nb = ( struct notify_baton* )apr_palloc(spool, sizeof( struct notify_baton ) ); nb->master = this; nb->received_some_change = FALSE; @@ -212,9 +212,9 @@ void kio_svnProtocol::initNotifier(bool is_checkout, bool is_export, bool suppre ctx->notify_baton = nb; } -svn_error_t* kio_svnProtocol::checkAuth(svn_auth_cred_simple_t **cred, void *baton, const char *realm, const char *username, svn_boolean_t may_save, apr_pool_t *pool) { - kdDebug(9036) << "kio_svnProtocol::checkAuth() " << endl; - kio_svnProtocol *p = ( kio_svnProtocol* )baton; +svn_error_t* tdeio_svnProtocol::checkAuth(svn_auth_cred_simple_t **cred, void *baton, const char *realm, const char *username, svn_boolean_t may_save, apr_pool_t *pool) { + kdDebug(9036) << "tdeio_svnProtocol::checkAuth() " << endl; + tdeio_svnProtocol *p = ( tdeio_svnProtocol* )baton; svn_auth_cred_simple_t *ret = (svn_auth_cred_simple_t*)apr_pcalloc (pool, sizeof (*ret)); p->info.keepPassword = true; @@ -236,14 +236,14 @@ svn_error_t* kio_svnProtocol::checkAuth(svn_auth_cred_simple_t **cred, void *bat return SVN_NO_ERROR; } -void kio_svnProtocol::recordCurrentURL(const KURL& url) { +void tdeio_svnProtocol::recordCurrentURL(const KURL& url) { myURL = url; } //don't implement mimeType() until we don't need to download the whole file -void kio_svnProtocol::get(const KURL& url ){ - kdDebug(9036) << "kio_svn::get(const KURL& url)" << endl ; +void tdeio_svnProtocol::get(const KURL& url ){ + kdDebug(9036) << "tdeio_svn::get(const KURL& url)" << endl ; TQString remoteServer = url.host(); infoMessage(i18n("Looking for %1...").arg( remoteServer ) ); @@ -308,8 +308,8 @@ void kio_svnProtocol::get(const KURL& url ){ svn_pool_destroy (subpool); } -void kio_svnProtocol::stat(const KURL & url){ - kdDebug(9036) << "kio_svn::stat(const KURL& url) : " << url.url() << endl ; +void tdeio_svnProtocol::stat(const KURL & url){ + kdDebug(9036) << "tdeio_svn::stat(const KURL& url) : " << url.url() << endl ; void *ra_baton, *session; svn_ra_plugin_t *ra_lib; @@ -361,7 +361,7 @@ void kio_svnProtocol::stat(const KURL & url){ //start session svn_ra_callbacks_t *cbtable = (svn_ra_callbacks_t*)apr_pcalloc(subpool, sizeof(*cbtable)); - kio_svn_callback_baton_t *callbackbt = (kio_svn_callback_baton_t*)apr_pcalloc(subpool, sizeof( *callbackbt )); + tdeio_svn_callback_baton_t *callbackbt = (tdeio_svn_callback_baton_t*)apr_pcalloc(subpool, sizeof( *callbackbt )); cbtable->open_tmp_file = open_tmp_file; cbtable->get_wc_prop = NULL; @@ -415,8 +415,8 @@ void kio_svnProtocol::stat(const KURL & url){ svn_pool_destroy( subpool ); } -void kio_svnProtocol::listDir(const KURL& url){ - kdDebug(9036) << "kio_svn::listDir(const KURL& url) : " << url.url() << endl ; +void tdeio_svnProtocol::listDir(const KURL& url){ + kdDebug(9036) << "tdeio_svn::listDir(const KURL& url) : " << url.url() << endl ; apr_pool_t *subpool = svn_pool_create (pool); apr_hash_t *dirents; @@ -500,7 +500,7 @@ void kio_svnProtocol::listDir(const KURL& url){ svn_pool_destroy (subpool); } -bool kio_svnProtocol::createUDSEntry( const TQString& filename, const TQString& user, long long int size, bool isdir, time_t mtime, UDSEntry& entry) { +bool tdeio_svnProtocol::createUDSEntry( const TQString& filename, const TQString& user, long long int size, bool isdir, time_t mtime, UDSEntry& entry) { kdDebug(9036) << "MTime : " << ( long )mtime << endl; kdDebug(9036) << "UDS filename : " << filename << endl; UDSAtom atom; @@ -528,8 +528,8 @@ bool kio_svnProtocol::createUDSEntry( const TQString& filename, const TQString& } // not used, at least for KDevelop -// void kio_svnProtocol::copy(const KURL & src, const KURL& dest, int /*permissions*/, bool /*overwrite*/) { -// kdDebug(9036) << "kio_svnProtocol::copy() Source : " << src.url() << " Dest : " << dest.url() << endl; +// void tdeio_svnProtocol::copy(const KURL & src, const KURL& dest, int /*permissions*/, bool /*overwrite*/) { +// kdDebug(9036) << "tdeio_svnProtocol::copy() Source : " << src.url() << " Dest : " << dest.url() << endl; // // apr_pool_t *subpool = svn_pool_create (pool); // svn_client_commit_info_t *commit_info = NULL; @@ -575,8 +575,8 @@ bool kio_svnProtocol::createUDSEntry( const TQString& filename, const TQString& // svn_pool_destroy (subpool); // } -void kio_svnProtocol::mkdir( const KURL::List& list, int /*permissions*/ ) { - kdDebug(9036) << "kio_svnProtocol::mkdir(LIST) : " << list << endl; +void tdeio_svnProtocol::mkdir( const KURL::List& list, int /*permissions*/ ) { + kdDebug(9036) << "tdeio_svnProtocol::mkdir(LIST) : " << list << endl; apr_pool_t *subpool = svn_pool_create (pool); svn_client_commit_info_t *commit_info = NULL; @@ -588,7 +588,7 @@ void kio_svnProtocol::mkdir( const KURL::List& list, int /*permissions*/ ) { KURL::List::const_iterator it = list.begin(), end = list.end(); for ( ; it != end; ++it ) { TQString cur = makeSvnURL( *it ); - kdDebug( 9036 ) << "kio_svnProtocol::mkdir raw url for subversion : " << cur << endl; + kdDebug( 9036 ) << "tdeio_svnProtocol::mkdir raw url for subversion : " << cur << endl; const char *_target = apr_pstrdup( subpool, svn_path_canonicalize( apr_pstrdup( subpool, cur.utf8() ), subpool ) ); (*(( const char ** )apr_array_push(( apr_array_header_t* )targets)) ) = _target; } @@ -605,8 +605,8 @@ void kio_svnProtocol::mkdir( const KURL::List& list, int /*permissions*/ ) { svn_pool_destroy (subpool); } -void kio_svnProtocol::mkdir( const KURL& url, int /*permissions*/ ) { - kdDebug(9036) << "kio_svnProtocol::mkdir() : " << url.url() << endl; +void tdeio_svnProtocol::mkdir( const KURL& url, int /*permissions*/ ) { + kdDebug(9036) << "tdeio_svnProtocol::mkdir() : " << url.url() << endl; apr_pool_t *subpool = svn_pool_create (pool); svn_client_commit_info_t *commit_info = NULL; @@ -630,8 +630,8 @@ void kio_svnProtocol::mkdir( const KURL& url, int /*permissions*/ ) { svn_pool_destroy (subpool); } -void kio_svnProtocol::del( const KURL& url, bool /*isfile*/ ) { - kdDebug(9036) << "kio_svnProtocol::del() : " << url.url() << endl; +void tdeio_svnProtocol::del( const KURL& url, bool /*isfile*/ ) { + kdDebug(9036) << "tdeio_svnProtocol::del() : " << url.url() << endl; apr_pool_t *subpool = svn_pool_create (pool); svn_client_commit_info_t *commit_info = NULL; @@ -655,8 +655,8 @@ void kio_svnProtocol::del( const KURL& url, bool /*isfile*/ ) { svn_pool_destroy (subpool); } -void kio_svnProtocol::rename(const KURL& src, const KURL& dest, bool /*overwrite*/) { - kdDebug(9036) << "kio_svnProtocol::rename() Source : " << src.url() << " Dest : " << dest.url() << endl; +void tdeio_svnProtocol::rename(const KURL& src, const KURL& dest, bool /*overwrite*/) { + kdDebug(9036) << "tdeio_svnProtocol::rename() Source : " << src.url() << " Dest : " << dest.url() << endl; apr_pool_t *subpool = svn_pool_create (pool); svn_client_commit_info_t *commit_info = NULL; @@ -703,14 +703,14 @@ void kio_svnProtocol::rename(const KURL& src, const KURL& dest, bool /*overwrite svn_pool_destroy (subpool); } -void kio_svnProtocol::special( const TQByteArray& data ) { -// kdDebug(9036) << "kio_svnProtocol::special" << endl; +void tdeio_svnProtocol::special( const TQByteArray& data ) { +// kdDebug(9036) << "tdeio_svnProtocol::special" << endl; TQDataStream stream(data, IO_ReadOnly); int tmp; stream >> tmp; - kdDebug(9036) << "kio_svnProtocol::special " << tmp << endl; + kdDebug(9036) << "tdeio_svnProtocol::special " << tmp << endl; switch ( tmp ) { case SVN_CHECKOUT: @@ -722,7 +722,7 @@ void kio_svnProtocol::special( const TQByteArray& data ) { stream >> wc; stream >> revnumber; stream >> revkind; - kdDebug(9036) << "kio_svnProtocol CHECKOUT from " << repository.url() << " to " << wc.url() << " at " << revnumber << " or " << revkind << endl; + kdDebug(9036) << "tdeio_svnProtocol CHECKOUT from " << repository.url() << " to " << wc.url() << " at " << revnumber << " or " << revkind << endl; checkout( repository, wc, revnumber, revkind ); break; } @@ -734,7 +734,7 @@ void kio_svnProtocol::special( const TQByteArray& data ) { stream >> list; stream >> revnumber; stream >> revkind; - kdDebug(9036) << "kio_svnProtocol UPDATE " << endl; + kdDebug(9036) << "tdeio_svnProtocol UPDATE " << endl; update( list, revnumber, revkind ); break; } @@ -746,7 +746,7 @@ void kio_svnProtocol::special( const TQByteArray& data ) { stream >> tmp; wclist << tmp; } - kdDebug(9036) << "kio_svnProtocol COMMIT" << endl; + kdDebug(9036) << "tdeio_svnProtocol COMMIT" << endl; commit( wclist ); break; } @@ -761,13 +761,13 @@ void kio_svnProtocol::special( const TQByteArray& data ) { stream >> tmp; wclist << tmp; } - kdDebug(9036) << "kio_svnProtocol COMMIT2" << endl; + kdDebug(9036) << "tdeio_svnProtocol COMMIT2" << endl; commit2( recurse, keeplocks, wclist ); break; } case SVN_LOG: { - kdDebug(9036) << "kio_svnProtocol LOG" << endl; + kdDebug(9036) << "tdeio_svnProtocol LOG" << endl; int revstart, revend; TQString revkindstart, revkindend; bool discorverChangedPath, strictNodeHistory; @@ -793,7 +793,7 @@ void kio_svnProtocol::special( const TQByteArray& data ) { KURL wc,repos; stream >> repos; stream >> wc; - kdDebug(9036) << "kio_svnProtocol IMPORT" << endl; + kdDebug(9036) << "tdeio_svnProtocol IMPORT" << endl; import(repos,wc); break; } @@ -801,7 +801,7 @@ void kio_svnProtocol::special( const TQByteArray& data ) { { KURL::List wcList; stream >> wcList; - kdDebug(9036) << "kio_svnProtocol ADD" << endl; + kdDebug(9036) << "tdeio_svnProtocol ADD" << endl; add(wcList); break; } @@ -809,7 +809,7 @@ void kio_svnProtocol::special( const TQByteArray& data ) { { KURL::List wclist; stream >> wclist; - kdDebug(9036) << "kio_svnProtocol DEL" << endl; + kdDebug(9036) << "tdeio_svnProtocol DEL" << endl; wc_delete(wclist); break; } @@ -817,7 +817,7 @@ void kio_svnProtocol::special( const TQByteArray& data ) { { KURL::List wclist; stream >> wclist; - kdDebug(9036) << "kio_svnProtocol REVERT" << endl; + kdDebug(9036) << "tdeio_svnProtocol REVERT" << endl; wc_revert(wclist); break; } @@ -852,7 +852,7 @@ void kio_svnProtocol::special( const TQByteArray& data ) { { KURL::List list; stream >> list; - kdDebug(9036) << "kio_svnProtocol MKDIR" << endl; + kdDebug(9036) << "tdeio_svnProtocol MKDIR" << endl; mkdir(list,0); break; } @@ -862,7 +862,7 @@ void kio_svnProtocol::special( const TQByteArray& data ) { bool recurse; stream >> url; stream >> recurse; - kdDebug(9036) << "kio_svnProtocol RESOLVE" << endl; + kdDebug(9036) << "tdeio_svnProtocol RESOLVE" << endl; wc_resolve(url,recurse); break; } @@ -877,7 +877,7 @@ void kio_svnProtocol::special( const TQByteArray& data ) { stream >> recurse; stream >> revnumber; stream >> revkind; - kdDebug(9036) << "kio_svnProtocol SWITCH" << endl; + kdDebug(9036) << "tdeio_svnProtocol SWITCH" << endl; svn_switch(wc,url,revnumber,revkind,recurse); break; } @@ -905,7 +905,7 @@ void kio_svnProtocol::special( const TQByteArray& data ) { stream >> rev2; stream >> revkind2; stream >> recurse >> pegdiff; - kdDebug(9036) << "kio_svnProtocol DIFF" << endl; + kdDebug(9036) << "tdeio_svnProtocol DIFF" << endl; svn_diff(url1,url2,rev1,rev2,revkind1,revkind2,recurse,pegdiff); break; } @@ -970,7 +970,7 @@ void kio_svnProtocol::special( const TQByteArray& data ) { } default: { - kdDebug(9036) << "kio_svnProtocol DEFAULT" << endl; + kdDebug(9036) << "tdeio_svnProtocol DEFAULT" << endl; break; } } @@ -978,7 +978,7 @@ void kio_svnProtocol::special( const TQByteArray& data ) { /** * not used anywhere, anymore */ -void kio_svnProtocol::popupMessage( const TQString& message ) { +void tdeio_svnProtocol::popupMessage( const TQString& message ) { // TQByteArray params; // TQDataStream stream(params, IO_WriteOnly); // stream << message; @@ -987,7 +987,7 @@ void kio_svnProtocol::popupMessage( const TQString& message ) { // kdWarning() << "Communication with KDED:KSvnd failed" << endl; } -void kio_svnProtocol::blame( KURL url, UrlMode /*mode*/,/* int pegRev, TQString pegRevKind,*/ int startRev, TQString startRevKind, int endRev, TQString endRevKind ) +void tdeio_svnProtocol::blame( KURL url, UrlMode /*mode*/,/* int pegRev, TQString pegRevKind,*/ int startRev, TQString startRevKind, int endRev, TQString endRevKind ) { kdDebug(9036) << " __TIME__ " << __TIME__ << endl; // kdDebug(9036) << " PegRev " << pegRev << pegRevKind << endl; @@ -1002,7 +1002,7 @@ void kio_svnProtocol::blame( KURL url, UrlMode /*mode*/,/* int pegRev, TQString // svn_opt_revision_t revPeg = createRevision( pegRev, pegRevKind, subpool ); //initNotifier(false, false, false, subpool); - svn_client_blame_receiver_t receiver = kio_svnProtocol::blameReceiver; + svn_client_blame_receiver_t receiver = tdeio_svnProtocol::blameReceiver; svn_error_t *err = svn_client_blame( path_or_url, &rev1, &rev2, receiver, (void*)this, ctx, subpool ); if ( err ) error( TDEIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) ); @@ -1011,9 +1011,9 @@ void kio_svnProtocol::blame( KURL url, UrlMode /*mode*/,/* int pegRev, TQString } -svn_error_t* kio_svnProtocol::blameReceiver( void *baton, apr_int64_t line_no, svn_revnum_t rev, const char *author, const char *date, const char *line, apr_pool_t *pool ) +svn_error_t* tdeio_svnProtocol::blameReceiver( void *baton, apr_int64_t line_no, svn_revnum_t rev, const char *author, const char *date, const char *line, apr_pool_t *pool ) { - kio_svnProtocol *p = (kio_svnProtocol*)baton; + tdeio_svnProtocol *p = (tdeio_svnProtocol*)baton; p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "LINE", TQString::number(line_no) ); p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "REV", TQString::number(rev) ); p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "AUTHOR", author ); @@ -1029,7 +1029,7 @@ svn_error_t* kio_svnProtocol::blameReceiver( void *baton, apr_int64_t line_no, s Thus retreiving URL from WC should be done here, using subversion native API. Thus, svn_log should get another flag (bool repositHistory )specifying between file:/// or URL */ -void kio_svnProtocol::svn_log( int revstart, const TQString& revkindstart, int revend, const TQString& revkindend, +void tdeio_svnProtocol::svn_log( int revstart, const TQString& revkindstart, int revend, const TQString& revkindend, bool discorverChangedPaths, bool strictNodeHistory, const KURL::List& urls ) { @@ -1056,7 +1056,7 @@ void kio_svnProtocol::svn_log( int revstart, const TQString& revkindstart, int r incCounter(); } - svn_log_message_receiver_t receiver = kio_svnProtocol::receiveLogMessage; + svn_log_message_receiver_t receiver = tdeio_svnProtocol::receiveLogMessage; svn_error_t *err = svn_client_log2(targets, &rev1, &rev2, 0, discorverChangedPaths, strictNodeHistory, receiver, this, ctx, subpool); if ( err ){ error( TDEIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) ); @@ -1069,10 +1069,10 @@ void kio_svnProtocol::svn_log( int revstart, const TQString& revkindstart, int r } // save for one revision -svn_error_t* kio_svnProtocol::receiveLogMessage(void *baton, apr_hash_t *changed_paths, svn_revnum_t revision, +svn_error_t* tdeio_svnProtocol::receiveLogMessage(void *baton, apr_hash_t *changed_paths, svn_revnum_t revision, const char *author, const char *date, const char *message, apr_pool_t *pool ) { - kio_svnProtocol *p = (kio_svnProtocol*)baton; + tdeio_svnProtocol *p = (tdeio_svnProtocol*)baton; p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "rev", TQString::number(revision) ); p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "author", author ); p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "date", date ); @@ -1099,7 +1099,7 @@ svn_error_t* kio_svnProtocol::receiveLogMessage(void *baton, apr_hash_t *changed return SVN_NO_ERROR; } -svn_opt_revision_t kio_svnProtocol::createRevision( int revision, const TQString& revkind, apr_pool_t *pool ) { +svn_opt_revision_t tdeio_svnProtocol::createRevision( int revision, const TQString& revkind, apr_pool_t *pool ) { svn_opt_revision_t result;//,endrev; // TODO support svn_opt_revision_date if ( revision != -1 ) { @@ -1127,9 +1127,9 @@ svn_opt_revision_t kio_svnProtocol::createRevision( int revision, const TQString return result; } -void kio_svnProtocol::svn_diff(const KURL & url1, const KURL& url2,int rev1, int rev2,const TQString& revkind1,const TQString& revkind2,bool recurse, bool pegdiff ) +void tdeio_svnProtocol::svn_diff(const KURL & url1, const KURL& url2,int rev1, int rev2,const TQString& revkind1,const TQString& revkind2,bool recurse, bool pegdiff ) { - kdDebug(9036) << "kio_svn::diff : " << url1.path() << " at revision " << rev1 << " or " << revkind1 << " with " + kdDebug(9036) << "tdeio_svn::diff : " << url1.path() << " at revision " << rev1 << " or " << revkind1 << " with " << url2.path() << " at revision " << rev2 << " or " << revkind2 << endl ; @@ -1211,8 +1211,8 @@ void kio_svnProtocol::svn_diff(const KURL & url1, const KURL& url2,int rev1, int svn_pool_destroy (subpool); } -void kio_svnProtocol::svn_switch( const KURL& wc, const KURL& repos, int revnumber, const TQString& revkind, bool recurse) { - kdDebug(9036) << "kio_svn::switch : " << wc.path() << " at revision " << revnumber << " or " << revkind << endl ; +void tdeio_svnProtocol::svn_switch( const KURL& wc, const KURL& repos, int revnumber, const TQString& revkind, bool recurse) { + kdDebug(9036) << "tdeio_svn::switch : " << wc.path() << " at revision " << revnumber << " or " << revkind << endl ; apr_pool_t *subpool = svn_pool_create (pool); @@ -1242,7 +1242,7 @@ void kio_svnProtocol::svn_switch( const KURL& wc, const KURL& repos, int revnumb svn_pool_destroy (subpool); } -void kio_svnProtocol::svn_switch_relocate( const KURL &wc, const KURL &origUrl, const KURL &newUrl, +void tdeio_svnProtocol::svn_switch_relocate( const KURL &wc, const KURL &origUrl, const KURL &newUrl, bool recurse ) { apr_pool_t *subpool = svn_pool_create( pool ); @@ -1266,8 +1266,8 @@ void kio_svnProtocol::svn_switch_relocate( const KURL &wc, const KURL &origUrl, svn_pool_destroy( subpool ); } -void kio_svnProtocol::update( const KURL::List &list, int revnumber, const TQString& revkind ) { - kdDebug(9036) << "kio_svn::update : __TIME__" << __TIME__ << endl; +void tdeio_svnProtocol::update( const KURL::List &list, int revnumber, const TQString& revkind ) { + kdDebug(9036) << "tdeio_svn::update : __TIME__" << __TIME__ << endl; apr_pool_t *subpool = svn_pool_create (pool); @@ -1293,8 +1293,8 @@ void kio_svnProtocol::update( const KURL::List &list, int revnumber, const TQStr svn_pool_destroy (subpool); } -void kio_svnProtocol::import( const KURL& repos, const KURL& wc ) { - kdDebug(9036) << "kio_svnProtocol::import() : " << wc.url() << " into " << repos.url() << endl; +void tdeio_svnProtocol::import( const KURL& repos, const KURL& wc ) { + kdDebug(9036) << "tdeio_svnProtocol::import() : " << wc.url() << " into " << repos.url() << endl; apr_pool_t *subpool = svn_pool_create (pool); // svn_client_commit_info_t *commit_info = @@ -1319,8 +1319,8 @@ void kio_svnProtocol::import( const KURL& repos, const KURL& wc ) { finished(); } -void kio_svnProtocol::checkout( const KURL& repos, const KURL& wc, int revnumber, const TQString& revkind ) { - kdDebug(9036) << "kio_svn::checkout : " << repos.url() << " into " << wc.path() << " at revision " << revnumber << " or " << revkind << endl ; +void tdeio_svnProtocol::checkout( const KURL& repos, const KURL& wc, int revnumber, const TQString& revkind ) { + kdDebug(9036) << "tdeio_svn::checkout : " << repos.url() << " into " << wc.path() << " at revision " << revnumber << " or " << revkind << endl ; apr_pool_t *subpool = svn_pool_create (pool); KURL nurl = repos; @@ -1346,13 +1346,13 @@ void kio_svnProtocol::checkout( const KURL& repos, const KURL& wc, int revnumber svn_pool_destroy (subpool); } -void kio_svnProtocol::commit(const KURL::List& wc) +void tdeio_svnProtocol::commit(const KURL::List& wc) { commit2(true, true, wc); } -void kio_svnProtocol::commit2(bool recurse, bool keeplocks, const KURL::List& wc) { - kdDebug(9036) << "kio_svnProtocol::commit2() : " << wc << endl; +void tdeio_svnProtocol::commit2(bool recurse, bool keeplocks, const KURL::List& wc) { + kdDebug(9036) << "tdeio_svnProtocol::commit2() : " << wc << endl; apr_pool_t *subpool = svn_pool_create (pool); svn_client_commit_info_t *commit_info = NULL; @@ -1401,8 +1401,8 @@ void kio_svnProtocol::commit2(bool recurse, bool keeplocks, const KURL::List& wc svn_pool_destroy (subpool); } -void kio_svnProtocol::add(const KURL::List& list) { - kdDebug(9036) << "kio_svnProtocol::add() __TIME__" << __TIME__ << endl; +void tdeio_svnProtocol::add(const KURL::List& list) { + kdDebug(9036) << "tdeio_svnProtocol::add() __TIME__" << __TIME__ << endl; apr_pool_t *subpool = svn_pool_create (pool); bool nonrecursive = false; @@ -1429,8 +1429,8 @@ void kio_svnProtocol::add(const KURL::List& list) { svn_pool_destroy (subpool); } -void kio_svnProtocol::wc_delete(const KURL::List& wc) { - kdDebug(9036) << "kio_svnProtocol::wc_delete() : " << wc << endl; +void tdeio_svnProtocol::wc_delete(const KURL::List& wc) { + kdDebug(9036) << "tdeio_svnProtocol::wc_delete() : " << wc << endl; apr_pool_t *subpool = svn_pool_create (pool); svn_client_commit_info_t *commit_info = NULL; @@ -1455,8 +1455,8 @@ void kio_svnProtocol::wc_delete(const KURL::List& wc) { svn_pool_destroy (subpool); } -void kio_svnProtocol::wc_revert(const KURL::List& wc) { - kdDebug(9036) << "kio_svnProtocol::revert() : " << wc << endl; +void tdeio_svnProtocol::wc_revert(const KURL::List& wc) { + kdDebug(9036) << "tdeio_svnProtocol::revert() : " << wc << endl; apr_pool_t *subpool = svn_pool_create (pool); bool nonrecursive = false; @@ -1482,14 +1482,14 @@ void kio_svnProtocol::wc_revert(const KURL::List& wc) { svn_pool_destroy (subpool); } -void kio_svnProtocol::wc_status(const KURL& wc, bool checkRepos, bool fullRecurse, bool getAll, int revnumber, const TQString& revkind) { - kdDebug(9036) << "kio_svnProtocol::wc_status() : " << wc.url() << " checkRepos " << checkRepos << " fullRecurse " << fullRecurse << " getAll " << getAll << endl; +void tdeio_svnProtocol::wc_status(const KURL& wc, bool checkRepos, bool fullRecurse, bool getAll, int revnumber, const TQString& revkind) { + kdDebug(9036) << "tdeio_svnProtocol::wc_status() : " << wc.url() << " checkRepos " << checkRepos << " fullRecurse " << fullRecurse << " getAll " << getAll << endl; wc_status2( wc, checkRepos, fullRecurse, getAll, false, revnumber, revkind ); } -void kio_svnProtocol::wc_status2(const KURL& wc, bool checkRepos, bool fullRecurse, bool getAll, bool noIgnore, int revnumber, const TQString& revkind) { - kdDebug(9036) << "kio_svnProtocol::wc_status2() : " << wc.url() << " checkRepos " << checkRepos << " fullRecurse " << fullRecurse << " getAll " << getAll << " noIgnore " << noIgnore << " revnumber " << revnumber << " revkind " << revkind << endl; +void tdeio_svnProtocol::wc_status2(const KURL& wc, bool checkRepos, bool fullRecurse, bool getAll, bool noIgnore, int revnumber, const TQString& revkind) { + kdDebug(9036) << "tdeio_svnProtocol::wc_status2() : " << wc.url() << " checkRepos " << checkRepos << " fullRecurse " << fullRecurse << " getAll " << getAll << " noIgnore " << noIgnore << " revnumber " << revnumber << " revkind " << revkind << endl; kdDebug(9036) << " __TIME__ " << __TIME__ << endl; apr_pool_t *subpool = svn_pool_create (pool); @@ -1503,7 +1503,7 @@ void kio_svnProtocol::wc_status2(const KURL& wc, bool checkRepos, bool fullRecur initNotifier(false, false, false, subpool); - svn_error_t *err = svn_client_status(&result_rev, svn_path_canonicalize( nurl.path().utf8(), subpool ), &rev, kio_svnProtocol::status, this, fullRecurse, getAll, checkRepos, noIgnore, ctx, subpool); + svn_error_t *err = svn_client_status(&result_rev, svn_path_canonicalize( nurl.path().utf8(), subpool ), &rev, tdeio_svnProtocol::status, this, fullRecurse, getAll, checkRepos, noIgnore, ctx, subpool); if ( err ){ error( TDEIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) ); @@ -1515,9 +1515,9 @@ void kio_svnProtocol::wc_status2(const KURL& wc, bool checkRepos, bool fullRecur svn_pool_destroy (subpool); } -void kio_svnProtocol::svn_info( KURL pathOrUrl, int pegRev, TQString pegRevKind, int rev, TQString revKind, bool recurse ) +void tdeio_svnProtocol::svn_info( KURL pathOrUrl, int pegRev, TQString pegRevKind, int rev, TQString revKind, bool recurse ) { - kdDebug(9036) << " kio_svnProtocol::svn_info(): pegRev " << pegRev << " pegKind " << pegRevKind << " rev " << rev << " revKind " << revKind << " recurse " << recurse << endl; + kdDebug(9036) << " tdeio_svnProtocol::svn_info(): pegRev " << pegRev << " pegKind " << pegRevKind << " rev " << rev << " revKind " << revKind << " recurse " << recurse << endl; apr_pool_t *subpool = svn_pool_create (pool); svn_opt_revision_t peg_rev = createRevision( pegRev, pegRevKind, subpool ); @@ -1525,7 +1525,7 @@ void kio_svnProtocol::svn_info( KURL pathOrUrl, int pegRev, TQString pegRevKind, svn_error_t *err = svn_client_info( pathOrUrl.pathOrURL().utf8(), &peg_rev, &revision, - kio_svnProtocol::infoReceiver, + tdeio_svnProtocol::infoReceiver, this, recurse, ctx, pool ); @@ -1539,10 +1539,10 @@ void kio_svnProtocol::svn_info( KURL pathOrUrl, int pegRev, TQString pegRevKind, finished(); } -svn_error_t* kio_svnProtocol::infoReceiver( void *baton, const char *path, +svn_error_t* tdeio_svnProtocol::infoReceiver( void *baton, const char *path, const svn_info_t *info, apr_pool_t *pool) { - kio_svnProtocol *p= (kio_svnProtocol*)baton ; + tdeio_svnProtocol *p= (tdeio_svnProtocol*)baton ; if( !p ) return SVN_NO_ERROR; @@ -1557,10 +1557,10 @@ svn_error_t* kio_svnProtocol::infoReceiver( void *baton, const char *path, return SVN_NO_ERROR; } -void kio_svnProtocol::svn_copy( const KURL &srcUrl, int srcRev, const TQString &srcRevKind, +void tdeio_svnProtocol::svn_copy( const KURL &srcUrl, int srcRev, const TQString &srcRevKind, const KURL &destUrl ) { - kdDebug(9036) << " kio: svn_copy src: " << srcUrl << " Dest Url: " << destUrl << " revnum: " << srcRev << " revKind: " << srcRevKind << endl; + kdDebug(9036) << " tdeio: svn_copy src: " << srcUrl << " Dest Url: " << destUrl << " revnum: " << srcRev << " revKind: " << srcRevKind << endl; apr_pool_t *subpool = svn_pool_create (pool); svn_commit_info_t *commit_info = svn_create_commit_info( subpool ); @@ -1594,7 +1594,7 @@ void kio_svnProtocol::svn_copy( const KURL &srcUrl, int srcRev, const TQString & svn_pool_destroy (subpool); } -void kio_svnProtocol::svn_merge(const KURL &src1, int revNum1, TQString revKind1, +void tdeio_svnProtocol::svn_merge(const KURL &src1, int revNum1, TQString revKind1, const KURL &src2, int revNum2, TQString revKind2, const KURL &target_wc, bool recurse, bool ignore_ancestry, bool force, bool dry_run ) @@ -1627,7 +1627,7 @@ void kio_svnProtocol::svn_merge(const KURL &src1, int revNum1, TQString revKind1 //change the proto and remove trailing / //remove double / also -TQString kio_svnProtocol::makeSvnURL ( const KURL& url ) const { +TQString tdeio_svnProtocol::makeSvnURL ( const KURL& url ) const { TQString kproto = url.protocol(); KURL tpURL = url; tpURL.cleanPath( true ); @@ -1668,7 +1668,7 @@ TQString kio_svnProtocol::makeSvnURL ( const KURL& url ) const { return tpURL.url(-1); } -TQString kio_svnProtocol::chooseProtocol ( const TQString& kproto ) const { +TQString tdeio_svnProtocol::chooseProtocol ( const TQString& kproto ) const { if ( kproto == "svn+http" ) return TQString( "http" ); else if ( kproto == "svn+https" ) return TQString( "https" ); else if ( kproto == "svn+ssh" ) return TQString( "svn+ssh" ); @@ -1687,9 +1687,9 @@ TQString kio_svnProtocol::chooseProtocol ( const TQString& kproto ) const { /** @brief Other failure. This can happen if neon has introduced a new * failure bit that we do not handle yet. */ #define SVN_AUTH_SSL_OTHER 0x40000000 -svn_error_t *kio_svnProtocol::trustSSLPrompt(svn_auth_cred_ssl_server_trust_t **cred_p, void *baton, const char *realm, apr_uint32_t failures, const svn_auth_ssl_server_cert_info_t *ci, svn_boolean_t may_save, apr_pool_t *pool) +svn_error_t *tdeio_svnProtocol::trustSSLPrompt(svn_auth_cred_ssl_server_trust_t **cred_p, void *baton, const char *realm, apr_uint32_t failures, const svn_auth_ssl_server_cert_info_t *ci, svn_boolean_t may_save, apr_pool_t *pool) { - kio_svnProtocol *p = (kio_svnProtocol*)baton; + tdeio_svnProtocol *p = (tdeio_svnProtocol*)baton; // prepare params. TQByteArray params, replyData; TQCString replyType; @@ -1737,11 +1737,11 @@ svn_error_t *kio_svnProtocol::trustSSLPrompt(svn_auth_cred_ssl_server_trust_t ** return SVN_NO_ERROR; } /** TODO fully implemented, but there is no way to test this yet.*/ -svn_error_t *kio_svnProtocol::clientCertSSLPrompt( +svn_error_t *tdeio_svnProtocol::clientCertSSLPrompt( svn_auth_cred_ssl_client_cert_t **cred_p, void *baton, const char *realm, svn_boolean_t may_save, apr_pool_t *pool) { kdDebug(9036) << " clientCertSSLPrompt " << endl; -// kio_svnProtocol *p = (kio_svnProtocol*)baton; +// tdeio_svnProtocol *p = (tdeio_svnProtocol*)baton; // TQByteArray reply; // TQByteArray params; // TQCString replyType; @@ -1766,12 +1766,12 @@ svn_error_t *kio_svnProtocol::clientCertSSLPrompt( } /** TODO fully implemented, but there is no way to test this yet.*/ -svn_error_t *kio_svnProtocol::clientCertPasswdPrompt( +svn_error_t *tdeio_svnProtocol::clientCertPasswdPrompt( svn_auth_cred_ssl_client_cert_pw_t **cred_p, void *baton, const char *realm, svn_boolean_t may_save, apr_pool_t *pool) { kdDebug(9036) << " Password Prompt Callback " << endl; kdDebug(9036) << " realm " << realm << " <--realm " << endl; -// kio_svnProtocol *p = ( kio_svnProtocol* )baton; +// tdeio_svnProtocol *p = ( tdeio_svnProtocol* )baton; // // prepare dcop // TQByteArray reply; // TQByteArray params; @@ -1809,7 +1809,7 @@ svn_error_t *kio_svnProtocol::clientCertPasswdPrompt( } -svn_error_t *kio_svnProtocol::commitLogPrompt( const char **log_msg, const char **file, +svn_error_t *tdeio_svnProtocol::commitLogPrompt( const char **log_msg, const char **file, apr_array_header_t *commit_items, void *baton, apr_pool_t *pool ) { *file = NULL; // if omitting this, it will segfault at import operation. @@ -1818,7 +1818,7 @@ svn_error_t *kio_svnProtocol::commitLogPrompt( const char **log_msg, const char TQByteArray reply; TQString result;// slist; TQStringList slist; - kio_svnProtocol *p = ( kio_svnProtocol* )baton; + tdeio_svnProtocol *p = ( tdeio_svnProtocol* )baton; svn_stringbuf_t *message = NULL; for (int i = 0; i < commit_items->nelts; i++) { @@ -1890,7 +1890,7 @@ svn_error_t *kio_svnProtocol::commitLogPrompt( const char **log_msg, const char return SVN_NO_ERROR; } -void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action_t action, svn_node_kind_t kind, const char *mime_type, svn_wc_notify_state_t content_state, svn_wc_notify_state_t prop_state, svn_revnum_t revision) { +void tdeio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action_t action, svn_node_kind_t kind, const char *mime_type, svn_wc_notify_state_t content_state, svn_wc_notify_state_t prop_state, svn_revnum_t revision) { kdDebug(9036) << "NOTIFY : " << path << " updated at revision " << revision << " action : " << action << ", kind : " << kind << " , content_state : " << content_state << ", prop_state : " << prop_state << endl; TQString userstring; @@ -2068,7 +2068,7 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action break; } //// End convert - kio_svnProtocol *p = ( kio_svnProtocol* )nb->master; + tdeio_svnProtocol *p = ( tdeio_svnProtocol* )nb->master; if (!p) kdDebug(9036) << " Null Pointer at Line " << __LINE__ << endl; p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "path" , TQString::fromUtf8( path )); @@ -2079,11 +2079,11 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "prop", TQString::number( prop_state )); p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "rev", TQString::number( revision )); p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "string", userstring ); - kdDebug(9036) << " kio_svnProtocol::notify() userstring " << userstring << endl; + kdDebug(9036) << " tdeio_svnProtocol::notify() userstring " << userstring << endl; p->incCounter(); } -void kio_svnProtocol::status(void *baton, const char *path, svn_wc_status_t *status) { +void tdeio_svnProtocol::status(void *baton, const char *path, svn_wc_status_t *status) { kdDebug(9036) << "STATUS : " << path << ", wc text status : " << status->text_status << ", wc prop status : " << status->prop_status << ", repos text status : " << status->repos_text_status @@ -2091,7 +2091,7 @@ void kio_svnProtocol::status(void *baton, const char *path, svn_wc_status_t *sta << endl; TQByteArray params; - kio_svnProtocol *p = ( kio_svnProtocol* )baton; + tdeio_svnProtocol *p = ( tdeio_svnProtocol* )baton; TQDataStream stream(params, IO_WriteOnly); long int rev = status->entry ? status->entry->revision : 0; @@ -2106,17 +2106,17 @@ void kio_svnProtocol::status(void *baton, const char *path, svn_wc_status_t *sta p->incCounter(); } -void kio_svnProtocol::progressCallback( apr_off_t processed, apr_off_t total, void *baton, apr_pool_t *pool) +void tdeio_svnProtocol::progressCallback( apr_off_t processed, apr_off_t total, void *baton, apr_pool_t *pool) { - kio_svnProtocol *p = (kio_svnProtocol*)baton; + tdeio_svnProtocol *p = (tdeio_svnProtocol*)baton; if( total > -1 ) p->totalSize( total ); if( processed > -1 ) p->processedSize( processed ); } -void kio_svnProtocol::wc_resolve( const KURL& wc, bool recurse ) { - kdDebug(9036) << "kio_svnProtocol::wc_resolve() : " << wc.url() << endl; +void tdeio_svnProtocol::wc_resolve( const KURL& wc, bool recurse ) { + kdDebug(9036) << "tdeio_svnProtocol::wc_resolve() : " << wc.url() << endl; apr_pool_t *subpool = svn_pool_create (pool); @@ -2136,19 +2136,19 @@ void kio_svnProtocol::wc_resolve( const KURL& wc, bool recurse ) { extern "C" { KDE_EXPORT int kdemain(int argc, char **argv) { - TDEInstance instance( "kio_kdevsvn" ); + TDEInstance instance( "tdeio_kdevsvn" ); - kdDebug(9036) << "*** Starting kio_kdevsvn " << endl; + kdDebug(9036) << "*** Starting tdeio_kdevsvn " << endl; if (argc != 4) { - kdDebug(9036) << "Usage: kio_kdevsvn protocol domain-socket1 domain-socket2" << endl; + kdDebug(9036) << "Usage: tdeio_kdevsvn protocol domain-socket1 domain-socket2" << endl; exit(-1); } - kio_svnProtocol slave(argv[2], argv[3]); + tdeio_svnProtocol slave(argv[2], argv[3]); slave.dispatchLoop(); - kdDebug(9036) << "*** kio_kdevsvn Done" << endl; + kdDebug(9036) << "*** tdeio_kdevsvn Done" << endl; return 0; } } diff --git a/vcs/subversion/svn_kio.h b/vcs/subversion/svn_tdeio.h index b00cddb8..a5415931 100644 --- a/vcs/subversion/svn_kio.h +++ b/vcs/subversion/svn_tdeio.h @@ -36,7 +36,7 @@ #include "subversion_global.h" class TQCString; -class kio_svnProtocol; +class tdeio_svnProtocol; typedef struct kbaton { svn_stream_t *target_stream; @@ -44,11 +44,11 @@ typedef struct kbaton { svn_stream_t *string_stream; } kbaton; -typedef struct kio_svn_callback_baton_t { +typedef struct tdeio_svn_callback_baton_t { const char* base_dir; apr_hash_t *config; apr_pool_t *pool; -} kio_svn_callback_baton_t; +} tdeio_svn_callback_baton_t; typedef struct notify_baton { svn_boolean_t received_some_change; @@ -61,15 +61,15 @@ typedef struct notify_baton { when we've already had one print error. */ apr_pool_t *pool; /* this pool is cleared after every notification, so don't keep anything here! */ - kio_svnProtocol *master; + tdeio_svnProtocol *master; } notify_baton; -class kio_svnProtocol : public TDEIO::SlaveBase +class tdeio_svnProtocol : public TDEIO::SlaveBase { public: - kio_svnProtocol(const TQCString &pool_socket, const TQCString &app_socket); - virtual ~kio_svnProtocol(); + tdeio_svnProtocol(const TQCString &pool_socket, const TQCString &app_socket); + virtual ~tdeio_svnProtocol(); virtual void special( const TQByteArray& data ); virtual void get(const KURL& url); virtual void listDir(const KURL& url); |