diff options
author | hjk <hjk121@nokiamail.com> | 2013-10-16 11:02:37 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@digia.com> | 2013-10-16 12:09:59 +0200 |
commit | ebcd992577bfca1e94f207958d736490395cd82b (patch) | |
tree | 2bba49115790e80fef7e57006d3acc47cfcecf95 /src/plugins/qt4projectmanager | |
parent | 56d564c5b318ff57ee02dbf3de6ca1a22b0231ca (diff) | |
download | qt-creator-ebcd992577bfca1e94f207958d736490395cd82b.tar.gz |
Rename namespace Qt4ProjectManager to QmakeProjectManager
First step towards plugin renaming.
Change-Id: I8ac017660a7aa2bda0d7bb7d72ab0cfceaf6cfd2
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/plugins/qt4projectmanager')
141 files changed, 342 insertions, 342 deletions
diff --git a/src/plugins/qt4projectmanager/addlibrarywizard.cpp b/src/plugins/qt4projectmanager/addlibrarywizard.cpp index 02c496a7ae..ec3ec3a0e6 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 1d780aa112..9fa7b52e7e 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 048ea286a1..b51ab06b38 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 63eaa4d278..2e950d0a14 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 305963cb6b..fa8d4676f0 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 d705685a2d..ac89b0c6d9 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 e955d171d2..22297ae81c 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 9bb7cbef3a..b745dd5f1a 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 910a145e74..9536f67302 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 1605b2a507..fcb4792b65 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 4cbdf488a6..2f70b02a43 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 3caf1938d4..89bd627073 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 d06fa35202..74b4ed9ca2 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 568467950d..747738b0fe 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 dbe53ec911..eb94d6a6b9 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 c73e68f70c..2dd4b5d65b 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 c3241c97f9..3a27e79cf4 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 e03864c1d7..faa11b96d7 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 5a91de26c7..996d7eee28 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 dcfe0cd245..db85709cc6 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 6637f792f5..27bd3c996b 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 b6241b544c..483a49a708 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 27cc84a635..78f10f3844 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 e3f85b13d3..fc642a181e 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 d36de678a1..89f4f30177 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 fce5c604f3..a9defa62f1 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 e8a4bfb6c9..61d3434529 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 6390b17b24..b23bf4acb2 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 bc18a5e18c..6f984a2506 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 bd1bfe3b49..ce30d6a902 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 d9729cbb3a..059e07563a 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 62882df759..9856fd7d2c 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 84ea394bce..d14cb23f7c 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 4c25f9c51f..dad0f76176 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 3460c76b98..fafa799ce8 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 3e4150b2ae..4976ebd081 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 21227bba9d..5867dc6c32 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 41c5e8c477..1d50c8193a 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 11e5b1424c..9552f50ecb 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 a7317962fd..efe1876304 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 a4b8afa812..3ca96d15a2 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 358a74ab2c..3e3ecf6a7d 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 5a8587ceda..824929ae97 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 a42b1b61fa..e53566a5b6 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 2e5795d945..e3803d1411 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 82c7943dea..fc9dd5142c 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 b5b15f69c1..592653d746 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 fcd668c8e5..c942e4974f 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 c2e86e1913..6bd695c68f 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 4e31de957c..61fa3e872e 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 8d6fa07a0b..68b73aa15e 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 f9e0176a1b..68d92d35f1 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 4ab5be811d..36078c6277 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 73abdded5e..cf716fce4b 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 c6b6684ecc..ddbd99416d 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 c0e55fd5f2..c687291e14 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 5eb76d8639..003258e4ce 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 aae5c1f758..43c5828044 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 a5e9b46713..c9cd53f544 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 17e519b530..f7458bfbc0 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 8be72bff5b..e44f0b56ac 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 c7b9d4890a..a38d1f2573 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 0d42df9267..3812a8e8b6 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 67547d8320..ecd1d69a3c 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 4c6e41636c..aa70f654c5 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 327d75c8c2..90040f68b7 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 3ec29088cd..cef43d4129 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 54ce6f8bce..bd8e07a112 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 9040c63238..82df6646b6 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 7d922b37ca..09cbc7fc43 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 cc4c14588b..e8bd3f8e75 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 4fd1e5dbc2..935bd9be84 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 606371886c..1266a5425a 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 1527a4b524..6208cfc704 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 7529b6d41a..4c303d0d44 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 ceedb6aaa6..ffb41b655f 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 49f3f12971..f4c2023215 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 05829462d0..7aa9d79b5b 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 12d0ea4215..0e13164ce3 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 4aa8111e99..c5f6bb8141 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 d694117074..b3dc87af80 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 1c2faa409a..56301b0932 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 1d8ea43bef..b3c5db9086 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 70e5964e73..8c3bf3e9ef 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 3da4e01751..514a9c67fe 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 e0d4fb9ce1..ec1684cbe8 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 46d8e0864a..574bc2e053 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 a1da9bf76f..05bfa502a3 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 25788eb87f..ff0127c863 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 6a76376f48..6b63d94268 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 53b0defe69..aaa1f95abc 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 80214d4de9..b52f74817c 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 aa7d1b47fd..cf15d1f2fa 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 1f7e236399..42a46a9b88 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 929e59ff1d..53187641d1 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 61076255bc..e1ca179451 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 854377dd17..12cd8307af 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 908a1aece6..d82ce8f6a4 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 d19c2b84de..45c7278efe 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 87b7c2a502..c90ecadb1c 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 65d5854170..b2a10f3877 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 28ef629b4b..17dddc6b62 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 0fe2471fb6..06ba9b5e76 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 4a5a9b2302..b39f26c586 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 0b4c4eb630..5ad87a7e5c 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 dadeca8538..c5a7b52a60 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 67b7215e5b..3cab4b1b85 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 e888d5abcc..83bacdd630 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 5de8a51f45..3b7f60f33e 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 e82630a631..14aa1d8d1b 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 c54c0aea80..0d3cc6a5af 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 d6f9206cc7..2e09d750a7 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 edd4f36e59..adf066f57a 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 f3470ee05e..060fd577b1 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 cdb39a266d..32645adbab 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 cfad8acbc9..5dbf54b3cb 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 3708eebf85..6659767512 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 5c772618bf..25dad27648 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 9275c06afd..7bd00d0aa6 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 37926909f6..d7e6f10008 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 2e9cdb2f19..2ded15d813 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 eac1da521f..b252083f89 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 1f8db6732d..7f08bbfca9 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 7c9f5f0164..bdde5f4ac0 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 b625403041..ef93c432fc 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 0048c20f15..4e27920757 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 7c82e2db3f..a62003143a 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 47f82a4cde..df791b10bc 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 78d4a6a3cb..f6572cef4e 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 bb78c12d6c..de266f071e 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 816b60e3ef..53b5f123a7 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 c17ca2a8c3..889b5ed855 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 94a1b8aca6..df73cd8a29 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 fbd51812ea..69c493881d 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 e9472028c3..49862379cf 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 f8ffa99bf3..5dbc77566e 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 fa90d9e5d8..53e3847931 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 4f421c64d9..e2afee117c 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 f1f211370b..b48f405064 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 69b0ae77b4..52e46b3690 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 4c46aae057..6b964d8877 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> |