qiurui
/
qtdatavis3d
mirror of https://github.com/qt/qtdatavis3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <mika.salmela@theqtcompany.com>
This commit is contained in:
Miikka Heikkinen 2015-06-17 14:01:44 +03:00
parent 916d67d266
commit a71eb045af
81 changed files with 109 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/datavisualization/bars/graphmodifier.h
View File

@ -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);

4
examples/datavisualization/custominput/scatterdatamodifier.h
View File

@ -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:

2
examples/datavisualization/customproxy/variantbardatamapping.h
View File

@ -61,7 +61,7 @@ public:
const QStringList &rowCategories,
const QStringList &columnCategories);
//! [2]
signals:
Q_SIGNALS:
//! [3]
void mappingChanged();
//! [3]

2
examples/datavisualization/customproxy/variantbardataproxy.h
View File

@ -51,7 +51,7 @@ public:
VariantBarDataMapping *mapping();
//! [1]
public slots:
public Q_SLOTS:
void handleItemsAdded(int index, int count);
void handleDataCleared();
void handleMappingChanged();

2
examples/datavisualization/customproxy/variantdataset.h
View File

@ -43,7 +43,7 @@ public:
const VariantDataItemList &itemList() const;
signals:
Q_SIGNALS:
void itemsAdded(int index, int count);
void dataCleared();
//! [0]

4
examples/datavisualization/qmlaxisformatter/customformatter.h
View File

@ -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);

2
examples/datavisualization/qmloscilloscope/datasource.h
View File

@ -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);

2
examples/datavisualization/rotations/scatterdatamodifier.h
View File

@ -34,7 +34,7 @@ public:
void generateData();
public slots:
public Q_SLOTS:
void setFieldLines(int lines);
void setArrowsPerLine(int arrows);
void toggleRotation();

4
examples/datavisualization/scatter/scatterdatamodifier.h
View File

@ -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);

2
examples/datavisualization/surface/surfacegraph.h
View File

@ -59,7 +59,7 @@ public:
void adjustZMin(int min);
void adjustZMax(int max);
public slots:
public Q_SLOTS:
void changeTheme(int theme);
private:

2
examples/datavisualization/texturesurface/highlightseries.h
View File

@ -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);

2
examples/datavisualization/texturesurface/topographicseries.h
View File

@ -35,7 +35,7 @@ public:
float sampleCountX() { return m_sampleCountX; }
float sampleCountZ() { return m_sampleCountZ; }
public slots:
public Q_SLOTS:
private:
float m_sampleCountX;

2
examples/datavisualization/volumetric/volumetric.h
View File

@ -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);

2
src/datavisualization/axis/qabstract3daxis.h
View File

@ -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);

2
src/datavisualization/axis/qcategory3daxis.h
View File

@ -37,7 +37,7 @@ public:
void setLabels(const QStringList &labels);
QStringList labels() const;
signals:
Q_SIGNALS:
void labelsChanged();
protected:

2
src/datavisualization/axis/qlogvalue3daxisformatter.h
View File

@ -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);

2
src/datavisualization/axis/qvalue3daxis.h
View File

@ -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);

2
src/datavisualization/axis/qvalue3daxis_p.h
View File

@ -48,7 +48,7 @@ public:
void emitLabelsChanged();
signals:
Q_SIGNALS:
void formatterDirty();
protected:

2
src/datavisualization/axis/qvalue3daxisformatter_p.h
View File

@ -58,7 +58,7 @@ public:
void setAxis(QValue3DAxis *axis);
void markDirty(bool labelsChange);
public slots:
public Q_SLOTS:
void markDirtyNoLabelChange();
protected:

4
src/datavisualization/data/abstractitemmodelhandler_p.h
View File

@ -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:

2
src/datavisualization/data/baritemmodelhandler_p.h
View File

@ -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> ());

2
src/datavisualization/data/qabstract3dseries.h
View File

@ -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);

2
src/datavisualization/data/qbar3dseries.h
View File

@ -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);

2
src/datavisualization/data/qbardataproxy.h
View File

@ -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);

2
src/datavisualization/data/qcustom3ditem.h
View File

@ -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);

2
src/datavisualization/data/qcustom3ditem_p.h
View File

@ -86,7 +86,7 @@ public:
QCustomItemDirtyBitField m_dirtyBits;
signals:
Q_SIGNALS:
void needUpdate();
private:

2
src/datavisualization/data/qcustom3dlabel.h
View File

@ -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);

2
src/datavisualization/data/qcustom3dvolume.h
View File

@ -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);

2
src/datavisualization/data/qheightmapsurfacedataproxy.h
View File

@ -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);

2
src/datavisualization/data/qitemmodelbardataproxy.h
View File

@ -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);

2
src/datavisualization/data/qitemmodelscatterdataproxy.h
View File

@ -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);

2
src/datavisualization/data/qitemmodelsurfacedataproxy.h
View File

@ -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);

2
src/datavisualization/data/qscatter3dseries.h
View File

@ -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);

2
src/datavisualization/data/qscatterdataproxy.h
View File

@ -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);

2
src/datavisualization/data/qsurface3dseries.h
View File

@ -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);

2
src/datavisualization/data/qsurfacedataproxy.h
View File

@ -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);

2
src/datavisualization/data/scatteritemmodelhandler_p.h
View File

@ -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);

2
src/datavisualization/data/surfaceitemmodelhandler_p.h
View File

@ -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> ());

4
src/datavisualization/engine/abstract3dcontroller_p.h
View File

@ -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);

2
src/datavisualization/engine/abstract3drenderer_p.h
View File

