UI files: Do not polute the global Ui namespace

Make sure all ui-files are in the plugin's internal namespace.

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

11 files changed, 61 insertions, 45 deletions

diff --git a/src/plugins/debugger/attachcoredialog.ui b/src/plugins/debugger/attachcoredialog.ui
index 9a8aa98335..680a603d3b 100644
--- a/src/plugins/debugger/attachcoredialog.ui
+++ b/src/plugins/debugger/attachcoredialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>AttachCoreDialog</class>
- <widget class="QDialog" name="AttachCoreDialog">
+ <class>Debugger::Internal::AttachCoreDialog</class>
+ <widget class="QDialog" name="Debugger::Internal::AttachCoreDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -42,7 +42,7 @@
       </widget>
      </item>
      <item row="0" column="1">
-      <widget class="Utils::PathChooser" name="execFileName"/>
+      <widget class="Utils::PathChooser" name="execFileName" native="true"/>
      </item>
      <item row="1" column="0">
       <widget class="QLabel" name="coreLabel">
@@ -55,7 +55,7 @@
       </widget>
      </item>
      <item row="1" column="1">
-      <widget class="Utils::PathChooser" name="coreFileName"/>
+      <widget class="Utils::PathChooser" name="coreFileName" native="true"/>
      </item>
      <item row="2" column="0">
       <widget class="QLabel" name="toolchainLabel">
@@ -81,7 +81,7 @@
       </widget>
      </item>
      <item row="3" column="1">
-      <widget class="Utils::PathChooser" name="sysrootPathChooser"/>
+      <widget class="Utils::PathChooser" name="sysrootPathChooser" native="true"/>
      </item>
      <item row="4" column="0">
       <widget class="QLabel" name="overrideStartScriptLabel">
@@ -94,7 +94,7 @@
       </widget>
      </item>
      <item row="4" column="1">
-      <widget class="Utils::PathChooser" name="overrideStartScriptFileName"/>
+      <widget class="Utils::PathChooser" name="overrideStartScriptFileName" native="true"/>
      </item>
     </layout>
    </item>
@@ -136,6 +136,10 @@
    <extends>QWidget</extends>
    <header location="global">utils/pathchooser.h</header>
    <container>1</container>
+   <slots>
+    <signal>editingFinished()</signal>
+    <signal>browsingFinished()</signal>
+   </slots>
   </customwidget>
   <customwidget>
    <class>Debugger::Internal::DebuggerToolChainComboBox</class>
diff --git a/src/plugins/debugger/attachexternaldialog.ui b/src/plugins/debugger/attachexternaldialog.ui
index 6767ea86a9..c2f945a4cc 100644
--- a/src/plugins/debugger/attachexternaldialog.ui
+++ b/src/plugins/debugger/attachexternaldialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>AttachExternalDialog</class>
- <widget class="QDialog" name="AttachExternalDialog">
+ <class>Debugger::Internal::AttachExternalDialog</class>
+ <widget class="QDialog" name="Debugger::Internal::AttachExternalDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
diff --git a/src/plugins/debugger/attachtoqmlportdialog.ui b/src/plugins/debugger/attachtoqmlportdialog.ui
index fdcc849cf3..caf141f5df 100644
--- a/src/plugins/debugger/attachtoqmlportdialog.ui
+++ b/src/plugins/debugger/attachtoqmlportdialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>AttachToQmlPortDialog</class>
- <widget class="QDialog" name="AttachToQmlPortDialog">
+ <class>Debugger::Internal::AttachToQmlPortDialog</class>
+ <widget class="QDialog" name="Debugger::Internal::AttachToQmlPortDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -86,6 +86,10 @@
    <extends>QWidget</extends>
    <header location="global">utils/pathchooser.h</header>
    <container>1</container>
+   <slots>
+    <signal>editingFinished()</signal>
+    <signal>browsingFinished()</signal>
+   </slots>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/src/plugins/debugger/commonoptionspage.ui b/src/plugins/debugger/commonoptionspage.ui
index 3e8ec5e937..8cf9ae4f0e 100644
--- a/src/plugins/debugger/commonoptionspage.ui
+++ b/src/plugins/debugger/commonoptionspage.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>CommonOptionsPage</class>
- <widget class="QWidget" name="CommonOptionsPage">
+ <class>Debugger::Internal::CommonOptionsPage</class>
+ <widget class="QWidget" name="Debugger::Internal::CommonOptionsPage">
   <property name="geometry">
    <rect>
     <x>0</x>
