Ios: Do not pollute the global/Qt namespace with widgets

Change-Id: Iccaaff6bff386b8d2513ca79daa581d29b3c6fb2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>

src/plugins/ios/iosdeploystepwidget.h

@@ -27,12 +27,11 @@
 
 #include <projectexplorer/buildstep.h>
 
-QT_BEGIN_NAMESPACE
-namespace Ui { class IosDeployStepWidget; }
-QT_END_NAMESPACE
-
 namespace Ios {
 namespace Internal {
+
+namespace Ui { class IosDeployStepWidget; }
+
 class IosDeployStep;
 
 class IosDeployStepWidget : public ProjectExplorer::BuildStepConfigWidget

src/plugins/ios/iosdeploystepwidget.ui

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>IosDeployStepWidget</class>
+ <class>Ios::Internal::IosDeployStepWidget</class>
  <widget class="QWidget" name="IosDeployStepWidget">
   <property name="geometry">
    <rect>

src/plugins/ios/iossettingswidget.cpp

@@ -50,7 +50,7 @@ namespace Internal {
 
 IosSettingsWidget::IosSettingsWidget(QWidget *parent)
     : QWidget(parent),
-      m_ui(new Ui_IosSettingsWidget),
+      m_ui(new Ui::IosSettingsWidget),
       m_saveSettingsRequested(false)
 {
     initGui();

src/plugins/ios/iossettingswidget.h

@@ -32,13 +32,11 @@
 #include <QWidget>
 #include <QAbstractTableModel>
 
-QT_BEGIN_NAMESPACE
-class Ui_IosSettingsWidget;
-QT_END_NAMESPACE
-
 namespace Ios {
 namespace Internal {
 
+namespace Ui { class IosSettingsWidget; }
+
 class IosSettingsWidget : public QWidget
 {
     Q_OBJECT
@@ -52,7 +50,7 @@ public:
 private:
     void initGui();
 
-    Ui_IosSettingsWidget *m_ui;
+    Ui::IosSettingsWidget *m_ui;
     bool m_saveSettingsRequested;
 };
 

src/plugins/ios/iossettingswidget.ui

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>IosSettingsWidget</class>
+ <class>Ios::Internal::IosSettingsWidget</class>
  <widget class="QWidget" name="IosSettingsWidget">
   <property name="geometry">
    <rect>