From 8be917e3bd971831d026d8dbde68729e9d9dde16 Mon Sep 17 00:00:00 2001
From: dt_ <qtc-committer@nokia.com>
Date: Fri, 24 Jun 2011 12:43:48 +0200
Subject: [PATCH] Remove unneeded code
Change-Id: I334d7e21b09bc07a1ad20c08ca318e5e69d691bb
Reviewed-on: http://codereview.qt.nokia.com/885
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
---
.../wizards/abstractmobileappwizard.cpp | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
index 5bdf18bcdc3..55f9c6ddee0 100644
--- a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
@@ -263,21 +263,6 @@ Core::GeneratedFiles AbstractMobileAppWizard::generateFiles(const QWizard *wizar
return app()->generateFiles(errorMessage);
}
-// TODO remove this workaround:
-// SessionManager::projectContainsFile() incorrectly returns false if the
-// file name in the .pro file (and thus also in m_projectFileCache)
-// contains relative path segments ("../").
-inline static QString fileInCurrentProject(const QString &file)
-{
- const ProjectExplorer::Project *p = ProjectExplorer::ProjectExplorerPlugin::instance()->currentProject();
- QTC_ASSERT(p, return QString(); )
- const QStringList filesInProject = p->files(ProjectExplorer::Project::ExcludeGeneratedFiles);
- foreach (const QString &uncleanFile, filesInProject)
- if (QDir::cleanPath(uncleanFile) == file)
- return uncleanFile;
- return QString();
-}
-
bool AbstractMobileAppWizard::postGenerateFiles(const QWizard *w,
const Core::GeneratedFiles &l, QString *errorMessage)
{
@@ -293,7 +278,7 @@ bool AbstractMobileAppWizard::postGenerateFiles(const QWizard *w,
project.saveSettings();
success = ProjectExplorer::CustomProjectWizard::postGenerateOpen(l, errorMessage);
if (success) {
- const QString fileToOpen = fileInCurrentProject(fileToOpenPostGeneration());
+ const QString fileToOpen = fileToOpenPostGeneration();
if (!fileToOpen.isEmpty()) {
Core::EditorManager::instance()->openEditor(fileToOpen, QString(), Core::EditorManager::ModeSwitch);
ProjectExplorer::ProjectExplorerPlugin::instance()->setCurrentFile(0, fileToOpen);
--
GitLab