@ -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

4
src/datavisualization/engine/bars3dcontroller_p.h
View File

@ -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);

2
src/datavisualization/engine/bars3drenderer_p.h
View File

@ -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),

2
src/datavisualization/engine/q3dbars.h
View File

@ -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);

2
src/datavisualization/engine/q3dcamera.h
View File

@ -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);

2
src/datavisualization/engine/q3dcamera_p.h
View File

@ -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);

2
src/datavisualization/engine/q3dobject.h
View File

@ -45,7 +45,7 @@ public:
QVector3D position() const;
void setPosition(const QVector3D &position);
signals:
Q_SIGNALS:
void positionChanged(const QVector3D &position);
protected:

2
src/datavisualization/engine/q3dscatter.h
View File

@ -55,7 +55,7 @@ public:
QScatter3DSeries *selectedSeries() const;
signals:
Q_SIGNALS:
void axisXChanged(QValue3DAxis *axis);
void axisYChanged(QValue3DAxis *axis);
void axisZChanged(QValue3DAxis *axis);

2
src/datavisualization/engine/q3dscene.h
View File

@ -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);

2
src/datavisualization/engine/q3dscene_p.h
View File

@ -95,7 +95,7 @@ public:
bool isInArea(const QRect &area, int x, int y) const;
signals:
Q_SIGNALS:
void needRender();
public:

2
src/datavisualization/engine/q3dsurface.h
View File

@ -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);

2
src/datavisualization/engine/qabstract3dgraph.h
View File

@ -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);

2
src/datavisualization/engine/qabstract3dgraph_p.h
View File

@ -54,7 +54,7 @@ public:
QImage renderToImage(int msaaSamples, const QSize &imageSize);
public slots:
public Q_SLOTS:
void renderLater();
void renderNow();

4
src/datavisualization/engine/scatter3dcontroller_p.h
View File

@ -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:

2
src/datavisualization/engine/scatter3drenderer_p.h
View File

@ -105,7 +105,7 @@ public:
void render(GLuint defaultFboHandle);
public slots:
public Q_SLOTS:
void updateSelectedItem(int index, QScatter3DSeries *series);
protected:

4
src/datavisualization/engine/surface3dcontroller_p.h
View File

@ -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);

2
src/datavisualization/engine/surface3drenderer_p.h
View File

@ -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:

2
src/datavisualization/input/q3dinputhandler.h
View File

@ -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);

2
src/datavisualization/input/q3dinputhandler_p.h
View File

@ -43,7 +43,7 @@ public:
Q3DInputHandlerPrivate(Q3DInputHandler *q);
~Q3DInputHandlerPrivate();
public slots:
public Q_SLOTS:
void handleSceneChange(Q3DScene *scene);
void handleQueriedGraphPositionChange();

2
src/datavisualization/input/qabstract3dinputhandler.h
View File

@ -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);

2
src/datavisualization/theme/q3dtheme.h
View File

@ -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);

2
src/datavisualization/theme/q3dtheme_p.h
View File

@ -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:

4
src/datavisualizationqml2/abstractdeclarative_p.h
View File

@ -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);

2
src/datavisualizationqml2/colorgradient_p.h
View File

@ -51,7 +51,7 @@ public:
QColor color() const;
void setColor(const QColor &color);
signals:
Q_SIGNALS:
void positionChanged(qreal position);
void colorChanged(QColor color);

4
src/datavisualizationqml2/declarativebars_p.h
View File

@ -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);

2
src/datavisualizationqml2/declarativecolor_p.h
View File

@ -45,7 +45,7 @@ public:
void setColor(const QColor &color);
QColor color() const;
signals:
Q_SIGNALS:
void colorChanged(QColor color);
private:

4
src/datavisualizationqml2/declarativescatter_p.h
View File

@ -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);

2
src/datavisualizationqml2/declarativescene_p.h
View File

@ -51,7 +51,7 @@ public:
QPointF selectionQueryPosition() const;
QPoint invalidSelectionPoint() const;
signals:
Q_SIGNALS:
void selectionQueryPositionChanged(const QPointF position);
};

12
src/datavisualizationqml2/declarativeseries_p.h
View File

@ -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);

4
src/datavisualizationqml2/declarativesurface_p.h
View File

@ -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);

2
src/datavisualizationqml2/declarativetheme_p.h
View File

@ -80,7 +80,7 @@ public:
virtual void classBegin();
virtual void componentComplete();
signals:
Q_SIGNALS:
void singleHighlightGradientChanged(ColorGradient *gradient);
void multiHighlightGradientChanged(ColorGradient *gradient);

4
tests/barstest/chart.h
View File

@ -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:

4
tests/directional/scatterdatamodifier.h
View File

@ -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);

2
tests/kinectsurface/QtKinectWrapper/QKinectWrapper.h
View File

@ -104,7 +104,7 @@ private:
bool initialize();
signals:
Q_SIGNALS:
void dataNotification();
void statusNotification(QKinect::KinectStatus);
};

4
tests/kinectsurface/surfacedata.h
View File

@ -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:

4
tests/multigraphs/data.h
View File

@ -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:

2
tests/qmlperf/datagenerator.h
View File

@ -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);

4
tests/scattertest/scatterchart.h
View File

@ -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:

6
tests/spectrum/spectrumapp/engine.h
View File

@ -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();

8
tests/spectrum/spectrumapp/spectrumanalyser.h
View File

@ -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:

2
tests/surfacetest/graphmodifier.h
View File

@ -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();

2
tests/volumetrictest/volumetrictest.h
View File

@ -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);