From ebcd992577bfca1e94f207958d736490395cd82b Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 16 Oct 2013 11:02:37 +0200 Subject: Rename namespace Qt4ProjectManager to QmakeProjectManager First step towards plugin renaming. Change-Id: I8ac017660a7aa2bda0d7bb7d72ab0cfceaf6cfd2 Reviewed-by: Eike Ziller --- src/plugins/android/androiddeployqtwidget.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/plugins/android/androiddeployqtwidget.cpp') diff --git a/src/plugins/android/androiddeployqtwidget.cpp b/src/plugins/android/androiddeployqtwidget.cpp index 8a46ebce5e..bf760dc7c4 100644 --- a/src/plugins/android/androiddeployqtwidget.cpp +++ b/src/plugins/android/androiddeployqtwidget.cpp @@ -135,7 +135,7 @@ AndroidDeployQtWidget::AndroidDeployQtWidget(AndroidDeployQtStep *step) connect(m_ui->createAndroidManifestButton, SIGNAL(clicked()), this, SLOT(createManifestButton())); - m_extraLibraryListModel = new AndroidExtraLibraryListModel(static_cast(m_step->project()), + m_extraLibraryListModel = new AndroidExtraLibraryListModel(static_cast(m_step->project()), this); m_ui->androidExtraLibsListView->setModel(m_extraLibraryListModel); @@ -156,8 +156,8 @@ AndroidDeployQtWidget::~AndroidDeployQtWidget() void AndroidDeployQtWidget::checkProjectTemplate() { - Qt4ProjectManager::Qt4Project *project = static_cast(m_step->project()); - if (project->rootQt4ProjectNode()->projectType() == Qt4ProjectManager::ApplicationTemplate) + QmakeProjectManager::Qt4Project *project = static_cast(m_step->project()); + if (project->rootQt4ProjectNode()->projectType() == QmakeProjectManager::ApplicationTemplate) m_ui->additionalLibrariesGroupBox->setEnabled(true); else m_ui->additionalLibrariesGroupBox->setEnabled(false); @@ -171,9 +171,9 @@ void AndroidDeployQtWidget::createManifestButton() void AndroidDeployQtWidget::updateInputFileUi() { - Qt4ProjectManager::Qt4Project *project - = static_cast(m_step->project()); - QList nodes = project->applicationProFiles(); + QmakeProjectManager::Qt4Project *project + = static_cast(m_step->project()); + QList nodes = project->applicationProFiles(); int size = nodes.size(); if (size == 0 || size == 1) { // there's nothing to select, e.g. before parsing @@ -185,8 +185,8 @@ void AndroidDeployQtWidget::updateInputFileUi() m_ui->inputFileComboBox->setVisible(true); m_ui->inputFileComboBox->clear(); - foreach (Qt4ProjectManager::Qt4ProFileNode *node, nodes) { - QString file = node->singleVariableValue(Qt4ProjectManager::AndroidDeploySettingsFile); + foreach (QmakeProjectManager::Qt4ProFileNode *node, nodes) { + QString file = node->singleVariableValue(QmakeProjectManager::AndroidDeploySettingsFile); m_ui->inputFileComboBox->addItem(node->displayName(), file); } @@ -325,8 +325,8 @@ void AndroidDeployQtWidget::activeBuildConfigurationChanged() disconnect(m_currentBuildConfiguration, SIGNAL(qmakeBuildConfigurationChanged()), this, SLOT(updateSigningWarning())); updateSigningWarning(); - Qt4ProjectManager::Qt4BuildConfiguration *bc - = qobject_cast(m_step->target()->activeBuildConfiguration()); + QmakeProjectManager::Qt4BuildConfiguration *bc + = qobject_cast(m_step->target()->activeBuildConfiguration()); m_currentBuildConfiguration = bc; if (bc) connect(bc, SIGNAL(qmakeBuildConfigurationChanged()), this, SLOT(updateSigningWarning())); @@ -335,7 +335,7 @@ void AndroidDeployQtWidget::activeBuildConfigurationChanged() void AndroidDeployQtWidget::updateSigningWarning() { - Qt4ProjectManager::Qt4BuildConfiguration *bc = qobject_cast(m_step->target()->activeBuildConfiguration()); + QmakeProjectManager::Qt4BuildConfiguration *bc = qobject_cast(m_step->target()->activeBuildConfiguration()); bool debug = bc && (bc->qmakeBuildConfiguration() & QtSupport::BaseQtVersion::DebugBuild); if (m_step->signPackage() && debug) { m_ui->signingDebugWarningIcon->setVisible(true); -- cgit v1.2.1