From 2dc48cb4ae703aefd67e1b9d0219733ed842e487 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
Date: Wed, 8 Jul 2015 12:34:50 +0200
Subject: [PATCH] QmlDesigner: Move PuppetDialog ui files to the QmlDesigner
 namespace

Change-Id: Ic8fa31ded61992f05cceee7f5cab85022e9b3d66
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
---
 .../qmldesigner/designercore/instances/puppetdialog.cpp   | 4 ++++
 .../qmldesigner/designercore/instances/puppetdialog.h     | 7 +++++--
 .../qmldesigner/designercore/instances/puppetdialog.ui    | 8 ++++----
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/plugins/qmldesigner/designercore/instances/puppetdialog.cpp b/src/plugins/qmldesigner/designercore/instances/puppetdialog.cpp
index 9559857dcde..f1c93b19b03 100644
--- a/src/plugins/qmldesigner/designercore/instances/puppetdialog.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/puppetdialog.cpp
@@ -31,6 +31,8 @@
 #include "puppetdialog.h"
 #include "ui_puppetdialog.h"
 
+namespace QmlDesigner {
+
 PuppetDialog::PuppetDialog(QWidget *parent) :
     QDialog(parent),
     ui(new Ui::PuppetDialog)
@@ -63,3 +65,5 @@ void PuppetDialog::warning(QWidget *parent, const QString &title, const QString
 
     dialog.exec();
 }
+
+} //QmlDesigner
diff --git a/src/plugins/qmldesigner/designercore/instances/puppetdialog.h b/src/plugins/qmldesigner/designercore/instances/puppetdialog.h
index f6a99b8a047..3016dd941fb 100644
--- a/src/plugins/qmldesigner/designercore/instances/puppetdialog.h
+++ b/src/plugins/qmldesigner/designercore/instances/puppetdialog.h
@@ -33,11 +33,12 @@
 
 #include <QDialog>
 
-QT_BEGIN_NAMESPACE
+namespace QmlDesigner {
+
 namespace Ui {
 class PuppetDialog;
 }
-QT_END_NAMESPACE
+
 
 class PuppetDialog : public QDialog
 {
@@ -59,4 +60,6 @@ private:
     Ui::PuppetDialog *ui;
 };
 
+} //QmlDesigner
+
 #endif // PUPPETDIALOG_H
diff --git a/src/plugins/qmldesigner/designercore/instances/puppetdialog.ui b/src/plugins/qmldesigner/designercore/instances/puppetdialog.ui
index c0981706b2f..b7efa8c26c3 100644
--- a/src/plugins/qmldesigner/designercore/instances/puppetdialog.ui
+++ b/src/plugins/qmldesigner/designercore/instances/puppetdialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>PuppetDialog</class>
- <widget class="QDialog" name="PuppetDialog">
+ <class>QmlDesigner::PuppetDialog</class>
+ <widget class="QDialog" name="QmlDesigner::PuppetDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -63,7 +63,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>PuppetDialog</receiver>
+   <receiver>QmlDesigner::PuppetDialog</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -79,7 +79,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>PuppetDialog</receiver>
+   <receiver>QmlDesigner::PuppetDialog</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">