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

Rename namespace Qt4ProjectManager to QmakeProjectManager

Browse Source 
First step towards plugin renaming.

Change-Id: I8ac017660a7aa2bda0d7bb7d72ab0cfceaf6cfd2
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
hjk
2013-10-16 11:02:37 +02:00
committed by Eike Ziller
parent 56d564c5b3
commit ebcd992577
199 changed files with 509 additions and 509 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/android/androiddebugsupport.cpp
View File

@@ -53,7 +53,7 @@
using namespace Debugger; using namespace Debugger;
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Qt4ProjectManager; using namespace QmakeProjectManager;
namespace Android { namespace Android {
namespace Internal { namespace Internal {

2
src/plugins/android/androiddeployconfiguration.cpp
View File

@@ -124,7 +124,7 @@ DeployConfiguration *AndroidDeployConfigurationFactory::clone(Target *parent, De
QList<Core::Id> AndroidDeployConfigurationFactory::availableCreationIds(Target *parent) const QList<Core::Id> AndroidDeployConfigurationFactory::availableCreationIds(Target *parent) const
{ {
QList<Core::Id> ids; QList<Core::Id> ids;
if (!qobject_cast<Qt4ProjectManager::Qt4Project *>(parent->project())) if (!qobject_cast<QmakeProjectManager::Qt4Project *>(parent->project()))
return ids; return ids;
if (!parent->project()->supportsKit(parent->kit())) if (!parent->project()->supportsKit(parent->kit()))

12
src/plugins/android/androiddeployqtstep.cpp
View File

@@ -188,8 +188,8 @@ bool AndroidDeployQtStep::init()
m_serialNumber = info.serialNumber; m_serialNumber = info.serialNumber;
} }
Qt4ProjectManager::Qt4BuildConfiguration *bc QmakeProjectManager::Qt4BuildConfiguration *bc
= static_cast<Qt4ProjectManager::Qt4BuildConfiguration *>(target()->activeBuildConfiguration()); = static_cast<QmakeProjectManager::Qt4BuildConfiguration *>(target()->activeBuildConfiguration());
if (m_signPackage) { if (m_signPackage) {
// check keystore and certificate passwords // check keystore and certificate passwords
@@ -344,12 +344,12 @@ void AndroidDeployQtStep::runCommand(const QString &program, const QStringList &
void AndroidDeployQtStep::updateInputFile() void AndroidDeployQtStep::updateInputFile()
{ {
Qt4ProjectManager::Qt4Project *pro = static_cast<Qt4ProjectManager::Qt4Project *>(project()); QmakeProjectManager::Qt4Project *pro = static_cast<QmakeProjectManager::Qt4Project *>(project());
QList<Qt4ProjectManager::Qt4ProFileNode *> nodes = pro->applicationProFiles(); QList<QmakeProjectManager::Qt4ProFileNode *> nodes = pro->applicationProFiles();
QStringList inputFiles; QStringList inputFiles;
foreach (Qt4ProjectManager::Qt4ProFileNode *node, nodes) foreach (QmakeProjectManager::Qt4ProFileNode *node, nodes)
inputFiles << node->singleVariableValue(Qt4ProjectManager::AndroidDeploySettingsFile); inputFiles << node->singleVariableValue(QmakeProjectManager::AndroidDeploySettingsFile);
if (!inputFiles.contains(m_inputFile)) if (!inputFiles.contains(m_inputFile))
m_inputFile.clear(); m_inputFile.clear();

22
src/plugins/android/androiddeployqtwidget.cpp
View File

@@ -135,7 +135,7 @@ AndroidDeployQtWidget::AndroidDeployQtWidget(AndroidDeployQtStep *step)
connect(m_ui->createAndroidManifestButton, SIGNAL(clicked()), connect(m_ui->createAndroidManifestButton, SIGNAL(clicked()),
this, SLOT(createManifestButton())); this, SLOT(createManifestButton()));
m_extraLibraryListModel = new AndroidExtraLibraryListModel(static_cast<Qt4ProjectManager::Qt4Project *>(m_step->project()), m_extraLibraryListModel = new AndroidExtraLibraryListModel(static_cast<QmakeProjectManager::Qt4Project *>(m_step->project()),
this); this);
m_ui->androidExtraLibsListView->setModel(m_extraLibraryListModel); m_ui->androidExtraLibsListView->setModel(m_extraLibraryListModel);
@@ -156,8 +156,8 @@ AndroidDeployQtWidget::~AndroidDeployQtWidget()
void AndroidDeployQtWidget::checkProjectTemplate() void AndroidDeployQtWidget::checkProjectTemplate()
{ {
Qt4ProjectManager::Qt4Project *project = static_cast<Qt4ProjectManager::Qt4Project *>(m_step->project()); QmakeProjectManager::Qt4Project *project = static_cast<QmakeProjectManager::Qt4Project *>(m_step->project());
if (project->rootQt4ProjectNode()->projectType() == Qt4ProjectManager::ApplicationTemplate) if (project->rootQt4ProjectNode()->projectType() == QmakeProjectManager::ApplicationTemplate)
m_ui->additionalLibrariesGroupBox->setEnabled(true); m_ui->additionalLibrariesGroupBox->setEnabled(true);
else else
m_ui->additionalLibrariesGroupBox->setEnabled(false); m_ui->additionalLibrariesGroupBox->setEnabled(false);
@@ -171,9 +171,9 @@ void AndroidDeployQtWidget::createManifestButton()
void AndroidDeployQtWidget::updateInputFileUi() void AndroidDeployQtWidget::updateInputFileUi()
{ {
Qt4ProjectManager::Qt4Project *project QmakeProjectManager::Qt4Project *project
= static_cast<Qt4ProjectManager::Qt4Project *>(m_step->project()); = static_cast<QmakeProjectManager::Qt4Project *>(m_step->project());
QList<Qt4ProjectManager::Qt4ProFileNode *> nodes = project->applicationProFiles(); QList<QmakeProjectManager::Qt4ProFileNode *> nodes = project->applicationProFiles();
int size = nodes.size(); int size = nodes.size();
if (size == 0 || size == 1) { if (size == 0 || size == 1) {
// there's nothing to select, e.g. before parsing // there's nothing to select, e.g. before parsing
@@ -185,8 +185,8 @@ void AndroidDeployQtWidget::updateInputFileUi()
m_ui->inputFileComboBox->setVisible(true); m_ui->inputFileComboBox->setVisible(true);
m_ui->inputFileComboBox->clear(); m_ui->inputFileComboBox->clear();
foreach (Qt4ProjectManager::Qt4ProFileNode *node, nodes) { foreach (QmakeProjectManager::Qt4ProFileNode *node, nodes) {
QString file = node->singleVariableValue(Qt4ProjectManager::AndroidDeploySettingsFile); QString file = node->singleVariableValue(QmakeProjectManager::AndroidDeploySettingsFile);
m_ui->inputFileComboBox->addItem(node->displayName(), file); m_ui->inputFileComboBox->addItem(node->displayName(), file);
} }
@@ -325,8 +325,8 @@ void AndroidDeployQtWidget::activeBuildConfigurationChanged()
disconnect(m_currentBuildConfiguration, SIGNAL(qmakeBuildConfigurationChanged()), disconnect(m_currentBuildConfiguration, SIGNAL(qmakeBuildConfigurationChanged()),
this, SLOT(updateSigningWarning())); this, SLOT(updateSigningWarning()));
updateSigningWarning(); updateSigningWarning();
Qt4ProjectManager::Qt4BuildConfiguration *bc QmakeProjectManager::Qt4BuildConfiguration *bc
= qobject_cast<Qt4ProjectManager::Qt4BuildConfiguration *>(m_step->target()->activeBuildConfiguration()); = qobject_cast<QmakeProjectManager::Qt4BuildConfiguration *>(m_step->target()->activeBuildConfiguration());
m_currentBuildConfiguration = bc; m_currentBuildConfiguration = bc;
if (bc) if (bc)
connect(bc, SIGNAL(qmakeBuildConfigurationChanged()), this, SLOT(updateSigningWarning())); connect(bc, SIGNAL(qmakeBuildConfigurationChanged()), this, SLOT(updateSigningWarning()));
@@ -335,7 +335,7 @@ void AndroidDeployQtWidget::activeBuildConfigurationChanged()
void AndroidDeployQtWidget::updateSigningWarning() void AndroidDeployQtWidget::updateSigningWarning()
{ {
Qt4ProjectManager::Qt4BuildConfiguration *bc = qobject_cast<Qt4ProjectManager::Qt4BuildConfiguration *>(m_step->target()->activeBuildConfiguration()); QmakeProjectManager::Qt4BuildConfiguration *bc = qobject_cast<QmakeProjectManager::Qt4BuildConfiguration *>(m_step->target()->activeBuildConfiguration());
bool debug = bc && (bc->qmakeBuildConfiguration() & QtSupport::BaseQtVersion::DebugBuild); bool debug = bc && (bc->qmakeBuildConfiguration() & QtSupport::BaseQtVersion::DebugBuild);
if (m_step->signPackage() && debug) { if (m_step->signPackage() && debug) {
m_ui->signingDebugWarningIcon->setVisible(true); m_ui->signingDebugWarningIcon->setVisible(true);

4
src/plugins/android/androiddeployqtwidget.h
View File

@@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE
namespace Ui { class AndroidDeployQtWidget; } namespace Ui { class AndroidDeployQtWidget; }
QT_END_NAMESPACE QT_END_NAMESPACE
namespace Qt4ProjectManager { class Qt4BuildConfiguration; } namespace QmakeProjectManager { class Qt4BuildConfiguration; }
namespace Android { namespace Android {
namespace Internal { namespace Internal {
@@ -85,7 +85,7 @@ private:
Ui::AndroidDeployQtWidget *m_ui; Ui::AndroidDeployQtWidget *m_ui;
AndroidDeployQtStep *m_step; AndroidDeployQtStep *m_step;
AndroidExtraLibraryListModel *m_extraLibraryListModel; AndroidExtraLibraryListModel *m_extraLibraryListModel;
Qt4ProjectManager::Qt4BuildConfiguration *m_currentBuildConfiguration; QmakeProjectManager::Qt4BuildConfiguration *m_currentBuildConfiguration;
bool m_ignoreChange; bool m_ignoreChange;
}; };

6
src/plugins/android/androiddeploystep.cpp
View File

@@ -56,7 +56,7 @@
using namespace Core; using namespace Core;
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Qt4ProjectManager; using namespace QmakeProjectManager;
namespace Android { namespace Android {
namespace Internal { namespace Internal {
@@ -143,7 +143,7 @@ bool AndroidDeployStep::init()
} }
m_ndkToolChainVersion = static_cast<AndroidToolChain *>(tc)->ndkToolChainVersion(); m_ndkToolChainVersion = static_cast<AndroidToolChain *>(tc)->ndkToolChainVersion();
QString arch = static_cast<Qt4Project *>(project())->rootQt4ProjectNode()->singleVariableValue(Qt4ProjectManager::AndroidArchVar); QString arch = static_cast<Qt4Project *>(project())->rootQt4ProjectNode()->singleVariableValue(QmakeProjectManager::AndroidArchVar);
if (!arch.isEmpty()) if (!arch.isEmpty())
m_libgnustl = AndroidManager::libGnuStl(arch, m_ndkToolChainVersion); m_libgnustl = AndroidManager::libGnuStl(arch, m_ndkToolChainVersion);
return true; return true;
@@ -498,4 +498,4 @@ void AndroidDeployStep::writeOutput(const QString &text, OutputFormat format)
} }
} // namespace Internal } // namespace Internal
} // namespace Qt4ProjectManager } // namespace Android

2
src/plugins/android/androiddeploystepwidget.cpp
View File

@@ -134,4 +134,4 @@ void AndroidDeployStepWidget::resetDefaultDevices()
} }
} // namespace Internal } // namespace Internal
} // namespace Qt4ProjectManager } // namespace Android

16
src/plugins/android/androidextralibrarylistmodel.cpp
View File

@@ -35,7 +35,7 @@
using namespace Android; using namespace Android;
using namespace Internal; using namespace Internal;
AndroidExtraLibraryListModel::AndroidExtraLibraryListModel(Qt4ProjectManager::Qt4Project *project, AndroidExtraLibraryListModel::AndroidExtraLibraryListModel(QmakeProjectManager::Qt4Project *project,
QObject *parent) QObject *parent)
: QAbstractItemModel(parent) : QAbstractItemModel(parent)
, m_project(project) , m_project(project)
@@ -77,18 +77,18 @@ QVariant AndroidExtraLibraryListModel::data(const QModelIndex &index, int role)
void AndroidExtraLibraryListModel::reset() void AndroidExtraLibraryListModel::reset()
{ {
if (m_project->rootQt4ProjectNode()->projectType() != Qt4ProjectManager::ApplicationTemplate) if (m_project->rootQt4ProjectNode()->projectType() != QmakeProjectManager::ApplicationTemplate)
return; return;
beginResetModel(); beginResetModel();
Qt4ProjectManager::Qt4ProFileNode *node = m_project->rootQt4ProjectNode(); QmakeProjectManager::Qt4ProFileNode *node = m_project->rootQt4ProjectNode();
m_entries = node->variableValue(Qt4ProjectManager::AndroidExtraLibs); m_entries = node->variableValue(QmakeProjectManager::AndroidExtraLibs);
endResetModel(); endResetModel();
} }
void AndroidExtraLibraryListModel::addEntries(const QStringList &list) void AndroidExtraLibraryListModel::addEntries(const QStringList &list)
{ {
if (m_project->rootQt4ProjectNode()->projectType() != Qt4ProjectManager::ApplicationTemplate) if (m_project->rootQt4ProjectNode()->projectType() != QmakeProjectManager::ApplicationTemplate)
return; return;
beginInsertRows(QModelIndex(), m_entries.size(), m_entries.size() + list.size()); beginInsertRows(QModelIndex(), m_entries.size(), m_entries.size() + list.size());
@@ -96,7 +96,7 @@ void AndroidExtraLibraryListModel::addEntries(const QStringList &list)
foreach (QString path, list) foreach (QString path, list)
m_entries += QDir(m_project->projectDirectory()).relativeFilePath(path); m_entries += QDir(m_project->projectDirectory()).relativeFilePath(path);
Qt4ProjectManager::Qt4ProFileNode *node = m_project->rootQt4ProjectNode(); QmakeProjectManager::Qt4ProFileNode *node = m_project->rootQt4ProjectNode();
node->setProVariable(QLatin1String("ANDROID_EXTRA_LIBS"), m_entries.join(QLatin1String(" "))); node->setProVariable(QLatin1String("ANDROID_EXTRA_LIBS"), m_entries.join(QLatin1String(" ")));
endInsertRows(); endInsertRows();
@@ -109,7 +109,7 @@ bool greaterModelIndexByRow(const QModelIndex &a, const QModelIndex &b)
void AndroidExtraLibraryListModel::removeEntries(QModelIndexList list) void AndroidExtraLibraryListModel::removeEntries(QModelIndexList list)
{ {
if (list.isEmpty() || m_project->rootQt4ProjectNode()->projectType() != Qt4ProjectManager::ApplicationTemplate) if (list.isEmpty() || m_project->rootQt4ProjectNode()->projectType() != QmakeProjectManager::ApplicationTemplate)
return; return;
std::sort(list.begin(), list.end(), greaterModelIndexByRow); std::sort(list.begin(), list.end(), greaterModelIndexByRow);
@@ -128,6 +128,6 @@ void AndroidExtraLibraryListModel::removeEntries(QModelIndexList list)
endRemoveRows(); endRemoveRows();
} }
Qt4ProjectManager::Qt4ProFileNode *node = m_project->rootQt4ProjectNode(); QmakeProjectManager::Qt4ProFileNode *node = m_project->rootQt4ProjectNode();
node->setProVariable(QLatin1String("ANDROID_EXTRA_LIBS"), m_entries.join(QLatin1String(" "))); node->setProVariable(QLatin1String("ANDROID_EXTRA_LIBS"), m_entries.join(QLatin1String(" ")));
} }

6
src/plugins/android/androidextralibrarylistmodel.h
View File

@@ -34,7 +34,7 @@
#include <QAbstractItemModel> #include <QAbstractItemModel>
#include <QStringList> #include <QStringList>
namespace Qt4ProjectManager { class Qt4Project; } namespace QmakeProjectManager { class Qt4Project; }
namespace Android { namespace Android {
namespace Internal { namespace Internal {
@@ -42,7 +42,7 @@ class AndroidExtraLibraryListModel : public QAbstractItemModel
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit AndroidExtraLibraryListModel(Qt4ProjectManager::Qt4Project *project, explicit AndroidExtraLibraryListModel(QmakeProjectManager::Qt4Project *project,
QObject *parent = 0); QObject *parent = 0);
QModelIndex index(int row, int column, const QModelIndex &parent) const; QModelIndex index(int row, int column, const QModelIndex &parent) const;
@@ -58,7 +58,7 @@ private slots:
void reset(); void reset();
private: private:
Qt4ProjectManager::Qt4Project *m_project; QmakeProjectManager::Qt4Project *m_project;
QStringList m_entries; QStringList m_entries;
}; };

38
src/plugins/android/androidmanager.cpp
View File

@@ -127,7 +127,7 @@ namespace Internal {
bool AndroidManager::supportsAndroid(ProjectExplorer::Target *target) bool AndroidManager::supportsAndroid(ProjectExplorer::Target *target)
{ {
if (!qobject_cast<Qt4ProjectManager::Qt4Project *>(target->project())) if (!qobject_cast<QmakeProjectManager::Qt4Project *>(target->project()))
return false; return false;
QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(target->kit()); QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(target->kit());
return version && version->platformName() == QLatin1String(QtSupport::Constants::ANDROID_PLATFORM); return version && version->platformName() == QLatin1String(QtSupport::Constants::ANDROID_PLATFORM);
@@ -259,13 +259,13 @@ bool AndroidManager::setBuildTargetSDK(ProjectExplorer::Target *target, const QS
QString AndroidManager::targetArch(ProjectExplorer::Target *target) QString AndroidManager::targetArch(ProjectExplorer::Target *target)
{ {
Qt4ProjectManager::Qt4Project *pro = qobject_cast<Qt4ProjectManager::Qt4Project *>(target->project()); QmakeProjectManager::Qt4Project *pro = qobject_cast<QmakeProjectManager::Qt4Project *>(target->project());
if (!pro) if (!pro)
return QString(); return QString();
Qt4ProjectManager::Qt4ProFileNode *node = pro->rootQt4ProjectNode(); QmakeProjectManager::Qt4ProFileNode *node = pro->rootQt4ProjectNode();
if (!node) if (!node)
return QString(); return QString();
return node->singleVariableValue(Qt4ProjectManager::AndroidArchVar); return node->singleVariableValue(QmakeProjectManager::AndroidArchVar);
} }
Utils::FileName AndroidManager::dirPath(ProjectExplorer::Target *target) Utils::FileName AndroidManager::dirPath(ProjectExplorer::Target *target)
@@ -330,11 +330,11 @@ Utils::FileName AndroidManager::apkPath(ProjectExplorer::Target *target, BuildTy
QStringList AndroidManager::availableTargetApplications(ProjectExplorer::Target *target) QStringList AndroidManager::availableTargetApplications(ProjectExplorer::Target *target)
{ {
QStringList apps; QStringList apps;
Qt4ProjectManager::Qt4Project *qt4Project = qobject_cast<Qt4ProjectManager::Qt4Project *>(target->project()); QmakeProjectManager::Qt4Project *qt4Project = qobject_cast<QmakeProjectManager::Qt4Project *>(target->project());
if (!qt4Project) if (!qt4Project)
return apps; return apps;
foreach (Qt4ProjectManager::Qt4ProFileNode *proFile, qt4Project->applicationProFiles()) { foreach (QmakeProjectManager::Qt4ProFileNode *proFile, qt4Project->applicationProFiles()) {
if (proFile->projectType() == Qt4ProjectManager::ApplicationTemplate) { if (proFile->projectType() == QmakeProjectManager::ApplicationTemplate) {
if (proFile->targetInformation().target.startsWith(QLatin1String("lib")) if (proFile->targetInformation().target.startsWith(QLatin1String("lib"))
&& proFile->targetInformation().target.endsWith(QLatin1String(".so"))) && proFile->targetInformation().target.endsWith(QLatin1String(".so")))
apps << proFile->targetInformation().target.mid(3, proFile->targetInformation().target.lastIndexOf(QLatin1Char('.')) - 3); apps << proFile->targetInformation().target.mid(3, proFile->targetInformation().target.lastIndexOf(QLatin1Char('.')) - 3);
@@ -509,9 +509,9 @@ QString AndroidManager::targetApplicationPath(ProjectExplorer::Target *target)
QString selectedApp = targetApplication(target); QString selectedApp = targetApplication(target);
if (selectedApp.isEmpty()) if (selectedApp.isEmpty())
return QString(); return QString();
Qt4ProjectManager::Qt4Project *qt4Project = qobject_cast<Qt4ProjectManager::Qt4Project *>(target->project()); QmakeProjectManager::Qt4Project *qt4Project = qobject_cast<QmakeProjectManager::Qt4Project *>(target->project());
foreach (Qt4ProjectManager::Qt4ProFileNode *proFile, qt4Project->applicationProFiles()) { foreach (QmakeProjectManager::Qt4ProFileNode *proFile, qt4Project->applicationProFiles()) {
if (proFile->projectType() == Qt4ProjectManager::ApplicationTemplate) { if (proFile->projectType() == QmakeProjectManager::ApplicationTemplate) {
if (proFile->targetInformation().target.startsWith(QLatin1String("lib")) if (proFile->targetInformation().target.startsWith(QLatin1String("lib"))
&& proFile->targetInformation().target.endsWith(QLatin1String(".so"))) { && proFile->targetInformation().target.endsWith(QLatin1String(".so"))) {
if (proFile->targetInformation().target.mid(3, proFile->targetInformation().target.lastIndexOf(QLatin1Char('.')) - 3) if (proFile->targetInformation().target.mid(3, proFile->targetInformation().target.lastIndexOf(QLatin1Char('.')) - 3)
@@ -529,7 +529,7 @@ QString AndroidManager::targetApplicationPath(ProjectExplorer::Target *target)
bool AndroidManager::createAndroidTemplatesIfNecessary(ProjectExplorer::Target *target) bool AndroidManager::createAndroidTemplatesIfNecessary(ProjectExplorer::Target *target)
{ {
QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(target->kit()); QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(target->kit());
Qt4ProjectManager::Qt4Project *qt4Project = qobject_cast<Qt4ProjectManager::Qt4Project*>(target->project()); QmakeProjectManager::Qt4Project *qt4Project = qobject_cast<QmakeProjectManager::Qt4Project*>(target->project());
if (!qt4Project || !qt4Project->rootProjectNode() || !version) if (!qt4Project || !qt4Project->rootProjectNode() || !version)
return false; return false;
@@ -804,16 +804,16 @@ QVector<AndroidManager::Library> AndroidManager::availableQtLibsWithDependencies
if (tc->type() != QLatin1String(Constants::ANDROID_TOOLCHAIN_TYPE)) if (tc->type() != QLatin1String(Constants::ANDROID_TOOLCHAIN_TYPE))
return QVector<AndroidManager::Library>(); return QVector<AndroidManager::Library>();
Qt4ProjectManager::Qt4Project *project = static_cast<Qt4ProjectManager::Qt4Project *>(target->project()); QmakeProjectManager::Qt4Project *project = static_cast<QmakeProjectManager::Qt4Project *>(target->project());
QString arch = project->rootQt4ProjectNode()->singleVariableValue(Qt4ProjectManager::AndroidArchVar); QString arch = project->rootQt4ProjectNode()->singleVariableValue(QmakeProjectManager::AndroidArchVar);
AndroidToolChain *atc = static_cast<AndroidToolChain *>(tc); AndroidToolChain *atc = static_cast<AndroidToolChain *>(tc);
QString libgnustl = libGnuStl(arch, atc->ndkToolChainVersion()); QString libgnustl = libGnuStl(arch, atc->ndkToolChainVersion());
Utils::FileName readelfPath = AndroidConfigurations::instance().readelfPath(target->activeRunConfiguration()->abi().architecture(), Utils::FileName readelfPath = AndroidConfigurations::instance().readelfPath(target->activeRunConfiguration()->abi().architecture(),
atc->ndkToolChainVersion()); atc->ndkToolChainVersion());
const Qt4ProjectManager::Qt4Project *const qt4Project const QmakeProjectManager::Qt4Project *const qt4Project
= qobject_cast<const Qt4ProjectManager::Qt4Project *>(target->project()); = qobject_cast<const QmakeProjectManager::Qt4Project *>(target->project());
if (!qt4Project || !version) if (!qt4Project || !version)
return QVector<AndroidManager::Library>(); return QVector<AndroidManager::Library>();
QString qtLibsPath = version->qmakeProperty("QT_INSTALL_LIBS"); QString qtLibsPath = version->qmakeProperty("QT_INSTALL_LIBS");
@@ -904,12 +904,12 @@ bool AndroidManager::setBundledInLib(ProjectExplorer::Target *target, const QStr
QStringList AndroidManager::availablePrebundledLibs(ProjectExplorer::Target *target) QStringList AndroidManager::availablePrebundledLibs(ProjectExplorer::Target *target)
{ {
QStringList libs; QStringList libs;
Qt4ProjectManager::Qt4Project *qt4Project = qobject_cast<Qt4ProjectManager::Qt4Project *>(target->project()); QmakeProjectManager::Qt4Project *qt4Project = qobject_cast<QmakeProjectManager::Qt4Project *>(target->project());
if (!qt4Project) if (!qt4Project)
return libs; return libs;
foreach (Qt4ProjectManager::Qt4ProFileNode *node, qt4Project->allProFiles()) foreach (QmakeProjectManager::Qt4ProFileNode *node, qt4Project->allProFiles())
if (node->projectType() == Qt4ProjectManager::LibraryTemplate) if (node->projectType() == QmakeProjectManager::LibraryTemplate)
libs << node->targetInformation().target; libs << node->targetInformation().target;
return libs; return libs;
} }
@@ -1317,4 +1317,4 @@ bool AndroidManager::checkForQt51Files(const QString &projectDirectory)
} }
} // namespace Internal } // namespace Internal
} // namespace Qt4ProjectManager } // namespace Android

8
src/plugins/android/androidpackagecreationstep.cpp
View File

@@ -72,7 +72,7 @@ namespace {
const QLatin1String CertificateSeparator("*******************************************"); const QLatin1String CertificateSeparator("*******************************************");
} }
using namespace Qt4ProjectManager; using namespace QmakeProjectManager;
AndroidPackageCreationStep::AndroidPackageCreationStep(BuildStepList *bsl) AndroidPackageCreationStep::AndroidPackageCreationStep(BuildStepList *bsl)
: BuildStep(bsl, CreatePackageId) : BuildStep(bsl, CreatePackageId)
@@ -109,7 +109,7 @@ bool AndroidPackageCreationStep::init()
// Copying // Copying
m_androidDir = AndroidManager::dirPath(target()); m_androidDir = AndroidManager::dirPath(target());
Utils::FileName path = m_androidDir; Utils::FileName path = m_androidDir;
QString androidTargetArch = project->rootQt4ProjectNode()->singleVariableValue(Qt4ProjectManager::AndroidArchVar); QString androidTargetArch = project->rootQt4ProjectNode()->singleVariableValue(QmakeProjectManager::AndroidArchVar);
if (androidTargetArch.isEmpty()) { if (androidTargetArch.isEmpty()) {
raiseError(tr("Cannot create Android package: No ANDROID_TARGET_ARCH set in make spec.")); raiseError(tr("Cannot create Android package: No ANDROID_TARGET_ARCH set in make spec."));
return false; return false;
@@ -435,7 +435,7 @@ void AndroidPackageCreationStep::collectFiles(QList<DeployItem> *deployList,
return; return;
Qt4Project *project = static_cast<Qt4Project *>(target()->project()); Qt4Project *project = static_cast<Qt4Project *>(target()->project());
QString androidTargetArch = project->rootQt4ProjectNode()->singleVariableValue(Qt4ProjectManager::AndroidArchVar); QString androidTargetArch = project->rootQt4ProjectNode()->singleVariableValue(QmakeProjectManager::AndroidArchVar);
QString androidAssetsPath = m_androidDir.toString() + QLatin1String("/assets/"); QString androidAssetsPath = m_androidDir.toString() + QLatin1String("/assets/");
QString androidJarPath = m_androidDir.toString() + QLatin1String("/libs/"); QString androidJarPath = m_androidDir.toString() + QLatin1String("/libs/");
@@ -882,4 +882,4 @@ void AndroidPackageCreationStep::raiseError(const QString &shortMsg,
const Core::Id AndroidPackageCreationStep::CreatePackageId("Qt4ProjectManager.AndroidPackageCreationStep"); const Core::Id AndroidPackageCreationStep::CreatePackageId("Qt4ProjectManager.AndroidPackageCreationStep");
} // namespace Internal } // namespace Internal
} // namespace Qt4ProjectManager } // namespace Android

2
src/plugins/android/androidpackagecreationwidget.cpp
View File

@@ -56,7 +56,7 @@ namespace Android {
namespace Internal { namespace Internal {
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Qt4ProjectManager; using namespace QmakeProjectManager;
///////////////////////////// CheckModel ///////////////////////////// ///////////////////////////// CheckModel /////////////////////////////

4
src/plugins/android/androidpackagecreationwidget.h
View File

@@ -41,7 +41,7 @@ class QFileSystemWatcher;
namespace Ui { class AndroidPackageCreationWidget; } namespace Ui { class AndroidPackageCreationWidget; }
QT_END_NAMESPACE QT_END_NAMESPACE
namespace Qt4ProjectManager { class Qt4BuildConfiguration; } namespace QmakeProjectManager { class Qt4BuildConfiguration; }
namespace Android { namespace Android {
namespace Internal { namespace Internal {
@@ -112,7 +112,7 @@ private:
CheckModel *m_qtLibsModel; CheckModel *m_qtLibsModel;
CheckModel *m_prebundledLibs; CheckModel *m_prebundledLibs;
QFileSystemWatcher *m_fileSystemWatcher; QFileSystemWatcher *m_fileSystemWatcher;
Qt4ProjectManager::Qt4BuildConfiguration *m_currentBuildConfiguration; QmakeProjectManager::Qt4BuildConfiguration *m_currentBuildConfiguration;
}; };
} // namespace Internal } // namespace Internal

4
src/plugins/android/androidqtversion.cpp
View File

@@ -50,7 +50,7 @@
using namespace Android::Internal; using namespace Android::Internal;
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Qt4ProjectManager; using namespace QmakeProjectManager;
AndroidQtVersion::AndroidQtVersion() AndroidQtVersion::AndroidQtVersion()
: QtSupport::BaseQtVersion() : QtSupport::BaseQtVersion()
@@ -109,7 +109,7 @@ void AndroidQtVersion::addToEnvironment(const ProjectExplorer::Kit *k, Utils::En
env.set(QLatin1String("ANDROID_NDK_HOST"), AndroidConfigurations::instance().config().toolchainHost); env.set(QLatin1String("ANDROID_NDK_HOST"), AndroidConfigurations::instance().config().toolchainHost);
env.set(QLatin1String("ANDROID_NDK_ROOT"), AndroidConfigurations::instance().config().ndkLocation.toUserOutput()); env.set(QLatin1String("ANDROID_NDK_ROOT"), AndroidConfigurations::instance().config().ndkLocation.toUserOutput());
Qt4Project *qt4pro = qobject_cast<Qt4ProjectManager::Qt4Project *>(ProjectExplorerPlugin::instance()->currentProject()); Qt4Project *qt4pro = qobject_cast<QmakeProjectManager::Qt4Project *>(ProjectExplorerPlugin::instance()->currentProject());
if (!qt4pro || !qt4pro->activeTarget() if (!qt4pro || !qt4pro->activeTarget()
|| QtSupport::QtKitInformation::qtVersion(k)->type() != QLatin1String(Constants::ANDROIDQT)) || QtSupport::QtKitInformation::qtVersion(k)->type() != QLatin1String(Constants::ANDROIDQT))
return; return;

8
src/plugins/android/androidrunconfiguration.cpp
View File

@@ -47,7 +47,7 @@ const char PRO_FILE_KEY[] = "Qt4ProjectManager.Qt4RunConfiguration.ProFile";
} }
using namespace ProjectExplorer; using namespace ProjectExplorer;
using Qt4ProjectManager::Qt4Project; using QmakeProjectManager::Qt4Project;
namespace Android { namespace Android {
namespace Internal { namespace Internal {
@@ -74,8 +74,8 @@ AndroidRunConfiguration::AndroidRunConfiguration(Target *parent, AndroidRunConfi
void AndroidRunConfiguration::init() void AndroidRunConfiguration::init()
{ {
setDefaultDisplayName(defaultDisplayName()); setDefaultDisplayName(defaultDisplayName());
connect(target()->project(), SIGNAL(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool,bool)), connect(target()->project(), SIGNAL(proFileUpdated(QmakeProjectManager::Qt4ProFileNode*,bool,bool)),
this, SLOT(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool,bool))); this, SLOT(proFileUpdated(QmakeProjectManager::Qt4ProFileNode*,bool,bool)));
} }
bool AndroidRunConfiguration::fromMap(const QVariantMap &map) bool AndroidRunConfiguration::fromMap(const QVariantMap &map)
@@ -112,7 +112,7 @@ QString AndroidRunConfiguration::disabledReason() const
return QString(); return QString();
} }
void AndroidRunConfiguration::proFileUpdated(Qt4ProjectManager::Qt4ProFileNode *pro, bool success, bool parseInProgress) void AndroidRunConfiguration::proFileUpdated(QmakeProjectManager::Qt4ProFileNode *pro, bool success, bool parseInProgress)
{ {
if (m_proFilePath != pro->path()) if (m_proFilePath != pro->path())
return; return;

4
src/plugins/android/androidrunconfiguration.h
View File

@@ -35,7 +35,7 @@
#include <projectexplorer/runconfiguration.h> #include <projectexplorer/runconfiguration.h>
namespace Qt4ProjectManager { class Qt4ProFileNode; } namespace QmakeProjectManager { class Qt4ProFileNode; }
namespace Android { namespace Android {
namespace Internal { namespace Internal {
@@ -70,7 +70,7 @@ protected:
bool fromMap(const QVariantMap &map); bool fromMap(const QVariantMap &map);
QVariantMap toMap() const; QVariantMap toMap() const;
private slots: private slots:
void proFileUpdated(Qt4ProjectManager::Qt4ProFileNode *pro, bool success, bool parseInProgress); void proFileUpdated(QmakeProjectManager::Qt4ProFileNode *pro, bool success, bool parseInProgress);
private: private:
void init(); void init();

2
src/plugins/android/androidruncontrol.cpp
View File

@@ -111,4 +111,4 @@ QIcon AndroidRunControl::icon() const
} }
} // namespace Internal } // namespace Internal
} // namespace Qt4ProjectManager } // namespace Android

4
src/plugins/android/androidrunfactories.cpp
View File

@@ -48,7 +48,7 @@
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Qt4ProjectManager; using namespace QmakeProjectManager;
namespace Android { namespace Android {
namespace Internal { namespace Internal {
@@ -180,4 +180,4 @@ RunControl *AndroidRunControlFactory::create(RunConfiguration *runConfig,
} }
} // namespace Internal } // namespace Internal
} // namespace Qt4ProjectManager } // namespace Android

2
src/plugins/android/androidrunfactories.h
View File

@@ -43,7 +43,7 @@ class Node;
namespace Android { namespace Android {
namespace Internal { namespace Internal {
class AndroidRunConfigurationFactory : public Qt4ProjectManager::QmakeRunConfigurationFactory class AndroidRunConfigurationFactory : public QmakeProjectManager::QmakeRunConfigurationFactory
{ {
Q_OBJECT Q_OBJECT

2
src/plugins/android/androidrunner.cpp
View File

@@ -403,4 +403,4 @@ QString AndroidRunner::displayName() const
} }
} // namespace Internal } // namespace Internal
} // namespace Qt4ProjectManager } // namespace Android

12
src/plugins/android/createandroidmanifestwizard.cpp
View File

@@ -43,8 +43,8 @@
using namespace Android; using namespace Android;
using namespace Android::Internal; using namespace Android::Internal;
using Qt4ProjectManager::Qt4Project; using QmakeProjectManager::Qt4Project;
using Qt4ProjectManager::Qt4ProFileNode; using QmakeProjectManager::Qt4ProFileNode;
// //
// NoApplicationProFilePage // NoApplicationProFilePage
@@ -96,7 +96,7 @@ void ChooseProFilePage::nodeSelected(int index)
ChooseDirectoryPage::ChooseDirectoryPage(CreateAndroidManifestWizard *wizard) ChooseDirectoryPage::ChooseDirectoryPage(CreateAndroidManifestWizard *wizard)
: m_wizard(wizard), m_androidPackageSourceDir(0) : m_wizard(wizard), m_androidPackageSourceDir(0)
{ {
QString androidPackageDir = m_wizard->node()->singleVariableValue(Qt4ProjectManager::AndroidPackageSourceDir); QString androidPackageDir = m_wizard->node()->singleVariableValue(QmakeProjectManager::AndroidPackageSourceDir);
QFormLayout *fl = new QFormLayout(this); QFormLayout *fl = new QFormLayout(this);
QLabel *label = new QLabel(this); QLabel *label = new QLabel(this);
@@ -147,12 +147,12 @@ CreateAndroidManifestWizard::CreateAndroidManifestWizard(ProjectExplorer::Target
} }
} }
Qt4ProjectManager::Qt4ProFileNode *CreateAndroidManifestWizard::node() const QmakeProjectManager::Qt4ProFileNode *CreateAndroidManifestWizard::node() const
{ {
return m_node; return m_node;
} }
void CreateAndroidManifestWizard::setNode(Qt4ProjectManager::Qt4ProFileNode *node) void CreateAndroidManifestWizard::setNode(QmakeProjectManager::Qt4ProFileNode *node)
{ {
m_node = node; m_node = node;
} }
@@ -205,7 +205,7 @@ void CreateAndroidManifestWizard::createAndroidManifestFile()
return; return;
} }
if (m_node->singleVariableValue(Qt4ProjectManager::AndroidPackageSourceDir).isEmpty()) { if (m_node->singleVariableValue(QmakeProjectManager::AndroidPackageSourceDir).isEmpty()) {
// and now time for some magic // and now time for some magic
QString dir = QFileInfo(fileName).absolutePath(); QString dir = QFileInfo(fileName).absolutePath();
QString value = QLatin1String("$$PWD/") QString value = QLatin1String("$$PWD/")

10
src/plugins/android/createandroidmanifestwizard.h
View File

@@ -37,7 +37,7 @@ class QComboBox;
QT_END_NAMESPACE QT_END_NAMESPACE
namespace ProjectExplorer { class Target; } namespace ProjectExplorer { class Target; }
namespace Qt4ProjectManager { class Qt4ProFileNode; } namespace QmakeProjectManager { class Qt4ProFileNode; }
namespace Android { namespace Android {
namespace Internal { namespace Internal {
@@ -57,7 +57,7 @@ class ChooseProFilePage : public QWizardPage
{ {
Q_OBJECT Q_OBJECT
public: public:
ChooseProFilePage(CreateAndroidManifestWizard *wizard, const QList<Qt4ProjectManager::Qt4ProFileNode *> &nodes); ChooseProFilePage(CreateAndroidManifestWizard *wizard, const QList<QmakeProjectManager::Qt4ProFileNode *> &nodes);
private slots: private slots:
void nodeSelected(int index); void nodeSelected(int index);
private: private:
@@ -81,8 +81,8 @@ class CreateAndroidManifestWizard : public Utils::Wizard
public: public:
CreateAndroidManifestWizard(ProjectExplorer::Target *target); CreateAndroidManifestWizard(ProjectExplorer::Target *target);
Qt4ProjectManager::Qt4ProFileNode *node() const; QmakeProjectManager::Qt4ProFileNode *node() const;
void setNode(Qt4ProjectManager::Qt4ProFileNode *node); void setNode(QmakeProjectManager::Qt4ProFileNode *node);
QString sourceFileName() const; QString sourceFileName() const;
@@ -93,7 +93,7 @@ public slots:
private: private:
void createAndroidManifestFile(); void createAndroidManifestFile();
ProjectExplorer::Target *m_target; ProjectExplorer::Target *m_target;
Qt4ProjectManager::Qt4ProFileNode *m_node; QmakeProjectManager::Qt4ProFileNode *m_node;
QString m_directory; QString m_directory;
}; };
} }

2
src/plugins/cmakeprojectmanager/cmakeeditor.h
View File

@@ -104,6 +104,6 @@ public:
}; };
} // namespace Internal } // namespace Internal
} // namespace Qt4ProjectManager } // namespace CMakeProjectManager
#endif // CMAKEEDITOR_H #endif // CMAKEEDITOR_H

2
src/plugins/ios/iosbuildstep.cpp
View File

@@ -57,7 +57,7 @@
using namespace Core; using namespace Core;
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Qt4ProjectManager; using namespace QmakeProjectManager;
namespace Ios { namespace Ios {
namespace Internal { namespace Internal {

2
src/plugins/ios/iosconfigurations.cpp
View File

@@ -319,7 +319,7 @@ void IosConfigurations::updateAutomaticKitList()
Debugger::DebuggerKitInformation::setDebugger(newKit, debugger); Debugger::DebuggerKitInformation::setDebugger(newKit, debugger);
SysRootKitInformation::setSysRoot(newKit, p.sdkPath); SysRootKitInformation::setSysRoot(newKit, p.sdkPath);
//Qt4ProjectManager::QmakeKitInformation::setMkspec(newKit, // QmakeProjectManager::QmakeKitInformation::setMkspec(newKit,
// Utils::FileName::fromString(QLatin1String("macx-ios-clang"))); // Utils::FileName::fromString(QLatin1String("macx-ios-clang")));
KitManager::registerKit(newKit); KitManager::registerKit(newKit);
existingKits << newKit; existingKits << newKit;

2
src/plugins/ios/iosdebugsupport.cpp
View File

@@ -48,7 +48,7 @@
using namespace Debugger; using namespace Debugger;
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Qt4ProjectManager; using namespace QmakeProjectManager;
namespace Ios { namespace Ios {
namespace Internal { namespace Internal {

2
src/plugins/ios/iosdeployconfiguration.cpp
View File

@@ -112,7 +112,7 @@ DeployConfiguration *IosDeployConfigurationFactory::clone(Target *parent, Deploy
QList<Core::Id> IosDeployConfigurationFactory::availableCreationIds(Target *parent) const QList<Core::Id> IosDeployConfigurationFactory::availableCreationIds(Target *parent) const
{ {
QList<Core::Id> ids; QList<Core::Id> ids;
if (!qobject_cast<Qt4ProjectManager::Qt4Project *>(parent->project())) if (!qobject_cast<QmakeProjectManager::Qt4Project *>(parent->project()))
return ids; return ids;
if (!parent->project()->supportsKit(parent->kit())) if (!parent->project()->supportsKit(parent->kit()))
return ids; return ids;

4
src/plugins/ios/iosdeploystep.cpp
View File

@@ -50,7 +50,7 @@
#define ASSERT_STATE(state) ASSERT_STATE_GENERIC(State, state, m_state) #define ASSERT_STATE(state) ASSERT_STATE_GENERIC(State, state, m_state)
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Qt4ProjectManager; using namespace QmakeProjectManager;
namespace Ios { namespace Ios {
namespace Internal { namespace Internal {
@@ -239,4 +239,4 @@ IosSimulator::ConstPtr IosDeployStep::iossimulator() const
} }
} // namespace Internal } // namespace Internal
} // namespace Qt4ProjectManager } // namespace Ios

2
src/plugins/ios/iosdeploystepwidget.cpp
View File

@@ -67,4 +67,4 @@ QString IosDeployStepWidget::summaryText() const
} }
} // namespace Internal } // namespace Internal
} // namespace Qt4ProjectManager } // namespace Ios

6
src/plugins/ios/iosmanager.cpp
View File

@@ -50,7 +50,7 @@
#include <QApplication> #include <QApplication>
#include <QDomDocument> #include <QDomDocument>
using namespace Qt4ProjectManager; using namespace QmakeProjectManager;
using namespace ProjectExplorer; using namespace ProjectExplorer;
namespace Ios { namespace Ios {
@@ -58,7 +58,7 @@ namespace Internal {
bool IosManager::supportsIos(ProjectExplorer::Target *target) bool IosManager::supportsIos(ProjectExplorer::Target *target)
{ {
if (!qobject_cast<Qt4ProjectManager::Qt4Project *>(target->project())) if (!qobject_cast<QmakeProjectManager::Qt4Project *>(target->project()))
return false; return false;
QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(target->kit()); QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(target->kit());
return version && version->type() == QLatin1String(Ios::Constants::IOSQT); return version && version->type() == QLatin1String(Ios::Constants::IOSQT);
@@ -72,4 +72,4 @@ QString IosManager::resDirForTarget(Target *target)
} }
} // namespace Internal } // namespace Internal
} // namespace Qt4ProjectManager } // namespace Ios

2
src/plugins/ios/iosqtversion.cpp
View File

@@ -47,7 +47,7 @@
using namespace Ios::Internal; using namespace Ios::Internal;
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Qt4ProjectManager; using namespace QmakeProjectManager;
IosQtVersion::IosQtVersion() IosQtVersion::IosQtVersion()
: QtSupport::BaseQtVersion() : QtSupport::BaseQtVersion()

2
src/plugins/ios/iosrunconfiguration.cpp
View File

@@ -49,7 +49,7 @@
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Qt4ProjectManager; using namespace QmakeProjectManager;
namespace Ios { namespace Ios {
namespace Internal { namespace Internal {

2
src/plugins/ios/iosruncontrol.cpp
View File

@@ -109,4 +109,4 @@ QIcon IosRunControl::icon() const
} }
} // namespace Internal } // namespace Internal
} // namespace Qt4ProjectManager } // namespace Ios

4
src/plugins/ios/iosrunfactories.cpp
View File

@@ -48,7 +48,7 @@
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Qt4ProjectManager; using namespace QmakeProjectManager;
namespace Ios { namespace Ios {
namespace Internal { namespace Internal {
@@ -173,4 +173,4 @@ RunControl *IosRunControlFactory::create(RunConfiguration *runConfig,
} }
} // namespace Internal } // namespace Internal
} // namespace Qt4ProjectManager } // namespace Ios

2
src/plugins/ios/iosrunfactories.h
View File

@@ -43,7 +43,7 @@ class Node;
namespace Ios { namespace Ios {
namespace Internal { namespace Internal {
class IosRunConfigurationFactory : public Qt4ProjectManager::QmakeRunConfigurationFactory class IosRunConfigurationFactory : public QmakeProjectManager::QmakeRunConfigurationFactory
{ {
Q_OBJECT Q_OBJECT

2
src/plugins/ios/iosrunner.cpp
View File

@@ -209,4 +209,4 @@ QString IosRunner::displayName() const
} }
} // namespace Internal } // namespace Internal
} // namespace Qt4ProjectManager } // namespace Ios

6
src/plugins/projectexplorer/settingsaccessor.cpp
View File

@@ -1514,15 +1514,15 @@ QVariantMap Version1Handler::update(Project *project, const QVariantMap &map)
"CMake Default target display name")); "CMake Default target display name"));
else if (project->id() == "Qt4ProjectManager.Qt4Project") else if (project->id() == "Qt4ProjectManager.Qt4Project")
targets << TargetDescription(QString::fromLatin1("Qt4ProjectManager.Target.DesktopTarget"), targets << TargetDescription(QString::fromLatin1("Qt4ProjectManager.Target.DesktopTarget"),
QCoreApplication::translate("Qt4ProjectManager::Internal::Qt4Target", QCoreApplication::translate("QmakeProjectManager::Internal::Qt4Target",
"Desktop", "Desktop",
"Qt4 Desktop target display name")) "Qt4 Desktop target display name"))
<< TargetDescription(QString::fromLatin1("Qt4ProjectManager.Target.MaemoEmulatorTarget"), << TargetDescription(QString::fromLatin1("Qt4ProjectManager.Target.MaemoEmulatorTarget"),
QCoreApplication::translate("Qt4ProjectManager::Internal::Qt4Target", QCoreApplication::translate("QmakeProjectManager::Internal::Qt4Target",
"Maemo Emulator", "Maemo Emulator",
"Qt4 Maemo Emulator target display name")) "Qt4 Maemo Emulator target display name"))
<< TargetDescription(QString::fromLatin1("Qt4ProjectManager.Target.MaemoDeviceTarget"), << TargetDescription(QString::fromLatin1("Qt4ProjectManager.Target.MaemoDeviceTarget"),
QCoreApplication::translate("Qt4ProjectManager::Internal::Qt4Target", QCoreApplication::translate("QmakeProjectManager::Internal::Qt4Target",
"Maemo Device", "Maemo Device",
"Qt4 Maemo Device target display name")); "Qt4 Maemo Device target display name"));
else if (project->id() == "QmlProjectManager.QmlProject") else if (project->id() == "QmlProjectManager.QmlProject")

6
src/plugins/qmlprojectmanager/qmlapplicationwizard.cpp
View File

@@ -47,7 +47,7 @@
using namespace Core; using namespace Core;
using namespace ExtensionSystem; using namespace ExtensionSystem;
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Qt4ProjectManager; using namespace QmakeProjectManager;
namespace QmlProjectManager { namespace QmlProjectManager {
namespace Internal { namespace Internal {
@@ -71,7 +71,7 @@ QmlApplicationWizard::QmlApplicationWizard(const TemplateInfo &templateInfo)
setWizardKind(ProjectWizard); setWizardKind(ProjectWizard);
setCategory(QLatin1String(ProjectExplorer::Constants::QT_APPLICATION_WIZARD_CATEGORY)); setCategory(QLatin1String(ProjectExplorer::Constants::QT_APPLICATION_WIZARD_CATEGORY));
setId(QLatin1String("QA.QMLB Application")); setId(QLatin1String("QA.QMLB Application"));
setIcon(QIcon(QLatin1String(Qt4ProjectManager::Constants::ICON_QTQUICK_APP))); setIcon(QIcon(QLatin1String(QmakeProjectManager::Constants::ICON_QTQUICK_APP)));
setDisplayCategory( setDisplayCategory(
QLatin1String(ProjectExplorer::Constants::QT_APPLICATION_WIZARD_CATEGORY_DISPLAY)); QLatin1String(ProjectExplorer::Constants::QT_APPLICATION_WIZARD_CATEGORY_DISPLAY));
setDisplayName(tr("Qt Quick Application")); setDisplayName(tr("Qt Quick Application"));
@@ -105,7 +105,7 @@ void QmlApplicationWizard::createInstances(ExtensionSystem::IPlugin *plugin)
} }
wizard->setRequiredFeatures(features); wizard->setRequiredFeatures(features);
wizard->setIcon(QIcon(QLatin1String(Qt4ProjectManager::Constants::ICON_QTQUICK_APP))); wizard->setIcon(QIcon(QLatin1String(QmakeProjectManager::Constants::ICON_QTQUICK_APP)));
plugin->addAutoReleasedObject(wizard); plugin->addAutoReleasedObject(wizard);
} }
} }

4
src/plugins/qnx/blackberryconfiguration.cpp
View File

@@ -232,7 +232,7 @@ Kit *BlackBerryConfiguration::createKit(QnxAbstractQtVersion *version, ToolChain
DebuggerKitInformation::setDebugger(kit, debugger); DebuggerKitInformation::setDebugger(kit, debugger);
if (isSimulator) if (isSimulator)
Qt4ProjectManager::QmakeKitInformation::setMkspec( QmakeProjectManager::QmakeKitInformation::setMkspec(
kit, FileName::fromString(QLatin1String("blackberry-x86-qcc"))); kit, FileName::fromString(QLatin1String("blackberry-x86-qcc")));
DeviceTypeKitInformation::setDeviceTypeId(kit, Constants::QNX_BB_OS_TYPE); DeviceTypeKitInformation::setDeviceTypeId(kit, Constants::QNX_BB_OS_TYPE);
@@ -251,7 +251,7 @@ Kit *BlackBerryConfiguration::createKit(QnxAbstractQtVersion *version, ToolChain
kit->setSticky(DeviceTypeKitInformation::id(), true); kit->setSticky(DeviceTypeKitInformation::id(), true);
kit->setSticky(SysRootKitInformation::id(), true); kit->setSticky(SysRootKitInformation::id(), true);
kit->setSticky(DebuggerKitInformation::id(), true); kit->setSticky(DebuggerKitInformation::id(), true);
kit->setSticky(Qt4ProjectManager::QmakeKitInformation::id(), true); kit->setSticky(QmakeProjectManager::QmakeKitInformation::id(), true);
return kit; return kit;
} }

6
src/plugins/qnx/blackberrydeployconfiguration.cpp
View File

@@ -82,7 +82,7 @@ void BlackBerryDeployConfiguration::ctor()
void BlackBerryDeployConfiguration::setupBarDescriptor() void BlackBerryDeployConfiguration::setupBarDescriptor()
{ {
Qt4ProjectManager::Qt4BuildConfiguration *bc = qobject_cast<Qt4ProjectManager::Qt4BuildConfiguration *>(target()->activeBuildConfiguration()); QmakeProjectManager::Qt4BuildConfiguration *bc = qobject_cast<QmakeProjectManager::Qt4BuildConfiguration *>(target()->activeBuildConfiguration());
if (!bc || !target()->kit()) if (!bc || !target()->kit())
return; return;
@@ -90,8 +90,8 @@ void BlackBerryDeployConfiguration::setupBarDescriptor()
QString projectName = target()->project()->displayName(); QString projectName = target()->project()->displayName();
QString targetName; QString targetName;
Qt4ProjectManager::Qt4Project *project = static_cast<Qt4ProjectManager::Qt4Project *>(target()->project()); QmakeProjectManager::Qt4Project *project = static_cast<QmakeProjectManager::Qt4Project *>(target()->project());
foreach (Qt4ProjectManager::Qt4ProFileNode *node, project->applicationProFiles()) { foreach (QmakeProjectManager::Qt4ProFileNode *node, project->applicationProFiles()) {
QString target = node->targetInformation().target; QString target = node->targetInformation().target;
if (!target.isEmpty()) { if (!target.isEmpty()) {
targetName = target; targetName = target;

2
src/plugins/qnx/blackberrydeployconfigurationfactory.cpp
View File

@@ -60,7 +60,7 @@ QList<Core::Id> BlackBerryDeployConfigurationFactory::availableCreationIds(Proje
{ {
QList<Core::Id> result; QList<Core::Id> result;
Qt4ProjectManager::Qt4Project *project = qobject_cast<Qt4ProjectManager::Qt4Project *>(parent->project()); QmakeProjectManager::Qt4Project *project = qobject_cast<QmakeProjectManager::Qt4Project *>(parent->project());
if (!project) if (!project)
return result; return result;

18
src/plugins/qnx/blackberrydeployinformation.cpp
View File

@@ -241,8 +241,8 @@ void BlackBerryDeployInformation::updateModel()
beginResetModel(); beginResetModel();
QList<BarPackageDeployInformation> keep; QList<BarPackageDeployInformation> keep;
QList<Qt4ProjectManager::Qt4ProFileNode *> appNodes = project()->applicationProFiles(); QList<QmakeProjectManager::Qt4ProFileNode *> appNodes = project()->applicationProFiles();
foreach (Qt4ProjectManager::Qt4ProFileNode *node, appNodes) { foreach (QmakeProjectManager::Qt4ProFileNode *node, appNodes) {
bool nodeFound = false; bool nodeFound = false;
for (int i = 0; i < m_deployInformation.size(); ++i) { for (int i = 0; i < m_deployInformation.size(); ++i) {
if (m_deployInformation[i].proFilePath == node->path() if (m_deployInformation[i].proFilePath == node->path()
@@ -264,9 +264,9 @@ void BlackBerryDeployInformation::updateModel()
endResetModel(); endResetModel();
} }
Qt4ProjectManager::Qt4Project *BlackBerryDeployInformation::project() const QmakeProjectManager::Qt4Project *BlackBerryDeployInformation::project() const
{ {
return static_cast<Qt4ProjectManager::Qt4Project *>(m_target->project()); return static_cast<QmakeProjectManager::Qt4Project *>(m_target->project());
} }
void BlackBerryDeployInformation::initModel() void BlackBerryDeployInformation::initModel()
@@ -282,7 +282,7 @@ void BlackBerryDeployInformation::initModel()
return; return;
} }
const Qt4ProjectManager::Qt4ProFileNode *const rootNode = project()->rootQt4ProjectNode(); const QmakeProjectManager::Qt4ProFileNode *const rootNode = project()->rootQt4ProjectNode();
if (!rootNode || rootNode->parseInProgress()) // Can be null right after project creation by wizard. if (!rootNode || rootNode->parseInProgress()) // Can be null right after project creation by wizard.
return; return;
@@ -291,17 +291,17 @@ void BlackBerryDeployInformation::initModel()
beginResetModel(); beginResetModel();
m_deployInformation.clear(); m_deployInformation.clear();
QList<Qt4ProjectManager::Qt4ProFileNode *> appNodes = project()->applicationProFiles(); QList<QmakeProjectManager::Qt4ProFileNode *> appNodes = project()->applicationProFiles();
foreach (Qt4ProjectManager::Qt4ProFileNode *node, appNodes) foreach (QmakeProjectManager::Qt4ProFileNode *node, appNodes)
m_deployInformation << deployInformationFromNode(node); m_deployInformation << deployInformationFromNode(node);
endResetModel(); endResetModel();
connect(project(), SIGNAL(proFilesEvaluated()), this, SLOT(updateModel())); connect(project(), SIGNAL(proFilesEvaluated()), this, SLOT(updateModel()));
} }
BarPackageDeployInformation BlackBerryDeployInformation::deployInformationFromNode(Qt4ProjectManager::Qt4ProFileNode *node) const BarPackageDeployInformation BlackBerryDeployInformation::deployInformationFromNode(QmakeProjectManager::Qt4ProFileNode *node) const
{ {
Qt4ProjectManager::TargetInformation ti = node->targetInformation(); QmakeProjectManager::TargetInformation ti = node->targetInformation();
QFileInfo fi(node->path()); QFileInfo fi(node->path());
const QString buildDir = m_target->activeBuildConfiguration()->buildDirectory().toString(); const QString buildDir = m_target->activeBuildConfiguration()->buildDirectory().toString();

6
src/plugins/qnx/blackberrydeployinformation.h
View File

@@ -37,7 +37,7 @@ namespace ProjectExplorer {
class Target; class Target;
} }
namespace Qt4ProjectManager { namespace QmakeProjectManager {
class Qt4ProFileNode; class Qt4ProFileNode;
class Qt4Project; class Qt4Project;
} }
@@ -102,10 +102,10 @@ private:
ColumnCount // Always have last ColumnCount // Always have last
}; };
Qt4ProjectManager::Qt4Project *project() const; QmakeProjectManager::Qt4Project *project() const;
void initModel(); void initModel();
BarPackageDeployInformation deployInformationFromNode(Qt4ProjectManager::Qt4ProFileNode *node) const; BarPackageDeployInformation deployInformationFromNode(QmakeProjectManager::Qt4ProFileNode *node) const;
ProjectExplorer::Target *m_target; ProjectExplorer::Target *m_target;

4
src/plugins/qnx/blackberryrunconfiguration.h
View File

@@ -38,7 +38,7 @@ namespace ProjectExplorer {
class Target; class Target;
} }
namespace Qt4ProjectManager { namespace QmakeProjectManager {
class Qt4BuildConfiguration; class Qt4BuildConfiguration;
class Qt4Project; class Qt4Project;
} }
@@ -69,7 +69,7 @@ public:
QVariantMap toMap() const; QVariantMap toMap() const;
BlackBerryDeployConfiguration *deployConfiguration() const; BlackBerryDeployConfiguration *deployConfiguration() const;
Qt4ProjectManager::Qt4BuildConfiguration *activeQt4BuildConfiguration() const; QmakeProjectManager::Qt4BuildConfiguration *activeQt4BuildConfiguration() const;
QString key() const; QString key() const;

6
src/plugins/qnx/blackberryrunconfigurationfactory.cpp
View File

@@ -57,7 +57,7 @@ QList<Core::Id> BlackBerryRunConfigurationFactory::availableCreationIds(ProjectE
if (!canHandle(parent)) if (!canHandle(parent))
return ids; return ids;
Qt4ProjectManager::Qt4Project *qt4Project = qobject_cast<Qt4ProjectManager::Qt4Project *>(parent->project()); QmakeProjectManager::Qt4Project *qt4Project = qobject_cast<QmakeProjectManager::Qt4Project *>(parent->project());
if (!qt4Project) if (!qt4Project)
return ids; return ids;
@@ -85,7 +85,7 @@ bool BlackBerryRunConfigurationFactory::canCreate(ProjectExplorer::Target *paren
if (!canHandle(parent)) if (!canHandle(parent))
return false; return false;
Qt4ProjectManager::Qt4Project *qt4Project = qobject_cast<Qt4ProjectManager::Qt4Project *>(parent->project()); QmakeProjectManager::Qt4Project *qt4Project = qobject_cast<QmakeProjectManager::Qt4Project *>(parent->project());
if (!qt4Project) if (!qt4Project)
return false; return false;
@@ -140,7 +140,7 @@ bool BlackBerryRunConfigurationFactory::canHandle(ProjectExplorer::Target *t) co
{ {
if (!t->project()->supportsKit(t->kit())) if (!t->project()->supportsKit(t->kit()))
return false; return false;
if (!qobject_cast<Qt4ProjectManager::Qt4Project *>(t->project())) if (!qobject_cast<QmakeProjectManager::Qt4Project *>(t->project()))
return false; return false;
Core::Id deviceType = ProjectExplorer::DeviceTypeKitInformation::deviceTypeId(t->kit()); Core::Id deviceType = ProjectExplorer::DeviceTypeKitInformation::deviceTypeId(t->kit());

2
src/plugins/qnx/blackberryruncontrol.h
View File

@@ -36,7 +36,7 @@
#include <projectexplorer/runconfiguration.h> #include <projectexplorer/runconfiguration.h>
namespace Qt4ProjectManager { namespace QmakeProjectManager {
class Qt4BuildConfiguration; class Qt4BuildConfiguration;
} }

4
src/plugins/qnx/qnxrunconfigurationfactory.cpp
View File

@@ -58,7 +58,7 @@ QList<Core::Id> QnxRunConfigurationFactory::availableCreationIds(ProjectExplorer
if (!canHandle(parent)) if (!canHandle(parent))
return ids; return ids;
Qt4ProjectManager::Qt4Project *qt4Project = qobject_cast<Qt4ProjectManager::Qt4Project *>(parent->project()); QmakeProjectManager::Qt4Project *qt4Project = qobject_cast<QmakeProjectManager::Qt4Project *>(parent->project());
if (!qt4Project) if (!qt4Project)
return ids; return ids;
@@ -85,7 +85,7 @@ bool QnxRunConfigurationFactory::canCreate(ProjectExplorer::Target *parent, cons
if (!canHandle(parent) || !id.name().startsWith(Constants::QNX_QNX_RUNCONFIGURATION_PREFIX)) if (!canHandle(parent) || !id.name().startsWith(Constants::QNX_QNX_RUNCONFIGURATION_PREFIX))
return false; return false;
Qt4ProjectManager::Qt4Project *qt4Project = qobject_cast<Qt4ProjectManager::Qt4Project *>(parent->project()); QmakeProjectManager::Qt4Project *qt4Project = qobject_cast<QmakeProjectManager::Qt4Project *>(parent->project());
if (!qt4Project) if (!qt4Project)
return false; return false;

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

@@ -40,8 +40,8 @@
#include <QFileInfo> #include <QFileInfo>
#include <QDebug> #include <QDebug>
using namespace Qt4ProjectManager; using namespace QmakeProjectManager;
using namespace Qt4ProjectManager::Internal; using namespace QmakeProjectManager::Internal;
const char qt_file_dialog_filter_reg_exp[] = const char qt_file_dialog_filter_reg_exp[] =

4
src/plugins/qt4projectmanager/addlibrarywizard.h
View File

@@ -39,7 +39,7 @@ class QCheckBox;
class QLabel; class QLabel;
QT_END_NAMESPACE QT_END_NAMESPACE
namespace Qt4ProjectManager { namespace QmakeProjectManager {
namespace Internal { namespace Internal {
class LibraryDetailsWidget; class LibraryDetailsWidget;
@@ -154,6 +154,6 @@ public:
} // namespace Internal } // namespace Internal
} // namespace Qt4ProjectManager } // namespace QmakeProjectManager
#endif // ADDLIBRARYWIZARD_H #endif // ADDLIBRARYWIZARD_H

4
src/plugins/qt4projectmanager/applicationlauncher.h
View File

@@ -34,7 +34,7 @@
#include <QStringList> #include <QStringList>
#include <QProcess> #include <QProcess>
namespace Qt4ProjectManager { namespace QmakeProjectManager {
namespace Internal { namespace Internal {
class ConsoleProcess; class ConsoleProcess;
@@ -80,6 +80,6 @@ private:
}; };
} // namespace Internal } // namespace Internal
} // namespace Qt4ProjectManager } // namespace QmakeProjectManager
#endif // APPLICATIONLAUNCHER_H #endif // APPLICATIONLAUNCHER_H

2
src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.cpp
View File

@@ -31,7 +31,7 @@
#include <QFileInfo> #include <QFileInfo>
namespace Qt4ProjectManager { namespace QmakeProjectManager {
namespace Internal { namespace Internal {
ClassDefinition::ClassDefinition(QWidget *parent) : ClassDefinition::ClassDefinition(QWidget *parent) :

2
src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.h
View File

@@ -36,7 +36,7 @@
#include <QTabWidget> #include <QTabWidget>
namespace Qt4ProjectManager { namespace QmakeProjectManager {
namespace Internal { namespace Internal {
class ClassDefinition : public QTabWidget class ClassDefinition : public QTabWidget

4
src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.ui
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>Qt4ProjectManager::Internal::ClassDefinition</class> <class>QmakeProjectManager::Internal::ClassDefinition</class>
<widget class="QTabWidget" name="Qt4ProjectManager::Internal::ClassDefinition"> <widget class="QTabWidget" name="QmakeProjectManager::Internal::ClassDefinition">
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>

4
src/plugins/qt4projectmanager/customwidgetwizard/classlist.cpp
View File

@@ -39,7 +39,7 @@
#include <QDebug> #include <QDebug>
#include <QRegExp> #include <QRegExp>
namespace Qt4ProjectManager { namespace QmakeProjectManager {
namespace Internal { namespace Internal {
// ClassModel: Validates the class name in setData() and // ClassModel: Validates the class name in setData() and
@@ -169,4 +169,4 @@ void ClassList::slotCurrentRowChanged(const QModelIndex &current, const QModelIn
} }
} // namespace Internal } // namespace Internal
} // namespace Qt4ProjectManager } // namespace QmakeProjectManager

4
src/plugins/qt4projectmanager/customwidgetwizard/classlist.h
View File

@@ -34,7 +34,7 @@
QT_FORWARD_DECLARE_CLASS(QModelIndex) QT_FORWARD_DECLARE_CLASS(QModelIndex)
namespace Qt4ProjectManager { namespace QmakeProjectManager {
namespace Internal { namespace Internal {
class ClassModel; class ClassModel;
@@ -71,5 +71,5 @@ private:
}; };
} // namespace Internal } // namespace Internal
} // namespace Qt4ProjectManager } // namespace QmakeProjectManager
#endif #endif

4
src/plugins/qt4projectmanager/customwidgetwizard/customwidgetpluginwizardpage.cpp
View File

@@ -31,7 +31,7 @@
#include "customwidgetwidgetswizardpage.h" #include "customwidgetwidgetswizardpage.h"
#include "ui_customwidgetpluginwizardpage.h" #include "ui_customwidgetpluginwizardpage.h"
namespace Qt4ProjectManager { namespace QmakeProjectManager {
namespace Internal { namespace Internal {
CustomWidgetPluginWizardPage::CustomWidgetPluginWizardPage(QWidget *parent) : CustomWidgetPluginWizardPage::CustomWidgetPluginWizardPage(QWidget *parent) :
@@ -139,4 +139,4 @@ bool CustomWidgetPluginWizardPage::isComplete() const
} }
} // namespace Internal } // namespace Internal
} // namespace Qt4ProjectManager } // namespace QmakeProjectManager

4
src/plugins/qt4projectmanager/customwidgetwizard/customwidgetpluginwizardpage.h
View File

@@ -35,7 +35,7 @@
#include <QWizardPage> #include <QWizardPage>
#include <QSharedPointer> #include <QSharedPointer>
namespace Qt4ProjectManager { namespace QmakeProjectManager {
namespace Internal { namespace Internal {
struct PluginOptions; struct PluginOptions;
@@ -80,6 +80,6 @@ private:
}; };
} // namespace Internal } // namespace Internal
} // namespace Qt4ProjectManager } // namespace QmakeProjectManager
#endif // CUSTOMWIDGETPLUGINWIZARDPAGE_H #endif // CUSTOMWIDGETPLUGINWIZARDPAGE_H

4
src/plugins/qt4projectmanager/customwidgetwizard/customwidgetpluginwizardpage.ui
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>Qt4ProjectManager::Internal::CustomWidgetPluginWizardPage</class> <class>QmakeProjectManager::Internal::CustomWidgetPluginWizardPage</class>
<widget class="QWizardPage" name="Qt4ProjectManager::Internal::CustomWidgetPluginWizardPage"> <widget class="QWizardPage" name="QmakeProjectManager::Internal::CustomWidgetPluginWizardPage">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>

2
src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.cpp
View File

@@ -38,7 +38,7 @@
#include <QStackedLayout> #include <QStackedLayout>
#include <QIcon> #include <QIcon>
namespace Qt4ProjectManager { namespace QmakeProjectManager {
namespace Internal { namespace Internal {
CustomWidgetWidgetsWizardPage::CustomWidgetWidgetsWizardPage(QWidget *parent) : CustomWidgetWidgetsWizardPage::CustomWidgetWidgetsWizardPage(QWidget *parent) :

2
src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.h
View File

@@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE
class QStackedLayout; class QStackedLayout;
QT_END_NAMESPACE QT_END_NAMESPACE
namespace Qt4ProjectManager { namespace QmakeProjectManager {
namespace Internal { namespace Internal {
class ClassDefinition; class ClassDefinition;

8
src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.ui
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>Qt4ProjectManager::Internal::CustomWidgetWidgetsWizardPage</class> <class>QmakeProjectManager::Internal::CustomWidgetWidgetsWizardPage</class>
<widget class="QWizardPage" name="Qt4ProjectManager::Internal::CustomWidgetWidgetsWizardPage"> <widget class="QWizardPage" name="QmakeProjectManager::Internal::CustomWidgetWidgetsWizardPage">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
@@ -28,7 +28,7 @@
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="3" column="0">
<widget class="Qt4ProjectManager::Internal::ClassList" name="classList"> <widget class="QmakeProjectManager::Internal::ClassList" name="classList">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@@ -92,7 +92,7 @@
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget> <customwidget>
<class>Qt4ProjectManager::Internal::ClassList</class> <class>QmakeProjectManager::Internal::ClassList</class>
<extends>QListWidget</extends> <extends>QListWidget</extends>
<header location="global">qt4projectmanager/customwidgetwizard/classlist.h</header> <header location="global">qt4projectmanager/customwidgetwizard/classlist.h</header>
</customwidget> </customwidget>

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

@@ -39,7 +39,7 @@
#include <QCoreApplication> #include <QCoreApplication>
namespace Qt4ProjectManager { namespace QmakeProjectManager {
namespace Internal { namespace Internal {
CustomWidgetWizard::CustomWidgetWizard() CustomWidgetWizard::CustomWidgetWizard()
@@ -80,4 +80,4 @@ Core::GeneratedFiles CustomWidgetWizard::generateFiles(const QWizard *w,
} }
} // namespace Internal } // namespace Internal
} // namespace Qt4ProjectManager } // namespace QmakeProjectManager

4
src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.h
View File

@@ -32,7 +32,7 @@
#include "../wizards/qtwizard.h" #include "../wizards/qtwizard.h"
namespace Qt4ProjectManager { namespace QmakeProjectManager {
namespace Internal { namespace Internal {
class CustomWidgetWizard : public QtWizard class CustomWidgetWizard : public QtWizard
@@ -50,6 +50,6 @@ protected:
}; };
} // namespace Internal } // namespace Internal
} // namespace Qt4ProjectManager } // namespace QmakeProjectManager
#endif // CUSTOMWIDGETWIZARD_H #endif // CUSTOMWIDGETWIZARD_H

4
src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizarddialog.cpp
View File

@@ -53,7 +53,7 @@ public:
} // namespace } // namespace
namespace Qt4ProjectManager { namespace QmakeProjectManager {
namespace Internal { namespace Internal {
enum { IntroPageId = 0}; enum { IntroPageId = 0};
@@ -109,4 +109,4 @@ QSharedPointer<PluginOptions> CustomWidgetWizardDialog::pluginOptions() const
} }
} // namespace Internal } // namespace Internal
} // namespace Qt4ProjectManager } // namespace QmakeProjectManager

4
src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizarddialog.h
View File

@@ -34,7 +34,7 @@
#include <QSharedPointer> #include <QSharedPointer>
namespace Qt4ProjectManager { namespace QmakeProjectManager {
namespace Internal { namespace Internal {
class CustomWidgetWidgetsWizardPage; class CustomWidgetWidgetsWizardPage;
@@ -68,6 +68,6 @@ private:
}; };
} // namespace Internal } // namespace Internal
} // namespace Qt4ProjectManager } // namespace QmakeProjectManager
#endif // CUSTOMWIDGETWIZARDDIALOG_H #endif // CUSTOMWIDGETWIZARDDIALOG_H

2
src/plugins/qt4projectmanager/customwidgetwizard/filenamingparameters.h
View File

@@ -33,7 +33,7 @@
#include <QString> #include <QString>
#include <QFileInfo> #include <QFileInfo>
namespace Qt4ProjectManager { namespace QmakeProjectManager {
namespace Internal { namespace Internal {
/* Helper struct specifying how to generate file names /* Helper struct specifying how to generate file names

2
src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.cpp
View File

@@ -45,7 +45,7 @@ static QString headerGuard(const QString &header)
return header.toUpper().replace(QRegExp(QLatin1String("[^A-Z0-9]+")), QLatin1String("_")); return header.toUpper().replace(QRegExp(QLatin1String("[^A-Z0-9]+")), QLatin1String("_"));
} }
namespace Qt4ProjectManager { namespace QmakeProjectManager {
namespace Internal { namespace Internal {
struct ProjectContents { struct ProjectContents {

2
src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.h
View File

@@ -43,7 +43,7 @@ namespace Core {
class GeneratedFile; class GeneratedFile;
} }
namespace Qt4ProjectManager { namespace QmakeProjectManager {
namespace Internal { namespace Internal {
struct PluginOptions; struct PluginOptions;

2
src/plugins/qt4projectmanager/customwidgetwizard/pluginoptions.h
View File

@@ -33,7 +33,7 @@
#include <QString> #include <QString>
#include <QList> #include <QList>
namespace Qt4ProjectManager { namespace QmakeProjectManager {
namespace Internal { namespace Internal {
struct PluginOptions { struct PluginOptions {

8
src/plugins/qt4projectmanager/externaleditors.cpp
View File

@@ -48,7 +48,7 @@
enum { debug = 0 }; enum { debug = 0 };
namespace Qt4ProjectManager { namespace QmakeProjectManager {
namespace Internal { namespace Internal {
// Figure out the Qt4 project used by the file if any // Figure out the Qt4 project used by the file if any
@@ -180,7 +180,7 @@ bool ExternalQtEditor::startEditorProcess(const EditorLaunchData &data, QString
LinguistExternalEditor::LinguistExternalEditor(QObject *parent) : LinguistExternalEditor::LinguistExternalEditor(QObject *parent) :
ExternalQtEditor(linguistIdC, ExternalQtEditor(linguistIdC,
QLatin1String(linguistDisplayName), QLatin1String(linguistDisplayName),
QLatin1String(Qt4ProjectManager::Constants::LINGUIST_MIMETYPE), QLatin1String(QmakeProjectManager::Constants::LINGUIST_MIMETYPE),
parent) parent)
{ {
} }
@@ -197,7 +197,7 @@ bool LinguistExternalEditor::startEditor(const QString &fileName, QString *error
MacDesignerExternalEditor::MacDesignerExternalEditor(QObject *parent) : MacDesignerExternalEditor::MacDesignerExternalEditor(QObject *parent) :
ExternalQtEditor(designerIdC, ExternalQtEditor(designerIdC,
QLatin1String(designerDisplayName), QLatin1String(designerDisplayName),
QLatin1String(Qt4ProjectManager::Constants::FORM_MIMETYPE), QLatin1String(QmakeProjectManager::Constants::FORM_MIMETYPE),
parent) parent)
{ {
} }
@@ -291,4 +291,4 @@ bool DesignerExternalEditor::startEditor(const QString &fileName, QString *error
} }
} // namespace Internal } // namespace Internal
} // namespace Qt4ProjectManager } // namespace QmakeProjectManager

4
src/plugins/qt4projectmanager/externaleditors.h
View File

@@ -46,7 +46,7 @@ namespace QtSupport {
class BaseQtVersion; class BaseQtVersion;
} }
namespace Qt4ProjectManager { namespace QmakeProjectManager {
namespace Internal { namespace Internal {
/* Convenience parametrizable base class for Qt editors/binaries /* Convenience parametrizable base class for Qt editors/binaries
@@ -144,6 +144,6 @@ private:
}; };
} // namespace Internal } // namespace Internal
} // namespace Qt4ProjectManager } // namespace QmakeProjectManager
#endif // EXTERNALEDITORS_H #endif // EXTERNALEDITORS_H

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

@@ -30,8 +30,8 @@
#include "findqt4profiles.h" #include "findqt4profiles.h"
#include "qt4nodes.h" #include "qt4nodes.h"
using namespace Qt4ProjectManager; using namespace QmakeProjectManager;
using namespace Qt4ProjectManager::Internal; using namespace QmakeProjectManager::Internal;
QList<Qt4ProFileNode *> FindQt4ProFiles::operator()(ProjectExplorer::ProjectNode *root) QList<Qt4ProFileNode *> FindQt4ProFiles::operator()(ProjectExplorer::ProjectNode *root)
{ {

4
src/plugins/qt4projectmanager/findqt4profiles.h
View File

@@ -32,7 +32,7 @@
#include <projectexplorer/nodesvisitor.h> #include <projectexplorer/nodesvisitor.h>
namespace Qt4ProjectManager { namespace QmakeProjectManager {
class Qt4ProFileNode; class Qt4ProFileNode;
namespace Internal { namespace Internal {
@@ -47,7 +47,7 @@ private:
}; };
} // namespace Internal } // namespace Internal
} // namespace Qt4ProjectManager } // namespace QmakeProjectManager
#endif // FINDQT4PROFILES_H #endif // FINDQT4PROFILES_H

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

@@ -46,8 +46,8 @@
#include <QTextStream> #include <QTextStream>
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Qt4ProjectManager; using namespace QmakeProjectManager;
using namespace Qt4ProjectManager::Internal; using namespace QmakeProjectManager::Internal;
LibraryDetailsController::LibraryDetailsController( LibraryDetailsController::LibraryDetailsController(
Ui::LibraryDetailsWidget *libraryDetails, Ui::LibraryDetailsWidget *libraryDetails,

4
src/plugins/qt4projectmanager/librarydetailscontroller.h
View File

@@ -32,7 +32,7 @@
#include "addlibrarywizard.h" #include "addlibrarywizard.h"
namespace Qt4ProjectManager { namespace QmakeProjectManager {
class Qt4ProFileNode; class Qt4ProFileNode;
namespace Internal { namespace Internal {
@@ -200,6 +200,6 @@ private:
}; };
} // namespace Internal } // namespace Internal
} // namespace Qt4ProjectManager } // namespace QmakeProjectManager
#endif // LIBRARYDETAILSCONTROLLER_H #endif // LIBRARYDETAILSCONTROLLER_H

8
src/plugins/qt4projectmanager/librarydetailswidget.ui
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>Qt4ProjectManager::Internal::LibraryDetailsWidget</class> <class>QmakeProjectManager::Internal::LibraryDetailsWidget</class>
<widget class="QWidget" name="Qt4ProjectManager::Internal::LibraryDetailsWidget"> <widget class="QWidget" name="QmakeProjectManager::Internal::LibraryDetailsWidget">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
@@ -31,7 +31,7 @@
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="Qt4ProjectManager::Internal::LibraryPathChooser" name="libraryPathChooser" native="true"/> <widget class="QmakeProjectManager::Internal::LibraryPathChooser" name="libraryPathChooser" native="true"/>
</item> </item>
<item row="3" column="0"> <item row="3" column="0">
<widget class="QLabel" name="includeLabel"> <widget class="QLabel" name="includeLabel">
@@ -242,7 +242,7 @@
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>Qt4ProjectManager::Internal::LibraryPathChooser</class> <class>QmakeProjectManager::Internal::LibraryPathChooser</class>
<extends>QWidget</extends> <extends>QWidget</extends>
<header location="global">qt4projectmanager/addlibrarywizard.h</header> <header location="global">qt4projectmanager/addlibrarywizard.h</header>
<container>1</container> <container>1</container>

6
src/plugins/qt4projectmanager/makestep.cpp
View File

@@ -49,8 +49,8 @@
using ExtensionSystem::PluginManager; using ExtensionSystem::PluginManager;
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Qt4ProjectManager; using namespace QmakeProjectManager;
using namespace Qt4ProjectManager::Internal; using namespace QmakeProjectManager::Internal;
namespace { namespace {
const char MAKESTEP_BS_ID[] = "Qt4ProjectManager.MakeStep"; const char MAKESTEP_BS_ID[] = "Qt4ProjectManager.MakeStep";
@@ -188,7 +188,7 @@ bool MakeStep::init()
QString args; QString args;
Qt4ProjectManager::Qt4ProFileNode *subNode = bc->subNodeBuild(); QmakeProjectManager::Qt4ProFileNode *subNode = bc->subNodeBuild();
if (subNode) { if (subNode) {
QString makefile = subNode->makefile(); QString makefile = subNode->makefile();
if (makefile.isEmpty()) if (makefile.isEmpty())

2
src/plugins/qt4projectmanager/makestep.h
View File

@@ -40,7 +40,7 @@ class IBuildStepFactory;
class Task; class Task;
} }
namespace Qt4ProjectManager { namespace QmakeProjectManager {
class Qt4BuildConfiguration; class Qt4BuildConfiguration;
class MakeStepConfigWidget; class MakeStepConfigWidget;

4
src/plugins/qt4projectmanager/makestep.ui
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>Qt4ProjectManager::Internal::MakeStep</class> <class>QmakeProjectManager::Internal::MakeStep</class>
<widget class="QWidget" name="Qt4ProjectManager::Internal::MakeStep"> <widget class="QWidget" name="QmakeProjectManager::Internal::MakeStep">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>

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

@@ -32,7 +32,7 @@
#include <texteditor/codeassist/keywordscompletionassist.h> #include <texteditor/codeassist/keywordscompletionassist.h>
using namespace Qt4ProjectManager::Internal; using namespace QmakeProjectManager::Internal;
using namespace TextEditor; using namespace TextEditor;
@@ -280,7 +280,7 @@ ProFileCompletionAssistProvider::~ProFileCompletionAssistProvider()
bool ProFileCompletionAssistProvider::supportsEditor(const Core::Id &editorId) const bool ProFileCompletionAssistProvider::supportsEditor(const Core::Id &editorId) const
{ {
return editorId == Qt4ProjectManager::Constants::PROFILE_EDITOR_ID; return editorId == QmakeProjectManager::Constants::PROFILE_EDITOR_ID;
} }
IAssistProcessor *ProFileCompletionAssistProvider::createProcessor() const IAssistProcessor *ProFileCompletionAssistProvider::createProcessor() const

6
src/plugins/qt4projectmanager/profilecompletionassist.h
View File

@@ -34,7 +34,7 @@
#include <QStringList> #include <QStringList>
namespace Qt4ProjectManager { namespace QmakeProjectManager {
namespace Internal { namespace Internal {
class ProFileCompletionAssistProvider : public TextEditor::CompletionAssistProvider class ProFileCompletionAssistProvider : public TextEditor::CompletionAssistProvider
@@ -54,7 +54,7 @@ private:
QStringList m_functions; QStringList m_functions;
}; };
} // Internal } // namespace Internal
} // Qt4ProjectManager } // namespace QmakeProjectManager
#endif // PROFILECOMPLETIONASSIST_H #endif // PROFILECOMPLETIONASSIST_H

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

@@ -45,7 +45,7 @@
#include <QSharedPointer> #include <QSharedPointer>
#include <QTextBlock> #include <QTextBlock>
namespace Qt4ProjectManager { namespace QmakeProjectManager {
namespace Internal { namespace Internal {
// //
@@ -221,4 +221,4 @@ QString ProFileDocument::suggestedFileName() const
} }
} // namespace Internal } // namespace Internal
} // namespace Qt4ProjectManager } // namespace QmakeProjectManager

4
src/plugins/qt4projectmanager/profileeditor.h
View File

@@ -39,7 +39,7 @@ class FontSettings;
class TextEditorActionHandler; class TextEditorActionHandler;
} }
namespace Qt4ProjectManager { namespace QmakeProjectManager {
namespace Internal { namespace Internal {
class ProFileEditorFactory; class ProFileEditorFactory;
@@ -98,6 +98,6 @@ public:
}; };
} // namespace Internal } // namespace Internal
} // namespace Qt4ProjectManager } // namespace QmakeProjectManager
#endif // PROFILEEDITOR_H #endif // PROFILEEDITOR_H

14
src/plugins/qt4projectmanager/profileeditorfactory.cpp
View File

@@ -39,18 +39,18 @@
#include <QCoreApplication> #include <QCoreApplication>
using namespace Qt4ProjectManager; using namespace QmakeProjectManager;
using namespace Qt4ProjectManager::Internal; using namespace QmakeProjectManager::Internal;
ProFileEditorFactory::ProFileEditorFactory(Qt4Manager *manager, TextEditor::TextEditorActionHandler *handler) : ProFileEditorFactory::ProFileEditorFactory(Qt4Manager *manager, TextEditor::TextEditorActionHandler *handler) :
m_manager(manager), m_manager(manager),
m_actionHandler(handler) m_actionHandler(handler)
{ {
setId(Qt4ProjectManager::Constants::PROFILE_EDITOR_ID); setId(QmakeProjectManager::Constants::PROFILE_EDITOR_ID);
setDisplayName(qApp->translate("OpenWith::Editors", Qt4ProjectManager::Constants::PROFILE_EDITOR_DISPLAY_NAME)); setDisplayName(qApp->translate("OpenWith::Editors", QmakeProjectManager::Constants::PROFILE_EDITOR_DISPLAY_NAME));
addMimeType(Qt4ProjectManager::Constants::PROFILE_MIMETYPE); addMimeType(QmakeProjectManager::Constants::PROFILE_MIMETYPE);
addMimeType(Qt4ProjectManager::Constants::PROINCLUDEFILE_MIMETYPE); addMimeType(QmakeProjectManager::Constants::PROINCLUDEFILE_MIMETYPE);
addMimeType(Qt4ProjectManager::Constants::PROFEATUREFILE_MIMETYPE); addMimeType(QmakeProjectManager::Constants::PROFEATUREFILE_MIMETYPE);
Core::FileIconProvider::registerIconOverlayForSuffix(QtSupport::Constants::ICON_QT_PROJECT, "pro"); Core::FileIconProvider::registerIconOverlayForSuffix(QtSupport::Constants::ICON_QT_PROJECT, "pro");
Core::FileIconProvider::registerIconOverlayForSuffix(QtSupport::Constants::ICON_QT_PROJECT, "pri"); Core::FileIconProvider::registerIconOverlayForSuffix(QtSupport::Constants::ICON_QT_PROJECT, "pri");

4
src/plugins/qt4projectmanager/profileeditorfactory.h
View File

@@ -34,7 +34,7 @@
namespace TextEditor { class TextEditorActionHandler; } namespace TextEditor { class TextEditorActionHandler; }
namespace Qt4ProjectManager { namespace QmakeProjectManager {
class Qt4Manager; class Qt4Manager;
@@ -57,6 +57,6 @@ private:
}; };
} // namespace Internal } // namespace Internal
} // namespace Qt4ProjectManager } // namespace QmakeProjectManager
#endif // PROFILEEDITORFACTORY_H #endif // PROFILEEDITORFACTORY_H

2
src/plugins/qt4projectmanager/profilehighlighter.cpp
View File

@@ -34,7 +34,7 @@
#include <QTextDocument> #include <QTextDocument>
using namespace Qt4ProjectManager::Internal; using namespace QmakeProjectManager::Internal;
ProFileHighlighter::ProFileHighlighter(QTextDocument *document) : ProFileHighlighter::ProFileHighlighter(QTextDocument *document) :

4
src/plugins/qt4projectmanager/profilehighlighter.h
View File

@@ -33,7 +33,7 @@
#include <texteditor/syntaxhighlighter.h> #include <texteditor/syntaxhighlighter.h>
#include <texteditor/codeassist/keywordscompletionassist.h> #include <texteditor/codeassist/keywordscompletionassist.h>
namespace Qt4ProjectManager { namespace QmakeProjectManager {
namespace Internal { namespace Internal {
class ProFileHighlighter : public TextEditor::SyntaxHighlighter class ProFileHighlighter : public TextEditor::SyntaxHighlighter
@@ -56,6 +56,6 @@ private:
}; };
} // namespace Internal } // namespace Internal
} // namespace Qt4ProjectManager } // namespace QmakeProjectManager
#endif // PROFILEHIGHLIGHTER_H #endif // PROFILEHIGHLIGHTER_H

10
src/plugins/qt4projectmanager/profilehighlighterfactory.cpp
View File

@@ -31,14 +31,14 @@
#include "qt4projectmanagerconstants.h" #include "qt4projectmanagerconstants.h"
#include "profilehighlighter.h" #include "profilehighlighter.h"
using namespace Qt4ProjectManager::Internal; using namespace QmakeProjectManager::Internal;
ProFileHighlighterFactory::ProFileHighlighterFactory() ProFileHighlighterFactory::ProFileHighlighterFactory()
{ {
setId(Qt4ProjectManager::Constants::PROFILE_EDITOR_ID); setId(QmakeProjectManager::Constants::PROFILE_EDITOR_ID);
addMimeType(Qt4ProjectManager::Constants::PROFILE_MIMETYPE); addMimeType(QmakeProjectManager::Constants::PROFILE_MIMETYPE);
addMimeType(Qt4ProjectManager::Constants::PROINCLUDEFILE_MIMETYPE); addMimeType(QmakeProjectManager::Constants::PROINCLUDEFILE_MIMETYPE);
addMimeType(Qt4ProjectManager::Constants::PROFEATUREFILE_MIMETYPE); addMimeType(QmakeProjectManager::Constants::PROFEATUREFILE_MIMETYPE);
} }
TextEditor::SyntaxHighlighter *ProFileHighlighterFactory::createHighlighter() const TextEditor::SyntaxHighlighter *ProFileHighlighterFactory::createHighlighter() const

4
src/plugins/qt4projectmanager/profilehighlighterfactory.h
View File

@@ -32,7 +32,7 @@
#include <texteditor/ihighlighterfactory.h> #include <texteditor/ihighlighterfactory.h>
namespace Qt4ProjectManager { namespace QmakeProjectManager {
namespace Internal { namespace Internal {
class ProFileHighlighterFactory : public TextEditor::IHighlighterFactory class ProFileHighlighterFactory : public TextEditor::IHighlighterFactory
@@ -46,6 +46,6 @@ public:
}; };
} // namespace Internal } // namespace Internal
} // namespace Qt4ProjectManager } // namespace QmakeProjectManager
#endif // PROFILEHIGHLIGHTERFACTORY_H #endif // PROFILEHIGHLIGHTERFACTORY_H

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

@@ -38,8 +38,8 @@
#include <QTextBlock> #include <QTextBlock>
#include <QUrl> #include <QUrl>
using namespace Qt4ProjectManager; using namespace QmakeProjectManager;
using namespace Qt4ProjectManager::Internal; using namespace QmakeProjectManager::Internal;
using namespace Core; using namespace Core;
ProFileHoverHandler::ProFileHoverHandler(QObject *parent) ProFileHoverHandler::ProFileHoverHandler(QObject *parent)

4
src/plugins/qt4projectmanager/profilehoverhandler.h
View File

@@ -47,7 +47,7 @@ namespace TextEditor {
class ITextEditor; class ITextEditor;
} }
namespace Qt4ProjectManager { namespace QmakeProjectManager {
namespace Internal { namespace Internal {
class ProFileHoverHandler : public TextEditor::BaseHoverHandler class ProFileHoverHandler : public TextEditor::BaseHoverHandler
@@ -81,6 +81,6 @@ private:
}; };
} // namespace Internal } // namespace Internal
} // namespace Qt4ProjectManager } // namespace QmakeProjectManager
#endif // PROFILEHOVERHANDLER_H #endif // PROFILEHOVERHANDLER_H

4
src/plugins/qt4projectmanager/qmakebuildinfo.h
View File

@@ -37,7 +37,7 @@
#include <qtsupport/baseqtversion.h> #include <qtsupport/baseqtversion.h>
#include <qtsupport/qtkitinformation.h> #include <qtsupport/qtkitinformation.h>
namespace Qt4ProjectManager { namespace QmakeProjectManager {
class QmakeBuildInfo : public ProjectExplorer::BuildInfo class QmakeBuildInfo : public ProjectExplorer::BuildInfo
{ {
@@ -58,6 +58,6 @@ public:
} }
}; };
} // namespace Qt4ProjectManager } // namespace QmakeProjectManager
#endif // QMAKEBUILDINFO_H #endif // QMAKEBUILDINFO_H

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

@@ -35,7 +35,7 @@
#include <QLineEdit> #include <QLineEdit>
namespace Qt4ProjectManager { namespace QmakeProjectManager {
namespace Internal { namespace Internal {
QmakeKitConfigWidget::QmakeKitConfigWidget(ProjectExplorer::Kit *k, const ProjectExplorer::KitInformation *ki) : QmakeKitConfigWidget::QmakeKitConfigWidget(ProjectExplorer::Kit *k, const ProjectExplorer::KitInformation *ki) :
@@ -88,4 +88,4 @@ void QmakeKitConfigWidget::mkspecWasChanged(const QString &text)
} }
} // namespace Internal } // namespace Internal
} // namespace Qt4ProjectManager } // namespace QmakeProjectManager

4
src/plugins/qt4projectmanager/qmakekitconfigwidget.h
View File

@@ -36,7 +36,7 @@ QT_BEGIN_NAMESPACE
class QLineEdit; class QLineEdit;
QT_END_NAMESPACE QT_END_NAMESPACE
namespace Qt4ProjectManager { namespace QmakeProjectManager {
namespace Internal { namespace Internal {
class QmakeKitConfigWidget : public ProjectExplorer::KitConfigWidget class QmakeKitConfigWidget : public ProjectExplorer::KitConfigWidget
@@ -65,6 +65,6 @@ private:
}; };
} // namespace Internal } // namespace Internal
} // namespace Debugger } // namespace QmakeProjectManager
#endif // QT4PM_QMAKEKITCONFIGWIDGET_H #endif // QT4PM_QMAKEKITCONFIGWIDGET_H

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

@@ -40,7 +40,7 @@
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Utils; using namespace Utils;
namespace Qt4ProjectManager { namespace QmakeProjectManager {
QmakeKitInformation::QmakeKitInformation() QmakeKitInformation::QmakeKitInformation()
{ {
@@ -141,4 +141,4 @@ FileName QmakeKitInformation::defaultMkspec(const Kit *k)
return version->mkspecFor(ToolChainKitInformation::toolChain(k)); return version->mkspecFor(ToolChainKitInformation::toolChain(k));
} }
} // namespace Qt4ProjectManager } // namespace QmakeProjectManager

4
src/plugins/qt4projectmanager/qmakekitinformation.h
View File

@@ -34,7 +34,7 @@
#include <projectexplorer/kitmanager.h> #include <projectexplorer/kitmanager.h>
namespace Qt4ProjectManager { namespace QmakeProjectManager {
class QT4PROJECTMANAGER_EXPORT QmakeKitInformation : public ProjectExplorer::KitInformation class QT4PROJECTMANAGER_EXPORT QmakeKitInformation : public ProjectExplorer::KitInformation
{ {
@@ -59,6 +59,6 @@ public:
static Utils::FileName defaultMkspec(const ProjectExplorer::Kit *k); static Utils::FileName defaultMkspec(const ProjectExplorer::Kit *k);
}; };
} // namespace Qt4ProjectManager } // namespace QmakeProjectManager
#endif // QT4PM_QMAKEKITINFORMATION_H #endif // QT4PM_QMAKEKITINFORMATION_H

6
src/plugins/qt4projectmanager/qmakeparser.cpp
View File

@@ -32,8 +32,8 @@
#include <projectexplorer/task.h> #include <projectexplorer/task.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
using namespace Qt4ProjectManager; using namespace QmakeProjectManager;
using namespace Qt4ProjectManager::Internal; using namespace QmakeProjectManager::Internal;
using ProjectExplorer::Task; using ProjectExplorer::Task;
QMakeParser::QMakeParser() : m_error(QLatin1String("^(.+):(\\d+):\\s(.+)$")) QMakeParser::QMakeParser() : m_error(QLatin1String("^(.+):(\\d+):\\s(.+)$"))
@@ -92,7 +92,7 @@ void QMakeParser::stdError(const QString &line)
# include "projectexplorer/outputparser_test.h" # include "projectexplorer/outputparser_test.h"
using namespace Qt4ProjectManager::Internal; using namespace QmakeProjectManager::Internal;
using namespace ProjectExplorer; using namespace ProjectExplorer;
void Qt4ProjectManagerPlugin::testQmakeOutputParsers_data() void Qt4ProjectManagerPlugin::testQmakeOutputParsers_data()

4
src/plugins/qt4projectmanager/qmakeparser.h
View File

@@ -34,7 +34,7 @@
#include <QRegExp> #include <QRegExp>
namespace Qt4ProjectManager { namespace QmakeProjectManager {
namespace Internal { namespace Internal {
class QMakeParser : public ProjectExplorer::IOutputParser class QMakeParser : public ProjectExplorer::IOutputParser
@@ -50,6 +50,6 @@ private:
}; };
} // namesapce Internal } // namesapce Internal
} // namespace ProjectExplorer } // namespace QmakeProjectManager
#endif // QMAKEPARSER_H #endif // QMAKEPARSER_H

12
src/plugins/qt4projectmanager/qmakeprojectimporter.cpp
View File

@@ -52,7 +52,7 @@
static const Core::Id QT_IS_TEMPORARY("Qmake.TempQt"); static const Core::Id QT_IS_TEMPORARY("Qmake.TempQt");
namespace Qt4ProjectManager { namespace QmakeProjectManager {
namespace Internal { namespace Internal {
QmakeProjectImporter::QmakeProjectImporter(const QString &path) : QmakeProjectImporter::QmakeProjectImporter(const QString &path) :
@@ -153,10 +153,10 @@ QList<ProjectExplorer::BuildInfo *> QmakeProjectImporter::import(const Utils::Fi
QmakeBuildInfo *info = new QmakeBuildInfo(factory); QmakeBuildInfo *info = new QmakeBuildInfo(factory);
if (makefileBuildConfig.first & QtSupport::BaseQtVersion::DebugBuild) { if (makefileBuildConfig.first & QtSupport::BaseQtVersion::DebugBuild) {
info->type = ProjectExplorer::BuildConfiguration::Debug; info->type = ProjectExplorer::BuildConfiguration::Debug;
info->displayName = QCoreApplication::translate("Qt4ProjectManager::Internal::QmakeProjectImporter", "Debug"); info->displayName = QCoreApplication::translate("QmakeProjectManager::Internal::QmakeProjectImporter", "Debug");
} else { } else {
info->type = ProjectExplorer::BuildConfiguration::Release; info->type = ProjectExplorer::BuildConfiguration::Release;
info->displayName = QCoreApplication::translate("Qt4ProjectManager::Internal::QmakeProjectImporter", "Release"); info->displayName = QCoreApplication::translate("QmakeProjectManager::Internal::QmakeProjectImporter", "Release");
} }
info->kitId = k->id(); info->kitId = k->id();
info->buildDirectory = Utils::FileName::fromString(fi.absoluteFilePath()); info->buildDirectory = Utils::FileName::fromString(fi.absoluteFilePath());
@@ -169,8 +169,8 @@ QList<ProjectExplorer::BuildInfo *> QmakeProjectImporter::import(const Utils::Fi
if (result.isEmpty() && !silent) if (result.isEmpty() && !silent)
QMessageBox::critical(Core::ICore::mainWindow(), QMessageBox::critical(Core::ICore::mainWindow(),
QCoreApplication::translate("Qt4ProjectManager::Internal::QmakeProjectImporter", "No Build Found"), QCoreApplication::translate("QmakeProjectManager::Internal::QmakeProjectImporter", "No Build Found"),
QCoreApplication::translate("Qt4ProjectManager::Internal::QmakeProjectImporter", "No build found in %1 matching project %2.") QCoreApplication::translate("QmakeProjectManager::Internal::QmakeProjectImporter", "No build found in %1 matching project %2.")
.arg(importPath.toUserOutput()).arg(projectFilePath())); .arg(importPath.toUserOutput()).arg(projectFilePath()));
return result; return result;
@@ -251,4 +251,4 @@ ProjectExplorer::Kit *QmakeProjectImporter::createTemporaryKit(QtSupport::BaseQt
} }
} // namespace Internal } // namespace Internal
} // namespace Qt4ProjectManager } // namespace QmakeProjectManager

4
src/plugins/qt4projectmanager/qmakeprojectimporter.h
View File

@@ -34,7 +34,7 @@
namespace QtSupport { class BaseQtVersion; } namespace QtSupport { class BaseQtVersion; }
namespace Qt4ProjectManager { namespace QmakeProjectManager {
class Qt4Project; class Qt4Project;
@@ -59,6 +59,6 @@ private:
}; };
} // namespace Internal } // namespace Internal
} // namespace Qt4ProjectManager } // namespace QmakeProjectManager
#endif // QMAKEPROJECTIMPORTER_H #endif // QMAKEPROJECTIMPORTER_H

Some files were not shown because too many files have changed in this diff Show More