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

UI files: Do not polute the global Ui namespace

Browse Source 
Make sure all ui-files are in the plugin's internal namespace.

Change-Id: Ifb2c3093441e8feb89e46f52fbb386fc316cfd13
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Tobias Hunger
2011-11-23 15:15:01 +00:00
committed by hjk
parent 88fd98fbc4
commit 0ce9fa2c16
141 changed files with 790 additions and 647 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/texteditor/displaysettingspage.cpp
View File

@@ -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()) {