diff --git a/demos/chartthemes/themewidget.h b/demos/chartthemes/themewidget.h index fa737d7..5161336 100644 --- a/demos/chartthemes/themewidget.h +++ b/demos/chartthemes/themewidget.h @@ -65,7 +65,7 @@ public: explicit ThemeWidget(QWidget *parent = 0); ~ThemeWidget(); -private slots: +private Q_SLOTS: void updateUI(); private: diff --git a/qmlplugin/declarativebarseries.h b/qmlplugin/declarativebarseries.h index 9091e4e..6f511ae 100644 --- a/qmlplugin/declarativebarseries.h +++ b/qmlplugin/declarativebarseries.h @@ -24,9 +24,9 @@ public: void setBarCategories(QStringList categories); QStringList barCategories(); -signals: +Q_SIGNALS: -public slots: +public Q_SLOTS: public: QChart *m_chart; diff --git a/qmlplugin/declarativepieseries.h b/qmlplugin/declarativepieseries.h index 5e27423..41177ce 100644 --- a/qmlplugin/declarativepieseries.h +++ b/qmlplugin/declarativepieseries.h @@ -19,13 +19,13 @@ public: explicit DeclarativePieSeries(QDeclarativeItem *parent = 0); QDeclarativeListProperty data(); -signals: +Q_SIGNALS: -public slots: +public Q_SLOTS: static void appendData(QDeclarativeListProperty *list, QPieSlice *element); -private slots: +private Q_SLOTS: void setParentForSeries(); private: diff --git a/qmlplugin/declarativexyseries.h b/qmlplugin/declarativexyseries.h index adf7c3d..ddd4f35 100644 --- a/qmlplugin/declarativexyseries.h +++ b/qmlplugin/declarativexyseries.h @@ -25,13 +25,13 @@ public: // from QDeclarativeParserStatus public: QDeclarativeListProperty points(); -signals: +Q_SIGNALS: -public slots: +public Q_SLOTS: static void appendPoints(QDeclarativeListProperty *list, DeclarativeXyPoint *element); -private slots: +private Q_SLOTS: public: QSeries::QSeriesType m_seriesType; diff --git a/src/areachart/areachartitem_p.h b/src/areachart/areachartitem_p.h index b9fa66d..8b614d9 100644 --- a/src/areachart/areachartitem_p.h +++ b/src/areachart/areachartitem_p.h @@ -30,10 +30,10 @@ public: protected: void mousePressEvent(QGraphicsSceneMouseEvent *event); -signals: +Q_SIGNALS: void clicked(const QPointF &point); -public slots: +public Q_SLOTS: void handleUpdated(); void handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY); void handleGeometryChanged(const QRectF &size); diff --git a/src/areachart/qareaseries.h b/src/areachart/qareaseries.h index e098a33..d4c73b3 100644 --- a/src/areachart/qareaseries.h +++ b/src/areachart/qareaseries.h @@ -35,7 +35,7 @@ public: // from QChartSeries // void setModelMappingUpper(int modelX, int modelY, Qt::Orientation orientation = Qt::Vertical); // void setModelMappingLower(int modelX, int modelY, Qt::Orientation orientation = Qt::Vertical); -signals: +Q_SIGNALS: void updated(); void clicked(const QPointF &point); diff --git a/src/axis/axisitem_p.h b/src/axis/axisitem_p.h index d052faf..7dad18c 100644 --- a/src/axis/axisitem_p.h +++ b/src/axis/axisitem_p.h @@ -48,7 +48,7 @@ public: inline QRectF geometry() const { return m_rect; } inline QVector layout() { return m_layoutVector; } -public slots: +public Q_SLOTS: void handleAxisUpdated(); void handleAxisCategoriesUpdated(); void handleRangeChanged(qreal min , qreal max,int tickCount); diff --git a/src/axis/qchartaxis.h b/src/axis/qchartaxis.h index 5df7411..7a956f0 100644 --- a/src/axis/qchartaxis.h +++ b/src/axis/qchartaxis.h @@ -69,7 +69,7 @@ public: void show(); void hide(); -signals: +Q_SIGNALS: void minChanged(qreal min); void maxChanged(qreal max); void rangeChanged(qreal min, qreal max); @@ -79,7 +79,7 @@ signals: void updated(); void changed(qreal min, qreal max, int tickCount,bool niceNumbers); //internal slot -public slots: +public Q_SLOTS: void handleAxisRangeChanged(qreal min, qreal max,int count); private: diff --git a/src/axis/qchartaxiscategories.h b/src/axis/qchartaxiscategories.h index c268910..cb51505 100644 --- a/src/axis/qchartaxiscategories.h +++ b/src/axis/qchartaxiscategories.h @@ -23,7 +23,7 @@ public: int count(); //internal signal -signals: +Q_SIGNALS: void updated(); private: diff --git a/src/barchart/barchartitem_p.h b/src/barchart/barchartitem_p.h index fd561ea..3512cf3 100644 --- a/src/barchart/barchartitem_p.h +++ b/src/barchart/barchartitem_p.h @@ -33,9 +33,7 @@ public: // TODO: Consider the domain for layoutChanged. May be use case, may not be. If it is, then the derived classes need to implement it virtual void dataChanged(); // data of series has changed -> need to recalculate bar sizes -private slots: -public: virtual QVector calculateLayout(); void applyLayout(const QVector &layout); void setLayout(const QVector &layout); @@ -43,7 +41,7 @@ public: QRectF geometry() const { return m_rect;} -public slots: +public Q_SLOTS: void handleModelChanged(int index); void handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY); void handleGeometryChanged(const QRectF &size); diff --git a/src/barchart/barchartmodel_p.h b/src/barchart/barchartmodel_p.h index 03b189c..2427839 100644 --- a/src/barchart/barchartmodel_p.h +++ b/src/barchart/barchartmodel_p.h @@ -41,10 +41,10 @@ public: QString categoryName(int category); -signals: +Q_SIGNALS: void modelUpdated(); -public slots: +public Q_SLOTS: private: diff --git a/src/barchart/qbarseries.h b/src/barchart/qbarseries.h index 29ebe03..a5aef6d 100644 --- a/src/barchart/qbarseries.h +++ b/src/barchart/qbarseries.h @@ -51,7 +51,7 @@ public: BarChartModel& model(); // <--- TO PIMPL -signals: +Q_SIGNALS: //void changed(int index); void clicked(QBarSet *barset, QString category); // Up to user of api, what to do with these signals void rightClicked(QBarSet *barset, QString category); diff --git a/src/chart_p.h b/src/chart_p.h index 7d6b14c..6335510 100644 --- a/src/chart_p.h +++ b/src/chart_p.h @@ -15,7 +15,7 @@ class Chart: public QObject public: explicit Chart(ChartPresenter *presenter); -public slots: +public Q_SLOTS: virtual void handleGeometryChanged(const QRectF& rect); virtual void handleDomainChanged(qreal minX,qreal maxX,qreal minY,qreal maxY); virtual void rangeXChanged(qreal min, qreal max, int tickXCount); diff --git a/src/chartpresenter_p.h b/src/chartpresenter_p.h index fcb4000..a3fb29c 100644 --- a/src/chartpresenter_p.h +++ b/src/chartpresenter_p.h @@ -58,14 +58,14 @@ private: void createConnections(); void resetAllElements(); -public slots: +public Q_SLOTS: void handleSeriesAdded(QSeries* series,Domain* domain); void handleSeriesRemoved(QSeries* series); void handleAxisAdded(QChartAxis* axis,Domain* domain); void handleAxisRemoved(QChartAxis* axis); void handleGeometryChanged(); -signals: +Q_SIGNALS: void geometryChanged(const QRectF& rect); private: diff --git a/src/domain_p.h b/src/domain_p.h index 3247e29..f3d22f7 100644 --- a/src/domain_p.h +++ b/src/domain_p.h @@ -43,12 +43,12 @@ public: void zoomOut(const QRectF& rect, const QSizeF& size); void move(int dx,int dy,const QSizeF& size); -signals: +Q_SIGNALS: void domainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY); void rangeXChanged(qreal min, qreal max, int tickXCount); void rangeYChanged(qreal min, qreal max, int tickYCount); -public slots: +public Q_SLOTS: void handleAxisXChanged(qreal min,qreal max,int tickXCount = 5,bool niceNumbers = false); void handleAxisYChanged(qreal min,qreal max,int tickYCount = 5,bool niceNumbers = false); diff --git a/src/legendscrollbutton_p.h b/src/legendscrollbutton_p.h index f23f2a9..62a1f6e 100644 --- a/src/legendscrollbutton_p.h +++ b/src/legendscrollbutton_p.h @@ -23,10 +23,10 @@ public: virtual void mousePressEvent(QGraphicsSceneMouseEvent *event); -signals: +Q_SIGNALS: void clicked(QGraphicsSceneMouseEvent* event); -public slots: +public Q_SLOTS: private: diff --git a/src/linechart/linechartitem_p.h b/src/linechart/linechartitem_p.h index bd0df77..61a7d44 100644 --- a/src/linechart/linechartitem_p.h +++ b/src/linechart/linechartitem_p.h @@ -22,7 +22,7 @@ public: void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); QPainterPath shape() const; -public slots: +public Q_SLOTS: void handleUpdated(); protected: diff --git a/src/qlegend.h b/src/qlegend.h index b1cea48..3598721 100644 --- a/src/qlegend.h +++ b/src/qlegend.h @@ -53,13 +53,13 @@ public: void setSize(const QSizeF size); void setPos(const QPointF &pos); -signals: +Q_SIGNALS: // for interactions. void clicked(QSeries *series, Qt::MouseButton button); void clicked(QBarSet *barset, Qt::MouseButton button); void clicked(QPieSlice *slice, Qt::MouseButton button); -public slots: +public Q_SLOTS: // PIMPL ---> void handleSeriesAdded(QSeries *series, Domain *domain); void handleSeriesRemoved(QSeries *series); diff --git a/src/scatterseries/scatterchartitem_p.h b/src/scatterseries/scatterchartitem_p.h index 35ec8a4..3e61a37 100644 --- a/src/scatterseries/scatterchartitem_p.h +++ b/src/scatterseries/scatterchartitem_p.h @@ -27,7 +27,7 @@ public: void markerSelected(Marker *item); -public slots: +public Q_SLOTS: void handleUpdated(); private: diff --git a/src/splinechart/qsplineseries.h b/src/splinechart/qsplineseries.h index 0028731..665ab2d 100644 --- a/src/splinechart/qsplineseries.h +++ b/src/splinechart/qsplineseries.h @@ -34,7 +34,7 @@ private: void calculateControlPoints(); QList getFirstControlPoints(QList rhs); -private slots: +private Q_SLOTS: void updateControlPoints(); private: diff --git a/src/splinechart/splinechartitem_p.h b/src/splinechart/splinechartitem_p.h index 5ad5049..63f03a4 100644 --- a/src/splinechart/splinechartitem_p.h +++ b/src/splinechart/splinechartitem_p.h @@ -17,7 +17,7 @@ public: void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); QPainterPath shape() const; -public slots: +public Q_SLOTS: void handleUpdated(); protected: diff --git a/src/xychart/qxyseries.h b/src/xychart/qxyseries.h index e135883..dcf3e4f 100644 --- a/src/xychart/qxyseries.h +++ b/src/xychart/qxyseries.h @@ -45,14 +45,14 @@ public: virtual void setModelMapping(int modelX, int modelY, Qt::Orientation orientation = Qt::Vertical); virtual void setModelMappingShift(int first, int count = 0); -private slots: +private Q_SLOTS: void modelUpdated(QModelIndex topLeft, QModelIndex bottomRight); void modelDataAboutToBeAdded(QModelIndex parent, int start, int end); void modelDataAdded(QModelIndex parent, int start, int end); void modelDataAboutToBeRemoved(QModelIndex parent, int start, int end); void modelDataRemoved(QModelIndex parent, int start, int end); -signals: +Q_SIGNALS: void clicked(const QPointF &point); void updated(); void pointReplaced(int index); diff --git a/src/xychart/xychartitem_p.h b/src/xychart/xychartitem_p.h index cfc9b8d..cbd31f1 100644 --- a/src/xychart/xychartitem_p.h +++ b/src/xychart/xychartitem_p.h @@ -21,14 +21,14 @@ public: QRectF clipRect() const { return m_clipRect;} -public slots: +public Q_SLOTS: void handlePointAdded(int index); void handlePointRemoved(int index); void handlePointReplaced(int index); void handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY); void handleGeometryChanged(const QRectF &size); -signals: +Q_SIGNALS: void clicked(const QPointF& point); protected: