diff options
126 files changed, 355 insertions, 1047 deletions
diff --git a/examples/datavisualization/audiolevels/audiolevels.cpp b/examples/datavisualization/audiolevels/audiolevels.cpp index 18c1342a..81059460 100644 --- a/examples/datavisualization/audiolevels/audiolevels.cpp +++ b/examples/datavisualization/audiolevels/audiolevels.cpp @@ -26,8 +26,8 @@ #include <QtDataVisualization/qbar3dseries.h> #include <QtDataVisualization/q3dtheme.h> -#include <QAudioDeviceInfo> -#include <QAudioInput> +#include <QtMultimedia/QAudioDeviceInfo> +#include <QtMultimedia/QAudioInput> using namespace QtDataVisualization; diff --git a/examples/datavisualization/audiolevels/audiolevelsiodevice.cpp b/examples/datavisualization/audiolevels/audiolevelsiodevice.cpp index c0cd70e3..27ddce4f 100644 --- a/examples/datavisualization/audiolevels/audiolevelsiodevice.cpp +++ b/examples/datavisualization/audiolevels/audiolevelsiodevice.cpp @@ -17,7 +17,7 @@ ****************************************************************************/ #include "audiolevelsiodevice.h" -#include <QDebug> +#include <QtCore/QDebug> using namespace QtDataVisualization; diff --git a/examples/datavisualization/audiolevels/audiolevelsiodevice.h b/examples/datavisualization/audiolevels/audiolevelsiodevice.h index 45f17626..7510db35 100644 --- a/examples/datavisualization/audiolevels/audiolevelsiodevice.h +++ b/examples/datavisualization/audiolevels/audiolevelsiodevice.h @@ -20,7 +20,7 @@ #define AUDIOLEVELSIODEVICE_H #include <QtDataVisualization/qbardataproxy.h> -#include <QIODevice> +#include <QtCore/QIODevice> using namespace QtDataVisualization; diff --git a/examples/datavisualization/audiolevels/main.cpp b/examples/datavisualization/audiolevels/main.cpp index 9dd07b1b..4f9c01cb 100644 --- a/examples/datavisualization/audiolevels/main.cpp +++ b/examples/datavisualization/audiolevels/main.cpp @@ -18,8 +18,8 @@ #include "audiolevels.h" -#include <QGuiApplication> -#include <QAudio> +#include <QtGui/QGuiApplication> +#include <QtMultimedia/QAudio> using namespace QtDataVisualization; diff --git a/examples/datavisualization/bars/graphmodifier.cpp b/examples/datavisualization/bars/graphmodifier.cpp index 55f52580..5df4066c 100644 --- a/examples/datavisualization/bars/graphmodifier.cpp +++ b/examples/datavisualization/bars/graphmodifier.cpp @@ -24,8 +24,8 @@ #include <QtDataVisualization/q3dcamera.h> #include <QtDataVisualization/qbar3dseries.h> #include <QtDataVisualization/q3dtheme.h> -#include <QTime> -#include <QComboBox> +#include <QtCore/QTime> +#include <QtWidgets/QComboBox> using namespace QtDataVisualization; diff --git a/examples/datavisualization/bars/graphmodifier.h b/examples/datavisualization/bars/graphmodifier.h index 674c3262..cac002a1 100644 --- a/examples/datavisualization/bars/graphmodifier.h +++ b/examples/datavisualization/bars/graphmodifier.h @@ -23,10 +23,10 @@ #include <QtDataVisualization/qbardataproxy.h> #include <QtDataVisualization/qabstract3dseries.h> -#include <QFont> -#include <QDebug> -#include <QStringList> -#include <QPointer> +#include <QtGui/QFont> +#include <QtCore/QDebug> +#include <QtCore/QStringList> +#include <QtCore/QPointer> using namespace QtDataVisualization; diff --git a/examples/datavisualization/bars/main.cpp b/examples/datavisualization/bars/main.cpp index f04e501d..e6461202 100644 --- a/examples/datavisualization/bars/main.cpp +++ b/examples/datavisualization/bars/main.cpp @@ -18,17 +18,17 @@ #include "graphmodifier.h" -#include <QApplication> -#include <QWidget> -#include <QHBoxLayout> -#include <QVBoxLayout> -#include <QPushButton> -#include <QCheckBox> -#include <QSlider> -#include <QFontComboBox> -#include <QLabel> -#include <QScreen> -#include <QFontDatabase> +#include <QtWidgets/QApplication> +#include <QtWidgets/QWidget> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QVBoxLayout> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QCheckBox> +#include <QtWidgets/QSlider> +#include <QtWidgets/QFontComboBox> +#include <QtWidgets/QLabel> +#include <QtGui/QScreen> +#include <QtGui/QFontDatabase> int main(int argc, char **argv) { diff --git a/examples/datavisualization/custominput/main.cpp b/examples/datavisualization/custominput/main.cpp index 069a5b0a..5dd31499 100644 --- a/examples/datavisualization/custominput/main.cpp +++ b/examples/datavisualization/custominput/main.cpp @@ -18,17 +18,17 @@ #include "scatterdatamodifier.h" -#include <QApplication> -#include <QWidget> -#include <QHBoxLayout> -#include <QVBoxLayout> -#include <QPushButton> -#include <QCheckBox> -#include <QComboBox> -#include <QFontComboBox> -#include <QLabel> -#include <QScreen> -#include <QFontDatabase> +#include <QtWidgets/QApplication> +#include <QtWidgets/QWidget> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QVBoxLayout> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QCheckBox> +#include <QtWidgets/QComboBox> +#include <QtWidgets/QFontComboBox> +#include <QtWidgets/QLabel> +#include <QtGui/QScreen> +#include <QtGui/QFontDatabase> int main(int argc, char **argv) { diff --git a/examples/datavisualization/custominput/scatterdatamodifier.cpp b/examples/datavisualization/custominput/scatterdatamodifier.cpp index a2a5bea9..2b812ba1 100644 --- a/examples/datavisualization/custominput/scatterdatamodifier.cpp +++ b/examples/datavisualization/custominput/scatterdatamodifier.cpp @@ -24,7 +24,9 @@ #include <QtDataVisualization/Q3DCamera> #include <QtDataVisualization/QScatter3DSeries> #include <QtDataVisualization/Q3DTheme> -#include <qmath.h> +#include <QtCore/qmath.h> +#include <QtCore/QTextStream> +#include <QtCore/QDebug> using namespace QtDataVisualization; diff --git a/examples/datavisualization/custominput/scatterdatamodifier.h b/examples/datavisualization/custominput/scatterdatamodifier.h index 9ea6a5c8..8b185711 100644 --- a/examples/datavisualization/custominput/scatterdatamodifier.h +++ b/examples/datavisualization/custominput/scatterdatamodifier.h @@ -24,9 +24,9 @@ #include <QtDataVisualization/q3dscatter.h> #include <QtGui/QFont> #include <QtCore/QTimer> -#include <QPropertyAnimation> -#include <QSequentialAnimationGroup> -#include <QVector3D> +#include <QtCore/QPropertyAnimation> +#include <QtCore/QSequentialAnimationGroup> +#include <QtGui/QVector3D> using namespace QtDataVisualization; diff --git a/examples/datavisualization/customproxy/main.cpp b/examples/datavisualization/customproxy/main.cpp index dd74721e..4ec67f4b 100644 --- a/examples/datavisualization/customproxy/main.cpp +++ b/examples/datavisualization/customproxy/main.cpp @@ -17,7 +17,7 @@ ****************************************************************************/ #include "rainfallgraph.h" -#include <QGuiApplication> +#include <QtGui/QGuiApplication> using namespace QtDataVisualization; diff --git a/examples/datavisualization/customproxy/rainfallgraph.cpp b/examples/datavisualization/customproxy/rainfallgraph.cpp index e2f04923..024fc2a1 100644 --- a/examples/datavisualization/customproxy/rainfallgraph.cpp +++ b/examples/datavisualization/customproxy/rainfallgraph.cpp @@ -23,11 +23,11 @@ #include <QtDataVisualization/q3dcamera.h> #include <QtDataVisualization/qbar3dseries.h> #include <QtDataVisualization/q3dtheme.h> -#include <QGuiApplication> -#include <QFont> -#include <QDebug> -#include <QTextStream> -#include <QFile> +#include <QtGui/QGuiApplication> +#include <QtGui/QFont> +#include <QtCore/QDebug> +#include <QtCore/QTextStream> +#include <QtCore/QFile> using namespace QtDataVisualization; diff --git a/examples/datavisualization/customproxy/variantbardatamapping.h b/examples/datavisualization/customproxy/variantbardatamapping.h index 3a145d9a..2f6a0ca1 100644 --- a/examples/datavisualization/customproxy/variantbardatamapping.h +++ b/examples/datavisualization/customproxy/variantbardatamapping.h @@ -19,7 +19,7 @@ #ifndef VARIANTBARDATAMAPPING_H #define VARIANTBARDATAMAPPING_H -#include <QStringList> +#include <QtCore/QStringList> class VariantBarDataMapping : public QObject { diff --git a/examples/datavisualization/customproxy/variantbardataproxy.h b/examples/datavisualization/customproxy/variantbardataproxy.h index b83f8a71..41aeaa3f 100644 --- a/examples/datavisualization/customproxy/variantbardataproxy.h +++ b/examples/datavisualization/customproxy/variantbardataproxy.h @@ -22,9 +22,9 @@ #include "qbardataproxy.h" #include "variantdataset.h" #include "variantbardatamapping.h" -#include <QStringList> -#include <QMap> -#include <QPointer> +#include <QtCore/QStringList> +#include <QtCore/QMap> +#include <QtCore/QPointer> using namespace QtDataVisualization; diff --git a/examples/datavisualization/customproxy/variantdataset.h b/examples/datavisualization/customproxy/variantdataset.h index f5eb5863..6a131d1a 100644 --- a/examples/datavisualization/customproxy/variantdataset.h +++ b/examples/datavisualization/customproxy/variantdataset.h @@ -19,8 +19,8 @@ #ifndef VARIANTDATASET_H #define VARIANTDATASET_H -#include <QScopedPointer> -#include <QVariantList> +#include <QtCore/QScopedPointer> +#include <QtCore/QVariantList> //! [1] typedef QVariantList VariantDataItem; diff --git a/examples/datavisualization/itemmodel/main.cpp b/examples/datavisualization/itemmodel/main.cpp index 2fce72aa..ad9f0112 100644 --- a/examples/datavisualization/itemmodel/main.cpp +++ b/examples/datavisualization/itemmodel/main.cpp @@ -25,14 +25,14 @@ #include <QtDataVisualization/qbar3dseries.h> #include <QtDataVisualization/q3dtheme.h> -#include <QApplication> -#include <QVBoxLayout> -#include <QTableWidget> -#include <QScreen> -#include <QTimer> -#include <QFont> -#include <QDebug> -#include <QHeaderView> +#include <QtWidgets/QApplication> +#include <QtWidgets/QVBoxLayout> +#include <QtWidgets/QTableWidget> +#include <QtGui/QScreen> +#include <QtCore/QTimer> +#include <QtGui/QFont> +#include <QtCore/QDebug> +#include <QtWidgets/QHeaderView> #define USE_STATIC_DATA diff --git a/examples/datavisualization/qmloscilloscope/datasource.cpp b/examples/datavisualization/qmloscilloscope/datasource.cpp index 8b10bcc7..01d7e73d 100644 --- a/examples/datavisualization/qmloscilloscope/datasource.cpp +++ b/examples/datavisualization/qmloscilloscope/datasource.cpp @@ -17,7 +17,7 @@ ****************************************************************************/ #include "datasource.h" -#include <qmath.h> +#include <QtCore/qmath.h> using namespace QtDataVisualization; diff --git a/examples/datavisualization/qmloscilloscope/datasource.h b/examples/datavisualization/qmloscilloscope/datasource.h index a467b86f..ef2f7acb 100644 --- a/examples/datavisualization/qmloscilloscope/datasource.h +++ b/examples/datavisualization/qmloscilloscope/datasource.h @@ -21,7 +21,6 @@ #include <QtDataVisualization/QSurface3DSeries> #include <QtDataVisualization/QValue3DAxis> -#include <QObject> class QQuickView; diff --git a/examples/datavisualization/rotations/main.cpp b/examples/datavisualization/rotations/main.cpp index 3ddb7b55..7f477c92 100644 --- a/examples/datavisualization/rotations/main.cpp +++ b/examples/datavisualization/rotations/main.cpp @@ -18,14 +18,14 @@ #include "scatterdatamodifier.h" -#include <QApplication> -#include <QWidget> -#include <QHBoxLayout> -#include <QVBoxLayout> -#include <QPushButton> -#include <QScreen> -#include <QSlider> -#include <QLabel> +#include <QtWidgets/QApplication> +#include <QtWidgets/QWidget> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QVBoxLayout> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QSlider> +#include <QtWidgets/QLabel> +#include <QtGui/QScreen> int main(int argc, char **argv) { diff --git a/examples/datavisualization/rotations/scatterdatamodifier.cpp b/examples/datavisualization/rotations/scatterdatamodifier.cpp index d916ffbd..90af63ab 100644 --- a/examples/datavisualization/rotations/scatterdatamodifier.cpp +++ b/examples/datavisualization/rotations/scatterdatamodifier.cpp @@ -23,7 +23,7 @@ #include <QtDataVisualization/q3dcamera.h> #include <QtDataVisualization/qscatter3dseries.h> #include <QtDataVisualization/q3dtheme.h> -#include <qmath.h> +#include <QtCore/qmath.h> using namespace QtDataVisualization; diff --git a/examples/datavisualization/scatter/main.cpp b/examples/datavisualization/scatter/main.cpp index d1dad77d..21530b82 100644 --- a/examples/datavisualization/scatter/main.cpp +++ b/examples/datavisualization/scatter/main.cpp @@ -18,17 +18,17 @@ #include "scatterdatamodifier.h" -#include <QApplication> -#include <QWidget> -#include <QHBoxLayout> -#include <QVBoxLayout> -#include <QPushButton> -#include <QCheckBox> -#include <QComboBox> -#include <QFontComboBox> -#include <QLabel> -#include <QScreen> -#include <QFontDatabase> +#include <QtWidgets/QApplication> +#include <QtWidgets/QWidget> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QVBoxLayout> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QCheckBox> +#include <QtWidgets/QComboBox> +#include <QtWidgets/QFontComboBox> +#include <QtWidgets/QLabel> +#include <QtGui/QScreen> +#include <QtGui/QFontDatabase> int main(int argc, char **argv) { diff --git a/examples/datavisualization/scatter/scatterdatamodifier.cpp b/examples/datavisualization/scatter/scatterdatamodifier.cpp index fcba54be..b38c043e 100644 --- a/examples/datavisualization/scatter/scatterdatamodifier.cpp +++ b/examples/datavisualization/scatter/scatterdatamodifier.cpp @@ -23,8 +23,8 @@ #include <QtDataVisualization/q3dcamera.h> #include <QtDataVisualization/qscatter3dseries.h> #include <QtDataVisualization/q3dtheme.h> -#include <qmath.h> -#include <QComboBox> +#include <QtCore/qmath.h> +#include <QtWidgets/QComboBox> using namespace QtDataVisualization; diff --git a/examples/datavisualization/surface/main.cpp b/examples/datavisualization/surface/main.cpp index 4e82eca8..4db614e6 100644 --- a/examples/datavisualization/surface/main.cpp +++ b/examples/datavisualization/surface/main.cpp @@ -29,6 +29,7 @@ #include <QtWidgets/QComboBox> #include <QtWidgets/QLabel> #include <QtGui/QPainter> +#include <QtGui/QScreen> int main(int argc, char **argv) { diff --git a/src/datavisualization/axis/qabstract3daxis.cpp b/src/datavisualization/axis/qabstract3daxis.cpp index 2ee7a25d..39b1230e 100644 --- a/src/datavisualization/axis/qabstract3daxis.cpp +++ b/src/datavisualization/axis/qabstract3daxis.cpp @@ -151,7 +151,7 @@ QAbstract3DAxis::AxisType QAbstract3DAxis::type() const * * Defines the title for the axis. */ -void QAbstract3DAxis::setTitle(QString title) +void QAbstract3DAxis::setTitle(const QString &title) { if (d_ptr->m_title != title) { d_ptr->m_title = title; diff --git a/src/datavisualization/axis/qabstract3daxis.h b/src/datavisualization/axis/qabstract3daxis.h index 28b93f36..0d63615a 100644 --- a/src/datavisualization/axis/qabstract3daxis.h +++ b/src/datavisualization/axis/qabstract3daxis.h @@ -20,11 +20,9 @@ #define QABSTRACT3DAXIS_H #include <QtDataVisualization/qdatavisualizationglobal.h> - -#include <QObject> -#include <QScopedPointer> -#include <QVector> -#include <QStringList> +#include <QtCore/QObject> +#include <QtCore/QScopedPointer> +#include <QtCore/QStringList> QT_BEGIN_NAMESPACE_DATAVISUALIZATION @@ -63,7 +61,7 @@ protected: public: virtual ~QAbstract3DAxis(); - void setTitle(QString title); + void setTitle(const QString &title); QString title() const; void setLabels(const QStringList &labels); @@ -84,7 +82,7 @@ public: void setRange(float min, float max); signals: - void titleChanged(QString newTitle); + void titleChanged(const QString &newTitle); void labelsChanged(); void orientationChanged(AxisOrientation orientation); void minChanged(float value); diff --git a/src/datavisualization/axis/qvalue3daxis.h b/src/datavisualization/axis/qvalue3daxis.h index c930c700..f0af759b 100644 --- a/src/datavisualization/axis/qvalue3daxis.h +++ b/src/datavisualization/axis/qvalue3daxis.h @@ -48,7 +48,7 @@ public: signals: void segmentCountChanged(int count); void subSegmentCountChanged(int count); - void labelFormatChanged(QString format); + void labelFormatChanged(const QString &format); protected: QValue3DAxisPrivate *dptr(); diff --git a/src/datavisualization/data/abstractitemmodelhandler.cpp b/src/datavisualization/data/abstractitemmodelhandler.cpp index 63eb7e45..9f2ccd86 100644 --- a/src/datavisualization/data/abstractitemmodelhandler.cpp +++ b/src/datavisualization/data/abstractitemmodelhandler.cpp @@ -17,7 +17,6 @@ ****************************************************************************/ #include "abstractitemmodelhandler_p.h" -#include <QTimer> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/data/abstractitemmodelhandler_p.h b/src/datavisualization/data/abstractitemmodelhandler_p.h index c238a63b..ecbfe61c 100644 --- a/src/datavisualization/data/abstractitemmodelhandler_p.h +++ b/src/datavisualization/data/abstractitemmodelhandler_p.h @@ -30,9 +30,9 @@ #define ABSTRACTITEMMODELHANDLER_P_H #include "datavisualizationglobal_p.h" -#include <QAbstractItemModel> -#include <QPointer> -#include <QTimer> +#include <QtCore/QAbstractItemModel> +#include <QtCore/QPointer> +#include <QtCore/QTimer> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/data/abstractrenderitem_p.h b/src/datavisualization/data/abstractrenderitem_p.h index 8d2fab8a..a53b8e41 100644 --- a/src/datavisualization/data/abstractrenderitem_p.h +++ b/src/datavisualization/data/abstractrenderitem_p.h @@ -32,10 +32,10 @@ #include "datavisualizationglobal_p.h" #include "labelitem_p.h" -#include <QOpenGLFunctions> -#include <QString> -#include <QVector3D> -#include <QQuaternion> +#include <QtCore/QString> +#include <QtGui/QOpenGLFunctions> +#include <QtGui/QVector3D> +#include <QtGui/QQuaternion> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/data/labelitem_p.h b/src/datavisualization/data/labelitem_p.h index ca60f742..3a2c1eb1 100644 --- a/src/datavisualization/data/labelitem_p.h +++ b/src/datavisualization/data/labelitem_p.h @@ -30,8 +30,8 @@ #define LABELITEM_P_H #include "datavisualizationglobal_p.h" -#include <QOpenGLFunctions> -#include <QSize> +#include <QtGui/QOpenGLFunctions> +#include <QtCore/QSize> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/data/qabstract3dseries.h b/src/datavisualization/data/qabstract3dseries.h index a8cee7c9..9f82901d 100644 --- a/src/datavisualization/data/qabstract3dseries.h +++ b/src/datavisualization/data/qabstract3dseries.h @@ -20,10 +20,11 @@ #define QABSTRACT3DSERIES_H #include <QtDataVisualization/q3dtheme.h> -#include <QObject> -#include <QScopedPointer> -#include <QLinearGradient> -#include <QQuaternion> +#include <QtCore/QObject> +#include <QtCore/QScopedPointer> +#include <QtCore/QString> +#include <QtGui/QLinearGradient> +#include <QtGui/QQuaternion> QT_BEGIN_NAMESPACE_DATAVISUALIZATION @@ -119,20 +120,20 @@ public: QString name() const; signals: - void itemLabelFormatChanged(QString format); + void itemLabelFormatChanged(const QString &format); void visibilityChanged(bool visible); void meshChanged(Mesh mesh); void meshSmoothChanged(bool enabled); - void meshRotationChanged(QQuaternion rotation); - void userDefinedMeshChanged(QString fileName); + void meshRotationChanged(const QQuaternion &rotation); + void userDefinedMeshChanged(const QString &fileName); void colorStyleChanged(Q3DTheme::ColorStyle style); - void baseColorChanged(QColor color); - void baseGradientChanged(QLinearGradient gradient); - void singleHighlightColorChanged(QColor color); - void singleHighlightGradientChanged(QLinearGradient gradient); - void multiHighlightColorChanged(QColor color); - void multiHighlightGradientChanged(QLinearGradient gradient); - void nameChanged(QString name); + void baseColorChanged(const QColor &color); + void baseGradientChanged(const QLinearGradient &gradient); + void singleHighlightColorChanged(const QColor &color); + void singleHighlightGradientChanged(const QLinearGradient &gradient); + void multiHighlightColorChanged(const QColor &color); + void multiHighlightGradientChanged(const QLinearGradient &gradient); + void nameChanged(const QString &name); protected: QScopedPointer<QAbstract3DSeriesPrivate> d_ptr; diff --git a/src/datavisualization/data/qabstract3dseries_p.h b/src/datavisualization/data/qabstract3dseries_p.h index 6fbabd3d..a803e99b 100644 --- a/src/datavisualization/data/qabstract3dseries_p.h +++ b/src/datavisualization/data/qabstract3dseries_p.h @@ -28,7 +28,6 @@ #include "datavisualizationglobal_p.h" #include "qabstract3dseries.h" -#include <QString> #ifndef QABSTRACT3DSERIES_P_H #define QABSTRACT3DSERIES_P_H diff --git a/src/datavisualization/data/qabstractdataproxy.h b/src/datavisualization/data/qabstractdataproxy.h index 52c2e2c6..c643c675 100644 --- a/src/datavisualization/data/qabstractdataproxy.h +++ b/src/datavisualization/data/qabstractdataproxy.h @@ -20,9 +20,8 @@ #define QABSTRACTDATAPROXY_H #include <QtDataVisualization/qdatavisualizationglobal.h> - -#include <QObject> -#include <QScopedPointer> +#include <QtCore/QObject> +#include <QtCore/QScopedPointer> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/data/qabstractdataproxy_p.h b/src/datavisualization/data/qabstractdataproxy_p.h index 093629d5..eb901f4c 100644 --- a/src/datavisualization/data/qabstractdataproxy_p.h +++ b/src/datavisualization/data/qabstractdataproxy_p.h @@ -28,7 +28,6 @@ #include "datavisualizationglobal_p.h" #include "qabstractdataproxy.h" -#include <QString> #ifndef QABSTRACTDATAPROXY_P_H #define QABSTRACTDATAPROXY_P_H diff --git a/src/datavisualization/data/qbar3dseries.cpp b/src/datavisualization/data/qbar3dseries.cpp index f4b990e9..ed4ffaba 100644 --- a/src/datavisualization/data/qbar3dseries.cpp +++ b/src/datavisualization/data/qbar3dseries.cpp @@ -147,15 +147,6 @@ QBar3DSeries::QBar3DSeries(QBarDataProxy *dataProxy, QObject *parent) : } /*! - * \internal - */ -QBar3DSeries::QBar3DSeries(QBar3DSeriesPrivate *d, QObject *parent) : - QAbstract3DSeries(d, parent) -{ - dptr()->connectSignals(); -} - -/*! * Destroys QBar3DSeries. */ QBar3DSeries::~QBar3DSeries() diff --git a/src/datavisualization/data/qbar3dseries.h b/src/datavisualization/data/qbar3dseries.h index aa67dadb..c56bc354 100644 --- a/src/datavisualization/data/qbar3dseries.h +++ b/src/datavisualization/data/qbar3dseries.h @@ -21,7 +21,7 @@ #include <QtDataVisualization/qabstract3dseries.h> #include <QtDataVisualization/qbardataproxy.h> -#include <QPoint> +#include <QtCore/QPoint> QT_BEGIN_NAMESPACE_DATAVISUALIZATION @@ -51,11 +51,10 @@ public: signals: void dataProxyChanged(QBarDataProxy *proxy); - void selectedBarChanged(QPoint position); + void selectedBarChanged(const QPoint &position); void meshAngleChanged(float angle); protected: - explicit QBar3DSeries(QBar3DSeriesPrivate *d, QObject *parent = 0); QBar3DSeriesPrivate *dptr(); const QBar3DSeriesPrivate *dptrc() const; diff --git a/src/datavisualization/data/qbardataitem.h b/src/datavisualization/data/qbardataitem.h index 84e7cd92..e7fce93b 100644 --- a/src/datavisualization/data/qbardataitem.h +++ b/src/datavisualization/data/qbardataitem.h @@ -42,7 +42,7 @@ public: inline float rotation() const { return m_angle; } protected: - virtual void createExtraData(); + void createExtraData(); QBarDataItemPrivate *d_ptr; diff --git a/src/datavisualization/data/qbardataproxy.cpp b/src/datavisualization/data/qbardataproxy.cpp index 4247e963..d2553f32 100644 --- a/src/datavisualization/data/qbardataproxy.cpp +++ b/src/datavisualization/data/qbardataproxy.cpp @@ -130,7 +130,7 @@ QBarDataProxy::~QBarDataProxy() * * The series this proxy is attached to. */ -QBar3DSeries *QBarDataProxy::series() +QBar3DSeries *QBarDataProxy::series() const { return static_cast<QBar3DSeries *>(d_ptr->series()); } @@ -227,6 +227,15 @@ void QBarDataProxy::setItem(int rowIndex, int columnIndex, const QBarDataItem &i } /*! + * Changes a single item at \a position to the \a item. + * The X-value of \a position indicates the row and the Y-value indicates the column. + */ +void QBarDataProxy::setItem(const QPoint &position, const QBarDataItem &item) +{ + setItem(position.x(), position.y(), item); +} + +/*! * Adds a new \a row to the end of array. * Existing row labels are not affected. * diff --git a/src/datavisualization/data/qbardataproxy.h b/src/datavisualization/data/qbardataproxy.h index 780897e8..55c11de3 100644 --- a/src/datavisualization/data/qbardataproxy.h +++ b/src/datavisualization/data/qbardataproxy.h @@ -21,8 +21,8 @@ #include <QtDataVisualization/qabstractdataproxy.h> #include <QtDataVisualization/qbardataitem.h> -#include <QVector> -#include <QStringList> +#include <QtCore/QVector> +#include <QtCore/QStringList> namespace QtDataVisualization { // typedefs introduced this way because QDoc doesn't understand namespace macros @@ -47,7 +47,7 @@ public: explicit QBarDataProxy(QObject *parent = 0); virtual ~QBarDataProxy(); - QBar3DSeries *series(); + QBar3DSeries *series() const; int rowCount() const; QStringList rowLabels() const; @@ -71,6 +71,7 @@ public: void setRows(int rowIndex, const QBarDataArray &rows, const QStringList &labels); void setItem(int rowIndex, int columnIndex, const QBarDataItem &item); + void setItem(const QPoint &position, const QBarDataItem &item); int addRow(QBarDataRow *row); int addRow(QBarDataRow *row, const QString &label); diff --git a/src/datavisualization/data/qheightmapsurfacedataproxy.cpp b/src/datavisualization/data/qheightmapsurfacedataproxy.cpp index 9ac5c90f..1aead1d7 100644 --- a/src/datavisualization/data/qheightmapsurfacedataproxy.cpp +++ b/src/datavisualization/data/qheightmapsurfacedataproxy.cpp @@ -134,6 +134,18 @@ QHeightMapSurfaceDataProxy::QHeightMapSurfaceDataProxy(const QImage &image, QObj } /*! + * Constructs QHeightMapSurfaceDataProxy from the given image \a filename and \a parent. Height map is set + * by calling setHeightMapFile() with \a filename. + * + * \sa heightMapFile + */ +QHeightMapSurfaceDataProxy::QHeightMapSurfaceDataProxy(const QString &filename, QObject *parent) : + QSurfaceDataProxy(new QHeightMapSurfaceDataProxyPrivate(this), parent) +{ + setHeightMapFile(filename); +} + +/*! * \internal */ QHeightMapSurfaceDataProxy::QHeightMapSurfaceDataProxy( diff --git a/src/datavisualization/data/qheightmapsurfacedataproxy.h b/src/datavisualization/data/qheightmapsurfacedataproxy.h index d506d4e8..5b6eb284 100644 --- a/src/datavisualization/data/qheightmapsurfacedataproxy.h +++ b/src/datavisualization/data/qheightmapsurfacedataproxy.h @@ -20,8 +20,8 @@ #define QHEIGHTMAPSURFACEDATAPROXY_H #include <QtDataVisualization/qsurfacedataproxy.h> - -#include <QImage> +#include <QtGui/QImage> +#include <QtCore/QString> QT_BEGIN_NAMESPACE_DATAVISUALIZATION @@ -41,6 +41,7 @@ class QT_DATAVISUALIZATION_EXPORT QHeightMapSurfaceDataProxy : public QSurfaceDa public: explicit QHeightMapSurfaceDataProxy(QObject *parent = 0); explicit QHeightMapSurfaceDataProxy(const QImage &image, QObject *parent = 0); + explicit QHeightMapSurfaceDataProxy(const QString &filename, QObject *parent = 0); virtual ~QHeightMapSurfaceDataProxy(); void setHeightMap(const QImage &image); @@ -59,8 +60,8 @@ public: float maxZValue() const; signals: - void heightMapChanged(QImage image); - void heightMapFileChanged(QString filename); + void heightMapChanged(const QImage &image); + void heightMapFileChanged(const QString &filename); void minXValueChanged(float value); void maxXValueChanged(float value); void minZValueChanged(float value); diff --git a/src/datavisualization/data/qheightmapsurfacedataproxy_p.h b/src/datavisualization/data/qheightmapsurfacedataproxy_p.h index 0e947666..5cc9993a 100644 --- a/src/datavisualization/data/qheightmapsurfacedataproxy_p.h +++ b/src/datavisualization/data/qheightmapsurfacedataproxy_p.h @@ -31,7 +31,7 @@ #include "qheightmapsurfacedataproxy.h" #include "qsurfacedataproxy_p.h" -#include <QTimer> +#include <QtCore/QTimer> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/data/qitemmodelbardataproxy.cpp b/src/datavisualization/data/qitemmodelbardataproxy.cpp index 6612a387..0e880c77 100644 --- a/src/datavisualization/data/qitemmodelbardataproxy.cpp +++ b/src/datavisualization/data/qitemmodelbardataproxy.cpp @@ -18,7 +18,6 @@ #include "qitemmodelbardataproxy_p.h" #include "baritemmodelhandler_p.h" -#include <QTimer> QT_BEGIN_NAMESPACE_DATAVISUALIZATION @@ -379,7 +378,7 @@ void QItemModelBarDataProxy::setRowCategories(const QStringList &categories) { if (dptr()->m_rowCategories != categories) { dptr()->m_rowCategories = categories; - emit rowCategoriesChanged(categories); + emit rowCategoriesChanged(); } } @@ -397,7 +396,7 @@ void QItemModelBarDataProxy::setColumnCategories(const QStringList &categories) { if (dptr()->m_columnCategories != categories) { dptr()->m_columnCategories = categories; - emit columnCategoriesChanged(categories); + emit columnCategoriesChanged(); } } diff --git a/src/datavisualization/data/qitemmodelbardataproxy.h b/src/datavisualization/data/qitemmodelbardataproxy.h index ce3ccaa3..f19b4445 100644 --- a/src/datavisualization/data/qitemmodelbardataproxy.h +++ b/src/datavisualization/data/qitemmodelbardataproxy.h @@ -20,8 +20,7 @@ #define QITEMMODELBARDATAPROXY_H #include <QtDataVisualization/qbardataproxy.h> -#include <QAbstractItemModel> -#include <QStringList> +#include <QtCore/QAbstractItemModel> QT_BEGIN_NAMESPACE_DATAVISUALIZATION @@ -96,12 +95,12 @@ public: signals: void itemModelChanged(const QAbstractItemModel* itemModel); - void rowRoleChanged(QString role); - void columnRoleChanged(QString role); - void valueRoleChanged(QString role); - void rotationRoleChanged(QString role); - void rowCategoriesChanged(QStringList categories); - void columnCategoriesChanged(QStringList categories); + void rowRoleChanged(const QString &role); + void columnRoleChanged(const QString &role); + void valueRoleChanged(const QString &role); + void rotationRoleChanged(const QString &role); + void rowCategoriesChanged(); + void columnCategoriesChanged(); void useModelCategoriesChanged(bool enable); void autoRowCategoriesChanged(bool enable); void autoColumnCategoriesChanged(bool enable); diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy.cpp b/src/datavisualization/data/qitemmodelscatterdataproxy.cpp index 4f407075..a5287abc 100644 --- a/src/datavisualization/data/qitemmodelscatterdataproxy.cpp +++ b/src/datavisualization/data/qitemmodelscatterdataproxy.cpp @@ -18,7 +18,6 @@ #include "qitemmodelscatterdataproxy_p.h" #include "scatteritemmodelhandler_p.h" -#include <QTimer> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy.h b/src/datavisualization/data/qitemmodelscatterdataproxy.h index ef950843..c6d2245d 100644 --- a/src/datavisualization/data/qitemmodelscatterdataproxy.h +++ b/src/datavisualization/data/qitemmodelscatterdataproxy.h @@ -20,8 +20,8 @@ #define QITEMMODELSCATTERDATAPROXY_H #include <QtDataVisualization/qscatterdataproxy.h> -#include <QAbstractItemModel> -#include <QStringList> +#include <QtCore/QAbstractItemModel> +#include <QtCore/QString> QT_BEGIN_NAMESPACE_DATAVISUALIZATION @@ -65,10 +65,10 @@ public: signals: void itemModelChanged(const QAbstractItemModel* itemModel); - void xPosRoleChanged(QString role); - void yPosRoleChanged(QString role); - void zPosRoleChanged(QString role); - void rotationRoleChanged(QString role); + void xPosRoleChanged(const QString &role); + void yPosRoleChanged(const QString &role); + void zPosRoleChanged(const QString &role); + void rotationRoleChanged(const QString &role); protected: QItemModelScatterDataProxyPrivate *dptr(); diff --git a/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp b/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp index 49c4d4ef..f15a8923 100644 --- a/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp +++ b/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp @@ -18,7 +18,6 @@ #include "qitemmodelsurfacedataproxy_p.h" #include "surfaceitemmodelhandler_p.h" -#include <QTimer> QT_BEGIN_NAMESPACE_DATAVISUALIZATION @@ -426,7 +425,7 @@ void QItemModelSurfaceDataProxy::setRowCategories(const QStringList &categories) { if (dptr()->m_rowCategories != categories) { dptr()->m_rowCategories = categories; - emit rowCategoriesChanged(categories); + emit rowCategoriesChanged(); } } @@ -444,7 +443,7 @@ void QItemModelSurfaceDataProxy::setColumnCategories(const QStringList &categori { if (dptr()->m_columnCategories != categories) { dptr()->m_columnCategories = categories; - emit columnCategoriesChanged(categories); + emit columnCategoriesChanged(); } } diff --git a/src/datavisualization/data/qitemmodelsurfacedataproxy.h b/src/datavisualization/data/qitemmodelsurfacedataproxy.h index a905f4c7..b1ebbeed 100644 --- a/src/datavisualization/data/qitemmodelsurfacedataproxy.h +++ b/src/datavisualization/data/qitemmodelsurfacedataproxy.h @@ -20,8 +20,8 @@ #define QITEMMODELSURFACEDATAPROXY_H #include <QtDataVisualization/qsurfacedataproxy.h> -#include <QAbstractItemModel> -#include <QStringList> +#include <QtCore/QAbstractItemModel> +#include <QtCore/QStringList> QT_BEGIN_NAMESPACE_DATAVISUALIZATION @@ -101,13 +101,13 @@ public: signals: void itemModelChanged(const QAbstractItemModel* itemModel); - void rowRoleChanged(QString role); - void columnRoleChanged(QString role); - void xPosRoleChanged(QString role); - void yPosRoleChanged(QString role); - void zPosRoleChanged(QString role); - void rowCategoriesChanged(QStringList categories); - void columnCategoriesChanged(QStringList categories); + void rowRoleChanged(const QString &role); + void columnRoleChanged(const QString &role); + void xPosRoleChanged(const QString &role); + void yPosRoleChanged(const QString &role); + void zPosRoleChanged(const QString &role); + void rowCategoriesChanged(); + void columnCategoriesChanged(); void useModelCategoriesChanged(bool enable); void autoRowCategoriesChanged(bool enable); void autoColumnCategoriesChanged(bool enable); diff --git a/src/datavisualization/data/qscatterdataitem.h b/src/datavisualization/data/qscatterdataitem.h index 62ebac56..87cc1fc5 100644 --- a/src/datavisualization/data/qscatterdataitem.h +++ b/src/datavisualization/data/qscatterdataitem.h @@ -20,8 +20,7 @@ #define QSCATTERDATAITEM_H #include <QtDataVisualization/qdatavisualizationglobal.h> - -#include <QQuaternion> +#include <QtGui/QQuaternion> QT_BEGIN_NAMESPACE_DATAVISUALIZATION @@ -50,7 +49,7 @@ public: inline float z() const { return m_position.z(); } protected: - virtual void createExtraData(); + void createExtraData(); QScatterDataItemPrivate *d_ptr; diff --git a/src/datavisualization/data/qscatterdataproxy.cpp b/src/datavisualization/data/qscatterdataproxy.cpp index b5e3863d..dbbb4384 100644 --- a/src/datavisualization/data/qscatterdataproxy.cpp +++ b/src/datavisualization/data/qscatterdataproxy.cpp @@ -98,7 +98,7 @@ QScatterDataProxy::~QScatterDataProxy() * * The series this proxy is attached to. */ -QScatter3DSeries *QScatterDataProxy::series() +QScatter3DSeries *QScatterDataProxy::series() const { return static_cast<QScatter3DSeries *>(d_ptr->series()); } diff --git a/src/datavisualization/data/qscatterdataproxy.h b/src/datavisualization/data/qscatterdataproxy.h index b8179166..fe561bbd 100644 --- a/src/datavisualization/data/qscatterdataproxy.h +++ b/src/datavisualization/data/qscatterdataproxy.h @@ -43,7 +43,7 @@ public: explicit QScatterDataProxy(QObject *parent = 0); virtual ~QScatterDataProxy(); - QScatter3DSeries *series(); + QScatter3DSeries *series() const; int itemCount() const; const QScatterDataArray *array() const; const QScatterDataItem *itemAt(int index) const; diff --git a/src/datavisualization/data/qsurface3dseries.h b/src/datavisualization/data/qsurface3dseries.h index b8a1a62b..8347104e 100644 --- a/src/datavisualization/data/qsurface3dseries.h +++ b/src/datavisualization/data/qsurface3dseries.h @@ -65,7 +65,7 @@ public: signals: void dataProxyChanged(QSurfaceDataProxy *proxy); - void selectedPointChanged(QPoint position); + void selectedPointChanged(const QPoint &position); void flatShadingEnabledChanged(bool enable); void flatShadingSupportedChanged(bool enable); void drawModeChanged(QSurface3DSeries::DrawFlags mode); diff --git a/src/datavisualization/data/qsurfacedataitem.h b/src/datavisualization/data/qsurfacedataitem.h index f305952b..1e4a384d 100644 --- a/src/datavisualization/data/qsurfacedataitem.h +++ b/src/datavisualization/data/qsurfacedataitem.h @@ -20,8 +20,7 @@ #define QSURFACEDATAITEM_H #include <QtDataVisualization/qdatavisualizationglobal.h> - -#include <QVector3D> +#include <QtGui/QVector3D> QT_BEGIN_NAMESPACE_DATAVISUALIZATION @@ -47,7 +46,7 @@ public: inline float z() const { return m_position.z(); } protected: - virtual void createExtraData(); + void createExtraData(); QSurfaceDataItemPrivate *d_ptr; diff --git a/src/datavisualization/data/qsurfacedataproxy.cpp b/src/datavisualization/data/qsurfacedataproxy.cpp index b19f1f0a..34cea326 100644 --- a/src/datavisualization/data/qsurfacedataproxy.cpp +++ b/src/datavisualization/data/qsurfacedataproxy.cpp @@ -131,7 +131,7 @@ QSurfaceDataProxy::~QSurfaceDataProxy() * * The series this proxy is attached to. */ -QSurface3DSeries *QSurfaceDataProxy::series() +QSurface3DSeries *QSurfaceDataProxy::series() const { return static_cast<QSurface3DSeries *>(d_ptr->series()); } @@ -186,6 +186,15 @@ void QSurfaceDataProxy::setItem(int rowIndex, int columnIndex, const QSurfaceDat } /*! + * Changes a single item at \a position to the \a item. + * The X-value of \a position indicates the row and the Y-value indicates the column. + */ +void QSurfaceDataProxy::setItem(const QPoint &position, const QSurfaceDataItem &item) +{ + setItem(position.x(), position.y(), item); +} + +/*! * Adds a new \a row to the end of array. The new \a row must have * the same number of columns as the rows at the initial array. * diff --git a/src/datavisualization/data/qsurfacedataproxy.h b/src/datavisualization/data/qsurfacedataproxy.h index 9cfe3b77..475f1f2d 100644 --- a/src/datavisualization/data/qsurfacedataproxy.h +++ b/src/datavisualization/data/qsurfacedataproxy.h @@ -45,7 +45,7 @@ public: explicit QSurfaceDataProxy(QObject *parent = 0); virtual ~QSurfaceDataProxy(); - QSurface3DSeries *series(); + QSurface3DSeries *series() const; int rowCount() const; int columnCount() const; const QSurfaceDataArray *array() const; @@ -58,6 +58,7 @@ public: void setRows(int rowIndex, const QSurfaceDataArray &rows); void setItem(int rowIndex, int columnIndex, const QSurfaceDataItem &item); + void setItem(const QPoint &position, const QSurfaceDataItem &item); int addRow(QSurfaceDataRow *row); int addRows(const QSurfaceDataArray &rows); diff --git a/src/datavisualization/data/qsurfacedataproxy_p.h b/src/datavisualization/data/qsurfacedataproxy_p.h index 658abe32..7c3486d2 100644 --- a/src/datavisualization/data/qsurfacedataproxy_p.h +++ b/src/datavisualization/data/qsurfacedataproxy_p.h @@ -32,8 +32,6 @@ #include "qsurfacedataproxy.h" #include "qabstractdataproxy_p.h" -#include <QSize> - QT_BEGIN_NAMESPACE_DATAVISUALIZATION class QSurfaceDataProxyPrivate : public QAbstractDataProxyPrivate diff --git a/src/datavisualization/data/scatteritemmodelhandler.cpp b/src/datavisualization/data/scatteritemmodelhandler.cpp index f89fa77c..08ed12f3 100644 --- a/src/datavisualization/data/scatteritemmodelhandler.cpp +++ b/src/datavisualization/data/scatteritemmodelhandler.cpp @@ -17,7 +17,6 @@ ****************************************************************************/ #include "scatteritemmodelhandler_p.h" -#include <QTimer> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/abstract3dcontroller.cpp b/src/datavisualization/engine/abstract3dcontroller.cpp index 4989ddb5..d2b59c58 100644 --- a/src/datavisualization/engine/abstract3dcontroller.cpp +++ b/src/datavisualization/engine/abstract3dcontroller.cpp @@ -32,8 +32,7 @@ #include "q3dtheme_p.h" #include "q3dscene_p.h" #include "q3dscene.h" - -#include <QThread> +#include <QtCore/QThread> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/abstract3dcontroller_p.h b/src/datavisualization/engine/abstract3dcontroller_p.h index cac46ddf..f9b6588d 100644 --- a/src/datavisualization/engine/abstract3dcontroller_p.h +++ b/src/datavisualization/engine/abstract3dcontroller_p.h @@ -35,10 +35,7 @@ #include "qabstract3dinputhandler.h" #include "qabstractdataproxy.h" #include "q3dscene_p.h" -#include "q3dbox.h" - -#include <QObject> -#include <QLinearGradient> +#include <QtGui/QLinearGradient> class QFont; diff --git a/src/datavisualization/engine/abstract3drenderer_p.h b/src/datavisualization/engine/abstract3drenderer_p.h index a381adf8..4f5b644e 100644 --- a/src/datavisualization/engine/abstract3drenderer_p.h +++ b/src/datavisualization/engine/abstract3drenderer_p.h @@ -33,7 +33,7 @@ #include <QtGui/QOpenGLFunctions> #ifdef DISPLAY_RENDER_SPEED -#include <QTime> +#include <QtCore/QTime> #endif #include "datavisualizationglobal_p.h" @@ -133,7 +133,6 @@ protected: AxisRenderCache m_axisCacheY; AxisRenderCache m_axisCacheZ; TextureHelper *m_textureHelper; - Q3DBox m_boundingBox; Q3DScene *m_cachedScene; bool m_selectionDirty; diff --git a/src/datavisualization/engine/axisrendercache.cpp b/src/datavisualization/engine/axisrendercache.cpp index c1c2d5bd..a107dd23 100644 --- a/src/datavisualization/engine/axisrendercache.cpp +++ b/src/datavisualization/engine/axisrendercache.cpp @@ -17,8 +17,9 @@ ****************************************************************************/ #include "axisrendercache_p.h" -#include "qmath.h" -#include <QFontMetrics> + +#include <QtCore/qmath.h> +#include <QtGui/QFontMetrics> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/bars3dcontroller.cpp b/src/datavisualization/engine/bars3dcontroller.cpp index c84c445b..442601eb 100644 --- a/src/datavisualization/engine/bars3dcontroller.cpp +++ b/src/datavisualization/engine/bars3dcontroller.cpp @@ -27,8 +27,8 @@ #include "thememanager_p.h" #include "q3dtheme_p.h" -#include <QMatrix4x4> -#include <qmath.h> +#include <QtGui/QMatrix4x4> +#include <QtCore/qmath.h> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp index bb702119..3ec23476 100644 --- a/src/datavisualization/engine/bars3drenderer.cpp +++ b/src/datavisualization/engine/bars3drenderer.cpp @@ -28,11 +28,10 @@ #include "q3dlight.h" #include "qbar3dseries_p.h" -#include <QMatrix4x4> -#include <QMouseEvent> -#include <QThread> -#include <qmath.h> -#include <QDebug> +#include <QtGui/QMatrix4x4> +#include <QtGui/QMouseEvent> +#include <QtCore/QThread> +#include <QtCore/qmath.h> // You can verify that depth buffer drawing works correctly by uncommenting this. // You should see the scene from where the light is diff --git a/src/datavisualization/engine/drawer.cpp b/src/datavisualization/engine/drawer.cpp index dd82eadc..b70d7c0e 100644 --- a/src/datavisualization/engine/drawer.cpp +++ b/src/datavisualization/engine/drawer.cpp @@ -24,8 +24,9 @@ #include "q3dcamera.h" #include "utils_p.h" #include "texturehelper_p.h" -#include <QMatrix4x4> -#include <qmath.h> + +#include <QtGui/QMatrix4x4> +#include <QtCore/qmath.h> // Resources need to be explicitly initialized when building as static library class StaticLibInitializer diff --git a/src/datavisualization/engine/drawer_p.h b/src/datavisualization/engine/drawer_p.h index 35a0a7ff..54c8111e 100644 --- a/src/datavisualization/engine/drawer_p.h +++ b/src/datavisualization/engine/drawer_p.h @@ -34,7 +34,6 @@ #include "q3dtheme.h" #include "labelitem_p.h" #include "abstractrenderitem_p.h" -#include <QFont> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/engine.pri b/src/datavisualization/engine/engine.pri index b686397c..64a0f4dd 100644 --- a/src/datavisualization/engine/engine.pri +++ b/src/datavisualization/engine/engine.pri @@ -23,7 +23,6 @@ HEADERS += $$PWD/qabstract3dgraph_p.h \ $$PWD/q3dscene.h \ $$PWD/q3dlight.h \ $$PWD/q3dlight_p.h \ - $$PWD/q3dbox.h \ $$PWD/q3dobject.h \ $$PWD/q3dobject_p.h \ $$PWD/q3dscene_p.h \ @@ -47,7 +46,6 @@ SOURCES += $$PWD/qabstract3dgraph.cpp \ $$PWD/selectionpointer.cpp \ $$PWD/q3dcamera.cpp \ $$PWD/q3dlight.cpp \ - $$PWD/q3dbox.cpp \ $$PWD/q3dobject.cpp \ $$PWD/q3dscene.cpp \ $$PWD/surfaceseriesrendercache.cpp diff --git a/src/datavisualization/engine/q3dbars.h b/src/datavisualization/engine/q3dbars.h index 97e7c067..7f9c981f 100644 --- a/src/datavisualization/engine/q3dbars.h +++ b/src/datavisualization/engine/q3dbars.h @@ -20,16 +20,13 @@ #define Q3DBARS_H #include <QtDataVisualization/qabstract3dgraph.h> -#include <QFont> -#include <QLinearGradient> +#include <QtDataVisualization/qvalue3daxis.h> +#include <QtDataVisualization/qcategory3daxis.h> +#include <QtDataVisualization/qbar3dseries.h> QT_BEGIN_NAMESPACE_DATAVISUALIZATION class Q3DBarsPrivate; -class QAbstract3DAxis; -class QCategory3DAxis; -class QValue3DAxis; -class QBar3DSeries; class QT_DATAVISUALIZATION_EXPORT Q3DBars : public QAbstract3DGraph { @@ -82,7 +79,7 @@ public: signals: void multiSeriesUniformChanged(bool uniform); void barThicknessChanged(float thicknessRatio); - void barSpacingChanged(QSizeF spacing); + void barSpacingChanged(const QSizeF &spacing); void barSpacingRelativeChanged(bool relative); void rowAxisChanged(QCategory3DAxis *axis); void columnAxisChanged(QCategory3DAxis *axis); diff --git a/src/datavisualization/engine/q3dbox.cpp b/src/datavisualization/engine/q3dbox.cpp deleted file mode 100644 index c5caea75..00000000 --- a/src/datavisualization/engine/q3dbox.cpp +++ /dev/null @@ -1,485 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc -** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com -** -** This file is part of the QtDataVisualization module. -** -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. -** -** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com -** -****************************************************************************/ - -#include "datavisualizationglobal_p.h" -#include "q3dbox.h" -#include <QtCore/QList> - -QT_BEGIN_NAMESPACE_DATAVISUALIZATION - -/*! - \class Q3DBox - \inmodule QtDataVisualization - \brief The Q3DBox class represents an axis-aligned box in 3D space. - \since Qt Data Visualization 1.0 - - Q3DBox can be used to represent the bounding box of objects in a 3D - scene so that they can be easily culled if they are out of view. - - The sides of the box are always aligned with the x, y, and z axes of - the world co-ordinate system. Transforming a box with transformed() - will result in the smallest axis-aligned bounding box that contains - the transformed box. - - Boxes may be null, finite, or infinite. A null box does not occupy - any space and does not intersect with any other box. A finite - box consists of a minimum() and maximum() extent in 3D space. - An infinite box encompasses all points in 3D space. - - The extents of a finite box are also included within the box. - A box with minimum() and maximum() set to the same value - contains a single point. -*/ - -/*! - \fn Q3DBox::Q3DBox() - - Constructs a null box in 3D space. - - \sa isNull() -*/ - -/*! - \fn Q3DBox::Q3DBox(const QVector3D& corner1, const QVector3D& corner2) - - Constructs a finite box in 3D space from \a corner1 to \a corner2. - The minimum() and maximum() co-ordinates of the new box are set - to the minimum and maximum x, y, and z values from \a corner1 and - \a corner2. The \a corner1 and \a corner2 values can be any two - opposite corners that define the box. - - \sa isFinite(), minimum(), maximum() -*/ - -/*! - \fn bool Q3DBox::isNull() const - - Returns true if this box is null; false otherwise. - - \sa isFinite(), isInfinite(), setToNull() -*/ - -/*! - \fn bool Q3DBox::isFinite() const - - Returns true if this box is finite in size; false otherwise. - - \sa isNull(), isInfinite(), setExtents() -*/ - -/*! - \fn bool Q3DBox::isInfinite() const - - Returns true if this box is infinite in size; false otherwise. - - \sa isNull(), isFinite(), setToInfinite() -*/ - -/*! - \fn QVector3D Q3DBox::minimum() const - - Returns the minimum corner of this box. - - \sa maximum(), setExtents() -*/ - -/*! - \fn QVector3D Q3DBox::maximum() const - - Returns the maximum corner of this box. - - \sa minimum(), setExtents() -*/ - -/*! - \fn void Q3DBox::setExtents(const QVector3D& corner1, const QVector3D& corner2) - - Sets the extents of this box to a finite region from \a corner1 to - \a corner2. The minimum() and maximum() co-ordinates of the box are - set to the minimum and maximum x, y, and z values from \a corner1 and - \a corner2. The \a corner1 and \a corner2 values can be any two - opposite corners that define the box. - - \sa minimum(), maximum() -*/ - -/*! - \fn void Q3DBox::setToNull() - - Sets this box to null. - - \sa isNull() -*/ - -/*! - \fn void Q3DBox::setToInfinite() - - Sets this box to be infinite in size. - - \sa isInfinite() -*/ - -/*! - \fn QVector3D Q3DBox::size() const - - Returns the finite size of this box. If this box is null or - infinite, the returned value will be zero. - - \sa center(), isNull(), isInfinite() -*/ - -/*! - \fn QVector3D Q3DBox::center() const - - Returns the finite center of this box. If this box is null - or infinite, the returned value will be zero. - - \sa size(), isNull(), isInfinite() -*/ - -/*! - \fn bool Q3DBox::contains(const QVector3D& point) const - - Returns true if this box contains \a point; false otherwise. - Null boxes do not contain any points and infinite boxes contain - all points. - - Containment is not a strict test: the point is contained if it - lies on one of the faces of the box. - - \sa intersects() -*/ - -/*! - \fn bool Q3DBox::contains(const Q3DBox& box) const - - Returns true if this box completely contains \a box. If this box - is null, then it will not contain \a box. If this box is infinite, - and \a box is not null, then \a box will be contained within this box. - If \a box is infinite, then this box must also be infinite to contain it. - - \sa intersects() -*/ - -/*! - Returns true if \a box intersects this box; false otherwise. - - \sa intersect(), intersected(), contains() -*/ -bool Q3DBox::intersects(const Q3DBox& box) const -{ - if (boxtype == Null) - return false; - else if (boxtype == Infinite) - return box.boxtype != Null; - else if (box.boxtype == Null) - return false; - else if (box.boxtype == Infinite) - return true; - - if (maxcorner.x() < box.mincorner.x()) - return false; - if (mincorner.x() > box.maxcorner.x()) - return false; - - if (maxcorner.y() < box.mincorner.y()) - return false; - if (mincorner.y() > box.maxcorner.y()) - return false; - - if (maxcorner.z() < box.mincorner.z()) - return false; - if (mincorner.z() > box.maxcorner.z()) - return false; - - return true; -} - -/*! - Intersects this box with \a box. - - \sa intersected(), intersects(), unite() -*/ -void Q3DBox::intersect(const Q3DBox& box) -{ - // Handle the simple cases first. - if (boxtype == Null) { - // Null intersected with anything is null. - return; - } else if (boxtype == Infinite) { - // Infinity intersected with a box is that box. - *this = box; - return; - } else if (box.boxtype == Null) { - // Anything intersected with null is null. - setToNull(); - return; - } else if (box.boxtype == Infinite) { - // Box intersected with infinity is the box. - return; - } - - // Intersect two finite boxes. - QVector3D min1 = mincorner; - QVector3D max1 = maxcorner; - QVector3D min2 = box.mincorner; - QVector3D max2 = box.maxcorner; - if (min2.x() > min1.x()) - min1.setX(min2.x()); - if (min2.y() > min1.y()) - min1.setY(min2.y()); - if (min2.z() > min1.z()) - min1.setZ(min2.z()); - if (max2.x() < max1.x()) - max1.setX(max2.x()); - if (max2.y() < max1.y()) - max1.setY(max2.y()); - if (max2.z() < max1.z()) - max1.setZ(max2.z()); - if (min1.x() > max1.x() || min1.y() > max1.y() || min1.z() > max1.z()) { - setToNull(); - } else { - mincorner = min1; - maxcorner = max1; - } -} - -/*! - Returns a new box which is the intersection of this box with \a box. - - \sa intersect(), intersects(), united() -*/ -Q3DBox Q3DBox::intersected(const Q3DBox& box) const -{ - Q3DBox result(*this); - result.intersect(box); - return result; -} - -/*! - Unites this box with \a point by expanding it to encompass \a point. - If \a point is already contained within this box, then this box - will be unchanged. - - \sa united(), intersect() -*/ -void Q3DBox::unite(const QVector3D& point) -{ - if (boxtype == Finite) { - if (point.x() < mincorner.x()) - mincorner.setX(point.x()); - else if (point.x() > maxcorner.x()) - maxcorner.setX(point.x()); - if (point.y() < mincorner.y()) - mincorner.setY(point.y()); - else if (point.y() > maxcorner.y()) - maxcorner.setY(point.y()); - if (point.z() < mincorner.z()) - mincorner.setZ(point.z()); - else if (point.z() > maxcorner.z()) - maxcorner.setZ(point.z()); - } else if (boxtype == Null) { - boxtype = Finite; - mincorner = point; - maxcorner = point; - } -} - -/*! - Unites this box with \a box by expanding this box to encompass the - region defined by \a box. If \a box is already contained within - this box, then this box will be unchanged. - - \sa united(), intersect() -*/ -void Q3DBox::unite(const Q3DBox& box) -{ - if (box.boxtype == Finite) { - unite(box.minimum()); - unite(box.maximum()); - } else if (box.boxtype == Infinite) { - setToInfinite(); - } -} - -/*! - Returns a new box which unites this box with \a point. The returned - value will be the smallest box that contains both this box and \a point. - - \sa unite(), intersected() -*/ -Q3DBox Q3DBox::united(const QVector3D& point) const -{ - if (boxtype == Finite) { - Q3DBox result(*this); - result.unite(point); - return result; - } else if (boxtype == Null) { - return Q3DBox(point, point); - } else { - return *this; - } -} - -/*! - Returns a new box which unites this box with \a box. The returned value - will be the smallest box that contains both this box and \a box. - - \sa unite(), intersected() -*/ -Q3DBox Q3DBox::united(const Q3DBox& box) const -{ - if (boxtype == Finite) { - Q3DBox result(*this); - result.unite(box); - return result; - } else if (boxtype == Null) { - return box; - } else { - return *this; - } -} - -/*! - Transforms this box according to \a matrix. Each of the 8 box - corners are transformed and then a new box that encompasses all - of the transformed corner values is created. - - \sa transformed() -*/ -void Q3DBox::transform(const QMatrix4x4& matrix) -{ - *this = transformed(matrix); -} - -/*! - Returns this box transformed by \a matrix. Each of the 8 box - corners are transformed and then a new box that encompasses all - of the transformed corner values is returned. - - \sa transform() -*/ -Q3DBox Q3DBox::transformed(const QMatrix4x4& matrix) const -{ - if (boxtype != Finite) - return *this; - Q3DBox result; - result.unite(matrix * mincorner); - result.unite(matrix * QVector3D(mincorner.x(), mincorner.y(), maxcorner.z())); - result.unite(matrix * QVector3D(mincorner.x(), maxcorner.y(), maxcorner.z())); - result.unite(matrix * QVector3D(mincorner.x(), maxcorner.y(), mincorner.z())); - result.unite(matrix * QVector3D(maxcorner.x(), mincorner.y(), mincorner.z())); - result.unite(matrix * QVector3D(maxcorner.x(), maxcorner.y(), mincorner.z())); - result.unite(matrix * QVector3D(maxcorner.x(), mincorner.y(), maxcorner.z())); - result.unite(matrix * maxcorner); - return result; -} - -/*! - \fn bool Q3DBox::operator==(const Q3DBox& box) const - - Returns true if this box is identical to \a box. -*/ - -/*! - \fn bool Q3DBox::operator!=(const Q3DBox& box) const - - Returns true if this box is not identical to \a box. -*/ - -/*! - \fn bool qFuzzyCompare(const Q3DBox& box1, const Q3DBox& box2) - \relates Q3DBox - - Returns true if \a box1 and \a box2 are almost equal; false otherwise. -*/ - -#ifndef QT_NO_DEBUG_STREAM - -/*! - \fn operator<<(QDebug dbg, const Q3DBox &box) - \internal - */ -QDebug operator<<(QDebug dbg, const Q3DBox &box) -{ - if (box.isFinite()) { - dbg.nospace() << "Q3DBox((" - << box.minimum().x() << ", " << box.minimum().y() << ", " - << box.minimum().z() << ") - (" - << box.maximum().x() << ", " << box.maximum().y() << ", " - << box.maximum().z() << "))"; - return dbg.space(); - } else if (box.isNull()) { - dbg << "Q3DBox(null)"; - return dbg; - } else { - dbg << "Q3DBox(infinite)"; - return dbg; - } -} - -#endif - -#ifndef QT_NO_DATASTREAM - -/*! - \relates Q3DBox - - Writes the given \a box to the given \a stream and returns a - reference to the stream. -*/ -QDataStream &operator<<(QDataStream &stream, const Q3DBox &box) -{ - if (box.isNull()) { - stream << int(0); - } else if (box.isInfinite()) { - stream << int(2); - } else { - stream << int(1); - stream << box.minimum(); - stream << box.maximum(); - } - return stream; -} - -/*! - \relates Q3DBox - - Reads a 3D box from the given \a stream into the given \a box - and returns a reference to the stream. -*/ -QDataStream &operator>>(QDataStream &stream, Q3DBox &box) -{ - int type; - stream >> type; - if (type == 1) { - QVector3D minimum, maximum; - stream >> minimum; - stream >> maximum; - box = Q3DBox(minimum, maximum); - } else if (type == 2) { - box.setToInfinite(); - } else { - box.setToNull(); - } - return stream; -} - -#endif - -QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/q3dbox.h b/src/datavisualization/engine/q3dbox.h deleted file mode 100644 index 6dbaefa1..00000000 --- a/src/datavisualization/engine/q3dbox.h +++ /dev/null @@ -1,158 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc -** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com -** -** This file is part of the QtDataVisualization module. -** -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. -** -** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com -** -****************************************************************************/ - -#ifndef Q3DBOX_H -#define Q3DBOX_H - -#include <QtDataVisualization/qdatavisualizationglobal.h> -#include <QtGui/QMatrix4x4> -#include <QtGui/QVector3D> - -QT_BEGIN_NAMESPACE_DATAVISUALIZATION - -class Q3DBox; // Needed to circumvent an issue with qdoc. If this line is removed, make docs will not work for this. - -class QT_DATAVISUALIZATION_EXPORT Q3DBox -{ -public: - inline Q3DBox() : boxtype(Null), mincorner(0, 0, 0), maxcorner(0, 0, 0) {} - inline Q3DBox(const QVector3D& corner1, const QVector3D& corner2): boxtype(Finite), - mincorner(qMin(corner1.x(), corner2.x()), - qMin(corner1.y(), corner2.y()), - qMin(corner1.z(), corner2.z())), - maxcorner(qMax(corner1.x(), corner2.x()), - qMax(corner1.y(), corner2.y()), - qMax(corner1.z(), corner2.z())) {} - - inline bool isNull() const { return (boxtype == Null); } - inline bool isFinite() const { return (boxtype == Finite); } - inline bool isInfinite() const { return (boxtype == Infinite); } - - inline QVector3D minimum() const { return mincorner; } - inline QVector3D maximum() const { return maxcorner; } - inline void setExtents(const QVector3D& corner1, const QVector3D& corner2) - { - boxtype = Finite; - mincorner = QVector3D(qMin(corner1.x(), corner2.x()), - qMin(corner1.y(), corner2.y()), - qMin(corner1.z(), corner2.z())); - maxcorner = QVector3D(qMax(corner1.x(), corner2.x()), - qMax(corner1.y(), corner2.y()), - qMax(corner1.z(), corner2.z())); - } - - inline void setToNull() - { - boxtype = Null; - mincorner = QVector3D(0, 0, 0); - maxcorner = QVector3D(0, 0, 0); - } - - inline void setToInfinite() - { - boxtype = Infinite; - mincorner = QVector3D(0, 0, 0); - maxcorner = QVector3D(0, 0, 0); - } - - inline QVector3D size() const { return maxcorner - mincorner; } - inline QVector3D center() const { return (mincorner + maxcorner) * 0.5f; } - - inline bool contains(const QVector3D& point) const - { - if (boxtype == Finite) { - return (point.x() >= mincorner.x() && point.x() <= maxcorner.x() && - point.y() >= mincorner.y() && point.y() <= maxcorner.y() && - point.z() >= mincorner.z() && point.z() <= maxcorner.z()); - } else if (boxtype == Infinite) { - return true; - } else { - return false; - } - } - - inline bool contains(const Q3DBox& box) const - { - if (box.boxtype == Finite) - return contains(box.mincorner) && contains(box.maxcorner); - else if (box.boxtype == Infinite) - return (boxtype == Infinite); - else - return false; - } - - bool intersects(const Q3DBox& box) const; - void intersect(const Q3DBox& box); - Q3DBox intersected(const Q3DBox& box) const; - - void unite(const QVector3D& point); - void unite(const Q3DBox& box); - - Q3DBox united(const QVector3D& point) const; - Q3DBox united(const Q3DBox& box) const; - - void transform(const QMatrix4x4& matrix); - Q3DBox transformed(const QMatrix4x4& matrix) const; - - inline bool operator==(const Q3DBox& box) const - { - return (boxtype == box.boxtype && - mincorner == box.mincorner && - maxcorner == box.maxcorner); - } - - inline bool operator!=(const Q3DBox& box) const - { - return (boxtype != box.boxtype || - mincorner != box.mincorner || - maxcorner != box.maxcorner); - } - - friend bool qFuzzyCompare(const Q3DBox& box1, const Q3DBox& box2); - -private: - enum Type - { - Null, - Finite, - Infinite - }; - - Q3DBox::Type boxtype; - QVector3D mincorner, maxcorner; -}; - -inline bool qFuzzyCompare(const Q3DBox& box1, const Q3DBox& box2) -{ - return box1.boxtype == box2.boxtype && - qFuzzyCompare(box1.mincorner, box2.mincorner) && - qFuzzyCompare(box1.maxcorner, box2.maxcorner); -} - -#ifndef QT_NO_DEBUG_STREAM -QT_DATAVISUALIZATION_EXPORT QDebug operator<<(QDebug dbg, const Q3DBox &box); -#endif - -#ifndef QT_NO_DATASTREAM -QT_DATAVISUALIZATION_EXPORT QDataStream &operator<<(QDataStream &stream, const Q3DBox &box); -QT_DATAVISUALIZATION_EXPORT QDataStream &operator>>(QDataStream &stream, Q3DBox &box); -#endif - -QT_END_NAMESPACE_DATAVISUALIZATION - -#endif diff --git a/src/datavisualization/engine/q3dcamera.cpp b/src/datavisualization/engine/q3dcamera.cpp index a3afd019..c7342aa9 100644 --- a/src/datavisualization/engine/q3dcamera.cpp +++ b/src/datavisualization/engine/q3dcamera.cpp @@ -19,12 +19,10 @@ #include "q3dcamera.h" #include "q3dcamera_p.h" #include "q3dscene.h" -#include "q3dbox.h" #include "q3dobject.h" #include "utils_p.h" -#include <qmath.h> -#include <QVector3D> +#include <QtCore/qmath.h> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/q3dcamera.h b/src/datavisualization/engine/q3dcamera.h index 44aff452..87602e5c 100644 --- a/src/datavisualization/engine/q3dcamera.h +++ b/src/datavisualization/engine/q3dcamera.h @@ -20,10 +20,6 @@ #define Q3DCAMERA_H #include <QtDataVisualization/q3dobject.h> -#include <QMatrix4x4> - -class QVector3D; -class QPoint; QT_BEGIN_NAMESPACE_DATAVISUALIZATION @@ -69,7 +65,6 @@ public: CameraPresetDirectlyBelow }; -public: Q3DCamera(QObject *parent = 0); virtual ~Q3DCamera(); @@ -116,7 +111,6 @@ private: friend class SelectionPointer; friend class Q3DInputHandler; friend class QTouch3DInputHandlerPrivate; - friend class QMac3DInputHandler; }; QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/q3dcamera_p.h b/src/datavisualization/engine/q3dcamera_p.h index 1112c87e..884229e3 100644 --- a/src/datavisualization/engine/q3dcamera_p.h +++ b/src/datavisualization/engine/q3dcamera_p.h @@ -31,6 +31,7 @@ #include "datavisualizationglobal_p.h" #include "q3dcamera.h" +#include <QtGui/QMatrix4x4> QT_BEGIN_NAMESPACE_DATAVISUALIZATION @@ -106,7 +107,6 @@ public: friend class SelectionPointer; friend class Q3DInputHandler; friend class QTouch3DInputHandler; - friend class QMac3DInputHandler; }; QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/q3dlight.h b/src/datavisualization/engine/q3dlight.h index 876601a7..6d51b90f 100644 --- a/src/datavisualization/engine/q3dlight.h +++ b/src/datavisualization/engine/q3dlight.h @@ -24,7 +24,6 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION class Q3DLightPrivate; -class Q3DScene; class QT_DATAVISUALIZATION_EXPORT Q3DLight : public Q3DObject { diff --git a/src/datavisualization/engine/q3dobject.h b/src/datavisualization/engine/q3dobject.h index 07506f63..4ea505bb 100644 --- a/src/datavisualization/engine/q3dobject.h +++ b/src/datavisualization/engine/q3dobject.h @@ -19,14 +19,14 @@ #ifndef Q3DOBJECT_H #define Q3DOBJECT_H -#include <QtDataVisualization/q3dscene.h> - -#include <QObject> -#include <QVector3D> +#include <QtDataVisualization/qdatavisualizationglobal.h> +#include <QtCore/QObject> +#include <QtGui/QVector3D> QT_BEGIN_NAMESPACE_DATAVISUALIZATION class Q3DObjectPrivate; +class Q3DScene; class QT_DATAVISUALIZATION_EXPORT Q3DObject : public QObject { @@ -46,7 +46,7 @@ public: void setPosition(const QVector3D &position); signals: - void positionChanged(QVector3D position); + void positionChanged(const QVector3D &position); protected: void setDirty(bool dirty); diff --git a/src/datavisualization/engine/q3dscatter.h b/src/datavisualization/engine/q3dscatter.h index 2d8516ee..016431af 100644 --- a/src/datavisualization/engine/q3dscatter.h +++ b/src/datavisualization/engine/q3dscatter.h @@ -20,16 +20,12 @@ #define Q3DSCATTER_H #include <QtDataVisualization/qabstract3dgraph.h> -#include <QtDataVisualization/q3dscene.h> -#include <QFont> -#include <QLinearGradient> +#include <QtDataVisualization/qvalue3daxis.h> +#include <QtDataVisualization/qscatter3dseries.h> QT_BEGIN_NAMESPACE_DATAVISUALIZATION class Q3DScatterPrivate; -class QValue3DAxis; -class QCategory3DAxis; -class QScatter3DSeries; class QT_DATAVISUALIZATION_EXPORT Q3DScatter : public QAbstract3DGraph { diff --git a/src/datavisualization/engine/q3dscene.cpp b/src/datavisualization/engine/q3dscene.cpp index f4467f22..be64b928 100644 --- a/src/datavisualization/engine/q3dscene.cpp +++ b/src/datavisualization/engine/q3dscene.cpp @@ -16,8 +16,6 @@ ** ****************************************************************************/ -#include <qmath.h> - #include "datavisualizationglobal_p.h" #include "q3dscene.h" @@ -25,6 +23,8 @@ #include "q3dcamera_p.h" #include "q3dlight_p.h" +#include <QtCore/qmath.h> + QT_BEGIN_NAMESPACE_DATAVISUALIZATION /*! 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; diff --git a/src/datavisualization/engine/q3dscene_p.h b/src/datavisualization/engine/q3dscene_p.h index b2948c06..bc6a7223 100644 --- a/src/datavisualization/engine/q3dscene_p.h +++ b/src/datavisualization/engine/q3dscene_p.h @@ -30,7 +30,7 @@ #define Q3DSCENE_P_H #include "datavisualizationglobal_p.h" -#include <QRect> +#include "q3dscene.h" QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/q3dsurface.h b/src/datavisualization/engine/q3dsurface.h index 673ce4d7..9868c844 100644 --- a/src/datavisualization/engine/q3dsurface.h +++ b/src/datavisualization/engine/q3dsurface.h @@ -20,14 +20,12 @@ #define Q3DSURFACE_H #include <QtDataVisualization/qabstract3dgraph.h> -#include <QtDataVisualization/q3dscene.h> -#include <QFont> +#include <QtDataVisualization/qvalue3daxis.h> +#include <QtDataVisualization/qsurface3dseries.h> QT_BEGIN_NAMESPACE_DATAVISUALIZATION class Q3DSurfacePrivate; -class QValue3DAxis; -class QSurface3DSeries; class QT_DATAVISUALIZATION_EXPORT Q3DSurface : public QAbstract3DGraph { diff --git a/src/datavisualization/engine/q3dsurface_p.h b/src/datavisualization/engine/q3dsurface_p.h index 540956b6..0e5a5121 100644 --- a/src/datavisualization/engine/q3dsurface_p.h +++ b/src/datavisualization/engine/q3dsurface_p.h @@ -32,8 +32,6 @@ #include "surface3dcontroller_p.h" #include "qabstract3dgraph_p.h" -#include <QList> - QT_BEGIN_NAMESPACE_DATAVISUALIZATION class Q3DSurface; diff --git a/src/datavisualization/engine/qabstract3dgraph.cpp b/src/datavisualization/engine/qabstract3dgraph.cpp index aeb4a0b6..f2102b29 100644 --- a/src/datavisualization/engine/qabstract3dgraph.cpp +++ b/src/datavisualization/engine/qabstract3dgraph.cpp @@ -23,11 +23,10 @@ #include "q3dscene_p.h" #include "qutils.h" -#include <QGuiApplication> -#include <QOpenGLContext> -#include <QOpenGLPaintDevice> -#include <QPainter> - +#include <QtGui/QGuiApplication> +#include <QtGui/QOpenGLContext> +#include <QtGui/QOpenGLPaintDevice> +#include <QtGui/QPainter> QT_BEGIN_NAMESPACE_DATAVISUALIZATION @@ -222,7 +221,7 @@ void QAbstract3DGraph::setActiveInputHandler(QAbstract3DInputHandler *inputHandl d_ptr->m_visualController->setActiveInputHandler(inputHandler); } -QAbstract3DInputHandler *QAbstract3DGraph::activeInputHandler() +QAbstract3DInputHandler *QAbstract3DGraph::activeInputHandler() const { return d_ptr->m_visualController->activeInputHandler(); } diff --git a/src/datavisualization/engine/qabstract3dgraph.h b/src/datavisualization/engine/qabstract3dgraph.h index 9534ce5c..adf67912 100644 --- a/src/datavisualization/engine/qabstract3dgraph.h +++ b/src/datavisualization/engine/qabstract3dgraph.h @@ -20,18 +20,15 @@ #define QABSTRACT3DGRAPH_H #include <QtDataVisualization/qdatavisualizationglobal.h> - -#include <QWindow> -#include <QOpenGLFunctions> -#include <QScreen> +#include <QtDataVisualization/q3dtheme.h> +#include <QtDataVisualization/q3dscene.h> +#include <QtDataVisualization/qabstract3dinputhandler.h> +#include <QtGui/QWindow> +#include <QtGui/QOpenGLFunctions> QT_BEGIN_NAMESPACE_DATAVISUALIZATION class QAbstract3DGraphPrivate; -class Abstract3DController; -class QAbstract3DInputHandler; -class Q3DTheme; -class Q3DScene; class QT_DATAVISUALIZATION_EXPORT QAbstract3DGraph : public QWindow, protected QOpenGLFunctions { @@ -78,7 +75,7 @@ public: void addInputHandler(QAbstract3DInputHandler *inputHandler); void releaseInputHandler(QAbstract3DInputHandler *inputHandler); void setActiveInputHandler(QAbstract3DInputHandler *inputHandler); - QAbstract3DInputHandler *activeInputHandler(); + QAbstract3DInputHandler *activeInputHandler() const; QList<QAbstract3DInputHandler *> inputHandlers() const; void addTheme(Q3DTheme *theme); @@ -117,6 +114,7 @@ signals: void shadowQualityChanged(ShadowQuality quality); private: + Q_DISABLE_COPY(QAbstract3DGraph) QScopedPointer<QAbstract3DGraphPrivate> d_ptr; friend class Q3DBars; diff --git a/src/datavisualization/engine/qabstract3dgraph_p.h b/src/datavisualization/engine/qabstract3dgraph_p.h index a353797b..d28495ab 100644 --- a/src/datavisualization/engine/qabstract3dgraph_p.h +++ b/src/datavisualization/engine/qabstract3dgraph_p.h @@ -31,8 +31,6 @@ #include "datavisualizationglobal_p.h" -#include <QObject> - class QOpenGLContext; class QOpenGLPaintDevice; diff --git a/src/datavisualization/engine/scatter3dcontroller.cpp b/src/datavisualization/engine/scatter3dcontroller.cpp index 8495052e..54292ac0 100644 --- a/src/datavisualization/engine/scatter3dcontroller.cpp +++ b/src/datavisualization/engine/scatter3dcontroller.cpp @@ -24,8 +24,8 @@ #include "qscatterdataproxy_p.h" #include "qscatter3dseries_p.h" -#include <QMatrix4x4> -#include <qmath.h> +#include <QtGui/QMatrix4x4> +#include <QtCore/qmath.h> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/scatter3drenderer.cpp b/src/datavisualization/engine/scatter3drenderer.cpp index d6f34a67..1785ca2c 100644 --- a/src/datavisualization/engine/scatter3drenderer.cpp +++ b/src/datavisualization/engine/scatter3drenderer.cpp @@ -27,11 +27,10 @@ #include "q3dlight.h" #include "qscatter3dseries_p.h" -#include <QMatrix4x4> -#include <QMouseEvent> -#include <QThread> -#include <qmath.h> -#include <QDebug> +#include <QtGui/QMatrix4x4> +#include <QtGui/QMouseEvent> +#include <QtCore/QThread> +#include <QtCore/qmath.h> // Commenting this draws the shadow map with perspective projection. Otherwise it's drawn in // orthographic projection. diff --git a/src/datavisualization/engine/selectionpointer.cpp b/src/datavisualization/engine/selectionpointer.cpp index fc1d7669..d4e635bc 100644 --- a/src/datavisualization/engine/selectionpointer.cpp +++ b/src/datavisualization/engine/selectionpointer.cpp @@ -26,7 +26,7 @@ #include "utils_p.h" #include "q3dlight.h" -#include <QMatrix4x4> +#include <QtGui/QMatrix4x4> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/selectionpointer_p.h b/src/datavisualization/engine/selectionpointer_p.h index c72b3510..1eac22be 100644 --- a/src/datavisualization/engine/selectionpointer_p.h +++ b/src/datavisualization/engine/selectionpointer_p.h @@ -29,8 +29,6 @@ #ifndef SELECTIONPOINTER_P_H #define SELECTIONPOINTER_P_H -#include <QVector3D> - #include "q3dscene.h" #include "datavisualizationglobal_p.h" #include "surface3dcontroller_p.h" diff --git a/src/datavisualization/engine/surface3dcontroller.cpp b/src/datavisualization/engine/surface3dcontroller.cpp index 48100c05..12d06501 100644 --- a/src/datavisualization/engine/surface3dcontroller.cpp +++ b/src/datavisualization/engine/surface3dcontroller.cpp @@ -26,9 +26,7 @@ #include "qsurface3dseries_p.h" #include "shaderhelper_p.h" -#include <QMatrix4x4> - -#include <QDebug> +#include <QtGui/QMatrix4x4> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp index c77f1787..fdb3c170 100644 --- a/src/datavisualization/engine/surface3drenderer.cpp +++ b/src/datavisualization/engine/surface3drenderer.cpp @@ -30,11 +30,9 @@ #include "q3dlight.h" #include "qsurface3dseries_p.h" -#include <QMatrix4x4> -#include <QMouseEvent> -#include <qmath.h> - -#include <QDebug> +#include <QtGui/QMatrix4x4> +#include <QtGui/QMouseEvent> +#include <QtCore/qmath.h> static const int ID_TO_RGBA_MASK = 0xff; diff --git a/src/datavisualization/global/datavisualizationglobal_p.h b/src/datavisualization/global/datavisualizationglobal_p.h index fc39874f..e448c1cb 100644 --- a/src/datavisualization/global/datavisualizationglobal_p.h +++ b/src/datavisualization/global/datavisualizationglobal_p.h @@ -30,10 +30,10 @@ #define DATAVISUALIZATIONGLOBAL_P_H #include "qdatavisualizationglobal.h" -#include <QOpenGLFunctions> -#include <QVector3D> -#include <QQuaternion> -#include <QDebug> +#include <QtGui/QOpenGLFunctions> +#include <QtGui/QVector3D> +#include <QtGui/QQuaternion> +#include <QtCore/QDebug> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/global/qdatavisualizationglobal.h b/src/datavisualization/global/qdatavisualizationglobal.h index d7e71265..186db94c 100644 --- a/src/datavisualization/global/qdatavisualizationglobal.h +++ b/src/datavisualization/global/qdatavisualizationglobal.h @@ -19,7 +19,7 @@ #ifndef QDATAVISUALIZATIONGLOBAL_H #define QDATAVISUALIZATIONGLOBAL_H -#include <qglobal.h> +#include <QtCore/qglobal.h> #define QT_DATAVISUALIZATION_VERSION_STR "1.0.0" /* diff --git a/src/datavisualization/input/q3dinputhandler.h b/src/datavisualization/input/q3dinputhandler.h index 49471d72..118bd829 100644 --- a/src/datavisualization/input/q3dinputhandler.h +++ b/src/datavisualization/input/q3dinputhandler.h @@ -16,8 +16,8 @@ ** ****************************************************************************/ -#ifndef QDEFAULT3DINPUTHANDLER_H -#define QDEFAULT3DINPUTHANDLER_H +#ifndef Q3DINPUTHANDLER_H +#define Q3DINPUTHANDLER_H #include <QtDataVisualization/qabstract3dinputhandler.h> diff --git a/src/datavisualization/input/qabstract3dinputhandler.cpp b/src/datavisualization/input/qabstract3dinputhandler.cpp index f786d466..5360eb38 100644 --- a/src/datavisualization/input/qabstract3dinputhandler.cpp +++ b/src/datavisualization/input/qabstract3dinputhandler.cpp @@ -17,6 +17,7 @@ ****************************************************************************/ #include "qabstract3dinputhandler_p.h" +#include "q3dscene.h" QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/input/qabstract3dinputhandler.h b/src/datavisualization/input/qabstract3dinputhandler.h index 803517ed..75ec8c1b 100644 --- a/src/datavisualization/input/qabstract3dinputhandler.h +++ b/src/datavisualization/input/qabstract3dinputhandler.h @@ -19,8 +19,13 @@ #ifndef QABSTRACT3DINPUTHANDLER_H #define QABSTRACT3DINPUTHANDLER_H +#include <QtDataVisualization/qdatavisualizationglobal.h> #include <QtDataVisualization/q3dscene.h> -#include <QMouseEvent> +#include <QtCore/QObject> +#include <QtCore/QPoint> +#include <QtGui/QWheelEvent> +#include <QtGui/QMouseEvent> +#include <QtGui/QTouchEvent> QT_BEGIN_NAMESPACE_DATAVISUALIZATION @@ -41,8 +46,9 @@ public: InputViewOnSecondary }; -public: +protected: explicit QAbstract3DInputHandler(QObject *parent = 0); +public: virtual ~QAbstract3DInputHandler(); // Input event listeners @@ -53,7 +59,6 @@ public: virtual void mouseMoveEvent(QMouseEvent *event, const QPoint &mousePos); virtual void wheelEvent(QWheelEvent *event); -public: InputView inputView() const; void setInputView(InputView inputView); @@ -64,9 +69,9 @@ public: void setScene(Q3DScene *scene); signals: - void positionChanged(QPoint position); + void positionChanged(const QPoint &position); void inputViewChanged(InputView view); - void sceneChanged(const Q3DScene *scene); + void sceneChanged(Q3DScene *scene); protected: void setPrevDistance(int distance); diff --git a/src/datavisualization/input/qabstract3dinputhandler_p.h b/src/datavisualization/input/qabstract3dinputhandler_p.h index 52b1a5f6..fa5a2315 100644 --- a/src/datavisualization/input/qabstract3dinputhandler_p.h +++ b/src/datavisualization/input/qabstract3dinputhandler_p.h @@ -31,7 +31,6 @@ #include "datavisualizationglobal_p.h" #include "qabstract3dinputhandler.h" -#include <QRect> QT_BEGIN_NAMESPACE_DATAVISUALIZATION @@ -62,7 +61,6 @@ public: private: QAbstract3DInputHandler::InputView m_inputView; QPoint m_inputPosition; - QRect m_mainViewPort; Q3DScene *m_scene; bool m_isDefaultHandler; diff --git a/src/datavisualization/input/qtouch3dinputhandler.cpp b/src/datavisualization/input/qtouch3dinputhandler.cpp index 76b5721b..da84b33f 100644 --- a/src/datavisualization/input/qtouch3dinputhandler.cpp +++ b/src/datavisualization/input/qtouch3dinputhandler.cpp @@ -18,8 +18,8 @@ #include "qtouch3dinputhandler_p.h" #include "q3dcamera_p.h" -#include <QTimer> -#include <qmath.h> +#include <QtCore/QTimer> +#include <QtCore/qmath.h> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/input/qtouch3dinputhandler_p.h b/src/datavisualization/input/qtouch3dinputhandler_p.h index 19c30142..613b5f28 100644 --- a/src/datavisualization/input/qtouch3dinputhandler_p.h +++ b/src/datavisualization/input/qtouch3dinputhandler_p.h @@ -22,6 +22,8 @@ #include "qabstract3dinputhandler_p.h" #include "qtouch3dinputhandler.h" +class QTimer; + QT_BEGIN_NAMESPACE_DATAVISUALIZATION class QAbstract3DInputHandler; diff --git a/src/datavisualization/theme/q3dtheme.h b/src/datavisualization/theme/q3dtheme.h index 91c5bb6f..43278c79 100644 --- a/src/datavisualization/theme/q3dtheme.h +++ b/src/datavisualization/theme/q3dtheme.h @@ -20,10 +20,10 @@ #define Q3DTHEME_H #include <QtDataVisualization/qdatavisualizationglobal.h> - -#include <QLinearGradient> -#include <QFont> -#include <QColor> +#include <QtCore/QObject> +#include <QtGui/QLinearGradient> +#include <QtGui/QFont> +#include <QtGui/QColor> QT_BEGIN_NAMESPACE_DATAVISUALIZATION @@ -149,23 +149,23 @@ public: signals: void typeChanged(Theme themeType); - void baseColorsChanged(QList<QColor> colors); - void backgroundColorChanged(QColor color); - void windowColorChanged(QColor color); - void labelTextColorChanged(QColor color); - void labelBackgroundColorChanged(QColor color); - void gridLineColorChanged(QColor color); - void singleHighlightColorChanged(QColor color); - void multiHighlightColorChanged(QColor color); - void lightColorChanged(QColor color); - void baseGradientsChanged(QList<QLinearGradient> gradients); - void singleHighlightGradientChanged(QLinearGradient gradient); - void multiHighlightGradientChanged(QLinearGradient gradient); + void baseColorsChanged(const QList<QColor> &colors); + void backgroundColorChanged(const QColor &color); + void windowColorChanged(const QColor &color); + void labelTextColorChanged(const QColor &color); + void labelBackgroundColorChanged(const QColor &color); + void gridLineColorChanged(const QColor &color); + void singleHighlightColorChanged(const QColor &color); + void multiHighlightColorChanged(const QColor &color); + void lightColorChanged(const QColor &color); + void baseGradientsChanged(const QList<QLinearGradient> &gradients); + void singleHighlightGradientChanged(const QLinearGradient &gradient); + void multiHighlightGradientChanged(const QLinearGradient &gradient); void lightStrengthChanged(float strength); void ambientLightStrengthChanged(float strength); void highlightLightStrengthChanged(float strength); void labelBorderEnabledChanged(bool enabled); - void fontChanged(QFont font); + void fontChanged(const QFont &font); void backgroundEnabledChanged(bool enabled); void gridEnabledChanged(bool enabled); void labelBackgroundEnabledChanged(bool enabled); @@ -173,16 +173,17 @@ signals: protected: explicit Q3DTheme(Q3DThemePrivate *d, Theme themeType, QObject *parent = 0); + QScopedPointer<Q3DThemePrivate> d_ptr; +private: + Q_DISABLE_COPY(Q3DTheme) + friend class ThemeManager; friend class Abstract3DRenderer; friend class Bars3DController; friend class AbstractDeclarative; friend class Abstract3DController; - -private: - Q_DISABLE_COPY(Q3DTheme) }; QT_END_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/utils/abstractobjecthelper.cpp b/src/datavisualization/utils/abstractobjecthelper.cpp index 9ced43a1..c350d096 100644 --- a/src/datavisualization/utils/abstractobjecthelper.cpp +++ b/src/datavisualization/utils/abstractobjecthelper.cpp @@ -18,8 +18,6 @@ #include "abstractobjecthelper_p.h" -#include <QDebug> - QT_BEGIN_NAMESPACE_DATAVISUALIZATION AbstractObjectHelper::AbstractObjectHelper() diff --git a/src/datavisualization/utils/abstractobjecthelper_p.h b/src/datavisualization/utils/abstractobjecthelper_p.h index 5ec34318..3220b37d 100644 --- a/src/datavisualization/utils/abstractobjecthelper_p.h +++ b/src/datavisualization/utils/abstractobjecthelper_p.h @@ -30,7 +30,7 @@ #define ABSTRACTOBJECTHELPER_H #include "datavisualizationglobal_p.h" -#include <QOpenGLFunctions> +#include <QtGui/QOpenGLFunctions> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/utils/camerahelper.cpp b/src/datavisualization/utils/camerahelper.cpp index 220c49db..ee4c27e0 100644 --- a/src/datavisualization/utils/camerahelper.cpp +++ b/src/datavisualization/utils/camerahelper.cpp @@ -18,9 +18,8 @@ #include "camerahelper_p.h" -#include <qmath.h> -#include <QMatrix4x4> -#include <QVector3D> +#include <QtCore/qmath.h> +#include <QtGui/QMatrix4x4> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/utils/camerahelper_p.h b/src/datavisualization/utils/camerahelper_p.h index e78bc24c..f410ceb5 100644 --- a/src/datavisualization/utils/camerahelper_p.h +++ b/src/datavisualization/utils/camerahelper_p.h @@ -31,8 +31,6 @@ #include "datavisualizationglobal_p.h" #include "q3dcamera.h" -#include "q3dbars.h" -#include <QObject> class QMatrix4x4; class QVector3D; @@ -71,17 +69,17 @@ public: QPointF getCameraRotations(); // Set default camera orientation. Position's x and y should be 0. void setDefaultCameraOrientation(const QVector3D &defaultPosition, - const QVector3D &defaultTarget, - const QVector3D &defaultUp); + const QVector3D &defaultTarget, + const QVector3D &defaultUp); // Calculate view matrix based on rotation and zoom QMatrix4x4 calculateViewMatrix(const QPoint &mousePos, int zoom, - int screenWidth, int screenHeight, - bool showUnder = false); + int screenWidth, int screenHeight, + bool showUnder = false); // Calcluate light position based on rotation. Call after calling calculateViewMatrix to get // up-to-date position QVector3D calculateLightPosition(const QVector3D &lightPosition, - GLfloat fixedRotation = 0.0f, - GLfloat distanceModifier = 0.0f); + GLfloat fixedRotation = 0.0f, + GLfloat distanceModifier = 0.0f); void updateMousePos(const QPoint &mousePos); void setCameraPreset(Q3DCamera::CameraPreset preset); }; diff --git a/src/datavisualization/utils/meshloader.cpp b/src/datavisualization/utils/meshloader.cpp index 49bdf710..615a7909 100644 --- a/src/datavisualization/utils/meshloader.cpp +++ b/src/datavisualization/utils/meshloader.cpp @@ -18,11 +18,10 @@ #include "meshloader_p.h" -#include <QFile> -#include <QStringList> -#include <QVector> -#include <QVector2D> -#include <QVector3D> +#include <QtCore/QFile> +#include <QtCore/QStringList> +#include <QtCore/QVector> +#include <QtGui/QVector2D> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/utils/meshloader_p.h b/src/datavisualization/utils/meshloader_p.h index e7425ae6..16ddaf6d 100644 --- a/src/datavisualization/utils/meshloader_p.h +++ b/src/datavisualization/utils/meshloader_p.h @@ -30,9 +30,7 @@ #define MESHLOADER_P_H #include "datavisualizationglobal_p.h" - -class QVector2D; -class QVector3D; +#include <QtGui/QVector2D> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/utils/objecthelper_p.h b/src/datavisualization/utils/objecthelper_p.h index f96fc87d..0260dd05 100644 --- a/src/datavisualization/utils/objecthelper_p.h +++ b/src/datavisualization/utils/objecthelper_p.h @@ -31,7 +31,7 @@ #include "datavisualizationglobal_p.h" #include "abstractobjecthelper_p.h" -#include <QOpenGLFunctions> +#include <QtGui/QOpenGLFunctions> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/utils/shaderhelper.cpp b/src/datavisualization/utils/shaderhelper.cpp index d4df11b4..7fb237c6 100644 --- a/src/datavisualization/utils/shaderhelper.cpp +++ b/src/datavisualization/utils/shaderhelper.cpp @@ -18,7 +18,7 @@ #include "shaderhelper_p.h" -#include <QOpenGLShader> +#include <QtGui/QOpenGLShader> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/utils/shaderhelper_p.h b/src/datavisualization/utils/shaderhelper_p.h index 34bbf39e..ced27572 100644 --- a/src/datavisualization/utils/shaderhelper_p.h +++ b/src/datavisualization/utils/shaderhelper_p.h @@ -30,7 +30,7 @@ #define SHADERHELPER_P_H #include "datavisualizationglobal_p.h" -#include <QOpenGLFunctions> +#include <QtGui/QOpenGLFunctions> class QOpenGLShaderProgram; diff --git a/src/datavisualization/utils/surfaceobject.cpp b/src/datavisualization/utils/surfaceobject.cpp index 1cb576c4..9bcdfee2 100644 --- a/src/datavisualization/utils/surfaceobject.cpp +++ b/src/datavisualization/utils/surfaceobject.cpp @@ -19,8 +19,7 @@ #include "surfaceobject_p.h" #include "abstractobjecthelper_p.h" -#include <QVector3D> -#include <QVector2D> +#include <QtGui/QVector2D> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/utils/surfaceobject_p.h b/src/datavisualization/utils/surfaceobject_p.h index ebae1149..69cb7e5d 100644 --- a/src/datavisualization/utils/surfaceobject_p.h +++ b/src/datavisualization/utils/surfaceobject_p.h @@ -33,7 +33,7 @@ #include "abstractobjecthelper_p.h" #include "qsurfacedataproxy.h" -#include <QRect> +#include <QtCore/QRect> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/utils/texturehelper.cpp b/src/datavisualization/utils/texturehelper.cpp index 0f5c8313..52c673dc 100644 --- a/src/datavisualization/utils/texturehelper.cpp +++ b/src/datavisualization/utils/texturehelper.cpp @@ -19,8 +19,8 @@ #include "texturehelper_p.h" #include "utils_p.h" -#include <QImage> -#include <QPainter> +#include <QtGui/QImage> +#include <QtGui/QPainter> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/utils/texturehelper_p.h b/src/datavisualization/utils/texturehelper_p.h index f9a23a08..ebfaa042 100644 --- a/src/datavisualization/utils/texturehelper_p.h +++ b/src/datavisualization/utils/texturehelper_p.h @@ -30,9 +30,9 @@ #define TEXTUREHELPER_P_H #include "datavisualizationglobal_p.h" -#include <QOpenGLFunctions> -#include <QRgb> -#include <QLinearGradient> +#include <QtGui/QOpenGLFunctions> +#include <QtGui/QRgb> +#include <QtGui/QLinearGradient> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/utils/utils.cpp b/src/datavisualization/utils/utils.cpp index 482fc831..e0b1370e 100644 --- a/src/datavisualization/utils/utils.cpp +++ b/src/datavisualization/utils/utils.cpp @@ -18,13 +18,12 @@ #include "utils_p.h" -#include <QVector3D> -#include <QColor> -#include <QPainter> -#include <QPoint> -#include <QImage> -#include <QRegExp> -#include <qmath.h> +#include <QtGui/QColor> +#include <QtGui/QPainter> +#include <QtCore/QPoint> +#include <QtGui/QImage> +#include <QtCore/QRegExp> +#include <QtCore/qmath.h> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/utils/vertexindexer.cpp b/src/datavisualization/utils/vertexindexer.cpp index f089ce6e..2a496ebc 100644 --- a/src/datavisualization/utils/vertexindexer.cpp +++ b/src/datavisualization/utils/vertexindexer.cpp @@ -18,7 +18,7 @@ #include "vertexindexer_p.h" -#include <qmath.h> +#include <QtCore/qmath.h> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualization/utils/vertexindexer_p.h b/src/datavisualization/utils/vertexindexer_p.h index fe100e21..260afad4 100644 --- a/src/datavisualization/utils/vertexindexer_p.h +++ b/src/datavisualization/utils/vertexindexer_p.h @@ -31,9 +31,8 @@ #include "datavisualizationglobal_p.h" -#include <QVector> -#include <QVector2D> -#include <QVector3D> +#include <QtCore/QVector> +#include <QtGui/QVector2D> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml2/abstractdeclarative.cpp index 7415df9b..3bdb2a3a 100644 --- a/src/datavisualizationqml2/abstractdeclarative.cpp +++ b/src/datavisualizationqml2/abstractdeclarative.cpp @@ -21,9 +21,9 @@ #include "declarativetheme_p.h" #include "declarativerendernode_p.h" -#include <QThread> -#include <QGuiApplication> -#include <QSGSimpleRectNode> +#include <QtCore/QThread> +#include <QtGui/QGuiApplication> +#include <QtQuick/QSGSimpleRectNode> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h index 83a1bbdb..a26f2ffa 100644 --- a/src/datavisualizationqml2/abstractdeclarative_p.h +++ b/src/datavisualizationqml2/abstractdeclarative_p.h @@ -34,11 +34,10 @@ #include "qabstract3dinputhandler.h" #include "declarativescene_p.h" -#include <QAbstractItemModel> -#include <QQuickItem> -#include <QObject> -#include <QQuickWindow> -#include <QPointer> +#include <QtCore/QAbstractItemModel> +#include <QtQuick/QQuickItem> +#include <QtQuick/QQuickWindow> +#include <QtCore/QPointer> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualizationqml2/colorgradient_p.h b/src/datavisualizationqml2/colorgradient_p.h index 31e3d305..c870ebcb 100644 --- a/src/datavisualizationqml2/colorgradient_p.h +++ b/src/datavisualizationqml2/colorgradient_p.h @@ -30,8 +30,8 @@ #define COLORGRADIENT_P_H #include "datavisualizationglobal_p.h" -#include <QColor> -#include <QQmlListProperty> +#include <QtGui/QColor> +#include <QtQml/QQmlListProperty> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp index f926b7fa..04e70ecb 100644 --- a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp +++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp @@ -18,7 +18,7 @@ #include "datavisualizationqml2_plugin.h" -#include <qqml.h> +#include <QtQml> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.h b/src/datavisualizationqml2/datavisualizationqml2_plugin.h index c12c2cb2..e39d6b35 100644 --- a/src/datavisualizationqml2/datavisualizationqml2_plugin.h +++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.h @@ -44,7 +44,7 @@ #include "declarativecolor_p.h" #include "declarativescene_p.h" -#include <QQmlExtensionPlugin> +#include <QtQml/QQmlExtensionPlugin> using namespace QtDataVisualization; diff --git a/src/datavisualizationqml2/declarativebars_p.h b/src/datavisualizationqml2/declarativebars_p.h index be66860d..97f5882a 100644 --- a/src/datavisualizationqml2/declarativebars_p.h +++ b/src/datavisualizationqml2/declarativebars_p.h @@ -38,11 +38,6 @@ #include "qbardataproxy.h" #include "qbar3dseries.h" -#include <QAbstractItemModel> -#include <QQuickItem> -#include <QObject> -#include <QQuickWindow> - QT_BEGIN_NAMESPACE_DATAVISUALIZATION class DeclarativeBars : public AbstractDeclarative diff --git a/src/datavisualizationqml2/declarativecolor_p.h b/src/datavisualizationqml2/declarativecolor_p.h index 67eb9a2b..87463384 100644 --- a/src/datavisualizationqml2/declarativecolor_p.h +++ b/src/datavisualizationqml2/declarativecolor_p.h @@ -30,7 +30,7 @@ #define DECLARATIVECOLOR_P_H #include "datavisualizationglobal_p.h" -#include <QColor> +#include <QtGui/QColor> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualizationqml2/declarativescatter_p.h b/src/datavisualizationqml2/declarativescatter_p.h index f36d2a7b..79b56e02 100644 --- a/src/datavisualizationqml2/declarativescatter_p.h +++ b/src/datavisualizationqml2/declarativescatter_p.h @@ -37,10 +37,6 @@ #include "qscatterdataproxy.h" #include "qscatter3dseries.h" -#include <QAbstractItemModel> -#include <QQuickItem> -#include <QObject> - QT_BEGIN_NAMESPACE_DATAVISUALIZATION class DeclarativeScatter : public AbstractDeclarative diff --git a/src/datavisualizationqml2/declarativeseries.cpp b/src/datavisualizationqml2/declarativeseries.cpp index 1a762152..21555f45 100644 --- a/src/datavisualizationqml2/declarativeseries.cpp +++ b/src/datavisualizationqml2/declarativeseries.cpp @@ -20,7 +20,7 @@ #include "qbardataproxy.h" #include "qscatterdataproxy.h" #include "qsurfacedataproxy.h" -#include <QMetaMethod> +#include <QtCore/QMetaMethod> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualizationqml2/declarativeseries_p.h b/src/datavisualizationqml2/declarativeseries_p.h index f196e311..25540e9b 100644 --- a/src/datavisualizationqml2/declarativeseries_p.h +++ b/src/datavisualizationqml2/declarativeseries_p.h @@ -34,7 +34,7 @@ #include "qscatter3dseries.h" #include "qsurface3dseries.h" #include "colorgradient_p.h" -#include <QQmlListProperty> +#include <QtQml/QQmlListProperty> QT_BEGIN_NAMESPACE_DATAVISUALIZATION diff --git a/src/datavisualizationqml2/declarativesurface_p.h b/src/datavisualizationqml2/declarativesurface_p.h index bba3887d..a4747167 100644 --- a/src/datavisualizationqml2/declarativesurface_p.h +++ b/src/datavisualizationqml2/declarativesurface_p.h @@ -37,11 +37,6 @@ #include "qsurfacedataproxy.h" #include "qsurface3dseries.h" -#include <QAbstractItemModel> -#include <QQuickItem> -#include <QObject> -#include <QQuickWindow> - QT_BEGIN_NAMESPACE_DATAVISUALIZATION class DeclarativeSurface : public AbstractDeclarative diff --git a/src/datavisualizationqml2/declarativetheme_p.h b/src/datavisualizationqml2/declarativetheme_p.h index 8101cf71..a7f40b1e 100644 --- a/src/datavisualizationqml2/declarativetheme_p.h +++ b/src/datavisualizationqml2/declarativetheme_p.h @@ -34,7 +34,7 @@ #include "colorgradient_p.h" #include "q3dtheme_p.h" -#include <QtQml/qqmlparserstatus.h> +#include <QtQml/QQmlParserStatus> QT_BEGIN_NAMESPACE_DATAVISUALIZATION |