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 | |
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')
-rw-r--r-- | vcs/subversion/integrator/svnintegratordlg.cpp | 8 | ||||
-rw-r--r-- | vcs/subversion/kdevsvnd.h | 2 | ||||
-rw-r--r-- | vcs/subversion/subversion_core.cpp | 114 | ||||
-rw-r--r-- | vcs/subversion/subversion_core.h | 12 | ||||
-rw-r--r-- | vcs/subversion/subversion_fileinfo.cpp | 16 | ||||
-rw-r--r-- | vcs/subversion/subversion_fileinfo.h | 4 | ||||
-rw-r--r-- | vcs/subversion/subversion_widget.cpp | 2 | ||||
-rw-r--r-- | vcs/subversion/subversion_widget.h | 2 | ||||
-rw-r--r-- | vcs/subversion/svn_kio.cpp | 66 | ||||
-rw-r--r-- | vcs/subversion/svn_kio.h | 6 |
10 files changed, 116 insertions, 116 deletions
diff --git a/vcs/subversion/integrator/svnintegratordlg.cpp b/vcs/subversion/integrator/svnintegratordlg.cpp index 0df43f4a..94ceca77 100644 --- a/vcs/subversion/integrator/svnintegratordlg.cpp +++ b/vcs/subversion/integrator/svnintegratordlg.cpp @@ -36,7 +36,7 @@ #include <kio/netaccess.h> -using namespace KIO; +using namespace TDEIO; SvnIntegratorDlg::SvnIntegratorDlg( TQWidget *parent, const char *name ) : SvnIntegratorDlgBase( parent, name ) @@ -68,7 +68,7 @@ void SvnIntegratorDlg::accept() TQDataStream s( parms, IO_WriteOnly ); int cmd = 10; // MKDIR(list) s << cmd << list; - KIO::SimpleJob* job = KIO::special( protocolUrl, parms, true ); + TDEIO::SimpleJob* job = TDEIO::special( protocolUrl, parms, true ); if( !NetAccess::synchronousRun( job, 0 ) ){ KMessageBox::error( this, i18n("Unable to create project directories on repository") ); return; @@ -79,7 +79,7 @@ void SvnIntegratorDlg::accept() cmd = 5; //IMPORT servURL.setPath( servURL.path() + "/trunk/" ); s2 << cmd << servURL << KURL::fromPathOrURL( m_projectLocation ); - KIO::SimpleJob* importJob = KIO::special( protocolUrl, parms2, true ); + TDEIO::SimpleJob* importJob = TDEIO::special( protocolUrl, parms2, true ); if( !NetAccess::synchronousRun( importJob, 0 ) ){ KMessageBox::error( this, i18n("Unable to import into repository.") ); return; @@ -100,7 +100,7 @@ void SvnIntegratorDlg::accept() int rev = -1; s3 << cmd2 << servURL << KURL::fromPathOrURL( m_projectLocation ) << rev << TQString( "HEAD" ); - SimpleJob *job2 = KIO::special( protocolUrl, parms3, true ); + SimpleJob *job2 = TDEIO::special( protocolUrl, parms3, true ); if( ! NetAccess::synchronousRun( job2, 0 ) ){ // Checkout failed KMessageBox::error(this, i18n("Unable to checkout from repository.") ); diff --git a/vcs/subversion/kdevsvnd.h b/vcs/subversion/kdevsvnd.h index 2954af6c..438520e1 100644 --- a/vcs/subversion/kdevsvnd.h +++ b/vcs/subversion/kdevsvnd.h @@ -40,7 +40,7 @@ public: ~KDevSvnd(); k_dcop: -// void addAuthInfo(KIO::AuthInfo, long); +// void addAuthInfo(TDEIO::AuthInfo, long); TQString commitDialog(TQString); int sslServerTrustPrompt(TQString certFailMsg, TQString hostname, TQString fingerPrint, TQString validfrom, TQString validuntil, TQString issuerName, TQString ascii_cert ); TQString sslCertFile(); 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 diff --git a/vcs/subversion/subversion_core.h b/vcs/subversion/subversion_core.h index b2f6ba41..28d98d3c 100644 --- a/vcs/subversion/subversion_core.h +++ b/vcs/subversion/subversion_core.h @@ -78,16 +78,16 @@ public: void createNewProject( const TQString& dirName, const KURL& importURL, bool init ); KDevVCSFileInfoProvider *fileInfoProvider() const; - void initProcessDlg( KIO::Job *job, const TQString &src, const TQString &dest ); + void initProcessDlg( TDEIO::Job *job, const TQString &src, const TQString &dest ); // k_dcop: // void notification( const TQString&, int,int, const TQString&, int,int ,long int, const TQString& ); private slots: - void slotEndCheckout( KIO::Job * job ); - void slotResult( KIO::Job * job ); - void slotLogResult( KIO::Job * job ); - void slotBlameResult( KIO::Job * job ); - void slotDiffResult( KIO::Job * job ); + void slotEndCheckout( TDEIO::Job * job ); + void slotResult( TDEIO::Job * job ); + void slotLogResult( TDEIO::Job * job ); + void slotBlameResult( TDEIO::Job * job ); + void slotDiffResult( TDEIO::Job * job ); signals: void checkoutFinished( TQString dir ); diff --git a/vcs/subversion/subversion_fileinfo.cpp b/vcs/subversion/subversion_fileinfo.cpp index be0a4411..6f960e0a 100644 --- a/vcs/subversion/subversion_fileinfo.cpp +++ b/vcs/subversion/subversion_fileinfo.cpp @@ -71,13 +71,13 @@ const VCSFileInfoMap *SVNFileInfoProvider::status( const TQString &dirPath ) { // Of course, the user cannot get information about the out-of-dateness of his local copy. s << cmd << KURL( TQFileInfo( rPath ).absFilePath() ) << false/*checkRepos*/ << false /*fullRecurse*/; - KIO::SimpleJob *job2 = KIO::special(servURL, parms, false); + TDEIO::SimpleJob *job2 = TDEIO::special(servURL, parms, false); job2->setWindow( m_part->mainWindow()->main() ); TQMap<TQString,TQString> ma; - KIO::NetAccess::synchronousRun(job2, m_part->mainWindow()->main(), 0, 0, &ma ); + TDEIO::NetAccess::synchronousRun(job2, m_part->mainWindow()->main(), 0, 0, &ma ); TQValueList<TQString> keys = ma.keys(); qHeapSort( keys ); @@ -154,18 +154,18 @@ bool SVNFileInfoProvider::requestStatus( const TQString &dirPath, void *callerDa kdDebug(9036) << "DIR : " << rPath << " " << TQFileInfo( rPath ).absFilePath() << endl; s << cmd << KURL( TQFileInfo( rPath ).absFilePath() ) << checkRepos << recursive; KURL servURL = "kdevsvn+http://fakeserver_this_is_normal_behavior/"; - job = KIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) ); + job = TDEIO::special(servURL, parms, false); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); if( checkRepos ) m_part->svncore()->initProcessDlg( job, dirPath, i18n("Subversion File/Directory Status") ); return true; } -void SVNFileInfoProvider::slotResult( KIO::Job *j ) { +void SVNFileInfoProvider::slotResult( TDEIO::Job *j ) { if ( j->error() ) j->showErrorDialog( m_part->mainWindow()->main() ); - KIO::MetaData ma = j->metaData(); + TDEIO::MetaData ma = j->metaData(); TQValueList<TQString> keys = ma.keys(); qHeapSort( keys ); TQValueList<TQString>::Iterator begin = keys.begin(), end = keys.end(), it; @@ -329,12 +329,12 @@ const VCSFileInfoMap *SVNFileInfoProvider::statusExt( const TQString &dirPath, rPath += TQDir::separator() + dirPath; kdDebug(9036) << "DIR : " << rPath << " " << KURL( TQFileInfo( rPath ).absFilePath() ) << endl; s << cmd << checkRepos << fullRecurse << getAll << noIgnore << -1 << "WORKING" << KURL( TQFileInfo( rPath ).absFilePath() ); - KIO::SimpleJob *job2 = KIO::special(servURL, parms, false); + TDEIO::SimpleJob *job2 = TDEIO::special(servURL, parms, false); job2->setWindow( m_part->mainWindow()->main() ); TQMap<TQString,TQString> ma; - KIO::NetAccess::synchronousRun(job2, m_part->mainWindow()->main(), 0, 0, &ma ); + TDEIO::NetAccess::synchronousRun(job2, m_part->mainWindow()->main(), 0, 0, &ma ); TQValueList<TQString> keys = ma.keys(); qHeapSort( keys ); diff --git a/vcs/subversion/subversion_fileinfo.h b/vcs/subversion/subversion_fileinfo.h index 8b91b3b2..7a1c9bf7 100644 --- a/vcs/subversion/subversion_fileinfo.h +++ b/vcs/subversion/subversion_fileinfo.h @@ -59,7 +59,7 @@ k_dcop: void slotStatus( const TQString& , int, int, int, int, long int ) ; public slots: - void slotResult( KIO::Job * ); + void slotResult( TDEIO::Job * ); private: mutable void *m_savedCallerData; @@ -67,7 +67,7 @@ private: mutable TQString m_recursivePreviousDirPath; mutable VCSFileInfoMap *m_cachedDirEntries; mutable VCSFileInfoMap *m_recursiveDirEntries; - KIO::SimpleJob *job; + TDEIO::SimpleJob *job; subversionPart *m_part; }; diff --git a/vcs/subversion/subversion_widget.cpp b/vcs/subversion/subversion_widget.cpp index c27f845e..0f66a844 100644 --- a/vcs/subversion/subversion_widget.cpp +++ b/vcs/subversion/subversion_widget.cpp @@ -115,7 +115,7 @@ SvnLogViewItem ::~SvnLogViewItem () //////////////////////////////////////////////////////////////////////// SvnProgressDlg::SvnProgressDlg( bool showNow ) - : KIO::DefaultProgress( showNow ) + : TDEIO::DefaultProgress( showNow ) { setStopOnClose( true ); setCaption( i18n("Subversion Job Progress") ); diff --git a/vcs/subversion/subversion_widget.h b/vcs/subversion/subversion_widget.h index a9369a37..a74f7182 100644 --- a/vcs/subversion/subversion_widget.h +++ b/vcs/subversion/subversion_widget.h @@ -85,7 +85,7 @@ class SvnLogViewItem : public SvnIntSortListItem { ///////////////////////////////////////////////////////////// /// Subversion Progress Display Widget -class SvnProgressDlg : public KIO::DefaultProgress { +class SvnProgressDlg : public TDEIO::DefaultProgress { public: SvnProgressDlg( bool showNow = true ); ~SvnProgressDlg(); 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); diff --git a/vcs/subversion/svn_kio.h b/vcs/subversion/svn_kio.h index 4ecfbb9d..0a6d56b2 100644 --- a/vcs/subversion/svn_kio.h +++ b/vcs/subversion/svn_kio.h @@ -65,7 +65,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); @@ -128,7 +128,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 @@ -155,7 +155,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; unsigned long int m_counter; }; |