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. --- src/projectmanager.cpp | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'src/projectmanager.cpp') diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp index 3ced0d63..c0380ffb 100644 --- a/src/projectmanager.cpp +++ b/src/projectmanager.cpp @@ -30,11 +30,11 @@ class TQDomDocument; #include #include -#include "tdevproject.h" -#include "tdevlanguagesupport.h" -#include "tdevplugin.h" -#include "tdevcreatefile.h" -#include "tdevversioncontrol.h" +#include "kdevproject.h" +#include "kdevlanguagesupport.h" +#include "kdevplugin.h" +#include "kdevcreatefile.h" +#include "kdevversioncontrol.h" #include "toplevel.h" @@ -97,7 +97,7 @@ void ProjectManager::createActions( TDEActionCollection* ac ) this, TQT_SLOT(slotOpenProject()), ac, "project_open"); action->setToolTip( i18n("Open project")); - action->setWhatsThis(i18n("Open project

Opens a KDevelop3 or TDevelop2 project.")); + action->setWhatsThis(i18n("Open project

Opens a KDevelop3 or KDevelop2 project.")); m_openRecentProjectAction = new TDERecentFilesAction(i18n("Open &Recent Project"), 0, @@ -137,8 +137,8 @@ void ProjectManager::slotOpenProject() if( url.isEmpty() ) return; - if (url.path().endsWith("tdevprj")) - loadTDevelop2Project( url ); + if (url.path().endsWith("kdevprj")) + loadKDevelop2Project( url ); else loadProject( url ); } @@ -490,8 +490,8 @@ bool ProjectManager::loadProjectPart() return false; } - TDevProject *projectPart = KParts::ComponentFactory - ::createInstanceFromService< TDevProject >( projectService, API::getInstance(), 0, + KDevProject *projectPart = KParts::ComponentFactory + ::createInstanceFromService< KDevProject >( projectService, API::getInstance(), 0, PluginController::argumentsFromService( projectService ) ); if ( !projectPart ) { KMessageBox::sorry(TopLevel::getInstance()->main(), @@ -517,7 +517,7 @@ bool ProjectManager::loadProjectPart() void ProjectManager::unloadProjectPart() { - TDevProject *projectPart = API::getInstance()->project(); + KDevProject *projectPart = API::getInstance()->project(); if( !projectPart ) return; PluginController::getInstance()->removePart( projectPart ); projectPart->closeProject(); @@ -547,8 +547,8 @@ bool ProjectManager::loadLanguageSupport(const TQString& lang) } KService::Ptr languageSupportService = *languageSupportOffers.begin(); - TDevLanguageSupport *langSupport = KParts::ComponentFactory - ::createInstanceFromService( languageSupportService, + KDevLanguageSupport *langSupport = KParts::ComponentFactory + ::createInstanceFromService( languageSupportService, API::getInstance(), 0, PluginController::argumentsFromService( languageSupportService ) ); @@ -569,7 +569,7 @@ bool ProjectManager::loadLanguageSupport(const TQString& lang) void ProjectManager::unloadLanguageSupport() { - TDevLanguageSupport *langSupport = API::getInstance()->languageSupport(); + KDevLanguageSupport *langSupport = API::getInstance()->languageSupport(); if( !langSupport ) return; kdDebug(9000) << "Language support for " << langSupport->name() << " unloading..." << endl; PluginController::getInstance()->removePart( langSupport ); @@ -611,14 +611,14 @@ ProjectSession* ProjectManager::projectSession() const return m_pProjectSession; } -bool ProjectManager::loadTDevelop2Project( const KURL & url ) +bool ProjectManager::loadKDevelop2Project( const KURL & url ) { if( !url.isValid() || !url.isLocalFile() ){ KMessageBox::sorry(0, i18n("Invalid URL.")); return false; } - TQString cmd = TDEGlobal::dirs()->findExe( "tdevprj2tdevelop" ); + TQString cmd = TDEGlobal::dirs()->findExe( "kdevprj2tdevelop" ); if (cmd.isEmpty()) { KMessageBox::sorry(0, i18n("You do not have 'kdevprj2tdevelop' installed.")); return false; -- cgit v1.2.1