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/qmljseditor | |
| 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/qmljseditor')
| -rw-r--r-- | src/plugins/qmljseditor/qmljscomponentnamedialog.h | 8 | ||||
| -rw-r--r-- | src/plugins/qmljseditor/qmljscomponentnamedialog.ui | 10 |
2 files changed, 12 insertions, 6 deletions
diff --git a/src/plugins/qmljseditor/qmljscomponentnamedialog.h b/src/plugins/qmljseditor/qmljscomponentnamedialog.h index 9bd4777a1e..4ea91267da 100644 --- a/src/plugins/qmljseditor/qmljscomponentnamedialog.h +++ b/src/plugins/qmljseditor/qmljscomponentnamedialog.h @@ -36,9 +36,15 @@ #include <QtGui/QDialog> QT_BEGIN_NAMESPACE + +namespace QmlJSEditor { +namespace Internal { namespace Ui { class ComponentNameDialog; -} +} // namespace Ui +} // namespace Internal +} // namespace QmlJSEditor + QT_END_NAMESPACE namespace QmlJSEditor { diff --git a/src/plugins/qmljseditor/qmljscomponentnamedialog.ui b/src/plugins/qmljseditor/qmljscomponentnamedialog.ui index 3b9171ceec..4bc64c3ce6 100644 --- a/src/plugins/qmljseditor/qmljscomponentnamedialog.ui +++ b/src/plugins/qmljseditor/qmljscomponentnamedialog.ui @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>ComponentNameDialog</class> - <widget class="QDialog" name="ComponentNameDialog"> + <class>QmlJSEditor::Internal::ComponentNameDialog</class> + <widget class="QDialog" name="QmlJSEditor::Internal::ComponentNameDialog"> <property name="geometry"> <rect> <x>0</x> <y>0</y> <width>495</width> - <height>130</height> + <height>138</height> </rect> </property> <property name="windowTitle"> @@ -91,7 +91,7 @@ <connection> <sender>buttonBox</sender> <signal>accepted()</signal> - <receiver>ComponentNameDialog</receiver> + <receiver>QmlJSEditor::Internal::ComponentNameDialog</receiver> <slot>accept()</slot> <hints> <hint type="sourcelabel"> @@ -107,7 +107,7 @@ <connection> <sender>buttonBox</sender> <signal>rejected()</signal> - <receiver>ComponentNameDialog</receiver> + <receiver>QmlJSEditor::Internal::ComponentNameDialog</receiver> <slot>reject()</slot> <hints> <hint type="sourcelabel"> |