feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Don't use the QtVersionManger::instance() where it isn't needed.

Browse Source 
Allows removing getting the instance once.
This commit is contained in:
dt
2009-04-23 14:36:47 +02:00
parent a2b29a5ec2
commit 37e382b3bd
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qt4projectmanager/projectloadwizard.cpp
View File

@@ -52,7 +52,7 @@ ProjectLoadWizard::ProjectLoadWizard(Qt4Project *project, QWidget *parent, Qt::W
{ {
ProjectExplorer::QtVersionManager * vm = ProjectExplorer::QtVersionManager::instance(); ProjectExplorer::QtVersionManager * vm = ProjectExplorer::QtVersionManager::instance();
QString directory = QFileInfo(project->file()->fileName()).absolutePath(); QString directory = QFileInfo(project->file()->fileName()).absolutePath();
QString importVersion = vm->findQtVersionFromMakefile(directory); QString importVersion = ProjectExplorer::QtVersionManager::findQtVersionFromMakefile(directory);
if (!importVersion.isNull()) { if (!importVersion.isNull()) {
// This also means we have a build in there // This also means we have a build in there
@@ -65,7 +65,7 @@ ProjectLoadWizard::ProjectLoadWizard(Qt4Project *project, QWidget *parent, Qt::W
} }
m_importBuildConfig = m_importVersion->defaultBuildConfig(); m_importBuildConfig = m_importVersion->defaultBuildConfig();
m_importBuildConfig= vm->scanMakefileForQmakeConfig(directory, m_importBuildConfig); m_importBuildConfig= ProjectExplorer::QtVersionManager::scanMakefileForQmakeConfig(directory, m_importBuildConfig);
} }
// So now we have the version and the configuration for that version // So now we have the version and the configuration for that version

9
src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
View File

@@ -184,8 +184,7 @@ void Qt4ProjectConfigWidget::updateImportLabel()
{ {
m_ui->importLabel->setVisible(false); m_ui->importLabel->setVisible(false);
if (m_ui->shadowBuildCheckBox->isChecked()) { if (m_ui->shadowBuildCheckBox->isChecked()) {
ProjectExplorer::QtVersionManager *vm = ProjectExplorer::QtVersionManager::instance(); QString qtPath = ProjectExplorer::QtVersionManager::findQtVersionFromMakefile(m_ui->shadowBuildDirEdit->path());
QString qtPath = vm->findQtVersionFromMakefile(m_ui->shadowBuildDirEdit->path());
if (!qtPath.isEmpty()) { if (!qtPath.isEmpty()) {
m_ui->importLabel->setVisible(true); m_ui->importLabel->setVisible(true);
} }
@@ -219,16 +218,16 @@ void Qt4ProjectConfigWidget::importLabelClicked()
if (m_ui->shadowBuildCheckBox->isChecked()) { if (m_ui->shadowBuildCheckBox->isChecked()) {
QString directory = m_ui->shadowBuildDirEdit->path(); QString directory = m_ui->shadowBuildDirEdit->path();
if (!directory.isEmpty()) { if (!directory.isEmpty()) {
QtVersionManager *vm = QtVersionManager::instance(); QString qtPath = QtVersionManager::findQtVersionFromMakefile(directory);
QString qtPath = vm->findQtVersionFromMakefile(directory);
if (!qtPath.isEmpty()) { if (!qtPath.isEmpty()) {
QtVersionManager *vm = QtVersionManager::instance();
QtVersion *version = vm->qtVersionForDirectory(qtPath); QtVersion *version = vm->qtVersionForDirectory(qtPath);
if (!version) { if (!version) {
version = new QtVersion(QFileInfo(qtPath).baseName(), qtPath); version = new QtVersion(QFileInfo(qtPath).baseName(), qtPath);
vm->addVersion(version); vm->addVersion(version);
} }
QtVersion::QmakeBuildConfig qmakeBuildConfig = version->defaultBuildConfig(); QtVersion::QmakeBuildConfig qmakeBuildConfig = version->defaultBuildConfig();
qmakeBuildConfig = vm->scanMakefileForQmakeConfig(directory, qmakeBuildConfig); qmakeBuildConfig = QtVersionManager::scanMakefileForQmakeConfig(directory, qmakeBuildConfig);
// So we got all the information now apply it... // So we got all the information now apply it...
m_pro->setQtVersion(m_buildConfiguration, version->uniqueId()); m_pro->setQtVersion(m_buildConfiguration, version->uniqueId());