diff options
Diffstat (limited to 'src/datavisualization/engine')
18 files changed, 22 insertions, 22 deletions
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: |