diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:38:54 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:38:54 -0600 |
commit | da1522385e5367bae56b90fac55c4355e475905b (patch) | |
tree | bfa432864dbf322feb4ed3a878f1222ee8ea7727 /vcs/subversion/svn_kio.cpp | |
parent | b9e542d0c805e9adee3a67e44532d5321032e21e (diff) | |
download | tdevelop-da1522385e5367bae56b90fac55c4355e475905b.tar.gz tdevelop-da1522385e5367bae56b90fac55c4355e475905b.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'vcs/subversion/svn_kio.cpp')
-rw-r--r-- | vcs/subversion/svn_kio.cpp | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/vcs/subversion/svn_kio.cpp b/vcs/subversion/svn_kio.cpp index 7018456f..1680595a 100644 --- a/vcs/subversion/svn_kio.cpp +++ b/vcs/subversion/svn_kio.cpp @@ -56,7 +56,7 @@ // #include "commitdlg.h" #include <ktextedit.h> -using namespace KIO; +using namespace TDEIO; using namespace SvnGlobal; typedef struct @@ -132,14 +132,14 @@ 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; - error( KIO::ERR_SLAVE_DEFINED, err->message ); + 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; - error( KIO::ERR_SLAVE_DEFINED, err->message ); + error( TDEIO::ERR_SLAVE_DEFINED, err->message ); return; } svn_config_get_config (&ctx->config, NULL, pool); @@ -286,7 +286,7 @@ void kio_svnProtocol::get(const KURL& url ){ svn_error_t *err = svn_client_cat (bt->string_stream, svn_path_canonicalize( target.utf8(),subpool ),&rev,ctx, subpool); if ( err ) { - error( KIO::ERR_SLAVE_DEFINED, err->message ); + error( TDEIO::ERR_SLAVE_DEFINED, err->message ); svn_pool_destroy( subpool ); return; } @@ -453,7 +453,7 @@ void kio_svnProtocol::listDir(const KURL& url){ initNotifier(false, false, false, subpool); svn_error_t *err = svn_client_ls (&dirents, svn_path_canonicalize( target.utf8(), subpool ), &rev, false, ctx, subpool); if ( err ) { - error( KIO::ERR_SLAVE_DEFINED, err->message ); + error( TDEIO::ERR_SLAVE_DEFINED, err->message ); svn_pool_destroy( subpool ); return; } @@ -504,23 +504,23 @@ bool kio_svnProtocol::createUDSEntry( const TQString& filename, const TQString& kdDebug(9036) << "MTime : " << ( long )mtime << endl; kdDebug(9036) << "UDS filename : " << filename << endl; UDSAtom atom; - atom.m_uds = KIO::UDS_NAME; + atom.m_uds = TDEIO::UDS_NAME; atom.m_str = filename; 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; entry.append( atom ); - atom.m_uds = KIO::UDS_SIZE; + atom.m_uds = TDEIO::UDS_SIZE; atom.m_long = size; entry.append( atom ); - atom.m_uds = KIO::UDS_MODIFICATION_TIME; + atom.m_uds = TDEIO::UDS_MODIFICATION_TIME; atom.m_long = mtime; entry.append( atom ); - atom.m_uds = KIO::UDS_USER; + atom.m_uds = TDEIO::UDS_USER; atom.m_str = user; entry.append( atom ); @@ -567,7 +567,7 @@ bool kio_svnProtocol::createUDSEntry( const TQString& filename, const TQString& // initNotifier(false, false, false, subpool); // svn_error_t *err = svn_client_copy(&commit_info, srcsvn.utf8(), &rev, destsvn.utf8(), ctx, subpool); // if ( err ) { -// error( KIO::ERR_SLAVE_DEFINED, err->message ); +// error( TDEIO::ERR_SLAVE_DEFINED, err->message ); // svn_pool_destroy (subpool); // } // @@ -596,7 +596,7 @@ void kio_svnProtocol::mkdir( const KURL::List& list, int /*permissions*/ ) { initNotifier(false, false, false, subpool); svn_error_t *err = svn_client_mkdir(&commit_info,targets,ctx,subpool); if ( err ) { - error( KIO::ERR_COULD_NOT_MKDIR, TQString::fromLocal8Bit(err->message) ); + error( TDEIO::ERR_COULD_NOT_MKDIR, TQString::fromLocal8Bit(err->message) ); svn_pool_destroy (subpool); return; } @@ -621,7 +621,7 @@ void kio_svnProtocol::mkdir( const KURL& url, int /*permissions*/ ) { initNotifier(false, false, false, subpool); svn_error_t *err = svn_client_mkdir(&commit_info,targets,ctx,subpool); if ( err ) { - error( KIO::ERR_COULD_NOT_MKDIR, err->message ); + error( TDEIO::ERR_COULD_NOT_MKDIR, err->message ); svn_pool_destroy (subpool); return; } @@ -646,7 +646,7 @@ void kio_svnProtocol::del( const KURL& url, bool /*isfile*/ ) { initNotifier(false, false, false, subpool); svn_error_t *err = svn_client_delete(&commit_info,targets,false/*force remove locally modified files in wc*/,ctx,subpool); if ( err ) { - error( KIO::ERR_CANNOT_DELETE, err->message ); + error( TDEIO::ERR_CANNOT_DELETE, err->message ); svn_pool_destroy (subpool); return; } @@ -694,7 +694,7 @@ void kio_svnProtocol::rename(const KURL& src, const KURL& dest, bool /*overwrite initNotifier(false, false, false, subpool); svn_error_t *err = svn_client_move(&commit_info, srcsvn.utf8(), &rev, destsvn.utf8(), false/*force remove locally modified files in wc*/, ctx, subpool); if ( err ) { - error( KIO::ERR_CANNOT_RENAME, err->message ); + error( TDEIO::ERR_CANNOT_RENAME, err->message ); svn_pool_destroy (subpool); return; } @@ -1005,7 +1005,7 @@ void kio_svnProtocol::blame( KURL url, UrlMode /*mode*/,/* int pegRev, TQString svn_client_blame_receiver_t receiver = kio_svnProtocol::blameReceiver; svn_error_t *err = svn_client_blame( path_or_url, &rev1, &rev2, receiver, (void*)this, ctx, subpool ); if ( err ) - error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) ); + error( TDEIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) ); finished(); svn_pool_destroy (subpool); @@ -1059,7 +1059,7 @@ void kio_svnProtocol::svn_log( int revstart, const TQString& revkindstart, int r svn_log_message_receiver_t receiver = kio_svnProtocol::receiveLogMessage; svn_error_t *err = svn_client_log2(targets, &rev1, &rev2, 0, discorverChangedPaths, strictNodeHistory, receiver, this, ctx, subpool); if ( err ){ - error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) ); + error( TDEIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) ); svn_pool_destroy (subpool); return; } @@ -1183,7 +1183,7 @@ void kio_svnProtocol::svn_diff(const KURL & url1, const KURL& url2,int rev1, int } if ( err ){ - error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) ); + error( TDEIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) ); svn_pool_destroy (subpool); return; } @@ -1233,7 +1233,7 @@ void kio_svnProtocol::svn_switch( const KURL& wc, const KURL& repos, int revnumb initNotifier(false, false, false, subpool); svn_error_t *err = svn_client_switch (NULL/*result revision*/, path, url, &rev, recurse, ctx, subpool); if ( err ){ - error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit( err->message ) ); + error( TDEIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit( err->message ) ); svn_pool_destroy (subpool); return; } @@ -1255,7 +1255,7 @@ void kio_svnProtocol::svn_switch_relocate( const KURL &wc, const KURL &origUrl, svn_error_t *err = svn_client_relocate( wcPath, fromUrl, toUrl, recurse, ctx, pool ); if ( err ){ - error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit( err->message ) ); + error( TDEIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit( err->message ) ); svn_pool_destroy (subpool); return; } @@ -1284,7 +1284,7 @@ void kio_svnProtocol::update( const KURL::List &list, int revnumber, const TQStr true/*recurse*/, false/*ignore_external*/, ctx, subpool); if ( err ){ - error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) ); + error( TDEIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) ); svn_pool_destroy (subpool); return; } @@ -1310,7 +1310,7 @@ void kio_svnProtocol::import( const KURL& repos, const KURL& wc ) { svn_error_t *err = svn_client_import2(&commit_info, path, url, nonrecursive, false, ctx, subpool); if ( err ){ - error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) ); + error( TDEIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) ); svn_pool_destroy (subpool); return; } @@ -1337,7 +1337,7 @@ void kio_svnProtocol::checkout( const KURL& repos, const KURL& wc, int revnumber initNotifier(true, false, false, subpool); svn_error_t *err = svn_client_checkout (NULL/* rev actually checkedout */, svn_path_canonicalize( target.utf8(), subpool ), svn_path_canonicalize ( dpath.utf8(), subpool ), &rev, true, ctx, subpool); if ( err ){ - error( KIO::ERR_SLAVE_DEFINED, err->message ); + error( TDEIO::ERR_SLAVE_DEFINED, err->message ); svn_pool_destroy (subpool); return; } @@ -1372,7 +1372,7 @@ void kio_svnProtocol::commit2(bool recurse, bool keeplocks, const KURL::List& wc if ( err ){ char errbuf[512]; svn_strerror(err->apr_err, errbuf, 512); - error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) + "\n: " + TQString::fromLocal8Bit(errbuf) ); + error( TDEIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) + "\n: " + TQString::fromLocal8Bit(errbuf) ); svn_pool_destroy (subpool); return; } @@ -1420,7 +1420,7 @@ void kio_svnProtocol::add(const KURL::List& list) { if( err ) break; } if ( err ){ - error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) ); + error( TDEIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) ); svn_pool_destroy (subpool); return; } @@ -1449,7 +1449,7 @@ void kio_svnProtocol::wc_delete(const KURL::List& wc) { svn_error_t *err = svn_client_delete(&commit_info,targets,force,ctx,subpool); if ( err ) - error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) ); + error( TDEIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) ); finished(); svn_pool_destroy (subpool); @@ -1473,7 +1473,7 @@ void kio_svnProtocol::wc_revert(const KURL::List& wc) { initNotifier(false, false, false, subpool); svn_error_t *err = svn_client_revert(targets,nonrecursive,ctx,subpool); if ( err ){ - error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit( err->message ) ); + error( TDEIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit( err->message ) ); svn_pool_destroy (subpool); return; } @@ -1506,7 +1506,7 @@ void kio_svnProtocol::wc_status2(const KURL& wc, bool checkRepos, bool fullRecur 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); if ( err ){ - error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) ); + error( TDEIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) ); svn_pool_destroy (subpool); return; } @@ -1531,7 +1531,7 @@ void kio_svnProtocol::svn_info( KURL pathOrUrl, int pegRev, TQString pegRevKind, ctx, pool ); if ( err ){ - error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) ); + error( TDEIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) ); svn_pool_destroy (subpool); return; } @@ -1577,7 +1577,7 @@ void kio_svnProtocol::svn_copy( const KURL &srcUrl, int srcRev, const TQString & apr_status_t errcode = err->apr_err; char buf[512]; svn_strerror(errcode, buf, 512); - error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(buf) ); + error( TDEIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(buf) ); svn_pool_destroy (subpool); return; } @@ -1599,7 +1599,7 @@ void kio_svnProtocol::svn_merge(const KURL &src1, int revNum1, TQString revKind1 const KURL &target_wc, bool recurse, bool ignore_ancestry, bool force, bool dry_run ) { - kdDebug(9036) << " KIO::svn_merge src1 " << src1.pathOrURL().utf8() << " src2 " << src2.pathOrURL().utf8() << " target " << target_wc.pathOrURL().utf8() << endl; + kdDebug(9036) << " TDEIO::svn_merge src1 " << src1.pathOrURL().utf8() << " src2 " << src2.pathOrURL().utf8() << " target " << target_wc.pathOrURL().utf8() << endl; apr_pool_t *subpool = svn_pool_create( pool ); svn_opt_revision_t rev1 = createRevision( revNum1, revKind1, subpool ); @@ -1615,7 +1615,7 @@ void kio_svnProtocol::svn_merge(const KURL &src1, int revNum1, TQString revKind1 apr_status_t errcode = err->apr_err; char buf[512]; svn_strerror(errcode, buf, 512); - error( KIO::ERR_SLAVE_DEFINED, + error( TDEIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) + "\n "+ TQString::fromLocal8Bit(buf) ); svn_pool_destroy (subpool); return; @@ -2127,7 +2127,7 @@ void kio_svnProtocol::wc_resolve( const KURL& wc, bool recurse ) { initNotifier(false, false, false, subpool); svn_error_t *err = svn_client_resolved(svn_path_canonicalize( nurl.path().utf8(), subpool ), recurse,ctx,subpool); if ( err ) - error( KIO::ERR_SLAVE_DEFINED, err->message ); + error( TDEIO::ERR_SLAVE_DEFINED, err->message ); finished(); svn_pool_destroy (subpool); |