diff options
Diffstat (limited to 'src')
57 files changed, 71 insertions, 71 deletions
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<int> &roles = QVector<int> ()); 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<int> &roles = QVector<int> ()); 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<int> &roles = QVector<int> ()); 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<QColor> &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); |