From 6392f5a9dfce2bf83617d49bb7f332181ec6004e Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 25 May 2014 15:37:31 +0900 Subject: Revert "Finish renaming tdevelop components" This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73. --- vcs/subversion/subversion_core.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'vcs/subversion/subversion_core.cpp') diff --git a/vcs/subversion/subversion_core.cpp b/vcs/subversion/subversion_core.cpp index 108bf298..e9c89ece 100644 --- a/vcs/subversion/subversion_core.cpp +++ b/vcs/subversion/subversion_core.cpp @@ -18,15 +18,15 @@ */ #include -#include -#include +#include +#include #include "subversion_part.h" #include "subversion_core.h" #include "subversion_widget.h" #include "svn_blamewidget.h" #include "svn_logviewwidget.h" #include "subversiondiff.h" -#include +#include #include "svn_co.h" #include #include @@ -82,7 +82,7 @@ subversionCore::~subversionCore() { //FIXME delete m_fileInfoProvider here? } -TDevVCSFileInfoProvider *subversionCore::fileInfoProvider() const { +KDevVCSFileInfoProvider *subversionCore::fileInfoProvider() const { return m_fileInfoProvider; } @@ -114,8 +114,8 @@ subversionWidget *subversionCore::processWidget() const { void subversionCore::resolve( const KURL::List& list ) { KURL servURL = m_part->baseURL(); if ( servURL.isEmpty() ) servURL="kdevsvn+svn://blah/"; - if ( ! servURL.protocol().startsWith( "tdevsvn+" ) ) { - servURL.setProtocol( "tdevsvn+" + servURL.protocol() ); //make sure it starts with "svn" + if ( ! servURL.protocol().startsWith( "kdevsvn+" ) ) { + servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn" } kdDebug(9036) << "servURL : " << servURL.prettyURL() << endl; for ( TQValueListConstIterator it = list.begin(); it != list.end() ; ++it ) { @@ -248,8 +248,8 @@ void subversionCore::diffAsync( const KURL &pathOrUrl1, const KURL &pathOrUrl2, void subversionCore::commit( const KURL::List& list, bool recurse, bool keeplocks ) { KURL servURL = m_part->baseURL(); if ( servURL.isEmpty() ) servURL="kdevsvn+svn://blah/"; - if ( ! servURL.protocol().startsWith( "tdevsvn+" ) ) { - servURL.setProtocol( "tdevsvn+" + servURL.protocol() ); //make sure it starts with "svn" + if ( ! servURL.protocol().startsWith( "kdevsvn+" ) ) { + servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn" } kdDebug(9036) << "servURL : " << servURL.prettyURL() << endl; TQByteArray parms; @@ -277,8 +277,8 @@ void subversionCore::svnLog( const KURL::List& list, clientInfo( KURL(m_part->project()->projectDirectory()), false, m_part->m_prjInfoMap ); KURL servURL = m_part->baseURL(); if ( servURL.isEmpty() ) servURL="kdevsvn+svn://blah/"; - if ( ! servURL.protocol().startsWith( "tdevsvn+" ) ) { - servURL.setProtocol( "tdevsvn+" + servURL.protocol() ); //make sure it starts with "svn" + if ( ! servURL.protocol().startsWith( "kdevsvn+" ) ) { + servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn" } kdDebug(9036) << "servURL : " << servURL.prettyURL() << endl; TQByteArray parms; @@ -304,8 +304,8 @@ void subversionCore::blame( const KURL &url, UrlMode mode, int revstart, TQStrin { KURL servURL = m_part->baseURL(); if ( servURL.isEmpty() ) servURL="kdevsvn+svn://blah/"; - if ( ! servURL.protocol().startsWith( "tdevsvn+" ) ) { - servURL.setProtocol( "tdevsvn+" + servURL.protocol() ); //make sure it starts with "svn" + if ( ! servURL.protocol().startsWith( "kdevsvn+" ) ) { + servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn" } kdDebug(9036) << "servURL : " << servURL.prettyURL() << endl; TQByteArray parms; @@ -374,7 +374,7 @@ void subversionCore::checkout() { int cmd = 1; int rev = -1; s << cmd << servURL << KURL( wcPath ) << rev << TQString( "HEAD" ); - servURL.setProtocol( "tdevsvn+" + servURL.protocol() ); //make sure it starts with "svn" + servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn" SimpleJob * job = TDEIO::special(servURL,parms, true); job->setWindow( m_part->mainWindow()->main() ); connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotEndCheckout( TDEIO::Job * ) ) ); -- cgit v1.2.3