diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-01-15 11:34:59 +0200 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-01-15 11:36:17 +0200 |
commit | 64d6b482bfb9dbacd548b72cb9c073513f6aa56f (patch) | |
tree | 6adea7f584f31d2b650379a4dba9ff6d7de527e3 /src/datavisualization/utils | |
parent | ca8eb71e320d08071f0f43393da3bb3fabf56da7 (diff) |
Removed QDataVis and namespace macros
- docs will be fixed in QTRD-2594
Task-number: QTRD-2699
Task-number: QTRD-2700
Change-Id: Ia89d365c2de5d9254b165feb4f0a54ec099084be
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/utils')
18 files changed, 36 insertions, 36 deletions
diff --git a/src/datavisualization/utils/abstractobjecthelper.cpp b/src/datavisualization/utils/abstractobjecthelper.cpp index 96cdc0c4..3192648f 100644 --- a/src/datavisualization/utils/abstractobjecthelper.cpp +++ b/src/datavisualization/utils/abstractobjecthelper.cpp @@ -20,7 +20,7 @@ #include <QDebug> -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { AbstractObjectHelper::AbstractObjectHelper() : m_vertexbuffer(0), @@ -80,4 +80,4 @@ GLuint AbstractObjectHelper::indicesType() return m_indicesType; } -QT_DATAVISUALIZATION_END_NAMESPACE +} diff --git a/src/datavisualization/utils/abstractobjecthelper_p.h b/src/datavisualization/utils/abstractobjecthelper_p.h index a6de6941..6f48238d 100644 --- a/src/datavisualization/utils/abstractobjecthelper_p.h +++ b/src/datavisualization/utils/abstractobjecthelper_p.h @@ -32,7 +32,7 @@ #include "datavisualizationglobal_p.h" #include <QOpenGLFunctions> -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { class AbstractObjectHelper: protected QOpenGLFunctions { @@ -60,6 +60,6 @@ public: GLuint m_indicesType; }; -QT_DATAVISUALIZATION_END_NAMESPACE +} #endif // ABSTRACTOBJECTHELPER_H diff --git a/src/datavisualization/utils/camerahelper.cpp b/src/datavisualization/utils/camerahelper.cpp index 9e7e58aa..9a07e783 100644 --- a/src/datavisualization/utils/camerahelper.cpp +++ b/src/datavisualization/utils/camerahelper.cpp @@ -22,7 +22,7 @@ #include <QMatrix4x4> #include <QVector3D> -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { CameraHelper::CameraHelper(QObject *parent) : QObject(parent), @@ -283,4 +283,4 @@ void CameraHelper::setCameraPreset(Q3DCamera::CameraPreset preset) } } -QT_DATAVISUALIZATION_END_NAMESPACE +} diff --git a/src/datavisualization/utils/camerahelper_p.h b/src/datavisualization/utils/camerahelper_p.h index 50de93a8..9d411b74 100644 --- a/src/datavisualization/utils/camerahelper_p.h +++ b/src/datavisualization/utils/camerahelper_p.h @@ -39,7 +39,7 @@ class QVector3D; class QPoint; class QPointF; -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { class CameraHelper : public QObject { @@ -86,6 +86,6 @@ public: void setCameraPreset(Q3DCamera::CameraPreset preset); }; -QT_DATAVISUALIZATION_END_NAMESPACE +} #endif diff --git a/src/datavisualization/utils/meshloader.cpp b/src/datavisualization/utils/meshloader.cpp index 119cde3a..08e56c39 100644 --- a/src/datavisualization/utils/meshloader.cpp +++ b/src/datavisualization/utils/meshloader.cpp @@ -26,7 +26,7 @@ #include <QDebug> -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { QString slashTag = QStringLiteral("/"); @@ -122,4 +122,4 @@ bool MeshLoader::loadOBJ(const QString &path, return true; } -QT_DATAVISUALIZATION_END_NAMESPACE +} diff --git a/src/datavisualization/utils/meshloader_p.h b/src/datavisualization/utils/meshloader_p.h index 48551fff..3add8c2d 100644 --- a/src/datavisualization/utils/meshloader_p.h +++ b/src/datavisualization/utils/meshloader_p.h @@ -34,7 +34,7 @@ class QVector2D; class QVector3D; -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { class MeshLoader { @@ -46,6 +46,6 @@ class MeshLoader // TODO: add loaders for other formats? }; -QT_DATAVISUALIZATION_END_NAMESPACE +} #endif diff --git a/src/datavisualization/utils/objecthelper.cpp b/src/datavisualization/utils/objecthelper.cpp index 180ce009..ce8f598a 100644 --- a/src/datavisualization/utils/objecthelper.cpp +++ b/src/datavisualization/utils/objecthelper.cpp @@ -23,7 +23,7 @@ #include <QDebug> -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { ObjectHelper::ObjectHelper(const QString &objectFile) : m_objectFile(objectFile) @@ -95,4 +95,4 @@ void ObjectHelper::load() m_meshDataLoaded = true; } -QT_DATAVISUALIZATION_END_NAMESPACE +} diff --git a/src/datavisualization/utils/objecthelper_p.h b/src/datavisualization/utils/objecthelper_p.h index 9d643fdd..6e325639 100644 --- a/src/datavisualization/utils/objecthelper_p.h +++ b/src/datavisualization/utils/objecthelper_p.h @@ -33,7 +33,7 @@ #include "abstractobjecthelper_p.h" #include <QOpenGLFunctions> -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { class ObjectHelper : public AbstractObjectHelper { @@ -49,6 +49,6 @@ private: QString m_objectFile; }; -QT_DATAVISUALIZATION_END_NAMESPACE +} #endif diff --git a/src/datavisualization/utils/shaderhelper.cpp b/src/datavisualization/utils/shaderhelper.cpp index b4d2ee76..6fcd2bd2 100644 --- a/src/datavisualization/utils/shaderhelper.cpp +++ b/src/datavisualization/utils/shaderhelper.cpp @@ -20,7 +20,7 @@ #include <QOpenGLShader> -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { void discardDebugMsgs(QtMsgType type, const QMessageLogContext &context, const QString &msg) { @@ -268,4 +268,4 @@ GLuint ShaderHelper::normalAtt() return m_normalAttr; } -QT_DATAVISUALIZATION_END_NAMESPACE +} diff --git a/src/datavisualization/utils/shaderhelper_p.h b/src/datavisualization/utils/shaderhelper_p.h index 191b7bf6..996ad7fc 100644 --- a/src/datavisualization/utils/shaderhelper_p.h +++ b/src/datavisualization/utils/shaderhelper_p.h @@ -34,7 +34,7 @@ class QOpenGLShaderProgram; -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { class ShaderHelper { @@ -110,6 +110,6 @@ class ShaderHelper GLboolean m_initialized; }; -QT_DATAVISUALIZATION_END_NAMESPACE +} #endif diff --git a/src/datavisualization/utils/surfaceobject.cpp b/src/datavisualization/utils/surfaceobject.cpp index 6e4765e5..1e00df0a 100644 --- a/src/datavisualization/utils/surfaceobject.cpp +++ b/src/datavisualization/utils/surfaceobject.cpp @@ -24,7 +24,7 @@ #include <QDebug> -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { SurfaceObject::SurfaceObject() { @@ -681,4 +681,4 @@ QVector3D SurfaceObject::normal(const QVector3D &a, const QVector3D &b, const QV return QVector3D::crossProduct(v1, v2); } -QT_DATAVISUALIZATION_END_NAMESPACE +} diff --git a/src/datavisualization/utils/surfaceobject_p.h b/src/datavisualization/utils/surfaceobject_p.h index e035d905..91b42c76 100644 --- a/src/datavisualization/utils/surfaceobject_p.h +++ b/src/datavisualization/utils/surfaceobject_p.h @@ -36,7 +36,7 @@ #include <QOpenGLFunctions> #include <QRect> -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { class SurfaceObject : public AbstractObjectHelper { @@ -85,5 +85,5 @@ private: QVector<QVector3D> m_normals; }; -QT_DATAVISUALIZATION_END_NAMESPACE +} #endif // SURFACEOBJECT_P_H diff --git a/src/datavisualization/utils/texturehelper.cpp b/src/datavisualization/utils/texturehelper.cpp index c88fc8dc..fc42b518 100644 --- a/src/datavisualization/utils/texturehelper.cpp +++ b/src/datavisualization/utils/texturehelper.cpp @@ -24,7 +24,7 @@ #include <QDebug> -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { TextureHelper::TextureHelper() { @@ -367,4 +367,4 @@ QRgb TextureHelper::qt_gl_convertToGLFormatHelper(QRgb src_pixel, GLenum texture } } -QT_DATAVISUALIZATION_END_NAMESPACE +} diff --git a/src/datavisualization/utils/texturehelper_p.h b/src/datavisualization/utils/texturehelper_p.h index 11022495..e67904d8 100644 --- a/src/datavisualization/utils/texturehelper_p.h +++ b/src/datavisualization/utils/texturehelper_p.h @@ -34,7 +34,7 @@ #include <QRgb> #include <QLinearGradient> -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { class TextureHelper : protected QOpenGLFunctions { @@ -67,6 +67,6 @@ class TextureHelper : protected QOpenGLFunctions friend class Scatter3DRenderer; }; -QT_DATAVISUALIZATION_END_NAMESPACE +} #endif diff --git a/src/datavisualization/utils/utils.cpp b/src/datavisualization/utils/utils.cpp index e6f33032..69dbf92d 100644 --- a/src/datavisualization/utils/utils.cpp +++ b/src/datavisualization/utils/utils.cpp @@ -26,7 +26,7 @@ #include <QRegExp> #include <qmath.h> -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { #define NUM_IN_POWER(y, x) for (;y<x;y<<=1) #define MIN_POWER 2 @@ -239,4 +239,4 @@ float Utils::wrapValue(float value, float min, float max) return value; } -QT_DATAVISUALIZATION_END_NAMESPACE +} diff --git a/src/datavisualization/utils/utils_p.h b/src/datavisualization/utils/utils_p.h index 3142e4c2..434a366f 100644 --- a/src/datavisualization/utils/utils_p.h +++ b/src/datavisualization/utils/utils_p.h @@ -39,7 +39,7 @@ class QString; class QPoint; class QImage; -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { class Utils { @@ -75,6 +75,6 @@ private: static ParamType mapFormatCharToParamType(const QChar &formatChar); }; -QT_DATAVISUALIZATION_END_NAMESPACE +} #endif diff --git a/src/datavisualization/utils/vertexindexer.cpp b/src/datavisualization/utils/vertexindexer.cpp index dafe5dbc..ea25b5d6 100644 --- a/src/datavisualization/utils/vertexindexer.cpp +++ b/src/datavisualization/utils/vertexindexer.cpp @@ -23,7 +23,7 @@ #include <QDebug> -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { int unique_vertices = 0; @@ -150,4 +150,4 @@ void VertexIndexer::indexVBO_TBN(const QVector<QVector3D> &in_vertices, //qDebug() << "unique vertices" << unique_vertices; } -QT_DATAVISUALIZATION_END_NAMESPACE +} diff --git a/src/datavisualization/utils/vertexindexer_p.h b/src/datavisualization/utils/vertexindexer_p.h index 0cf1857b..de8f7690 100644 --- a/src/datavisualization/utils/vertexindexer_p.h +++ b/src/datavisualization/utils/vertexindexer_p.h @@ -35,7 +35,7 @@ #include <QVector2D> #include <QVector3D> -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { class VertexIndexer { @@ -83,6 +83,6 @@ class VertexIndexer unsigned short &result); }; -QT_DATAVISUALIZATION_END_NAMESPACE +} #endif |