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/texteditor/displaysettingspage.cpp | |
| 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/texteditor/displaysettingspage.cpp')
| -rw-r--r-- | src/plugins/texteditor/displaysettingspage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/texteditor/displaysettingspage.cpp b/src/plugins/texteditor/displaysettingspage.cpp index 41a72bdd33..f5e201f8be 100644 --- a/src/plugins/texteditor/displaysettingspage.cpp +++ b/src/plugins/texteditor/displaysettingspage.cpp @@ -46,7 +46,7 @@ struct DisplaySettingsPage::DisplaySettingsPagePrivate explicit DisplaySettingsPagePrivate(const DisplaySettingsPageParameters &p); const DisplaySettingsPageParameters m_parameters; - Ui::DisplaySettingsPage *m_page; + Internal::Ui::DisplaySettingsPage *m_page; DisplaySettings m_displaySettings; QString m_searchKeywords; }; @@ -85,7 +85,7 @@ QString DisplaySettingsPage::displayName() const QWidget *DisplaySettingsPage::createPage(QWidget *parent) { QWidget *w = new QWidget(parent); - d->m_page = new Ui::DisplaySettingsPage; + d->m_page = new Internal::Ui::DisplaySettingsPage; d->m_page->setupUi(w); settingsToUI(); if (d->m_searchKeywords.isEmpty()) { |