From f3d19d795bafb6a7e6af19b3bdbafb8eabc11842 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Tue, 3 Jun 2014 08:38:36 +0300 Subject: Clean up the rest of engine Task-number: QTRD-3149 Change-Id: Id1c9f72480c63878cc9fa9a71cb3b1b057a79454 Change-Id: Id1c9f72480c63878cc9fa9a71cb3b1b057a79454 Reviewed-by: Miikka Heikkinen --- src/datavisualization/engine/axisrendercache.cpp | 1 - src/datavisualization/engine/axisrendercache_p.h | 2 -- src/datavisualization/engine/barseriesrendercache.cpp | 1 - src/datavisualization/engine/drawer.cpp | 3 --- src/datavisualization/engine/q3dbars.cpp | 6 ------ src/datavisualization/engine/q3dcamera.cpp | 3 --- src/datavisualization/engine/q3dlight.cpp | 2 -- src/datavisualization/engine/q3dobject.cpp | 1 - src/datavisualization/engine/q3dscatter.cpp | 4 ---- src/datavisualization/engine/q3dscene.cpp | 5 ----- src/datavisualization/engine/q3dsurface.cpp | 4 ---- src/datavisualization/engine/scatterseriesrendercache.cpp | 1 - src/datavisualization/engine/selectionpointer.cpp | 5 ----- src/datavisualization/engine/selectionpointer_p.h | 2 -- src/datavisualization/engine/seriesrendercache.cpp | 1 - src/datavisualization/engine/surfaceseriesrendercache.cpp | 5 +---- src/datavisualization/engine/surfaceseriesrendercache_p.h | 4 ---- 17 files changed, 1 insertion(+), 49 deletions(-) diff --git a/src/datavisualization/engine/axisrendercache.cpp b/src/datavisualization/engine/axisrendercache.cpp index bf661fe4..0b7a5c7a 100644 --- a/src/datavisualization/engine/axisrendercache.cpp +++ b/src/datavisualization/engine/axisrendercache.cpp @@ -18,7 +18,6 @@ #include "axisrendercache_p.h" -#include #include QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/axisrendercache_p.h b/src/datavisualization/engine/axisrendercache_p.h index 0e4492b4..90321740 100644 --- a/src/datavisualization/engine/axisrendercache_p.h +++ b/src/datavisualization/engine/axisrendercache_p.h @@ -30,8 +30,6 @@ #define AXISRENDERCACHE_P_H #include "datavisualizationglobal_p.h" -#include "labelitem_p.h" -#include "qabstract3daxis_p.h" #include "drawer_p.h" #include diff --git a/src/datavisualization/engine/barseriesrendercache.cpp b/src/datavisualization/engine/barseriesrendercache.cpp index 83d3e366..95da3680 100644 --- a/src/datavisualization/engine/barseriesrendercache.cpp +++ b/src/datavisualization/engine/barseriesrendercache.cpp @@ -17,7 +17,6 @@ ****************************************************************************/ #include "barseriesrendercache_p.h" -#include "bars3drenderer_p.h" QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/drawer.cpp b/src/datavisualization/engine/drawer.cpp index d6c9fdce..8a8df4fd 100644 --- a/src/datavisualization/engine/drawer.cpp +++ b/src/datavisualization/engine/drawer.cpp @@ -18,10 +18,7 @@ #include "drawer_p.h" #include "shaderhelper_p.h" -#include "objecthelper_p.h" -#include "abstractobjecthelper_p.h" #include "surfaceobject_p.h" -#include "q3dcamera.h" #include "utils_p.h" #include "texturehelper_p.h" #include "abstract3drenderer_p.h" diff --git a/src/datavisualization/engine/q3dbars.cpp b/src/datavisualization/engine/q3dbars.cpp index 7b37715f..ca90156e 100644 --- a/src/datavisualization/engine/q3dbars.cpp +++ b/src/datavisualization/engine/q3dbars.cpp @@ -16,13 +16,7 @@ ** ****************************************************************************/ -#include "q3dbars.h" #include "q3dbars_p.h" -#include "bars3dcontroller_p.h" -#include "qvalue3daxis.h" -#include "qcategory3daxis.h" -#include "q3dcamera.h" -#include "qbar3dseries_p.h" QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/q3dcamera.cpp b/src/datavisualization/engine/q3dcamera.cpp index 1a23569d..8aa8a2e0 100644 --- a/src/datavisualization/engine/q3dcamera.cpp +++ b/src/datavisualization/engine/q3dcamera.cpp @@ -16,10 +16,7 @@ ** ****************************************************************************/ -#include "q3dcamera.h" #include "q3dcamera_p.h" -#include "q3dscene.h" -#include "q3dobject.h" #include "utils_p.h" #include diff --git a/src/datavisualization/engine/q3dlight.cpp b/src/datavisualization/engine/q3dlight.cpp index 8ac9e3a0..2a7c56fa 100644 --- a/src/datavisualization/engine/q3dlight.cpp +++ b/src/datavisualization/engine/q3dlight.cpp @@ -16,8 +16,6 @@ ** ****************************************************************************/ -#include "q3dlight.h" -#include "q3dscene.h" #include "q3dlight_p.h" QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/q3dobject.cpp b/src/datavisualization/engine/q3dobject.cpp index 05edf287..b74b8ab7 100644 --- a/src/datavisualization/engine/q3dobject.cpp +++ b/src/datavisualization/engine/q3dobject.cpp @@ -16,7 +16,6 @@ ** ****************************************************************************/ -#include "q3dobject.h" #include "q3dobject_p.h" #include "q3dscene_p.h" diff --git a/src/datavisualization/engine/q3dscatter.cpp b/src/datavisualization/engine/q3dscatter.cpp index 7c7809f3..123cd658 100644 --- a/src/datavisualization/engine/q3dscatter.cpp +++ b/src/datavisualization/engine/q3dscatter.cpp @@ -18,10 +18,6 @@ #include "q3dscatter.h" #include "q3dscatter_p.h" -#include "scatter3dcontroller_p.h" -#include "qvalue3daxis.h" -#include "q3dcamera.h" -#include "qscatter3dseries_p.h" QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/q3dscene.cpp b/src/datavisualization/engine/q3dscene.cpp index 3e21d624..c1cc1a03 100644 --- a/src/datavisualization/engine/q3dscene.cpp +++ b/src/datavisualization/engine/q3dscene.cpp @@ -16,15 +16,10 @@ ** ****************************************************************************/ -#include "datavisualizationglobal_p.h" - -#include "q3dscene.h" #include "q3dscene_p.h" #include "q3dcamera_p.h" #include "q3dlight_p.h" -#include - QT_BEGIN_NAMESPACE_DATAVISUALIZATION /*! diff --git a/src/datavisualization/engine/q3dsurface.cpp b/src/datavisualization/engine/q3dsurface.cpp index 7724cb24..e5b21387 100644 --- a/src/datavisualization/engine/q3dsurface.cpp +++ b/src/datavisualization/engine/q3dsurface.cpp @@ -18,10 +18,6 @@ #include "q3dsurface.h" #include "q3dsurface_p.h" -#include "qvalue3daxis.h" -#include "qsurfacedataproxy.h" -#include "q3dcamera.h" -#include "qsurface3dseries_p.h" QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/scatterseriesrendercache.cpp b/src/datavisualization/engine/scatterseriesrendercache.cpp index 2a2c5393..5b2cf1ef 100644 --- a/src/datavisualization/engine/scatterseriesrendercache.cpp +++ b/src/datavisualization/engine/scatterseriesrendercache.cpp @@ -17,7 +17,6 @@ ****************************************************************************/ #include "scatterseriesrendercache_p.h" -#include "scatter3drenderer_p.h" QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/selectionpointer.cpp b/src/datavisualization/engine/selectionpointer.cpp index fe9325cf..183d3f8e 100644 --- a/src/datavisualization/engine/selectionpointer.cpp +++ b/src/datavisualization/engine/selectionpointer.cpp @@ -17,16 +17,11 @@ ****************************************************************************/ #include "selectionpointer_p.h" -#include "surface3dcontroller_p.h" #include "shaderhelper_p.h" #include "objecthelper_p.h" #include "texturehelper_p.h" #include "q3dcamera_p.h" -#include "drawer_p.h" #include "utils_p.h" -#include "q3dlight.h" - -#include QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/selectionpointer_p.h b/src/datavisualization/engine/selectionpointer_p.h index f33cd6cd..7dc28024 100644 --- a/src/datavisualization/engine/selectionpointer_p.h +++ b/src/datavisualization/engine/selectionpointer_p.h @@ -29,7 +29,6 @@ #ifndef SELECTIONPOINTER_P_H #define SELECTIONPOINTER_P_H -#include "q3dscene.h" #include "datavisualizationglobal_p.h" #include "surface3dcontroller_p.h" @@ -37,7 +36,6 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION class ShaderHelper; class ObjectHelper; -class SurfaceObject; class TextureHelper; class Drawer; diff --git a/src/datavisualization/engine/seriesrendercache.cpp b/src/datavisualization/engine/seriesrendercache.cpp index e4f221f8..dc4b9db3 100644 --- a/src/datavisualization/engine/seriesrendercache.cpp +++ b/src/datavisualization/engine/seriesrendercache.cpp @@ -17,7 +17,6 @@ ****************************************************************************/ #include "seriesrendercache_p.h" -#include "objecthelper_p.h" #include "abstract3drenderer_p.h" #include "texturehelper_p.h" #include "utils_p.h" diff --git a/src/datavisualization/engine/surfaceseriesrendercache.cpp b/src/datavisualization/engine/surfaceseriesrendercache.cpp index db3fa9f7..1cce5288 100644 --- a/src/datavisualization/engine/surfaceseriesrendercache.cpp +++ b/src/datavisualization/engine/surfaceseriesrendercache.cpp @@ -16,12 +16,9 @@ ** ****************************************************************************/ -#include "seriesrendercache_p.h" #include "surfaceseriesrendercache_p.h" -#include "objecthelper_p.h" #include "surface3drenderer_p.h" #include "texturehelper_p.h" -#include "utils_p.h" QT_BEGIN_NAMESPACE_DATAVISUALIZATION @@ -33,7 +30,7 @@ SurfaceSeriesRenderCache::SurfaceSeriesRenderCache(QAbstract3DSeries *series, m_surfaceFlatShading(false), m_surfaceObj(new SurfaceObject(renderer)), m_sliceSurfaceObj(new SurfaceObject(renderer)), - m_sampleSpace(QRect(0, 0, 0 , 0)), + m_sampleSpace(QRect(0, 0, 0, 0)), m_selectionTexture(0), m_selectionIdStart(0), m_selectionIdEnd(0), diff --git a/src/datavisualization/engine/surfaceseriesrendercache_p.h b/src/datavisualization/engine/surfaceseriesrendercache_p.h index 9d373812..b6254a75 100644 --- a/src/datavisualization/engine/surfaceseriesrendercache_p.h +++ b/src/datavisualization/engine/surfaceseriesrendercache_p.h @@ -31,7 +31,6 @@ #include "datavisualizationglobal_p.h" #include "seriesrendercache_p.h" -#include "qabstract3dseries_p.h" #include "qsurface3dseries_p.h" #include "surfaceobject_p.h" #include "selectionpointer_p.h" @@ -40,10 +39,7 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION -class Abstract3DRenderer; class Surface3DRenderer; -class ObjectHelper; -class TextureHelper; class SurfaceSeriesRenderCache : public SeriesRenderCache { -- cgit v1.2.3