From 01b9609c35227a2398ed2a39ebb1da2265bf3396 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= <tomi.korpipaa@digia.com>
Date: Fri, 17 Jan 2014 08:20:49 +0200
Subject: Reintroduced namespace macros, part 2

Added changes lost in merge

Task-number: QTRD-2594
Change-Id: Ib68b5d9294ad65f69443c475ba771dcfd09926bb
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
---
 src/datavisualizationqml2/abstractdeclarative.cpp | 4 ++--
 src/datavisualizationqml2/abstractdeclarative_p.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/datavisualizationqml2')

diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml2/abstractdeclarative.cpp
index 0c4e3b36..093897be 100644
--- a/src/datavisualizationqml2/abstractdeclarative.cpp
+++ b/src/datavisualizationqml2/abstractdeclarative.cpp
@@ -23,7 +23,7 @@
 #include <QGuiApplication>
 #include <QSGSimpleRectNode>
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 static QList<const QQuickWindow *> clearList;
 
@@ -262,4 +262,4 @@ void AbstractDeclarative::wheelEvent(QWheelEvent *event)
     m_controller->wheelEvent(event);
 }
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h
index 19233d5b..2780eb06 100644
--- a/src/datavisualizationqml2/abstractdeclarative_p.h
+++ b/src/datavisualizationqml2/abstractdeclarative_p.h
@@ -39,7 +39,7 @@
 #include <QObject>
 #include <QQuickWindow>
 
-namespace QtDataVisualization {
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 class AbstractDeclarative : public QQuickItem
 {
@@ -142,6 +142,6 @@ private:
 };
 Q_DECLARE_OPERATORS_FOR_FLAGS(AbstractDeclarative::SelectionFlags)
 
-}
+QT_END_NAMESPACE_DATAVISUALIZATION
 
 #endif // ABSTRACTDECLARATIVE_P_H
-- 
cgit v1.2.3