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/coreplugin/actionmanager | |
| 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/coreplugin/actionmanager')
3 files changed, 17 insertions, 6 deletions
diff --git a/src/plugins/coreplugin/actionmanager/commandmappings.cpp b/src/plugins/coreplugin/actionmanager/commandmappings.cpp index 8c6b065b81..32f065c08f 100644 --- a/src/plugins/coreplugin/actionmanager/commandmappings.cpp +++ b/src/plugins/coreplugin/actionmanager/commandmappings.cpp @@ -69,7 +69,7 @@ CommandMappings::~CommandMappings() QWidget *CommandMappings::createPage(QWidget *parent) { - m_page = new Ui_CommandMappings(); + m_page = new Ui::CommandMappings(); QWidget *w = new QWidget(parent); m_page->setupUi(w); m_page->targetEdit->setAutoHideButton(Utils::FancyLineEdit::Right, true); diff --git a/src/plugins/coreplugin/actionmanager/commandmappings.h b/src/plugins/coreplugin/actionmanager/commandmappings.h index b3e92cab29..217b5098d4 100644 --- a/src/plugins/coreplugin/actionmanager/commandmappings.h +++ b/src/plugins/coreplugin/actionmanager/commandmappings.h @@ -41,7 +41,13 @@ QT_BEGIN_NAMESPACE class QLineEdit; class QTreeWidget; class QTreeWidgetItem; -class Ui_CommandMappings; +namespace Core { +namespace Internal { +namespace Ui { +class CommandMappings; +} // namespace Ui +} // namespace Internal +} // namespace Core QT_END_NAMESPACE namespace Core { @@ -92,7 +98,7 @@ protected: virtual void markPossibleCollisions(QTreeWidgetItem *) {} virtual void resetCollisionMarkers() {} private: - Ui_CommandMappings *m_page; + Internal::Ui::CommandMappings *m_page; }; } // namespace Core diff --git a/src/plugins/coreplugin/actionmanager/commandmappings.ui b/src/plugins/coreplugin/actionmanager/commandmappings.ui index 8a6cb60746..ee4f1119cd 100644 --- a/src/plugins/coreplugin/actionmanager/commandmappings.ui +++ b/src/plugins/coreplugin/actionmanager/commandmappings.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>CommandMappings</class> - <widget class="QWidget" name="CommandMappings"> + <class>Core::Internal::CommandMappings</class> + <widget class="QWidget" name="Core::Internal::CommandMappings"> <property name="geometry"> <rect> <x>0</x> @@ -155,8 +155,13 @@ </widget> <customwidgets> <customwidget> - <class>Utils::FilterLineEdit</class> + <class>Utils::FancyLineEdit</class> <extends>QLineEdit</extends> + <header location="global">utils/fancylineedit.h</header> + </customwidget> + <customwidget> + <class>Utils::FilterLineEdit</class> + <extends>Utils::FancyLineEdit</extends> <header location="global">utils/filterlineedit.h</header> </customwidget> </customwidgets> |