From ebcd992577bfca1e94f207958d736490395cd82b Mon Sep 17 00:00:00 2001
From: hjk <hjk121@nokiamail.com>
Date: Wed, 16 Oct 2013 11:02:37 +0200
Subject: [PATCH] Rename namespace Qt4ProjectManager to QmakeProjectManager
First step towards plugin renaming.
Change-Id: I8ac017660a7aa2bda0d7bb7d72ab0cfceaf6cfd2
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
---
src/plugins/android/androiddebugsupport.cpp | 2 +-
.../android/androiddeployconfiguration.cpp | 2 +-
src/plugins/android/androiddeployqtstep.cpp | 12 +++---
src/plugins/android/androiddeployqtwidget.cpp | 22 +++++------
src/plugins/android/androiddeployqtwidget.h | 4 +-
src/plugins/android/androiddeploystep.cpp | 6 +--
.../android/androiddeploystepwidget.cpp | 2 +-
.../android/androidextralibrarylistmodel.cpp | 16 ++++----
.../android/androidextralibrarylistmodel.h | 6 +--
src/plugins/android/androidmanager.cpp | 38 +++++++++----------
.../android/androidpackagecreationstep.cpp | 8 ++--
.../android/androidpackagecreationwidget.cpp | 2 +-
.../android/androidpackagecreationwidget.h | 4 +-
src/plugins/android/androidqtversion.cpp | 4 +-
.../android/androidrunconfiguration.cpp | 8 ++--
src/plugins/android/androidrunconfiguration.h | 4 +-
src/plugins/android/androidruncontrol.cpp | 2 +-
src/plugins/android/androidrunfactories.cpp | 4 +-
src/plugins/android/androidrunfactories.h | 2 +-
src/plugins/android/androidrunner.cpp | 2 +-
.../android/createandroidmanifestwizard.cpp | 12 +++---
.../android/createandroidmanifestwizard.h | 10 ++---
src/plugins/cmakeprojectmanager/cmakeeditor.h | 2 +-
src/plugins/ios/iosbuildstep.cpp | 2 +-
src/plugins/ios/iosconfigurations.cpp | 2 +-
src/plugins/ios/iosdebugsupport.cpp | 2 +-
src/plugins/ios/iosdeployconfiguration.cpp | 2 +-
src/plugins/ios/iosdeploystep.cpp | 4 +-
src/plugins/ios/iosdeploystepwidget.cpp | 2 +-
src/plugins/ios/iosmanager.cpp | 6 +--
src/plugins/ios/iosqtversion.cpp | 2 +-
src/plugins/ios/iosrunconfiguration.cpp | 2 +-
src/plugins/ios/iosruncontrol.cpp | 2 +-
src/plugins/ios/iosrunfactories.cpp | 4 +-
src/plugins/ios/iosrunfactories.h | 2 +-
src/plugins/ios/iosrunner.cpp | 2 +-
.../projectexplorer/settingsaccessor.cpp | 6 +--
.../qmlapplicationwizard.cpp | 6 +--
src/plugins/qnx/blackberryconfiguration.cpp | 4 +-
.../qnx/blackberrydeployconfiguration.cpp | 6 +--
.../blackberrydeployconfigurationfactory.cpp | 2 +-
.../qnx/blackberrydeployinformation.cpp | 18 ++++-----
src/plugins/qnx/blackberrydeployinformation.h | 6 +--
src/plugins/qnx/blackberryrunconfiguration.h | 4 +-
.../qnx/blackberryrunconfigurationfactory.cpp | 6 +--
src/plugins/qnx/blackberryruncontrol.h | 2 +-
.../qnx/qnxrunconfigurationfactory.cpp | 4 +-
.../qt4projectmanager/addlibrarywizard.cpp | 4 +-
.../qt4projectmanager/addlibrarywizard.h | 4 +-
.../qt4projectmanager/applicationlauncher.h | 4 +-
.../customwidgetwizard/classdefinition.cpp | 2 +-
.../customwidgetwizard/classdefinition.h | 2 +-
.../customwidgetwizard/classdefinition.ui | 4 +-
.../customwidgetwizard/classlist.cpp | 4 +-
.../customwidgetwizard/classlist.h | 4 +-
.../customwidgetpluginwizardpage.cpp | 4 +-
.../customwidgetpluginwizardpage.h | 4 +-
.../customwidgetpluginwizardpage.ui | 4 +-
.../customwidgetwidgetswizardpage.cpp | 2 +-
.../customwidgetwidgetswizardpage.h | 2 +-
.../customwidgetwidgetswizardpage.ui | 8 ++--
.../customwidgetwizard/customwidgetwizard.cpp | 4 +-
.../customwidgetwizard/customwidgetwizard.h | 4 +-
.../customwidgetwizarddialog.cpp | 4 +-
.../customwidgetwizarddialog.h | 4 +-
.../customwidgetwizard/filenamingparameters.h | 2 +-
.../customwidgetwizard/plugingenerator.cpp | 2 +-
.../customwidgetwizard/plugingenerator.h | 2 +-
.../customwidgetwizard/pluginoptions.h | 2 +-
.../qt4projectmanager/externaleditors.cpp | 8 ++--
.../qt4projectmanager/externaleditors.h | 4 +-
.../qt4projectmanager/findqt4profiles.cpp | 4 +-
.../qt4projectmanager/findqt4profiles.h | 4 +-
.../librarydetailscontroller.cpp | 4 +-
.../librarydetailscontroller.h | 4 +-
.../qt4projectmanager/librarydetailswidget.ui | 8 ++--
src/plugins/qt4projectmanager/makestep.cpp | 6 +--
src/plugins/qt4projectmanager/makestep.h | 2 +-
src/plugins/qt4projectmanager/makestep.ui | 4 +-
.../profilecompletionassist.cpp | 4 +-
.../profilecompletionassist.h | 6 +--
.../qt4projectmanager/profileeditor.cpp | 4 +-
src/plugins/qt4projectmanager/profileeditor.h | 4 +-
.../profileeditorfactory.cpp | 14 +++----
.../qt4projectmanager/profileeditorfactory.h | 4 +-
.../qt4projectmanager/profilehighlighter.cpp | 2 +-
.../qt4projectmanager/profilehighlighter.h | 4 +-
.../profilehighlighterfactory.cpp | 10 ++---
.../profilehighlighterfactory.h | 4 +-
.../qt4projectmanager/profilehoverhandler.cpp | 4 +-
.../qt4projectmanager/profilehoverhandler.h | 4 +-
.../qt4projectmanager/qmakebuildinfo.h | 4 +-
.../qmakekitconfigwidget.cpp | 4 +-
.../qt4projectmanager/qmakekitconfigwidget.h | 4 +-
.../qt4projectmanager/qmakekitinformation.cpp | 4 +-
.../qt4projectmanager/qmakekitinformation.h | 4 +-
src/plugins/qt4projectmanager/qmakeparser.cpp | 6 +--
src/plugins/qt4projectmanager/qmakeparser.h | 4 +-
.../qmakeprojectimporter.cpp | 12 +++---
.../qt4projectmanager/qmakeprojectimporter.h | 4 +-
.../qmakerunconfigurationfactory.cpp | 4 +-
.../qmakerunconfigurationfactory.h | 4 +-
src/plugins/qt4projectmanager/qmakestep.cpp | 6 +--
src/plugins/qt4projectmanager/qmakestep.h | 4 +-
src/plugins/qt4projectmanager/qmakestep.ui | 4 +-
.../qt4buildconfiguration.cpp | 4 +-
.../qt4projectmanager/qt4buildconfiguration.h | 10 ++---
src/plugins/qt4projectmanager/qt4nodes.cpp | 30 +++++++--------
src/plugins/qt4projectmanager/qt4nodes.h | 16 ++++----
src/plugins/qt4projectmanager/qt4project.cpp | 32 ++++++++--------
src/plugins/qt4projectmanager/qt4project.h | 8 ++--
.../qt4projectconfigwidget.cpp | 4 +-
.../qt4projectconfigwidget.h | 4 +-
.../qt4projectconfigwidget.ui | 4 +-
.../qt4projectmanager/qt4projectmanager.cpp | 8 ++--
.../qt4projectmanager/qt4projectmanager.h | 4 +-
.../qt4projectmanagerconstants.h | 4 +-
.../qt4projectmanagerplugin.cpp | 10 ++---
.../qt4projectmanagerplugin.h | 4 +-
.../qt4projectmanager/qt4runconfiguration.cpp | 10 ++---
.../qt4projectmanager/qt4runconfiguration.h | 6 +--
.../qt4projectmanager/qtmodulesinfo.cpp | 2 +-
src/plugins/qt4projectmanager/qtmodulesinfo.h | 4 +-
.../wizards/abstractmobileapp.cpp | 4 +-
.../wizards/abstractmobileapp.h | 4 +-
.../wizards/abstractmobileappwizard.cpp | 4 +-
.../wizards/abstractmobileappwizard.h | 4 +-
.../wizards/consoleappwizard.cpp | 4 +-
.../wizards/consoleappwizard.h | 4 +-
.../wizards/consoleappwizarddialog.cpp | 4 +-
.../wizards/consoleappwizarddialog.h | 4 +-
.../wizards/emptyprojectwizard.cpp | 4 +-
.../wizards/emptyprojectwizard.h | 4 +-
.../wizards/emptyprojectwizarddialog.cpp | 4 +-
.../wizards/emptyprojectwizarddialog.h | 4 +-
.../qt4projectmanager/wizards/filespage.cpp | 4 +-
.../qt4projectmanager/wizards/filespage.h | 4 +-
.../wizards/guiappwizard.cpp | 4 +-
.../qt4projectmanager/wizards/guiappwizard.h | 4 +-
.../wizards/guiappwizarddialog.cpp | 4 +-
.../wizards/guiappwizarddialog.h | 4 +-
.../qt4projectmanager/wizards/html5app.cpp | 8 ++--
.../qt4projectmanager/wizards/html5app.h | 4 +-
.../wizards/html5appwizard.cpp | 4 +-
.../wizards/html5appwizard.h | 4 +-
.../wizards/html5appwizardpages.cpp | 4 +-
.../wizards/html5appwizardpages.h | 4 +-
.../wizards/html5appwizardsourcespage.ui | 4 +-
.../wizards/libraryparameters.cpp | 4 +-
.../wizards/libraryparameters.h | 4 +-
.../wizards/librarywizard.cpp | 4 +-
.../qt4projectmanager/wizards/librarywizard.h | 4 +-
.../wizards/librarywizarddialog.cpp | 4 +-
.../wizards/librarywizarddialog.h | 4 +-
.../qt4projectmanager/wizards/mobileapp.cpp | 4 +-
.../qt4projectmanager/wizards/mobileapp.h | 4 +-
.../mobileappwizardgenericoptionspage.ui | 4 +-
.../wizards/mobileappwizardpages.cpp | 4 +-
.../wizards/mobileappwizardpages.h | 4 +-
.../wizards/mobilelibraryparameters.cpp | 4 +-
.../wizards/mobilelibraryparameters.h | 4 +-
.../wizards/mobilelibrarywizardoptionpage.cpp | 4 +-
.../wizards/mobilelibrarywizardoptionpage.h | 4 +-
.../wizards/mobilelibrarywizardoptionpage.ui | 4 +-
.../qt4projectmanager/wizards/modulespage.cpp | 2 +-
.../qt4projectmanager/wizards/modulespage.h | 4 +-
.../wizards/qtprojectparameters.cpp | 4 +-
.../wizards/qtprojectparameters.h | 4 +-
.../qt4projectmanager/wizards/qtquickapp.cpp | 4 +-
.../qt4projectmanager/wizards/qtquickapp.h | 4 +-
.../wizards/qtquickappwizard.cpp | 6 +--
.../wizards/qtquickappwizard.h | 4 +-
.../wizards/qtquickappwizardpages.cpp | 4 +-
.../wizards/qtquickappwizardpages.h | 4 +-
.../wizards/qtquickcomponentsetoptionspage.ui | 4 +-
.../qt4projectmanager/wizards/qtwizard.cpp | 4 +-
.../qt4projectmanager/wizards/qtwizard.h | 4 +-
.../wizards/subdirsprojectwizard.cpp | 4 +-
.../wizards/subdirsprojectwizard.h | 4 +-
.../wizards/subdirsprojectwizarddialog.cpp | 4 +-
.../wizards/subdirsprojectwizarddialog.h | 4 +-
.../qt4projectmanager/wizards/testwizard.cpp | 4 +-
.../qt4projectmanager/wizards/testwizard.h | 4 +-
.../wizards/testwizarddialog.cpp | 4 +-
.../wizards/testwizarddialog.h | 4 +-
.../wizards/testwizardpage.cpp | 4 +-
.../wizards/testwizardpage.h | 4 +-
.../wizards/testwizardpage.ui | 4 +-
src/plugins/qtsupport/baseqtversion.cpp | 8 ++--
src/plugins/qtsupport/qmldebugginglibrary.cpp | 10 ++---
src/plugins/qtsupport/qmldumptool.cpp | 12 +++---
src/plugins/qtsupport/qmlobservertool.cpp | 8 ++--
src/plugins/qtsupport/qtoptionspage.cpp | 2 +-
src/shared/proparser/prowriter.cpp | 2 +-
src/shared/proparser/prowriter.h | 2 +-
.../auto/profilewriter/tst_profilewriter.cpp | 10 ++---
tests/manual/appwizards/helpers.cpp | 4 +-
tests/manual/appwizards/main.cpp | 2 +-
tests/tools/qtquickappblaster/main.cpp | 2 +-
199 files changed, 509 insertions(+), 509 deletions(-)
diff --git a/src/plugins/android/androiddebugsupport.cpp b/src/plugins/android/androiddebugsupport.cpp
index 6b480f6fd19..bc56c6f688e 100644
--- a/src/plugins/android/androiddebugsupport.cpp
+++ b/src/plugins/android/androiddebugsupport.cpp
@@ -53,7 +53,7 @@
using namespace Debugger;
using namespace ProjectExplorer;
-using namespace Qt4ProjectManager;
+using namespace QmakeProjectManager;
namespace Android {
namespace Internal {
diff --git a/src/plugins/android/androiddeployconfiguration.cpp b/src/plugins/android/androiddeployconfiguration.cpp
index ab1227d9c2c..01577311fd3 100644
--- a/src/plugins/android/androiddeployconfiguration.cpp
+++ b/src/plugins/android/androiddeployconfiguration.cpp
@@ -124,7 +124,7 @@ DeployConfiguration *AndroidDeployConfigurationFactory::clone(Target *parent, De
QList<Core::Id> AndroidDeployConfigurationFactory::availableCreationIds(Target *parent) const
{
QList<Core::Id> ids;
- if (!qobject_cast<Qt4ProjectManager::Qt4Project *>(parent->project()))
+ if (!qobject_cast<QmakeProjectManager::Qt4Project *>(parent->project()))
return ids;
if (!parent->project()->supportsKit(parent->kit()))
diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp
index 56ca22ec9f4..ecd3a95d2fb 100644
--- a/src/plugins/android/androiddeployqtstep.cpp
+++ b/src/plugins/android/androiddeployqtstep.cpp
@@ -188,8 +188,8 @@ bool AndroidDeployQtStep::init()
m_serialNumber = info.serialNumber;
}
- Qt4ProjectManager::Qt4BuildConfiguration *bc
- = static_cast<Qt4ProjectManager::Qt4BuildConfiguration *>(target()->activeBuildConfiguration());
+ QmakeProjectManager::Qt4BuildConfiguration *bc
+ = static_cast<QmakeProjectManager::Qt4BuildConfiguration *>(target()->activeBuildConfiguration());
if (m_signPackage) {
// check keystore and certificate passwords
@@ -344,12 +344,12 @@ void AndroidDeployQtStep::runCommand(const QString &program, const QStringList &
void AndroidDeployQtStep::updateInputFile()
{
- Qt4ProjectManager::Qt4Project *pro = static_cast<Qt4ProjectManager::Qt4Project *>(project());
- QList<Qt4ProjectManager::Qt4ProFileNode *> nodes = pro->applicationProFiles();
+ QmakeProjectManager::Qt4Project *pro = static_cast<QmakeProjectManager::Qt4Project *>(project());
+ QList<QmakeProjectManager::Qt4ProFileNode *> nodes = pro->applicationProFiles();
QStringList inputFiles;
- foreach (Qt4ProjectManager::Qt4ProFileNode *node, nodes)
- inputFiles << node->singleVariableValue(Qt4ProjectManager::AndroidDeploySettingsFile);
+ foreach (QmakeProjectManager::Qt4ProFileNode *node, nodes)
+ inputFiles << node->singleVariableValue(QmakeProjectManager::AndroidDeploySettingsFile);
if (!inputFiles.contains(m_inputFile))
m_inputFile.clear();
diff --git a/src/plugins/android/androiddeployqtwidget.cpp b/src/plugins/android/androiddeployqtwidget.cpp
index 8a46ebce5ea..bf760dc7c44 100644
--- a/src/plugins/android/androiddeployqtwidget.cpp
+++ b/src/plugins/android/androiddeployqtwidget.cpp
@@ -135,7 +135,7 @@ AndroidDeployQtWidget::AndroidDeployQtWidget(AndroidDeployQtStep *step)
connect(m_ui->createAndroidManifestButton, SIGNAL(clicked()),
this, SLOT(createManifestButton()));
- m_extraLibraryListModel = new AndroidExtraLibraryListModel(static_cast<Qt4ProjectManager::Qt4Project *>(m_step->project()),
+ m_extraLibraryListModel = new AndroidExtraLibraryListModel(static_cast<QmakeProjectManager::Qt4Project *>(m_step->project()),
this);
m_ui->androidExtraLibsListView->setModel(m_extraLibraryListModel);
@@ -156,8 +156,8 @@ AndroidDeployQtWidget::~AndroidDeployQtWidget()
void AndroidDeployQtWidget::checkProjectTemplate()
{
- Qt4ProjectManager::Qt4Project *project = static_cast<Qt4ProjectManager::Qt4Project *>(m_step->project());
- if (project->rootQt4ProjectNode()->projectType() == Qt4ProjectManager::ApplicationTemplate)
+ QmakeProjectManager::Qt4Project *project = static_cast<QmakeProjectManager::Qt4Project *>(m_step->project());
+ if (project->rootQt4ProjectNode()->projectType() == QmakeProjectManager::ApplicationTemplate)
m_ui->additionalLibrariesGroupBox->setEnabled(true);
else
m_ui->additionalLibrariesGroupBox->setEnabled(false);
@@ -171,9 +171,9 @@ void AndroidDeployQtWidget::createManifestButton()
void AndroidDeployQtWidget::updateInputFileUi()
{
- Qt4ProjectManager::Qt4Project *project
- = static_cast<Qt4ProjectManager::Qt4Project *>(m_step->project());
- QList<Qt4ProjectManager::Qt4ProFileNode *> nodes = project->applicationProFiles();
+ QmakeProjectManager::Qt4Project *project
+ = static_cast<QmakeProjectManager::Qt4Project *>(m_step->project());
+ QList<QmakeProjectManager::Qt4ProFileNode *> nodes = project->applicationProFiles();
int size = nodes.size();
if (size == 0 || size == 1) {
// there's nothing to select, e.g. before parsing
@@ -185,8 +185,8 @@ void AndroidDeployQtWidget::updateInputFileUi()
m_ui->inputFileComboBox->setVisible(true);
m_ui->inputFileComboBox->clear();
- foreach (Qt4ProjectManager::Qt4ProFileNode *node, nodes) {
- QString file = node->singleVariableValue(Qt4ProjectManager::AndroidDeploySettingsFile);
+ foreach (QmakeProjectManager::Qt4ProFileNode *node, nodes) {
+ QString file = node->singleVariableValue(QmakeProjectManager::AndroidDeploySettingsFile);
m_ui->inputFileComboBox->addItem(node->displayName(), file);
}
@@ -325,8 +325,8 @@ void AndroidDeployQtWidget::activeBuildConfigurationChanged()
disconnect(m_currentBuildConfiguration, SIGNAL(qmakeBuildConfigurationChanged()),
this, SLOT(updateSigningWarning()));
updateSigningWarning();
- Qt4ProjectManager::Qt4BuildConfiguration *bc
- = qobject_cast<Qt4ProjectManager::Qt4BuildConfiguration *>(m_step->target()->activeBuildConfiguration());
+ QmakeProjectManager::Qt4BuildConfiguration *bc
+ = qobject_cast<QmakeProjectManager::Qt4BuildConfiguration *>(m_step->target()->activeBuildConfiguration());
m_currentBuildConfiguration = bc;
if (bc)
connect(bc, SIGNAL(qmakeBuildConfigurationChanged()), this, SLOT(updateSigningWarning()));
@@ -335,7 +335,7 @@ void AndroidDeployQtWidget::activeBuildConfigurationChanged()
void AndroidDeployQtWidget::updateSigningWarning()
{
- Qt4ProjectManager::Qt4BuildConfiguration *bc = qobject_cast<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);
if (m_step->signPackage() && debug) {
m_ui->signingDebugWarningIcon->setVisible(true);
diff --git a/src/plugins/android/androiddeployqtwidget.h b/src/plugins/android/androiddeployqtwidget.h
index a3ef1d9b960..003ed3f1fc9 100644
--- a/src/plugins/android/androiddeployqtwidget.h
+++ b/src/plugins/android/androiddeployqtwidget.h
@@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE
namespace Ui { class AndroidDeployQtWidget; }
QT_END_NAMESPACE
-namespace Qt4ProjectManager { class Qt4BuildConfiguration; }
+namespace QmakeProjectManager { class Qt4BuildConfiguration; }
namespace Android {
namespace Internal {
@@ -85,7 +85,7 @@ private:
Ui::AndroidDeployQtWidget *m_ui;
AndroidDeployQtStep *m_step;
AndroidExtraLibraryListModel *m_extraLibraryListModel;
- Qt4ProjectManager::Qt4BuildConfiguration *m_currentBuildConfiguration;
+ QmakeProjectManager::Qt4BuildConfiguration *m_currentBuildConfiguration;
bool m_ignoreChange;
};
diff --git a/src/plugins/android/androiddeploystep.cpp b/src/plugins/android/androiddeploystep.cpp
index b26860d393b..446207da856 100644
--- a/src/plugins/android/androiddeploystep.cpp
+++ b/src/plugins/android/androiddeploystep.cpp
@@ -56,7 +56,7 @@
using namespace Core;
using namespace ProjectExplorer;
-using namespace Qt4ProjectManager;
+using namespace QmakeProjectManager;
namespace Android {
namespace Internal {
@@ -143,7 +143,7 @@ bool AndroidDeployStep::init()
}
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())
m_libgnustl = AndroidManager::libGnuStl(arch, m_ndkToolChainVersion);
return true;
@@ -498,4 +498,4 @@ void AndroidDeployStep::writeOutput(const QString &text, OutputFormat format)
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace Android
diff --git a/src/plugins/android/androiddeploystepwidget.cpp b/src/plugins/android/androiddeploystepwidget.cpp
index 68cb6b0c83b..f148576a987 100644
--- a/src/plugins/android/androiddeploystepwidget.cpp
+++ b/src/plugins/android/androiddeploystepwidget.cpp
@@ -134,4 +134,4 @@ void AndroidDeployStepWidget::resetDefaultDevices()
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace Android
diff --git a/src/plugins/android/androidextralibrarylistmodel.cpp b/src/plugins/android/androidextralibrarylistmodel.cpp
index 491c3d50657..c0912fd3170 100644
--- a/src/plugins/android/androidextralibrarylistmodel.cpp
+++ b/src/plugins/android/androidextralibrarylistmodel.cpp
@@ -35,7 +35,7 @@
using namespace Android;
using namespace Internal;
-AndroidExtraLibraryListModel::AndroidExtraLibraryListModel(Qt4ProjectManager::Qt4Project *project,
+AndroidExtraLibraryListModel::AndroidExtraLibraryListModel(QmakeProjectManager::Qt4Project *project,
QObject *parent)
: QAbstractItemModel(parent)
, m_project(project)
@@ -77,18 +77,18 @@ QVariant AndroidExtraLibraryListModel::data(const QModelIndex &index, int role)
void AndroidExtraLibraryListModel::reset()
{
- if (m_project->rootQt4ProjectNode()->projectType() != Qt4ProjectManager::ApplicationTemplate)
+ if (m_project->rootQt4ProjectNode()->projectType() != QmakeProjectManager::ApplicationTemplate)
return;
beginResetModel();
- Qt4ProjectManager::Qt4ProFileNode *node = m_project->rootQt4ProjectNode();
- m_entries = node->variableValue(Qt4ProjectManager::AndroidExtraLibs);
+ QmakeProjectManager::Qt4ProFileNode *node = m_project->rootQt4ProjectNode();
+ m_entries = node->variableValue(QmakeProjectManager::AndroidExtraLibs);
endResetModel();
}
void AndroidExtraLibraryListModel::addEntries(const QStringList &list)
{
- if (m_project->rootQt4ProjectNode()->projectType() != Qt4ProjectManager::ApplicationTemplate)
+ if (m_project->rootQt4ProjectNode()->projectType() != QmakeProjectManager::ApplicationTemplate)
return;
beginInsertRows(QModelIndex(), m_entries.size(), m_entries.size() + list.size());
@@ -96,7 +96,7 @@ void AndroidExtraLibraryListModel::addEntries(const QStringList &list)
foreach (QString path, list)
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(" ")));
endInsertRows();
@@ -109,7 +109,7 @@ bool greaterModelIndexByRow(const QModelIndex &a, const QModelIndex &b)
void AndroidExtraLibraryListModel::removeEntries(QModelIndexList list)
{
- if (list.isEmpty() || m_project->rootQt4ProjectNode()->projectType() != Qt4ProjectManager::ApplicationTemplate)
+ if (list.isEmpty() || m_project->rootQt4ProjectNode()->projectType() != QmakeProjectManager::ApplicationTemplate)
return;
std::sort(list.begin(), list.end(), greaterModelIndexByRow);
@@ -128,6 +128,6 @@ void AndroidExtraLibraryListModel::removeEntries(QModelIndexList list)
endRemoveRows();
}
- Qt4ProjectManager::Qt4ProFileNode *node = m_project->rootQt4ProjectNode();
+ QmakeProjectManager::Qt4ProFileNode *node = m_project->rootQt4ProjectNode();
node->setProVariable(QLatin1String("ANDROID_EXTRA_LIBS"), m_entries.join(QLatin1String(" ")));
}
diff --git a/src/plugins/android/androidextralibrarylistmodel.h b/src/plugins/android/androidextralibrarylistmodel.h
index a4f5f203a34..d343acbaf44 100644
--- a/src/plugins/android/androidextralibrarylistmodel.h
+++ b/src/plugins/android/androidextralibrarylistmodel.h
@@ -34,7 +34,7 @@
#include <QAbstractItemModel>
#include <QStringList>
-namespace Qt4ProjectManager { class Qt4Project; }
+namespace QmakeProjectManager { class Qt4Project; }
namespace Android {
namespace Internal {
@@ -42,7 +42,7 @@ class AndroidExtraLibraryListModel : public QAbstractItemModel
{
Q_OBJECT
public:
- explicit AndroidExtraLibraryListModel(Qt4ProjectManager::Qt4Project *project,
+ explicit AndroidExtraLibraryListModel(QmakeProjectManager::Qt4Project *project,
QObject *parent = 0);
QModelIndex index(int row, int column, const QModelIndex &parent) const;
@@ -58,7 +58,7 @@ private slots:
void reset();
private:
- Qt4ProjectManager::Qt4Project *m_project;
+ QmakeProjectManager::Qt4Project *m_project;
QStringList m_entries;
};
diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp
index 29208b19ffd..b6f2359eb4b 100644
--- a/src/plugins/android/androidmanager.cpp
+++ b/src/plugins/android/androidmanager.cpp
@@ -127,7 +127,7 @@ namespace Internal {
bool AndroidManager::supportsAndroid(ProjectExplorer::Target *target)
{
- if (!qobject_cast<Qt4ProjectManager::Qt4Project *>(target->project()))
+ if (!qobject_cast<QmakeProjectManager::Qt4Project *>(target->project()))
return false;
QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(target->kit());
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)
{
- Qt4ProjectManager::Qt4Project *pro = qobject_cast<Qt4ProjectManager::Qt4Project *>(target->project());
+ QmakeProjectManager::Qt4Project *pro = qobject_cast<QmakeProjectManager::Qt4Project *>(target->project());
if (!pro)
return QString();
- Qt4ProjectManager::Qt4ProFileNode *node = pro->rootQt4ProjectNode();
+ QmakeProjectManager::Qt4ProFileNode *node = pro->rootQt4ProjectNode();
if (!node)
return QString();
- return node->singleVariableValue(Qt4ProjectManager::AndroidArchVar);
+ return node->singleVariableValue(QmakeProjectManager::AndroidArchVar);
}
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 apps;
- Qt4ProjectManager::Qt4Project *qt4Project = qobject_cast<Qt4ProjectManager::Qt4Project *>(target->project());
+ QmakeProjectManager::Qt4Project *qt4Project = qobject_cast<QmakeProjectManager::Qt4Project *>(target->project());
if (!qt4Project)
return apps;
- foreach (Qt4ProjectManager::Qt4ProFileNode *proFile, qt4Project->applicationProFiles()) {
- if (proFile->projectType() == Qt4ProjectManager::ApplicationTemplate) {
+ foreach (QmakeProjectManager::Qt4ProFileNode *proFile, qt4Project->applicationProFiles()) {
+ if (proFile->projectType() == QmakeProjectManager::ApplicationTemplate) {
if (proFile->targetInformation().target.startsWith(QLatin1String("lib"))
&& proFile->targetInformation().target.endsWith(QLatin1String(".so")))
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);
if (selectedApp.isEmpty())
return QString();
- Qt4ProjectManager::Qt4Project *qt4Project = qobject_cast<Qt4ProjectManager::Qt4Project *>(target->project());
- foreach (Qt4ProjectManager::Qt4ProFileNode *proFile, qt4Project->applicationProFiles()) {
- if (proFile->projectType() == Qt4ProjectManager::ApplicationTemplate) {
+ QmakeProjectManager::Qt4Project *qt4Project = qobject_cast<QmakeProjectManager::Qt4Project *>(target->project());
+ foreach (QmakeProjectManager::Qt4ProFileNode *proFile, qt4Project->applicationProFiles()) {
+ if (proFile->projectType() == QmakeProjectManager::ApplicationTemplate) {
if (proFile->targetInformation().target.startsWith(QLatin1String("lib"))
&& proFile->targetInformation().target.endsWith(QLatin1String(".so"))) {
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)
{
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)
return false;
@@ -804,16 +804,16 @@ QVector<AndroidManager::Library> AndroidManager::availableQtLibsWithDependencies
if (tc->type() != QLatin1String(Constants::ANDROID_TOOLCHAIN_TYPE))
return QVector<AndroidManager::Library>();
- Qt4ProjectManager::Qt4Project *project = static_cast<Qt4ProjectManager::Qt4Project *>(target->project());
- QString arch = project->rootQt4ProjectNode()->singleVariableValue(Qt4ProjectManager::AndroidArchVar);
+ QmakeProjectManager::Qt4Project *project = static_cast<QmakeProjectManager::Qt4Project *>(target->project());
+ QString arch = project->rootQt4ProjectNode()->singleVariableValue(QmakeProjectManager::AndroidArchVar);
AndroidToolChain *atc = static_cast<AndroidToolChain *>(tc);
QString libgnustl = libGnuStl(arch, atc->ndkToolChainVersion());
Utils::FileName readelfPath = AndroidConfigurations::instance().readelfPath(target->activeRunConfiguration()->abi().architecture(),
atc->ndkToolChainVersion());
- const Qt4ProjectManager::Qt4Project *const qt4Project
- = qobject_cast<const Qt4ProjectManager::Qt4Project *>(target->project());
+ const QmakeProjectManager::Qt4Project *const qt4Project
+ = qobject_cast<const QmakeProjectManager::Qt4Project *>(target->project());
if (!qt4Project || !version)
return QVector<AndroidManager::Library>();
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 libs;
- Qt4ProjectManager::Qt4Project *qt4Project = qobject_cast<Qt4ProjectManager::Qt4Project *>(target->project());
+ QmakeProjectManager::Qt4Project *qt4Project = qobject_cast<QmakeProjectManager::Qt4Project *>(target->project());
if (!qt4Project)
return libs;
- foreach (Qt4ProjectManager::Qt4ProFileNode *node, qt4Project->allProFiles())
- if (node->projectType() == Qt4ProjectManager::LibraryTemplate)
+ foreach (QmakeProjectManager::Qt4ProFileNode *node, qt4Project->allProFiles())
+ if (node->projectType() == QmakeProjectManager::LibraryTemplate)
libs << node->targetInformation().target;
return libs;
}
@@ -1317,4 +1317,4 @@ bool AndroidManager::checkForQt51Files(const QString &projectDirectory)
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace Android
diff --git a/src/plugins/android/androidpackagecreationstep.cpp b/src/plugins/android/androidpackagecreationstep.cpp
index b405012e62c..7b14cb38aa7 100644
--- a/src/plugins/android/androidpackagecreationstep.cpp
+++ b/src/plugins/android/androidpackagecreationstep.cpp
@@ -72,7 +72,7 @@ namespace {
const QLatin1String CertificateSeparator("*******************************************");
}
-using namespace Qt4ProjectManager;
+using namespace QmakeProjectManager;
AndroidPackageCreationStep::AndroidPackageCreationStep(BuildStepList *bsl)
: BuildStep(bsl, CreatePackageId)
@@ -109,7 +109,7 @@ bool AndroidPackageCreationStep::init()
// Copying
m_androidDir = AndroidManager::dirPath(target());
Utils::FileName path = m_androidDir;
- QString androidTargetArch = project->rootQt4ProjectNode()->singleVariableValue(Qt4ProjectManager::AndroidArchVar);
+ QString androidTargetArch = project->rootQt4ProjectNode()->singleVariableValue(QmakeProjectManager::AndroidArchVar);
if (androidTargetArch.isEmpty()) {
raiseError(tr("Cannot create Android package: No ANDROID_TARGET_ARCH set in make spec."));
return false;
@@ -435,7 +435,7 @@ void AndroidPackageCreationStep::collectFiles(QList<DeployItem> *deployList,
return;
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 androidJarPath = m_androidDir.toString() + QLatin1String("/libs/");
@@ -882,4 +882,4 @@ void AndroidPackageCreationStep::raiseError(const QString &shortMsg,
const Core::Id AndroidPackageCreationStep::CreatePackageId("Qt4ProjectManager.AndroidPackageCreationStep");
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace Android
diff --git a/src/plugins/android/androidpackagecreationwidget.cpp b/src/plugins/android/androidpackagecreationwidget.cpp
index 66f56910358..529b581f237 100644
--- a/src/plugins/android/androidpackagecreationwidget.cpp
+++ b/src/plugins/android/androidpackagecreationwidget.cpp
@@ -56,7 +56,7 @@ namespace Android {
namespace Internal {
using namespace ProjectExplorer;
-using namespace Qt4ProjectManager;
+using namespace QmakeProjectManager;
///////////////////////////// CheckModel /////////////////////////////
diff --git a/src/plugins/android/androidpackagecreationwidget.h b/src/plugins/android/androidpackagecreationwidget.h
index 9362ba54e54..91d2313da4c 100644
--- a/src/plugins/android/androidpackagecreationwidget.h
+++ b/src/plugins/android/androidpackagecreationwidget.h
@@ -41,7 +41,7 @@ class QFileSystemWatcher;
namespace Ui { class AndroidPackageCreationWidget; }
QT_END_NAMESPACE
-namespace Qt4ProjectManager { class Qt4BuildConfiguration; }
+namespace QmakeProjectManager { class Qt4BuildConfiguration; }
namespace Android {
namespace Internal {
@@ -112,7 +112,7 @@ private:
CheckModel *m_qtLibsModel;
CheckModel *m_prebundledLibs;
QFileSystemWatcher *m_fileSystemWatcher;
- Qt4ProjectManager::Qt4BuildConfiguration *m_currentBuildConfiguration;
+ QmakeProjectManager::Qt4BuildConfiguration *m_currentBuildConfiguration;
};
} // namespace Internal
diff --git a/src/plugins/android/androidqtversion.cpp b/src/plugins/android/androidqtversion.cpp
index c329302ffd0..a9bc897e22d 100644
--- a/src/plugins/android/androidqtversion.cpp
+++ b/src/plugins/android/androidqtversion.cpp
@@ -50,7 +50,7 @@
using namespace Android::Internal;
using namespace ProjectExplorer;
-using namespace Qt4ProjectManager;
+using namespace QmakeProjectManager;
AndroidQtVersion::AndroidQtVersion()
: 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_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()
|| QtSupport::QtKitInformation::qtVersion(k)->type() != QLatin1String(Constants::ANDROIDQT))
return;
diff --git a/src/plugins/android/androidrunconfiguration.cpp b/src/plugins/android/androidrunconfiguration.cpp
index a7d433b0af6..c1064d85b01 100644
--- a/src/plugins/android/androidrunconfiguration.cpp
+++ b/src/plugins/android/androidrunconfiguration.cpp
@@ -47,7 +47,7 @@ const char PRO_FILE_KEY[] = "Qt4ProjectManager.Qt4RunConfiguration.ProFile";
}
using namespace ProjectExplorer;
-using Qt4ProjectManager::Qt4Project;
+using QmakeProjectManager::Qt4Project;
namespace Android {
namespace Internal {
@@ -74,8 +74,8 @@ AndroidRunConfiguration::AndroidRunConfiguration(Target *parent, AndroidRunConfi
void AndroidRunConfiguration::init()
{
setDefaultDisplayName(defaultDisplayName());
- connect(target()->project(), SIGNAL(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool,bool)),
- this, SLOT(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool,bool)));
+ connect(target()->project(), SIGNAL(proFileUpdated(QmakeProjectManager::Qt4ProFileNode*,bool,bool)),
+ this, SLOT(proFileUpdated(QmakeProjectManager::Qt4ProFileNode*,bool,bool)));
}
bool AndroidRunConfiguration::fromMap(const QVariantMap &map)
@@ -112,7 +112,7 @@ QString AndroidRunConfiguration::disabledReason() const
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())
return;
diff --git a/src/plugins/android/androidrunconfiguration.h b/src/plugins/android/androidrunconfiguration.h
index 7290b84d7bd..523e4936e8b 100644
--- a/src/plugins/android/androidrunconfiguration.h
+++ b/src/plugins/android/androidrunconfiguration.h
@@ -35,7 +35,7 @@
#include <projectexplorer/runconfiguration.h>
-namespace Qt4ProjectManager { class Qt4ProFileNode; }
+namespace QmakeProjectManager { class Qt4ProFileNode; }
namespace Android {
namespace Internal {
@@ -70,7 +70,7 @@ protected:
bool fromMap(const QVariantMap &map);
QVariantMap toMap() const;
private slots:
- void proFileUpdated(Qt4ProjectManager::Qt4ProFileNode *pro, bool success, bool parseInProgress);
+ void proFileUpdated(QmakeProjectManager::Qt4ProFileNode *pro, bool success, bool parseInProgress);
private:
void init();
diff --git a/src/plugins/android/androidruncontrol.cpp b/src/plugins/android/androidruncontrol.cpp
index 50e54135dc4..8b8e2ae5fac 100644
--- a/src/plugins/android/androidruncontrol.cpp
+++ b/src/plugins/android/androidruncontrol.cpp
@@ -111,4 +111,4 @@ QIcon AndroidRunControl::icon() const
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace Android
diff --git a/src/plugins/android/androidrunfactories.cpp b/src/plugins/android/androidrunfactories.cpp
index 493380b7090..f278ce32251 100644
--- a/src/plugins/android/androidrunfactories.cpp
+++ b/src/plugins/android/androidrunfactories.cpp
@@ -48,7 +48,7 @@
using namespace ProjectExplorer;
-using namespace Qt4ProjectManager;
+using namespace QmakeProjectManager;
namespace Android {
namespace Internal {
@@ -180,4 +180,4 @@ RunControl *AndroidRunControlFactory::create(RunConfiguration *runConfig,
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace Android
diff --git a/src/plugins/android/androidrunfactories.h b/src/plugins/android/androidrunfactories.h
index 3fa64f60e5e..eb9105bfab7 100644
--- a/src/plugins/android/androidrunfactories.h
+++ b/src/plugins/android/androidrunfactories.h
@@ -43,7 +43,7 @@ class Node;
namespace Android {
namespace Internal {
-class AndroidRunConfigurationFactory : public Qt4ProjectManager::QmakeRunConfigurationFactory
+class AndroidRunConfigurationFactory : public QmakeProjectManager::QmakeRunConfigurationFactory
{
Q_OBJECT
diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp
index e00cb95e682..cb7d2512746 100644
--- a/src/plugins/android/androidrunner.cpp
+++ b/src/plugins/android/androidrunner.cpp
@@ -403,4 +403,4 @@ QString AndroidRunner::displayName() const
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace Android
diff --git a/src/plugins/android/createandroidmanifestwizard.cpp b/src/plugins/android/createandroidmanifestwizard.cpp
index 1ecdadc22e7..928879e6213 100644
--- a/src/plugins/android/createandroidmanifestwizard.cpp
+++ b/src/plugins/android/createandroidmanifestwizard.cpp
@@ -43,8 +43,8 @@
using namespace Android;
using namespace Android::Internal;
-using Qt4ProjectManager::Qt4Project;
-using Qt4ProjectManager::Qt4ProFileNode;
+using QmakeProjectManager::Qt4Project;
+using QmakeProjectManager::Qt4ProFileNode;
//
// NoApplicationProFilePage
@@ -96,7 +96,7 @@ void ChooseProFilePage::nodeSelected(int index)
ChooseDirectoryPage::ChooseDirectoryPage(CreateAndroidManifestWizard *wizard)
: 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);
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;
}
-void CreateAndroidManifestWizard::setNode(Qt4ProjectManager::Qt4ProFileNode *node)
+void CreateAndroidManifestWizard::setNode(QmakeProjectManager::Qt4ProFileNode *node)
{
m_node = node;
}
@@ -205,7 +205,7 @@ void CreateAndroidManifestWizard::createAndroidManifestFile()
return;
}
- if (m_node->singleVariableValue(Qt4ProjectManager::AndroidPackageSourceDir).isEmpty()) {
+ if (m_node->singleVariableValue(QmakeProjectManager::AndroidPackageSourceDir).isEmpty()) {
// and now time for some magic
QString dir = QFileInfo(fileName).absolutePath();
QString value = QLatin1String("$$PWD/")
diff --git a/src/plugins/android/createandroidmanifestwizard.h b/src/plugins/android/createandroidmanifestwizard.h
index 5fb4eb8bf0a..348090333c5 100644
--- a/src/plugins/android/createandroidmanifestwizard.h
+++ b/src/plugins/android/createandroidmanifestwizard.h
@@ -37,7 +37,7 @@ class QComboBox;
QT_END_NAMESPACE
namespace ProjectExplorer { class Target; }
-namespace Qt4ProjectManager { class Qt4ProFileNode; }
+namespace QmakeProjectManager { class Qt4ProFileNode; }
namespace Android {
namespace Internal {
@@ -57,7 +57,7 @@ class ChooseProFilePage : public QWizardPage
{
Q_OBJECT
public:
- ChooseProFilePage(CreateAndroidManifestWizard *wizard, const QList<Qt4ProjectManager::Qt4ProFileNode *> &nodes);
+ ChooseProFilePage(CreateAndroidManifestWizard *wizard, const QList<QmakeProjectManager::Qt4ProFileNode *> &nodes);
private slots:
void nodeSelected(int index);
private:
@@ -81,8 +81,8 @@ class CreateAndroidManifestWizard : public Utils::Wizard
public:
CreateAndroidManifestWizard(ProjectExplorer::Target *target);
- Qt4ProjectManager::Qt4ProFileNode *node() const;
- void setNode(Qt4ProjectManager::Qt4ProFileNode *node);
+ QmakeProjectManager::Qt4ProFileNode *node() const;
+ void setNode(QmakeProjectManager::Qt4ProFileNode *node);
QString sourceFileName() const;
@@ -93,7 +93,7 @@ public slots:
private:
void createAndroidManifestFile();
ProjectExplorer::Target *m_target;
- Qt4ProjectManager::Qt4ProFileNode *m_node;
+ QmakeProjectManager::Qt4ProFileNode *m_node;
QString m_directory;
};
}
diff --git a/src/plugins/cmakeprojectmanager/cmakeeditor.h b/src/plugins/cmakeprojectmanager/cmakeeditor.h
index b5102dabfbe..55e7639a246 100644
--- a/src/plugins/cmakeprojectmanager/cmakeeditor.h
+++ b/src/plugins/cmakeprojectmanager/cmakeeditor.h
@@ -104,6 +104,6 @@ public:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace CMakeProjectManager
#endif // CMAKEEDITOR_H
diff --git a/src/plugins/ios/iosbuildstep.cpp b/src/plugins/ios/iosbuildstep.cpp
index df63f0ef8cc..04b35f7a640 100644
--- a/src/plugins/ios/iosbuildstep.cpp
+++ b/src/plugins/ios/iosbuildstep.cpp
@@ -57,7 +57,7 @@
using namespace Core;
using namespace ProjectExplorer;
-using namespace Qt4ProjectManager;
+using namespace QmakeProjectManager;
namespace Ios {
namespace Internal {
diff --git a/src/plugins/ios/iosconfigurations.cpp b/src/plugins/ios/iosconfigurations.cpp
index b3c79f97e10..9dac4889b3d 100644
--- a/src/plugins/ios/iosconfigurations.cpp
+++ b/src/plugins/ios/iosconfigurations.cpp
@@ -319,7 +319,7 @@ void IosConfigurations::updateAutomaticKitList()
Debugger::DebuggerKitInformation::setDebugger(newKit, debugger);
SysRootKitInformation::setSysRoot(newKit, p.sdkPath);
- //Qt4ProjectManager::QmakeKitInformation::setMkspec(newKit,
+ // QmakeProjectManager::QmakeKitInformation::setMkspec(newKit,
// Utils::FileName::fromString(QLatin1String("macx-ios-clang")));
KitManager::registerKit(newKit);
existingKits << newKit;
diff --git a/src/plugins/ios/iosdebugsupport.cpp b/src/plugins/ios/iosdebugsupport.cpp
index 5f731b02b80..580095be0c9 100644
--- a/src/plugins/ios/iosdebugsupport.cpp
+++ b/src/plugins/ios/iosdebugsupport.cpp
@@ -48,7 +48,7 @@
using namespace Debugger;
using namespace ProjectExplorer;
-using namespace Qt4ProjectManager;
+using namespace QmakeProjectManager;
namespace Ios {
namespace Internal {
diff --git a/src/plugins/ios/iosdeployconfiguration.cpp b/src/plugins/ios/iosdeployconfiguration.cpp
index 975a62647a6..c87b9f04f9f 100644
--- a/src/plugins/ios/iosdeployconfiguration.cpp
+++ b/src/plugins/ios/iosdeployconfiguration.cpp
@@ -112,7 +112,7 @@ DeployConfiguration *IosDeployConfigurationFactory::clone(Target *parent, Deploy
QList<Core::Id> IosDeployConfigurationFactory::availableCreationIds(Target *parent) const
{
QList<Core::Id> ids;
- if (!qobject_cast<Qt4ProjectManager::Qt4Project *>(parent->project()))
+ if (!qobject_cast<QmakeProjectManager::Qt4Project *>(parent->project()))
return ids;
if (!parent->project()->supportsKit(parent->kit()))
return ids;
diff --git a/src/plugins/ios/iosdeploystep.cpp b/src/plugins/ios/iosdeploystep.cpp
index 6d9d89beebf..b58fff46ce3 100644
--- a/src/plugins/ios/iosdeploystep.cpp
+++ b/src/plugins/ios/iosdeploystep.cpp
@@ -50,7 +50,7 @@
#define ASSERT_STATE(state) ASSERT_STATE_GENERIC(State, state, m_state)
using namespace ProjectExplorer;
-using namespace Qt4ProjectManager;
+using namespace QmakeProjectManager;
namespace Ios {
namespace Internal {
@@ -239,4 +239,4 @@ IosSimulator::ConstPtr IosDeployStep::iossimulator() const
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace Ios
diff --git a/src/plugins/ios/iosdeploystepwidget.cpp b/src/plugins/ios/iosdeploystepwidget.cpp
index d1e09b7adbf..56e12e4de72 100644
--- a/src/plugins/ios/iosdeploystepwidget.cpp
+++ b/src/plugins/ios/iosdeploystepwidget.cpp
@@ -67,4 +67,4 @@ QString IosDeployStepWidget::summaryText() const
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace Ios
diff --git a/src/plugins/ios/iosmanager.cpp b/src/plugins/ios/iosmanager.cpp
index 16fddc102b5..f8a95b13463 100644
--- a/src/plugins/ios/iosmanager.cpp
+++ b/src/plugins/ios/iosmanager.cpp
@@ -50,7 +50,7 @@
#include <QApplication>
#include <QDomDocument>
-using namespace Qt4ProjectManager;
+using namespace QmakeProjectManager;
using namespace ProjectExplorer;
namespace Ios {
@@ -58,7 +58,7 @@ namespace Internal {
bool IosManager::supportsIos(ProjectExplorer::Target *target)
{
- if (!qobject_cast<Qt4ProjectManager::Qt4Project *>(target->project()))
+ if (!qobject_cast<QmakeProjectManager::Qt4Project *>(target->project()))
return false;
QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(target->kit());
return version && version->type() == QLatin1String(Ios::Constants::IOSQT);
@@ -72,4 +72,4 @@ QString IosManager::resDirForTarget(Target *target)
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace Ios
diff --git a/src/plugins/ios/iosqtversion.cpp b/src/plugins/ios/iosqtversion.cpp
index 881cc415674..cbefa20a787 100644
--- a/src/plugins/ios/iosqtversion.cpp
+++ b/src/plugins/ios/iosqtversion.cpp
@@ -47,7 +47,7 @@
using namespace Ios::Internal;
using namespace ProjectExplorer;
-using namespace Qt4ProjectManager;
+using namespace QmakeProjectManager;
IosQtVersion::IosQtVersion()
: QtSupport::BaseQtVersion()
diff --git a/src/plugins/ios/iosrunconfiguration.cpp b/src/plugins/ios/iosrunconfiguration.cpp
index 851d6574be1..cb6b574348c 100644
--- a/src/plugins/ios/iosrunconfiguration.cpp
+++ b/src/plugins/ios/iosrunconfiguration.cpp
@@ -49,7 +49,7 @@
#include <utils/qtcassert.h>
using namespace ProjectExplorer;
-using namespace Qt4ProjectManager;
+using namespace QmakeProjectManager;
namespace Ios {
namespace Internal {
diff --git a/src/plugins/ios/iosruncontrol.cpp b/src/plugins/ios/iosruncontrol.cpp
index cbba7f02458..551ef33f85f 100644
--- a/src/plugins/ios/iosruncontrol.cpp
+++ b/src/plugins/ios/iosruncontrol.cpp
@@ -109,4 +109,4 @@ QIcon IosRunControl::icon() const
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace Ios
diff --git a/src/plugins/ios/iosrunfactories.cpp b/src/plugins/ios/iosrunfactories.cpp
index c5517270bd6..3b46b3e7f33 100644
--- a/src/plugins/ios/iosrunfactories.cpp
+++ b/src/plugins/ios/iosrunfactories.cpp
@@ -48,7 +48,7 @@
using namespace ProjectExplorer;
-using namespace Qt4ProjectManager;
+using namespace QmakeProjectManager;
namespace Ios {
namespace Internal {
@@ -173,4 +173,4 @@ RunControl *IosRunControlFactory::create(RunConfiguration *runConfig,
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace Ios
diff --git a/src/plugins/ios/iosrunfactories.h b/src/plugins/ios/iosrunfactories.h
index c7de3148a78..60ada9a8672 100644
--- a/src/plugins/ios/iosrunfactories.h
+++ b/src/plugins/ios/iosrunfactories.h
@@ -43,7 +43,7 @@ class Node;
namespace Ios {
namespace Internal {
-class IosRunConfigurationFactory : public Qt4ProjectManager::QmakeRunConfigurationFactory
+class IosRunConfigurationFactory : public QmakeProjectManager::QmakeRunConfigurationFactory
{
Q_OBJECT
diff --git a/src/plugins/ios/iosrunner.cpp b/src/plugins/ios/iosrunner.cpp
index 2b9e3645803..26fdcc6507d 100644
--- a/src/plugins/ios/iosrunner.cpp
+++ b/src/plugins/ios/iosrunner.cpp
@@ -209,4 +209,4 @@ QString IosRunner::displayName() const
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace Ios
diff --git a/src/plugins/projectexplorer/settingsaccessor.cpp b/src/plugins/projectexplorer/settingsaccessor.cpp
index 6fe011ef75e..1796bc1004e 100644
--- a/src/plugins/projectexplorer/settingsaccessor.cpp
+++ b/src/plugins/projectexplorer/settingsaccessor.cpp
@@ -1514,15 +1514,15 @@ QVariantMap Version1Handler::update(Project *project, const QVariantMap &map)
"CMake Default target display name"));
else if (project->id() == "Qt4ProjectManager.Qt4Project")
targets << TargetDescription(QString::fromLatin1("Qt4ProjectManager.Target.DesktopTarget"),
- QCoreApplication::translate("Qt4ProjectManager::Internal::Qt4Target",
+ QCoreApplication::translate("QmakeProjectManager::Internal::Qt4Target",
"Desktop",
"Qt4 Desktop target display name"))
<< TargetDescription(QString::fromLatin1("Qt4ProjectManager.Target.MaemoEmulatorTarget"),
- QCoreApplication::translate("Qt4ProjectManager::Internal::Qt4Target",
+ QCoreApplication::translate("QmakeProjectManager::Internal::Qt4Target",
"Maemo Emulator",
"Qt4 Maemo Emulator target display name"))
<< TargetDescription(QString::fromLatin1("Qt4ProjectManager.Target.MaemoDeviceTarget"),
- QCoreApplication::translate("Qt4ProjectManager::Internal::Qt4Target",
+ QCoreApplication::translate("QmakeProjectManager::Internal::Qt4Target",
"Maemo Device",
"Qt4 Maemo Device target display name"));
else if (project->id() == "QmlProjectManager.QmlProject")
diff --git a/src/plugins/qmlprojectmanager/qmlapplicationwizard.cpp b/src/plugins/qmlprojectmanager/qmlapplicationwizard.cpp
index 74661acaa59..2640728043f 100644
--- a/src/plugins/qmlprojectmanager/qmlapplicationwizard.cpp
+++ b/src/plugins/qmlprojectmanager/qmlapplicationwizard.cpp
@@ -47,7 +47,7 @@
using namespace Core;
using namespace ExtensionSystem;
using namespace ProjectExplorer;
-using namespace Qt4ProjectManager;
+using namespace QmakeProjectManager;
namespace QmlProjectManager {
namespace Internal {
@@ -71,7 +71,7 @@ QmlApplicationWizard::QmlApplicationWizard(const TemplateInfo &templateInfo)
setWizardKind(ProjectWizard);
setCategory(QLatin1String(ProjectExplorer::Constants::QT_APPLICATION_WIZARD_CATEGORY));
setId(QLatin1String("QA.QMLB Application"));
- setIcon(QIcon(QLatin1String(Qt4ProjectManager::Constants::ICON_QTQUICK_APP)));
+ setIcon(QIcon(QLatin1String(QmakeProjectManager::Constants::ICON_QTQUICK_APP)));
setDisplayCategory(
QLatin1String(ProjectExplorer::Constants::QT_APPLICATION_WIZARD_CATEGORY_DISPLAY));
setDisplayName(tr("Qt Quick Application"));
@@ -105,7 +105,7 @@ void QmlApplicationWizard::createInstances(ExtensionSystem::IPlugin *plugin)
}
wizard->setRequiredFeatures(features);
- wizard->setIcon(QIcon(QLatin1String(Qt4ProjectManager::Constants::ICON_QTQUICK_APP)));
+ wizard->setIcon(QIcon(QLatin1String(QmakeProjectManager::Constants::ICON_QTQUICK_APP)));
plugin->addAutoReleasedObject(wizard);
}
}
diff --git a/src/plugins/qnx/blackberryconfiguration.cpp b/src/plugins/qnx/blackberryconfiguration.cpp
index 851cbced3dc..7bf14c3d889 100644
--- a/src/plugins/qnx/blackberryconfiguration.cpp
+++ b/src/plugins/qnx/blackberryconfiguration.cpp
@@ -232,7 +232,7 @@ Kit *BlackBerryConfiguration::createKit(QnxAbstractQtVersion *version, ToolChain
DebuggerKitInformation::setDebugger(kit, debugger);
if (isSimulator)
- Qt4ProjectManager::QmakeKitInformation::setMkspec(
+ QmakeProjectManager::QmakeKitInformation::setMkspec(
kit, FileName::fromString(QLatin1String("blackberry-x86-qcc")));
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(SysRootKitInformation::id(), true);
kit->setSticky(DebuggerKitInformation::id(), true);
- kit->setSticky(Qt4ProjectManager::QmakeKitInformation::id(), true);
+ kit->setSticky(QmakeProjectManager::QmakeKitInformation::id(), true);
return kit;
}
diff --git a/src/plugins/qnx/blackberrydeployconfiguration.cpp b/src/plugins/qnx/blackberrydeployconfiguration.cpp
index 89f163380b6..358aea4fca8 100644
--- a/src/plugins/qnx/blackberrydeployconfiguration.cpp
+++ b/src/plugins/qnx/blackberrydeployconfiguration.cpp
@@ -82,7 +82,7 @@ void BlackBerryDeployConfiguration::ctor()
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())
return;
@@ -90,8 +90,8 @@ void BlackBerryDeployConfiguration::setupBarDescriptor()
QString projectName = target()->project()->displayName();
QString targetName;
- Qt4ProjectManager::Qt4Project *project = static_cast<Qt4ProjectManager::Qt4Project *>(target()->project());
- foreach (Qt4ProjectManager::Qt4ProFileNode *node, project->applicationProFiles()) {
+ QmakeProjectManager::Qt4Project *project = static_cast<QmakeProjectManager::Qt4Project *>(target()->project());
+ foreach (QmakeProjectManager::Qt4ProFileNode *node, project->applicationProFiles()) {
QString target = node->targetInformation().target;
if (!target.isEmpty()) {
targetName = target;
diff --git a/src/plugins/qnx/blackberrydeployconfigurationfactory.cpp b/src/plugins/qnx/blackberrydeployconfigurationfactory.cpp
index f8382b2b6c6..d42ce5b01ac 100644
--- a/src/plugins/qnx/blackberrydeployconfigurationfactory.cpp
+++ b/src/plugins/qnx/blackberrydeployconfigurationfactory.cpp
@@ -60,7 +60,7 @@ QList<Core::Id> BlackBerryDeployConfigurationFactory::availableCreationIds(Proje
{
QList<Core::Id> result;
- Qt4ProjectManager::Qt4Project *project = qobject_cast<Qt4ProjectManager::Qt4Project *>(parent->project());
+ QmakeProjectManager::Qt4Project *project = qobject_cast<QmakeProjectManager::Qt4Project *>(parent->project());
if (!project)
return result;
diff --git a/src/plugins/qnx/blackberrydeployinformation.cpp b/src/plugins/qnx/blackberrydeployinformation.cpp
index ed4412593be..3bbb4fdf51b 100644
--- a/src/plugins/qnx/blackberrydeployinformation.cpp
+++ b/src/plugins/qnx/blackberrydeployinformation.cpp
@@ -241,8 +241,8 @@ void BlackBerryDeployInformation::updateModel()
beginResetModel();
QList<BarPackageDeployInformation> keep;
- QList<Qt4ProjectManager::Qt4ProFileNode *> appNodes = project()->applicationProFiles();
- foreach (Qt4ProjectManager::Qt4ProFileNode *node, appNodes) {
+ QList<QmakeProjectManager::Qt4ProFileNode *> appNodes = project()->applicationProFiles();
+ foreach (QmakeProjectManager::Qt4ProFileNode *node, appNodes) {
bool nodeFound = false;
for (int i = 0; i < m_deployInformation.size(); ++i) {
if (m_deployInformation[i].proFilePath == node->path()
@@ -264,9 +264,9 @@ void BlackBerryDeployInformation::updateModel()
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()
@@ -282,7 +282,7 @@ void BlackBerryDeployInformation::initModel()
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.
return;
@@ -291,17 +291,17 @@ void BlackBerryDeployInformation::initModel()
beginResetModel();
m_deployInformation.clear();
- QList<Qt4ProjectManager::Qt4ProFileNode *> appNodes = project()->applicationProFiles();
- foreach (Qt4ProjectManager::Qt4ProFileNode *node, appNodes)
+ QList<QmakeProjectManager::Qt4ProFileNode *> appNodes = project()->applicationProFiles();
+ foreach (QmakeProjectManager::Qt4ProFileNode *node, appNodes)
m_deployInformation << deployInformationFromNode(node);
endResetModel();
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());
const QString buildDir = m_target->activeBuildConfiguration()->buildDirectory().toString();
diff --git a/src/plugins/qnx/blackberrydeployinformation.h b/src/plugins/qnx/blackberrydeployinformation.h
index 462f6feaabd..7e323287388 100644
--- a/src/plugins/qnx/blackberrydeployinformation.h
+++ b/src/plugins/qnx/blackberrydeployinformation.h
@@ -37,7 +37,7 @@ namespace ProjectExplorer {
class Target;
}
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
class Qt4ProFileNode;
class Qt4Project;
}
@@ -102,10 +102,10 @@ private:
ColumnCount // Always have last
};
- Qt4ProjectManager::Qt4Project *project() const;
+ QmakeProjectManager::Qt4Project *project() const;
void initModel();
- BarPackageDeployInformation deployInformationFromNode(Qt4ProjectManager::Qt4ProFileNode *node) const;
+ BarPackageDeployInformation deployInformationFromNode(QmakeProjectManager::Qt4ProFileNode *node) const;
ProjectExplorer::Target *m_target;
diff --git a/src/plugins/qnx/blackberryrunconfiguration.h b/src/plugins/qnx/blackberryrunconfiguration.h
index de76612eed9..e208df9e150 100644
--- a/src/plugins/qnx/blackberryrunconfiguration.h
+++ b/src/plugins/qnx/blackberryrunconfiguration.h
@@ -38,7 +38,7 @@ namespace ProjectExplorer {
class Target;
}
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
class Qt4BuildConfiguration;
class Qt4Project;
}
@@ -69,7 +69,7 @@ public:
QVariantMap toMap() const;
BlackBerryDeployConfiguration *deployConfiguration() const;
- Qt4ProjectManager::Qt4BuildConfiguration *activeQt4BuildConfiguration() const;
+ QmakeProjectManager::Qt4BuildConfiguration *activeQt4BuildConfiguration() const;
QString key() const;
diff --git a/src/plugins/qnx/blackberryrunconfigurationfactory.cpp b/src/plugins/qnx/blackberryrunconfigurationfactory.cpp
index 8ac206597d7..3a47050d8bb 100644
--- a/src/plugins/qnx/blackberryrunconfigurationfactory.cpp
+++ b/src/plugins/qnx/blackberryrunconfigurationfactory.cpp
@@ -57,7 +57,7 @@ QList<Core::Id> BlackBerryRunConfigurationFactory::availableCreationIds(ProjectE
if (!canHandle(parent))
return ids;
- Qt4ProjectManager::Qt4Project *qt4Project = qobject_cast<Qt4ProjectManager::Qt4Project *>(parent->project());
+ QmakeProjectManager::Qt4Project *qt4Project = qobject_cast<QmakeProjectManager::Qt4Project *>(parent->project());
if (!qt4Project)
return ids;
@@ -85,7 +85,7 @@ bool BlackBerryRunConfigurationFactory::canCreate(ProjectExplorer::Target *paren
if (!canHandle(parent))
return false;
- Qt4ProjectManager::Qt4Project *qt4Project = qobject_cast<Qt4ProjectManager::Qt4Project *>(parent->project());
+ QmakeProjectManager::Qt4Project *qt4Project = qobject_cast<QmakeProjectManager::Qt4Project *>(parent->project());
if (!qt4Project)
return false;
@@ -140,7 +140,7 @@ bool BlackBerryRunConfigurationFactory::canHandle(ProjectExplorer::Target *t) co
{
if (!t->project()->supportsKit(t->kit()))
return false;
- if (!qobject_cast<Qt4ProjectManager::Qt4Project *>(t->project()))
+ if (!qobject_cast<QmakeProjectManager::Qt4Project *>(t->project()))
return false;
Core::Id deviceType = ProjectExplorer::DeviceTypeKitInformation::deviceTypeId(t->kit());
diff --git a/src/plugins/qnx/blackberryruncontrol.h b/src/plugins/qnx/blackberryruncontrol.h
index 9539dd13491..74ac08a1812 100644
--- a/src/plugins/qnx/blackberryruncontrol.h
+++ b/src/plugins/qnx/blackberryruncontrol.h
@@ -36,7 +36,7 @@
#include <projectexplorer/runconfiguration.h>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
class Qt4BuildConfiguration;
}
diff --git a/src/plugins/qnx/qnxrunconfigurationfactory.cpp b/src/plugins/qnx/qnxrunconfigurationfactory.cpp
index f0ef6f620e9..aff76aa6d35 100644
--- a/src/plugins/qnx/qnxrunconfigurationfactory.cpp
+++ b/src/plugins/qnx/qnxrunconfigurationfactory.cpp
@@ -58,7 +58,7 @@ QList<Core::Id> QnxRunConfigurationFactory::availableCreationIds(ProjectExplorer
if (!canHandle(parent))
return ids;
- Qt4ProjectManager::Qt4Project *qt4Project = qobject_cast<Qt4ProjectManager::Qt4Project *>(parent->project());
+ QmakeProjectManager::Qt4Project *qt4Project = qobject_cast<QmakeProjectManager::Qt4Project *>(parent->project());
if (!qt4Project)
return ids;
@@ -85,7 +85,7 @@ bool QnxRunConfigurationFactory::canCreate(ProjectExplorer::Target *parent, cons
if (!canHandle(parent) || !id.name().startsWith(Constants::QNX_QNX_RUNCONFIGURATION_PREFIX))
return false;
- Qt4ProjectManager::Qt4Project *qt4Project = qobject_cast<Qt4ProjectManager::Qt4Project *>(parent->project());
+ QmakeProjectManager::Qt4Project *qt4Project = qobject_cast<QmakeProjectManager::Qt4Project *>(parent->project());
if (!qt4Project)
return false;
diff --git a/src/plugins/qt4projectmanager/addlibrarywizard.cpp b/src/plugins/qt4projectmanager/addlibrarywizard.cpp
index 02c496a7ae4..ec3ec3a0e6d 100644
--- a/src/plugins/qt4projectmanager/addlibrarywizard.cpp
+++ b/src/plugins/qt4projectmanager/addlibrarywizard.cpp
@@ -40,8 +40,8 @@
#include <QFileInfo>
#include <QDebug>
-using namespace Qt4ProjectManager;
-using namespace Qt4ProjectManager::Internal;
+using namespace QmakeProjectManager;
+using namespace QmakeProjectManager::Internal;
const char qt_file_dialog_filter_reg_exp[] =
diff --git a/src/plugins/qt4projectmanager/addlibrarywizard.h b/src/plugins/qt4projectmanager/addlibrarywizard.h
index 1d780aa1128..9fa7b52e7eb 100644
--- a/src/plugins/qt4projectmanager/addlibrarywizard.h
+++ b/src/plugins/qt4projectmanager/addlibrarywizard.h
@@ -39,7 +39,7 @@ class QCheckBox;
class QLabel;
QT_END_NAMESPACE
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
class LibraryDetailsWidget;
@@ -154,6 +154,6 @@ public:
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // ADDLIBRARYWIZARD_H
diff --git a/src/plugins/qt4projectmanager/applicationlauncher.h b/src/plugins/qt4projectmanager/applicationlauncher.h
index 048ea286a12..b51ab06b381 100644
--- a/src/plugins/qt4projectmanager/applicationlauncher.h
+++ b/src/plugins/qt4projectmanager/applicationlauncher.h
@@ -34,7 +34,7 @@
#include <QStringList>
#include <QProcess>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
class ConsoleProcess;
@@ -80,6 +80,6 @@ private:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // APPLICATIONLAUNCHER_H
diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.cpp b/src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.cpp
index 63eaa4d2787..2e950d0a144 100644
--- a/src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.cpp
+++ b/src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.cpp
@@ -31,7 +31,7 @@
#include <QFileInfo>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
ClassDefinition::ClassDefinition(QWidget *parent) :
diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.h b/src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.h
index 305963cb6b7..fa8d4676f0a 100644
--- a/src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.h
+++ b/src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.h
@@ -36,7 +36,7 @@
#include <QTabWidget>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
class ClassDefinition : public QTabWidget
diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.ui b/src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.ui
index d705685a2d4..ac89b0c6d90 100644
--- a/src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.ui
+++ b/src/plugins/qt4projectmanager/customwidgetwizard/classdefinition.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>Qt4ProjectManager::Internal::ClassDefinition</class>
- <widget class="QTabWidget" name="Qt4ProjectManager::Internal::ClassDefinition">
+ <class>QmakeProjectManager::Internal::ClassDefinition</class>
+ <widget class="QTabWidget" name="QmakeProjectManager::Internal::ClassDefinition">
<property name="enabled">
<bool>true</bool>
</property>
diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/classlist.cpp b/src/plugins/qt4projectmanager/customwidgetwizard/classlist.cpp
index e955d171d2c..22297ae81cb 100644
--- a/src/plugins/qt4projectmanager/customwidgetwizard/classlist.cpp
+++ b/src/plugins/qt4projectmanager/customwidgetwizard/classlist.cpp
@@ -39,7 +39,7 @@
#include <QDebug>
#include <QRegExp>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
// ClassModel: Validates the class name in setData() and
@@ -169,4 +169,4 @@ void ClassList::slotCurrentRowChanged(const QModelIndex ¤t, const QModelIn
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/classlist.h b/src/plugins/qt4projectmanager/customwidgetwizard/classlist.h
index 9bb7cbef3a9..b745dd5f1aa 100644
--- a/src/plugins/qt4projectmanager/customwidgetwizard/classlist.h
+++ b/src/plugins/qt4projectmanager/customwidgetwizard/classlist.h
@@ -34,7 +34,7 @@
QT_FORWARD_DECLARE_CLASS(QModelIndex)
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
class ClassModel;
@@ -71,5 +71,5 @@ private:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif
diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetpluginwizardpage.cpp b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetpluginwizardpage.cpp
index 910a145e742..9536f673025 100644
--- a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetpluginwizardpage.cpp
+++ b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetpluginwizardpage.cpp
@@ -31,7 +31,7 @@
#include "customwidgetwidgetswizardpage.h"
#include "ui_customwidgetpluginwizardpage.h"
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
CustomWidgetPluginWizardPage::CustomWidgetPluginWizardPage(QWidget *parent) :
@@ -139,4 +139,4 @@ bool CustomWidgetPluginWizardPage::isComplete() const
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetpluginwizardpage.h b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetpluginwizardpage.h
index 1605b2a507c..fcb4792b652 100644
--- a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetpluginwizardpage.h
+++ b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetpluginwizardpage.h
@@ -35,7 +35,7 @@
#include <QWizardPage>
#include <QSharedPointer>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
struct PluginOptions;
@@ -80,6 +80,6 @@ private:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // CUSTOMWIDGETPLUGINWIZARDPAGE_H
diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetpluginwizardpage.ui b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetpluginwizardpage.ui
index 4cbdf488a6a..2f70b02a432 100644
--- a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetpluginwizardpage.ui
+++ b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetpluginwizardpage.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>Qt4ProjectManager::Internal::CustomWidgetPluginWizardPage</class>
- <widget class="QWizardPage" name="Qt4ProjectManager::Internal::CustomWidgetPluginWizardPage">
+ <class>QmakeProjectManager::Internal::CustomWidgetPluginWizardPage</class>
+ <widget class="QWizardPage" name="QmakeProjectManager::Internal::CustomWidgetPluginWizardPage">
<property name="geometry">
<rect>
<x>0</x>
diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.cpp b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.cpp
index 3caf1938d46..89bd6270739 100644
--- a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.cpp
+++ b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.cpp
@@ -38,7 +38,7 @@
#include <QStackedLayout>
#include <QIcon>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
CustomWidgetWidgetsWizardPage::CustomWidgetWidgetsWizardPage(QWidget *parent) :
diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.h b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.h
index d06fa352028..74b4ed9ca2b 100644
--- a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.h
+++ b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.h
@@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE
class QStackedLayout;
QT_END_NAMESPACE
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
class ClassDefinition;
diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.ui b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.ui
index 568467950d1..747738b0fed 100644
--- a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.ui
+++ b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwidgetswizardpage.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>Qt4ProjectManager::Internal::CustomWidgetWidgetsWizardPage</class>
- <widget class="QWizardPage" name="Qt4ProjectManager::Internal::CustomWidgetWidgetsWizardPage">
+ <class>QmakeProjectManager::Internal::CustomWidgetWidgetsWizardPage</class>
+ <widget class="QWizardPage" name="QmakeProjectManager::Internal::CustomWidgetWidgetsWizardPage">
<property name="geometry">
<rect>
<x>0</x>
@@ -28,7 +28,7 @@
</widget>
</item>
<item row="3" column="0">
- <widget class="Qt4ProjectManager::Internal::ClassList" name="classList">
+ <widget class="QmakeProjectManager::Internal::ClassList" name="classList">
<property name="minimumSize">
<size>
<width>0</width>
@@ -92,7 +92,7 @@
</widget>
<customwidgets>
<customwidget>
- <class>Qt4ProjectManager::Internal::ClassList</class>
+ <class>QmakeProjectManager::Internal::ClassList</class>
<extends>QListWidget</extends>
<header location="global">qt4projectmanager/customwidgetwizard/classlist.h</header>
</customwidget>
diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.cpp b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.cpp
index dbe53ec911b..eb94d6a6b97 100644
--- a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.cpp
+++ b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.cpp
@@ -39,7 +39,7 @@
#include <QCoreApplication>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
CustomWidgetWizard::CustomWidgetWizard()
@@ -80,4 +80,4 @@ Core::GeneratedFiles CustomWidgetWizard::generateFiles(const QWizard *w,
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.h b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.h
index c73e68f70c3..2dd4b5d65b0 100644
--- a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.h
+++ b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.h
@@ -32,7 +32,7 @@
#include "../wizards/qtwizard.h"
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
class CustomWidgetWizard : public QtWizard
@@ -50,6 +50,6 @@ protected:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // CUSTOMWIDGETWIZARD_H
diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizarddialog.cpp b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizarddialog.cpp
index c3241c97f91..3a27e79cf45 100644
--- a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizarddialog.cpp
+++ b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizarddialog.cpp
@@ -53,7 +53,7 @@ public:
} // namespace
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
enum { IntroPageId = 0};
@@ -109,4 +109,4 @@ QSharedPointer<PluginOptions> CustomWidgetWizardDialog::pluginOptions() const
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizarddialog.h b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizarddialog.h
index e03864c1d71..faa11b96d7e 100644
--- a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizarddialog.h
+++ b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizarddialog.h
@@ -34,7 +34,7 @@
#include <QSharedPointer>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
class CustomWidgetWidgetsWizardPage;
@@ -68,6 +68,6 @@ private:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // CUSTOMWIDGETWIZARDDIALOG_H
diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/filenamingparameters.h b/src/plugins/qt4projectmanager/customwidgetwizard/filenamingparameters.h
index 5a91de26c7b..996d7eee283 100644
--- a/src/plugins/qt4projectmanager/customwidgetwizard/filenamingparameters.h
+++ b/src/plugins/qt4projectmanager/customwidgetwizard/filenamingparameters.h
@@ -33,7 +33,7 @@
#include <QString>
#include <QFileInfo>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
/* Helper struct specifying how to generate file names
diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.cpp b/src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.cpp
index dcfe0cd245a..db85709cc68 100644
--- a/src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.cpp
+++ b/src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.cpp
@@ -45,7 +45,7 @@ static QString headerGuard(const QString &header)
return header.toUpper().replace(QRegExp(QLatin1String("[^A-Z0-9]+")), QLatin1String("_"));
}
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
struct ProjectContents {
diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.h b/src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.h
index 6637f792f5d..27bd3c996b8 100644
--- a/src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.h
+++ b/src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.h
@@ -43,7 +43,7 @@ namespace Core {
class GeneratedFile;
}
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
struct PluginOptions;
diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/pluginoptions.h b/src/plugins/qt4projectmanager/customwidgetwizard/pluginoptions.h
index b6241b544c6..483a49a7086 100644
--- a/src/plugins/qt4projectmanager/customwidgetwizard/pluginoptions.h
+++ b/src/plugins/qt4projectmanager/customwidgetwizard/pluginoptions.h
@@ -33,7 +33,7 @@
#include <QString>
#include <QList>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
struct PluginOptions {
diff --git a/src/plugins/qt4projectmanager/externaleditors.cpp b/src/plugins/qt4projectmanager/externaleditors.cpp
index 27cc84a6359..78f10f38445 100644
--- a/src/plugins/qt4projectmanager/externaleditors.cpp
+++ b/src/plugins/qt4projectmanager/externaleditors.cpp
@@ -48,7 +48,7 @@
enum { debug = 0 };
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
// 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) :
ExternalQtEditor(linguistIdC,
QLatin1String(linguistDisplayName),
- QLatin1String(Qt4ProjectManager::Constants::LINGUIST_MIMETYPE),
+ QLatin1String(QmakeProjectManager::Constants::LINGUIST_MIMETYPE),
parent)
{
}
@@ -197,7 +197,7 @@ bool LinguistExternalEditor::startEditor(const QString &fileName, QString *error
MacDesignerExternalEditor::MacDesignerExternalEditor(QObject *parent) :
ExternalQtEditor(designerIdC,
QLatin1String(designerDisplayName),
- QLatin1String(Qt4ProjectManager::Constants::FORM_MIMETYPE),
+ QLatin1String(QmakeProjectManager::Constants::FORM_MIMETYPE),
parent)
{
}
@@ -291,4 +291,4 @@ bool DesignerExternalEditor::startEditor(const QString &fileName, QString *error
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
diff --git a/src/plugins/qt4projectmanager/externaleditors.h b/src/plugins/qt4projectmanager/externaleditors.h
index e3f85b13d3a..fc642a181eb 100644
--- a/src/plugins/qt4projectmanager/externaleditors.h
+++ b/src/plugins/qt4projectmanager/externaleditors.h
@@ -46,7 +46,7 @@ namespace QtSupport {
class BaseQtVersion;
}
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
/* Convenience parametrizable base class for Qt editors/binaries
@@ -144,6 +144,6 @@ private:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // EXTERNALEDITORS_H
diff --git a/src/plugins/qt4projectmanager/findqt4profiles.cpp b/src/plugins/qt4projectmanager/findqt4profiles.cpp
index d36de678a1a..89f4f301770 100644
--- a/src/plugins/qt4projectmanager/findqt4profiles.cpp
+++ b/src/plugins/qt4projectmanager/findqt4profiles.cpp
@@ -30,8 +30,8 @@
#include "findqt4profiles.h"
#include "qt4nodes.h"
-using namespace Qt4ProjectManager;
-using namespace Qt4ProjectManager::Internal;
+using namespace QmakeProjectManager;
+using namespace QmakeProjectManager::Internal;
QList<Qt4ProFileNode *> FindQt4ProFiles::operator()(ProjectExplorer::ProjectNode *root)
{
diff --git a/src/plugins/qt4projectmanager/findqt4profiles.h b/src/plugins/qt4projectmanager/findqt4profiles.h
index fce5c604f3b..a9defa62f16 100644
--- a/src/plugins/qt4projectmanager/findqt4profiles.h
+++ b/src/plugins/qt4projectmanager/findqt4profiles.h
@@ -32,7 +32,7 @@
#include <projectexplorer/nodesvisitor.h>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
class Qt4ProFileNode;
namespace Internal {
@@ -47,7 +47,7 @@ private:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // FINDQT4PROFILES_H
diff --git a/src/plugins/qt4projectmanager/librarydetailscontroller.cpp b/src/plugins/qt4projectmanager/librarydetailscontroller.cpp
index e8a4bfb6c90..61d34345291 100644
--- a/src/plugins/qt4projectmanager/librarydetailscontroller.cpp
+++ b/src/plugins/qt4projectmanager/librarydetailscontroller.cpp
@@ -46,8 +46,8 @@
#include <QTextStream>
using namespace ProjectExplorer;
-using namespace Qt4ProjectManager;
-using namespace Qt4ProjectManager::Internal;
+using namespace QmakeProjectManager;
+using namespace QmakeProjectManager::Internal;
LibraryDetailsController::LibraryDetailsController(
Ui::LibraryDetailsWidget *libraryDetails,
diff --git a/src/plugins/qt4projectmanager/librarydetailscontroller.h b/src/plugins/qt4projectmanager/librarydetailscontroller.h
index 6390b17b246..b23bf4acb28 100644
--- a/src/plugins/qt4projectmanager/librarydetailscontroller.h
+++ b/src/plugins/qt4projectmanager/librarydetailscontroller.h
@@ -32,7 +32,7 @@
#include "addlibrarywizard.h"
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
class Qt4ProFileNode;
namespace Internal {
@@ -200,6 +200,6 @@ private:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // LIBRARYDETAILSCONTROLLER_H
diff --git a/src/plugins/qt4projectmanager/librarydetailswidget.ui b/src/plugins/qt4projectmanager/librarydetailswidget.ui
index bc18a5e18c5..6f984a25062 100644
--- a/src/plugins/qt4projectmanager/librarydetailswidget.ui
+++ b/src/plugins/qt4projectmanager/librarydetailswidget.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>Qt4ProjectManager::Internal::LibraryDetailsWidget</class>
- <widget class="QWidget" name="Qt4ProjectManager::Internal::LibraryDetailsWidget">
+ <class>QmakeProjectManager::Internal::LibraryDetailsWidget</class>
+ <widget class="QWidget" name="QmakeProjectManager::Internal::LibraryDetailsWidget">
<property name="geometry">
<rect>
<x>0</x>
@@ -31,7 +31,7 @@
</widget>
</item>
<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 row="3" column="0">
<widget class="QLabel" name="includeLabel">
@@ -242,7 +242,7 @@
<container>1</container>
</customwidget>
<customwidget>
- <class>Qt4ProjectManager::Internal::LibraryPathChooser</class>
+ <class>QmakeProjectManager::Internal::LibraryPathChooser</class>
<extends>QWidget</extends>
<header location="global">qt4projectmanager/addlibrarywizard.h</header>
<container>1</container>
diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp
index bd1bfe3b49f..ce30d6a902e 100644
--- a/src/plugins/qt4projectmanager/makestep.cpp
+++ b/src/plugins/qt4projectmanager/makestep.cpp
@@ -49,8 +49,8 @@
using ExtensionSystem::PluginManager;
using namespace ProjectExplorer;
-using namespace Qt4ProjectManager;
-using namespace Qt4ProjectManager::Internal;
+using namespace QmakeProjectManager;
+using namespace QmakeProjectManager::Internal;
namespace {
const char MAKESTEP_BS_ID[] = "Qt4ProjectManager.MakeStep";
@@ -188,7 +188,7 @@ bool MakeStep::init()
QString args;
- Qt4ProjectManager::Qt4ProFileNode *subNode = bc->subNodeBuild();
+ QmakeProjectManager::Qt4ProFileNode *subNode = bc->subNodeBuild();
if (subNode) {
QString makefile = subNode->makefile();
if (makefile.isEmpty())
diff --git a/src/plugins/qt4projectmanager/makestep.h b/src/plugins/qt4projectmanager/makestep.h
index d9729cbb3ac..059e07563af 100644
--- a/src/plugins/qt4projectmanager/makestep.h
+++ b/src/plugins/qt4projectmanager/makestep.h
@@ -40,7 +40,7 @@ class IBuildStepFactory;
class Task;
}
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
class Qt4BuildConfiguration;
class MakeStepConfigWidget;
diff --git a/src/plugins/qt4projectmanager/makestep.ui b/src/plugins/qt4projectmanager/makestep.ui
index 62882df7596..9856fd7d2c7 100644
--- a/src/plugins/qt4projectmanager/makestep.ui
+++ b/src/plugins/qt4projectmanager/makestep.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>Qt4ProjectManager::Internal::MakeStep</class>
- <widget class="QWidget" name="Qt4ProjectManager::Internal::MakeStep">
+ <class>QmakeProjectManager::Internal::MakeStep</class>
+ <widget class="QWidget" name="QmakeProjectManager::Internal::MakeStep">
<property name="geometry">
<rect>
<x>0</x>
diff --git a/src/plugins/qt4projectmanager/profilecompletionassist.cpp b/src/plugins/qt4projectmanager/profilecompletionassist.cpp
index 84ea394bce2..d14cb23f7c9 100644
--- a/src/plugins/qt4projectmanager/profilecompletionassist.cpp
+++ b/src/plugins/qt4projectmanager/profilecompletionassist.cpp
@@ -32,7 +32,7 @@
#include <texteditor/codeassist/keywordscompletionassist.h>
-using namespace Qt4ProjectManager::Internal;
+using namespace QmakeProjectManager::Internal;
using namespace TextEditor;
@@ -280,7 +280,7 @@ ProFileCompletionAssistProvider::~ProFileCompletionAssistProvider()
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
diff --git a/src/plugins/qt4projectmanager/profilecompletionassist.h b/src/plugins/qt4projectmanager/profilecompletionassist.h
index 4c25f9c51f0..dad0f761763 100644
--- a/src/plugins/qt4projectmanager/profilecompletionassist.h
+++ b/src/plugins/qt4projectmanager/profilecompletionassist.h
@@ -34,7 +34,7 @@
#include <QStringList>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
class ProFileCompletionAssistProvider : public TextEditor::CompletionAssistProvider
@@ -54,7 +54,7 @@ private:
QStringList m_functions;
};
-} // Internal
-} // Qt4ProjectManager
+} // namespace Internal
+} // namespace QmakeProjectManager
#endif // PROFILECOMPLETIONASSIST_H
diff --git a/src/plugins/qt4projectmanager/profileeditor.cpp b/src/plugins/qt4projectmanager/profileeditor.cpp
index 3460c76b982..fafa799ce85 100644
--- a/src/plugins/qt4projectmanager/profileeditor.cpp
+++ b/src/plugins/qt4projectmanager/profileeditor.cpp
@@ -45,7 +45,7 @@
#include <QSharedPointer>
#include <QTextBlock>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
//
@@ -221,4 +221,4 @@ QString ProFileDocument::suggestedFileName() const
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
diff --git a/src/plugins/qt4projectmanager/profileeditor.h b/src/plugins/qt4projectmanager/profileeditor.h
index 3e4150b2aea..4976ebd0810 100644
--- a/src/plugins/qt4projectmanager/profileeditor.h
+++ b/src/plugins/qt4projectmanager/profileeditor.h
@@ -39,7 +39,7 @@ class FontSettings;
class TextEditorActionHandler;
}
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
class ProFileEditorFactory;
@@ -98,6 +98,6 @@ public:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // PROFILEEDITOR_H
diff --git a/src/plugins/qt4projectmanager/profileeditorfactory.cpp b/src/plugins/qt4projectmanager/profileeditorfactory.cpp
index 21227bba9d1..5867dc6c323 100644
--- a/src/plugins/qt4projectmanager/profileeditorfactory.cpp
+++ b/src/plugins/qt4projectmanager/profileeditorfactory.cpp
@@ -39,18 +39,18 @@
#include <QCoreApplication>
-using namespace Qt4ProjectManager;
-using namespace Qt4ProjectManager::Internal;
+using namespace QmakeProjectManager;
+using namespace QmakeProjectManager::Internal;
ProFileEditorFactory::ProFileEditorFactory(Qt4Manager *manager, TextEditor::TextEditorActionHandler *handler) :
m_manager(manager),
m_actionHandler(handler)
{
- setId(Qt4ProjectManager::Constants::PROFILE_EDITOR_ID);
- setDisplayName(qApp->translate("OpenWith::Editors", Qt4ProjectManager::Constants::PROFILE_EDITOR_DISPLAY_NAME));
- addMimeType(Qt4ProjectManager::Constants::PROFILE_MIMETYPE);
- addMimeType(Qt4ProjectManager::Constants::PROINCLUDEFILE_MIMETYPE);
- addMimeType(Qt4ProjectManager::Constants::PROFEATUREFILE_MIMETYPE);
+ setId(QmakeProjectManager::Constants::PROFILE_EDITOR_ID);
+ setDisplayName(qApp->translate("OpenWith::Editors", QmakeProjectManager::Constants::PROFILE_EDITOR_DISPLAY_NAME));
+ addMimeType(QmakeProjectManager::Constants::PROFILE_MIMETYPE);
+ addMimeType(QmakeProjectManager::Constants::PROINCLUDEFILE_MIMETYPE);
+ addMimeType(QmakeProjectManager::Constants::PROFEATUREFILE_MIMETYPE);
Core::FileIconProvider::registerIconOverlayForSuffix(QtSupport::Constants::ICON_QT_PROJECT, "pro");
Core::FileIconProvider::registerIconOverlayForSuffix(QtSupport::Constants::ICON_QT_PROJECT, "pri");
diff --git a/src/plugins/qt4projectmanager/profileeditorfactory.h b/src/plugins/qt4projectmanager/profileeditorfactory.h
index 41c5e8c477f..1d50c8193ac 100644
--- a/src/plugins/qt4projectmanager/profileeditorfactory.h
+++ b/src/plugins/qt4projectmanager/profileeditorfactory.h
@@ -34,7 +34,7 @@
namespace TextEditor { class TextEditorActionHandler; }
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
class Qt4Manager;
@@ -57,6 +57,6 @@ private:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // PROFILEEDITORFACTORY_H
diff --git a/src/plugins/qt4projectmanager/profilehighlighter.cpp b/src/plugins/qt4projectmanager/profilehighlighter.cpp
index 11e5b1424c5..9552f50ecb9 100644
--- a/src/plugins/qt4projectmanager/profilehighlighter.cpp
+++ b/src/plugins/qt4projectmanager/profilehighlighter.cpp
@@ -34,7 +34,7 @@
#include <QTextDocument>
-using namespace Qt4ProjectManager::Internal;
+using namespace QmakeProjectManager::Internal;
ProFileHighlighter::ProFileHighlighter(QTextDocument *document) :
diff --git a/src/plugins/qt4projectmanager/profilehighlighter.h b/src/plugins/qt4projectmanager/profilehighlighter.h
index a7317962fd4..efe18763046 100644
--- a/src/plugins/qt4projectmanager/profilehighlighter.h
+++ b/src/plugins/qt4projectmanager/profilehighlighter.h
@@ -33,7 +33,7 @@
#include <texteditor/syntaxhighlighter.h>
#include <texteditor/codeassist/keywordscompletionassist.h>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
class ProFileHighlighter : public TextEditor::SyntaxHighlighter
@@ -56,6 +56,6 @@ private:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // PROFILEHIGHLIGHTER_H
diff --git a/src/plugins/qt4projectmanager/profilehighlighterfactory.cpp b/src/plugins/qt4projectmanager/profilehighlighterfactory.cpp
index a4b8afa8127..3ca96d15a20 100644
--- a/src/plugins/qt4projectmanager/profilehighlighterfactory.cpp
+++ b/src/plugins/qt4projectmanager/profilehighlighterfactory.cpp
@@ -31,14 +31,14 @@
#include "qt4projectmanagerconstants.h"
#include "profilehighlighter.h"
-using namespace Qt4ProjectManager::Internal;
+using namespace QmakeProjectManager::Internal;
ProFileHighlighterFactory::ProFileHighlighterFactory()
{
- setId(Qt4ProjectManager::Constants::PROFILE_EDITOR_ID);
- addMimeType(Qt4ProjectManager::Constants::PROFILE_MIMETYPE);
- addMimeType(Qt4ProjectManager::Constants::PROINCLUDEFILE_MIMETYPE);
- addMimeType(Qt4ProjectManager::Constants::PROFEATUREFILE_MIMETYPE);
+ setId(QmakeProjectManager::Constants::PROFILE_EDITOR_ID);
+ addMimeType(QmakeProjectManager::Constants::PROFILE_MIMETYPE);
+ addMimeType(QmakeProjectManager::Constants::PROINCLUDEFILE_MIMETYPE);
+ addMimeType(QmakeProjectManager::Constants::PROFEATUREFILE_MIMETYPE);
}
TextEditor::SyntaxHighlighter *ProFileHighlighterFactory::createHighlighter() const
diff --git a/src/plugins/qt4projectmanager/profilehighlighterfactory.h b/src/plugins/qt4projectmanager/profilehighlighterfactory.h
index 358a74ab2c7..3e3ecf6a7d9 100644
--- a/src/plugins/qt4projectmanager/profilehighlighterfactory.h
+++ b/src/plugins/qt4projectmanager/profilehighlighterfactory.h
@@ -32,7 +32,7 @@
#include <texteditor/ihighlighterfactory.h>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
class ProFileHighlighterFactory : public TextEditor::IHighlighterFactory
@@ -46,6 +46,6 @@ public:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // PROFILEHIGHLIGHTERFACTORY_H
diff --git a/src/plugins/qt4projectmanager/profilehoverhandler.cpp b/src/plugins/qt4projectmanager/profilehoverhandler.cpp
index 5a8587cedac..824929ae97f 100644
--- a/src/plugins/qt4projectmanager/profilehoverhandler.cpp
+++ b/src/plugins/qt4projectmanager/profilehoverhandler.cpp
@@ -38,8 +38,8 @@
#include <QTextBlock>
#include <QUrl>
-using namespace Qt4ProjectManager;
-using namespace Qt4ProjectManager::Internal;
+using namespace QmakeProjectManager;
+using namespace QmakeProjectManager::Internal;
using namespace Core;
ProFileHoverHandler::ProFileHoverHandler(QObject *parent)
diff --git a/src/plugins/qt4projectmanager/profilehoverhandler.h b/src/plugins/qt4projectmanager/profilehoverhandler.h
index a42b1b61fa4..e53566a5b67 100644
--- a/src/plugins/qt4projectmanager/profilehoverhandler.h
+++ b/src/plugins/qt4projectmanager/profilehoverhandler.h
@@ -47,7 +47,7 @@ namespace TextEditor {
class ITextEditor;
}
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
class ProFileHoverHandler : public TextEditor::BaseHoverHandler
@@ -81,6 +81,6 @@ private:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // PROFILEHOVERHANDLER_H
diff --git a/src/plugins/qt4projectmanager/qmakebuildinfo.h b/src/plugins/qt4projectmanager/qmakebuildinfo.h
index 2e5795d945a..e3803d1411c 100644
--- a/src/plugins/qt4projectmanager/qmakebuildinfo.h
+++ b/src/plugins/qt4projectmanager/qmakebuildinfo.h
@@ -37,7 +37,7 @@
#include <qtsupport/baseqtversion.h>
#include <qtsupport/qtkitinformation.h>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
class QmakeBuildInfo : public ProjectExplorer::BuildInfo
{
@@ -58,6 +58,6 @@ public:
}
};
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // QMAKEBUILDINFO_H
diff --git a/src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp b/src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp
index 82c7943dea3..fc9dd5142ce 100644
--- a/src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp
+++ b/src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp
@@ -35,7 +35,7 @@
#include <QLineEdit>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
QmakeKitConfigWidget::QmakeKitConfigWidget(ProjectExplorer::Kit *k, const ProjectExplorer::KitInformation *ki) :
@@ -88,4 +88,4 @@ void QmakeKitConfigWidget::mkspecWasChanged(const QString &text)
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
diff --git a/src/plugins/qt4projectmanager/qmakekitconfigwidget.h b/src/plugins/qt4projectmanager/qmakekitconfigwidget.h
index b5b15f69c10..592653d746e 100644
--- a/src/plugins/qt4projectmanager/qmakekitconfigwidget.h
+++ b/src/plugins/qt4projectmanager/qmakekitconfigwidget.h
@@ -36,7 +36,7 @@ QT_BEGIN_NAMESPACE
class QLineEdit;
QT_END_NAMESPACE
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
class QmakeKitConfigWidget : public ProjectExplorer::KitConfigWidget
@@ -65,6 +65,6 @@ private:
};
} // namespace Internal
-} // namespace Debugger
+} // namespace QmakeProjectManager
#endif // QT4PM_QMAKEKITCONFIGWIDGET_H
diff --git a/src/plugins/qt4projectmanager/qmakekitinformation.cpp b/src/plugins/qt4projectmanager/qmakekitinformation.cpp
index fcd668c8e52..c942e4974fe 100644
--- a/src/plugins/qt4projectmanager/qmakekitinformation.cpp
+++ b/src/plugins/qt4projectmanager/qmakekitinformation.cpp
@@ -40,7 +40,7 @@
using namespace ProjectExplorer;
using namespace Utils;
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
QmakeKitInformation::QmakeKitInformation()
{
@@ -141,4 +141,4 @@ FileName QmakeKitInformation::defaultMkspec(const Kit *k)
return version->mkspecFor(ToolChainKitInformation::toolChain(k));
}
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
diff --git a/src/plugins/qt4projectmanager/qmakekitinformation.h b/src/plugins/qt4projectmanager/qmakekitinformation.h
index c2e86e19139..6bd695c68fb 100644
--- a/src/plugins/qt4projectmanager/qmakekitinformation.h
+++ b/src/plugins/qt4projectmanager/qmakekitinformation.h
@@ -34,7 +34,7 @@
#include <projectexplorer/kitmanager.h>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
class QT4PROJECTMANAGER_EXPORT QmakeKitInformation : public ProjectExplorer::KitInformation
{
@@ -59,6 +59,6 @@ public:
static Utils::FileName defaultMkspec(const ProjectExplorer::Kit *k);
};
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // QT4PM_QMAKEKITINFORMATION_H
diff --git a/src/plugins/qt4projectmanager/qmakeparser.cpp b/src/plugins/qt4projectmanager/qmakeparser.cpp
index 4e31de957cf..61fa3e872e1 100644
--- a/src/plugins/qt4projectmanager/qmakeparser.cpp
+++ b/src/plugins/qt4projectmanager/qmakeparser.cpp
@@ -32,8 +32,8 @@
#include <projectexplorer/task.h>
#include <projectexplorer/projectexplorerconstants.h>
-using namespace Qt4ProjectManager;
-using namespace Qt4ProjectManager::Internal;
+using namespace QmakeProjectManager;
+using namespace QmakeProjectManager::Internal;
using ProjectExplorer::Task;
QMakeParser::QMakeParser() : m_error(QLatin1String("^(.+):(\\d+):\\s(.+)$"))
@@ -92,7 +92,7 @@ void QMakeParser::stdError(const QString &line)
# include "projectexplorer/outputparser_test.h"
-using namespace Qt4ProjectManager::Internal;
+using namespace QmakeProjectManager::Internal;
using namespace ProjectExplorer;
void Qt4ProjectManagerPlugin::testQmakeOutputParsers_data()
diff --git a/src/plugins/qt4projectmanager/qmakeparser.h b/src/plugins/qt4projectmanager/qmakeparser.h
index 8d6fa07a0b8..68b73aa15e3 100644
--- a/src/plugins/qt4projectmanager/qmakeparser.h
+++ b/src/plugins/qt4projectmanager/qmakeparser.h
@@ -34,7 +34,7 @@
#include <QRegExp>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
class QMakeParser : public ProjectExplorer::IOutputParser
@@ -50,6 +50,6 @@ private:
};
} // namesapce Internal
-} // namespace ProjectExplorer
+} // namespace QmakeProjectManager
#endif // QMAKEPARSER_H
diff --git a/src/plugins/qt4projectmanager/qmakeprojectimporter.cpp b/src/plugins/qt4projectmanager/qmakeprojectimporter.cpp
index f9e0176a1b8..68d92d35f18 100644
--- a/src/plugins/qt4projectmanager/qmakeprojectimporter.cpp
+++ b/src/plugins/qt4projectmanager/qmakeprojectimporter.cpp
@@ -52,7 +52,7 @@
static const Core::Id QT_IS_TEMPORARY("Qmake.TempQt");
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
QmakeProjectImporter::QmakeProjectImporter(const QString &path) :
@@ -153,10 +153,10 @@ QList<ProjectExplorer::BuildInfo *> QmakeProjectImporter::import(const Utils::Fi
QmakeBuildInfo *info = new QmakeBuildInfo(factory);
if (makefileBuildConfig.first & QtSupport::BaseQtVersion::DebugBuild) {
info->type = ProjectExplorer::BuildConfiguration::Debug;
- info->displayName = QCoreApplication::translate("Qt4ProjectManager::Internal::QmakeProjectImporter", "Debug");
+ info->displayName = QCoreApplication::translate("QmakeProjectManager::Internal::QmakeProjectImporter", "Debug");
} else {
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->buildDirectory = Utils::FileName::fromString(fi.absoluteFilePath());
@@ -169,8 +169,8 @@ QList<ProjectExplorer::BuildInfo *> QmakeProjectImporter::import(const Utils::Fi
if (result.isEmpty() && !silent)
QMessageBox::critical(Core::ICore::mainWindow(),
- QCoreApplication::translate("Qt4ProjectManager::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"),
+ QCoreApplication::translate("QmakeProjectManager::Internal::QmakeProjectImporter", "No build found in %1 matching project %2.")
.arg(importPath.toUserOutput()).arg(projectFilePath()));
return result;
@@ -251,4 +251,4 @@ ProjectExplorer::Kit *QmakeProjectImporter::createTemporaryKit(QtSupport::BaseQt
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
diff --git a/src/plugins/qt4projectmanager/qmakeprojectimporter.h b/src/plugins/qt4projectmanager/qmakeprojectimporter.h
index 4ab5be811d8..36078c62778 100644
--- a/src/plugins/qt4projectmanager/qmakeprojectimporter.h
+++ b/src/plugins/qt4projectmanager/qmakeprojectimporter.h
@@ -34,7 +34,7 @@
namespace QtSupport { class BaseQtVersion; }
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
class Qt4Project;
@@ -59,6 +59,6 @@ private:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // QMAKEPROJECTIMPORTER_H
diff --git a/src/plugins/qt4projectmanager/qmakerunconfigurationfactory.cpp b/src/plugins/qt4projectmanager/qmakerunconfigurationfactory.cpp
index 73abdded5eb..cf716fce4b3 100644
--- a/src/plugins/qt4projectmanager/qmakerunconfigurationfactory.cpp
+++ b/src/plugins/qt4projectmanager/qmakerunconfigurationfactory.cpp
@@ -31,7 +31,7 @@
#include <extensionsystem/pluginmanager.h>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
QmakeRunConfigurationFactory::QmakeRunConfigurationFactory(QObject *parent) :
ProjectExplorer::IRunConfigurationFactory(parent)
@@ -51,4 +51,4 @@ QmakeRunConfigurationFactory *QmakeRunConfigurationFactory::find(ProjectExplorer
return 0;
}
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
diff --git a/src/plugins/qt4projectmanager/qmakerunconfigurationfactory.h b/src/plugins/qt4projectmanager/qmakerunconfigurationfactory.h
index c6b6684ecc9..ddbd99416d6 100644
--- a/src/plugins/qt4projectmanager/qmakerunconfigurationfactory.h
+++ b/src/plugins/qt4projectmanager/qmakerunconfigurationfactory.h
@@ -36,7 +36,7 @@
namespace ProjectExplorer { class Node; }
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
class QT4PROJECTMANAGER_EXPORT QmakeRunConfigurationFactory : public ProjectExplorer::IRunConfigurationFactory
{
@@ -52,6 +52,6 @@ public:
static QmakeRunConfigurationFactory *find(ProjectExplorer::Target *t);
};
-} // Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // QMAKERUNCONFIGURATIONFACTORY_H
diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp
index c0e55fd5f25..c687291e14f 100644
--- a/src/plugins/qt4projectmanager/qmakestep.cpp
+++ b/src/plugins/qt4projectmanager/qmakestep.cpp
@@ -53,8 +53,8 @@
#include <QDir>
#include <QMessageBox>
-using namespace Qt4ProjectManager;
-using namespace Qt4ProjectManager::Internal;
+using namespace QmakeProjectManager;
+using namespace QmakeProjectManager::Internal;
using namespace ProjectExplorer;
using namespace Utils;
@@ -421,7 +421,7 @@ FileName QMakeStep::mkspec()
}
}
- return Qt4ProjectManager::QmakeKitInformation::effectiveMkspec(target()->kit());
+ return QmakeProjectManager::QmakeKitInformation::effectiveMkspec(target()->kit());
}
QVariantMap QMakeStep::toMap() const
diff --git a/src/plugins/qt4projectmanager/qmakestep.h b/src/plugins/qt4projectmanager/qmakestep.h
index 5eb76d86396..003258e4ce1 100644
--- a/src/plugins/qt4projectmanager/qmakestep.h
+++ b/src/plugins/qt4projectmanager/qmakestep.h
@@ -43,7 +43,7 @@ class IBuildStepFactory;
class Project;
}
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
class Qt4BuildConfiguration;
class Qt4Project;
@@ -177,6 +177,6 @@ private:
bool m_ignoreChange;
};
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // QMAKESTEP_H
diff --git a/src/plugins/qt4projectmanager/qmakestep.ui b/src/plugins/qt4projectmanager/qmakestep.ui
index aae5c1f7587..43c5828044b 100644
--- a/src/plugins/qt4projectmanager/qmakestep.ui
+++ b/src/plugins/qt4projectmanager/qmakestep.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>Qt4ProjectManager::Internal::QMakeStep</class>
- <widget class="QWidget" name="Qt4ProjectManager::Internal::QMakeStep">
+ <class>QmakeProjectManager::Internal::QMakeStep</class>
+ <widget class="QWidget" name="QmakeProjectManager::Internal::QMakeStep">
<property name="geometry">
<rect>
<x>0</x>
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
index a5e9b467136..c9cd53f5445 100644
--- a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
@@ -55,7 +55,7 @@
#include <QInputDialog>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
// --------------------------------------------------------------------
// Helpers:
@@ -725,4 +725,4 @@ bool Qt4BuildConfiguration::LastKitState::operator !=(const LastKitState &other)
return !operator ==(other);
}
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.h b/src/plugins/qt4projectmanager/qt4buildconfiguration.h
index 17e519b530c..f7458bfbc06 100644
--- a/src/plugins/qt4projectmanager/qt4buildconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.h
@@ -37,7 +37,7 @@
namespace ProjectExplorer { class FileNode; }
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
class QmakeBuildInfo;
class QMakeStep;
@@ -58,8 +58,8 @@ public:
ProjectExplorer::NamedWidget *createConfigWidget();
bool isShadowBuild() const;
- void setSubNodeBuild(Qt4ProjectManager::Qt4ProFileNode *node);
- Qt4ProjectManager::Qt4ProFileNode *subNodeBuild() const;
+ void setSubNodeBuild(QmakeProjectManager::Qt4ProFileNode *node);
+ QmakeProjectManager::Qt4ProFileNode *subNodeBuild() const;
ProjectExplorer::FileNode *fileNodeBuild() const;
void setFileNodeBuild(ProjectExplorer::FileNode *node);
@@ -148,7 +148,7 @@ private:
bool m_isEnabled;
bool m_qtVersionSupportsShadowBuilds;
QtSupport::BaseQtVersion::QmakeBuildConfigs m_qmakeBuildConfiguration;
- Qt4ProjectManager::Qt4ProFileNode *m_subNodeBuild;
+ QmakeProjectManager::Qt4ProFileNode *m_subNodeBuild;
ProjectExplorer::FileNode *m_fileNodeBuild;
friend class Internal::Qt4ProjectConfigWidget;
@@ -185,6 +185,6 @@ private:
ProjectExplorer::BuildConfiguration::BuildType type) const;
};
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // QT4BUILDCONFIGURATION_H
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index 8be72bff5b6..e44f0b56acb 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -81,22 +81,22 @@ struct FileTypeDataStorage {
static const FileTypeDataStorage fileTypeDataStorage[] = {
{ ProjectExplorer::HeaderType,
- QT_TRANSLATE_NOOP("Qt4ProjectManager::Qt4PriFileNode", "Headers"),
+ QT_TRANSLATE_NOOP("QmakeProjectManager::Qt4PriFileNode", "Headers"),
":/qt4projectmanager/images/headers.png" },
{ ProjectExplorer::SourceType,
- QT_TRANSLATE_NOOP("Qt4ProjectManager::Qt4PriFileNode", "Sources"),
+ QT_TRANSLATE_NOOP("QmakeProjectManager::Qt4PriFileNode", "Sources"),
":/qt4projectmanager/images/sources.png" },
{ ProjectExplorer::FormType,
- QT_TRANSLATE_NOOP("Qt4ProjectManager::Qt4PriFileNode", "Forms"),
+ QT_TRANSLATE_NOOP("QmakeProjectManager::Qt4PriFileNode", "Forms"),
":/qtsupport/images/forms.png" },
{ ProjectExplorer::ResourceType,
- QT_TRANSLATE_NOOP("Qt4ProjectManager::Qt4PriFileNode", "Resources"),
+ QT_TRANSLATE_NOOP("QmakeProjectManager::Qt4PriFileNode", "Resources"),
":/qtsupport/images/qt_qrc.png" },
{ ProjectExplorer::QMLType,
- QT_TRANSLATE_NOOP("Qt4ProjectManager::Qt4PriFileNode", "QML"),
+ QT_TRANSLATE_NOOP("QmakeProjectManager::Qt4PriFileNode", "QML"),
":/qtsupport/images/qml.png" },
{ ProjectExplorer::UnknownFileType,
- QT_TRANSLATE_NOOP("Qt4ProjectManager::Qt4PriFileNode", "Other files"),
+ QT_TRANSLATE_NOOP("QmakeProjectManager::Qt4PriFileNode", "Other files"),
":/qt4projectmanager/images/unknown.png" }
};
@@ -143,7 +143,7 @@ Qt4NodeStaticData::Qt4NodeStaticData()
overlayIcon, desiredSize);
QIcon folderIcon;
folderIcon.addPixmap(folderPixmap);
- const QString desc = Qt4ProjectManager::Qt4PriFileNode::tr(fileTypeDataStorage[i].typeName);
+ const QString desc = QmakeProjectManager::Qt4PriFileNode::tr(fileTypeDataStorage[i].typeName);
fileTypeData.push_back(Qt4NodeStaticData::FileTypeData(fileTypeDataStorage[i].type,
desc, folderIcon));
}
@@ -167,10 +167,10 @@ static void clearQt4NodeStaticData()
enum { debug = 0 };
-using namespace Qt4ProjectManager;
-using namespace Qt4ProjectManager::Internal;
+using namespace QmakeProjectManager;
+using namespace QmakeProjectManager::Internal;
-Qt4PriFile::Qt4PriFile(Qt4ProjectManager::Qt4PriFileNode *qt4PriFile)
+Qt4PriFile::Qt4PriFile(QmakeProjectManager::Qt4PriFileNode *qt4PriFile)
: IDocument(qt4PriFile), m_priFile(qt4PriFile)
{
setFilePath(m_priFile->path());
@@ -196,7 +196,7 @@ QString Qt4PriFile::suggestedFileName() const
QString Qt4PriFile::mimeType() const
{
- return QLatin1String(Qt4ProjectManager::Constants::PROFILE_MIMETYPE);
+ return QLatin1String(QmakeProjectManager::Constants::PROFILE_MIMETYPE);
}
bool Qt4PriFile::isModified() const
@@ -231,7 +231,7 @@ bool Qt4PriFile::reload(QString *errorString, ReloadFlag flag, ChangeType type)
Implements abstract ProjectNode class
*/
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
Qt4PriFileNode::Qt4PriFileNode(Qt4Project *project, Qt4ProFileNode* qt4ProFileNode, const QString &filePath)
: ProjectNode(filePath),
@@ -385,7 +385,7 @@ struct InternalNode
}
// Makes the projectNode's subtree below the given folder match this internal node's subtree
- void updateSubFolders(Qt4ProjectManager::Qt4PriFileNode *projectNode, ProjectExplorer::FolderNode *folder)
+ void updateSubFolders(QmakeProjectManager::Qt4PriFileNode *projectNode, ProjectExplorer::FolderNode *folder)
{
updateFiles(projectNode, folder, type);
@@ -476,7 +476,7 @@ struct InternalNode
}
// Makes the folder's files match this internal node's file list
- void updateFiles(Qt4ProjectManager::Qt4PriFileNode *projectNode, FolderNode *folder, FileType type)
+ void updateFiles(QmakeProjectManager::Qt4PriFileNode *projectNode, FolderNode *folder, FileType type)
{
QList<FileNode*> existingFileNodes;
foreach (FileNode *fileNode, folder->fileNodes()) {
@@ -1394,7 +1394,7 @@ QSet<Utils::FileName> Qt4PriFileNode::filterFilesRecursiveEnumerata(ProjectExplo
return result;
}
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
static Qt4ProjectType proFileTemplateTypeToProjectType(ProFileEvaluator::TemplateType type)
{
diff --git a/src/plugins/qt4projectmanager/qt4nodes.h b/src/plugins/qt4projectmanager/qt4nodes.h
index c7b9d4890a4..a38d1f25738 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.h
+++ b/src/plugins/qt4projectmanager/qt4nodes.h
@@ -63,7 +63,7 @@ class RunConfiguration;
class Project;
}
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
class Qt4BuildConfiguration;
class Qt4ProFileNode;
class Qt4Project;
@@ -222,7 +222,7 @@ private:
bool m_includedInExactParse;
// managed by Qt4ProFileNode
- friend class Qt4ProjectManager::Qt4ProFileNode;
+ friend class QmakeProjectManager::Qt4ProFileNode;
friend class Internal::Qt4PriFile; // for scheduling updates on modified
// internal temporary subtree representation
friend struct Internal::InternalNode;
@@ -258,19 +258,19 @@ public:
Qt4NodesWatcher(QObject *parent = 0);
signals:
- void projectTypeChanged(Qt4ProjectManager::Qt4ProFileNode *projectNode,
- const Qt4ProjectManager::Qt4ProjectType oldType,
- const Qt4ProjectManager::Qt4ProjectType newType);
+ void projectTypeChanged(QmakeProjectManager::Qt4ProFileNode *projectNode,
+ const QmakeProjectManager::Qt4ProjectType oldType,
+ const QmakeProjectManager::Qt4ProjectType newType);
void variablesChanged(Qt4ProFileNode *projectNode,
const QHash<Qt4Variable, QStringList> &oldValues,
const QHash<Qt4Variable, QStringList> &newValues);
- void proFileUpdated(Qt4ProjectManager::Qt4ProFileNode *projectNode, bool success, bool parseInProgress);
+ void proFileUpdated(QmakeProjectManager::Qt4ProFileNode *projectNode, bool success, bool parseInProgress);
private:
// let them emit signals
- friend class Qt4ProjectManager::Qt4ProFileNode;
+ friend class QmakeProjectManager::Qt4ProFileNode;
friend class Qt4PriFileNode;
};
@@ -462,6 +462,6 @@ private:
QtSupport::ProFileReader *m_readerCumulative;
};
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // QT4NODES_H
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index 0d42df92670..3812a8e8b6a 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -64,8 +64,8 @@
#include <QFileSystemWatcher>
#include <QMessageBox>
-using namespace Qt4ProjectManager;
-using namespace Qt4ProjectManager::Internal;
+using namespace QmakeProjectManager;
+using namespace QmakeProjectManager::Internal;
using namespace ProjectExplorer;
enum { debug = 0 };
@@ -111,7 +111,7 @@ void updateBoilerPlateCodeFiles(const AbstractMobileApp *app, const QString &pro
} // namespace
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
class Qt4ProjectFile : public Core::IDocument
@@ -147,8 +147,8 @@ class CentralizedFolderWatcher : public QObject
public:
CentralizedFolderWatcher(Qt4Project *parent);
~CentralizedFolderWatcher();
- void watchFolders(const QList<QString> &folders, Qt4ProjectManager::Qt4PriFileNode *node);
- void unwatchFolders(const QList<QString> &folders, Qt4ProjectManager::Qt4PriFileNode *node);
+ void watchFolders(const QList<QString> &folders, QmakeProjectManager::Qt4PriFileNode *node);
+ void unwatchFolders(const QList<QString> &folders, QmakeProjectManager::Qt4PriFileNode *node);
private slots:
void folderChanged(const QString &folder);
@@ -159,7 +159,7 @@ private:
Qt4Project *m_project;
QSet<QString> recursiveDirs(const QString &folder);
QFileSystemWatcher m_watcher;
- QMultiMap<QString, Qt4ProjectManager::Qt4PriFileNode *> m_map;
+ QMultiMap<QString, QmakeProjectManager::Qt4PriFileNode *> m_map;
QSet<QString> m_recursiveWatchedFolders;
QTimer m_compressTimer;
@@ -269,7 +269,7 @@ void ProjectFilesVisitor::visitFolderNode(FolderNode *folderNode)
namespace Internal {
Qt4ProjectFile::Qt4ProjectFile(const QString &filePath, QObject *parent)
: Core::IDocument(parent),
- m_mimeType(QLatin1String(Qt4ProjectManager::Constants::PROFILE_MIMETYPE))
+ m_mimeType(QLatin1String(QmakeProjectManager::Constants::PROFILE_MIMETYPE))
{
setFilePath(filePath);
}
@@ -343,7 +343,7 @@ Qt4Project::Qt4Project(Qt4Manager *manager, const QString& fileName) :
m_centralizedFolderWatcher(0),
m_activeTarget(0)
{
- setProjectContext(Core::Context(Qt4ProjectManager::Constants::PROJECT_ID));
+ setProjectContext(Core::Context(QmakeProjectManager::Constants::PROJECT_ID));
setProjectLanguages(Core::Context(ProjectExplorer::Constants::LANG_CXX));
m_asyncUpdateTimer.setSingleShot(true);
@@ -407,8 +407,8 @@ bool Qt4Project::fromMap(const QVariantMap &map)
updateCodeModels();
// We have the profile nodes now, so we know the runconfigs!
- connect(m_nodesWatcher, SIGNAL(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool,bool)),
- this, SIGNAL(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool,bool)));
+ connect(m_nodesWatcher, SIGNAL(proFileUpdated(QmakeProjectManager::Qt4ProFileNode*,bool,bool)),
+ this, SIGNAL(proFileUpdated(QmakeProjectManager::Qt4ProFileNode*,bool,bool)));
// Now we emit update once :)
m_rootProjectNode->emitProFileUpdatedRecursive();
@@ -1216,7 +1216,7 @@ QSet<QString> CentralizedFolderWatcher::recursiveDirs(const QString &folder)
return result;
}
-void CentralizedFolderWatcher::watchFolders(const QList<QString> &folders, Qt4ProjectManager::Qt4PriFileNode *node)
+void CentralizedFolderWatcher::watchFolders(const QList<QString> &folders, QmakeProjectManager::Qt4PriFileNode *node)
{
if (debugCFW)
qDebug()<<"CFW::watchFolders()"<<folders<<"for node"<<node->path();
@@ -1241,7 +1241,7 @@ void CentralizedFolderWatcher::watchFolders(const QList<QString> &folders, Qt4Pr
}
}
-void CentralizedFolderWatcher::unwatchFolders(const QList<QString> &folders, Qt4ProjectManager::Qt4PriFileNode *node)
+void CentralizedFolderWatcher::unwatchFolders(const QList<QString> &folders, QmakeProjectManager::Qt4PriFileNode *node)
{
if (debugCFW)
qDebug()<<"CFW::unwatchFolders()"<<folders<<"for node"<<node->path();
@@ -1265,7 +1265,7 @@ void CentralizedFolderWatcher::unwatchFolders(const QList<QString> &folders, Qt4
// So the rwf is a subdirectory of a folder we aren't watching
// but maybe someone else wants us to watch
bool needToWatch = false;
- QMultiMap<QString, Qt4ProjectManager::Qt4PriFileNode *>::const_iterator it, end;
+ QMultiMap<QString, QmakeProjectManager::Qt4PriFileNode *>::const_iterator it, end;
end = m_map.constEnd();
for (it = m_map.constEnd(); it != end; ++it) {
if (rwf.startsWith(it.key())) {
@@ -1314,12 +1314,12 @@ void CentralizedFolderWatcher::delayedFolderChanged(const QString &folder)
while (true) {
if (!dir.endsWith(slash))
dir.append(slash);
- QList<Qt4ProjectManager::Qt4PriFileNode *> nodes = m_map.values(dir);
+ QList<QmakeProjectManager::Qt4PriFileNode *> nodes = m_map.values(dir);
if (!nodes.isEmpty()) {
// Collect all the files
QSet<Utils::FileName> newFiles;
newFiles += Qt4PriFileNode::recursiveEnumerate(folder);
- foreach (Qt4ProjectManager::Qt4PriFileNode *node, nodes) {
+ foreach (QmakeProjectManager::Qt4PriFileNode *node, nodes) {
newOrRemovedFiles = newOrRemovedFiles
|| node->folderChanged(folder, newFiles);
}
@@ -1635,6 +1635,6 @@ KitMatcher *Qt4Project::createRequiredKitMatcher() const
return new QtSupport::QtVersionKitMatcher;
}
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#include "qt4project.moc"
diff --git a/src/plugins/qt4projectmanager/qt4project.h b/src/plugins/qt4projectmanager/qt4project.h
index 67547d83204..ecd1d69a3c0 100644
--- a/src/plugins/qt4projectmanager/qt4project.h
+++ b/src/plugins/qt4projectmanager/qt4project.h
@@ -48,7 +48,7 @@ QT_END_NAMESPACE
namespace ProjectExplorer { class DeploymentData; }
namespace QtSupport { class ProFileReader; }
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
class MakeStep;
class QMakeStep;
class Qt4BuildConfiguration;
@@ -108,7 +108,7 @@ public:
void destroyProFileReader(QtSupport::ProFileReader *reader);
/// \internal
- void scheduleAsyncUpdate(Qt4ProjectManager::Qt4ProFileNode *node);
+ void scheduleAsyncUpdate(QmakeProjectManager::Qt4ProFileNode *node);
/// \internal
void incrementPendingEvaluateFutures();
/// \internal
@@ -145,7 +145,7 @@ public:
ProjectExplorer::KitMatcher *createRequiredKitMatcher() const;
signals:
- void proFileUpdated(Qt4ProjectManager::Qt4ProFileNode *node, bool, bool);
+ void proFileUpdated(QmakeProjectManager::Qt4ProFileNode *node, bool, bool);
void buildDirectoryInitialized();
void proFilesEvaluated();
@@ -222,7 +222,7 @@ private:
friend class Qt4Manager; // to schedule a async update if the unconfigured settings change
};
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // QT4PROJECT_H
diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
index 4c6e41636ce..aa70f654c55 100644
--- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
@@ -39,8 +39,8 @@
#include <utils/detailswidget.h>
-using namespace Qt4ProjectManager;
-using namespace Qt4ProjectManager::Internal;
+using namespace QmakeProjectManager;
+using namespace QmakeProjectManager::Internal;
using namespace ProjectExplorer;
Qt4ProjectConfigWidget::Qt4ProjectConfigWidget(Qt4BuildConfiguration *bc)
diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.h b/src/plugins/qt4projectmanager/qt4projectconfigwidget.h
index 327d75c8c2c..90040f68b7c 100644
--- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.h
+++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.h
@@ -40,7 +40,7 @@ namespace Utils {
class DetailsWidget;
}
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
class Qt4BuildConfiguration;
class Qt4ProFileNode;
@@ -80,6 +80,6 @@ private:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // QT4PROJECTCONFIGWIDGET_H
diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.ui b/src/plugins/qt4projectmanager/qt4projectconfigwidget.ui
index 3ec29088cda..cef43d4129b 100644
--- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.ui
+++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>Qt4ProjectManager::Internal::Qt4ProjectConfigWidget</class>
- <widget class="QWidget" name="Qt4ProjectManager::Internal::Qt4ProjectConfigWidget">
+ <class>QmakeProjectManager::Internal::Qt4ProjectConfigWidget</class>
+ <widget class="QWidget" name="QmakeProjectManager::Internal::Qt4ProjectConfigWidget">
<property name="geometry">
<rect>
<x>0</x>
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.cpp b/src/plugins/qt4projectmanager/qt4projectmanager.cpp
index 54ce6f8bce5..bd8e07a1129 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.cpp
@@ -52,8 +52,8 @@
#include <QMessageBox>
using namespace ProjectExplorer;
-using namespace Qt4ProjectManager;
-using namespace Qt4ProjectManager::Internal;
+using namespace QmakeProjectManager;
+using namespace QmakeProjectManager::Internal;
// Known file types of a Qt 4 project
static const char *qt4FileTypes[] = {
@@ -93,7 +93,7 @@ void Qt4Manager::notifyChanged(const QString &name)
QString Qt4Manager::mimeType() const
{
- return QLatin1String(Qt4ProjectManager::Constants::PROFILE_MIMETYPE);
+ return QLatin1String(QmakeProjectManager::Constants::PROFILE_MIMETYPE);
}
ProjectExplorer::Project *Qt4Manager::openProject(const QString &fileName, QString *errorString)
@@ -164,7 +164,7 @@ void Qt4Manager::addLibrary(const QString &fileName, ProFileEditorWidget *editor
editable = editor->editor();
} else {
editable = qobject_cast<TextEditor::BaseTextEditor *>
- (Core::EditorManager::openEditor(fileName, Qt4ProjectManager::Constants::PROFILE_EDITOR_ID,
+ (Core::EditorManager::openEditor(fileName, QmakeProjectManager::Constants::PROFILE_EDITOR_ID,
Core::EditorManager::DoNotMakeVisible));
}
if (!editable)
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.h b/src/plugins/qt4projectmanager/qt4projectmanager.h
index 9040c63238b..82df6646b67 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.h
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.h
@@ -44,7 +44,7 @@ class Node;
class ToolChain;
}
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
class Qt4Builder;
@@ -109,6 +109,6 @@ private:
ProjectExplorer::FileNode *m_contextFile;
};
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // QT4PROJECTMANAGER_H
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h b/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
index 7d922b37ca1..09cbc7fc43b 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
@@ -32,7 +32,7 @@
#include <QtGlobal>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Constants {
// Contexts
@@ -82,7 +82,7 @@ const char QMAKEVAR_QUICK1_DEBUG[] = "CONFIG+=declarative_debug";
const char QMAKEVAR_QUICK2_DEBUG[] = "CONFIG+=qml_debug";
} // namespace Constants
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // QT4PROJECTMANAGERCONSTANTS_H
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
index cc4c14588bb..e8bd3f8e758 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
@@ -75,8 +75,8 @@
#include <QtPlugin>
-using namespace Qt4ProjectManager::Internal;
-using namespace Qt4ProjectManager;
+using namespace QmakeProjectManager::Internal;
+using namespace QmakeProjectManager;
using namespace ProjectExplorer;
Qt4ProjectManagerPlugin::Qt4ProjectManagerPlugin()
@@ -99,7 +99,7 @@ Qt4ProjectManagerPlugin::~Qt4ProjectManagerPlugin()
bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString *errorMessage)
{
Q_UNUSED(arguments)
- const Core::Context projectContext(Qt4ProjectManager::Constants::PROJECT_ID);
+ const Core::Context projectContext(QmakeProjectManager::Constants::PROJECT_ID);
Core::Context projecTreeContext(ProjectExplorer::Constants::C_PROJECT_TREE);
if (!Core::MimeDatabase::addMimeTypes(QLatin1String(":qt4projectmanager/Qt4ProjectManager.mimetypes.xml"), errorMessage))
@@ -255,9 +255,9 @@ bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString *
connect(m_projectExplorer, SIGNAL(currentNodeChanged(ProjectExplorer::Node*,ProjectExplorer::Project*)),
this, SLOT(updateContextActions(ProjectExplorer::Node*,ProjectExplorer::Project*)));
- Core::ActionContainer *contextMenu = Core::ActionManager::createMenu(Qt4ProjectManager::Constants::M_CONTEXT);
+ Core::ActionContainer *contextMenu = Core::ActionManager::createMenu(QmakeProjectManager::Constants::M_CONTEXT);
- Core::Context proFileEditorContext = Core::Context(Qt4ProjectManager::Constants::C_PROFILEEDITOR);
+ Core::Context proFileEditorContext = Core::Context(QmakeProjectManager::Constants::C_PROFILEEDITOR);
command = Core::ActionManager::command(TextEditor::Constants::JUMP_TO_FILE_UNDER_CURSOR);
contextMenu->addAction(command);
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h
index 4fd1e5dbc29..935bd9be849 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.h
@@ -46,7 +46,7 @@ class Target;
}
namespace Utils { class ParameterAction; }
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
class Qt4Manager;
class QtVersionManager;
@@ -104,6 +104,6 @@ private:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // QT4PROJECTMANAGERPLUGIN_H
diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
index 606371886ca..1266a5425a1 100644
--- a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
@@ -55,8 +55,8 @@
#include <QFileInfo>
#include <QDir>
-using namespace Qt4ProjectManager::Internal;
-using namespace Qt4ProjectManager;
+using namespace QmakeProjectManager::Internal;
+using namespace QmakeProjectManager;
using ProjectExplorer::LocalApplicationRunConfiguration;
using Utils::PersistentSettingsReader;
using Utils::PersistentSettingsWriter;
@@ -127,7 +127,7 @@ QString Qt4RunConfiguration::disabledReason() const
return QString();
}
-void Qt4RunConfiguration::proFileUpdated(Qt4ProjectManager::Qt4ProFileNode *pro, bool success, bool parseInProgress)
+void Qt4RunConfiguration::proFileUpdated(QmakeProjectManager::Qt4ProFileNode *pro, bool success, bool parseInProgress)
{
ProjectExplorer::LocalEnvironmentAspect *aspect
= extraAspect<ProjectExplorer::LocalEnvironmentAspect>();
@@ -162,8 +162,8 @@ void Qt4RunConfiguration::ctor()
QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(target()->kit());
m_forcedGuiMode = (version && version->type() == QLatin1String(QtSupport::Constants::SIMULATORQT));
- connect(target()->project(), SIGNAL(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool,bool)),
- this, SLOT(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool,bool)));
+ connect(target()->project(), SIGNAL(proFileUpdated(QmakeProjectManager::Qt4ProFileNode*,bool,bool)),
+ this, SLOT(proFileUpdated(QmakeProjectManager::Qt4ProFileNode*,bool,bool)));
connect(target(), SIGNAL(kitChanged()),
this, SLOT(kitChanged()));
}
diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.h b/src/plugins/qt4projectmanager/qt4runconfiguration.h
index 1527a4b5240..6208cfc704c 100644
--- a/src/plugins/qt4projectmanager/qt4runconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt4runconfiguration.h
@@ -51,7 +51,7 @@ class PathChooser;
class DetailsWidget;
}
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
class Qt4Project;
class Qt4ProFileNode;
@@ -108,7 +108,7 @@ signals:
private slots:
void kitChanged();
- void proFileUpdated(Qt4ProjectManager::Qt4ProFileNode *pro, bool success, bool parseInProgress);
+ void proFileUpdated(QmakeProjectManager::Qt4ProFileNode *pro, bool success, bool parseInProgress);
protected:
Qt4RunConfiguration(ProjectExplorer::Target *parent, Qt4RunConfiguration *source);
@@ -211,6 +211,6 @@ private:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // QT4RUNCONFIGURATION_H
diff --git a/src/plugins/qt4projectmanager/qtmodulesinfo.cpp b/src/plugins/qt4projectmanager/qtmodulesinfo.cpp
index 7529b6d41ab..4c303d0d44a 100644
--- a/src/plugins/qt4projectmanager/qtmodulesinfo.cpp
+++ b/src/plugins/qt4projectmanager/qtmodulesinfo.cpp
@@ -32,7 +32,7 @@
#include <QString>
#include <QCoreApplication>
-using namespace Qt4ProjectManager::Internal;
+using namespace QmakeProjectManager::Internal;
struct item
{
diff --git a/src/plugins/qt4projectmanager/qtmodulesinfo.h b/src/plugins/qt4projectmanager/qtmodulesinfo.h
index ceedb6aaa62..ffb41b655f3 100644
--- a/src/plugins/qt4projectmanager/qtmodulesinfo.h
+++ b/src/plugins/qt4projectmanager/qtmodulesinfo.h
@@ -31,7 +31,7 @@
#include <QStringList>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
class QtModulesInfo
@@ -44,6 +44,6 @@ public:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // QTMODULESINFO_H
diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp
index 49f3f129716..f4c20232152 100644
--- a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp
+++ b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp
@@ -40,7 +40,7 @@
#include <utils/fileutils.h>
#include <utils/qtcassert.h>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
AbstractGeneratedFileInfo::AbstractGeneratedFileInfo()
: fileType(ExtendedFile)
@@ -421,4 +421,4 @@ void AbstractMobileApp::insertParameter(QString &line, const QString ¶meter)
QLatin1Char('(') + parameter + QLatin1Char(')'));
}
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.h b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.h
index 05829462d0f..7aa9d79b5b7 100644
--- a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.h
+++ b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.h
@@ -40,7 +40,7 @@
QT_FORWARD_DECLARE_CLASS(QTextStream)
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
/// \internal
struct
@@ -177,6 +177,6 @@ private:
ScreenOrientation m_orientation;
};
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // ABSTRACTMOBILEAPP_H
diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
index 12d0ea4215a..0e13164ce33 100644
--- a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
@@ -44,7 +44,7 @@
using namespace ProjectExplorer;
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
AbstractMobileAppWizardDialog::AbstractMobileAppWizardDialog(QWidget *parent,
const QtSupport::QtVersionNumber &minimumQtVersionNumber,
@@ -244,4 +244,4 @@ void AbstractMobileAppWizard::useProjectPath(const QString &projectName,
projectPathChanged(app()->path(AbstractMobileApp::AppPro));
}
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.h b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.h
index 4aa8111e99b..c5f6bb81411 100644
--- a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.h
+++ b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.h
@@ -40,7 +40,7 @@ class QtVersionNumber;
class QtVersionManager;
} // QtSupport
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
class AbstractMobileApp;
@@ -117,6 +117,6 @@ private:
QString *errorMessage) const = 0;
};
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // ABSTRACTMOBILEAPPWIZARD_H
diff --git a/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp b/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp
index d694117074d..b3dc87af80a 100644
--- a/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp
@@ -49,7 +49,7 @@ static const char mainCppC[] =
static const char mainSourceFileC[] = "main";
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
ConsoleAppWizard::ConsoleAppWizard()
@@ -105,4 +105,4 @@ Core::GeneratedFiles
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/consoleappwizard.h b/src/plugins/qt4projectmanager/wizards/consoleappwizard.h
index 1c2faa409a7..56301b0932c 100644
--- a/src/plugins/qt4projectmanager/wizards/consoleappwizard.h
+++ b/src/plugins/qt4projectmanager/wizards/consoleappwizard.h
@@ -32,7 +32,7 @@
#include "qtwizard.h"
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
class ModulesPage;
@@ -53,6 +53,6 @@ protected:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // CONSOLEAPPWIZARD_H
diff --git a/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.cpp
index 1d8ea43bef4..b3c5db90863 100644
--- a/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.cpp
+++ b/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.cpp
@@ -32,7 +32,7 @@
#include <QDebug>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
ConsoleAppWizardDialog::ConsoleAppWizardDialog(const QString &templateName,
@@ -70,4 +70,4 @@ QtProjectParameters ConsoleAppWizardDialog::parameters() const
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.h b/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.h
index 70e5964e73b..8c3bf3e9ef2 100644
--- a/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.h
+++ b/src/plugins/qt4projectmanager/wizards/consoleappwizarddialog.h
@@ -32,7 +32,7 @@
#include "qtwizard.h"
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
struct QtProjectParameters;
@@ -50,6 +50,6 @@ public:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // CONSOLEAPPWIZARDDIALOG_H
diff --git a/src/plugins/qt4projectmanager/wizards/emptyprojectwizard.cpp b/src/plugins/qt4projectmanager/wizards/emptyprojectwizard.cpp
index 3da4e017516..514a9c67fe3 100644
--- a/src/plugins/qt4projectmanager/wizards/emptyprojectwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/emptyprojectwizard.cpp
@@ -36,7 +36,7 @@
#include <QCoreApplication>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
EmptyProjectWizard::EmptyProjectWizard()
@@ -75,4 +75,4 @@ Core::GeneratedFiles
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/emptyprojectwizard.h b/src/plugins/qt4projectmanager/wizards/emptyprojectwizard.h
index e0d4fb9ce11..ec1684cbe85 100644
--- a/src/plugins/qt4projectmanager/wizards/emptyprojectwizard.h
+++ b/src/plugins/qt4projectmanager/wizards/emptyprojectwizard.h
@@ -32,7 +32,7 @@
#include "qtwizard.h"
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
class EmptyProjectWizard : public QtWizard
@@ -50,6 +50,6 @@ private:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // EMPTYPROJECTWIZARD_H
diff --git a/src/plugins/qt4projectmanager/wizards/emptyprojectwizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/emptyprojectwizarddialog.cpp
index 46d8e0864a9..574bc2e053d 100644
--- a/src/plugins/qt4projectmanager/wizards/emptyprojectwizarddialog.cpp
+++ b/src/plugins/qt4projectmanager/wizards/emptyprojectwizarddialog.cpp
@@ -30,7 +30,7 @@
#include "emptyprojectwizarddialog.h"
#include <projectexplorer/projectexplorerconstants.h>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
EmptyProjectWizardDialog::EmptyProjectWizardDialog(const QString &templateName,
@@ -60,4 +60,4 @@ QtProjectParameters EmptyProjectWizardDialog::parameters() const
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/emptyprojectwizarddialog.h b/src/plugins/qt4projectmanager/wizards/emptyprojectwizarddialog.h
index a1da9bf76f4..05bfa502a3e 100644
--- a/src/plugins/qt4projectmanager/wizards/emptyprojectwizarddialog.h
+++ b/src/plugins/qt4projectmanager/wizards/emptyprojectwizarddialog.h
@@ -32,7 +32,7 @@
#include "qtwizard.h"
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
struct QtProjectParameters;
@@ -50,6 +50,6 @@ public:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // EMPTYPROJECTWIZARDDIALOG_H
diff --git a/src/plugins/qt4projectmanager/wizards/filespage.cpp b/src/plugins/qt4projectmanager/wizards/filespage.cpp
index 25788eb87f2..ff0127c8638 100644
--- a/src/plugins/qt4projectmanager/wizards/filespage.cpp
+++ b/src/plugins/qt4projectmanager/wizards/filespage.cpp
@@ -34,7 +34,7 @@
#include <QLabel>
#include <QLayout>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
FilesPage::FilesPage(QWidget *parent) :
@@ -196,4 +196,4 @@ void FilesPage::setClassTypeComboVisible(bool v)
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/filespage.h b/src/plugins/qt4projectmanager/wizards/filespage.h
index 6a76376f48c..6b63d942687 100644
--- a/src/plugins/qt4projectmanager/wizards/filespage.h
+++ b/src/plugins/qt4projectmanager/wizards/filespage.h
@@ -40,7 +40,7 @@ namespace Utils {
class NewClassWidget;
} // namespace Utils
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
class FilesPage : public QWizardPage
@@ -88,6 +88,6 @@ private:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // FILESPAGE_H
diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp b/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
index 53b0defe693..aaa1f95abcf 100644
--- a/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
@@ -69,7 +69,7 @@ static inline QStringList baseClasses()
return rc;
}
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
GuiAppWizard::GuiAppWizard(bool isMobile)
@@ -269,4 +269,4 @@ bool GuiAppWizard::parametrizeTemplate(const QString &templatePath, const QStrin
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizard.h b/src/plugins/qt4projectmanager/wizards/guiappwizard.h
index 80214d4de9d..b52f74817ce 100644
--- a/src/plugins/qt4projectmanager/wizards/guiappwizard.h
+++ b/src/plugins/qt4projectmanager/wizards/guiappwizard.h
@@ -32,7 +32,7 @@
#include "qtwizard.h"
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
struct GuiAppParameters;
@@ -59,6 +59,6 @@ private:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // GUIAPPWIZARD_H
diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp
index aa7d1b47fd3..cf15d1f2fa2 100644
--- a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp
+++ b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp
@@ -35,7 +35,7 @@
#include <projectexplorer/projectexplorerconstants.h>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
GuiAppParameters::GuiAppParameters()
@@ -124,4 +124,4 @@ GuiAppParameters GuiAppWizardDialog::parameters() const
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.h b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.h
index 1f7e2363997..42a46a9b88b 100644
--- a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.h
+++ b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.h
@@ -32,7 +32,7 @@
#include "qtwizard.h"
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
struct QtProjectParameters;
@@ -77,6 +77,6 @@ private:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // GUIAPPWIZARDDIALOG_H
diff --git a/src/plugins/qt4projectmanager/wizards/html5app.cpp b/src/plugins/qt4projectmanager/wizards/html5app.cpp
index 929e59ff1d2..53187641d14 100644
--- a/src/plugins/qt4projectmanager/wizards/html5app.cpp
+++ b/src/plugins/qt4projectmanager/wizards/html5app.cpp
@@ -38,7 +38,7 @@
#include <coreplugin/icore.h>
#endif // CREATORLESSTEST
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
const QString appViewerBaseName(QLatin1String("html5applicationviewer"));
@@ -192,7 +192,7 @@ QByteArray Html5App::appViewerCppFileCode(QString *errorMessage) const
QFile touchNavigavigationFile(touchNavigavigationDir + QLatin1String(touchNavigavigationFiles[i]));
if (!touchNavigavigationFile.open(QIODevice::ReadOnly)) {
if (errorMessage)
- *errorMessage = QCoreApplication::translate("Qt4ProjectManager::AbstractMobileApp",
+ *errorMessage = QCoreApplication::translate("QmakeProjectManager::AbstractMobileApp",
"Could not open template file '%1'.").arg(QLatin1String(touchNavigavigationFiles[i]));
return QByteArray();
}
@@ -213,7 +213,7 @@ QByteArray Html5App::appViewerCppFileCode(QString *errorMessage) const
QFile appViewerCppFile(path(AppViewerCppOrigin));
if (!appViewerCppFile.open(QIODevice::ReadOnly)) {
if (errorMessage)
- *errorMessage = QCoreApplication::translate("Qt4ProjectManager::AbstractMobileApp",
+ *errorMessage = QCoreApplication::translate("QmakeProjectManager::AbstractMobileApp",
"Could not open template file '%1'.").arg(path(AppViewerCppOrigin));
return QByteArray();
}
@@ -314,4 +314,4 @@ QList<DeploymentFolder> Html5App::deploymentFolders() const
const int Html5App::StubVersion = 12;
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/html5app.h b/src/plugins/qt4projectmanager/wizards/html5app.h
index 61076255bc8..e1ca1794519 100644
--- a/src/plugins/qt4projectmanager/wizards/html5app.h
+++ b/src/plugins/qt4projectmanager/wizards/html5app.h
@@ -32,7 +32,7 @@
#include "abstractmobileapp.h"
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
struct Html5AppGeneratedFileInfo : public AbstractGeneratedFileInfo
@@ -112,6 +112,6 @@ private:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // HTML5APP_H
diff --git a/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp b/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp
index 854377dd17e..12cd8307afc 100644
--- a/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp
@@ -41,7 +41,7 @@
#include <QIcon>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
class Html5AppWizardDialog : public AbstractMobileAppWizardDialog
@@ -147,6 +147,6 @@ AbstractMobileAppWizardDialog *Html5AppWizard::wizardDialog() const
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#include "html5appwizard.moc"
diff --git a/src/plugins/qt4projectmanager/wizards/html5appwizard.h b/src/plugins/qt4projectmanager/wizards/html5appwizard.h
index 908a1aece60..d82ce8f6a45 100644
--- a/src/plugins/qt4projectmanager/wizards/html5appwizard.h
+++ b/src/plugins/qt4projectmanager/wizards/html5appwizard.h
@@ -32,7 +32,7 @@
#include "abstractmobileappwizard.h"
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
class Html5AppWizard : public AbstractMobileAppWizard
@@ -59,6 +59,6 @@ private:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // HTML5APPWIZARD_H
diff --git a/src/plugins/qt4projectmanager/wizards/html5appwizardpages.cpp b/src/plugins/qt4projectmanager/wizards/html5appwizardpages.cpp
index d19c2b84de7..45c7278efed 100644
--- a/src/plugins/qt4projectmanager/wizards/html5appwizardpages.cpp
+++ b/src/plugins/qt4projectmanager/wizards/html5appwizardpages.cpp
@@ -30,7 +30,7 @@
#include "html5appwizardpages.h"
#include "ui_html5appwizardsourcespage.h"
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
class Html5AppWizardOptionsPagePrivate
@@ -103,4 +103,4 @@ void Html5AppWizardOptionsPage::setLineEditsEnabled()
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/html5appwizardpages.h b/src/plugins/qt4projectmanager/wizards/html5appwizardpages.h
index 87b7c2a5028..c90ecadb1c1 100644
--- a/src/plugins/qt4projectmanager/wizards/html5appwizardpages.h
+++ b/src/plugins/qt4projectmanager/wizards/html5appwizardpages.h
@@ -33,7 +33,7 @@
#include <QWizardPage>
#include "html5app.h"
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
class Html5AppWizardOptionsPage : public QWizardPage
@@ -58,6 +58,6 @@ private:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // HTML5APPWIZARDPAGES_H
diff --git a/src/plugins/qt4projectmanager/wizards/html5appwizardsourcespage.ui b/src/plugins/qt4projectmanager/wizards/html5appwizardsourcespage.ui
index 65d58541702..b2a10f38773 100644
--- a/src/plugins/qt4projectmanager/wizards/html5appwizardsourcespage.ui
+++ b/src/plugins/qt4projectmanager/wizards/html5appwizardsourcespage.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>Qt4ProjectManager::Internal::Html5AppWizardSourcesPage</class>
- <widget class="QWizardPage" name="Qt4ProjectManager::Internal::Html5AppWizardSourcesPage">
+ <class>QmakeProjectManager::Internal::Html5AppWizardSourcesPage</class>
+ <widget class="QWizardPage" name="QmakeProjectManager::Internal::Html5AppWizardSourcesPage">
<property name="geometry">
<rect>
<x>0</x>
diff --git a/src/plugins/qt4projectmanager/wizards/libraryparameters.cpp b/src/plugins/qt4projectmanager/wizards/libraryparameters.cpp
index 28ef629b4bf..17dddc6b620 100644
--- a/src/plugins/qt4projectmanager/wizards/libraryparameters.cpp
+++ b/src/plugins/qt4projectmanager/wizards/libraryparameters.cpp
@@ -54,7 +54,7 @@ static const char *globalHeaderContentsC =
"\n"
"#endif // " GUARD_VARIABLE "\n";
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
void LibraryParameters::generateCode(QtProjectParameters:: Type t,
@@ -167,4 +167,4 @@ QString LibraryParameters::generateSharedHeader(const QString &globalHeaderFile
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/libraryparameters.h b/src/plugins/qt4projectmanager/wizards/libraryparameters.h
index 0fe2471fb6b..06ba9b5e762 100644
--- a/src/plugins/qt4projectmanager/wizards/libraryparameters.h
+++ b/src/plugins/qt4projectmanager/wizards/libraryparameters.h
@@ -34,7 +34,7 @@
#include <QString>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
// Additional parameters required besides QtProjectParameters for creating
@@ -64,6 +64,6 @@ struct LibraryParameters {
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // LIBRARYPARAMETERS_H
diff --git a/src/plugins/qt4projectmanager/wizards/librarywizard.cpp b/src/plugins/qt4projectmanager/wizards/librarywizard.cpp
index 4a5a9b2302b..b39f26c5864 100644
--- a/src/plugins/qt4projectmanager/wizards/librarywizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/librarywizard.cpp
@@ -41,7 +41,7 @@
static const char sharedHeaderPostfixC[] = "_global";
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
LibraryWizard::LibraryWizard()
@@ -154,4 +154,4 @@ Core::GeneratedFiles LibraryWizard::generateFiles(const QWizard *w,
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/librarywizard.h b/src/plugins/qt4projectmanager/wizards/librarywizard.h
index 0b4c4eb6307..5ad87a7e5c6 100644
--- a/src/plugins/qt4projectmanager/wizards/librarywizard.h
+++ b/src/plugins/qt4projectmanager/wizards/librarywizard.h
@@ -33,7 +33,7 @@
#include "qtwizard.h"
#include "libraryparameters.h"
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
class LibraryWizard : public QtWizard
@@ -51,6 +51,6 @@ protected:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // LIBRARYWIZARD_H
diff --git a/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp
index dadeca8538a..c5a7b52a607 100644
--- a/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp
+++ b/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp
@@ -44,7 +44,7 @@
enum { debugLibWizard = 0 };
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
struct PluginBaseClasses {
@@ -376,4 +376,4 @@ MobileLibraryParameters LibraryWizardDialog::mobileLibraryParameters() const
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/librarywizarddialog.h b/src/plugins/qt4projectmanager/wizards/librarywizarddialog.h
index 67b7215e5b7..3cab4b1b855 100644
--- a/src/plugins/qt4projectmanager/wizards/librarywizarddialog.h
+++ b/src/plugins/qt4projectmanager/wizards/librarywizarddialog.h
@@ -32,7 +32,7 @@
#include "qtwizard.h"
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
struct QtProjectParameters;
@@ -88,6 +88,6 @@ private:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // LIBRARYWIZARDDIALOG_H
diff --git a/src/plugins/qt4projectmanager/wizards/mobileapp.cpp b/src/plugins/qt4projectmanager/wizards/mobileapp.cpp
index e888d5abcc5..83bacdd630e 100644
--- a/src/plugins/qt4projectmanager/wizards/mobileapp.cpp
+++ b/src/plugins/qt4projectmanager/wizards/mobileapp.cpp
@@ -31,7 +31,7 @@
#include <QTextStream>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
const QString mainWindowBaseName(QLatin1String("mainwindow"));
@@ -147,4 +147,4 @@ QList<DeploymentFolder> MobileApp::deploymentFolders() const
const int MobileApp::StubVersion = 2;
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/mobileapp.h b/src/plugins/qt4projectmanager/wizards/mobileapp.h
index 5de8a51f459..3b7f60f33e5 100644
--- a/src/plugins/qt4projectmanager/wizards/mobileapp.h
+++ b/src/plugins/qt4projectmanager/wizards/mobileapp.h
@@ -32,7 +32,7 @@
#include "abstractmobileapp.h"
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
struct MobileAppGeneratedFileInfo : AbstractGeneratedFileInfo
@@ -81,6 +81,6 @@ private:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // MOBILEAPP_H
diff --git a/src/plugins/qt4projectmanager/wizards/mobileappwizardgenericoptionspage.ui b/src/plugins/qt4projectmanager/wizards/mobileappwizardgenericoptionspage.ui
index e82630a631a..14aa1d8d1bb 100644
--- a/src/plugins/qt4projectmanager/wizards/mobileappwizardgenericoptionspage.ui
+++ b/src/plugins/qt4projectmanager/wizards/mobileappwizardgenericoptionspage.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>Qt4ProjectManager::Internal::MobileAppWizardGenericOptionsPage</class>
- <widget class="QWizardPage" name="Qt4ProjectManager::Internal::MobileAppWizardGenericOptionsPage">
+ <class>QmakeProjectManager::Internal::MobileAppWizardGenericOptionsPage</class>
+ <widget class="QWizardPage" name="QmakeProjectManager::Internal::MobileAppWizardGenericOptionsPage">
<property name="geometry">
<rect>
<x>0</x>
diff --git a/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.cpp b/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.cpp
index c54c0aea80e..0d3cc6a5afb 100644
--- a/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.cpp
+++ b/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.cpp
@@ -35,7 +35,7 @@
#include <QFileDialog>
#include <QMessageBox>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
class MobileAppWizardGenericOptionsPagePrivate
@@ -128,6 +128,6 @@ private:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#include "mobileappwizardpages.moc"
diff --git a/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.h b/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.h
index d6f9206cc75..2e09d750a76 100644
--- a/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.h
+++ b/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.h
@@ -34,7 +34,7 @@
#include <QWizardPage>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
class MobileAppWizardGenericOptionsPage : public QWizardPage
@@ -53,6 +53,6 @@ private:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // MOBILEAPPWIZARDPAGES_H
diff --git a/src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.cpp b/src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.cpp
index edd4f36e59d..adf066f57ab 100644
--- a/src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.cpp
+++ b/src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.cpp
@@ -31,7 +31,7 @@
#include <QTextStream>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
MobileLibraryParameters::MobileLibraryParameters() :
@@ -55,4 +55,4 @@ void MobileLibraryParameters::writeLinuxProFile(QTextStream &str) const
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.h b/src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.h
index f3470ee05e4..060fd577b11 100644
--- a/src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.h
+++ b/src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.h
@@ -36,7 +36,7 @@ QT_BEGIN_NAMESPACE
class QTextStream;
QT_END_NAMESPACE
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
// Additional parameters required for creating mobile
@@ -58,5 +58,5 @@ public:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // MOBILELIBRARYPARAMETERS_H
diff --git a/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.cpp b/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.cpp
index cdb39a266dd..32645adbabd 100644
--- a/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.cpp
+++ b/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.cpp
@@ -31,7 +31,7 @@
#include "ui_mobilelibrarywizardoptionpage.h"
#include "qtprojectparameters.h"
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
class MobileLibraryWizardOptionPagePrivate
@@ -78,4 +78,4 @@ void MobileLibraryWizardOptionPage::setLibraryType(int type)
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.h b/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.h
index cfad8acbc98..5dbf54b3cbf 100644
--- a/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.h
+++ b/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.h
@@ -32,7 +32,7 @@
#include <QWizardPage>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
class MobileLibraryWizardOptionPage : public QWizardPage
@@ -52,6 +52,6 @@ private:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // MOBILELIBRARYWIZARDOPTIONPAGE_H
diff --git a/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.ui b/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.ui
index 3708eebf85f..66597675125 100644
--- a/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.ui
+++ b/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>Qt4ProjectManager::Internal::MobileLibraryWizardOptionPage</class>
- <widget class="QWizardPage" name="Qt4ProjectManager::Internal::MobileLibraryWizardOptionPage">
+ <class>QmakeProjectManager::Internal::MobileLibraryWizardOptionPage</class>
+ <widget class="QWizardPage" name="QmakeProjectManager::Internal::MobileLibraryWizardOptionPage">
<property name="geometry">
<rect>
<x>0</x>
diff --git a/src/plugins/qt4projectmanager/wizards/modulespage.cpp b/src/plugins/qt4projectmanager/wizards/modulespage.cpp
index 5c772618bf1..25dad27648c 100644
--- a/src/plugins/qt4projectmanager/wizards/modulespage.cpp
+++ b/src/plugins/qt4projectmanager/wizards/modulespage.cpp
@@ -40,7 +40,7 @@
#include <math.h>
-using namespace Qt4ProjectManager::Internal;
+using namespace QmakeProjectManager::Internal;
ModulesPage::ModulesPage(QWidget *parent)
: QWizardPage(parent)
diff --git a/src/plugins/qt4projectmanager/wizards/modulespage.h b/src/plugins/qt4projectmanager/wizards/modulespage.h
index 9275c06afd6..7bd00d0aa60 100644
--- a/src/plugins/qt4projectmanager/wizards/modulespage.h
+++ b/src/plugins/qt4projectmanager/wizards/modulespage.h
@@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE
class QCheckBox;
QT_END_NAMESPACE
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
class ModulesPage : public QWizardPage
@@ -63,6 +63,6 @@ private:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // MODULESPAGE_H
diff --git a/src/plugins/qt4projectmanager/wizards/qtprojectparameters.cpp b/src/plugins/qt4projectmanager/wizards/qtprojectparameters.cpp
index 37926909f62..d7e6f10008c 100644
--- a/src/plugins/qt4projectmanager/wizards/qtprojectparameters.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtprojectparameters.cpp
@@ -36,7 +36,7 @@
#include <QDateTime>
#include <QDebug>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
// ----------- QtProjectParameters
@@ -154,4 +154,4 @@ QString QtProjectParameters::libraryMacro(const QString &projectName)
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/qtprojectparameters.h b/src/plugins/qt4projectmanager/wizards/qtprojectparameters.h
index 2e9cdb2f193..2ded15d8130 100644
--- a/src/plugins/qt4projectmanager/wizards/qtprojectparameters.h
+++ b/src/plugins/qt4projectmanager/wizards/qtprojectparameters.h
@@ -36,7 +36,7 @@ QT_BEGIN_NAMESPACE
class QTextStream;
QT_END_NAMESPACE
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
// Create a macro name by taking a file name, upper casing it and
@@ -74,6 +74,6 @@ struct QtProjectParameters {
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // QTPROJECTPARAMETERS_H
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp
index eac1da521f3..b252083f895 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp
@@ -37,7 +37,7 @@
#include <coreplugin/icore.h>
#endif // CREATORLESSTEST
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
QtQuickApp::QtQuickApp()
@@ -282,4 +282,4 @@ QString QtQuickApp::componentSetDir(ComponentSet componentSet) const
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickapp.h b/src/plugins/qt4projectmanager/wizards/qtquickapp.h
index 1f8db6732d6..7f08bbfca92 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickapp.h
+++ b/src/plugins/qt4projectmanager/wizards/qtquickapp.h
@@ -32,7 +32,7 @@
#include "abstractmobileapp.h"
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
struct QtQuickAppGeneratedFileInfo : public AbstractGeneratedFileInfo
@@ -122,6 +122,6 @@ private:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // QTQUICKAPP_H
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
index 7c9f5f01647..bdde5f4ac0e 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
@@ -41,7 +41,7 @@
#include <QIcon>
#include <QDebug>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
class QtQuickAppWizardDialog : public AbstractMobileAppWizardDialog
@@ -108,7 +108,7 @@ QtQuickAppWizard::QtQuickAppWizard()
: d(new QtQuickAppWizardPrivate)
{
setWizardKind(ProjectWizard);
- setIcon(QIcon(QLatin1String(Qt4ProjectManager::Constants::ICON_QTQUICK_APP)));
+ setIcon(QIcon(QLatin1String(QmakeProjectManager::Constants::ICON_QTQUICK_APP)));
setId(QLatin1String("D.QMLA Application"));
setCategory(QLatin1String(ProjectExplorer::Constants::QT_APPLICATION_WIZARD_CATEGORY));
setDisplayCategory(QLatin1String(ProjectExplorer::Constants::QT_APPLICATION_WIZARD_CATEGORY_DISPLAY));
@@ -270,6 +270,6 @@ AbstractMobileAppWizardDialog *QtQuickAppWizard::wizardDialog() const
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#include "qtquickappwizard.moc"
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.h b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.h
index b6254030412..ef93c432fcb 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.h
+++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.h
@@ -32,7 +32,7 @@
#include "abstractmobileappwizard.h"
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
class QtQuickAppWizard : public AbstractMobileAppWizard
@@ -71,6 +71,6 @@ private:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // QTQUICKAPPWIZARD_H
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.cpp b/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.cpp
index 0048c20f156..4e27920757b 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.cpp
@@ -30,7 +30,7 @@
#include "qtquickappwizardpages.h"
#include "ui_qtquickcomponentsetoptionspage.h"
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
class QtQuickComponentSetOptionsPagePrivate
@@ -69,4 +69,4 @@ bool QtQuickComponentSetOptionsPage::isComplete() const
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.h b/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.h
index 7c82e2db3f7..a62003143a6 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.h
+++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.h
@@ -32,7 +32,7 @@
#include <QWizardPage>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
class QtQuickComponentSetOptionsPage : public QWizardPage
@@ -51,6 +51,6 @@ private:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // QTQUICKAPPWIZARDPAGES_H
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickcomponentsetoptionspage.ui b/src/plugins/qt4projectmanager/wizards/qtquickcomponentsetoptionspage.ui
index 47f82a4cdea..df791b10bc9 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickcomponentsetoptionspage.ui
+++ b/src/plugins/qt4projectmanager/wizards/qtquickcomponentsetoptionspage.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>Qt4ProjectManager::Internal::QtQuickComponentSetOptionsPage</class>
- <widget class="QWizardPage" name="Qt4ProjectManager::Internal::QtQuickComponentSetOptionsPage">
+ <class>QmakeProjectManager::Internal::QtQuickComponentSetOptionsPage</class>
+ <widget class="QWizardPage" name="QmakeProjectManager::Internal::QtQuickComponentSetOptionsPage">
<property name="geometry">
<rect>
<x>0</x>
diff --git a/src/plugins/qt4projectmanager/wizards/qtwizard.cpp b/src/plugins/qt4projectmanager/wizards/qtwizard.cpp
index 78d4a6a3cb0..f6572cef4ec 100644
--- a/src/plugins/qt4projectmanager/wizards/qtwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtwizard.cpp
@@ -50,8 +50,8 @@
#include <QVariant>
using namespace ProjectExplorer;
-using namespace Qt4ProjectManager;
-using namespace Qt4ProjectManager::Internal;
+using namespace QmakeProjectManager;
+using namespace QmakeProjectManager::Internal;
// -------------------- QtWizard
QtWizard::QtWizard()
diff --git a/src/plugins/qt4projectmanager/wizards/qtwizard.h b/src/plugins/qt4projectmanager/wizards/qtwizard.h
index bb78c12d6c4..de266f071ed 100644
--- a/src/plugins/qt4projectmanager/wizards/qtwizard.h
+++ b/src/plugins/qt4projectmanager/wizards/qtwizard.h
@@ -39,7 +39,7 @@ class Kit;
class TargetSetupPage;
} // namespace ProjectExplorer
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
class Qt4Project;
@@ -151,6 +151,6 @@ private:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // QTWIZARD_H
diff --git a/src/plugins/qt4projectmanager/wizards/subdirsprojectwizard.cpp b/src/plugins/qt4projectmanager/wizards/subdirsprojectwizard.cpp
index 816b60e3ef8..53b5f123a77 100644
--- a/src/plugins/qt4projectmanager/wizards/subdirsprojectwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/subdirsprojectwizard.cpp
@@ -37,7 +37,7 @@
#include <QCoreApplication>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
SubdirsProjectWizard::SubdirsProjectWizard()
@@ -100,4 +100,4 @@ bool SubdirsProjectWizard::postGenerateFiles(const QWizard *w, const Core::Gener
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/subdirsprojectwizard.h b/src/plugins/qt4projectmanager/wizards/subdirsprojectwizard.h
index c17ca2a8c36..889b5ed8551 100644
--- a/src/plugins/qt4projectmanager/wizards/subdirsprojectwizard.h
+++ b/src/plugins/qt4projectmanager/wizards/subdirsprojectwizard.h
@@ -32,7 +32,7 @@
#include "qtwizard.h"
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
class SubdirsProjectWizard : public QtWizard
@@ -51,6 +51,6 @@ private:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // SUBDIRSPROJECTWIZARD_H
diff --git a/src/plugins/qt4projectmanager/wizards/subdirsprojectwizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/subdirsprojectwizarddialog.cpp
index 94a1b8aca65..df73cd8a29d 100644
--- a/src/plugins/qt4projectmanager/wizards/subdirsprojectwizarddialog.cpp
+++ b/src/plugins/qt4projectmanager/wizards/subdirsprojectwizarddialog.cpp
@@ -30,7 +30,7 @@
#include "subdirsprojectwizarddialog.h"
#include <projectexplorer/projectexplorerconstants.h>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
SubdirsProjectWizardDialog::SubdirsProjectWizardDialog(const QString &templateName,
@@ -61,4 +61,4 @@ QtProjectParameters SubdirsProjectWizardDialog::parameters() const
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/subdirsprojectwizarddialog.h b/src/plugins/qt4projectmanager/wizards/subdirsprojectwizarddialog.h
index fbd51812ea7..69c493881de 100644
--- a/src/plugins/qt4projectmanager/wizards/subdirsprojectwizarddialog.h
+++ b/src/plugins/qt4projectmanager/wizards/subdirsprojectwizarddialog.h
@@ -32,7 +32,7 @@
#include "qtwizard.h"
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
struct QtProjectParameters;
@@ -50,6 +50,6 @@ public:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // SUBDIRSPROJECTWIZARDDIALOG_H
diff --git a/src/plugins/qt4projectmanager/wizards/testwizard.cpp b/src/plugins/qt4projectmanager/wizards/testwizard.cpp
index e9472028c3c..49862379cff 100644
--- a/src/plugins/qt4projectmanager/wizards/testwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/testwizard.cpp
@@ -40,7 +40,7 @@
#include <QTextStream>
#include <QFileInfo>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
TestWizard::TestWizard()
@@ -184,4 +184,4 @@ Core::GeneratedFiles TestWizard::generateFiles(const QWizard *w, QString *errorM
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/testwizard.h b/src/plugins/qt4projectmanager/wizards/testwizard.h
index f8ffa99bf3c..5dbc77566e1 100644
--- a/src/plugins/qt4projectmanager/wizards/testwizard.h
+++ b/src/plugins/qt4projectmanager/wizards/testwizard.h
@@ -32,7 +32,7 @@
#include "qtwizard.h"
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
class TestWizard : public QtWizard
@@ -50,6 +50,6 @@ protected:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // TESTWIZARD_H
diff --git a/src/plugins/qt4projectmanager/wizards/testwizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/testwizarddialog.cpp
index fa90d9e5d85..53e3847931a 100644
--- a/src/plugins/qt4projectmanager/wizards/testwizarddialog.cpp
+++ b/src/plugins/qt4projectmanager/wizards/testwizarddialog.cpp
@@ -35,7 +35,7 @@
enum PageIds { StartPageId = 0 };
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
const char *TestWizardParameters::filePrefix = "tst_";
@@ -95,4 +95,4 @@ QtProjectParameters TestWizardDialog::projectParameters() const
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/testwizarddialog.h b/src/plugins/qt4projectmanager/wizards/testwizarddialog.h
index 4f421c64d92..e2afee117ce 100644
--- a/src/plugins/qt4projectmanager/wizards/testwizarddialog.h
+++ b/src/plugins/qt4projectmanager/wizards/testwizarddialog.h
@@ -32,7 +32,7 @@
#include "qtwizard.h"
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
class TestWizardPage;
@@ -80,6 +80,6 @@ private:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // TESTWIZARDDIALOG_H
diff --git a/src/plugins/qt4projectmanager/wizards/testwizardpage.cpp b/src/plugins/qt4projectmanager/wizards/testwizardpage.cpp
index f1f211370b5..b48f405064f 100644
--- a/src/plugins/qt4projectmanager/wizards/testwizardpage.cpp
+++ b/src/plugins/qt4projectmanager/wizards/testwizardpage.cpp
@@ -32,7 +32,7 @@
#include "qtwizard.h"
#include "ui_testwizardpage.h"
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
TestWizardPage::TestWizardPage(QWidget *parent) :
@@ -134,4 +134,4 @@ void TestWizardPage::slotUpdateValid()
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/testwizardpage.h b/src/plugins/qt4projectmanager/wizards/testwizardpage.h
index 69b0ae77b4c..52e46b36908 100644
--- a/src/plugins/qt4projectmanager/wizards/testwizardpage.h
+++ b/src/plugins/qt4projectmanager/wizards/testwizardpage.h
@@ -32,7 +32,7 @@
#include <QWizardPage>
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
namespace Ui {
@@ -73,6 +73,6 @@ private:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace QmakeProjectManager
#endif // TESTWIZARDPAGE_H
diff --git a/src/plugins/qt4projectmanager/wizards/testwizardpage.ui b/src/plugins/qt4projectmanager/wizards/testwizardpage.ui
index 4c46aae0574..6b964d88778 100644
--- a/src/plugins/qt4projectmanager/wizards/testwizardpage.ui
+++ b/src/plugins/qt4projectmanager/wizards/testwizardpage.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>Qt4ProjectManager::Internal::TestWizardPage</class>
- <widget class="QWizardPage" name="Qt4ProjectManager::Internal::TestWizardPage">
+ <class>QmakeProjectManager::Internal::TestWizardPage</class>
+ <widget class="QWizardPage" name="QmakeProjectManager::Internal::TestWizardPage">
<property name="windowTitle">
<string>WizardPage</string>
</property>
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index 98ca503fb10..8449f120ae6 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -1219,7 +1219,7 @@ QList<Task> BaseQtVersion::reportIssuesImpl(const QString &proFile, const QStrin
if (!isValid()) {
//: %1: Reason for being invalid
- const QString msg = QCoreApplication::translate("Qt4ProjectManager::QtVersion", "The Qt version is invalid: %1").arg(invalidReason());
+ const QString msg = QCoreApplication::translate("QmakeProjectManager::QtVersion", "The Qt version is invalid: %1").arg(invalidReason());
results.append(Task(Task::Error, msg, FileName(), -1,
ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM));
}
@@ -1228,7 +1228,7 @@ QList<Task> BaseQtVersion::reportIssuesImpl(const QString &proFile, const QStrin
if (!qmakeInfo.exists() ||
!qmakeInfo.isExecutable()) {
//: %1: Path to qmake executable
- const QString msg = QCoreApplication::translate("Qt4ProjectManager::QtVersion",
+ const QString msg = QCoreApplication::translate("QmakeProjectManager::QtVersion",
"The qmake command \"%1\" was not found or is not executable.").arg(qmakeCommand().toUserOutput());
results.append(Task(Task::Error, msg, FileName(), -1,
ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM));
@@ -1239,12 +1239,12 @@ QList<Task> BaseQtVersion::reportIssuesImpl(const QString &proFile, const QStrin
if (!sourcePath.endsWith(slash))
sourcePath.append(slash);
if ((tmpBuildDir.startsWith(sourcePath)) && (tmpBuildDir != sourcePath)) {
- const QString msg = QCoreApplication::translate("Qt4ProjectManager::QtVersion",
+ const QString msg = QCoreApplication::translate("QmakeProjectManager::QtVersion",
"Qmake does not support build directories below the source directory.");
results.append(Task(Task::Warning, msg, FileName(), -1,
ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM));
} else if (tmpBuildDir.count(slash) != sourcePath.count(slash) && qtVersion() < QtVersionNumber(4,8, 0)) {
- const QString msg = QCoreApplication::translate("Qt4ProjectManager::QtVersion",
+ const QString msg = QCoreApplication::translate("QmakeProjectManager::QtVersion",
"The build directory needs to be at the same level as the source directory.");
results.append(Task(Task::Warning, msg, FileName(), -1,
diff --git a/src/plugins/qtsupport/qmldebugginglibrary.cpp b/src/plugins/qtsupport/qmldebugginglibrary.cpp
index b68073e6075..f2a90a45ad5 100644
--- a/src/plugins/qtsupport/qmldebugginglibrary.cpp
+++ b/src/plugins/qtsupport/qmldebugginglibrary.cpp
@@ -64,12 +64,12 @@ bool QmlDebuggingLibrary::canBuild(const BaseQtVersion *qtVersion, QString *reas
{
if (qtVersion->qtVersion() < QtVersionNumber(4, 7, 1)) {
if (reason)
- *reason = QCoreApplication::translate("Qt4ProjectManager::QmlDebuggingLibrary", "Only available for Qt 4.7.1 or newer.");
+ *reason = QCoreApplication::translate("QmakeProjectManager::QmlDebuggingLibrary", "Only available for Qt 4.7.1 or newer.");
return false;
}
if (qtVersion->qtVersion() >= QtVersionNumber(4, 8, 0)) {
if (reason)
- *reason = QCoreApplication::translate("Qt4ProjectManager::QmlDebuggingLibrary", "Not needed.");
+ *reason = QCoreApplication::translate("QmakeProjectManager::QmlDebuggingLibrary", "Not needed.");
return false;
}
return true;
@@ -77,7 +77,7 @@ bool QmlDebuggingLibrary::canBuild(const BaseQtVersion *qtVersion, QString *reas
bool QmlDebuggingLibrary::build(BuildHelperArguments arguments, QString *log, QString *errorMessage)
{
- arguments.helperName = QCoreApplication::translate("Qt4ProjectManager::QmlDebuggingLibrary", "QML Debugging");
+ arguments.helperName = QCoreApplication::translate("QmakeProjectManager::QmlDebuggingLibrary", "QML Debugging");
arguments.proFilename = QLatin1String("qmljsdebugger.pro");
return buildHelper(arguments, log, errorMessage);
}
@@ -85,7 +85,7 @@ bool QmlDebuggingLibrary::build(BuildHelperArguments arguments, QString *log, Q
static inline bool mkpath(const QString &targetDirectory, QString *errorMessage)
{
if (!QDir().mkpath(targetDirectory)) {
- *errorMessage = QCoreApplication::translate("Qt4ProjectManager::QmlDebuggingLibrary", "The target directory %1 could not be created.").arg(targetDirectory);
+ *errorMessage = QCoreApplication::translate("QmakeProjectManager::QmlDebuggingLibrary", "The target directory %1 could not be created.").arg(targetDirectory);
return false;
}
return true;
@@ -109,7 +109,7 @@ QString QmlDebuggingLibrary::copy(const QString &qtInstallData, QString *errorMe
return directory;
}
}
- *errorMessage = QCoreApplication::translate("Qt4ProjectManager::QmlDebuggingLibrary",
+ *errorMessage = QCoreApplication::translate("QmakeProjectManager::QmlDebuggingLibrary",
"QML Debugging library could not be built in any of the directories:\n- %1\n\nReason: %2")
.arg(directories.join(QLatin1String("\n- ")), *errorMessage);
return QString();
diff --git a/src/plugins/qtsupport/qmldumptool.cpp b/src/plugins/qtsupport/qmldumptool.cpp
index 5edc01b33a2..044daada7ff 100644
--- a/src/plugins/qtsupport/qmldumptool.cpp
+++ b/src/plugins/qtsupport/qmldumptool.cpp
@@ -195,24 +195,24 @@ bool QmlDumpTool::canBuild(const BaseQtVersion *qtVersion, QString *reason)
if (qtVersion->type() != QLatin1String(Constants::DESKTOPQT)
&& qtVersion->type() != QLatin1String(Constants::SIMULATORQT)) {
if (reason)
- *reason = QCoreApplication::translate("Qt4ProjectManager::QmlDumpTool", "Only available for Qt for Desktop and Qt for Qt Simulator.");
+ *reason = QCoreApplication::translate("QmakeProjectManager::QmlDumpTool", "Only available for Qt for Desktop and Qt for Qt Simulator.");
return false;
}
if (qtVersion->qtVersion() < QtVersionNumber(4, 7, 1)) {
if (reason)
- *reason = QCoreApplication::translate("Qt4ProjectManager::QmlDumpTool", "Only available for Qt 4.7.1 or newer.");
+ *reason = QCoreApplication::translate("QmakeProjectManager::QmlDumpTool", "Only available for Qt 4.7.1 or newer.");
return false;
}
if (qtVersion->qtVersion() >= QtVersionNumber(4, 8, 0)) {
if (reason)
- *reason = QCoreApplication::translate("Qt4ProjectManager::QmlDumpTool", "Not needed.");
+ *reason = QCoreApplication::translate("QmakeProjectManager::QmlDumpTool", "Not needed.");
return false;
}
if (!hasPrivateHeaders(installHeaders)) {
if (reason)
- *reason = QCoreApplication::translate("Qt4ProjectManager::QmlDumpTool", "Private headers are missing for this Qt version.");
+ *reason = QCoreApplication::translate("QmakeProjectManager::QmlDumpTool", "Private headers are missing for this Qt version.");
return false;
}
return true;
@@ -280,7 +280,7 @@ QStringList QmlDumpTool::locationsByInstallData(const QString &qtInstallData, bo
bool QmlDumpTool::build(BuildHelperArguments arguments, QString *log, QString *errorMessage)
{
- arguments.helperName = QCoreApplication::translate("Qt4ProjectManager::QmlDumpTool", "qmldump");
+ arguments.helperName = QCoreApplication::translate("QmakeProjectManager::QmlDumpTool", "qmldump");
arguments.proFilename = QLatin1String("qmldump.pro");
return buildHelper(arguments, log, errorMessage);
}
@@ -327,7 +327,7 @@ void QmlDumpTool::pathAndEnvironment(Project *project, BaseQtVersion *version,
buildTask->updateProjectWhenDone(project, preferDebug);
QFuture<void> task = QtConcurrent::run(&QmlDumpBuildTask::run, buildTask);
const QString taskName = QmlDumpBuildTask::tr("Building helper");
- Core::ProgressManager::addTask(task, taskName, "Qt4ProjectManager::BuildHelpers");
+ Core::ProgressManager::addTask(task, taskName, "QmakeProjectManager::BuildHelpers");
}
return;
}
diff --git a/src/plugins/qtsupport/qmlobservertool.cpp b/src/plugins/qtsupport/qmlobservertool.cpp
index 1ce7414a3d9..9479645293f 100644
--- a/src/plugins/qtsupport/qmlobservertool.cpp
+++ b/src/plugins/qtsupport/qmlobservertool.cpp
@@ -93,18 +93,18 @@ bool QmlObserverTool::canBuild(const BaseQtVersion *qtVersion, QString *reason)
if (qtVersion->type() != QLatin1String(Constants::DESKTOPQT)
&& qtVersion->type() != QLatin1String(Constants::SIMULATORQT)) {
if (reason)
- *reason = QCoreApplication::translate("Qt4ProjectManager::QmlObserverTool", "Only available for Qt for Desktop or Qt for Qt Simulator.");
+ *reason = QCoreApplication::translate("QmakeProjectManager::QmlObserverTool", "Only available for Qt for Desktop or Qt for Qt Simulator.");
return false;
}
if (qtVersion->qtVersion() < QtVersionNumber(4, 7, 1)) {
if (reason)
- *reason = QCoreApplication::translate("Qt4ProjectManager::QmlObserverTool", "Only available for Qt 4.7.1 or newer.");
+ *reason = QCoreApplication::translate("QmakeProjectManager::QmlObserverTool", "Only available for Qt 4.7.1 or newer.");
return false;
}
if (qtVersion->qtVersion() >= QtVersionNumber(4, 8, 0)) {
if (reason)
- *reason = QCoreApplication::translate("Qt4ProjectManager::QmlObserverTool", "Not needed.");
+ *reason = QCoreApplication::translate("QmakeProjectManager::QmlObserverTool", "Not needed.");
return false;
}
return true;
@@ -135,7 +135,7 @@ QStringList QmlObserverTool::locationsByInstallData(const QString &qtInstallData
bool QmlObserverTool::build(BuildHelperArguments arguments, QString *log, QString *errorMessage)
{
- arguments.helperName = QCoreApplication::translate("Qt4ProjectManager::QmlObserverTool", "QMLObserver");
+ arguments.helperName = QCoreApplication::translate("QmakeProjectManager::QmlObserverTool", "QMLObserver");
arguments.proFilename = QLatin1String("qmlobserver.pro");
return buildHelper(arguments, log, errorMessage);
diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp
index 525fdb98645..e3047d39c1b 100644
--- a/src/plugins/qtsupport/qtoptionspage.cpp
+++ b/src/plugins/qtsupport/qtoptionspage.cpp
@@ -458,7 +458,7 @@ void QtOptionsPageWidget::buildDebuggingHelper(DebuggingHelperBuildTask::Tools t
QFuture<void> task = QtConcurrent::run(&DebuggingHelperBuildTask::run, buildTask);
const QString taskName = tr("Building helpers");
- Core::ProgressManager::addTask(task, taskName, "Qt4ProjectManager::BuildHelpers");
+ Core::ProgressManager::addTask(task, taskName, "QmakeProjectManager::BuildHelpers");
}
void QtOptionsPageWidget::buildGdbHelper()
{
diff --git a/src/shared/proparser/prowriter.cpp b/src/shared/proparser/prowriter.cpp
index e465c0d4556..f71d600663a 100644
--- a/src/shared/proparser/prowriter.cpp
+++ b/src/shared/proparser/prowriter.cpp
@@ -33,7 +33,7 @@
#include <QDir>
#include <QPair>
-using namespace Qt4ProjectManager::Internal;
+using namespace QmakeProjectManager::Internal;
static uint getBlockLen(const ushort *&tokPtr)
{
diff --git a/src/shared/proparser/prowriter.h b/src/shared/proparser/prowriter.h
index e88e7c411ef..4461e246b68 100644
--- a/src/shared/proparser/prowriter.h
+++ b/src/shared/proparser/prowriter.h
@@ -38,7 +38,7 @@ class QDir;
class ProFile;
QT_END_NAMESPACE
-namespace Qt4ProjectManager {
+namespace QmakeProjectManager {
namespace Internal {
class QMAKE_EXPORT ProWriter
diff --git a/tests/auto/profilewriter/tst_profilewriter.cpp b/tests/auto/profilewriter/tst_profilewriter.cpp
index 4dd71629b8e..10c3c305c5e 100644
--- a/tests/auto/profilewriter/tst_profilewriter.cpp
+++ b/tests/auto/profilewriter/tst_profilewriter.cpp
@@ -57,7 +57,7 @@ static ParseHandler parseHandler;
//////////////// the actual autotest
-typedef Qt4ProjectManager::Internal::ProWriter PW;
+typedef QmakeProjectManager::Internal::ProWriter PW;
class tst_ProFileWriter : public QObject
{
@@ -625,7 +625,7 @@ void tst_ProFileWriter::removes()
QMakeParser parser(0, &vfs, &parseHandler);
ProFile *proFile = parser.parsedProBlock(input, QLatin1String(BASE_DIR "/test.pro"), 1);
QVERIFY(proFile);
- Qt4ProjectManager::Internal::ProWriter::removeVarValues(proFile, &lines, values, vars);
+ QmakeProjectManager::Internal::ProWriter::removeVarValues(proFile, &lines, values, vars);
proFile->deref();
QCOMPARE(lines.join(QLatin1String("\n")), output);
@@ -654,7 +654,7 @@ void tst_ProFileWriter::multiVar()
QMakeParser parser(0, &vfs, &parseHandler);
ProFile *proFile = parser.parsedProBlock(input, QLatin1String(BASE_DIR "/test.pro"), 1);
QVERIFY(proFile);
- Qt4ProjectManager::Internal::ProWriter::removeFiles(proFile, &lines, baseDir, files, vars);
+ QmakeProjectManager::Internal::ProWriter::removeFiles(proFile, &lines, baseDir, files, vars);
proFile->deref();
QCOMPARE(lines.join(QLatin1String("\n")), output);
@@ -675,7 +675,7 @@ void tst_ProFileWriter::addFiles()
QMakeParser parser(0, &vfs, &parseHandler);
ProFile *proFile = parser.parsedProBlock(input, QLatin1String(BASE_DIR "/test.pro"), 1);
QVERIFY(proFile);
- Qt4ProjectManager::Internal::ProWriter::addFiles(proFile, &lines, QDir(BASE_DIR),
+ QmakeProjectManager::Internal::ProWriter::addFiles(proFile, &lines, QDir(BASE_DIR),
QStringList() << QString::fromLatin1(BASE_DIR "/sub/bar.cpp"),
QLatin1String("SOURCES"));
proFile->deref();
@@ -697,7 +697,7 @@ void tst_ProFileWriter::removeFiles()
QMakeParser parser(0, &vfs, &parseHandler);
ProFile *proFile = parser.parsedProBlock(input, QLatin1String(BASE_DIR "/test.pro"), 1);
QVERIFY(proFile);
- Qt4ProjectManager::Internal::ProWriter::removeFiles(proFile, &lines, QDir(BASE_DIR),
+ QmakeProjectManager::Internal::ProWriter::removeFiles(proFile, &lines, QDir(BASE_DIR),
QStringList() << QString::fromLatin1(BASE_DIR "/sub/bar.cpp"),
QStringList() << QLatin1String("SOURCES") << QLatin1String("HEADERS"));
proFile->deref();
diff --git a/tests/manual/appwizards/helpers.cpp b/tests/manual/appwizards/helpers.cpp
index 442b1791172..54a6e8dd1a0 100644
--- a/tests/manual/appwizards/helpers.cpp
+++ b/tests/manual/appwizards/helpers.cpp
@@ -31,8 +31,8 @@
#include "html5app.h"
#include <QtCore>
-using namespace Qt4ProjectManager;
-using namespace Qt4ProjectManager::Internal;
+using namespace QmakeProjectManager;
+using namespace QmakeProjectManager::Internal;
static bool writeFile(const QByteArray &data, const QString &targetFile)
{
diff --git a/tests/manual/appwizards/main.cpp b/tests/manual/appwizards/main.cpp
index 0e9d40f6d68..b55a6c04a3b 100644
--- a/tests/manual/appwizards/main.cpp
+++ b/tests/manual/appwizards/main.cpp
@@ -33,7 +33,7 @@
#include <QApplication>
#include <QDebug>
-using namespace Qt4ProjectManager::Internal;
+using namespace QmakeProjectManager::Internal;
int main(int argc, char *argv[])
{
diff --git a/tests/tools/qtquickappblaster/main.cpp b/tests/tools/qtquickappblaster/main.cpp
index f0bb14259f6..ffb1802cb62 100644
--- a/tests/tools/qtquickappblaster/main.cpp
+++ b/tests/tools/qtquickappblaster/main.cpp
@@ -30,7 +30,7 @@
#include "qtquickapp.h"
#include <QtCore>
-using namespace Qt4ProjectManager::Internal;
+using namespace QmakeProjectManager::Internal;
bool processXmlFile(const QString &xmlFile)
{
--
GitLab