From d91e065526fe084374b206b6e7c9f0d628abb93d Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Mon, 17 Feb 2014 16:18:27 +0200
Subject: Clean up public API and includes usage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I20ba0ffafa6bbe22d624a15fe3046ef2e33ab6d7
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
---
 src/datavisualization/engine/q3dscene.h | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

(limited to 'src/datavisualization/engine/q3dscene.h')

diff --git a/src/datavisualization/engine/q3dscene.h b/src/datavisualization/engine/q3dscene.h
index 9c122c2a..d663744e 100644
--- a/src/datavisualization/engine/q3dscene.h
+++ b/src/datavisualization/engine/q3dscene.h
@@ -20,15 +20,13 @@
 #define Q3DSCENE_H
 
 #include <QtDataVisualization/qdatavisualizationglobal.h>
-
-#include <QObject>
-#include <QRect>
+#include <QtDataVisualization/q3dcamera.h>
+#include <QtDataVisualization/q3dlight.h>
+#include <QtCore/QObject>
+#include <QtCore/QRect>
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
-class Q3DCamera;
-class Q3DBox;
-class Q3DLight;
 class Q3DScenePrivate;
 
 class QT_DATAVISUALIZATION_EXPORT Q3DScene : public QObject
@@ -46,7 +44,7 @@ class QT_DATAVISUALIZATION_EXPORT Q3DScene : public QObject
 
 public:
     Q3DScene(QObject *parent = 0);
-    ~Q3DScene();
+    virtual ~Q3DScene();
 
     QRect viewport() const;
 
@@ -78,15 +76,15 @@ public:
     void setDevicePixelRatio(float pixelRatio);
 
 signals:
-    void viewportChanged(QRect viewport);
-    void primarySubViewportChanged(QRect subViewport);
-    void secondarySubViewportChanged(QRect subViewport);
+    void viewportChanged(const QRect &viewport);
+    void primarySubViewportChanged(const QRect &subViewport);
+    void secondarySubViewportChanged(const QRect &subViewport);
     void secondarySubviewOnTopChanged(bool isSecondaryOnTop);
     void slicingActiveChanged(bool isSlicingActive);
-    void activeCameraChanged(const Q3DCamera *camera);
-    void activeLightChanged(const Q3DLight *light);
+    void activeCameraChanged(Q3DCamera *camera);
+    void activeLightChanged(Q3DLight *light);
     void devicePixelRatioChanged(float pixelRatio);
-    void selectionQueryPositionChanged(const QPoint position);
+    void selectionQueryPositionChanged(const QPoint &position);
 
 private:
     QScopedPointer<Q3DScenePrivate> d_ptr;
-- 
cgit v1.2.3