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

10
src/plugins/coreplugin/actionmanager/commandmappings.h
View File

@@ -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