From c9902fd0189ab2df12ef199933187828c597d56c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Mon, 12 Aug 2013 13:24:18 +0300 Subject: Corrected includes of own public headers Task-number: QTRD-2181 Change-Id: Idc684886a8cfd0bfe7d7b3186c87a773bb62b353 Reviewed-by: Miikka Heikkinen --- examples/barchart/main.cpp | 8 ++++---- examples/mapdata/mapdata.cpp | 2 +- examples/mapdata/mapdata.h | 2 +- examples/rainfall/rainfallchart.cpp | 4 ++-- examples/rainfall/rainfallchart.h | 2 +- examples/scatterchart/scatterchart.cpp | 4 ++-- examples/scatterchart/scatterchart.h | 2 +- examples/spectrum/spectrumapp/main.cpp | 7 ++++--- examples/spectrum/spectrumapp/spectrum.h | 2 +- examples/surfacechart/chartmodifier.h | 2 +- examples/surfacechart/main.cpp | 1 - examples/widget/chart.cpp | 6 +++--- examples/widget/chart.h | 2 +- src/datavis3d/axis/qabstractaxis.h | 2 +- src/datavis3d/axis/qcategoryaxis.h | 2 +- src/datavis3d/axis/qvalueaxis.h | 2 +- src/datavis3d/data/qabstractdataproxy.h | 2 +- src/datavis3d/data/qbardataitem.h | 2 +- src/datavis3d/data/qbardataproxy.h | 4 ++-- src/datavis3d/data/qitemmodelbardatamapping.h | 2 +- src/datavis3d/data/qitemmodelbardataproxy.h | 4 ++-- src/datavis3d/data/qitemmodelmapdatamapping.h | 2 +- src/datavis3d/data/qitemmodelmapdataproxy.h | 4 ++-- src/datavis3d/data/qitemmodelscatterdatamapping.h | 2 +- src/datavis3d/data/qitemmodelscatterdataproxy.h | 4 ++-- src/datavis3d/data/qmapdataitem.h | 4 ++-- src/datavis3d/data/qmapdataproxy.h | 4 ++-- src/datavis3d/data/qscatterdataitem.h | 2 +- src/datavis3d/data/qscatterdataproxy.h | 4 ++-- src/datavis3d/engine/q3dbars.h | 4 ++-- src/datavis3d/engine/q3dmaps.h | 4 ++-- src/datavis3d/engine/q3dscatter.h | 4 ++-- src/datavis3d/engine/q3dsurface.h | 4 ++-- src/datavis3d/engine/q3dwindow.h | 2 +- src/datavis3d/global/qdatavis3dnamespace.h | 2 +- 35 files changed, 55 insertions(+), 55 deletions(-) diff --git a/examples/barchart/main.cpp b/examples/barchart/main.cpp index 24690ebb..bea1a370 100644 --- a/examples/barchart/main.cpp +++ b/examples/barchart/main.cpp @@ -38,10 +38,10 @@ ** ****************************************************************************/ -#include "q3dbars.h" -#include "qcategoryaxis.h" -#include "qitemmodelbardataproxy.h" -#include "qvalueaxis.h" +#include +#include +#include +#include #include #include diff --git a/examples/mapdata/mapdata.cpp b/examples/mapdata/mapdata.cpp index 6c7333b2..9dba5bbd 100644 --- a/examples/mapdata/mapdata.cpp +++ b/examples/mapdata/mapdata.cpp @@ -39,7 +39,7 @@ ****************************************************************************/ #include "mapdata.h" -#include "qmapdataproxy.h" +#include #include #include diff --git a/examples/mapdata/mapdata.h b/examples/mapdata/mapdata.h index 03bb86a6..4108ef23 100644 --- a/examples/mapdata/mapdata.h +++ b/examples/mapdata/mapdata.h @@ -41,7 +41,7 @@ #ifndef CHARTMODIFIER_H #define CHARTMODIFIER_H -#include "q3dmaps.h" +#include #include #include diff --git a/examples/rainfall/rainfallchart.cpp b/examples/rainfall/rainfallchart.cpp index 1053f132..7a17d821 100644 --- a/examples/rainfall/rainfallchart.cpp +++ b/examples/rainfall/rainfallchart.cpp @@ -39,8 +39,8 @@ ****************************************************************************/ #include "rainfallchart.h" -#include "qcategoryaxis.h" -#include "qvalueaxis.h" +#include +#include #include #include #include diff --git a/examples/rainfall/rainfallchart.h b/examples/rainfall/rainfallchart.h index 0eb5bf5e..c9f96827 100644 --- a/examples/rainfall/rainfallchart.h +++ b/examples/rainfall/rainfallchart.h @@ -41,8 +41,8 @@ #ifndef RAINFALLCHART_H #define RAINFALLCHART_H -#include "q3dbars.h" #include "variantbardataproxy.h" +#include #include using namespace QtDataVis3D; diff --git a/examples/scatterchart/scatterchart.cpp b/examples/scatterchart/scatterchart.cpp index eeccf533..9dc2c97a 100644 --- a/examples/scatterchart/scatterchart.cpp +++ b/examples/scatterchart/scatterchart.cpp @@ -39,8 +39,8 @@ ****************************************************************************/ #include "scatterchart.h" -#include "qscatterdataproxy.h" -#include "qvalueaxis.h" +#include +#include using namespace QtDataVis3D; diff --git a/examples/scatterchart/scatterchart.h b/examples/scatterchart/scatterchart.h index cf8e5b1b..ffbf5490 100644 --- a/examples/scatterchart/scatterchart.h +++ b/examples/scatterchart/scatterchart.h @@ -41,7 +41,7 @@ #ifndef SCATTERDATAMODIFIER_H #define SCATTERDATAMODIFIER_H -#include "q3dscatter.h" +#include #include #include diff --git a/examples/spectrum/spectrumapp/main.cpp b/examples/spectrum/spectrumapp/main.cpp index 4f27931f..aa1af7ab 100644 --- a/examples/spectrum/spectrumapp/main.cpp +++ b/examples/spectrum/spectrumapp/main.cpp @@ -38,11 +38,12 @@ ** ****************************************************************************/ -#include "q3dbars.h" #include "engine.h" #include "utils.h" -#include "qbardataproxy.h" -#include "qvalueaxis.h" + +#include +#include +#include #include #include diff --git a/examples/spectrum/spectrumapp/spectrum.h b/examples/spectrum/spectrumapp/spectrum.h index 244a5892..5b22b114 100644 --- a/examples/spectrum/spectrumapp/spectrum.h +++ b/examples/spectrum/spectrumapp/spectrum.h @@ -41,9 +41,9 @@ #ifndef SPECTRUM_H #define SPECTRUM_H -#include #include "utils.h" #include "fftreal_wrapper.h" // For FFTLengthPowerOfTwo +#include //----------------------------------------------------------------------------- // Constants diff --git a/examples/surfacechart/chartmodifier.h b/examples/surfacechart/chartmodifier.h index 3daf96ed..c988e820 100644 --- a/examples/surfacechart/chartmodifier.h +++ b/examples/surfacechart/chartmodifier.h @@ -41,7 +41,7 @@ #ifndef CHARTMODIFIER_H #define CHARTMODIFIER_H -#include +#include #include using namespace QtDataVis3D; diff --git a/examples/surfacechart/main.cpp b/examples/surfacechart/main.cpp index c9d95c67..990a8c89 100644 --- a/examples/surfacechart/main.cpp +++ b/examples/surfacechart/main.cpp @@ -38,7 +38,6 @@ ** ****************************************************************************/ -#include #include "chartmodifier.h" #include diff --git a/examples/widget/chart.cpp b/examples/widget/chart.cpp index 7deffe6b..d1038839 100644 --- a/examples/widget/chart.cpp +++ b/examples/widget/chart.cpp @@ -39,9 +39,9 @@ ****************************************************************************/ #include "chart.h" -#include "qcategoryaxis.h" -#include "qvalueaxis.h" -#include "qbardataproxy.h" +#include +#include +#include #include QT_DATAVIS3D_USE_NAMESPACE diff --git a/examples/widget/chart.h b/examples/widget/chart.h index 612447b7..e42257ce 100644 --- a/examples/widget/chart.h +++ b/examples/widget/chart.h @@ -41,7 +41,7 @@ #ifndef CHARTMODIFIER_H #define CHARTMODIFIER_H -#include "q3dbars.h" +#include #include #include diff --git a/src/datavis3d/axis/qabstractaxis.h b/src/datavis3d/axis/qabstractaxis.h index d63f4f7c..855ffb43 100644 --- a/src/datavis3d/axis/qabstractaxis.h +++ b/src/datavis3d/axis/qabstractaxis.h @@ -42,7 +42,7 @@ #ifndef QABSTRACTAXIS_H #define QABSTRACTAXIS_H -#include "qdatavis3dnamespace.h" +#include #include #include #include diff --git a/src/datavis3d/axis/qcategoryaxis.h b/src/datavis3d/axis/qcategoryaxis.h index b83efc6d..c73a4944 100644 --- a/src/datavis3d/axis/qcategoryaxis.h +++ b/src/datavis3d/axis/qcategoryaxis.h @@ -42,7 +42,7 @@ #ifndef QCATEGORYAXIS_H #define QCATEGORYAXIS_H -#include "qabstractaxis.h" +#include QT_DATAVIS3D_BEGIN_NAMESPACE diff --git a/src/datavis3d/axis/qvalueaxis.h b/src/datavis3d/axis/qvalueaxis.h index 473088e6..0a230ab5 100644 --- a/src/datavis3d/axis/qvalueaxis.h +++ b/src/datavis3d/axis/qvalueaxis.h @@ -42,7 +42,7 @@ #ifndef QVALUEAXIS_H #define QVALUEAXIS_H -#include "qabstractaxis.h" +#include QT_DATAVIS3D_BEGIN_NAMESPACE diff --git a/src/datavis3d/data/qabstractdataproxy.h b/src/datavis3d/data/qabstractdataproxy.h index 1b86f18a..87efff9a 100644 --- a/src/datavis3d/data/qabstractdataproxy.h +++ b/src/datavis3d/data/qabstractdataproxy.h @@ -42,7 +42,7 @@ #ifndef QABSTRACTDATAPROXY_H #define QABSTRACTDATAPROXY_H -#include "qdatavis3dnamespace.h" +#include #include #include #include diff --git a/src/datavis3d/data/qbardataitem.h b/src/datavis3d/data/qbardataitem.h index 19063003..80802ce9 100644 --- a/src/datavis3d/data/qbardataitem.h +++ b/src/datavis3d/data/qbardataitem.h @@ -42,7 +42,7 @@ #ifndef QBARDATAITEM_H #define QBARDATAITEM_H -#include "qdatavis3dnamespace.h" +#include QT_DATAVIS3D_BEGIN_NAMESPACE diff --git a/src/datavis3d/data/qbardataproxy.h b/src/datavis3d/data/qbardataproxy.h index af04aad5..02b8376d 100644 --- a/src/datavis3d/data/qbardataproxy.h +++ b/src/datavis3d/data/qbardataproxy.h @@ -42,8 +42,8 @@ #ifndef QBARDATAPROXY_H #define QBARDATAPROXY_H -#include "qabstractdataproxy.h" -#include "qbardataitem.h" +#include +#include #include QT_DATAVIS3D_BEGIN_NAMESPACE diff --git a/src/datavis3d/data/qitemmodelbardatamapping.h b/src/datavis3d/data/qitemmodelbardatamapping.h index 29e4b9d2..c9f627ba 100644 --- a/src/datavis3d/data/qitemmodelbardatamapping.h +++ b/src/datavis3d/data/qitemmodelbardatamapping.h @@ -42,7 +42,7 @@ #ifndef QITEMMODELBARDATAMAPPING_H #define QITEMMODELBARDATAMAPPING_H -#include "qdatavis3dnamespace.h" +#include #include QT_DATAVIS3D_BEGIN_NAMESPACE diff --git a/src/datavis3d/data/qitemmodelbardataproxy.h b/src/datavis3d/data/qitemmodelbardataproxy.h index 370fc6b3..721dd510 100644 --- a/src/datavis3d/data/qitemmodelbardataproxy.h +++ b/src/datavis3d/data/qitemmodelbardataproxy.h @@ -42,8 +42,8 @@ #ifndef QITEMMODELBARDATAPROXY_H #define QITEMMODELBARDATAPROXY_H -#include "qbardataproxy.h" -#include "qitemmodelbardatamapping.h" +#include +#include #include #include diff --git a/src/datavis3d/data/qitemmodelmapdatamapping.h b/src/datavis3d/data/qitemmodelmapdatamapping.h index 3638f878..b22da042 100644 --- a/src/datavis3d/data/qitemmodelmapdatamapping.h +++ b/src/datavis3d/data/qitemmodelmapdatamapping.h @@ -42,7 +42,7 @@ #ifndef QITEMMODELMAPDATAMAPPING_H #define QITEMMODELMAPDATAMAPPING_H -#include "qdatavis3dnamespace.h" +#include #include QT_DATAVIS3D_BEGIN_NAMESPACE diff --git a/src/datavis3d/data/qitemmodelmapdataproxy.h b/src/datavis3d/data/qitemmodelmapdataproxy.h index 874c9532..7fc839b3 100644 --- a/src/datavis3d/data/qitemmodelmapdataproxy.h +++ b/src/datavis3d/data/qitemmodelmapdataproxy.h @@ -42,8 +42,8 @@ #ifndef QITEMMODELMAPDATAPROXY_H #define QITEMMODELMAPDATAPROXY_H -#include "qmapdataproxy.h" -#include "qitemmodelmapdatamapping.h" +#include +#include #include #include diff --git a/src/datavis3d/data/qitemmodelscatterdatamapping.h b/src/datavis3d/data/qitemmodelscatterdatamapping.h index 0aba5a00..8751875d 100644 --- a/src/datavis3d/data/qitemmodelscatterdatamapping.h +++ b/src/datavis3d/data/qitemmodelscatterdatamapping.h @@ -42,7 +42,7 @@ #ifndef QITEMMODELSCATTERDATAMAPPING_H #define QITEMMODELSCATTERDATAMAPPING_H -#include "qdatavis3dnamespace.h" +#include #include QT_DATAVIS3D_BEGIN_NAMESPACE diff --git a/src/datavis3d/data/qitemmodelscatterdataproxy.h b/src/datavis3d/data/qitemmodelscatterdataproxy.h index 27753a6f..23147de1 100644 --- a/src/datavis3d/data/qitemmodelscatterdataproxy.h +++ b/src/datavis3d/data/qitemmodelscatterdataproxy.h @@ -42,8 +42,8 @@ #ifndef QITEMMODELSCATTERDATAPROXY_H #define QITEMMODELSCATTERDATAPROXY_H -#include "qscatterdataproxy.h" -#include "qitemmodelscatterdatamapping.h" +#include +#include #include #include diff --git a/src/datavis3d/data/qmapdataitem.h b/src/datavis3d/data/qmapdataitem.h index 91e1a381..22a61e10 100644 --- a/src/datavis3d/data/qmapdataitem.h +++ b/src/datavis3d/data/qmapdataitem.h @@ -42,8 +42,8 @@ #ifndef QMAPDATAITEM_H #define QMAPDATAITEM_H -#include "qdatavis3dnamespace.h" -#include "qbardataitem.h" +#include +#include #include QT_DATAVIS3D_BEGIN_NAMESPACE diff --git a/src/datavis3d/data/qmapdataproxy.h b/src/datavis3d/data/qmapdataproxy.h index 8c224b86..ea1d5b2c 100644 --- a/src/datavis3d/data/qmapdataproxy.h +++ b/src/datavis3d/data/qmapdataproxy.h @@ -42,8 +42,8 @@ #ifndef QMAPDATAPROXY_H #define QMAPDATAPROXY_H -#include "qabstractdataproxy.h" -#include "qmapdataitem.h" +#include +#include QT_DATAVIS3D_BEGIN_NAMESPACE diff --git a/src/datavis3d/data/qscatterdataitem.h b/src/datavis3d/data/qscatterdataitem.h index 40649175..2e5e597a 100644 --- a/src/datavis3d/data/qscatterdataitem.h +++ b/src/datavis3d/data/qscatterdataitem.h @@ -42,7 +42,7 @@ #ifndef QSCATTERDATAITEM_H #define QSCATTERDATAITEM_H -#include "qdatavis3dnamespace.h" +#include #include QT_DATAVIS3D_BEGIN_NAMESPACE diff --git a/src/datavis3d/data/qscatterdataproxy.h b/src/datavis3d/data/qscatterdataproxy.h index c96854e2..e05ac1c8 100644 --- a/src/datavis3d/data/qscatterdataproxy.h +++ b/src/datavis3d/data/qscatterdataproxy.h @@ -42,8 +42,8 @@ #ifndef QSCATTERDATAPROXY_H #define QSCATTERDATAPROXY_H -#include "qabstractdataproxy.h" -#include "qscatterdataitem.h" +#include +#include QT_DATAVIS3D_BEGIN_NAMESPACE diff --git a/src/datavis3d/engine/q3dbars.h b/src/datavis3d/engine/q3dbars.h index 53ba9bca..a5284960 100644 --- a/src/datavis3d/engine/q3dbars.h +++ b/src/datavis3d/engine/q3dbars.h @@ -42,8 +42,8 @@ #ifndef Q3DBARS_H #define Q3DBARS_H -#include "qdatavis3dnamespace.h" -#include "q3dwindow.h" +#include +#include #include QT_DATAVIS3D_BEGIN_NAMESPACE diff --git a/src/datavis3d/engine/q3dmaps.h b/src/datavis3d/engine/q3dmaps.h index 2fd4c043..94233763 100644 --- a/src/datavis3d/engine/q3dmaps.h +++ b/src/datavis3d/engine/q3dmaps.h @@ -42,8 +42,8 @@ #ifndef Q3DMAPS_H #define Q3DMAPS_H -#include "qdatavis3dnamespace.h" -#include "q3dwindow.h" +#include +#include #include #include diff --git a/src/datavis3d/engine/q3dscatter.h b/src/datavis3d/engine/q3dscatter.h index d34342da..685010a1 100644 --- a/src/datavis3d/engine/q3dscatter.h +++ b/src/datavis3d/engine/q3dscatter.h @@ -42,8 +42,8 @@ #ifndef Q3DSCATTER_H #define Q3DSCATTER_H -#include "qdatavis3dnamespace.h" -#include "q3dwindow.h" +#include +#include #include QT_DATAVIS3D_BEGIN_NAMESPACE diff --git a/src/datavis3d/engine/q3dsurface.h b/src/datavis3d/engine/q3dsurface.h index cabd1f53..c8f0fb5a 100644 --- a/src/datavis3d/engine/q3dsurface.h +++ b/src/datavis3d/engine/q3dsurface.h @@ -42,8 +42,8 @@ #ifndef Q3DSURFACE_H #define Q3DSURFACE_H -#include "qdatavis3dnamespace.h" -#include "q3dwindow.h" +#include +#include QT_DATAVIS3D_BEGIN_NAMESPACE diff --git a/src/datavis3d/engine/q3dwindow.h b/src/datavis3d/engine/q3dwindow.h index 1d200731..47d5b8d3 100644 --- a/src/datavis3d/engine/q3dwindow.h +++ b/src/datavis3d/engine/q3dwindow.h @@ -42,7 +42,7 @@ #ifndef Q3DWINDOW_H #define Q3DWINDOW_H -#include "qdatavis3dnamespace.h" +#include #include #include diff --git a/src/datavis3d/global/qdatavis3dnamespace.h b/src/datavis3d/global/qdatavis3dnamespace.h index d3fc41a2..a0744785 100644 --- a/src/datavis3d/global/qdatavis3dnamespace.h +++ b/src/datavis3d/global/qdatavis3dnamespace.h @@ -42,7 +42,7 @@ #ifndef QVIS3DNAMESPACE_H #define QVIS3DNAMESPACE_H -#include "qdatavis3dglobal.h" +#include namespace QtDataVis3D { -- cgit v1.2.3