diff --git a/src/plugins/debugger/debuggerdialogs.h b/src/plugins/debugger/debuggerdialogs.h
index a484143d33..c8c726779a 100644
--- a/src/plugins/debugger/debuggerdialogs.h
+++ b/src/plugins/debugger/debuggerdialogs.h
@@ -45,6 +45,8 @@ class QPushButton;
 class QLineEdit;
 class QDialogButtonBox;
 
+namespace Debugger {
+namespace Internal {
 namespace Ui {
 class AttachCoreDialog;
 class AttachExternalDialog;
@@ -53,6 +55,8 @@ class StartRemoteDialog;
 class AttachToQmlPortDialog;
 class StartRemoteEngineDialog;
 } // namespace Ui
+} // namespace Internal
+} // namespace Debugger
 
 QT_END_NAMESPACE
 
diff --git a/src/plugins/debugger/dumperoptionpage.ui b/src/plugins/debugger/dumperoptionpage.ui
index eb8c227ff4..7c500d6014 100644
--- a/src/plugins/debugger/dumperoptionpage.ui
+++ b/src/plugins/debugger/dumperoptionpage.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>DebuggingHelperOptionPage</class>
- <widget class="QWidget" name="DebuggingHelperOptionPage">
+ <class>Debugger::Internal::DebuggingHelperOptionPage</class>
+ <widget class="QWidget" name="Debugger::Internal::DebuggingHelperOptionPage">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -88,18 +88,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>Utils::PathChooser</class>
-   <extends>QWidget</extends>
-   <header location="global">utils/pathchooser.h</header>
-   <container>1</container>
-   <slots>
-    <signal>editingFinished()</signal>
-    <signal>browsingFinished()</signal>
-   </slots>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/plugins/debugger/gdb/gdboptionspage.ui b/src/plugins/debugger/gdb/gdboptionspage.ui
index b389ce882a..a53133d4aa 100644
--- a/src/plugins/debugger/gdb/gdboptionspage.ui
+++ b/src/plugins/debugger/gdb/gdboptionspage.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>GdbOptionsPage</class>
- <widget class="QWidget" name="GdbOptionsPage">
+ <class>Debugger::Internal::GdbOptionsPage</class>
+ <widget class="QWidget" name="Debugger::Internal::GdbOptionsPage">
   <property name="geometry">
    <rect>
     <x>0</x>
diff --git a/src/plugins/debugger/lldb/lldboptionspagewidget.ui b/src/plugins/debugger/lldb/lldboptionspagewidget.ui
index d9db166c90..78e77699f0 100644
--- a/src/plugins/debugger/lldb/lldboptionspagewidget.ui
+++ b/src/plugins/debugger/lldb/lldboptionspagewidget.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>LldbOptionsPageWidget</class>
- <widget class="QWidget" name="LldbOptionsPageWidget">
+ <class>Debugger::Internal::LldbOptionsPageWidget</class>
+ <widget class="QWidget" name="Debugger::Internal::LldbOptionsPageWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
diff --git a/src/plugins/debugger/startexternaldialog.ui b/src/plugins/debugger/startexternaldialog.ui
index ab6047a9b2..f694b7c8fd 100644
--- a/src/plugins/debugger/startexternaldialog.ui
+++ b/src/plugins/debugger/startexternaldialog.ui
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>StartExternalDialog</class>
- <widget class="QDialog" name="StartExternalDialog">
+ <class>Debugger::Internal::StartExternalDialog</class>
+ <widget class="QDialog" name="Debugger::Internal::StartExternalDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>263</width>
+    <height>214</height>
+   </rect>
+  </property>
   <property name="windowTitle">
    <string>Start Debugger</string>
   </property>
@@ -28,7 +36,7 @@
       </widget>
      </item>
      <item row="0" column="1">
-      <widget class="Utils::PathChooser" name="execFile"/>
+      <widget class="Utils::PathChooser" name="execFile" native="true"/>
      </item>
      <item row="1" column="0">
       <widget class="QLabel" name="argsLabel">
@@ -67,7 +75,7 @@
       </widget>
      </item>
      <item row="3" column="1">
