diff options
| author | Tobias Hunger <tobias.hunger@nokia.com> | 2011-11-23 15:15:01 +0000 |
|---|---|---|
| committer | hjk <qthjk@ovi.com> | 2011-11-24 10:49:41 +0100 |
| commit | 0ce9fa2c16073f85ed17890088f6e40f523ce928 (patch) | |
| tree | b9baa3db68e42a3edb545b20fd003bbc49a321ba /src/plugins/qmldesigner | |
| parent | 88fd98fbc4dc15afa4f42f84045dcdff38b9b301 (diff) | |
| download | qt-creator-0ce9fa2c16073f85ed17890088f6e40f523ce928.tar.gz | |
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>
Diffstat (limited to 'src/plugins/qmldesigner')
3 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.cpp b/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.cpp index 765d84ab7b..836e0ae249 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.cpp @@ -92,7 +92,7 @@ void BehaviorWidget::buttonPressed(bool show) } } -BehaviorDialog::BehaviorDialog(QWidget *parent) : QDialog(parent), m_ui(new Ui_BehaviorDialog) +BehaviorDialog::BehaviorDialog(QWidget *parent) : QDialog(parent), m_ui(new Internal::Ui::BehaviorDialog) { m_ui->setupUi(this); setModal(true); diff --git a/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.h b/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.h index b743d4ba3c..413c77b616 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.h +++ b/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.h @@ -91,7 +91,7 @@ public slots: private: ModelNode m_modelNode; QString m_propertyName; - QScopedPointer<Ui_BehaviorDialog> m_ui; + QScopedPointer<Internal::Ui::BehaviorDialog> m_ui; }; diff --git a/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.ui b/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.ui index c04735264a..2d0d3257d2 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.ui +++ b/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.ui @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>BehaviorDialog</class> - <widget class="QDialog" name="BehaviorDialog"> + <class>QmlDesigner::Internal::BehaviorDialog</class> + <widget class="QDialog" name="QmlDesigner::Internal::BehaviorDialog"> <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>267</width> - <height>333</height> + <width>269</width> + <height>354</height> </rect> </property> <property name="sizePolicy"> @@ -423,7 +423,7 @@ qlineargradient(spread:pad, x1:0.585, y1:0.0284091, x2:0.517, y2:1, stop:0 rgba( <connection> <sender>ButtonGroup</sender> <signal>accepted()</signal> - <receiver>BehaviorDialog</receiver> + <receiver>QmlDesigner::Internal::BehaviorDialog</receiver> <slot>accept()</slot> <hints> <hint type="sourcelabel"> @@ -439,7 +439,7 @@ qlineargradient(spread:pad, x1:0.585, y1:0.0284091, x2:0.517, y2:1, stop:0 rgba( <connection> <sender>ButtonGroup</sender> <signal>rejected()</signal> - <receiver>BehaviorDialog</receiver> + <receiver>QmlDesigner::Internal::BehaviorDialog</receiver> <slot>reject()</slot> <hints> <hint type="sourcelabel"> |