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>

src/plugins/cpptools/completionsettingspage.cpp

@@ -65,7 +65,7 @@ QString CompletionSettingsPage::displayName() const
 QWidget *CompletionSettingsPage::createPage(QWidget *parent)
 {
     QWidget *w = new QWidget(parent);
-    m_page = new Ui_CompletionSettingsPage;
+    m_page = new Ui::CompletionSettingsPage;
     m_page->setupUi(w);
 
     const TextEditor::CompletionSettings &settings =

src/plugins/cpptools/completionsettingspage.h

@@ -37,7 +37,13 @@
 #include <texteditor/texteditoroptionspage.h>
 
 QT_BEGIN_NAMESPACE
-class Ui_CompletionSettingsPage;
+namespace CppTools {
+namespace Internal {
+namespace Ui {
+class CompletionSettingsPage;
+} // namespace Ui
+} // namespace Internal
+} // namespace CppTools
 QT_END_NAMESPACE
 
 namespace CppTools {
@@ -65,7 +71,7 @@ private:
     TextEditor::CaseSensitivity caseSensitivity() const;
     TextEditor::CompletionTrigger completionTrigger() const;
 
-    Ui_CompletionSettingsPage *m_page;
+    Ui::CompletionSettingsPage *m_page;
     QString m_searchKeywords;
 };
 

src/plugins/cpptools/completionsettingspage.ui

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>CompletionSettingsPage</class>
- <widget class="QWidget" name="CompletionSettingsPage">
+ <class>CppTools::Internal::CompletionSettingsPage</class>
+ <widget class="QWidget" name="CppTools::Internal::CompletionSettingsPage">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>363</width>
+    <width>393</width>
     <height>241</height>
    </rect>
   </property>

src/plugins/cpptools/cppfilesettingspage.cpp

@@ -234,7 +234,7 @@ QString CppFileSettings::licenseTemplate(const QString &fileName, const QString
 
 CppFileSettingsWidget::CppFileSettingsWidget(QWidget *parent) :
     QWidget(parent),
-    m_ui(new Ui::CppFileSettingsPage)
+    m_ui(new Internal::Ui::CppFileSettingsPage)
 {
     m_ui->setupUi(this);
     const Core::MimeDatabase *mdb = Core::ICore::instance()->mimeDatabase();

src/plugins/cpptools/cppfilesettingspage.h

@@ -39,10 +39,17 @@
 #include <QtGui/QWidget>
 
 QT_BEGIN_NAMESPACE
+
+namespace CppTools {
+namespace Internal {
 namespace Ui {
-    class CppFileSettingsPage;
-}
+class CppFileSettingsPage;
+} // namespace Ui
+} // namespace Internal
+} // namespace CppTools
+
 class QSettings;
+
 QT_END_NAMESPACE
 
 namespace CppTools {
@@ -91,7 +98,7 @@ private:
     inline QString licenseTemplatePath() const;
     inline void setLicenseTemplatePath(const QString &);
 
-    Ui::CppFileSettingsPage *m_ui;
+    Internal::Ui::CppFileSettingsPage *m_ui;
 };
 
 class CppFileSettingsPage : public Core::IOptionsPage

src/plugins/cpptools/cppfilesettingspage.ui

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>CppFileSettingsPage</class>
- <widget class="QWidget" name="CppFileSettingsPage">
+ <class>CppTools::Internal::CppFileSettingsPage</class>
+ <widget class="QWidget" name="CppTools::Internal::CppFileSettingsPage">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>283</width>
+    <width>291</width>
     <height>142</height>
    </rect>
   </property>
@@ -79,6 +79,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/>