forked from qt-creator/qt-creator
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>
This commit is contained in:
@@ -43,6 +43,15 @@ class QLineEdit;
|
||||
class QTextEdit;
|
||||
class QPlainTextEdit;
|
||||
class QListWidgetItem;
|
||||
|
||||
namespace Core {
|
||||
namespace Internal {
|
||||
namespace Ui {
|
||||
class VariableChooser;
|
||||
} // namespace Ui
|
||||
} // namespace Internal
|
||||
} // namespace Core
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
namespace Utils {
|
||||
@@ -51,10 +60,6 @@ class IconButton;
|
||||
|
||||
namespace Core {
|
||||
|
||||
namespace Ui {
|
||||
class VariableChooser;
|
||||
}
|
||||
|
||||
class CORE_EXPORT VariableChooser : public QWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
@@ -76,7 +81,7 @@ private slots:
|
||||
private:
|
||||
void createIconButton();
|
||||
|
||||
Ui::VariableChooser *ui;
|
||||
Internal::Ui::VariableChooser *ui;
|
||||
QString m_defaultDescription;
|
||||
QPointer<QLineEdit> m_lineEdit;
|
||||
QPointer<QTextEdit> m_textEdit;
|
||||
|
||||
Reference in New Issue
Block a user