From 684e86adea5e89d6220560e82f1823f99920bb40 Mon Sep 17 00:00:00 2001
From: ck <qt-info@nokia.com>
Date: Tue, 16 Feb 2010 15:11:58 +0100
Subject: Designer: Fix compile for namespaced qt.

---
 tools/designer/src/components/formeditor/formwindow.cpp         | 8 ++------
 tools/designer/src/components/formeditor/formwindow.h           | 1 -
 tools/designer/src/components/formeditor/qdesignerundostack.cpp | 4 ++++
 tools/designer/src/components/formeditor/qdesignerundostack.h   | 3 ++-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tools/designer/src/components/formeditor/formwindow.cpp b/tools/designer/src/components/formeditor/formwindow.cpp
index ccb1984..631ca7c 100644
--- a/tools/designer/src/components/formeditor/formwindow.cpp
+++ b/tools/designer/src/components/formeditor/formwindow.cpp
@@ -1459,12 +1459,6 @@ QDebug operator<<(QDebug in, const ArrowKeyOperation &op)
     return in;
 }
 
-} // namespace qdesigner_internal
-
-Q_DECLARE_METATYPE(qdesigner_internal::ArrowKeyOperation)
-
-namespace qdesigner_internal {
-
 // ArrowKeyPropertyHelper: Applies a struct ArrowKeyOperation
 // (stored as new value) to a list of widgets using to calculate the
 // changed geometry of the widget in setValue(). Thus, the 'newValue'
@@ -2969,3 +2963,5 @@ QUndoStack *FormWindow::commandHistory() const
 } // namespace
 
 QT_END_NAMESPACE
+
+Q_DECLARE_METATYPE(qdesigner_internal::ArrowKeyOperation)
diff --git a/tools/designer/src/components/formeditor/formwindow.h b/tools/designer/src/components/formeditor/formwindow.h
index 06f60b5..dc0026f 100644
--- a/tools/designer/src/components/formeditor/formwindow.h
+++ b/tools/designer/src/components/formeditor/formwindow.h
@@ -76,7 +76,6 @@ class FormWindowWidgetStack;
 class FormWindowManager;
 class FormWindowDnDItem;
 class SetPropertyCommand;
-class QDesignerUndoStack;
 
 class QT_FORMEDITOR_EXPORT FormWindow: public FormWindowBase
 {
diff --git a/tools/designer/src/components/formeditor/qdesignerundostack.cpp b/tools/designer/src/components/formeditor/qdesignerundostack.cpp
index 6996bcd..007031d 100644
--- a/tools/designer/src/components/formeditor/qdesignerundostack.cpp
+++ b/tools/designer/src/components/formeditor/qdesignerundostack.cpp
@@ -44,6 +44,8 @@
 #include <QtGui/QUndoStack>
 #include <QtGui/QUndoCommand>
 
+QT_BEGIN_NAMESPACE
+
 namespace qdesigner_internal {
 
 QDesignerUndoStack::QDesignerUndoStack(QObject *parent) :
@@ -106,3 +108,5 @@ void QDesignerUndoStack::setDirty(bool v)
 }
 
 } // namespace qdesigner_internal
+
+QT_END_NAMESPACE
diff --git a/tools/designer/src/components/formeditor/qdesignerundostack.h b/tools/designer/src/components/formeditor/qdesignerundostack.h
index b1b3389..5451ad8 100644
--- a/tools/designer/src/components/formeditor/qdesignerundostack.h
+++ b/tools/designer/src/components/formeditor/qdesignerundostack.h
@@ -47,7 +47,6 @@
 QT_BEGIN_NAMESPACE
 class QUndoStack;
 class QUndoCommand;
-QT_END_NAMESPACE
 
 namespace qdesigner_internal {
 
@@ -86,4 +85,6 @@ private:
 
 } // namespace qdesigner_internal
 
+QT_END_NAMESPACE
+
 #endif // QDESIGNERUNDOSTACK_H
-- 
cgit v0.12