From da1522385e5367bae56b90fac55c4355e475905b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:38:54 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- vcs/subversion/integrator/svnintegratordlg.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'vcs/subversion/integrator') 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 -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.") ); -- cgit v1.2.1