feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Move PuppetDialog ui files to the QmlDesigner namespace

Browse Source 
Change-Id: Ic8fa31ded61992f05cceee7f5cab85022e9b3d66
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Thomas Hartmann
2015-07-08 12:34:50 +02:00
committed by Thomas Hartmann
parent 749e5a00b1
commit 2dc48cb4ae
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmldesigner/designercore/instances/puppetdialog.cpp
View File

@@ -31,6 +31,8 @@
#include "puppetdialog.h" #include "puppetdialog.h"
#include "ui_puppetdialog.h" #include "ui_puppetdialog.h"
namespace QmlDesigner {
PuppetDialog::PuppetDialog(QWidget *parent) : PuppetDialog::PuppetDialog(QWidget *parent) :
QDialog(parent), QDialog(parent),
ui(new Ui::PuppetDialog) ui(new Ui::PuppetDialog)
@@ -63,3 +65,5 @@ void PuppetDialog::warning(QWidget *parent, const QString &title, const QString
dialog.exec(); dialog.exec();
} }
} //QmlDesigner

7
src/plugins/qmldesigner/designercore/instances/puppetdialog.h
View File

@@ -33,11 +33,12 @@
#include <QDialog> #include <QDialog>
QT_BEGIN_NAMESPACE namespace QmlDesigner {
namespace Ui { namespace Ui {
class PuppetDialog; class PuppetDialog;
} }
QT_END_NAMESPACE
class PuppetDialog : public QDialog class PuppetDialog : public QDialog
{ {
@@ -59,4 +60,6 @@ private:
Ui::PuppetDialog *ui; Ui::PuppetDialog *ui;
}; };
} //QmlDesigner
#endif // PUPPETDIALOG_H #endif // PUPPETDIALOG_H

8
src/plugins/qmldesigner/designercore/instances/puppetdialog.ui
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>PuppetDialog</class> <class>QmlDesigner::PuppetDialog</class>
<widget class="QDialog" name="PuppetDialog"> <widget class="QDialog" name="QmlDesigner::PuppetDialog">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
@@ -63,7 +63,7 @@
<connection> <connection>
<sender>buttonBox</sender> <sender>buttonBox</sender>
<signal>accepted()</signal> <signal>accepted()</signal>
<receiver>PuppetDialog</receiver> <receiver>QmlDesigner::PuppetDialog</receiver>
<slot>accept()</slot> <slot>accept()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
@@ -79,7 +79,7 @@
<connection> <connection>
<sender>buttonBox</sender> <sender>buttonBox</sender>
<signal>rejected()</signal> <signal>rejected()</signal>
<receiver>PuppetDialog</receiver> <receiver>QmlDesigner::PuppetDialog</receiver>
<slot>reject()</slot> <slot>reject()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">