From a71eb045af5a00fe135201f8b3c5999eda26e0bd Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Wed, 17 Jun 2015 14:01:44 +0300 Subject: Fix building against 5.6 Apparently Qt modules are now required to use Q_SIGNALS and Q_SLOTS macros instead of 'signals' and 'slots' in headers. Change-Id: I4140b1fff4386d74bb371176919234366965e887 Reviewed-by: Mika Salmela --- examples/datavisualization/bars/graphmodifier.h | 4 ++-- examples/datavisualization/custominput/scatterdatamodifier.h | 4 ++-- .../datavisualization/customproxy/variantbardatamapping.h | 2 +- examples/datavisualization/customproxy/variantbardataproxy.h | 2 +- examples/datavisualization/customproxy/variantdataset.h | 2 +- .../datavisualization/qmlaxisformatter/customformatter.h | 4 ++-- examples/datavisualization/qmloscilloscope/datasource.h | 2 +- examples/datavisualization/rotations/scatterdatamodifier.h | 2 +- examples/datavisualization/scatter/scatterdatamodifier.h | 4 ++-- examples/datavisualization/surface/surfacegraph.h | 2 +- examples/datavisualization/texturesurface/highlightseries.h | 2 +- .../datavisualization/texturesurface/topographicseries.h | 2 +- examples/datavisualization/volumetric/volumetric.h | 2 +- src/datavisualization/axis/qabstract3daxis.h | 2 +- src/datavisualization/axis/qcategory3daxis.h | 2 +- src/datavisualization/axis/qlogvalue3daxisformatter.h | 2 +- src/datavisualization/axis/qvalue3daxis.h | 2 +- src/datavisualization/axis/qvalue3daxis_p.h | 2 +- src/datavisualization/axis/qvalue3daxisformatter_p.h | 2 +- src/datavisualization/data/abstractitemmodelhandler_p.h | 4 ++-- src/datavisualization/data/baritemmodelhandler_p.h | 2 +- src/datavisualization/data/qabstract3dseries.h | 2 +- src/datavisualization/data/qbar3dseries.h | 2 +- src/datavisualization/data/qbardataproxy.h | 2 +- src/datavisualization/data/qcustom3ditem.h | 2 +- src/datavisualization/data/qcustom3ditem_p.h | 2 +- src/datavisualization/data/qcustom3dlabel.h | 2 +- src/datavisualization/data/qcustom3dvolume.h | 2 +- src/datavisualization/data/qheightmapsurfacedataproxy.h | 2 +- src/datavisualization/data/qitemmodelbardataproxy.h | 2 +- src/datavisualization/data/qitemmodelscatterdataproxy.h | 2 +- src/datavisualization/data/qitemmodelsurfacedataproxy.h | 2 +- src/datavisualization/data/qscatter3dseries.h | 2 +- src/datavisualization/data/qscatterdataproxy.h | 2 +- src/datavisualization/data/qsurface3dseries.h | 2 +- src/datavisualization/data/qsurfacedataproxy.h | 2 +- src/datavisualization/data/scatteritemmodelhandler_p.h | 2 +- src/datavisualization/data/surfaceitemmodelhandler_p.h | 2 +- src/datavisualization/engine/abstract3dcontroller_p.h | 4 ++-- src/datavisualization/engine/abstract3drenderer_p.h | 2 +- src/datavisualization/engine/bars3dcontroller_p.h | 4 ++-- src/datavisualization/engine/bars3drenderer_p.h | 2 +- src/datavisualization/engine/q3dbars.h | 2 +- src/datavisualization/engine/q3dcamera.h | 2 +- src/datavisualization/engine/q3dcamera_p.h | 2 +- src/datavisualization/engine/q3dobject.h | 2 +- src/datavisualization/engine/q3dscatter.h | 2 +- src/datavisualization/engine/q3dscene.h | 2 +- src/datavisualization/engine/q3dscene_p.h | 2 +- src/datavisualization/engine/q3dsurface.h | 2 +- src/datavisualization/engine/qabstract3dgraph.h | 2 +- src/datavisualization/engine/qabstract3dgraph_p.h | 2 +- src/datavisualization/engine/scatter3dcontroller_p.h | 4 ++-- src/datavisualization/engine/scatter3drenderer_p.h | 2 +- src/datavisualization/engine/surface3dcontroller_p.h | 4 ++-- src/datavisualization/engine/surface3drenderer_p.h | 2 +- src/datavisualization/input/q3dinputhandler.h | 2 +- src/datavisualization/input/q3dinputhandler_p.h | 2 +- src/datavisualization/input/qabstract3dinputhandler.h | 2 +- src/datavisualization/theme/q3dtheme.h | 2 +- src/datavisualization/theme/q3dtheme_p.h | 2 +- src/datavisualizationqml2/abstractdeclarative_p.h | 4 ++-- src/datavisualizationqml2/colorgradient_p.h | 2 +- src/datavisualizationqml2/declarativebars_p.h | 4 ++-- src/datavisualizationqml2/declarativecolor_p.h | 2 +- src/datavisualizationqml2/declarativescatter_p.h | 4 ++-- src/datavisualizationqml2/declarativescene_p.h | 2 +- src/datavisualizationqml2/declarativeseries_p.h | 12 ++++++------ src/datavisualizationqml2/declarativesurface_p.h | 4 ++-- src/datavisualizationqml2/declarativetheme_p.h | 2 +- tests/barstest/chart.h | 4 ++-- tests/directional/scatterdatamodifier.h | 4 ++-- tests/kinectsurface/QtKinectWrapper/QKinectWrapper.h | 2 +- tests/kinectsurface/surfacedata.h | 4 ++-- tests/multigraphs/data.h | 4 ++-- tests/qmlperf/datagenerator.h | 2 +- tests/scattertest/scatterchart.h | 4 ++-- tests/spectrum/spectrumapp/engine.h | 6 +++--- tests/spectrum/spectrumapp/spectrumanalyser.h | 8 ++++---- tests/surfacetest/graphmodifier.h | 2 +- tests/volumetrictest/volumetrictest.h | 2 +- 81 files changed, 109 insertions(+), 109 deletions(-) diff --git a/examples/datavisualization/bars/graphmodifier.h b/examples/datavisualization/bars/graphmodifier.h index 775f4573..d9a22855 100644 --- a/examples/datavisualization/bars/graphmodifier.h +++ b/examples/datavisualization/bars/graphmodifier.h @@ -52,7 +52,7 @@ public: void setReverseValueAxis(int enabled); void setReflection(bool enabled); -public slots: +public Q_SLOTS: void changeRange(int range); void changeStyle(int style); void changeSelectionMode(int selectionMode); @@ -64,7 +64,7 @@ public slots: void setAxisTitleFixed(bool enabled); void zoomToSelectedBar(); -signals: +Q_SIGNALS: void shadowQualityChanged(int quality); void backgroundEnabledChanged(bool enabled); void gridEnabledChanged(bool enabled); diff --git a/examples/datavisualization/custominput/scatterdatamodifier.h b/examples/datavisualization/custominput/scatterdatamodifier.h index 5aafbdeb..b1181a38 100644 --- a/examples/datavisualization/custominput/scatterdatamodifier.h +++ b/examples/datavisualization/custominput/scatterdatamodifier.h @@ -41,12 +41,12 @@ public: void toggleCameraAnimation(); void start(); -public slots: +public Q_SLOTS: void changeShadowQuality(int quality); void shadowQualityUpdatedByVisual(QAbstract3DGraph::ShadowQuality shadowQuality); void triggerSelection(); -signals: +Q_SIGNALS: void shadowQualityChanged(int quality); private: diff --git a/examples/datavisualization/customproxy/variantbardatamapping.h b/examples/datavisualization/customproxy/variantbardatamapping.h index 0c300709..024e7ffc 100644 --- a/examples/datavisualization/customproxy/variantbardatamapping.h +++ b/examples/datavisualization/customproxy/variantbardatamapping.h @@ -61,7 +61,7 @@ public: const QStringList &rowCategories, const QStringList &columnCategories); //! [2] -signals: +Q_SIGNALS: //! [3] void mappingChanged(); //! [3] diff --git a/examples/datavisualization/customproxy/variantbardataproxy.h b/examples/datavisualization/customproxy/variantbardataproxy.h index afaa70d1..62a14bee 100644 --- a/examples/datavisualization/customproxy/variantbardataproxy.h +++ b/examples/datavisualization/customproxy/variantbardataproxy.h @@ -51,7 +51,7 @@ public: VariantBarDataMapping *mapping(); //! [1] -public slots: +public Q_SLOTS: void handleItemsAdded(int index, int count); void handleDataCleared(); void handleMappingChanged(); diff --git a/examples/datavisualization/customproxy/variantdataset.h b/examples/datavisualization/customproxy/variantdataset.h index 78aa6170..1ee74965 100644 --- a/examples/datavisualization/customproxy/variantdataset.h +++ b/examples/datavisualization/customproxy/variantdataset.h @@ -43,7 +43,7 @@ public: const VariantDataItemList &itemList() const; -signals: +Q_SIGNALS: void itemsAdded(int index, int count); void dataCleared(); //! [0] diff --git a/examples/datavisualization/qmlaxisformatter/customformatter.h b/examples/datavisualization/qmlaxisformatter/customformatter.h index 62eac218..2e5817fd 100644 --- a/examples/datavisualization/qmlaxisformatter/customformatter.h +++ b/examples/datavisualization/qmlaxisformatter/customformatter.h @@ -51,11 +51,11 @@ public: QDate originDate() const; QString selectionFormat() const; -public slots: +public Q_SLOTS: void setOriginDate(const QDate &date); void setSelectionFormat(const QString &format); -signals: +Q_SIGNALS: void originDateChanged(const QDate &date); void selectionFormatChanged(const QString &format); diff --git a/examples/datavisualization/qmloscilloscope/datasource.h b/examples/datavisualization/qmloscilloscope/datasource.h index 03dcc510..667c78aa 100644 --- a/examples/datavisualization/qmloscilloscope/datasource.h +++ b/examples/datavisualization/qmloscilloscope/datasource.h @@ -31,7 +31,7 @@ public: virtual ~DataSource(); //! [0] -public slots: +public Q_SLOTS: void generateData(int cacheCount, int rowCount, int columnCount, float xMin, float xMax, float yMin, float yMax, float zMin, float zMax); diff --git a/examples/datavisualization/rotations/scatterdatamodifier.h b/examples/datavisualization/rotations/scatterdatamodifier.h index a876a419..23c6f3df 100644 --- a/examples/datavisualization/rotations/scatterdatamodifier.h +++ b/examples/datavisualization/rotations/scatterdatamodifier.h @@ -34,7 +34,7 @@ public: void generateData(); -public slots: +public Q_SLOTS: void setFieldLines(int lines); void setArrowsPerLine(int arrows); void toggleRotation(); diff --git a/examples/datavisualization/scatter/scatterdatamodifier.h b/examples/datavisualization/scatter/scatterdatamodifier.h index 867ed821..2c9ca1db 100644 --- a/examples/datavisualization/scatter/scatterdatamodifier.h +++ b/examples/datavisualization/scatter/scatterdatamodifier.h @@ -44,13 +44,13 @@ public: void toggleItemCount(); void start(); -public slots: +public Q_SLOTS: void changeStyle(int style); void changeTheme(int theme); void changeShadowQuality(int quality); void shadowQualityUpdatedByVisual(QAbstract3DGraph::ShadowQuality shadowQuality); -signals: +Q_SIGNALS: void backgroundEnabledChanged(bool enabled); void gridEnabledChanged(bool enabled); void shadowQualityChanged(int quality); diff --git a/examples/datavisualization/surface/surfacegraph.h b/examples/datavisualization/surface/surfacegraph.h index 34eb373a..d59a59a1 100644 --- a/examples/datavisualization/surface/surfacegraph.h +++ b/examples/datavisualization/surface/surfacegraph.h @@ -59,7 +59,7 @@ public: void adjustZMin(int min); void adjustZMax(int max); -public slots: +public Q_SLOTS: void changeTheme(int theme); private: diff --git a/examples/datavisualization/texturesurface/highlightseries.h b/examples/datavisualization/texturesurface/highlightseries.h index 43fe704a..701204ce 100644 --- a/examples/datavisualization/texturesurface/highlightseries.h +++ b/examples/datavisualization/texturesurface/highlightseries.h @@ -35,7 +35,7 @@ public: void setTopographicSeries(TopographicSeries *series); inline void setMinHeight(float height) { m_minHeight = height; } -public slots: +public Q_SLOTS: void handlePositionChange(const QPoint &position); void handleGradientChange(float value); diff --git a/examples/datavisualization/texturesurface/topographicseries.h b/examples/datavisualization/texturesurface/topographicseries.h index 206e60aa..b77e8ebf 100644 --- a/examples/datavisualization/texturesurface/topographicseries.h +++ b/examples/datavisualization/texturesurface/topographicseries.h @@ -35,7 +35,7 @@ public: float sampleCountX() { return m_sampleCountX; } float sampleCountZ() { return m_sampleCountZ; } -public slots: +public Q_SLOTS: private: float m_sampleCountX; diff --git a/examples/datavisualization/volumetric/volumetric.h b/examples/datavisualization/volumetric/volumetric.h index 1edd4cb9..58cd973e 100644 --- a/examples/datavisualization/volumetric/volumetric.h +++ b/examples/datavisualization/volumetric/volumetric.h @@ -43,7 +43,7 @@ public: void setSliceLabels(QLabel *xLabel, QLabel *yLabel, QLabel *zLabel); void setAlphaMultiplierLabel(QLabel *label); -public slots: +public Q_SLOTS: void sliceX(int enabled); void sliceY(int enabled); void sliceZ(int enabled); diff --git a/src/datavisualization/axis/qabstract3daxis.h b/src/datavisualization/axis/qabstract3daxis.h index 52c29531..69d4043c 100644 --- a/src/datavisualization/axis/qabstract3daxis.h +++ b/src/datavisualization/axis/qabstract3daxis.h @@ -93,7 +93,7 @@ public: void setTitleFixed(bool fixed); bool isTitleFixed() const; -signals: +Q_SIGNALS: void titleChanged(const QString &newTitle); void labelsChanged(); void orientationChanged(QAbstract3DAxis::AxisOrientation orientation); diff --git a/src/datavisualization/axis/qcategory3daxis.h b/src/datavisualization/axis/qcategory3daxis.h index fa72f29d..30c8c602 100644 --- a/src/datavisualization/axis/qcategory3daxis.h +++ b/src/datavisualization/axis/qcategory3daxis.h @@ -37,7 +37,7 @@ public: void setLabels(const QStringList &labels); QStringList labels() const; -signals: +Q_SIGNALS: void labelsChanged(); protected: diff --git a/src/datavisualization/axis/qlogvalue3daxisformatter.h b/src/datavisualization/axis/qlogvalue3daxisformatter.h index b4aabc3c..13ddf356 100644 --- a/src/datavisualization/axis/qlogvalue3daxisformatter.h +++ b/src/datavisualization/axis/qlogvalue3daxisformatter.h @@ -46,7 +46,7 @@ public: void setShowEdgeLabels(bool enabled); bool showEdgeLabels() const; -signals: +Q_SIGNALS: void baseChanged(qreal base); void autoSubGridChanged(bool enabled); void showEdgeLabelsChanged(bool enabled); diff --git a/src/datavisualization/axis/qvalue3daxis.h b/src/datavisualization/axis/qvalue3daxis.h index e301e78b..14ed7102 100644 --- a/src/datavisualization/axis/qvalue3daxis.h +++ b/src/datavisualization/axis/qvalue3daxis.h @@ -54,7 +54,7 @@ public: void setReversed(bool enable); bool reversed() const; -signals: +Q_SIGNALS: void segmentCountChanged(int count); void subSegmentCountChanged(int count); void labelFormatChanged(const QString &format); diff --git a/src/datavisualization/axis/qvalue3daxis_p.h b/src/datavisualization/axis/qvalue3daxis_p.h index 9a151b68..b712461f 100644 --- a/src/datavisualization/axis/qvalue3daxis_p.h +++ b/src/datavisualization/axis/qvalue3daxis_p.h @@ -48,7 +48,7 @@ public: void emitLabelsChanged(); -signals: +Q_SIGNALS: void formatterDirty(); protected: diff --git a/src/datavisualization/axis/qvalue3daxisformatter_p.h b/src/datavisualization/axis/qvalue3daxisformatter_p.h index a71953b6..a8a09662 100644 --- a/src/datavisualization/axis/qvalue3daxisformatter_p.h +++ b/src/datavisualization/axis/qvalue3daxisformatter_p.h @@ -58,7 +58,7 @@ public: void setAxis(QValue3DAxis *axis); void markDirty(bool labelsChange); -public slots: +public Q_SLOTS: void markDirtyNoLabelChange(); protected: diff --git a/src/datavisualization/data/abstractitemmodelhandler_p.h b/src/datavisualization/data/abstractitemmodelhandler_p.h index 37af355f..a02cbdc0 100644 --- a/src/datavisualization/data/abstractitemmodelhandler_p.h +++ b/src/datavisualization/data/abstractitemmodelhandler_p.h @@ -46,7 +46,7 @@ public: virtual void setItemModel(QAbstractItemModel *itemModel); virtual QAbstractItemModel *itemModel() const; -public slots: +public Q_SLOTS: virtual void handleColumnsInserted(const QModelIndex &parent, int start, int end); virtual void handleColumnsMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, @@ -65,7 +65,7 @@ public slots: virtual void handleMappingChanged(); virtual void handlePendingResolve(); -signals: +Q_SIGNALS: void itemModelChanged(const QAbstractItemModel *itemModel); protected: diff --git a/src/datavisualization/data/baritemmodelhandler_p.h b/src/datavisualization/data/baritemmodelhandler_p.h index eff04d0d..64c53513 100644 --- a/src/datavisualization/data/baritemmodelhandler_p.h +++ b/src/datavisualization/data/baritemmodelhandler_p.h @@ -41,7 +41,7 @@ public: BarItemModelHandler(QItemModelBarDataProxy *proxy, QObject *parent = 0); virtual ~BarItemModelHandler(); -public slots: +public Q_SLOTS: virtual void handleDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector &roles = QVector ()); diff --git a/src/datavisualization/data/qabstract3dseries.h b/src/datavisualization/data/qabstract3dseries.h index 5c6ec9eb..0b55c97c 100644 --- a/src/datavisualization/data/qabstract3dseries.h +++ b/src/datavisualization/data/qabstract3dseries.h @@ -125,7 +125,7 @@ public: void setItemLabelVisible(bool visible); bool isItemLabelVisible() const; -signals: +Q_SIGNALS: void itemLabelFormatChanged(const QString &format); void visibilityChanged(bool visible); void meshChanged(QAbstract3DSeries::Mesh mesh); diff --git a/src/datavisualization/data/qbar3dseries.h b/src/datavisualization/data/qbar3dseries.h index 9a569d28..d098d7cf 100644 --- a/src/datavisualization/data/qbar3dseries.h +++ b/src/datavisualization/data/qbar3dseries.h @@ -49,7 +49,7 @@ public: void setMeshAngle(float angle); float meshAngle() const; -signals: +Q_SIGNALS: void dataProxyChanged(QBarDataProxy *proxy); void selectedBarChanged(const QPoint &position); void meshAngleChanged(float angle); diff --git a/src/datavisualization/data/qbardataproxy.h b/src/datavisualization/data/qbardataproxy.h index 19a78b45..37240c6d 100644 --- a/src/datavisualization/data/qbardataproxy.h +++ b/src/datavisualization/data/qbardataproxy.h @@ -85,7 +85,7 @@ public: void removeRows(int rowIndex, int removeCount, bool removeLabels = true); -signals: +Q_SIGNALS: void arrayReset(); void rowsAdded(int startIndex, int count); void rowsChanged(int startIndex, int count); diff --git a/src/datavisualization/data/qcustom3ditem.h b/src/datavisualization/data/qcustom3ditem.h index 83737677..0995c217 100644 --- a/src/datavisualization/data/qcustom3ditem.h +++ b/src/datavisualization/data/qcustom3ditem.h @@ -79,7 +79,7 @@ public: void setTextureImage(const QImage &textureImage); -signals: +Q_SIGNALS: void meshFileChanged(const QString &meshFile); void textureFileChanged(const QString &textureFile); void positionChanged(const QVector3D &position); diff --git a/src/datavisualization/data/qcustom3ditem_p.h b/src/datavisualization/data/qcustom3ditem_p.h index c83f5169..4b3e7074 100644 --- a/src/datavisualization/data/qcustom3ditem_p.h +++ b/src/datavisualization/data/qcustom3ditem_p.h @@ -86,7 +86,7 @@ public: QCustomItemDirtyBitField m_dirtyBits; -signals: +Q_SIGNALS: void needUpdate(); private: diff --git a/src/datavisualization/data/qcustom3dlabel.h b/src/datavisualization/data/qcustom3dlabel.h index 49f68d16..df50f63a 100644 --- a/src/datavisualization/data/qcustom3dlabel.h +++ b/src/datavisualization/data/qcustom3dlabel.h @@ -69,7 +69,7 @@ public: void setFacingCamera(bool enabled); bool isFacingCamera() const; -signals: +Q_SIGNALS: void textChanged(const QString &text); void fontChanged(const QFont &font); void textColorChanged(const QColor &color); diff --git a/src/datavisualization/data/qcustom3dvolume.h b/src/datavisualization/data/qcustom3dvolume.h index d9b082b6..4ee79518 100644 --- a/src/datavisualization/data/qcustom3dvolume.h +++ b/src/datavisualization/data/qcustom3dvolume.h @@ -112,7 +112,7 @@ public: QImage renderSlice(Qt::Axis axis, int index); -signals: +Q_SIGNALS: void textureWidthChanged(int value); void textureHeightChanged(int value); void textureDepthChanged(int value); diff --git a/src/datavisualization/data/qheightmapsurfacedataproxy.h b/src/datavisualization/data/qheightmapsurfacedataproxy.h index 09937771..e014fbc9 100644 --- a/src/datavisualization/data/qheightmapsurfacedataproxy.h +++ b/src/datavisualization/data/qheightmapsurfacedataproxy.h @@ -59,7 +59,7 @@ public: void setMaxZValue(float max); float maxZValue() const; -signals: +Q_SIGNALS: void heightMapChanged(const QImage &image); void heightMapFileChanged(const QString &filename); void minXValueChanged(float value); diff --git a/src/datavisualization/data/qitemmodelbardataproxy.h b/src/datavisualization/data/qitemmodelbardataproxy.h index 21cffd81..71546d94 100644 --- a/src/datavisualization/data/qitemmodelbardataproxy.h +++ b/src/datavisualization/data/qitemmodelbardataproxy.h @@ -132,7 +132,7 @@ public: void setMultiMatchBehavior(MultiMatchBehavior behavior); MultiMatchBehavior multiMatchBehavior() const; -signals: +Q_SIGNALS: void itemModelChanged(const QAbstractItemModel* itemModel); void rowRoleChanged(const QString &role); void columnRoleChanged(const QString &role); diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy.h b/src/datavisualization/data/qitemmodelscatterdataproxy.h index a1704037..ae1413c5 100644 --- a/src/datavisualization/data/qitemmodelscatterdataproxy.h +++ b/src/datavisualization/data/qitemmodelscatterdataproxy.h @@ -90,7 +90,7 @@ public: void setRotationRoleReplace(const QString &replace); QString rotationRoleReplace() const; -signals: +Q_SIGNALS: void itemModelChanged(const QAbstractItemModel* itemModel); void xPosRoleChanged(const QString &role); void yPosRoleChanged(const QString &role); diff --git a/src/datavisualization/data/qitemmodelsurfacedataproxy.h b/src/datavisualization/data/qitemmodelsurfacedataproxy.h index 88478755..08ce94aa 100644 --- a/src/datavisualization/data/qitemmodelsurfacedataproxy.h +++ b/src/datavisualization/data/qitemmodelsurfacedataproxy.h @@ -146,7 +146,7 @@ public: void setMultiMatchBehavior(MultiMatchBehavior behavior); MultiMatchBehavior multiMatchBehavior() const; -signals: +Q_SIGNALS: void itemModelChanged(const QAbstractItemModel* itemModel); void rowRoleChanged(const QString &role); void columnRoleChanged(const QString &role); diff --git a/src/datavisualization/data/qscatter3dseries.h b/src/datavisualization/data/qscatter3dseries.h index 5556b566..ebc42cc6 100644 --- a/src/datavisualization/data/qscatter3dseries.h +++ b/src/datavisualization/data/qscatter3dseries.h @@ -48,7 +48,7 @@ public: void setItemSize(float size); float itemSize() const; -signals: +Q_SIGNALS: void dataProxyChanged(QScatterDataProxy *proxy); void selectedItemChanged(int index); void itemSizeChanged(float size); diff --git a/src/datavisualization/data/qscatterdataproxy.h b/src/datavisualization/data/qscatterdataproxy.h index 8e562fd4..fffac6d4 100644 --- a/src/datavisualization/data/qscatterdataproxy.h +++ b/src/datavisualization/data/qscatterdataproxy.h @@ -61,7 +61,7 @@ public: void removeItems(int index, int removeCount); -signals: +Q_SIGNALS: void arrayReset(); void itemsAdded(int startIndex, int count); void itemsChanged(int startIndex, int count); diff --git a/src/datavisualization/data/qsurface3dseries.h b/src/datavisualization/data/qsurface3dseries.h index a5215175..693681da 100644 --- a/src/datavisualization/data/qsurface3dseries.h +++ b/src/datavisualization/data/qsurface3dseries.h @@ -70,7 +70,7 @@ public: void setTextureFile(const QString &filename); QString textureFile() const; -signals: +Q_SIGNALS: void dataProxyChanged(QSurfaceDataProxy *proxy); void selectedPointChanged(const QPoint &position); void flatShadingEnabledChanged(bool enable); diff --git a/src/datavisualization/data/qsurfacedataproxy.h b/src/datavisualization/data/qsurfacedataproxy.h index 8bb6e42e..0101955e 100644 --- a/src/datavisualization/data/qsurfacedataproxy.h +++ b/src/datavisualization/data/qsurfacedataproxy.h @@ -68,7 +68,7 @@ public: void removeRows(int rowIndex, int removeCount); -signals: +Q_SIGNALS: void arrayReset(); void rowsAdded(int startIndex, int count); void rowsChanged(int startIndex, int count); diff --git a/src/datavisualization/data/scatteritemmodelhandler_p.h b/src/datavisualization/data/scatteritemmodelhandler_p.h index b5461b38..688ce34b 100644 --- a/src/datavisualization/data/scatteritemmodelhandler_p.h +++ b/src/datavisualization/data/scatteritemmodelhandler_p.h @@ -41,7 +41,7 @@ public: ScatterItemModelHandler(QItemModelScatterDataProxy *proxy, QObject *parent = 0); virtual ~ScatterItemModelHandler(); -public slots: +public Q_SLOTS: virtual void handleDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector &roles = QVector ()); virtual void handleRowsInserted(const QModelIndex &parent, int start, int end); diff --git a/src/datavisualization/data/surfaceitemmodelhandler_p.h b/src/datavisualization/data/surfaceitemmodelhandler_p.h index 7cfdba99..6273e9c9 100644 --- a/src/datavisualization/data/surfaceitemmodelhandler_p.h +++ b/src/datavisualization/data/surfaceitemmodelhandler_p.h @@ -41,7 +41,7 @@ public: SurfaceItemModelHandler(QItemModelSurfaceDataProxy *proxy, QObject *parent = 0); virtual ~SurfaceItemModelHandler(); -public slots: +public Q_SLOTS: virtual void handleDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector &roles = QVector ()); diff --git a/src/datavisualization/engine/abstract3dcontroller_p.h b/src/datavisualization/engine/abstract3dcontroller_p.h index bfb6dd6a..9c24711b 100644 --- a/src/datavisualization/engine/abstract3dcontroller_p.h +++ b/src/datavisualization/engine/abstract3dcontroller_p.h @@ -347,7 +347,7 @@ public: void markSeriesItemLabelsDirty(); bool isOpenGLES() const; -public slots: +public Q_SLOTS: void destroyRenderer(); void handleAxisTitleChanged(const QString &title); @@ -380,7 +380,7 @@ public slots: void updateCustomItem(); -signals: +Q_SIGNALS: void shadowQualityChanged(QAbstract3DGraph::ShadowQuality quality); void activeInputHandlerChanged(QAbstract3DInputHandler *inputHandler); void activeThemeChanged(Q3DTheme *activeTheme); diff --git a/src/datavisualization/engine/abstract3drenderer_p.h b/src/datavisualization/engine/abstract3drenderer_p.h index 01e9bf21..2d912e40 100644 --- a/src/datavisualization/engine/abstract3drenderer_p.h +++ b/src/datavisualization/engine/abstract3drenderer_p.h @@ -173,7 +173,7 @@ public: QVector4D indexToSelectionColor(GLint index); void calculatePolarXZ(const QVector3D &dataPos, float &x, float &z) const; -signals: +Q_SIGNALS: void needRender(); // Emit this if something in renderer causes need for another render pass. void requestShadowQuality(QAbstract3DGraph::ShadowQuality quality); // For automatic quality adjustments diff --git a/src/datavisualization/engine/bars3dcontroller_p.h b/src/datavisualization/engine/bars3dcontroller_p.h index f6376d49..0a76982e 100644 --- a/src/datavisualization/engine/bars3dcontroller_p.h +++ b/src/datavisualization/engine/bars3dcontroller_p.h @@ -139,7 +139,7 @@ public: virtual void handleAxisRangeChangedBySender(QObject *sender); virtual void adjustAxisRanges(); -public slots: +public Q_SLOTS: void handleArrayReset(); void handleRowsAdded(int startIndex, int count); void handleRowsChanged(int startIndex, int count); @@ -149,7 +149,7 @@ public slots: void handleDataRowLabelsChanged(); void handleDataColumnLabelsChanged(); -signals: +Q_SIGNALS: void primarySeriesChanged(QBar3DSeries *series); void selectedSeriesChanged(QBar3DSeries *series); diff --git a/src/datavisualization/engine/bars3drenderer_p.h b/src/datavisualization/engine/bars3drenderer_p.h index af98f6bf..dcb7764e 100644 --- a/src/datavisualization/engine/bars3drenderer_p.h +++ b/src/datavisualization/engine/bars3drenderer_p.h @@ -125,7 +125,7 @@ protected: virtual void fixCameraTarget(QVector3D &target); virtual void getVisibleItemBounds(QVector3D &minBounds, QVector3D &maxBounds); -public slots: +public Q_SLOTS: void updateMultiSeriesScaling(bool uniform); void updateBarSpecs(GLfloat thicknessRatio = 1.0f, const QSizeF &spacing = QSizeF(1.0, 1.0), diff --git a/src/datavisualization/engine/q3dbars.h b/src/datavisualization/engine/q3dbars.h index b792390d..7860d5b3 100644 --- a/src/datavisualization/engine/q3dbars.h +++ b/src/datavisualization/engine/q3dbars.h @@ -79,7 +79,7 @@ public: void setFloorLevel(float level); float floorLevel() const; -signals: +Q_SIGNALS: void multiSeriesUniformChanged(bool uniform); void barThicknessChanged(float thicknessRatio); void barSpacingChanged(const QSizeF &spacing); diff --git a/src/datavisualization/engine/q3dcamera.h b/src/datavisualization/engine/q3dcamera.h index 5c6a376d..7fdb2fdd 100644 --- a/src/datavisualization/engine/q3dcamera.h +++ b/src/datavisualization/engine/q3dcamera.h @@ -99,7 +99,7 @@ public: QVector3D target() const; void setTarget(const QVector3D &target); -signals: +Q_SIGNALS: void xRotationChanged(float rotation); void yRotationChanged(float rotation); void zoomLevelChanged(float zoomLevel); diff --git a/src/datavisualization/engine/q3dcamera_p.h b/src/datavisualization/engine/q3dcamera_p.h index 4cc830d4..3860102c 100644 --- a/src/datavisualization/engine/q3dcamera_p.h +++ b/src/datavisualization/engine/q3dcamera_p.h @@ -73,7 +73,7 @@ public: float fixedRotation, float distanceModifier) const; -signals: +Q_SIGNALS: void minXRotationChanged(float rotation); void minYRotationChanged(float rotation); void maxXRotationChanged(float rotation); diff --git a/src/datavisualization/engine/q3dobject.h b/src/datavisualization/engine/q3dobject.h index b7a5f806..d7a9cfbe 100644 --- a/src/datavisualization/engine/q3dobject.h +++ b/src/datavisualization/engine/q3dobject.h @@ -45,7 +45,7 @@ public: QVector3D position() const; void setPosition(const QVector3D &position); -signals: +Q_SIGNALS: void positionChanged(const QVector3D &position); protected: diff --git a/src/datavisualization/engine/q3dscatter.h b/src/datavisualization/engine/q3dscatter.h index ddb073ad..943a3551 100644 --- a/src/datavisualization/engine/q3dscatter.h +++ b/src/datavisualization/engine/q3dscatter.h @@ -55,7 +55,7 @@ public: QScatter3DSeries *selectedSeries() const; -signals: +Q_SIGNALS: void axisXChanged(QValue3DAxis *axis); void axisYChanged(QValue3DAxis *axis); void axisZChanged(QValue3DAxis *axis); diff --git a/src/datavisualization/engine/q3dscene.h b/src/datavisualization/engine/q3dscene.h index 1fcd110e..2d73591f 100644 --- a/src/datavisualization/engine/q3dscene.h +++ b/src/datavisualization/engine/q3dscene.h @@ -79,7 +79,7 @@ public: float devicePixelRatio() const; void setDevicePixelRatio(float pixelRatio); -signals: +Q_SIGNALS: void viewportChanged(const QRect &viewport); void primarySubViewportChanged(const QRect &subViewport); void secondarySubViewportChanged(const QRect &subViewport); diff --git a/src/datavisualization/engine/q3dscene_p.h b/src/datavisualization/engine/q3dscene_p.h index 90641eb9..b34bc943 100644 --- a/src/datavisualization/engine/q3dscene_p.h +++ b/src/datavisualization/engine/q3dscene_p.h @@ -95,7 +95,7 @@ public: bool isInArea(const QRect &area, int x, int y) const; -signals: +Q_SIGNALS: void needRender(); public: diff --git a/src/datavisualization/engine/q3dsurface.h b/src/datavisualization/engine/q3dsurface.h index 74ffb520..6562a788 100644 --- a/src/datavisualization/engine/q3dsurface.h +++ b/src/datavisualization/engine/q3dsurface.h @@ -59,7 +59,7 @@ public: void setFlipHorizontalGrid(bool flip); bool flipHorizontalGrid() const; -signals: +Q_SIGNALS: void axisXChanged(QValue3DAxis *axis); void axisYChanged(QValue3DAxis *axis); void axisZChanged(QValue3DAxis *axis); diff --git a/src/datavisualization/engine/qabstract3dgraph.h b/src/datavisualization/engine/qabstract3dgraph.h index 08522de7..bfd98b86 100644 --- a/src/datavisualization/engine/qabstract3dgraph.h +++ b/src/datavisualization/engine/qabstract3dgraph.h @@ -195,7 +195,7 @@ protected: void mouseMoveEvent(QMouseEvent *event); void wheelEvent(QWheelEvent *event); -signals: +Q_SIGNALS: void activeInputHandlerChanged(QAbstract3DInputHandler *inputHandler); void activeThemeChanged(Q3DTheme *theme); void selectionModeChanged(QAbstract3DGraph::SelectionFlags mode); diff --git a/src/datavisualization/engine/qabstract3dgraph_p.h b/src/datavisualization/engine/qabstract3dgraph_p.h index eb7fe39c..4161f32b 100644 --- a/src/datavisualization/engine/qabstract3dgraph_p.h +++ b/src/datavisualization/engine/qabstract3dgraph_p.h @@ -54,7 +54,7 @@ public: QImage renderToImage(int msaaSamples, const QSize &imageSize); -public slots: +public Q_SLOTS: void renderLater(); void renderNow(); diff --git a/src/datavisualization/engine/scatter3dcontroller_p.h b/src/datavisualization/engine/scatter3dcontroller_p.h index d41582e6..25ffa0db 100644 --- a/src/datavisualization/engine/scatter3dcontroller_p.h +++ b/src/datavisualization/engine/scatter3dcontroller_p.h @@ -119,14 +119,14 @@ public: virtual void handlePendingClick(); virtual void adjustAxisRanges(); -public slots: +public Q_SLOTS: void handleArrayReset(); void handleItemsAdded(int startIndex, int count); void handleItemsChanged(int startIndex, int count); void handleItemsRemoved(int startIndex, int count); void handleItemsInserted(int startIndex, int count); -signals: +Q_SIGNALS: void selectedSeriesChanged(QScatter3DSeries *series); protected: diff --git a/src/datavisualization/engine/scatter3drenderer_p.h b/src/datavisualization/engine/scatter3drenderer_p.h index 05b8fd07..8d72af84 100644 --- a/src/datavisualization/engine/scatter3drenderer_p.h +++ b/src/datavisualization/engine/scatter3drenderer_p.h @@ -105,7 +105,7 @@ public: void render(GLuint defaultFboHandle); -public slots: +public Q_SLOTS: void updateSelectedItem(int index, QScatter3DSeries *series); protected: diff --git a/src/datavisualization/engine/surface3dcontroller_p.h b/src/datavisualization/engine/surface3dcontroller_p.h index 5b4accf1..7f5b8d4b 100644 --- a/src/datavisualization/engine/surface3dcontroller_p.h +++ b/src/datavisualization/engine/surface3dcontroller_p.h @@ -112,7 +112,7 @@ public: void updateSurfaceTexture(QSurface3DSeries *series); -public slots: +public Q_SLOTS: void handleArrayReset(); void handleRowsAdded(int startIndex, int count); void handleRowsChanged(int startIndex, int count); @@ -122,7 +122,7 @@ public slots: void handleFlatShadingSupportedChange(bool supported); -signals: +Q_SIGNALS: void selectedSeriesChanged(QSurface3DSeries *series); void flipHorizontalGridChanged(bool flip); diff --git a/src/datavisualization/engine/surface3drenderer_p.h b/src/datavisualization/engine/surface3drenderer_p.h index ab48e057..a1c87677 100644 --- a/src/datavisualization/engine/surface3drenderer_p.h +++ b/src/datavisualization/engine/surface3drenderer_p.h @@ -109,7 +109,7 @@ protected: virtual void fixCameraTarget(QVector3D &target); virtual void getVisibleItemBounds(QVector3D &minBounds, QVector3D &maxBounds); -signals: +Q_SIGNALS: void flatShadingSupportedChanged(bool supported); private: diff --git a/src/datavisualization/input/q3dinputhandler.h b/src/datavisualization/input/q3dinputhandler.h index 84641e75..c4ded4fd 100644 --- a/src/datavisualization/input/q3dinputhandler.h +++ b/src/datavisualization/input/q3dinputhandler.h @@ -52,7 +52,7 @@ public: virtual void mouseMoveEvent(QMouseEvent *event, const QPoint &mousePos); virtual void wheelEvent(QWheelEvent *event); -signals: +Q_SIGNALS: void rotationEnabledChanged(bool enable); void zoomEnabledChanged(bool enable); void selectionEnabledChanged(bool enable); diff --git a/src/datavisualization/input/q3dinputhandler_p.h b/src/datavisualization/input/q3dinputhandler_p.h index e6358c91..b5fc89fa 100644 --- a/src/datavisualization/input/q3dinputhandler_p.h +++ b/src/datavisualization/input/q3dinputhandler_p.h @@ -43,7 +43,7 @@ public: Q3DInputHandlerPrivate(Q3DInputHandler *q); ~Q3DInputHandlerPrivate(); -public slots: +public Q_SLOTS: void handleSceneChange(Q3DScene *scene); void handleQueriedGraphPositionChange(); diff --git a/src/datavisualization/input/qabstract3dinputhandler.h b/src/datavisualization/input/qabstract3dinputhandler.h index 369e10d9..30ac3aac 100644 --- a/src/datavisualization/input/qabstract3dinputhandler.h +++ b/src/datavisualization/input/qabstract3dinputhandler.h @@ -68,7 +68,7 @@ public: Q3DScene *scene() const; void setScene(Q3DScene *scene); -signals: +Q_SIGNALS: void positionChanged(const QPoint &position); void inputViewChanged(QAbstract3DInputHandler::InputView view); void sceneChanged(Q3DScene *scene); diff --git a/src/datavisualization/theme/q3dtheme.h b/src/datavisualization/theme/q3dtheme.h index 982c574d..cbecbc4f 100644 --- a/src/datavisualization/theme/q3dtheme.h +++ b/src/datavisualization/theme/q3dtheme.h @@ -147,7 +147,7 @@ public: void setColorStyle(ColorStyle style); ColorStyle colorStyle() const; -signals: +Q_SIGNALS: void typeChanged(Q3DTheme::Theme themeType); void baseColorsChanged(const QList &colors); void backgroundColorChanged(const QColor &color); diff --git a/src/datavisualization/theme/q3dtheme_p.h b/src/datavisualization/theme/q3dtheme_p.h index 44dcd7af..53f36b71 100644 --- a/src/datavisualization/theme/q3dtheme_p.h +++ b/src/datavisualization/theme/q3dtheme_p.h @@ -108,7 +108,7 @@ public: inline bool isForcePredefinedType() { return m_forcePredefinedType; } inline void setForcePredefinedType(bool enable) { m_forcePredefinedType = enable; } -signals: +Q_SIGNALS: void needRender(); public: diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h index 9625e859..3509f7ab 100644 --- a/src/datavisualizationqml2/abstractdeclarative_p.h +++ b/src/datavisualizationqml2/abstractdeclarative_p.h @@ -224,7 +224,7 @@ public: void setMargin(qreal margin); qreal margin() const; -public slots: +public Q_SLOTS: virtual void handleAxisXChanged(QAbstract3DAxis *axis) = 0; virtual void handleAxisYChanged(QAbstract3DAxis *axis) = 0; virtual void handleAxisZChanged(QAbstract3DAxis *axis) = 0; @@ -247,7 +247,7 @@ protected: virtual void handleOptimizationHintChange(QAbstract3DGraph::OptimizationHints hints); virtual QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *); -signals: +Q_SIGNALS: void selectionModeChanged(AbstractDeclarative::SelectionFlags mode); void shadowQualityChanged(AbstractDeclarative::ShadowQuality quality); void shadowsSupportedChanged(bool supported); diff --git a/src/datavisualizationqml2/colorgradient_p.h b/src/datavisualizationqml2/colorgradient_p.h index 7659b577..a2437ede 100644 --- a/src/datavisualizationqml2/colorgradient_p.h +++ b/src/datavisualizationqml2/colorgradient_p.h @@ -51,7 +51,7 @@ public: QColor color() const; void setColor(const QColor &color); -signals: +Q_SIGNALS: void positionChanged(qreal position); void colorChanged(QColor color); diff --git a/src/datavisualizationqml2/declarativebars_p.h b/src/datavisualizationqml2/declarativebars_p.h index 89126ed4..1ba8b401 100644 --- a/src/datavisualizationqml2/declarativebars_p.h +++ b/src/datavisualizationqml2/declarativebars_p.h @@ -89,12 +89,12 @@ public: void setFloorLevel(float level); float floorLevel() const; -public slots: +public Q_SLOTS: void handleAxisXChanged(QAbstract3DAxis *axis); void handleAxisYChanged(QAbstract3DAxis *axis); void handleAxisZChanged(QAbstract3DAxis *axis); -signals: +Q_SIGNALS: void rowAxisChanged(QCategory3DAxis *axis); void valueAxisChanged(QValue3DAxis *axis); void columnAxisChanged(QCategory3DAxis *axis); diff --git a/src/datavisualizationqml2/declarativecolor_p.h b/src/datavisualizationqml2/declarativecolor_p.h index 178f73ed..39a7924b 100644 --- a/src/datavisualizationqml2/declarativecolor_p.h +++ b/src/datavisualizationqml2/declarativecolor_p.h @@ -45,7 +45,7 @@ public: void setColor(const QColor &color); QColor color() const; -signals: +Q_SIGNALS: void colorChanged(QColor color); private: diff --git a/src/datavisualizationqml2/declarativescatter_p.h b/src/datavisualizationqml2/declarativescatter_p.h index d65ffb27..65d05915 100644 --- a/src/datavisualizationqml2/declarativescatter_p.h +++ b/src/datavisualizationqml2/declarativescatter_p.h @@ -67,12 +67,12 @@ public: QScatter3DSeries *selectedSeries() const; -public slots: +public Q_SLOTS: void handleAxisXChanged(QAbstract3DAxis *axis); void handleAxisYChanged(QAbstract3DAxis *axis); void handleAxisZChanged(QAbstract3DAxis *axis); -signals: +Q_SIGNALS: void axisXChanged(QValue3DAxis *axis); void axisYChanged(QValue3DAxis *axis); void axisZChanged(QValue3DAxis *axis); diff --git a/src/datavisualizationqml2/declarativescene_p.h b/src/datavisualizationqml2/declarativescene_p.h index f98f6d3a..65bb7528 100644 --- a/src/datavisualizationqml2/declarativescene_p.h +++ b/src/datavisualizationqml2/declarativescene_p.h @@ -51,7 +51,7 @@ public: QPointF selectionQueryPosition() const; QPoint invalidSelectionPoint() const; -signals: +Q_SIGNALS: void selectionQueryPositionChanged(const QPointF position); }; diff --git a/src/datavisualizationqml2/declarativeseries_p.h b/src/datavisualizationqml2/declarativeseries_p.h index e8b25acb..33d9611a 100644 --- a/src/datavisualizationqml2/declarativeseries_p.h +++ b/src/datavisualizationqml2/declarativeseries_p.h @@ -76,12 +76,12 @@ public: void setMultiHighlightGradient(ColorGradient *gradient); ColorGradient *multiHighlightGradient() const; -public slots: +public Q_SLOTS: void handleBaseGradientUpdate(); void handleSingleHighlightGradientUpdate(); void handleMultiHighlightGradientUpdate(); -signals: +Q_SIGNALS: void selectedBarChanged(QPointF position); void baseGradientChanged(ColorGradient *gradient); void singleHighlightGradientChanged(ColorGradient *gradient); @@ -120,12 +120,12 @@ public: int invalidSelectionIndex() const; -public slots: +public Q_SLOTS: void handleBaseGradientUpdate(); void handleSingleHighlightGradientUpdate(); void handleMultiHighlightGradientUpdate(); -signals: +Q_SIGNALS: void baseGradientChanged(ColorGradient *gradient); void singleHighlightGradientChanged(ColorGradient *gradient); void multiHighlightGradientChanged(ColorGradient *gradient); @@ -168,12 +168,12 @@ public: void setMultiHighlightGradient(ColorGradient *gradient); ColorGradient *multiHighlightGradient() const; -public slots: +public Q_SLOTS: void handleBaseGradientUpdate(); void handleSingleHighlightGradientUpdate(); void handleMultiHighlightGradientUpdate(); -signals: +Q_SIGNALS: void selectedPointChanged(QPointF position); void baseGradientChanged(ColorGradient *gradient); void singleHighlightGradientChanged(ColorGradient *gradient); diff --git a/src/datavisualizationqml2/declarativesurface_p.h b/src/datavisualizationqml2/declarativesurface_p.h index a72c3f1c..0c745606 100644 --- a/src/datavisualizationqml2/declarativesurface_p.h +++ b/src/datavisualizationqml2/declarativesurface_p.h @@ -70,12 +70,12 @@ public: void setFlipHorizontalGrid(bool flip); bool flipHorizontalGrid() const; -public slots: +public Q_SLOTS: void handleAxisXChanged(QAbstract3DAxis *axis); void handleAxisYChanged(QAbstract3DAxis *axis); void handleAxisZChanged(QAbstract3DAxis *axis); -signals: +Q_SIGNALS: void axisXChanged(QValue3DAxis *axis); void axisYChanged(QValue3DAxis *axis); void axisZChanged(QValue3DAxis *axis); diff --git a/src/datavisualizationqml2/declarativetheme_p.h b/src/datavisualizationqml2/declarativetheme_p.h index b84e5b49..8df3f52c 100644 --- a/src/datavisualizationqml2/declarativetheme_p.h +++ b/src/datavisualizationqml2/declarativetheme_p.h @@ -80,7 +80,7 @@ public: virtual void classBegin(); virtual void componentComplete(); -signals: +Q_SIGNALS: void singleHighlightGradientChanged(ColorGradient *gradient); void multiHighlightGradientChanged(ColorGradient *gradient); diff --git a/tests/barstest/chart.h b/tests/barstest/chart.h index b1460606..8ae4f4af 100644 --- a/tests/barstest/chart.h +++ b/tests/barstest/chart.h @@ -102,7 +102,7 @@ public: void setReflectivity(int value); void toggleCustomItem(); -public slots: +public Q_SLOTS: void flipViews(); void setGradient(); void toggleMultiseriesScaling(); @@ -128,7 +128,7 @@ public slots: void setFloorLevel(int value); void setGraphMargin(int value); -signals: +Q_SIGNALS: void shadowQualityChanged(int quality); private: diff --git a/tests/directional/scatterdatamodifier.h b/tests/directional/scatterdatamodifier.h index 0440ea01..878743cb 100644 --- a/tests/directional/scatterdatamodifier.h +++ b/tests/directional/scatterdatamodifier.h @@ -45,14 +45,14 @@ public: void toggleRotation(); void start(); -public slots: +public Q_SLOTS: void changeStyle(int style); void changeTheme(int theme); void changeShadowQuality(int quality); void shadowQualityUpdatedByVisual(QAbstract3DGraph::ShadowQuality shadowQuality); void triggerRotation(); -signals: +Q_SIGNALS: void backgroundEnabledChanged(bool enabled); void gridEnabledChanged(bool enabled); void shadowQualityChanged(int quality); diff --git a/tests/kinectsurface/QtKinectWrapper/QKinectWrapper.h b/tests/kinectsurface/QtKinectWrapper/QKinectWrapper.h index 69a40a46..3f380508 100644 --- a/tests/kinectsurface/QtKinectWrapper/QKinectWrapper.h +++ b/tests/kinectsurface/QtKinectWrapper/QKinectWrapper.h @@ -104,7 +104,7 @@ private: bool initialize(); -signals: +Q_SIGNALS: void dataNotification(); void statusNotification(QKinect::KinectStatus); }; diff --git a/tests/kinectsurface/surfacedata.h b/tests/kinectsurface/surfacedata.h index d06799ad..8e29b5c7 100644 --- a/tests/kinectsurface/surfacedata.h +++ b/tests/kinectsurface/surfacedata.h @@ -60,7 +60,7 @@ public: MeshBars }; -public slots: +public Q_SLOTS: void setResolution(int selection); void changeMode(int mode); @@ -89,7 +89,7 @@ public: QWidget *buttonOne, QWidget *buttonTwo); ~ContainerChanger(); -public slots: +public Q_SLOTS: void changeContainer(int container); private: diff --git a/tests/multigraphs/data.h b/tests/multigraphs/data.h index d3e60fec..01b53243 100644 --- a/tests/multigraphs/data.h +++ b/tests/multigraphs/data.h @@ -56,7 +56,7 @@ public: Bars }; -public slots: +public Q_SLOTS: void setResolution(int selection); void changeMode(int mode); @@ -84,7 +84,7 @@ public: QWidget *buttonOne, QWidget *buttonTwo); ~ContainerChanger(); -public slots: +public Q_SLOTS: void changeContainer(int container); private: diff --git a/tests/qmlperf/datagenerator.h b/tests/qmlperf/datagenerator.h index ce7d235e..32261df8 100644 --- a/tests/qmlperf/datagenerator.h +++ b/tests/qmlperf/datagenerator.h @@ -31,7 +31,7 @@ public: DataGenerator(QObject *parent = 0); virtual ~DataGenerator(); -public slots: +public Q_SLOTS: void generateData(QScatter3DSeries *series, uint count); void add(QScatter3DSeries *series, uint count); void writeLine(int itemCount, float fps); diff --git a/tests/scattertest/scatterchart.h b/tests/scattertest/scatterchart.h index 139def24..67a76406 100644 --- a/tests/scattertest/scatterchart.h +++ b/tests/scattertest/scatterchart.h @@ -63,7 +63,7 @@ public: void testItemChanges(); void testAxisReverse(); -public slots: +public Q_SLOTS: void changeShadowQuality(int quality); void shadowQualityUpdatedByVisual(QAbstract3DGraph::ShadowQuality shadowQuality); void clear(); @@ -103,7 +103,7 @@ public slots: void setCameraTargetZ(int value); void setGraphMargin(int value); -signals: +Q_SIGNALS: void shadowQualityChanged(int quality); private: diff --git a/tests/spectrum/spectrumapp/engine.h b/tests/spectrum/spectrumapp/engine.h index 6fc7a384..2ebc392d 100644 --- a/tests/spectrum/spectrumapp/engine.h +++ b/tests/spectrum/spectrumapp/engine.h @@ -117,14 +117,14 @@ public: */ void setWindowFunction(WindowFunction type); -public slots: +public Q_SLOTS: void startRecording(); void startPlayback(); void suspend(); void setAudioInputDevice(const QAudioDeviceInfo &device); void setAudioOutputDevice(const QAudioDeviceInfo &device); -signals: +Q_SIGNALS: void stateChanged(QAudio::Mode mode, QAudio::State state); /** @@ -179,7 +179,7 @@ signals: */ void bufferChanged(qint64 position, qint64 length, const QByteArray &buffer); -private slots: +private Q_SLOTS: void audioNotify(); void audioStateChanged(QAudio::State state); void audioDataReady(); diff --git a/tests/spectrum/spectrumapp/spectrumanalyser.h b/tests/spectrum/spectrumapp/spectrumanalyser.h index f24e44a7..16588014 100644 --- a/tests/spectrum/spectrumapp/spectrumanalyser.h +++ b/tests/spectrum/spectrumapp/spectrumanalyser.h @@ -47,13 +47,13 @@ public: SpectrumAnalyserThread(QObject *parent); ~SpectrumAnalyserThread(); -public slots: +public Q_SLOTS: void setWindowFunction(WindowFunction type); void calculateSpectrum(const QByteArray &buffer, int inputFrequency, int bytesPerSample); -signals: +Q_SIGNALS: void calculationComplete(const FrequencySpectrum &spectrum); private: @@ -124,10 +124,10 @@ public: */ void cancelCalculation(); -signals: +Q_SIGNALS: void spectrumChanged(const FrequencySpectrum &spectrum); -private slots: +private Q_SLOTS: void calculationComplete(const FrequencySpectrum &spectrum); private: diff --git a/tests/surfacetest/graphmodifier.h b/tests/surfacetest/graphmodifier.h index b827ecee..f3811dfc 100644 --- a/tests/surfacetest/graphmodifier.h +++ b/tests/surfacetest/graphmodifier.h @@ -116,7 +116,7 @@ public: void setHorizontalAspectRatio(int ratio); void setSurfaceTexture(bool enabled); -public slots: +public Q_SLOTS: void changeShadowQuality(int quality); void changeTheme(int theme); void flipViews(); diff --git a/tests/volumetrictest/volumetrictest.h b/tests/volumetrictest/volumetrictest.h index d437b85c..bcbba93a 100644 --- a/tests/volumetrictest/volumetrictest.h +++ b/tests/volumetrictest/volumetrictest.h @@ -39,7 +39,7 @@ public: void setFpsLabel(QLabel *fpsLabel); void setSliceLabels(QLabel *xLabel, QLabel *yLabel, QLabel *zLabel); -public slots: +public Q_SLOTS: void sliceX(int enabled); void sliceY(int enabled); void sliceZ(int enabled); -- cgit v1.2.3 From 67674dd7480193f531a4d0521b7e6c0ac7a16bc8 Mon Sep 17 00:00:00 2001 From: Mika Salmela Date: Fri, 13 Feb 2015 10:00:48 +0200 Subject: Data member initialization removed from header. Change-Id: I12ff4abfe54a54831f833a5e23a8367dd5792210 Reviewed-by: Mika Salmela --- tests/galaxy/galaxydata.cpp | 8 +++++--- tests/galaxy/galaxydata.h | 8 ++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/tests/galaxy/galaxydata.cpp b/tests/galaxy/galaxydata.cpp index 31a39c1e..c4b7f8ac 100644 --- a/tests/galaxy/galaxydata.cpp +++ b/tests/galaxy/galaxydata.cpp @@ -60,16 +60,18 @@ GalaxyData::GalaxyData(Q3DScatter *scatter, m_elEx1(ex1), m_elEx2(ex2), m_radFarField(m_radGalaxy * 2), - m_filtered(false) + m_filtered(false), + m_minx(9999.9), + m_maxx(-9999.0), + m_miny(9999.9), + m_maxy(-9999.0) { m_graph->activeTheme()->setType(Q3DTheme::ThemeEbony); m_graph->setShadowQuality(QAbstract3DGraph::ShadowQualitySoftLow); m_graph->axisX()->setRange(-25000.0f, 25000.0f); - //m_graph->axisY()->setRange(m_minY, m_minY + m_rangeY); m_graph->axisZ()->setRange(-25000.0f, 25000.0f); m_graph->setOptimizationHints(QAbstract3DGraph::OptimizationStatic); - //m_graph->activeTheme()->setType(Q3DTheme::ThemeIsabelle); m_graph->activeTheme()->setBackgroundColor(QColor(31, 31, 31)); m_graph->activeTheme()->setWindowColor(QColor(31, 31, 31)); m_graph->activeTheme()->setLabelBackgroundColor(QColor(31, 31, 31)); diff --git a/tests/galaxy/galaxydata.h b/tests/galaxy/galaxydata.h index 8f084316..248cba1f 100644 --- a/tests/galaxy/galaxydata.h +++ b/tests/galaxy/galaxydata.h @@ -103,10 +103,10 @@ private: QSlider *m_eccentricityOuterSlider; QLabel *m_fpsLabel; - qreal m_minx = 9999.9; - qreal m_maxx = -9999.0; - qreal m_miny = 9999.9; - qreal m_maxy = -9999.0; + qreal m_minx; + qreal m_maxx; + qreal m_miny; + qreal m_maxy; int m_range; bool m_filtered; }; -- cgit v1.2.3 From 8fbd58642744c8b1738a1aff01b29bed1b43c8e4 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 11 Sep 2015 12:09:28 +0300 Subject: Version numbers and change file update for 1.2.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I2933c3fd121d6c20bf2e5585aed63351046318ed Reviewed-by: Tomi Korpipää --- .qmake.conf | 2 +- README | 2 +- dist/changes-1.2.2 | 6 ++++++ src/datavisualization/doc/qtdatavisualization.qdocconf | 10 +++++----- src/datavisualization/global/qdatavisualizationglobal.h | 4 ++-- 5 files changed, 15 insertions(+), 9 deletions(-) create mode 100644 dist/changes-1.2.2 diff --git a/.qmake.conf b/.qmake.conf index 4412217c..41298804 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,6 +1,6 @@ load(qt_build_config) CONFIG += qt_example_installs -MODULE_VERSION=1.2.1 +MODULE_VERSION=1.2.2 CMAKE_MODULE_TESTS=- diff --git a/README b/README index d17d0075..8dca8705 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ --------------------------- -Qt Data Visualization 1.2.1 +Qt Data Visualization 1.2.2 --------------------------- Qt Data Visualization module provides multiple graph types to visualize data in 3D space diff --git a/dist/changes-1.2.2 b/dist/changes-1.2.2 new file mode 100644 index 00000000..a429f858 --- /dev/null +++ b/dist/changes-1.2.2 @@ -0,0 +1,6 @@ +Qt Data Visualization 1.2.2 + +Fixed issues +------------ + +- Compilation fixes for Qt 5.6 diff --git a/src/datavisualization/doc/qtdatavisualization.qdocconf b/src/datavisualization/doc/qtdatavisualization.qdocconf index bdc25332..f38c965f 100644 --- a/src/datavisualization/doc/qtdatavisualization.qdocconf +++ b/src/datavisualization/doc/qtdatavisualization.qdocconf @@ -6,7 +6,7 @@ include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf) project = QtDataVisualization description = Qt Data Visualization Reference Documentation -version = 1.2.1 +version = 1.2.2 exampledirs += ../../../examples/datavisualization \ snippets @@ -27,14 +27,14 @@ indexes += $QT_INSTALL_DOCS/qtcore/qtcore.index \ qhp.projects = QtDataVisualization qhp.QtDataVisualization.file = qtdatavisualization.qhp -qhp.QtDataVisualization.namespace = com.digia.qtdatavisualization.121 +qhp.QtDataVisualization.namespace = com.digia.qtdatavisualization.122 qhp.QtDataVisualization.virtualFolder = qtdatavisualization qhp.QtDataVisualization.indexTitle = Qt Data Visualization qhp.QtDataVisualization.indexRoot = -qhp.QtDataVisualization.filterAttributes = qtdatavisualization 1.2.1 qtrefdoc -qhp.QtDataVisualization.customFilters.Qt.name = QtDataVisualization 1.2.1 -qhp.QtDataVisualization.customFilters.Qt.filterAttributes = qtdatavisualization 1.2.1 +qhp.QtDataVisualization.filterAttributes = qtdatavisualization 1.2.2 qtrefdoc +qhp.QtDataVisualization.customFilters.Qt.name = QtDataVisualization 1.2.2 +qhp.QtDataVisualization.customFilters.Qt.filterAttributes = qtdatavisualization 1.2.2 qhp.QtDataVisualization.subprojects = gettingstarted examples classes types qhp.QtDataVisualization.subprojects.gettingstarted.title = Getting Started qhp.QtDataVisualization.subprojects.gettingstarted.indexTitle = Qt Data Visualization Getting Started diff --git a/src/datavisualization/global/qdatavisualizationglobal.h b/src/datavisualization/global/qdatavisualizationglobal.h index f22017f3..6b78e82c 100644 --- a/src/datavisualization/global/qdatavisualizationglobal.h +++ b/src/datavisualization/global/qdatavisualizationglobal.h @@ -21,11 +21,11 @@ #include -#define QT_DATAVISUALIZATION_VERSION_STR "1.2.1" +#define QT_DATAVISUALIZATION_VERSION_STR "1.2.2" /* QT_DATAVISUALIZATION_VERSION is (major << 16) + (minor << 8) + patch. */ -#define QT_DATAVISUALIZATION_VERSION 0x010201 +#define QT_DATAVISUALIZATION_VERSION 0x010202 /* can be used like #if (QT_DATAVISUALIZATION_VERSION >= QT_DATAVISUALIZATION_VERSION_CHECK(1, 0, 0)) */ -- cgit v1.2.3 From b8b107f178ad823e9ed24a338676f0ae40fdf02c Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 11 Sep 2015 13:10:23 +0300 Subject: Correct file version, description, and product name Change-Id: Ic90d3b04434d07e12c313c56d7217d7bf550cdb3 Reviewed-by: Jani Heikkinen --- src/datavisualization/datavisualization.pro | 3 +++ src/datavisualizationqml2/datavisualizationqml2.pro | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/src/datavisualization/datavisualization.pro b/src/datavisualization/datavisualization.pro index 645a1733..5c170c7a 100644 --- a/src/datavisualization/datavisualization.pro +++ b/src/datavisualization/datavisualization.pro @@ -20,6 +20,9 @@ QMAKE_DOCS = $$PWD/doc/qtdatavisualization.qdocconf load(qt_module) +QMAKE_TARGET_PRODUCT = "Qt Data Visualization (Qt $$QT_VERSION)" +QMAKE_TARGET_DESCRIPTION = "3D Data Visualization component for Qt." + include($$PWD/global/global.pri) include($$PWD/engine/engine.pri) include($$PWD/utils/utils.pri) diff --git a/src/datavisualizationqml2/datavisualizationqml2.pro b/src/datavisualizationqml2/datavisualizationqml2.pro index 87376e70..332a4cf8 100644 --- a/src/datavisualizationqml2/datavisualizationqml2.pro +++ b/src/datavisualizationqml2/datavisualizationqml2.pro @@ -52,6 +52,13 @@ CONFIG += no_cxx_module load(qml_plugin) +win32 { + CONFIG += skip_target_version_ext + VERSION = $$MODULE_VERSION + QMAKE_TARGET_PRODUCT = "Qt Data Visualization (Qt $$QT_VERSION)" + QMAKE_TARGET_DESCRIPTION = "3D Data Visualization QML plugin for Qt." +} + # Copy qmldir to DESTDIR so we can use the plugin directly from there in our examples # without having to do 'make install'. !android:!ios { -- cgit v1.2.3 From dc6dcf918bcf4f350ab92ab659506b4a0f8d80f6 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 11 Sep 2015 14:35:25 +0300 Subject: Fix compile warnings about shadow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Renamed some function parameters so that they do not trigger shadow warnings. Change-Id: Iea6561d26d3f77d075fc7f30b047bfa4d34cb2e7 Reviewed-by: Tomi Korpipää --- src/datavisualization/data/qbardataitem.cpp | 4 ++-- src/datavisualization/data/qbardataitem.h | 2 +- src/datavisualization/data/qscatterdataitem.cpp | 10 +++++----- src/datavisualization/data/qscatterdataitem.h | 4 ++-- src/datavisualization/data/qsurfacedataitem.cpp | 4 ++-- src/datavisualization/data/qsurfacedataitem.h | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/datavisualization/data/qbardataitem.cpp b/src/datavisualization/data/qbardataitem.cpp index ad74533b..e7849025 100644 --- a/src/datavisualization/data/qbardataitem.cpp +++ b/src/datavisualization/data/qbardataitem.cpp @@ -93,8 +93,8 @@ QBarDataItem &QBarDataItem::operator=(const QBarDataItem &other) } /*! - * \fn void QBarDataItem::setValue(float value) - * Sets \a value to this data item. + * \fn void QBarDataItem::setValue(float val) + * Sets value \a val to this data item. */ /*! diff --git a/src/datavisualization/data/qbardataitem.h b/src/datavisualization/data/qbardataitem.h index a318bb72..fb3e4fae 100644 --- a/src/datavisualization/data/qbardataitem.h +++ b/src/datavisualization/data/qbardataitem.h @@ -36,7 +36,7 @@ public: QBarDataItem &operator=(const QBarDataItem &other); - inline void setValue(float value) { m_value = value; } + inline void setValue(float val) { m_value = val; } inline float value() const { return m_value; } inline void setRotation(float angle) { m_angle = angle; } inline float rotation() const { return m_angle; } diff --git a/src/datavisualization/data/qscatterdataitem.cpp b/src/datavisualization/data/qscatterdataitem.cpp index 86c65785..78ec1edf 100644 --- a/src/datavisualization/data/qscatterdataitem.cpp +++ b/src/datavisualization/data/qscatterdataitem.cpp @@ -93,8 +93,8 @@ QScatterDataItem &QScatterDataItem::operator=(const QScatterDataItem &other) } /*! - * \fn void QScatterDataItem::setPosition(const QVector3D &position) - * Sets \a position to this data item. + * \fn void QScatterDataItem::setPosition(const QVector3D &pos) + * Sets position \a pos to this data item. */ /*! @@ -103,9 +103,9 @@ QScatterDataItem &QScatterDataItem::operator=(const QScatterDataItem &other) */ /*! - * \fn void QScatterDataItem::setRotation(const QQuaternion &rotation) - * Sets \a rotation to this data item. - * The \a rotation should be a normalized QQuaternion. + * \fn void QScatterDataItem::setRotation(const QQuaternion &rot) + * Sets rotation \a rot to this data item. + * The \a rot should be a normalized QQuaternion. * If the series also has rotation, item and series rotations are multiplied together. * Defaults to no rotation. */ diff --git a/src/datavisualization/data/qscatterdataitem.h b/src/datavisualization/data/qscatterdataitem.h index 8c154f4b..c2fcc20b 100644 --- a/src/datavisualization/data/qscatterdataitem.h +++ b/src/datavisualization/data/qscatterdataitem.h @@ -37,9 +37,9 @@ public: QScatterDataItem &operator=(const QScatterDataItem &other); - inline void setPosition(const QVector3D &position) { m_position = position; } + inline void setPosition(const QVector3D &pos) { m_position = pos; } inline QVector3D position() const { return m_position; } - inline void setRotation(const QQuaternion &rotation) { m_rotation = rotation; } + inline void setRotation(const QQuaternion &rot) { m_rotation = rot; } inline QQuaternion rotation() const { return m_rotation; } inline void setX(float value) { m_position.setX(value); } inline void setY(float value) { m_position.setY(value); } diff --git a/src/datavisualization/data/qsurfacedataitem.cpp b/src/datavisualization/data/qsurfacedataitem.cpp index 3c9171cf..b11d480f 100644 --- a/src/datavisualization/data/qsurfacedataitem.cpp +++ b/src/datavisualization/data/qsurfacedataitem.cpp @@ -82,8 +82,8 @@ QSurfaceDataItem &QSurfaceDataItem::operator=(const QSurfaceDataItem &other) } /*! - * \fn void QSurfaceDataItem::setPosition(const QVector3D &position) - * Sets \a position to this data item. + * \fn void QSurfaceDataItem::setPosition(const QVector3D &pos) + * Sets position \a pos to this data item. */ /*! diff --git a/src/datavisualization/data/qsurfacedataitem.h b/src/datavisualization/data/qsurfacedataitem.h index 33ecc7aa..972d3e17 100644 --- a/src/datavisualization/data/qsurfacedataitem.h +++ b/src/datavisualization/data/qsurfacedataitem.h @@ -36,7 +36,7 @@ public: QSurfaceDataItem &operator=(const QSurfaceDataItem &other); - inline void setPosition(const QVector3D &position) { m_position = position; } + inline void setPosition(const QVector3D &pos) { m_position = pos; } inline QVector3D position() const { return m_position; } inline void setX(float value) { m_position.setX(value); } inline void setY(float value) { m_position.setY(value); } -- cgit v1.2.3