diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-01-16 13:33:57 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-16 13:49:43 +0200 |
| commit | 8674307d6bafabfcaedfe175b883313f0e7d88b9 (patch) | |
| tree | 4428b5c4d3dc305d0290b9929a7f703b11fe73f6 /src/datavisualization/global | |
| parent | d2c37e276d17fb91163188878988894df993e69b (diff) | |
Reintroduced namespace macros
Task-number: QTRD-2594
Change-Id: I31e1ea20fd590d7bdf3d1218d696915c22c3426b
Change-Id: I31e1ea20fd590d7bdf3d1218d696915c22c3426b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/global')
| -rw-r--r-- | src/datavisualization/global/datavisualizationglobal_p.h | 4 | ||||
| -rw-r--r-- | src/datavisualization/global/qdatavisualizationglobal.h | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/datavisualization/global/datavisualizationglobal_p.h b/src/datavisualization/global/datavisualizationglobal_p.h index c061c05c..410cc296 100644 --- a/src/datavisualization/global/datavisualizationglobal_p.h +++ b/src/datavisualization/global/datavisualizationglobal_p.h @@ -34,7 +34,7 @@ #include <QVector3D> #include <QDebug> -namespace QtDataVisualization { +QT_BEGIN_NAMESPACE_DATAVISUALIZATION // Constants used in several files // Distance from camera to origin @@ -56,6 +56,6 @@ static const QVector3D invalidColorVector = QVector3D(-1.0f, -1.0f, -1.0f); static const GLfloat gradientTextureHeight = 1024.0f; static const GLfloat gradientTextureWidth = 2.0f; -} +QT_END_NAMESPACE_DATAVISUALIZATION #endif diff --git a/src/datavisualization/global/qdatavisualizationglobal.h b/src/datavisualization/global/qdatavisualizationglobal.h index e17cc7ea..946abfa1 100644 --- a/src/datavisualization/global/qdatavisualizationglobal.h +++ b/src/datavisualization/global/qdatavisualizationglobal.h @@ -52,4 +52,7 @@ # define QT_DATAVISUALIZATION_AUTOTEST_EXPORT #endif +#define QT_BEGIN_NAMESPACE_DATAVISUALIZATION namespace QtDataVisualization { +#define QT_END_NAMESPACE_DATAVISUALIZATION } + #endif |