From 2d05c9a2f41f762daf818474303b25974572ca22 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 8 Aug 2013 14:22:01 +0200 Subject: [PATCH] ProjectExplorer: Add missing namespace around CustomParserConfigDialog. This also fixes compilation with namespaced Qt. Change-Id: I74c15a97c81cc414d1d850cb0dabf72014c7ff6b Reviewed-by: Tobias Hunger Reviewed-by: Orgad Shaneh --- src/plugins/projectexplorer/customparserconfigdialog.cpp | 6 ++++++ src/plugins/projectexplorer/customparserconfigdialog.h | 8 ++++++-- src/plugins/projectexplorer/customparserconfigdialog.ui | 8 ++++---- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/plugins/projectexplorer/customparserconfigdialog.cpp b/src/plugins/projectexplorer/customparserconfigdialog.cpp index c236abe1a54..b45c745c8f9 100644 --- a/src/plugins/projectexplorer/customparserconfigdialog.cpp +++ b/src/plugins/projectexplorer/customparserconfigdialog.cpp @@ -33,6 +33,9 @@ #include #include +namespace ProjectExplorer { +namespace Internal { + CustomParserConfigDialog::CustomParserConfigDialog(QDialog *parent) : QDialog(parent), ui(new Ui::CustomParserConfigDialog) @@ -165,3 +168,6 @@ void CustomParserConfigDialog::changed() ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true); m_dirty = true; } + +} // namespace Internal +} // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/customparserconfigdialog.h b/src/plugins/projectexplorer/customparserconfigdialog.h index 53d9d6fec49..1f0e43be832 100644 --- a/src/plugins/projectexplorer/customparserconfigdialog.h +++ b/src/plugins/projectexplorer/customparserconfigdialog.h @@ -34,9 +34,10 @@ #include -QT_BEGIN_NAMESPACE +namespace ProjectExplorer { +namespace Internal { + namespace Ui { class CustomParserConfigDialog; } -QT_END_NAMESPACE class CustomParserConfigDialog : public QDialog { @@ -67,4 +68,7 @@ private: bool m_dirty; }; +} // namespace Internal +} // namespace ProjectExplorer + #endif // CUSTOMPARSERCONFIGDIALOG_H diff --git a/src/plugins/projectexplorer/customparserconfigdialog.ui b/src/plugins/projectexplorer/customparserconfigdialog.ui index 09e37db5b57..86f8bde7621 100644 --- a/src/plugins/projectexplorer/customparserconfigdialog.ui +++ b/src/plugins/projectexplorer/customparserconfigdialog.ui @@ -1,7 +1,7 @@ - CustomParserConfigDialog - + ProjectExplorer::Internal::CustomParserConfigDialog + 0 @@ -211,7 +211,7 @@ buttonBox accepted() - CustomParserConfigDialog + ProjectExplorer::Internal::CustomParserConfigDialog accept() @@ -227,7 +227,7 @@ buttonBox rejected() - CustomParserConfigDialog + ProjectExplorer::Internal::CustomParserConfigDialog reject()