summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/utils/camerahelper_p.h
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2014-01-27 13:10:44 +0200
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2014-01-27 13:13:58 +0200
commitb368e57e59351736f9ad06834a743a7c1b49d368 (patch)
tree3b7d42569905d8cde0ca7571cd664428354a50dd /src/datavisualization/utils/camerahelper_p.h
parenteb3d0514ca886db33776522ea00f27b69bc86ad1 (diff)
parent05d06fbc61f07e400b519a9b020c2473398627c1 (diff)
Merge branch 'develop'v1.0.0-beta1
Diffstat (limited to 'src/datavisualization/utils/camerahelper_p.h')
-rw-r--r--src/datavisualization/utils/camerahelper_p.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/datavisualization/utils/camerahelper_p.h b/src/datavisualization/utils/camerahelper_p.h
index 50de93a8..e78bc24c 100644
--- a/src/datavisualization/utils/camerahelper_p.h
+++ b/src/datavisualization/utils/camerahelper_p.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2013 Digia Plc
+** Copyright (C) 2014 Digia Plc
** All rights reserved.
** For any questions to Digia, please use contact form at http://qt.digia.com
**
@@ -26,8 +26,8 @@
//
// We mean it.
-#ifndef CAMERAPOSITIONER_P_H
-#define CAMERAPOSITIONER_P_H
+#ifndef CAMERAHELPER_P_H
+#define CAMERAHELPER_P_H
#include "datavisualizationglobal_p.h"
#include "q3dcamera.h"
@@ -39,7 +39,7 @@ class QVector3D;
class QPoint;
class QPointF;
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class CameraHelper : public QObject
{
@@ -86,6 +86,6 @@ public:
void setCameraPreset(Q3DCamera::CameraPreset preset);
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+QT_END_NAMESPACE_DATAVISUALIZATION
#endif