summaryrefslogtreecommitdiffstats
path: root/kioslave/svn
diff options
context:
space:
mode:
Diffstat (limited to 'kioslave/svn')
-rw-r--r--kioslave/svn/ksvnd/ksvnd.h2
-rw-r--r--kioslave/svn/svn.cpp52
-rw-r--r--kioslave/svn/svn.h6
-rw-r--r--kioslave/svn/svnhelper/kio_svn_helper.cpp52
-rw-r--r--kioslave/svn/svnhelper/kio_svn_helper.h2
5 files changed, 57 insertions, 57 deletions
diff --git a/kioslave/svn/ksvnd/ksvnd.h b/kioslave/svn/ksvnd/ksvnd.h
index adea9b68..90612937 100644
--- a/kioslave/svn/ksvnd/ksvnd.h
+++ b/kioslave/svn/ksvnd/ksvnd.h
@@ -39,7 +39,7 @@ public:
~KSvnd();
k_dcop:
-// void addAuthInfo(KIO::AuthInfo, long);
+// void addAuthInfo(TDEIO::AuthInfo, long);
TQString commitDialog(TQString);
bool anyNotValidWorkingCopy( const KURL::List& wclist );
bool anyValidWorkingCopy( const KURL::List& wclist );
diff --git a/kioslave/svn/svn.cpp b/kioslave/svn/svn.cpp
index cfb4b243..becef81e 100644
--- a/kioslave/svn/svn.cpp
+++ b/kioslave/svn/svn.cpp
@@ -53,7 +53,7 @@
#include "svn.h"
#include <apr_portable.h>
-using namespace KIO;
+using namespace TDEIO;
typedef struct
{
@@ -125,14 +125,14 @@ kio_svnProtocol::kio_svnProtocol(const TQCString &pool_socket, const TQCString &
svn_error_t *err = svn_client_create_context(&ctx, pool);
if ( err ) {
kdDebug(7128) << "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(7128) << "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);
@@ -272,7 +272,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;
}
@@ -439,7 +439,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;
}
@@ -490,23 +490,23 @@ bool kio_svnProtocol::createUDSEntry( const TQString& filename, const TQString&
kdDebug(7128) << "MTime : " << ( long )mtime << endl;
kdDebug(7128) << "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 );
@@ -552,7 +552,7 @@ void kio_svnProtocol::copy(const KURL & src, const KURL& dest, int /*permissions
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 );
}
finished();
@@ -580,7 +580,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, err->message );
+ error( TDEIO::ERR_COULD_NOT_MKDIR, err->message );
}
finished();
@@ -603,7 +603,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 );
}
finished();
@@ -626,7 +626,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 );
}
finished();
@@ -672,7 +672,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 );
}
finished();
@@ -935,7 +935,7 @@ void kio_svnProtocol::svn_diff(const KURL & url1, const KURL& url2,int rev1, int
initNotifier(false, false, false, subpool);
svn_error_t *err = svn_client_diff (options, path1, &revision1, path2, &revision2, recurse, false, true, outfile, NULL, ctx, subpool);
if ( err )
- error( KIO::ERR_SLAVE_DEFINED, err->message );
+ error( TDEIO::ERR_SLAVE_DEFINED, err->message );
//read the content of the outfile now
TQStringList tmp;
apr_file_close(outfile);
@@ -981,7 +981,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, err->message );
+ error( TDEIO::ERR_SLAVE_DEFINED, err->message );
finished();
svn_pool_destroy (subpool);
@@ -1001,7 +1001,7 @@ void kio_svnProtocol::update( const KURL& wc, int revnumber, const TQString& rev
initNotifier(false, false, false, subpool);
svn_error_t *err = svn_client_update (NULL, svn_path_canonicalize( target.utf8(), subpool ), &rev, true, ctx, subpool);
if ( err )
- error( KIO::ERR_SLAVE_DEFINED, err->message );
+ error( TDEIO::ERR_SLAVE_DEFINED, err->message );
finished();
svn_pool_destroy (subpool);
@@ -1029,7 +1029,7 @@ void kio_svnProtocol::import( const KURL& repos, const KURL& wc ) {
initNotifier(false, false, false, subpool);
svn_error_t *err = svn_client_import(&commit_info,path,url,nonrecursive,ctx,subpool);
if ( err )
- error( KIO::ERR_SLAVE_DEFINED, err->message );
+ error( TDEIO::ERR_SLAVE_DEFINED, err->message );
finished();
svn_pool_destroy (subpool);
@@ -1053,7 +1053,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 );
finished();
svn_pool_destroy (subpool);
@@ -1078,7 +1078,7 @@ void kio_svnProtocol::commit(const KURL::List& wc) {
initNotifier(false, false, false, subpool);
svn_error_t *err = svn_client_commit(&commit_info,targets,nonrecursive,ctx,subpool);
if ( err )
- error( KIO::ERR_SLAVE_DEFINED, err->message );
+ error( TDEIO::ERR_SLAVE_DEFINED, err->message );
if ( commit_info ) {
for ( TQValueListConstIterator<KURL> it = wc.begin(); it != wc.end() ; ++it ) {
@@ -1118,7 +1118,7 @@ void kio_svnProtocol::add(const KURL& wc) {
initNotifier(false, false, false, subpool);
svn_error_t *err = svn_client_add(svn_path_canonicalize( nurl.path().utf8(), subpool ),nonrecursive,ctx,subpool);
if ( err )
- error( KIO::ERR_SLAVE_DEFINED, err->message );
+ error( TDEIO::ERR_SLAVE_DEFINED, err->message );
finished();
svn_pool_destroy (subpool);
@@ -1144,7 +1144,7 @@ void kio_svnProtocol::wc_delete(const KURL::List& wc) {
svn_error_t *err = svn_client_delete(&commit_info,targets,nonrecursive,ctx,subpool);
if ( err )
- error( KIO::ERR_SLAVE_DEFINED, err->message );
+ error( TDEIO::ERR_SLAVE_DEFINED, err->message );
finished();
svn_pool_destroy (subpool);
@@ -1168,7 +1168,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, err->message );
+ error( TDEIO::ERR_SLAVE_DEFINED, err->message );
finished();
svn_pool_destroy (subpool);
@@ -1192,7 +1192,7 @@ void kio_svnProtocol::wc_status(const KURL& wc, bool checkRepos, bool fullRecurs
svn_error_t *err = svn_client_status(&result_rev, svn_path_canonicalize( nurl.path().utf8(), subpool ), &rev, kio_svnProtocol::status, this, fullRecurse, getAll, checkRepos, no_ignore, ctx, subpool);
if ( err )
- error( KIO::ERR_SLAVE_DEFINED, err->message );
+ error( TDEIO::ERR_SLAVE_DEFINED, err->message );
finished();
svn_pool_destroy (subpool);
@@ -1565,7 +1565,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);
diff --git a/kioslave/svn/svn.h b/kioslave/svn/svn.h
index 91d4303b..d3156663 100644
--- a/kioslave/svn/svn.h
+++ b/kioslave/svn/svn.h
@@ -64,7 +64,7 @@ typedef struct notify_baton {
} notify_baton;
-class kio_svnProtocol : public KIO::SlaveBase
+class kio_svnProtocol : public TDEIO::SlaveBase
{
public:
kio_svnProtocol(const TQCString &pool_socket, const TQCString &app_socket);
@@ -113,7 +113,7 @@ class kio_svnProtocol : public KIO::SlaveBase
KURL myURL;
svn_client_ctx_t *ctx;
- KIO::AuthInfo info;
+ TDEIO::AuthInfo info;
enum SVN_METHOD {
SVN_CHECKOUT=1, //KURL repository, KURL workingcopy, int revnumber=-1, TQString revkind(HEAD, ...) //revnumber==-1 => use of revkind
@@ -132,7 +132,7 @@ class kio_svnProtocol : public KIO::SlaveBase
};
private:
- 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);
apr_pool_t *pool;
int m_counter;
};
diff --git a/kioslave/svn/svnhelper/kio_svn_helper.cpp b/kioslave/svn/svnhelper/kio_svn_helper.cpp
index ec938c39..64b51d1a 100644
--- a/kioslave/svn/svnhelper/kio_svn_helper.cpp
+++ b/kioslave/svn/svnhelper/kio_svn_helper.cpp
@@ -66,9 +66,9 @@ SvnHelper::SvnHelper():TDEApplication() {
int rev = -1;
kdDebug(7128) << "updating : " << (*it).prettyURL() << endl;
s << cmd << *it << rev << TQString( "HEAD" );
- KIO::SimpleJob * job = KIO::special(servURL, parms, true);
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
- KIO::NetAccess::synchronousRun( job, 0 );
+ TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, true);
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+ TDEIO::NetAccess::synchronousRun( job, 0 );
}
} else if (args->isSet("c")) {
kdDebug(7128) << "commit " << list << endl;
@@ -81,9 +81,9 @@ SvnHelper::SvnHelper():TDEApplication() {
kdDebug(7128) << "commiting : " << (*it).prettyURL() << endl;
s << *it;
}
- KIO::SimpleJob * job = KIO::special(servURL, parms, true);
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
- KIO::NetAccess::synchronousRun( job, 0 );
+ TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, true);
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+ TDEIO::NetAccess::synchronousRun( job, 0 );
} else if (args->isSet("a")) {
kdDebug(7128) << "add " << list << endl;
KURL servURL = "svn+http://this_is_a_fake_URL_and_this_is_normal/";
@@ -93,9 +93,9 @@ SvnHelper::SvnHelper():TDEApplication() {
int cmd = 6;
kdDebug(7128) << "adding : " << (*it).prettyURL() << endl;
s << cmd << *it;
- KIO::SimpleJob * job = KIO::special(servURL, parms, true);
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
- KIO::NetAccess::synchronousRun( job, 0 );
+ TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, true);
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+ TDEIO::NetAccess::synchronousRun( job, 0 );
}
} else if (args->isSet("D")) {
kdDebug(7128) << "diff " << list << endl;
@@ -110,9 +110,9 @@ SvnHelper::SvnHelper():TDEApplication() {
TQString revkind1 = "BASE";
TQString revkind2 = "WORKING";
s << cmd << *it << *it << rev1 << revkind1 << rev2 << revkind2 << true ;
- KIO::SimpleJob * job = KIO::special(servURL, parms, true);
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
- KIO::NetAccess::synchronousRun( job, 0 );
+ TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, true);
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+ TDEIO::NetAccess::synchronousRun( job, 0 );
if ( diffresult.count() > 0 ) {
//check kompare is available
if ( !KStandardDirs::findExe( "kompare" ).isNull() ) {
@@ -151,9 +151,9 @@ SvnHelper::SvnHelper():TDEApplication() {
kdDebug(7128) << "deleting : " << (*it).prettyURL() << endl;
s << *it;
}
- KIO::SimpleJob * job = KIO::special(servURL, parms, true);
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
- KIO::NetAccess::synchronousRun( job, 0 );
+ TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, true);
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+ TDEIO::NetAccess::synchronousRun( job, 0 );
} else if (args->isSet("s")) {
kdDebug(7128) << "switch " << list << endl;
SubversionSwitch d;
@@ -178,9 +178,9 @@ SvnHelper::SvnHelper():TDEApplication() {
s << recurse;
s << revnumber;
s << revkind;
- KIO::SimpleJob * job = KIO::special(servURL, parms, true);
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
- KIO::NetAccess::synchronousRun( job, 0 );
+ TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, true);
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+ TDEIO::NetAccess::synchronousRun( job, 0 );
}
}
} else if (args->isSet("r")) {
@@ -194,9 +194,9 @@ SvnHelper::SvnHelper():TDEApplication() {
kdDebug(7128) << "reverting : " << (*it).prettyURL() << endl;
s << *it;
}
- KIO::SimpleJob * job = KIO::special(servURL, parms, true);
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
- KIO::NetAccess::synchronousRun( job, 0 );
+ TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, true);
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+ TDEIO::NetAccess::synchronousRun( job, 0 );
} else if (args->isSet("C")) {
kdDebug(7128) << "checkout " << list << endl;
SubversionCheckout d;
@@ -219,9 +219,9 @@ SvnHelper::SvnHelper():TDEApplication() {
s << rev;
s << revkind;
kdDebug(7128) << "checkouting : " << d.url->url() << " into " << (*it).prettyURL() << " at rev : " << rev << " or " << revkind << endl;
- KIO::SimpleJob * job = KIO::special(servURL, parms, true);
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
- KIO::NetAccess::synchronousRun( job, 0 );
+ TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, true);
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+ TDEIO::NetAccess::synchronousRun( job, 0 );
}
}
} else {
@@ -230,11 +230,11 @@ SvnHelper::SvnHelper():TDEApplication() {
TQTimer::singleShot( 0, this, TQT_SLOT( finished() ) );
}
-void SvnHelper::slotResult( KIO::Job* job ) {
+void SvnHelper::slotResult( TDEIO::Job* job ) {
if ( job->error() )
job->showErrorDialog( );
- KIO::MetaData ma = job->metaData();
+ TDEIO::MetaData ma = job->metaData();
TQValueList<TQString> keys = ma.keys();
qHeapSort( keys );
TQValueList<TQString>::Iterator begin = keys.begin(), end = keys.end(), it;
diff --git a/kioslave/svn/svnhelper/kio_svn_helper.h b/kioslave/svn/svnhelper/kio_svn_helper.h
index 4ee9239b..b10dcaaf 100644
--- a/kioslave/svn/svnhelper/kio_svn_helper.h
+++ b/kioslave/svn/svnhelper/kio_svn_helper.h
@@ -33,7 +33,7 @@ public:
SvnHelper();
private slots:
void finished();
- void slotResult( KIO::Job *);
+ void slotResult( TDEIO::Job *);
private:
WId m_id;
TQStringList diffresult; //for diff commands ;)
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-20 08:26:52 +0000