compile fix with namespaces

Change-Id: I1b888ff8bd5c30a13dc8c00824d4cae6990a4b23
Reviewed-by: hjk <qthjk@ovi.com>

src/plugins/analyzerbase/startremotedialog.h

@@ -37,23 +37,12 @@
 
 #include <QtGui/QDialog>
 
-QT_BEGIN_NAMESPACE
+namespace Utils { class SshConnectionParameters; }
 
 namespace Analyzer {
-namespace Internal {
-namespace Ui {
-class StartRemoteDialog;
-} // namespace Ui
-} // namespace Internal
-} // namespace Analyzer
-
-QT_END_NAMESPACE
 
-namespace Utils {
-class SshConnectionParameters;
-}
+namespace Internal { namespace Ui { class StartRemoteDialog; } }
 
-namespace Analyzer {
 
 class ANALYZER_EXPORT StartRemoteDialog : public QDialog
 {

src/plugins/coreplugin/actionmanager/commandmappings.h

@@ -41,13 +41,6 @@ QT_BEGIN_NAMESPACE
 class QLineEdit;
 class QTreeWidget;
 class QTreeWidgetItem;
-namespace Core {
-namespace Internal {
-namespace Ui {
-class CommandMappings;
-} // namespace Ui
-} // namespace Internal
-} // namespace Core
 QT_END_NAMESPACE
 
 namespace Core {
@@ -56,6 +49,8 @@ class Command;
 
 namespace Internal {
 
+namespace Ui { class CommandMappings; }
+
 class ActionManagerPrivate;
 class MainWindow;
 

src/plugins/coreplugin/variablechooser.h

@@ -43,23 +43,14 @@ class QLineEdit;
 class QTextEdit;
 class QPlainTextEdit;
 class QListWidgetItem;
-
-namespace Core {
-namespace Internal {
-namespace Ui {
-class VariableChooser;
-} // namespace Ui
-} // namespace Internal
-} // namespace Core
-
 QT_END_NAMESPACE
 
-namespace Utils {
-class IconButton;
-} // namespace Utils
+namespace Utils { class IconButton; }
 
 namespace Core {
 
+namespace Internal { namespace Ui { class VariableChooser; } }
+
 class CORE_EXPORT VariableChooser : public QWidget
 {
     Q_OBJECT
@@ -90,4 +81,5 @@ private:
 };
 
 } // namespace Core
+
 #endif // VARIABLECHOOSER_H

src/plugins/cpptools/completionsettingspage.h

@@ -36,18 +36,10 @@
 #include <texteditor/completionsettings.h>
 #include <texteditor/texteditoroptionspage.h>
 
-QT_BEGIN_NAMESPACE
 namespace CppTools {
 namespace Internal {
-namespace Ui {
-class CompletionSettingsPage;
-} // namespace Ui
-} // namespace Internal
-} // namespace CppTools
-QT_END_NAMESPACE
 
-namespace CppTools {
-namespace Internal {
+namespace Ui { class CompletionSettingsPage; }
 
 // TODO: Move this class to the text editor plugin
 

src/plugins/cpptools/cppcodestylesettings.h

@@ -88,11 +88,10 @@ public:
     void fromMap(const QString &prefix, const QVariantMap &map);
 
     bool equals(const CppCodeStyleSettings &rhs) const;
+    bool operator==(const CppCodeStyleSettings &s) const { return equals(s); }
+    bool operator!=(const CppCodeStyleSettings &s) const { return !equals(s); }
 };
 
-inline bool operator==(const CppCodeStyleSettings &s1, const CppCodeStyleSettings &s2) { return s1.equals(s2); }
-inline bool operator!=(const CppCodeStyleSettings &s1, const CppCodeStyleSettings &s2) { return !s1.equals(s2); }
-
 } // namespace CppTools
 
 Q_DECLARE_METATYPE(CppTools::CppCodeStyleSettings)

src/plugins/cpptools/cppfilesettingspage.h

@@ -34,27 +34,20 @@
 #define CPPSETTINGSPAGE_H
 
 #include <coreplugin/dialogs/ioptionspage.h>
+
 #include <QtCore/QPointer>
 #include <QtCore/QSharedPointer>
 #include <QtGui/QWidget>
 
 QT_BEGIN_NAMESPACE
-
-namespace CppTools {
-namespace Internal {
-namespace Ui {
-class CppFileSettingsPage;
-} // namespace Ui
-} // namespace Internal
-} // namespace CppTools
-
 class QSettings;
-
 QT_END_NAMESPACE
 
 namespace CppTools {
 namespace Internal {
 
+namespace Ui { class CppFileSettingsPage; }
+
 struct CppFileSettings
 {
     CppFileSettings();
@@ -73,11 +66,10 @@ struct CppFileSettings
     static QString licenseTemplate(const QString &file = QString(), const QString &className = QString());
 
     bool equals(const CppFileSettings &rhs) const;
+    bool operator==(const CppFileSettings &s) const { return equals(s); }
+    bool operator!=(const CppFileSettings &s) const { return !equals(s); }
 };
 
-inline bool operator==(const CppFileSettings &s1, const CppFileSettings &s2) { return s1.equals(s2); }
-inline bool operator!=(const CppFileSettings &s1, const CppFileSettings &s2) { return !s1.equals(s2); }
-
 class CppFileSettingsWidget : public QWidget
 {
     Q_OBJECT
@@ -98,7 +90,7 @@ private:
     inline QString licenseTemplatePath() const;
     inline void setLicenseTemplatePath(const QString &);
 
-    Internal::Ui::CppFileSettingsPage *m_ui;
+    Ui::CppFileSettingsPage *m_ui;
 };
 
 class CppFileSettingsPage : public Core::IOptionsPage

src/plugins/debugger/debuggerdialogs.h

@@ -39,14 +39,17 @@
 #include <QtGui/QVBoxLayout>
 
 QT_BEGIN_NAMESPACE
-
 class QModelIndex;
 class QPushButton;
 class QLineEdit;
 class QDialogButtonBox;
+QT_END_NAMESPACE
+
+namespace ProjectExplorer { class Abi; }
 
 namespace Debugger {
 namespace Internal {
+
 namespace Ui {
 class AttachCoreDialog;
 class AttachExternalDialog;
@@ -55,17 +58,6 @@ class StartRemoteDialog;
 class AttachToQmlPortDialog;
 class StartRemoteEngineDialog;
 } // namespace Ui
-} // namespace Internal
-} // namespace Debugger
-
-QT_END_NAMESPACE
-
-namespace ProjectExplorer {
-class Abi;
-}
-
-namespace Debugger {
-namespace Internal {
 
 class ProcessListFilterModel;
 

src/plugins/genericprojectmanager/genericmakestep.h

@@ -36,17 +36,7 @@
 #include <projectexplorer/abstractprocessstep.h>
 
 QT_BEGIN_NAMESPACE
-
 class QListWidgetItem;
-
-namespace GenericProjectManager {
-namespace Internal {
-namespace Ui {
-class GenericMakeStep;
-} // namespace Ui
-} // namespace Internal
-} // namespace GenericProjectManager
-
 QT_END_NAMESPACE
 
 namespace GenericProjectManager {
@@ -55,10 +45,12 @@ namespace Internal {
 class GenericBuildConfiguration;
 class GenericMakeStepConfigWidget;
 class GenericMakeStepFactory;
+namespace Ui { class GenericMakeStep; }
 
 class GenericMakeStep : public ProjectExplorer::AbstractProcessStep
 {
     Q_OBJECT
+
     friend class GenericMakeStepConfigWidget; // TODO remove again?
     friend class GenericMakeStepFactory;
 

src/plugins/genericprojectmanager/genericproject.h

@@ -61,6 +61,7 @@ class ToolChain;
 
 namespace GenericProjectManager {
 namespace Internal {
+
 class GenericBuildConfiguration;
 class GenericProject;
 class GenericTarget;

src/plugins/genericprojectmanager/genericprojectplugin.h

@@ -39,8 +39,8 @@
 #include <QtGui/QAction>
 
 namespace ProjectExplorer {
-    class Project;
-    class Node;
+class Project;
+class Node;
 }
 
 namespace GenericProjectManager {
@@ -48,7 +48,7 @@ namespace Internal {
 
 class ProjectFilesFactory;
 
-class GenericProjectPlugin: public ExtensionSystem::IPlugin
+class GenericProjectPlugin : public ExtensionSystem::IPlugin
 {
     Q_OBJECT
 

src/plugins/madde/maemodeployconfigurationwidget.h

@@ -35,18 +35,6 @@
 
 #include <projectexplorer/deployconfiguration.h>
 
-QT_BEGIN_NAMESPACE
-
-namespace Madde {
-namespace Internal {
-namespace Ui {
-class MaemoDeployConfigurationWidget;
-} // namespace Ui
-} // namespace Internal
-} // namespace Madde
-
-QT_END_NAMESPACE
-
 namespace RemoteLinux {
 class DeployableFilesPerProFile;
 class RemoteLinuxDeployConfigurationWidget;
@@ -54,7 +42,10 @@ class RemoteLinuxDeployConfigurationWidget;
 
 namespace Madde {
 namespace Internal {
+
 class Qt4MaemoDeployConfiguration;
+namespace Ui { class MaemoDeployConfigurationWidget; }
+
 
 class MaemoDeployConfigurationWidget : public ProjectExplorer::DeployConfigurationWidget
 {

src/plugins/madde/maemopackagecreationwidget.h

@@ -34,25 +34,16 @@
 
 #include <projectexplorer/buildstep.h>
 
-QT_BEGIN_NAMESPACE
-
 namespace Madde {
 namespace Internal {
-namespace Ui {
-class MaemoPackageCreationWidget;
-} // namespace Ui
-} // namespace Internal
-} // namespace Madde
-
-QT_END_NAMESPACE
 
-namespace Madde {
-namespace Internal {
+namespace Ui { class MaemoPackageCreationWidget; }
 class AbstractMaemoPackageCreationStep;
 
 class MaemoPackageCreationWidget : public ProjectExplorer::BuildStepConfigWidget
 {
     Q_OBJECT
+
 public:
     MaemoPackageCreationWidget(AbstractMaemoPackageCreationStep *step);
     ~MaemoPackageCreationWidget();

src/plugins/madde/maemopublishingbuildsettingspagefremantlefree.h

@@ -29,28 +29,21 @@
 ** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
+
 #ifndef MAEMOPUBLISHINGBUILDSETTINGSPAGEFREMANTLEFREE_H
 #define MAEMOPUBLISHINGBUILDSETTINGSPAGEFREMANTLEFREE_H
 
 #include <QtCore/QList>
 #include <QtGui/QWizardPage>
 
-QT_BEGIN_NAMESPACE
-namespace Madde {
-namespace Internal {
-namespace Ui {
-class MaemoPublishingWizardPageFremantleFree;
-} // namespace Ui
-} // namespace Internal
-} // namespace Madde
-QT_END_NAMESPACE
-
 namespace ProjectExplorer { class Project; }
 namespace Qt4ProjectManager { class Qt4BuildConfiguration; }
 
 namespace Madde {
 namespace Internal {
+
 class MaemoPublisherFremantleFree;
+namespace Ui { class MaemoPublishingWizardPageFremantleFree; }
 
 class MaemoPublishingBuildSettingsPageFremantleFree : public QWizardPage
 {

src/plugins/madde/maemopublishingfileselectiondialog.h

@@ -35,18 +35,10 @@
 #include <QtCore/QStringList>
 #include <QtGui/QDialog>
 
-QT_BEGIN_NAMESPACE
 namespace Madde {
 namespace Internal {
-namespace Ui {
-class MaemoPublishingFileSelectionDialog;
-} // namespace Ui
-} // namespace Internal
-} // namespace Madde
-QT_END_NAMESPACE
 
-namespace Madde {
-namespace Internal {
+namespace Ui { class MaemoPublishingFileSelectionDialog; }
 
 class MaemoPublishingFileSelectionDialog : public QDialog
 {

src/plugins/madde/maemopublishingresultpagefremantlefree.h

@@ -29,26 +29,17 @@
 ** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
+
 #ifndef MAEMOPUBLISHINGRESULTPAGEFREMANTLEFREE_H
 #define MAEMOPUBLISHINGRESULTPAGEFREMANTLEFREE_H
 
 #include "maemopublisherfremantlefree.h"
 #include <QtGui/QWizardPage>
 
-QT_BEGIN_NAMESPACE
-
 namespace Madde {
 namespace Internal {
-namespace Ui {
-class MaemoPublishingResultPageFremantleFree;
-} // namespace Ui
-} // namespace Internal
-} // namespace Madde
 
-QT_END_NAMESPACE
-
-namespace Madde {
-namespace Internal {
+namespace Ui { class MaemoPublishingResultPageFremantleFree; }
 
 class MaemoPublishingResultPageFremantleFree : public QWizardPage
 {

src/plugins/madde/maemopublishinguploadsettingspagefremantlefree.h

@@ -29,24 +29,17 @@
 ** Nokia at qt-info@nokia.com.
 **
 **************************************************************************/
+
 #ifndef MAEMOPUBLISHINGUPLOADSETTINGSWIZARDPAGE_H
 #define MAEMOPUBLISHINGUPLOADSETTINGSWIZARDPAGE_H
 
 #include <QtGui/QWizardPage>
 
-QT_BEGIN_NAMESPACE
 namespace Madde {
 namespace Internal {
-namespace Ui {
-class MaemoPublishingUploadSettingsPageFremantleFree;
-} // namespace Ui
-} // namespace Internal
-} // namespace Madde
-QT_END_NAMESPACE
 
-namespace Madde {
-namespace Internal {
 class MaemoPublisherFremantleFree;
+namespace Ui { class MaemoPublishingUploadSettingsPageFremantleFree; }
 
 class MaemoPublishingUploadSettingsPageFremantleFree : public QWizardPage
 {

src/plugins/madde/maemoqemusettingswidget.h

@@ -34,20 +34,10 @@
 
 #include <QtGui/QWidget>
 
-QT_BEGIN_NAMESPACE
-
 namespace Madde {
 namespace Internal {
-namespace Ui {
-class MaemoQemuSettingsWidget;
-} // namespace Ui
-} // namespace Internal
-} // namespace Madde
 
-QT_END_NAMESPACE
-
-namespace Madde {
-namespace Internal {
+namespace Ui { class MaemoQemuSettingsWidget; }
 
 class MaemoQemuSettingsWidget : public QWidget
 {

src/plugins/qmljseditor/qmljscomponentnamedialog.h

@@ -35,20 +35,10 @@
 
 #include <QtGui/QDialog>
 
-QT_BEGIN_NAMESPACE
-
 namespace QmlJSEditor {
 namespace Internal {
-namespace Ui {
-    class ComponentNameDialog;
-} // namespace Ui
-} // namespace Internal
-} // namespace QmlJSEditor
 
-QT_END_NAMESPACE
-
-namespace QmlJSEditor {
-namespace Internal {
+namespace Ui { class ComponentNameDialog; }
 
 class ComponentNameDialog : public QDialog
 {

src/plugins/qt4projectmanager/makestep.h

@@ -39,18 +39,6 @@
 #include <projectexplorer/buildstep.h>
 #include <projectexplorer/task.h>
 
-QT_BEGIN_NAMESPACE
-
-namespace Qt4ProjectManager {
-namespace Internal {
-namespace Ui {
-class MakeStep;
-} // namespace Ui
-} // namespace Internal
-} // namespace Qt4ProjectManager
-
-QT_END_NAMESPACE
-
 namespace ProjectExplorer {
 class BuildStep;
 class GnuMakeParser;
@@ -59,10 +47,13 @@ class Project;
 }
 
 namespace Qt4ProjectManager {
+
 class Qt4BuildConfiguration;
 
 namespace Internal {
 
+namespace Ui { class MakeStep; }
+
 class MakeStepFactory : public ProjectExplorer::IBuildStepFactory
 {
     Q_OBJECT

src/plugins/qt4projectmanager/qmakestep.h

@@ -38,18 +38,6 @@
 
 #include <QtCore/QStringList>
 
-QT_BEGIN_NAMESPACE
-
-namespace Qt4ProjectManager {
-namespace Internal {
-namespace Ui {
-class QMakeStep;
-} // namespace Ui
-} // namespace Internal
-} // namespace Qt4ProjectManager
-
-QT_END_NAMESPACE
-
 namespace ProjectExplorer {
 class BuildStep;
 class IBuildStepFactory;
@@ -62,6 +50,8 @@ class Qt4Project;
 
 namespace Internal {
 
+namespace Ui { class QMakeStep; }
+
 class QMakeStepFactory : public ProjectExplorer::IBuildStepFactory
 {
     Q_OBJECT

src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.h

@@ -35,18 +35,6 @@
 
 #include <QtGui/QWizardPage>
 
-QT_BEGIN_NAMESPACE
-
-namespace Qt4ProjectManager {
-namespace Internal {
-namespace Ui {
-class S60PublishingBuildSettingsPageOvi;
-} // namespace Ui
-} // namespace Internal
-} // namespace Qt4ProjectManager
-
-QT_END_NAMESPACE
-
 namespace ProjectExplorer {
 class Project;
 class BuildConfiguration;
@@ -55,13 +43,19 @@ class ToolChain;
 
 namespace Qt4ProjectManager {
 namespace Internal {
+
+namespace Ui { class S60PublishingBuildSettingsPageOvi; }
+
 class S60PublisherOvi;
 
+
 class S60PublishingBuildSettingsPageOvi : public QWizardPage
 {
     Q_OBJECT
+
 public:
-    explicit S60PublishingBuildSettingsPageOvi(S60PublisherOvi *publisher, const ProjectExplorer::Project *project, QWidget *parent = 0);
+    explicit S60PublishingBuildSettingsPageOvi(S60PublisherOvi *publisher,
+        const ProjectExplorer::Project *project, QWidget *parent = 0);
     ~S60PublishingBuildSettingsPageOvi();
 
     virtual bool isComplete() const;
@@ -80,7 +74,7 @@ private:
 private:
     ProjectExplorer::BuildConfiguration *m_bc;
     ProjectExplorer::ToolChain *m_toolchain;
-    Ui::S60PublishingBuildSettingsPageOvi * m_ui;
+    Ui::S60PublishingBuildSettingsPageOvi *m_ui;
     S60PublisherOvi * const m_publisher;
 };
 

src/plugins/qt4projectmanager/qt-s60/s60publishingresultspageovi.h

@@ -35,25 +35,17 @@
 
 #include <QWizardPage>
 
-QT_BEGIN_NAMESPACE
-
 namespace Qt4ProjectManager {
 namespace Internal {
-namespace Ui {
-class S60PublishingResultsPageOvi;
-} // namespace Ui
-} // namespace Internal
-} // namespace Qt4ProjectManager
-
-QT_END_NAMESPACE
 
-namespace Qt4ProjectManager {
-namespace Internal {
 class S60PublisherOvi;
 
+namespace Ui { class S60PublishingResultsPageOvi; }
+
 class S60PublishingResultsPageOvi : public QWizardPage
 {
     Q_OBJECT
+
 public:
     explicit S60PublishingResultsPageOvi(S60PublisherOvi *publisher, QWidget *parent = 0);
     ~S60PublishingResultsPageOvi();

src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.h

@@ -36,25 +36,18 @@
 #include <QtGui/QWizardPage>
 
 QT_BEGIN_NAMESPACE
-
-namespace Qt4ProjectManager {
-namespace Internal {
-namespace Ui {
-class S60PublishingSisSettingsPageOvi;
-} // namespace Ui
-} // namespace Internal
-} // namespace Qt4ProjectManager
-
 class QLabel;
-