diff options
author | Eike Ziller <eike.ziller@nokia.com> | 2012-02-14 16:43:51 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@nokia.com> | 2012-02-20 13:32:49 +0100 |
commit | d66acb51d0c8b511df9f679806cbd3d84cce41ef (patch) | |
tree | 58289c9e7f7bc6107b4d620fad791a206d097555 /src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp | |
parent | 266da3568d2db185f67227d38e29cd20d28fb2bd (diff) | |
download | qt-creator-d66acb51d0c8b511df9f679806cbd3d84cce41ef.tar.gz |
Rename IFile->IDocument and FileManager->DocumentManager
And adapt the other API respectively.
Change-Id: I1e04e555409be09242db6890f9e013396f83aeed
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Diffstat (limited to 'src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp')
-rw-r--r-- | src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp index 614f109150..990d134d33 100644 --- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp +++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp @@ -43,7 +43,7 @@ #include "ui_qt4projectconfigwidget.h" #include <coreplugin/icore.h> -#include <coreplugin/ifile.h> +#include <coreplugin/idocument.h> #include <projectexplorer/toolchainmanager.h> #include <projectexplorer/toolchain.h> @@ -362,7 +362,7 @@ void Qt4ProjectConfigWidget::updateImportLabel() if (!qmakePath.isEmpty()) { // Is it from the same build? QtSupport::QtVersionManager::MakefileCompatible mc = - QtSupport::QtVersionManager::makefileIsFor(makefile, m_buildConfiguration->target()->project()->file()->fileName()); + QtSupport::QtVersionManager::makefileIsFor(makefile, m_buildConfiguration->target()->project()->document()->fileName()); if (mc == QtSupport::QtVersionManager::DifferentProject) { incompatibleBuild = true; } else if (mc == QtSupport::QtVersionManager::SameProject) { @@ -395,11 +395,11 @@ void Qt4ProjectConfigWidget::updateImportLabel() buildDirectory = m_buildConfiguration->buildDirectory(); QList<ProjectExplorer::Task> issues; if (QtSupport::BaseQtVersion *version = m_buildConfiguration->qtVersion()) { - issues = version->reportIssues(m_buildConfiguration->target()->project()->file()->fileName(), + issues = version->reportIssues(m_buildConfiguration->target()->project()->document()->fileName(), buildDirectory); foreach (Qt4BaseTargetFactory *factory, Qt4BaseTargetFactory::qt4BaseTargetFactoriesForIds(version->supportedTargetIds().toList())) - issues.append(factory->reportIssues(m_buildConfiguration->target()->project()->file()->fileName())); + issues.append(factory->reportIssues(m_buildConfiguration->target()->project()->document()->fileName())); qSort(issues); } |