diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-01-17 08:20:49 +0200 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-01-17 08:22:15 +0200 |
commit | 01b9609c35227a2398ed2a39ebb1da2265bf3396 (patch) | |
tree | 7af408b0657e86c2cee140c34be7e051a06a2b19 /src/datavisualizationqml2 | |
parent | 2c9963be44c00e7299401e248bc94ef191e0af68 (diff) |
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>
Diffstat (limited to 'src/datavisualizationqml2')
-rw-r--r-- | src/datavisualizationqml2/abstractdeclarative.cpp | 4 | ||||
-rw-r--r-- | src/datavisualizationqml2/abstractdeclarative_p.h | 4 |
2 files changed, 4 insertions, 4 deletions
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 |