diff options
| author | hjk <hjk121@nokiamail.com> | 2013-10-29 14:22:31 +0100 |
|---|---|---|
| committer | hjk <hjk121@nokiamail.com> | 2013-10-29 14:54:53 +0100 |
| commit | ce9c2efd1f2f5626de7523faacc5f1329edf176d (patch) | |
| tree | 7e0a513696ba918d3caffd2c99e79743bd1a5043 /src/plugins/android/createandroidmanifestwizard.cpp | |
| parent | 262a1e262d3fdbc09844e3feac10d3814fb015f0 (diff) | |
| download | qt-creator-ce9c2efd1f2f5626de7523faacc5f1329edf176d.tar.gz | |
Qt4ProjectManager: Rename {Qt4,Qmake}{Project,Pr{i,o}FileNode}
Change-Id: I27139d8ccc17b665853bec4a37e80568680b5fcc
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
Diffstat (limited to 'src/plugins/android/createandroidmanifestwizard.cpp')
| -rw-r--r-- | src/plugins/android/createandroidmanifestwizard.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/android/createandroidmanifestwizard.cpp b/src/plugins/android/createandroidmanifestwizard.cpp index 6a7912b6db..8855d98ae0 100644 --- a/src/plugins/android/createandroidmanifestwizard.cpp +++ b/src/plugins/android/createandroidmanifestwizard.cpp @@ -43,8 +43,8 @@ using namespace Android; using namespace Android::Internal; -using QmakeProjectManager::Qt4Project; -using QmakeProjectManager::Qt4ProFileNode; +using QmakeProjectManager::QmakeProject; +using QmakeProjectManager::QmakeProFileNode; // // NoApplicationProFilePage @@ -63,7 +63,7 @@ NoApplicationProFilePage::NoApplicationProFilePage(CreateAndroidManifestWizard * // // ChooseProFilePage // -ChooseProFilePage::ChooseProFilePage(CreateAndroidManifestWizard *wizard, const QList<Qt4ProFileNode *> &nodes) +ChooseProFilePage::ChooseProFilePage(CreateAndroidManifestWizard *wizard, const QList<QmakeProFileNode *> &nodes) : m_wizard(wizard) { QFormLayout *fl = new QFormLayout(this); @@ -73,7 +73,7 @@ ChooseProFilePage::ChooseProFilePage(CreateAndroidManifestWizard *wizard, const fl->addRow(label); m_comboBox = new QComboBox(this); - foreach (Qt4ProFileNode *node, nodes) + foreach (QmakeProFileNode *node, nodes) m_comboBox->addItem(node->displayName(), QVariant::fromValue(static_cast<void *>(node))); // TODO something more? connect(m_comboBox, SIGNAL(currentIndexChanged(int)), @@ -86,7 +86,7 @@ ChooseProFilePage::ChooseProFilePage(CreateAndroidManifestWizard *wizard, const void ChooseProFilePage::nodeSelected(int index) { Q_UNUSED(index) - m_wizard->setNode(static_cast<Qt4ProFileNode *>(m_comboBox->itemData(m_comboBox->currentIndex()).value<void *>())); + m_wizard->setNode(static_cast<QmakeProFileNode *>(m_comboBox->itemData(m_comboBox->currentIndex()).value<void *>())); } @@ -133,8 +133,8 @@ CreateAndroidManifestWizard::CreateAndroidManifestWizard(ProjectExplorer::Target { setWindowTitle(tr("Create Android Manifest Wizard")); - Qt4Project *project = static_cast<Qt4Project *>(target->project()); - QList<Qt4ProFileNode *> nodes = project->applicationProFiles(); + QmakeProject *project = static_cast<QmakeProject *>(target->project()); + QList<QmakeProFileNode *> nodes = project->applicationProFiles(); if (nodes.isEmpty()) { // oh uhm can't create anything addPage(new NoApplicationProFilePage(this)); @@ -147,12 +147,12 @@ CreateAndroidManifestWizard::CreateAndroidManifestWizard(ProjectExplorer::Target } } -QmakeProjectManager::Qt4ProFileNode *CreateAndroidManifestWizard::node() const +QmakeProjectManager::QmakeProFileNode *CreateAndroidManifestWizard::node() const { return m_node; } -void CreateAndroidManifestWizard::setNode(QmakeProjectManager::Qt4ProFileNode *node) +void CreateAndroidManifestWizard::setNode(QmakeProjectManager::QmakeProFileNode *node) { m_node = node; } |