-      <widget class="Utils::PathChooser" name="workingDirectory"/>
+      <widget class="Utils::PathChooser" name="workingDirectory" native="true"/>
      </item>
      <item row="4" column="0">
       <widget class="QLabel" name="toolChainLabel">
@@ -139,6 +147,10 @@
    <extends>QWidget</extends>
    <header location="global">utils/pathchooser.h</header>
    <container>1</container>
+   <slots>
+    <signal>editingFinished()</signal>
+    <signal>browsingFinished()</signal>
+   </slots>
   </customwidget>
   <customwidget>
    <class>Debugger::Internal::DebuggerToolChainComboBox</class>
diff --git a/src/plugins/debugger/startremotedialog.ui b/src/plugins/debugger/startremotedialog.ui
index 1dabe7c23d..24794c04c9 100644
--- a/src/plugins/debugger/startremotedialog.ui
+++ b/src/plugins/debugger/startremotedialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>StartRemoteDialog</class>
- <widget class="QDialog" name="StartRemoteDialog">
+ <class>Debugger::Internal::StartRemoteDialog</class>
+ <widget class="QDialog" name="Debugger::Internal::StartRemoteDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -27,7 +27,7 @@
       </widget>
      </item>
      <item row="0" column="1">
-      <widget class="Utils::PathChooser" name="debuggerPathChooser"/>
+      <widget class="Utils::PathChooser" name="debuggerPathChooser" native="true"/>
      </item>
      <item row="1" column="0">
       <widget class="QLabel" name="executableLabel">
@@ -40,7 +40,7 @@
       </widget>
      </item>
      <item row="1" column="1">
-      <widget class="Utils::PathChooser" name="executablePathChooser"/>
+      <widget class="Utils::PathChooser" name="executablePathChooser" native="true"/>
      </item>
      <item row="2" column="0">
       <widget class="QLabel" name="channelLabel">
@@ -104,7 +104,7 @@
       </widget>
      </item>
      <item row="5" column="1">
-      <widget class="Utils::PathChooser" name="sysrootPathChooser"/>
+      <widget class="Utils::PathChooser" name="sysrootPathChooser" native="true"/>
      </item>
      <item row="6" column="0">
       <widget class="QLabel" name="debuginfoLabel">
@@ -117,7 +117,7 @@
       </widget>
      </item>
      <item row="6" column="1">
-      <widget class="Utils::PathChooser" name="debuginfoPathChooser"/>
+      <widget class="Utils::PathChooser" name="debuginfoPathChooser" native="true"/>
      </item>
      <item row="7" column="0">
       <widget class="QLabel" name="overrideStartScriptLabel">
@@ -130,7 +130,7 @@
       </widget>
      </item>
      <item row="7" column="1">
-      <widget class="Utils::PathChooser" name="overrideStartScriptPathChooser"/>
+      <widget class="Utils::PathChooser" name="overrideStartScriptPathChooser" native="true"/>
      </item>
      <item row="8" column="0">
       <widget class="QLabel" name="useServerStartScriptLabel">
@@ -156,7 +156,7 @@
       </widget>
      </item>
      <item row="9" column="1">
-      <widget class="Utils::PathChooser" name="serverStartScriptPathChooser"/>
+      <widget class="Utils::PathChooser" name="serverStartScriptPathChooser" native="true"/>
      </item>
     </layout>
    </item>
@@ -178,6 +178,10 @@
    <extends>QWidget</extends>
    <header location="global">utils/pathchooser.h</header>
    <container>1</container>
+   <slots>
+    <signal>editingFinished()</signal>
+    <signal>browsingFinished()</signal>
+   </slots>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/src/plugins/debugger/startremoteenginedialog.ui b/src/plugins/debugger/startremoteenginedialog.ui
index 83d647e0fc..1f686f7938 100644
--- a/src/plugins/debugger/startremoteenginedialog.ui
+++ b/src/plugins/debugger/startremoteenginedialog.ui
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>StartRemoteEngineDialog</class>
- <widget class="QDialog" name="StartRemoteEngineDialog">
+ <class>Debugger::Internal::StartRemoteEngineDialog</class>
+ <widget class="QDialog" name="Debugger::Internal::StartRemoteEngineDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>233</width>
-    <height>207</height>
+    <height>214</height>
    </rect>
   </property>
   <property name="windowTitle">