From 312f6d0ff1703046be3a774855e91637567ef1be Mon Sep 17 00:00:00 2001
From: Christian Kamm <christian.d.kamm@nokia.com>
Date: Tue, 24 May 2011 13:56:19 +0200
Subject: [PATCH] C++ style settings: Compile fix for namespaced Qt.

Change-Id: I89db5239576385823315443474669f5fd9ef69b4
Reviewed-on: http://codereview.qt.nokia.com/87
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk
---
 src/plugins/cpptools/cppcodestylesettingspage.cpp |  2 +-
 src/plugins/cpptools/cppcodestylesettingspage.h   | 10 ++++------
 src/plugins/cpptools/cppcodestylesettingspage.ui  |  8 ++++----
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/plugins/cpptools/cppcodestylesettingspage.cpp b/src/plugins/cpptools/cppcodestylesettingspage.cpp
index ba01ed3fb32..a9da3c0981e 100644
--- a/src/plugins/cpptools/cppcodestylesettingspage.cpp
+++ b/src/plugins/cpptools/cppcodestylesettingspage.cpp
@@ -179,7 +179,7 @@ CppCodeStylePreferencesWidget::CppCodeStylePreferencesWidget(QWidget *parent)
     : QWidget(parent),
       m_tabPreferences(0),
       m_cppCodeStylePreferences(0),
-      m_ui(new ::Ui::CppCodeStyleSettingsPage)
+      m_ui(new Ui::CppCodeStyleSettingsPage)
 {
     m_ui->setupUi(this);
 
diff --git a/src/plugins/cpptools/cppcodestylesettingspage.h b/src/plugins/cpptools/cppcodestylesettingspage.h
index fd4e78bf85b..f599f8bcdd5 100644
--- a/src/plugins/cpptools/cppcodestylesettingspage.h
+++ b/src/plugins/cpptools/cppcodestylesettingspage.h
@@ -13,12 +13,6 @@
 #include "cppcodestylesettings.h"
 #include "cppcodeformatter.h"
 
-QT_BEGIN_NAMESPACE
-namespace Ui {
-    class CppCodeStyleSettingsPage;
-}
-QT_END_NAMESPACE
-
 namespace TextEditor {
     class FontSettings;
     class TabSettings;
@@ -33,6 +27,10 @@ class CppCodeStylePreferences;
 
 namespace Internal {
 
+namespace Ui {
+class CppCodeStyleSettingsPage;
+}
+
 class CppCodeStylePreferencesWidget : public QWidget
 {
     Q_OBJECT
diff --git a/src/plugins/cpptools/cppcodestylesettingspage.ui b/src/plugins/cpptools/cppcodestylesettingspage.ui
index 74561d23674..8909fced93f 100644
--- a/src/plugins/cpptools/cppcodestylesettingspage.ui
+++ b/src/plugins/cpptools/cppcodestylesettingspage.ui
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>CppCodeStyleSettingsPage</class>
- <widget class="QWidget" name="CppCodeStyleSettingsPage">
+ <class>CppTools::Internal::CppCodeStyleSettingsPage</class>
+ <widget class="QWidget" name="CppTools::Internal::CppCodeStyleSettingsPage">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>759</width>
-    <height>467</height>
+    <width>757</width>
+    <height>465</height>
    </rect>
   </property>
   <property name="windowTitle">