From e044c5463329652f28565dfc7de24ef8b0edaa6f Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 17 Jun 2015 15:33:10 +0900 Subject: Revert to .kdevelop files with entity name for project files. This resolves bug 2308. Signed-off-by: Michele Calgaro --- src/projectmanager.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/projectmanager.cpp') diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp index 77c84658..19a88d78 100644 --- a/src/projectmanager.cpp +++ b/src/projectmanager.cpp @@ -55,7 +55,7 @@ class TQDomDocument; TQString ProjectInfo::sessionFile() const { TQString sf = m_projectURL.path(-1); - sf.truncate(sf.length() - 8); // without ".tdevelop" + sf.truncate(sf.length() - 8); // without ".kdevelop" sf += "kdevses"; // suffix for a TDevelop session file return sf; } @@ -130,7 +130,7 @@ void ProjectManager::slotOpenProject() TQString defaultProjectsDir = config->readPathEntry("DefaultProjectsDir", TQDir::homeDirPath()+"/"); KURL url = KFileDialog::getOpenURL(defaultProjectsDir, - i18n("*.tdevelop|KDevelop 3 Project Files\n" + i18n("*.kdevelop|KDevelop 3 Project Files\n" "*.kdevprj|KDevelop 2 Project Files"), TopLevel::getInstance()->main(), i18n("Open Project") ); @@ -379,7 +379,7 @@ bool ProjectManager::loadProjectFile() TDEIO::NetAccess::removeTempFile(path); return false; } - if (m_info->m_document.documentElement().nodeName() != "tdevelop") + if (m_info->m_document.documentElement().nodeName() != "kdevelop") { KMessageBox::sorry(TopLevel::getInstance()->main(), i18n("This is not a valid project file.")); @@ -411,7 +411,7 @@ bool ProjectManager::saveProjectFile() API::getInstance()->projectDom()->save(stream, 2); fout.close(); } else { - KTempFile fout(TQString::fromLatin1("tdevelop3")); + KTempFile fout(TQString::fromLatin1("kdevelop3")); fout.setAutoDelete(true); if (fout.status() != 0) { KMessageBox::sorry(TopLevel::getInstance()->main(), i18n("Could not write the project file.")); @@ -457,7 +457,7 @@ void ProjectManager::getGeneralInfo() if( m_info->m_projectName.isEmpty() ) { m_info->m_projectName = m_info->m_projectURL.filename(); - m_info->m_projectName = m_info->m_projectName.left(m_info->m_projectName.length()-TQString(".tdevelop").length()); + m_info->m_projectName = m_info->m_projectName.left(m_info->m_projectName.length()-TQString(".kdevelop").length()); TQDomElement prjname = m_info->m_document.createElement("projectname"); prjname.appendChild( m_info->m_document.createTextNode( m_info->m_projectName) ); generalEl.appendChild( prjname ); @@ -618,9 +618,9 @@ bool ProjectManager::loadKDevelop2Project( const KURL & url ) return false; } - TQString cmd = TDEGlobal::dirs()->findExe( "kdevprj2tdevelop" ); + TQString cmd = TDEGlobal::dirs()->findExe( "kdevprj2kdevelop" ); if (cmd.isEmpty()) { - KMessageBox::sorry(0, i18n("You do not have 'kdevprj2tdevelop' installed.")); + KMessageBox::sorry(0, i18n("You do not have 'kdevprj2kdevelop' installed.")); return false; } @@ -631,7 +631,7 @@ bool ProjectManager::loadKDevelop2Project( const KURL & url ) proc << "perl" << cmd << KShellProcess::quote( url.path() ); proc.start( TDEProcess::Block ); - TQString projectFile = fileInfo.dirPath( true ) + "/" + fileInfo.baseName() + ".tdevelop"; + TQString projectFile = fileInfo.dirPath( true ) + "/" + fileInfo.baseName() + ".kdevelop"; return loadProject( KURL(projectFile) ); } -- cgit v1.2.1