summaryrefslogtreecommitdiffstats
path: root/vcs/subversion/subversion_core.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'vcs/subversion/subversion_core.cpp')
-rw-r--r--vcs/subversion/subversion_core.cpp114
1 files changed, 57 insertions, 57 deletions
diff --git a/vcs/subversion/subversion_core.cpp b/vcs/subversion/subversion_core.cpp
index cba5aee4..4a647b34 100644
--- a/vcs/subversion/subversion_core.cpp
+++ b/vcs/subversion/subversion_core.cpp
@@ -51,7 +51,7 @@
#include <kinstance.h>
#include <kaboutdata.h>
-using namespace KIO;
+using namespace TDEIO;
using namespace SvnGlobal;
subversionCore::subversionCore(subversionPart *part)
@@ -125,9 +125,9 @@ void subversionCore::resolve( const KURL::List& list ) {
int cmd = 11;
bool recurse = true;
s << cmd << *it << recurse;
- SimpleJob * job = KIO::special(servURL, parms, true);
+ SimpleJob * job = TDEIO::special(servURL, parms, true);
job->setWindow( m_part->mainWindow()->main() );
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
}
}
@@ -141,9 +141,9 @@ void subversionCore::update( const KURL::List& list ) {
int rev = -1;
s << cmd << list << rev << TQString( "HEAD" );
- SimpleJob * job = KIO::special(servURL, parms, false);
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
- initProcessDlg( (KIO::Job*)job, i18n("Subversion Update") , i18n("Subversion Update") );
+ SimpleJob * job = TDEIO::special(servURL, parms, false);
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+ initProcessDlg( (TDEIO::Job*)job, i18n("Subversion Update") , i18n("Subversion Update") );
}
void subversionCore::diff( const KURL::List& list, const TQString& where){
@@ -159,9 +159,9 @@ void subversionCore::diff( const KURL::List& list, const TQString& where){
TQString revkind1 = where;
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() ) {
@@ -240,9 +240,9 @@ void subversionCore::diffAsync( const KURL &pathOrUrl1, const KURL &pathOrUrl2,
kdDebug(9036) << "diffing async : " << pathOrUrl1 << " and " << pathOrUrl2 << endl;
s << cmd << pathOrUrl1 << pathOrUrl2 << rev1 << revKind1 << rev2 << revKind2 << recurse;
s << pegdiff;
- KIO::SimpleJob * job = KIO::special(servURL, parms, false);
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotDiffResult( KIO::Job * ) ) );
- initProcessDlg( (KIO::Job*)job, pathOrUrl1.prettyURL(), pathOrUrl2.prettyURL() );
+ TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, false);
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotDiffResult( TDEIO::Job * ) ) );
+ initProcessDlg( (TDEIO::Job*)job, pathOrUrl1.prettyURL(), pathOrUrl2.prettyURL() );
}
void subversionCore::commit( const KURL::List& list, bool recurse, bool keeplocks ) {
@@ -260,12 +260,12 @@ void subversionCore::commit( const KURL::List& list, bool recurse, bool keeplock
kdDebug(9036) << "adding to list: " << (*it).prettyURL() << endl;
s << *it;
}
- SimpleJob * job = KIO::special(servURL, parms, false);
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
+ SimpleJob * job = TDEIO::special(servURL, parms, false);
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
if( list.count() == 1 )
- initProcessDlg( (KIO::Job*)job, (*(list.begin())).prettyURL() , i18n("Commit to remote repository") );
+ initProcessDlg( (TDEIO::Job*)job, (*(list.begin())).prettyURL() , i18n("Commit to remote repository") );
else if( list.count() > 1 )
- initProcessDlg( (KIO::Job*)job, i18n("From working copy") , i18n("Commit to remote repository") );
+ initProcessDlg( (TDEIO::Job*)job, i18n("From working copy") , i18n("Commit to remote repository") );
}
// Right now, only one item for each action.
void subversionCore::svnLog( const KURL::List& list,
@@ -294,10 +294,10 @@ void subversionCore::svnLog( const KURL::List& list,
kdDebug(9036) << "svnCore: adding to list: " << (*it).prettyURL() << endl;
s << *it;
}
- SimpleJob * job = KIO::special(servURL, parms, false);
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotLogResult( KIO::Job * ) ) );
+ SimpleJob * job = TDEIO::special(servURL, parms, false);
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotLogResult( TDEIO::Job * ) ) );
// progress info. LogView is allowed and meaninful only for one url in KDev3.4
- initProcessDlg( (KIO::Job*)job, (*(list.begin())).prettyURL() , i18n("Subversion Log View") );
+ initProcessDlg( (TDEIO::Job*)job, (*(list.begin())).prettyURL() , i18n("Subversion Log View") );
}
void subversionCore::blame( const KURL &url, UrlMode mode, int revstart, TQString revKindStart, int revend, TQString revKindEnd )
@@ -315,9 +315,9 @@ void subversionCore::blame( const KURL &url, UrlMode mode, int revstart, TQStrin
s << cmd << url << (int)mode ;
s << revstart << revKindStart << revend << revKindEnd ;
- SimpleJob * job = KIO::special(servURL, parms, false);
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotBlameResult( KIO::Job * ) ) );
- initProcessDlg( (KIO::Job*)job, url.prettyURL() , i18n("Subversion Blame") );
+ SimpleJob * job = TDEIO::special(servURL, parms, false);
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotBlameResult( TDEIO::Job * ) ) );
+ initProcessDlg( (TDEIO::Job*)job, url.prettyURL() , i18n("Subversion Blame") );
}
void subversionCore::add( const KURL::List& list ) {
@@ -330,9 +330,9 @@ void subversionCore::add( const KURL::List& list ) {
int cmd = 6;
s << cmd << list;
// add/delete/revert works on local copy. Don't need to show progress dialog
- SimpleJob * job = KIO::special(servURL, parms, false);
+ SimpleJob * job = TDEIO::special(servURL, parms, false);
job->setWindow( m_part->mainWindow()->main() );
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
}
void subversionCore::del( const KURL::List& list ) {
@@ -344,9 +344,9 @@ void subversionCore::del( const KURL::List& list ) {
int cmd = 7;
s << cmd << list;
// add/delete/revert works on local copy. Don't need to show progress dialog
- SimpleJob * job = KIO::special(servURL, parms, false);
+ SimpleJob * job = TDEIO::special(servURL, parms, false);
job->setWindow( m_part->mainWindow()->main() );
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
}
void subversionCore::revert( const KURL::List& list ) {
@@ -357,9 +357,9 @@ void subversionCore::revert( const KURL::List& list ) {
TQDataStream s( parms, IO_WriteOnly );
int cmd = 8;
s << cmd << list;
- SimpleJob * job = KIO::special(servURL, parms, false);
+ SimpleJob * job = TDEIO::special(servURL, parms, false);
job->setWindow( m_part->mainWindow()->main() );
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
}
void subversionCore::checkout() {
@@ -375,9 +375,9 @@ void subversionCore::checkout() {
int rev = -1;
s << cmd << servURL << KURL( wcPath ) << rev << TQString( "HEAD" );
servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn"
- SimpleJob * job = KIO::special(servURL,parms, true);
+ SimpleJob * job = TDEIO::special(servURL,parms, true);
job->setWindow( m_part->mainWindow()->main() );
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotEndCheckout( KIO::Job * ) ) );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotEndCheckout( TDEIO::Job * ) ) );
}
}
@@ -392,9 +392,9 @@ void subversionCore::switchTree( const KURL &path, const KURL &repositUrl,
s << cmd << path << repositUrl ;
s << recurse << revNum << revKind;
- SimpleJob * job = KIO::special(servURL, parms, false);
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
- initProcessDlg( (KIO::Job*)job, repositUrl.prettyURL() , path.prettyURL() );
+ SimpleJob * job = TDEIO::special(servURL, parms, false);
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+ initProcessDlg( (TDEIO::Job*)job, repositUrl.prettyURL() , path.prettyURL() );
}
void subversionCore::switchRelocate( const KURL &path,
@@ -407,8 +407,8 @@ void subversionCore::switchRelocate( const KURL &path,
int cmd = 16;
s << cmd << path << currentUrl << newUrl << recurse;
- SimpleJob * job = KIO::special(servURL, parms, false);
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
+ SimpleJob * job = TDEIO::special(servURL, parms, false);
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
// this doesn't contact repository
}
@@ -422,9 +422,9 @@ void subversionCore::svnCopy( const KURL &src, int srcRev, const TQString &srcRe
int cmd = 17;
s << cmd << src << srcRev << srcRevKind << dest;
- SimpleJob * job = KIO::special(servURL, parms, false);
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
- initProcessDlg( (KIO::Job*)job, src.prettyURL(), dest.prettyURL() );
+ SimpleJob * job = TDEIO::special(servURL, parms, false);
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+ initProcessDlg( (TDEIO::Job*)job, src.prettyURL(), dest.prettyURL() );
}
void subversionCore::merge( const KURL &src1, int rev1, TQString revKind1,
@@ -439,9 +439,9 @@ void subversionCore::merge( const KURL &src1, int rev1, TQString revKind1,
s << cmd << src1 << rev1 << revKind1 << src2 << rev2 << revKind2 << wc_path;
s << recurse << ignore_ancestry << force << dry_run;
- SimpleJob * job = KIO::special(servURL, parms, false);
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
- initProcessDlg( (KIO::Job*)job, src1.prettyURL() + "\n" + src2.prettyURL() ,
+ SimpleJob * job = TDEIO::special(servURL, parms, false);
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+ initProcessDlg( (TDEIO::Job*)job, src1.prettyURL() + "\n" + src2.prettyURL() ,
wc_path.prettyURL() );
}
@@ -452,10 +452,10 @@ bool subversionCore::clientInfo( KURL path_or_url, bool recurse, TQMap< KURL, Sv
TQDataStream s( parms, IO_WriteOnly );
int cmd = 15;
s << cmd << path_or_url << -1 << TQString("UNSPECIFIED") << -1 << TQString("UNSPECIFIED") << recurse;
- SimpleJob *job = KIO::special( servURL, parms, false );
+ SimpleJob *job = TDEIO::special( servURL, parms, false );
TQMap<TQString,TQString> ma;
- KIO::NetAccess::synchronousRun(job, 0, 0, 0, &ma ); // synchronize
+ TDEIO::NetAccess::synchronousRun(job, 0, 0, 0, &ma ); // synchronize
TQValueList<TQString> keys = ma.keys();
TQValueList<TQString>::Iterator begin = keys.begin(), end = keys.end(), it;
@@ -493,7 +493,7 @@ bool subversionCore::clientInfo( KURL path_or_url, bool recurse, TQMap< KURL, Sv
return true;;
}
-void subversionCore::slotEndCheckout( KIO::Job * job ) {
+void subversionCore::slotEndCheckout( TDEIO::Job * job ) {
if ( job->error() ) {
job->showErrorDialog( m_part->mainWindow()->main() );
emit checkoutFinished( TQString() );
@@ -501,7 +501,7 @@ void subversionCore::slotEndCheckout( KIO::Job * job ) {
emit checkoutFinished(wcPath);
}
-void subversionCore::slotResult( KIO::Job * job ) {
+void subversionCore::slotResult( TDEIO::Job * job ) {
if ( job->error() ){
job->showErrorDialog( m_part->mainWindow()->main() );
if( job->error() == ERR_CANNOT_LAUNCH_PROCESS )
@@ -512,7 +512,7 @@ void subversionCore::slotResult( KIO::Job * job ) {
) );
return;
}
- 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;
@@ -529,7 +529,7 @@ void subversionCore::slotResult( KIO::Job * job ) {
}
}
}
-void subversionCore::slotLogResult( KIO::Job * job )
+void subversionCore::slotLogResult( TDEIO::Job * job )
{
if ( job->error() ){
job->showErrorDialog( m_part->mainWindow()->main() );
@@ -544,7 +544,7 @@ void subversionCore::slotLogResult( KIO::Job * job )
TQValueList<SvnLogHolder> holderList;
- KIO::MetaData ma = job->metaData();
+ TDEIO::MetaData ma = job->metaData();
TQValueList<TQString> keys = ma.keys();
TQRegExp rx( "([0-9]*)(.*)" );
int curIdx, lastIdx;
@@ -589,7 +589,7 @@ void subversionCore::slotLogResult( KIO::Job * job )
}
-void subversionCore::slotBlameResult( KIO::Job * job )
+void subversionCore::slotBlameResult( TDEIO::Job * job )
{
if ( job->error() ){
job->showErrorDialog( m_part->mainWindow()->main() );
@@ -603,7 +603,7 @@ void subversionCore::slotBlameResult( KIO::Job * job )
}
TQValueList<SvnBlameHolder> blameList;
- KIO::MetaData ma = job->metaData();
+ TDEIO::MetaData ma = job->metaData();
TQValueList<TQString> keys = ma.keys();
TQRegExp rx( "([0-9]*)(.*)" );
int curIdx, lastIdx;
@@ -659,7 +659,7 @@ void subversionCore::slotBlameResult( KIO::Job * job )
m_part->mainWindow()->raiseView(processWidget());
}
-void subversionCore::slotDiffResult( KIO::Job * job )
+void subversionCore::slotDiffResult( TDEIO::Job * job )
{
if ( job->error() ){
job->showErrorDialog( m_part->mainWindow()->main() );
@@ -671,7 +671,7 @@ void subversionCore::slotDiffResult( KIO::Job * job )
) );
return;
}
- 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;
@@ -716,16 +716,16 @@ void subversionCore::slotDiffResult( KIO::Job * job )
}
}
-void subversionCore::initProcessDlg( KIO::Job *job, const TQString &src, const TQString &dest )
+void subversionCore::initProcessDlg( TDEIO::Job *job, const TQString &src, const TQString &dest )
{
SvnProgressDlg *progress = new SvnProgressDlg( true );
progress->setSourceUrl( src );
progress->setDestUrl( dest );
progress->setJob( job );
- connect( job, TQT_SIGNAL( totalSize(KIO::Job*, KIO::filesize_t) ),
- progress, TQT_SLOT( slotTotalSize (KIO::Job*, KIO::filesize_t) ) );
- connect( job, TQT_SIGNAL( processedSize(KIO::Job*, KIO::filesize_t) ),
- progress, TQT_SLOT( slotProcessedSize(KIO::Job*, KIO::filesize_t) ) );
+ connect( job, TQT_SIGNAL( totalSize(TDEIO::Job*, TDEIO::filesize_t) ),
+ progress, TQT_SLOT( slotTotalSize (TDEIO::Job*, TDEIO::filesize_t) ) );
+ connect( job, TQT_SIGNAL( processedSize(TDEIO::Job*, TDEIO::filesize_t) ),
+ progress, TQT_SLOT( slotProcessedSize(TDEIO::Job*, TDEIO::filesize_t) ) );
}
void subversionCore::createNewProject( const TQString& // dirName