diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2019-04-01 09:17:51 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2019-04-01 11:11:36 +0000 |
| commit | be2280a9600430d55595742ec75c08bb1556ec9b (patch) | |
| tree | 2bae8337b09ceb5410316be4a17f4c930887513b /src | |
| parent | 2286b0d68cad71bd1c266070377c86ad961bf1ba (diff) | |
Switch export macros to standard formv5.13.0-beta2
Qt expects the export macros to have Q_ prefixes, otherwise the symbol
versioning script won't find them and mark them.
Task-number: QTBUG-73752
Change-Id: I4ee654eadbbfc6f5c25f3bb0a8123c8c17235c12
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src')
213 files changed, 230 insertions, 230 deletions
diff --git a/src/charts/animations/axisanimation_p.h b/src/charts/animations/axisanimation_p.h index 42cf8081..43144161 100644 --- a/src/charts/animations/axisanimation_p.h +++ b/src/charts/animations/axisanimation_p.h @@ -47,7 +47,7 @@ QT_CHARTS_BEGIN_NAMESPACE class ChartAxisElement; -class QT_CHARTS_PRIVATE_EXPORT AxisAnimation: public ChartAnimation +class Q_CHARTS_PRIVATE_EXPORT AxisAnimation: public ChartAnimation { public: enum Animation { DefaultAnimation, ZoomOutAnimation, ZoomInAnimation, MoveForwardAnimation, MoveBackwordAnimation}; diff --git a/src/charts/animations/baranimation_p.h b/src/charts/animations/baranimation_p.h index c27765d0..d0fcc286 100644 --- a/src/charts/animations/baranimation_p.h +++ b/src/charts/animations/baranimation_p.h @@ -46,7 +46,7 @@ QT_CHARTS_BEGIN_NAMESPACE class AbstractBarChartItem; -class QT_CHARTS_PRIVATE_EXPORT BarAnimation : public ChartAnimation +class Q_CHARTS_PRIVATE_EXPORT BarAnimation : public ChartAnimation { Q_OBJECT diff --git a/src/charts/animations/boxplotanimation_p.h b/src/charts/animations/boxplotanimation_p.h index 0f3cb388..83a13aea 100644 --- a/src/charts/animations/boxplotanimation_p.h +++ b/src/charts/animations/boxplotanimation_p.h @@ -49,7 +49,7 @@ QT_CHARTS_BEGIN_NAMESPACE class BoxPlotChartItem; -class QT_CHARTS_PRIVATE_EXPORT BoxPlotAnimation : public QObject +class Q_CHARTS_PRIVATE_EXPORT BoxPlotAnimation : public QObject { Q_OBJECT public: diff --git a/src/charts/animations/boxwhiskersanimation_p.h b/src/charts/animations/boxwhiskersanimation_p.h index 99e26d7b..34f30012 100644 --- a/src/charts/animations/boxwhiskersanimation_p.h +++ b/src/charts/animations/boxwhiskersanimation_p.h @@ -49,7 +49,7 @@ QT_CHARTS_BEGIN_NAMESPACE class BoxPlotChartItem; class BoxPlotAnimation; -class QT_CHARTS_PRIVATE_EXPORT BoxWhiskersAnimation : public ChartAnimation +class Q_CHARTS_PRIVATE_EXPORT BoxWhiskersAnimation : public ChartAnimation { Q_OBJECT diff --git a/src/charts/animations/candlestickanimation_p.h b/src/charts/animations/candlestickanimation_p.h index c1b82db6..6d409b22 100644 --- a/src/charts/animations/candlestickanimation_p.h +++ b/src/charts/animations/candlestickanimation_p.h @@ -48,7 +48,7 @@ class Candlestick; class CandlestickChartItem; class CandlestickBodyWicksAnimation; -class QT_CHARTS_PRIVATE_EXPORT CandlestickAnimation : public QObject +class Q_CHARTS_PRIVATE_EXPORT CandlestickAnimation : public QObject { Q_OBJECT diff --git a/src/charts/animations/candlestickbodywicksanimation_p.h b/src/charts/animations/candlestickbodywicksanimation_p.h index 4a79cd38..cf015e08 100644 --- a/src/charts/animations/candlestickbodywicksanimation_p.h +++ b/src/charts/animations/candlestickbodywicksanimation_p.h @@ -48,7 +48,7 @@ QT_CHARTS_BEGIN_NAMESPACE class Candlestick; class CandlestickAnimation; -class QT_CHARTS_PRIVATE_EXPORT CandlestickBodyWicksAnimation : public ChartAnimation +class Q_CHARTS_PRIVATE_EXPORT CandlestickBodyWicksAnimation : public ChartAnimation { Q_OBJECT diff --git a/src/charts/animations/chartanimation_p.h b/src/charts/animations/chartanimation_p.h index 87d552b5..cfd1feee 100644 --- a/src/charts/animations/chartanimation_p.h +++ b/src/charts/animations/chartanimation_p.h @@ -47,7 +47,7 @@ QT_CHARTS_BEGIN_NAMESPACE const static int ChartAnimationDuration = 1000; -class QT_CHARTS_PRIVATE_EXPORT ChartAnimation: public QVariantAnimation +class Q_CHARTS_PRIVATE_EXPORT ChartAnimation: public QVariantAnimation { Q_OBJECT public: diff --git a/src/charts/animations/pieanimation_p.h b/src/charts/animations/pieanimation_p.h index de3c5ebc..8a9b2e5f 100644 --- a/src/charts/animations/pieanimation_p.h +++ b/src/charts/animations/pieanimation_p.h @@ -48,7 +48,7 @@ QT_CHARTS_BEGIN_NAMESPACE class PieChartItem; -class QT_CHARTS_PRIVATE_EXPORT PieAnimation : public ChartAnimation +class Q_CHARTS_PRIVATE_EXPORT PieAnimation : public ChartAnimation { Q_OBJECT diff --git a/src/charts/animations/piesliceanimation_p.h b/src/charts/animations/piesliceanimation_p.h index de962d51..15d5ed91 100644 --- a/src/charts/animations/piesliceanimation_p.h +++ b/src/charts/animations/piesliceanimation_p.h @@ -47,7 +47,7 @@ QT_CHARTS_BEGIN_NAMESPACE class PieChartItem; -class QT_CHARTS_PRIVATE_EXPORT PieSliceAnimation : public ChartAnimation +class Q_CHARTS_PRIVATE_EXPORT PieSliceAnimation : public ChartAnimation { public: PieSliceAnimation(PieSliceItem *sliceItem); diff --git a/src/charts/animations/scatteranimation_p.h b/src/charts/animations/scatteranimation_p.h index 6df74417..bb3021c1 100644 --- a/src/charts/animations/scatteranimation_p.h +++ b/src/charts/animations/scatteranimation_p.h @@ -46,7 +46,7 @@ QT_CHARTS_BEGIN_NAMESPACE class ScatterChartItem; -class QT_CHARTS_PRIVATE_EXPORT ScatterAnimation : public XYAnimation +class Q_CHARTS_PRIVATE_EXPORT ScatterAnimation : public XYAnimation { public: ScatterAnimation(ScatterChartItem *item, int duration, QEasingCurve &curve); diff --git a/src/charts/animations/splineanimation_p.h b/src/charts/animations/splineanimation_p.h index 11261aa7..d49e8523 100644 --- a/src/charts/animations/splineanimation_p.h +++ b/src/charts/animations/splineanimation_p.h @@ -49,7 +49,7 @@ QT_CHARTS_BEGIN_NAMESPACE class SplineChartItem; -class QT_CHARTS_PRIVATE_EXPORT SplineAnimation : public XYAnimation +class Q_CHARTS_PRIVATE_EXPORT SplineAnimation : public XYAnimation { public: SplineAnimation(SplineChartItem *item, int duration, QEasingCurve &curve); diff --git a/src/charts/animations/xyanimation_p.h b/src/charts/animations/xyanimation_p.h index e0f7937b..a120c559 100644 --- a/src/charts/animations/xyanimation_p.h +++ b/src/charts/animations/xyanimation_p.h @@ -47,7 +47,7 @@ QT_CHARTS_BEGIN_NAMESPACE class XYChart; -class QT_CHARTS_PRIVATE_EXPORT XYAnimation : public ChartAnimation +class Q_CHARTS_PRIVATE_EXPORT XYAnimation : public ChartAnimation { protected: enum Animation { AddPointAnimation, RemovePointAnimation, ReplacePointAnimation, NewAnimation }; diff --git a/src/charts/areachart/areachartitem_p.h b/src/charts/areachart/areachartitem_p.h index 3546d330..e71bf34e 100644 --- a/src/charts/areachart/areachartitem_p.h +++ b/src/charts/areachart/areachartitem_p.h @@ -49,7 +49,7 @@ QT_CHARTS_BEGIN_NAMESPACE class AreaChartItem; -class QT_CHARTS_PRIVATE_EXPORT AreaChartItem : public ChartItem +class Q_CHARTS_PRIVATE_EXPORT AreaChartItem : public ChartItem { Q_OBJECT public: @@ -114,7 +114,7 @@ private: }; -class QT_CHARTS_PRIVATE_EXPORT AreaBoundItem : public LineChartItem +class Q_CHARTS_PRIVATE_EXPORT AreaBoundItem : public LineChartItem { public: AreaBoundItem(AreaChartItem *area, QLineSeries *lineSeries,QGraphicsItem* item = 0) diff --git a/src/charts/areachart/qareaseries.h b/src/charts/areachart/qareaseries.h index 2b84b8d5..41b09ba5 100644 --- a/src/charts/areachart/qareaseries.h +++ b/src/charts/areachart/qareaseries.h @@ -39,7 +39,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QLineSeries; class QAreaSeriesPrivate; -class QT_CHARTS_EXPORT QAreaSeries : public QAbstractSeries +class Q_CHARTS_EXPORT QAreaSeries : public QAbstractSeries { Q_OBJECT Q_PROPERTY(QtCharts::QLineSeries *upperSeries READ upperSeries) diff --git a/src/charts/areachart/qareaseries_p.h b/src/charts/areachart/qareaseries_p.h index a4d46169..6b111d15 100644 --- a/src/charts/areachart/qareaseries_p.h +++ b/src/charts/areachart/qareaseries_p.h @@ -47,7 +47,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QAreaSeries; class QLineSeries; -class QT_CHARTS_PRIVATE_EXPORT QAreaSeriesPrivate: public QAbstractSeriesPrivate +class Q_CHARTS_PRIVATE_EXPORT QAreaSeriesPrivate: public QAbstractSeriesPrivate { Q_OBJECT diff --git a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx_p.h b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx_p.h index 47a32a09..0bfdd089 100644 --- a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx_p.h +++ b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx_p.h @@ -47,7 +47,7 @@ QT_CHARTS_BEGIN_NAMESPACE class ChartPresenter; class QBarCategoryAxis; -class QT_CHARTS_PRIVATE_EXPORT ChartBarCategoryAxisX : public HorizontalAxis +class Q_CHARTS_PRIVATE_EXPORT ChartBarCategoryAxisX : public HorizontalAxis { Q_OBJECT public: diff --git a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy_p.h b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy_p.h index 14732ab4..5a67f93e 100644 --- a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy_p.h +++ b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy_p.h @@ -47,7 +47,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QBarCategoryAxis; class ChartPresenter; -class QT_CHARTS_PRIVATE_EXPORT ChartBarCategoryAxisY : public VerticalAxis +class Q_CHARTS_PRIVATE_EXPORT ChartBarCategoryAxisY : public VerticalAxis { Q_OBJECT public: diff --git a/src/charts/axis/barcategoryaxis/qbarcategoryaxis.h b/src/charts/axis/barcategoryaxis/qbarcategoryaxis.h index 54763e82..d4b405c4 100644 --- a/src/charts/axis/barcategoryaxis/qbarcategoryaxis.h +++ b/src/charts/axis/barcategoryaxis/qbarcategoryaxis.h @@ -36,7 +36,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QBarCategoryAxisPrivate; -class QT_CHARTS_EXPORT QBarCategoryAxis : public QAbstractAxis +class Q_CHARTS_EXPORT QBarCategoryAxis : public QAbstractAxis { Q_OBJECT Q_PROPERTY(QStringList categories READ categories WRITE setCategories NOTIFY categoriesChanged) diff --git a/src/charts/axis/barcategoryaxis/qbarcategoryaxis_p.h b/src/charts/axis/barcategoryaxis/qbarcategoryaxis_p.h index 3101d041..4671de1e 100644 --- a/src/charts/axis/barcategoryaxis/qbarcategoryaxis_p.h +++ b/src/charts/axis/barcategoryaxis/qbarcategoryaxis_p.h @@ -47,7 +47,7 @@ QT_CHARTS_BEGIN_NAMESPACE class AbstractDomain; -class QT_CHARTS_PRIVATE_EXPORT QBarCategoryAxisPrivate : public QAbstractAxisPrivate +class Q_CHARTS_PRIVATE_EXPORT QBarCategoryAxisPrivate : public QAbstractAxisPrivate { Q_OBJECT diff --git a/src/charts/axis/cartesianchartaxis_p.h b/src/charts/axis/cartesianchartaxis_p.h index b619ed8b..3361aaf7 100644 --- a/src/charts/axis/cartesianchartaxis_p.h +++ b/src/charts/axis/cartesianchartaxis_p.h @@ -47,7 +47,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QAbstractAxis; -class QT_CHARTS_PRIVATE_EXPORT CartesianChartAxis : public ChartAxisElement +class Q_CHARTS_PRIVATE_EXPORT CartesianChartAxis : public ChartAxisElement { Q_OBJECT Q_INTERFACES(QGraphicsLayoutItem) diff --git a/src/charts/axis/categoryaxis/chartcategoryaxisx_p.h b/src/charts/axis/categoryaxis/chartcategoryaxisx_p.h index ea42aea0..9dd07f98 100644 --- a/src/charts/axis/categoryaxis/chartcategoryaxisx_p.h +++ b/src/charts/axis/categoryaxis/chartcategoryaxisx_p.h @@ -46,7 +46,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QCategoryAxis; -class QT_CHARTS_PRIVATE_EXPORT ChartCategoryAxisX : public HorizontalAxis +class Q_CHARTS_PRIVATE_EXPORT ChartCategoryAxisX : public HorizontalAxis { Q_OBJECT public: diff --git a/src/charts/axis/categoryaxis/chartcategoryaxisy_p.h b/src/charts/axis/categoryaxis/chartcategoryaxisy_p.h index 9057ed14..10b84d0f 100644 --- a/src/charts/axis/categoryaxis/chartcategoryaxisy_p.h +++ b/src/charts/axis/categoryaxis/chartcategoryaxisy_p.h @@ -46,7 +46,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QCategoryAxis; -class QT_CHARTS_PRIVATE_EXPORT ChartCategoryAxisY : public VerticalAxis +class Q_CHARTS_PRIVATE_EXPORT ChartCategoryAxisY : public VerticalAxis { Q_OBJECT public: diff --git a/src/charts/axis/categoryaxis/polarchartcategoryaxisangular_p.h b/src/charts/axis/categoryaxis/polarchartcategoryaxisangular_p.h index aef99571..2e3dec54 100644 --- a/src/charts/axis/categoryaxis/polarchartcategoryaxisangular_p.h +++ b/src/charts/axis/categoryaxis/polarchartcategoryaxisangular_p.h @@ -46,7 +46,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QCategoryAxis; -class QT_CHARTS_PRIVATE_EXPORT PolarChartCategoryAxisAngular : public PolarChartAxisAngular +class Q_CHARTS_PRIVATE_EXPORT PolarChartCategoryAxisAngular : public PolarChartAxisAngular { Q_OBJECT diff --git a/src/charts/axis/categoryaxis/polarchartcategoryaxisradial_p.h b/src/charts/axis/categoryaxis/polarchartcategoryaxisradial_p.h index b5d93e80..c9761cb0 100644 --- a/src/charts/axis/categoryaxis/polarchartcategoryaxisradial_p.h +++ b/src/charts/axis/categoryaxis/polarchartcategoryaxisradial_p.h @@ -46,7 +46,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QCategoryAxis; -class QT_CHARTS_PRIVATE_EXPORT PolarChartCategoryAxisRadial : public PolarChartAxisRadial +class Q_CHARTS_PRIVATE_EXPORT PolarChartCategoryAxisRadial : public PolarChartAxisRadial { Q_OBJECT diff --git a/src/charts/axis/categoryaxis/qcategoryaxis.h b/src/charts/axis/categoryaxis/qcategoryaxis.h index 3400aa18..6c6f9bf4 100644 --- a/src/charts/axis/categoryaxis/qcategoryaxis.h +++ b/src/charts/axis/categoryaxis/qcategoryaxis.h @@ -37,7 +37,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QCategoryAxisPrivate; -class QT_CHARTS_EXPORT QCategoryAxis : public QValueAxis +class Q_CHARTS_EXPORT QCategoryAxis : public QValueAxis { Q_OBJECT Q_PROPERTY(qreal startValue READ startValue WRITE setStartValue) diff --git a/src/charts/axis/categoryaxis/qcategoryaxis_p.h b/src/charts/axis/categoryaxis/qcategoryaxis_p.h index 1938fcb4..f0fdc0d6 100644 --- a/src/charts/axis/categoryaxis/qcategoryaxis_p.h +++ b/src/charts/axis/categoryaxis/qcategoryaxis_p.h @@ -47,7 +47,7 @@ QT_CHARTS_BEGIN_NAMESPACE typedef QPair<qreal, qreal> Range; -class QT_CHARTS_PRIVATE_EXPORT QCategoryAxisPrivate : public QValueAxisPrivate +class Q_CHARTS_PRIVATE_EXPORT QCategoryAxisPrivate : public QValueAxisPrivate { Q_OBJECT diff --git a/src/charts/axis/chartaxiselement_p.h b/src/charts/axis/chartaxiselement_p.h index d421dc8b..32ed9425 100644 --- a/src/charts/axis/chartaxiselement_p.h +++ b/src/charts/axis/chartaxiselement_p.h @@ -56,7 +56,7 @@ QT_CHARTS_BEGIN_NAMESPACE class ChartPresenter; class QAbstractAxis; -class QT_CHARTS_PRIVATE_EXPORT ChartAxisElement : public ChartElement, public QGraphicsLayoutItem +class Q_CHARTS_PRIVATE_EXPORT ChartAxisElement : public ChartElement, public QGraphicsLayoutItem { Q_OBJECT diff --git a/src/charts/axis/datetimeaxis/chartdatetimeaxisx_p.h b/src/charts/axis/datetimeaxis/chartdatetimeaxisx_p.h index dde0c998..37653049 100644 --- a/src/charts/axis/datetimeaxis/chartdatetimeaxisx_p.h +++ b/src/charts/axis/datetimeaxis/chartdatetimeaxisx_p.h @@ -46,7 +46,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QDateTimeAxis; -class QT_CHARTS_PRIVATE_EXPORT ChartDateTimeAxisX : public HorizontalAxis +class Q_CHARTS_PRIVATE_EXPORT ChartDateTimeAxisX : public HorizontalAxis { Q_OBJECT public: diff --git a/src/charts/axis/datetimeaxis/chartdatetimeaxisy_p.h b/src/charts/axis/datetimeaxis/chartdatetimeaxisy_p.h index b7346d52..01b4f876 100644 --- a/src/charts/axis/datetimeaxis/chartdatetimeaxisy_p.h +++ b/src/charts/axis/datetimeaxis/chartdatetimeaxisy_p.h @@ -46,7 +46,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QDateTimeAxis; -class QT_CHARTS_PRIVATE_EXPORT ChartDateTimeAxisY : public VerticalAxis +class Q_CHARTS_PRIVATE_EXPORT ChartDateTimeAxisY : public VerticalAxis { Q_OBJECT public: diff --git a/src/charts/axis/datetimeaxis/datetimeaxislabel_p.h b/src/charts/axis/datetimeaxis/datetimeaxislabel_p.h index c06c6240..616bf14a 100644 --- a/src/charts/axis/datetimeaxis/datetimeaxislabel_p.h +++ b/src/charts/axis/datetimeaxis/datetimeaxislabel_p.h @@ -45,7 +45,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT DateTimeAxisLabel : public EditableAxisLabel +class Q_CHARTS_PRIVATE_EXPORT DateTimeAxisLabel : public EditableAxisLabel { Q_OBJECT public: diff --git a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular_p.h b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular_p.h index c15362cd..9b64dc9a 100644 --- a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular_p.h +++ b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular_p.h @@ -46,7 +46,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QDateTimeAxis; -class QT_CHARTS_PRIVATE_EXPORT PolarChartDateTimeAxisAngular : public PolarChartAxisAngular +class Q_CHARTS_PRIVATE_EXPORT PolarChartDateTimeAxisAngular : public PolarChartAxisAngular { Q_OBJECT public: diff --git a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial_p.h b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial_p.h index 4d22278f..e3aed15c 100644 --- a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial_p.h +++ b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial_p.h @@ -46,7 +46,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QDateTimeAxis; -class QT_CHARTS_PRIVATE_EXPORT PolarChartDateTimeAxisRadial : public PolarChartAxisRadial +class Q_CHARTS_PRIVATE_EXPORT PolarChartDateTimeAxisRadial : public PolarChartAxisRadial { Q_OBJECT public: diff --git a/src/charts/axis/datetimeaxis/qdatetimeaxis.h b/src/charts/axis/datetimeaxis/qdatetimeaxis.h index 98942949..101737d3 100644 --- a/src/charts/axis/datetimeaxis/qdatetimeaxis.h +++ b/src/charts/axis/datetimeaxis/qdatetimeaxis.h @@ -40,7 +40,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QDateTimeAxisPrivate; -class QT_CHARTS_EXPORT QDateTimeAxis : public QAbstractAxis +class Q_CHARTS_EXPORT QDateTimeAxis : public QAbstractAxis { Q_OBJECT Q_PROPERTY(int tickCount READ tickCount WRITE setTickCount NOTIFY tickCountChanged) diff --git a/src/charts/axis/datetimeaxis/qdatetimeaxis_p.h b/src/charts/axis/datetimeaxis/qdatetimeaxis_p.h index 42483a06..30ddd214 100644 --- a/src/charts/axis/datetimeaxis/qdatetimeaxis_p.h +++ b/src/charts/axis/datetimeaxis/qdatetimeaxis_p.h @@ -46,7 +46,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT QDateTimeAxisPrivate : public QAbstractAxisPrivate +class Q_CHARTS_PRIVATE_EXPORT QDateTimeAxisPrivate : public QAbstractAxisPrivate { Q_OBJECT public: diff --git a/src/charts/axis/editableaxislabel_p.h b/src/charts/axis/editableaxislabel_p.h index 55c94e08..a29736c1 100644 --- a/src/charts/axis/editableaxislabel_p.h +++ b/src/charts/axis/editableaxislabel_p.h @@ -47,7 +47,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT EditableAxisLabel : public QGraphicsTextItem +class Q_CHARTS_PRIVATE_EXPORT EditableAxisLabel : public QGraphicsTextItem { Q_OBJECT public: diff --git a/src/charts/axis/horizontalaxis_p.h b/src/charts/axis/horizontalaxis_p.h index 079783fc..e6b64f50 100644 --- a/src/charts/axis/horizontalaxis_p.h +++ b/src/charts/axis/horizontalaxis_p.h @@ -44,7 +44,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT HorizontalAxis : public CartesianChartAxis +class Q_CHARTS_PRIVATE_EXPORT HorizontalAxis : public CartesianChartAxis { public: HorizontalAxis(QAbstractAxis *axis, QGraphicsItem *item = nullptr, bool intervalAxis = false); diff --git a/src/charts/axis/linearrowitem_p.h b/src/charts/axis/linearrowitem_p.h index 58a8d12e..2ea3812f 100644 --- a/src/charts/axis/linearrowitem_p.h +++ b/src/charts/axis/linearrowitem_p.h @@ -46,7 +46,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT LineArrowItem: public QGraphicsLineItem +class Q_CHARTS_PRIVATE_EXPORT LineArrowItem: public QGraphicsLineItem { public: explicit LineArrowItem(ChartAxisElement *axis, QGraphicsItem *parent = 0) diff --git a/src/charts/axis/logvalueaxis/chartlogvalueaxisx_p.h b/src/charts/axis/logvalueaxis/chartlogvalueaxisx_p.h index 2edcd290..1b61a38b 100644 --- a/src/charts/axis/logvalueaxis/chartlogvalueaxisx_p.h +++ b/src/charts/axis/logvalueaxis/chartlogvalueaxisx_p.h @@ -46,7 +46,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QLogValueAxis; -class QT_CHARTS_PRIVATE_EXPORT ChartLogValueAxisX : public HorizontalAxis +class Q_CHARTS_PRIVATE_EXPORT ChartLogValueAxisX : public HorizontalAxis { Q_OBJECT diff --git a/src/charts/axis/logvalueaxis/chartlogvalueaxisy_p.h b/src/charts/axis/logvalueaxis/chartlogvalueaxisy_p.h index beb5f27e..070a02b1 100644 --- a/src/charts/axis/logvalueaxis/chartlogvalueaxisy_p.h +++ b/src/charts/axis/logvalueaxis/chartlogvalueaxisy_p.h @@ -46,7 +46,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QLogValueAxis; -class QT_CHARTS_PRIVATE_EXPORT ChartLogValueAxisY : public VerticalAxis +class Q_CHARTS_PRIVATE_EXPORT ChartLogValueAxisY : public VerticalAxis { Q_OBJECT diff --git a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular_p.h b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular_p.h index 6c95597a..9703ef4d 100644 --- a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular_p.h +++ b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular_p.h @@ -46,7 +46,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QLogValueAxis; -class QT_CHARTS_PRIVATE_EXPORT PolarChartLogValueAxisAngular : public PolarChartAxisAngular +class Q_CHARTS_PRIVATE_EXPORT PolarChartLogValueAxisAngular : public PolarChartAxisAngular { Q_OBJECT public: diff --git a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial_p.h b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial_p.h index 17f8a988..aece4fa1 100644 --- a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial_p.h +++ b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial_p.h @@ -46,7 +46,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QLogValueAxis; -class QT_CHARTS_PRIVATE_EXPORT PolarChartLogValueAxisRadial : public PolarChartAxisRadial +class Q_CHARTS_PRIVATE_EXPORT PolarChartLogValueAxisRadial : public PolarChartAxisRadial { Q_OBJECT public: diff --git a/src/charts/axis/logvalueaxis/qlogvalueaxis.h b/src/charts/axis/logvalueaxis/qlogvalueaxis.h index 1ea9f2b1..5952fc5e 100644 --- a/src/charts/axis/logvalueaxis/qlogvalueaxis.h +++ b/src/charts/axis/logvalueaxis/qlogvalueaxis.h @@ -40,7 +40,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QLogValueAxisPrivate; -class QT_CHARTS_EXPORT QLogValueAxis : public QAbstractAxis +class Q_CHARTS_EXPORT QLogValueAxis : public QAbstractAxis { Q_OBJECT Q_PROPERTY(qreal min READ min WRITE setMin NOTIFY minChanged) diff --git a/src/charts/axis/logvalueaxis/qlogvalueaxis_p.h b/src/charts/axis/logvalueaxis/qlogvalueaxis_p.h index 5f735650..85145dfe 100644 --- a/src/charts/axis/logvalueaxis/qlogvalueaxis_p.h +++ b/src/charts/axis/logvalueaxis/qlogvalueaxis_p.h @@ -45,7 +45,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT QLogValueAxisPrivate : public QAbstractAxisPrivate +class Q_CHARTS_PRIVATE_EXPORT QLogValueAxisPrivate : public QAbstractAxisPrivate { Q_OBJECT public: diff --git a/src/charts/axis/polarchartaxis_p.h b/src/charts/axis/polarchartaxis_p.h index 9df07e75..d8f0d9f6 100644 --- a/src/charts/axis/polarchartaxis_p.h +++ b/src/charts/axis/polarchartaxis_p.h @@ -44,7 +44,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT PolarChartAxis : public ChartAxisElement +class Q_CHARTS_PRIVATE_EXPORT PolarChartAxis : public ChartAxisElement { Q_OBJECT Q_INTERFACES(QGraphicsLayoutItem) diff --git a/src/charts/axis/polarchartaxisangular_p.h b/src/charts/axis/polarchartaxisangular_p.h index ac517c4f..de11e52b 100644 --- a/src/charts/axis/polarchartaxisangular_p.h +++ b/src/charts/axis/polarchartaxisangular_p.h @@ -45,7 +45,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT PolarChartAxisAngular : public PolarChartAxis +class Q_CHARTS_PRIVATE_EXPORT PolarChartAxisAngular : public PolarChartAxis { Q_OBJECT diff --git a/src/charts/axis/polarchartaxisradial_p.h b/src/charts/axis/polarchartaxisradial_p.h index 73fbcea4..9ec55235 100644 --- a/src/charts/axis/polarchartaxisradial_p.h +++ b/src/charts/axis/polarchartaxisradial_p.h @@ -45,7 +45,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT PolarChartAxisRadial : public PolarChartAxis +class Q_CHARTS_PRIVATE_EXPORT PolarChartAxisRadial : public PolarChartAxis { Q_OBJECT diff --git a/src/charts/axis/qabstractaxis.h b/src/charts/axis/qabstractaxis.h index b7384155..54e736b3 100644 --- a/src/charts/axis/qabstractaxis.h +++ b/src/charts/axis/qabstractaxis.h @@ -39,7 +39,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QAbstractAxisPrivate; -class QT_CHARTS_EXPORT QAbstractAxis : public QObject +class Q_CHARTS_EXPORT QAbstractAxis : public QObject { Q_OBJECT //visibility diff --git a/src/charts/axis/qabstractaxis_p.h b/src/charts/axis/qabstractaxis_p.h index ee3af6a0..cbc8e85e 100644 --- a/src/charts/axis/qabstractaxis_p.h +++ b/src/charts/axis/qabstractaxis_p.h @@ -58,7 +58,7 @@ class QAbstractSeries; class ChartTheme; class ChartElement; -class QT_CHARTS_PRIVATE_EXPORT QAbstractAxisPrivate : public QObject +class Q_CHARTS_PRIVATE_EXPORT QAbstractAxisPrivate : public QObject { Q_OBJECT public: diff --git a/src/charts/axis/valueaxis/chartvalueaxisx_p.h b/src/charts/axis/valueaxis/chartvalueaxisx_p.h index 5e8b0957..05de436e 100644 --- a/src/charts/axis/valueaxis/chartvalueaxisx_p.h +++ b/src/charts/axis/valueaxis/chartvalueaxisx_p.h @@ -46,7 +46,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QValueAxis; -class QT_CHARTS_PRIVATE_EXPORT ChartValueAxisX : public HorizontalAxis +class Q_CHARTS_PRIVATE_EXPORT ChartValueAxisX : public HorizontalAxis { Q_OBJECT public: diff --git a/src/charts/axis/valueaxis/chartvalueaxisy_p.h b/src/charts/axis/valueaxis/chartvalueaxisy_p.h index 72c148ac..0b3adfad 100644 --- a/src/charts/axis/valueaxis/chartvalueaxisy_p.h +++ b/src/charts/axis/valueaxis/chartvalueaxisy_p.h @@ -46,7 +46,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QValueAxis; -class QT_CHARTS_PRIVATE_EXPORT ChartValueAxisY : public VerticalAxis +class Q_CHARTS_PRIVATE_EXPORT ChartValueAxisY : public VerticalAxis { Q_OBJECT public: diff --git a/src/charts/axis/valueaxis/polarchartvalueaxisangular_p.h b/src/charts/axis/valueaxis/polarchartvalueaxisangular_p.h index 8a39f510..beb81d0a 100644 --- a/src/charts/axis/valueaxis/polarchartvalueaxisangular_p.h +++ b/src/charts/axis/valueaxis/polarchartvalueaxisangular_p.h @@ -47,7 +47,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QValueAxis; -class QT_CHARTS_PRIVATE_EXPORT PolarChartValueAxisAngular : public PolarChartAxisAngular +class Q_CHARTS_PRIVATE_EXPORT PolarChartValueAxisAngular : public PolarChartAxisAngular { Q_OBJECT public: diff --git a/src/charts/axis/valueaxis/polarchartvalueaxisradial_p.h b/src/charts/axis/valueaxis/polarchartvalueaxisradial_p.h index 8c4d4105..a1b82070 100644 --- a/src/charts/axis/valueaxis/polarchartvalueaxisradial_p.h +++ b/src/charts/axis/valueaxis/polarchartvalueaxisradial_p.h @@ -46,7 +46,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QValueAxis; -class QT_CHARTS_PRIVATE_EXPORT PolarChartValueAxisRadial : public PolarChartAxisRadial +class Q_CHARTS_PRIVATE_EXPORT PolarChartValueAxisRadial : public PolarChartAxisRadial { Q_OBJECT public: diff --git a/src/charts/axis/valueaxis/qvalueaxis.h b/src/charts/axis/valueaxis/qvalueaxis.h index e7bb19f4..03b82342 100644 --- a/src/charts/axis/valueaxis/qvalueaxis.h +++ b/src/charts/axis/valueaxis/qvalueaxis.h @@ -36,7 +36,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QValueAxisPrivate; -class QT_CHARTS_EXPORT QValueAxis : public QAbstractAxis +class Q_CHARTS_EXPORT QValueAxis : public QAbstractAxis { Q_OBJECT Q_PROPERTY(int tickCount READ tickCount WRITE setTickCount NOTIFY tickCountChanged) diff --git a/src/charts/axis/valueaxis/qvalueaxis_p.h b/src/charts/axis/valueaxis/qvalueaxis_p.h index ad5df817..42ed6b41 100644 --- a/src/charts/axis/valueaxis/qvalueaxis_p.h +++ b/src/charts/axis/valueaxis/qvalueaxis_p.h @@ -45,7 +45,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT QValueAxisPrivate : public QAbstractAxisPrivate +class Q_CHARTS_PRIVATE_EXPORT QValueAxisPrivate : public QAbstractAxisPrivate { Q_OBJECT public: diff --git a/src/charts/axis/valueaxis/valueaxislabel_p.h b/src/charts/axis/valueaxis/valueaxislabel_p.h index 4fe3c1aa..44b01920 100644 --- a/src/charts/axis/valueaxis/valueaxislabel_p.h +++ b/src/charts/axis/valueaxis/valueaxislabel_p.h @@ -43,7 +43,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT ValueAxisLabel : public EditableAxisLabel +class Q_CHARTS_PRIVATE_EXPORT ValueAxisLabel : public EditableAxisLabel { Q_OBJECT public: diff --git a/src/charts/axis/verticalaxis_p.h b/src/charts/axis/verticalaxis_p.h index 670854c4..52a1a536 100644 --- a/src/charts/axis/verticalaxis_p.h +++ b/src/charts/axis/verticalaxis_p.h @@ -44,7 +44,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT VerticalAxis : public CartesianChartAxis +class Q_CHARTS_PRIVATE_EXPORT VerticalAxis : public CartesianChartAxis { public: VerticalAxis(QAbstractAxis *axis, QGraphicsItem *item = nullptr, bool intervalAxis = false); diff --git a/src/charts/barchart/abstractbarchartitem_p.h b/src/charts/barchart/abstractbarchartitem_p.h index 7afd8ec8..92e2304a 100644 --- a/src/charts/barchart/abstractbarchartitem_p.h +++ b/src/charts/barchart/abstractbarchartitem_p.h @@ -55,7 +55,7 @@ class BarAnimation; class QBarSetPrivate; class QAbstractAxis; -class QT_CHARTS_PRIVATE_EXPORT AbstractBarChartItem : public ChartItem +class Q_CHARTS_PRIVATE_EXPORT AbstractBarChartItem : public ChartItem { Q_OBJECT public: diff --git a/src/charts/barchart/bar_p.h b/src/charts/barchart/bar_p.h index 654d88a3..d29ce5a9 100644 --- a/src/charts/barchart/bar_p.h +++ b/src/charts/barchart/bar_p.h @@ -49,7 +49,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QBarSet; // Single visual bar item of chart -class QT_CHARTS_PRIVATE_EXPORT Bar : public QObject, public QGraphicsRectItem +class Q_CHARTS_PRIVATE_EXPORT Bar : public QObject, public QGraphicsRectItem { Q_OBJECT public: diff --git a/src/charts/barchart/horizontal/bar/horizontalbarchartitem_p.h b/src/charts/barchart/horizontal/bar/horizontalbarchartitem_p.h index d9d5c515..64154e8e 100644 --- a/src/charts/barchart/horizontal/bar/horizontalbarchartitem_p.h +++ b/src/charts/barchart/horizontal/bar/horizontalbarchartitem_p.h @@ -45,7 +45,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT HorizontalBarChartItem : public AbstractBarChartItem +class Q_CHARTS_PRIVATE_EXPORT HorizontalBarChartItem : public AbstractBarChartItem { Q_OBJECT public: diff --git a/src/charts/barchart/horizontal/bar/qhorizontalbarseries.h b/src/charts/barchart/horizontal/bar/qhorizontalbarseries.h index c3d07e0d..bf5ed30f 100644 --- a/src/charts/barchart/horizontal/bar/qhorizontalbarseries.h +++ b/src/charts/barchart/horizontal/bar/qhorizontalbarseries.h @@ -36,7 +36,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QHorizontalBarSeriesPrivate; -class QT_CHARTS_EXPORT QHorizontalBarSeries : public QAbstractBarSeries +class Q_CHARTS_EXPORT QHorizontalBarSeries : public QAbstractBarSeries { Q_OBJECT public: diff --git a/src/charts/barchart/horizontal/bar/qhorizontalbarseries_p.h b/src/charts/barchart/horizontal/bar/qhorizontalbarseries_p.h index 650bad5f..d66ade48 100644 --- a/src/charts/barchart/horizontal/bar/qhorizontalbarseries_p.h +++ b/src/charts/barchart/horizontal/bar/qhorizontalbarseries_p.h @@ -45,7 +45,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT QHorizontalBarSeriesPrivate: public QAbstractBarSeriesPrivate +class Q_CHARTS_PRIVATE_EXPORT QHorizontalBarSeriesPrivate: public QAbstractBarSeriesPrivate { public: QHorizontalBarSeriesPrivate(QHorizontalBarSeries *q); diff --git a/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem_p.h b/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem_p.h index bff54e9b..ac2eb4aa 100644 --- a/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem_p.h +++ b/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem_p.h @@ -45,7 +45,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT HorizontalPercentBarChartItem : public AbstractBarChartItem +class Q_CHARTS_PRIVATE_EXPORT HorizontalPercentBarChartItem : public AbstractBarChartItem { Q_OBJECT public: diff --git a/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.h b/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.h index 5c78b029..49b3ad2b 100644 --- a/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.h +++ b/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.h @@ -36,7 +36,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QHorizontalPercentBarSeriesPrivate; -class QT_CHARTS_EXPORT QHorizontalPercentBarSeries : public QAbstractBarSeries +class Q_CHARTS_EXPORT QHorizontalPercentBarSeries : public QAbstractBarSeries { Q_OBJECT public: diff --git a/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h b/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h index e17381ff..24c0bf67 100644 --- a/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h +++ b/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h @@ -45,7 +45,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT QHorizontalPercentBarSeriesPrivate: public QAbstractBarSeriesPrivate +class Q_CHARTS_PRIVATE_EXPORT QHorizontalPercentBarSeriesPrivate: public QAbstractBarSeriesPrivate { public: QHorizontalPercentBarSeriesPrivate(QHorizontalPercentBarSeries *q); diff --git a/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem_p.h b/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem_p.h index d3744490..a05c1107 100644 --- a/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem_p.h +++ b/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem_p.h @@ -45,7 +45,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT HorizontalStackedBarChartItem : public AbstractBarChartItem +class Q_CHARTS_PRIVATE_EXPORT HorizontalStackedBarChartItem : public AbstractBarChartItem { Q_OBJECT public: diff --git a/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.h b/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.h index 9f944262..dff60ff5 100644 --- a/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.h +++ b/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.h @@ -36,7 +36,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QHorizontalStackedBarSeriesPrivate; -class QT_CHARTS_EXPORT QHorizontalStackedBarSeries : public QAbstractBarSeries +class Q_CHARTS_EXPORT QHorizontalStackedBarSeries : public QAbstractBarSeries { Q_OBJECT public: diff --git a/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h b/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h index 1c3e014e..a5810336 100644 --- a/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h +++ b/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h @@ -45,7 +45,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT QHorizontalStackedBarSeriesPrivate: public QAbstractBarSeriesPrivate +class Q_CHARTS_PRIVATE_EXPORT QHorizontalStackedBarSeriesPrivate: public QAbstractBarSeriesPrivate { public: QHorizontalStackedBarSeriesPrivate(QHorizontalStackedBarSeries *q); diff --git a/src/charts/barchart/qabstractbarseries.h b/src/charts/barchart/qabstractbarseries.h index 82000d34..e3f4ac97 100644 --- a/src/charts/barchart/qabstractbarseries.h +++ b/src/charts/barchart/qabstractbarseries.h @@ -39,7 +39,7 @@ class QBarSet; class QAbstractBarSeriesPrivate; // Container for series -class QT_CHARTS_EXPORT QAbstractBarSeries : public QAbstractSeries +class Q_CHARTS_EXPORT QAbstractBarSeries : public QAbstractSeries { Q_OBJECT Q_PROPERTY(qreal barWidth READ barWidth WRITE setBarWidth) diff --git a/src/charts/barchart/qabstractbarseries_p.h b/src/charts/barchart/qabstractbarseries_p.h index 99fadeeb..a2902fb6 100644 --- a/src/charts/barchart/qabstractbarseries_p.h +++ b/src/charts/barchart/qabstractbarseries_p.h @@ -51,7 +51,7 @@ class QBarModelMapper; class QBarCategoryAxis; class QLegendMarker; -class QT_CHARTS_PRIVATE_EXPORT QAbstractBarSeriesPrivate : public QAbstractSeriesPrivate +class Q_CHARTS_PRIVATE_EXPORT QAbstractBarSeriesPrivate : public QAbstractSeriesPrivate { Q_OBJECT public: diff --git a/src/charts/barchart/qbarmodelmapper.cpp b/src/charts/barchart/qbarmodelmapper.cpp index bf3391c6..39195e69 100644 --- a/src/charts/barchart/qbarmodelmapper.cpp +++ b/src/charts/barchart/qbarmodelmapper.cpp @@ -545,7 +545,7 @@ QBarSet *qt_allocate_bar_set_cpp(const QString &label) return new QBarSet(label); } -QT_CHARTS_EXPORT QBarSet *(*qt_allocate_bar_set)(const QString &label) = &qt_allocate_bar_set_cpp; +Q_CHARTS_EXPORT QBarSet *(*qt_allocate_bar_set)(const QString &label) = &qt_allocate_bar_set_cpp; void QBarModelMapperPrivate::initializeBarFromModel() { diff --git a/src/charts/barchart/qbarmodelmapper.h b/src/charts/barchart/qbarmodelmapper.h index 6d08fb5a..3aa77d92 100644 --- a/src/charts/barchart/qbarmodelmapper.h +++ b/src/charts/barchart/qbarmodelmapper.h @@ -42,7 +42,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QBarModelMapperPrivate; class QAbstractBarSeries; -class QT_CHARTS_EXPORT QBarModelMapper : public QObject +class Q_CHARTS_EXPORT QBarModelMapper : public QObject { Q_OBJECT diff --git a/src/charts/barchart/qbarmodelmapper_p.h b/src/charts/barchart/qbarmodelmapper_p.h index cf08d5aa..fec7c415 100644 --- a/src/charts/barchart/qbarmodelmapper_p.h +++ b/src/charts/barchart/qbarmodelmapper_p.h @@ -51,7 +51,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QBarSet; -class QT_CHARTS_PRIVATE_EXPORT QBarModelMapperPrivate : public QObject +class Q_CHARTS_PRIVATE_EXPORT QBarModelMapperPrivate : public QObject { Q_OBJECT public: diff --git a/src/charts/barchart/qbarset.h b/src/charts/barchart/qbarset.h index 7edd93e0..8efaaa07 100644 --- a/src/charts/barchart/qbarset.h +++ b/src/charts/barchart/qbarset.h @@ -38,7 +38,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QBarSetPrivate; -class QT_CHARTS_EXPORT QBarSet : public QObject +class Q_CHARTS_EXPORT QBarSet : public QObject { Q_OBJECT Q_PROPERTY(QString label READ label WRITE setLabel NOTIFY labelChanged) diff --git a/src/charts/barchart/qbarset_p.h b/src/charts/barchart/qbarset_p.h index 78876b7b..464908b7 100644 --- a/src/charts/barchart/qbarset_p.h +++ b/src/charts/barchart/qbarset_p.h @@ -48,7 +48,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT QBarSetPrivate : public QObject +class Q_CHARTS_PRIVATE_EXPORT QBarSetPrivate : public QObject { Q_OBJECT diff --git a/src/charts/barchart/qhbarmodelmapper.h b/src/charts/barchart/qhbarmodelmapper.h index 7639ed6b..05abb3c7 100644 --- a/src/charts/barchart/qhbarmodelmapper.h +++ b/src/charts/barchart/qhbarmodelmapper.h @@ -34,7 +34,7 @@ QT_CHARTS_BEGIN_NAMESPACE /* Comment line for syncqt to generate the fwd-include correctly, due to QTBUG-22432 */ -class QT_CHARTS_EXPORT QHBarModelMapper : public QBarModelMapper +class Q_CHARTS_EXPORT QHBarModelMapper : public QBarModelMapper { Q_OBJECT Q_PROPERTY(QtCharts::QAbstractBarSeries *series READ series WRITE setSeries NOTIFY seriesReplaced) diff --git a/src/charts/barchart/qvbarmodelmapper.h b/src/charts/barchart/qvbarmodelmapper.h index b859a76a..239b3baa 100644 --- a/src/charts/barchart/qvbarmodelmapper.h +++ b/src/charts/barchart/qvbarmodelmapper.h @@ -34,7 +34,7 @@ QT_CHARTS_BEGIN_NAMESPACE /* Comment line for syncqt to generate the fwd-include correctly, due to QTBUG-22432 */ -class QT_CHARTS_EXPORT QVBarModelMapper : public QBarModelMapper +class Q_CHARTS_EXPORT QVBarModelMapper : public QBarModelMapper { Q_OBJECT Q_PROPERTY(QtCharts::QAbstractBarSeries *series READ series WRITE setSeries NOTIFY seriesReplaced) diff --git a/src/charts/barchart/vertical/bar/barchartitem_p.h b/src/charts/barchart/vertical/bar/barchartitem_p.h index 174eaa7a..f6e8b71f 100644 --- a/src/charts/barchart/vertical/bar/barchartitem_p.h +++ b/src/charts/barchart/vertical/bar/barchartitem_p.h @@ -47,7 +47,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT BarChartItem : public AbstractBarChartItem +class Q_CHARTS_PRIVATE_EXPORT BarChartItem : public AbstractBarChartItem { Q_OBJECT public: diff --git a/src/charts/barchart/vertical/bar/qbarseries.h b/src/charts/barchart/vertical/bar/qbarseries.h index 5de28119..c6cde538 100644 --- a/src/charts/barchart/vertical/bar/qbarseries.h +++ b/src/charts/barchart/vertical/bar/qbarseries.h @@ -36,7 +36,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QBarSeriesPrivate; -class QT_CHARTS_EXPORT QBarSeries : public QAbstractBarSeries +class Q_CHARTS_EXPORT QBarSeries : public QAbstractBarSeries { Q_OBJECT public: diff --git a/src/charts/barchart/vertical/bar/qbarseries_p.h b/src/charts/barchart/vertical/bar/qbarseries_p.h index 270ac4bc..16b633cb 100644 --- a/src/charts/barchart/vertical/bar/qbarseries_p.h +++ b/src/charts/barchart/vertical/bar/qbarseries_p.h @@ -46,7 +46,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT QBarSeriesPrivate: public QAbstractBarSeriesPrivate +class Q_CHARTS_PRIVATE_EXPORT QBarSeriesPrivate: public QAbstractBarSeriesPrivate { public: QBarSeriesPrivate(QBarSeries *q); diff --git a/src/charts/barchart/vertical/percent/percentbarchartitem_p.h b/src/charts/barchart/vertical/percent/percentbarchartitem_p.h index a922f62d..344e23fb 100644 --- a/src/charts/barchart/vertical/percent/percentbarchartitem_p.h +++ b/src/charts/barchart/vertical/percent/percentbarchartitem_p.h @@ -48,7 +48,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QAbstractBarSeries; -class QT_CHARTS_PRIVATE_EXPORT PercentBarChartItem : public AbstractBarChartItem +class Q_CHARTS_PRIVATE_EXPORT PercentBarChartItem : public AbstractBarChartItem { Q_OBJECT public: diff --git a/src/charts/barchart/vertical/percent/qpercentbarseries.h b/src/charts/barchart/vertical/percent/qpercentbarseries.h index e5545ec6..71ecdcf9 100644 --- a/src/charts/barchart/vertical/percent/qpercentbarseries.h +++ b/src/charts/barchart/vertical/percent/qpercentbarseries.h @@ -37,7 +37,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QPercentBarSeriesPrivate; -class QT_CHARTS_EXPORT QPercentBarSeries : public QAbstractBarSeries +class Q_CHARTS_EXPORT QPercentBarSeries : public QAbstractBarSeries { Q_OBJECT public: diff --git a/src/charts/barchart/vertical/percent/qpercentbarseries_p.h b/src/charts/barchart/vertical/percent/qpercentbarseries_p.h index 7a422410..96dd0d77 100644 --- a/src/charts/barchart/vertical/percent/qpercentbarseries_p.h +++ b/src/charts/barchart/vertical/percent/qpercentbarseries_p.h @@ -46,7 +46,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT QPercentBarSeriesPrivate: public QAbstractBarSeriesPrivate +class Q_CHARTS_PRIVATE_EXPORT QPercentBarSeriesPrivate: public QAbstractBarSeriesPrivate { public: QPercentBarSeriesPrivate(QPercentBarSeries *q); diff --git a/src/charts/barchart/vertical/stacked/qstackedbarseries.h b/src/charts/barchart/vertical/stacked/qstackedbarseries.h index d6032350..466baf08 100644 --- a/src/charts/barchart/vertical/stacked/qstackedbarseries.h +++ b/src/charts/barchart/vertical/stacked/qstackedbarseries.h @@ -37,7 +37,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QStackedBarSeriesPrivate; -class QT_CHARTS_EXPORT QStackedBarSeries : public QAbstractBarSeries +class Q_CHARTS_EXPORT QStackedBarSeries : public QAbstractBarSeries { Q_OBJECT public: diff --git a/src/charts/barchart/vertical/stacked/qstackedbarseries_p.h b/src/charts/barchart/vertical/stacked/qstackedbarseries_p.h index 94916dfe..5b9d4cd4 100644 --- a/src/charts/barchart/vertical/stacked/qstackedbarseries_p.h +++ b/src/charts/barchart/vertical/stacked/qstackedbarseries_p.h @@ -46,7 +46,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT QStackedBarSeriesPrivate: public QAbstractBarSeriesPrivate +class Q_CHARTS_PRIVATE_EXPORT QStackedBarSeriesPrivate: public QAbstractBarSeriesPrivate { public: QStackedBarSeriesPrivate(QStackedBarSeries *q); diff --git a/src/charts/barchart/vertical/stacked/stackedbarchartitem_p.h b/src/charts/barchart/vertical/stacked/stackedbarchartitem_p.h index 58ea7264..cef0aec9 100644 --- a/src/charts/barchart/vertical/stacked/stackedbarchartitem_p.h +++ b/src/charts/barchart/vertical/stacked/stackedbarchartitem_p.h @@ -47,7 +47,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT StackedBarChartItem : public AbstractBarChartItem +class Q_CHARTS_PRIVATE_EXPORT StackedBarChartItem : public AbstractBarChartItem { Q_OBJECT public: diff --git a/src/charts/boxplotchart/boxplotchartitem_p.h b/src/charts/boxplotchart/boxplotchartitem_p.h index f7a7cd9e..8a53f438 100644 --- a/src/charts/boxplotchart/boxplotchartitem_p.h +++ b/src/charts/boxplotchart/boxplotchartitem_p.h @@ -52,7 +52,7 @@ QT_CHARTS_BEGIN_NAMESPACE class BoxPlotSeriesPrivate; -class QT_CHARTS_PRIVATE_EXPORT BoxPlotChartItem : public ChartItem +class Q_CHARTS_PRIVATE_EXPORT BoxPlotChartItem : public ChartItem { Q_OBJECT public: diff --git a/src/charts/boxplotchart/boxwhiskers_p.h b/src/charts/boxplotchart/boxwhiskers_p.h index 6ce0bf53..6e6b8a21 100644 --- a/src/charts/boxplotchart/boxwhiskers_p.h +++ b/src/charts/boxplotchart/boxwhiskers_p.h @@ -53,7 +53,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QBarSet; -class QT_CHARTS_PRIVATE_EXPORT BoxWhiskers : public QGraphicsObject +class Q_CHARTS_PRIVATE_EXPORT BoxWhiskers : public QGraphicsObject { Q_OBJECT diff --git a/src/charts/boxplotchart/boxwhiskersdata_p.h b/src/charts/boxplotchart/boxwhiskersdata_p.h index 3e9554f2..ec961cc4 100644 --- a/src/charts/boxplotchart/boxwhiskersdata_p.h +++ b/src/charts/boxplotchart/boxwhiskersdata_p.h @@ -45,7 +45,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT BoxWhiskersData +class Q_CHARTS_PRIVATE_EXPORT BoxWhiskersData { public: BoxWhiskersData() : diff --git a/src/charts/boxplotchart/qboxplotmodelmapper.h b/src/charts/boxplotchart/qboxplotmodelmapper.h index 4b57002b..e65f4dbf 100644 --- a/src/charts/boxplotchart/qboxplotmodelmapper.h +++ b/src/charts/boxplotchart/qboxplotmodelmapper.h @@ -42,7 +42,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QBoxPlotModelMapperPrivate; class QBoxPlotSeries; -class QT_CHARTS_EXPORT QBoxPlotModelMapper : public QObject +class Q_CHARTS_EXPORT QBoxPlotModelMapper : public QObject { Q_OBJECT diff --git a/src/charts/boxplotchart/qboxplotmodelmapper_p.h b/src/charts/boxplotchart/qboxplotmodelmapper_p.h index 4e4e2c8a..1f6abbbd 100644 --- a/src/charts/boxplotchart/qboxplotmodelmapper_p.h +++ b/src/charts/boxplotchart/qboxplotmodelmapper_p.h @@ -49,7 +49,7 @@ QT_END_NAMESPACE QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT QBoxSet; +class Q_CHARTS_PRIVATE_EXPORT QBoxSet; class QBoxPlotModelMapperPrivate : public QObject { diff --git a/src/charts/boxplotchart/qboxplotseries.h b/src/charts/boxplotchart/qboxplotseries.h index fa736d56..7c9c129a 100644 --- a/src/charts/boxplotchart/qboxplotseries.h +++ b/src/charts/boxplotchart/qboxplotseries.h @@ -38,7 +38,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QBoxPlotSeriesPrivate; -class QT_CHARTS_EXPORT QBoxPlotSeries : public QAbstractSeries +class Q_CHARTS_EXPORT QBoxPlotSeries : public QAbstractSeries { Q_OBJECT Q_PROPERTY(bool boxOutlineVisible READ boxOutlineVisible WRITE setBoxOutlineVisible NOTIFY boxOutlineVisibilityChanged) diff --git a/src/charts/boxplotchart/qboxplotseries_p.h b/src/charts/boxplotchart/qboxplotseries_p.h index e15ef8b7..a4551015 100644 --- a/src/charts/boxplotchart/qboxplotseries_p.h +++ b/src/charts/boxplotchart/qboxplotseries_p.h @@ -49,7 +49,7 @@ QT_CHARTS_BEGIN_NAMESPACE class BoxPlotAnimation; -class QT_CHARTS_PRIVATE_EXPORT QBoxPlotSeriesPrivate : public QAbstractSeriesPrivate +class Q_CHARTS_PRIVATE_EXPORT QBoxPlotSeriesPrivate : public QAbstractSeriesPrivate { Q_OBJECT diff --git a/src/charts/boxplotchart/qboxset.h b/src/charts/boxplotchart/qboxset.h index eada7690..a400ebd7 100644 --- a/src/charts/boxplotchart/qboxset.h +++ b/src/charts/boxplotchart/qboxset.h @@ -38,7 +38,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QBoxSetPrivate; -class QT_CHARTS_EXPORT QBoxSet : public QObject +class Q_CHARTS_EXPORT QBoxSet : public QObject { Q_OBJECT Q_PROPERTY(QPen pen READ pen WRITE setPen NOTIFY penChanged) diff --git a/src/charts/boxplotchart/qboxset_p.h b/src/charts/boxplotchart/qboxset_p.h index 12b765b5..5bcbbb0b 100644 --- a/src/charts/boxplotchart/qboxset_p.h +++ b/src/charts/boxplotchart/qboxset_p.h @@ -50,7 +50,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QBoxPlotSeriesPrivate; -class QT_CHARTS_PRIVATE_EXPORT QBoxSetPrivate : public QObject +class Q_CHARTS_PRIVATE_EXPORT QBoxSetPrivate : public QObject { Q_OBJECT diff --git a/src/charts/boxplotchart/qhboxplotmodelmapper.h b/src/charts/boxplotchart/qhboxplotmodelmapper.h index 8ed690dd..364afd99 100644 --- a/src/charts/boxplotchart/qhboxplotmodelmapper.h +++ b/src/charts/boxplotchart/qhboxplotmodelmapper.h @@ -35,7 +35,7 @@ QT_CHARTS_BEGIN_NAMESPACE /* Comment line for syncqt to generate the fwd-include correctly, due to QTBUG-22432 */ -class QT_CHARTS_EXPORT QHBoxPlotModelMapper : public QBoxPlotModelMapper +class Q_CHARTS_EXPORT QHBoxPlotModelMapper : public QBoxPlotModelMapper { Q_OBJECT Q_PROPERTY(QtCharts::QBoxPlotSeries *series READ series WRITE setSeries NOTIFY seriesReplaced) diff --git a/src/charts/boxplotchart/qvboxplotmodelmapper.h b/src/charts/boxplotchart/qvboxplotmodelmapper.h index b6d9b391..69a48852 100644 --- a/src/charts/boxplotchart/qvboxplotmodelmapper.h +++ b/src/charts/boxplotchart/qvboxplotmodelmapper.h @@ -34,7 +34,7 @@ QT_CHARTS_BEGIN_NAMESPACE /* Comment line for syncqt to generate the fwd-include correctly, due to QTBUG-22432 */ -class QT_CHARTS_EXPORT QVBoxPlotModelMapper : public QBoxPlotModelMapper +class Q_CHARTS_EXPORT QVBoxPlotModelMapper : public QBoxPlotModelMapper { Q_OBJECT Q_PROPERTY(QtCharts::QBoxPlotSeries *series READ series WRITE setSeries NOTIFY seriesReplaced) diff --git a/src/charts/candlestickchart/candlestick_p.h b/src/charts/candlestickchart/candlestick_p.h index 80f2987e..0f4c8984 100644 --- a/src/charts/candlestickchart/candlestick_p.h +++ b/src/charts/candlestickchart/candlestick_p.h @@ -51,7 +51,7 @@ QT_CHARTS_BEGIN_NAMESPACE class AbstractDomain; class QCandlestickSet; -class QT_CHARTS_PRIVATE_EXPORT Candlestick : public QGraphicsObject +class Q_CHARTS_PRIVATE_EXPORT Candlestick : public QGraphicsObject { Q_OBJECT diff --git a/src/charts/candlestickchart/candlestickchartitem_p.h b/src/charts/candlestickchart/candlestickchartitem_p.h index ec1c12b4..8f47121a 100644 --- a/src/charts/candlestickchart/candlestickchartitem_p.h +++ b/src/charts/candlestickchart/candlestickchartitem_p.h @@ -49,7 +49,7 @@ class CandlestickAnimation; class QCandlestickSeries; class QCandlestickSet; -class QT_CHARTS_PRIVATE_EXPORT CandlestickChartItem : public ChartItem +class Q_CHARTS_PRIVATE_EXPORT CandlestickChartItem : public ChartItem { Q_OBJECT diff --git a/src/charts/candlestickchart/candlestickdata_p.h b/src/charts/candlestickchart/candlestickdata_p.h index 233d200b..258a0add 100644 --- a/src/charts/candlestickchart/candlestickdata_p.h +++ b/src/charts/candlestickchart/candlestickdata_p.h @@ -44,7 +44,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT CandlestickData +class Q_CHARTS_PRIVATE_EXPORT CandlestickData { public: CandlestickData() : diff --git a/src/charts/candlestickchart/qcandlestickmodelmapper.h b/src/charts/candlestickchart/qcandlestickmodelmapper.h index 1103da85..70bd21d1 100644 --- a/src/charts/candlestickchart/qcandlestickmodelmapper.h +++ b/src/charts/candlestickchart/qcandlestickmodelmapper.h @@ -42,7 +42,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QCandlestickModelMapperPrivate; class QCandlestickSeries; -class QT_CHARTS_EXPORT QCandlestickModelMapper : public QObject +class Q_CHARTS_EXPORT QCandlestickModelMapper : public QObject { Q_OBJECT Q_PROPERTY(QAbstractItemModel *model READ model WRITE setModel NOTIFY modelReplaced) diff --git a/src/charts/candlestickchart/qcandlestickmodelmapper_p.h b/src/charts/candlestickchart/qcandlestickmodelmapper_p.h index 7c14c9e8..89977f44 100644 --- a/src/charts/candlestickchart/qcandlestickmodelmapper_p.h +++ b/src/charts/candlestickchart/qcandlestickmodelmapper_p.h @@ -51,7 +51,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QCandlestickSet; -class QT_CHARTS_PRIVATE_EXPORT QCandlestickModelMapperPrivate : public QObject +class Q_CHARTS_PRIVATE_EXPORT QCandlestickModelMapperPrivate : public QObject { Q_OBJECT diff --git a/src/charts/candlestickchart/qcandlestickseries.h b/src/charts/candlestickchart/qcandlestickseries.h index f96e809a..9a223c12 100644 --- a/src/charts/candlestickchart/qcandlestickseries.h +++ b/src/charts/candlestickchart/qcandlestickseries.h @@ -37,7 +37,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QCandlestickSeriesPrivate; class QCandlestickSet; -class QT_CHARTS_EXPORT QCandlestickSeries : public QAbstractSeries +class Q_CHARTS_EXPORT QCandlestickSeries : public QAbstractSeries { Q_OBJECT Q_PROPERTY(int count READ count NOTIFY countChanged) diff --git a/src/charts/candlestickchart/qcandlestickseries_p.h b/src/charts/candlestickchart/qcandlestickseries_p.h index e747f8c3..56a2b6d4 100644 --- a/src/charts/candlestickchart/qcandlestickseries_p.h +++ b/src/charts/candlestickchart/qcandlestickseries_p.h @@ -50,7 +50,7 @@ class QCandlestickSeries; class QCandlestickSet; class QDateTimeAxis; -class QT_CHARTS_PRIVATE_EXPORT QCandlestickSeriesPrivate : public QAbstractSeriesPrivate +class Q_CHARTS_PRIVATE_EXPORT QCandlestickSeriesPrivate : public QAbstractSeriesPrivate { Q_OBJECT diff --git a/src/charts/candlestickchart/qcandlestickset.h b/src/charts/candlestickchart/qcandlestickset.h index ddbb6c16..891c642c 100644 --- a/src/charts/candlestickchart/qcandlestickset.h +++ b/src/charts/candlestickchart/qcandlestickset.h @@ -38,7 +38,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QCandlestickSetPrivate; -class QT_CHARTS_EXPORT QCandlestickSet : public QObject +class Q_CHARTS_EXPORT QCandlestickSet : public QObject { Q_OBJECT Q_PROPERTY(qreal timestamp READ timestamp WRITE setTimestamp NOTIFY timestampChanged) diff --git a/src/charts/candlestickchart/qcandlestickset_p.h b/src/charts/candlestickchart/qcandlestickset_p.h index 58cc41e5..22627840 100644 --- a/src/charts/candlestickchart/qcandlestickset_p.h +++ b/src/charts/candlestickchart/qcandlestickset_p.h @@ -49,7 +49,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QCandlestickSeriesPrivate; class QCandlestickSet; -class QT_CHARTS_PRIVATE_EXPORT QCandlestickSetPrivate : public QObject +class Q_CHARTS_PRIVATE_EXPORT QCandlestickSetPrivate : public QObject { Q_OBJECT diff --git a/src/charts/candlestickchart/qhcandlestickmodelmapper.h b/src/charts/candlestickchart/qhcandlestickmodelmapper.h index 8bfa8350..6ba86b8f 100644 --- a/src/charts/candlestickchart/qhcandlestickmodelmapper.h +++ b/src/charts/candlestickchart/qhcandlestickmodelmapper.h @@ -34,7 +34,7 @@ QT_CHARTS_BEGIN_NAMESPACE /* Comment line for syncqt to generate the fwd-include correctly, due to QTBUG-22432 */ -class QT_CHARTS_EXPORT QHCandlestickModelMapper : public QCandlestickModelMapper +class Q_CHARTS_EXPORT QHCandlestickModelMapper : public QCandlestickModelMapper { Q_OBJECT Q_PROPERTY(int timestampColumn READ timestampColumn WRITE setTimestampColumn NOTIFY timestampColumnChanged) diff --git a/src/charts/candlestickchart/qvcandlestickmodelmapper.h b/src/charts/candlestickchart/qvcandlestickmodelmapper.h index 3b00747d..0707859d 100644 --- a/src/charts/candlestickchart/qvcandlestickmodelmapper.h +++ b/src/charts/candlestickchart/qvcandlestickmodelmapper.h @@ -34,7 +34,7 @@ QT_CHARTS_BEGIN_NAMESPACE /* Comment line for syncqt to generate the fwd-include correctly, due to QTBUG-22432 */ -class QT_CHARTS_EXPORT QVCandlestickModelMapper : public QCandlestickModelMapper +class Q_CHARTS_EXPORT QVCandlestickModelMapper : public QCandlestickModelMapper { Q_OBJECT Q_PROPERTY(int timestampRow READ timestampRow WRITE setTimestampRow NOTIFY timestampRowChanged) diff --git a/src/charts/chartbackground_p.h b/src/charts/chartbackground_p.h index a89f6035..1a2bdfd8 100644 --- a/src/charts/chartbackground_p.h +++ b/src/charts/chartbackground_p.h @@ -49,7 +49,7 @@ QT_END_NAMESPACE QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT ChartBackground: public QGraphicsRectItem +class Q_CHARTS_PRIVATE_EXPORT ChartBackground: public QGraphicsRectItem { public: ChartBackground(QGraphicsItem *parent = 0); diff --git a/src/charts/chartconfig_p.h b/src/charts/chartconfig_p.h index 4ce09650..044a8ce0 100644 --- a/src/charts/chartconfig_p.h +++ b/src/charts/chartconfig_p.h @@ -44,7 +44,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT ChartConfig +class Q_CHARTS_PRIVATE_EXPORT ChartConfig { private: ChartConfig() { diff --git a/src/charts/chartdataset_p.h b/src/charts/chartdataset_p.h index 00b4b2bb..cafd6f88 100644 --- a/src/charts/chartdataset_p.h +++ b/src/charts/chartdataset_p.h @@ -51,7 +51,7 @@ class QAbstractAxis; class ChartPresenter; class GLXYSeriesDataManager; -class QT_CHARTS_PRIVATE_EXPORT ChartDataSet : public QObject +class Q_CHARTS_PRIVATE_EXPORT ChartDataSet : public QObject { Q_OBJECT public: diff --git a/src/charts/chartelement_p.h b/src/charts/chartelement_p.h index f29d6e2c..266b128f 100644 --- a/src/charts/chartelement_p.h +++ b/src/charts/chartelement_p.h @@ -54,7 +54,7 @@ class ChartThemeManager; class AbstractDomain; class ChartDataSet; -class QT_CHARTS_PRIVATE_EXPORT ChartElement: public QGraphicsObject +class Q_CHARTS_PRIVATE_EXPORT ChartElement: public QGraphicsObject { public: diff --git a/src/charts/chartitem_p.h b/src/charts/chartitem_p.h index 560764b7..248cb29c 100644 --- a/src/charts/chartitem_p.h +++ b/src/charts/chartitem_p.h @@ -46,7 +46,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT ChartItem : public ChartElement +class Q_CHARTS_PRIVATE_EXPORT ChartItem : public ChartElement { Q_OBJECT enum ChartItemTypes { AXIS_ITEM = UserType + 1, XYLINE_ITEM }; diff --git a/src/charts/chartpresenter_p.h b/src/charts/chartpresenter_p.h index 122c3c4a..6b44a502 100644 --- a/src/charts/chartpresenter_p.h +++ b/src/charts/chartpresenter_p.h @@ -63,7 +63,7 @@ class ChartTitle; class ChartAnimation; class AbstractChartLayout; -class QT_CHARTS_PRIVATE_EXPORT ChartPresenter: public QObject +class Q_CHARTS_PRIVATE_EXPORT ChartPresenter: public QObject { Q_OBJECT public: diff --git a/src/charts/chartthememanager_p.h b/src/charts/chartthememanager_p.h index 63a70663..c5e137ec 100644 --- a/src/charts/chartthememanager_p.h +++ b/src/charts/chartthememanager_p.h @@ -48,7 +48,7 @@ QT_CHARTS_BEGIN_NAMESPACE class ChartTheme; -class QT_CHARTS_PRIVATE_EXPORT ChartThemeManager: public QObject +class Q_CHARTS_PRIVATE_EXPORT ChartThemeManager: public QObject { Q_OBJECT public: diff --git a/src/charts/charttitle_p.h b/src/charts/charttitle_p.h index aaed6e9c..4fe96d1c 100644 --- a/src/charts/charttitle_p.h +++ b/src/charts/charttitle_p.h @@ -45,7 +45,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT ChartTitle : public QGraphicsTextItem +class Q_CHARTS_PRIVATE_EXPORT ChartTitle : public QGraphicsTextItem { public: ChartTitle(QGraphicsItem *parent = 0); diff --git a/src/charts/doc/qtcharts.qdocconf b/src/charts/doc/qtcharts.qdocconf index ff1b8819..0a624348 100644 --- a/src/charts/doc/qtcharts.qdocconf +++ b/src/charts/doc/qtcharts.qdocconf @@ -19,7 +19,7 @@ sources.fileextensions = "*.cpp *.qdoc" depends = qtcore qtgui qtwidgets qtqml qtquick qtmultimedia qtdoc -Cpp.ignoretokens += QT_CHARTS_EXPORT \ +Cpp.ignoretokens += Q_CHARTS_EXPORT \ QT_CHARTS_END_NAMESPACE \ QT_CHARTS_BEGIN_NAMESPACE diff --git a/src/charts/domain/abstractdomain_p.h b/src/charts/domain/abstractdomain_p.h index 9a5c8022..6b12f624 100644 --- a/src/charts/domain/abstractdomain_p.h +++ b/src/charts/domain/abstractdomain_p.h @@ -48,7 +48,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QAbstractAxis; -class QT_CHARTS_PRIVATE_EXPORT AbstractDomain: public QObject +class Q_CHARTS_PRIVATE_EXPORT AbstractDomain: public QObject { Q_OBJECT public: diff --git a/src/charts/domain/logxlogydomain_p.h b/src/charts/domain/logxlogydomain_p.h index e30dd8d4..c16ac01f 100644 --- a/src/charts/domain/logxlogydomain_p.h +++ b/src/charts/domain/logxlogydomain_p.h @@ -45,7 +45,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT LogXLogYDomain: public AbstractDomain +class Q_CHARTS_PRIVATE_EXPORT LogXLogYDomain: public AbstractDomain { Q_OBJECT public: diff --git a/src/charts/domain/logxlogypolardomain_p.h b/src/charts/domain/logxlogypolardomain_p.h index f25e6e03..4ed090e9 100644 --- a/src/charts/domain/logxlogypolardomain_p.h +++ b/src/charts/domain/logxlogypolardomain_p.h @@ -45,7 +45,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT LogXLogYPolarDomain: public PolarDomain +class Q_CHARTS_PRIVATE_EXPORT LogXLogYPolarDomain: public PolarDomain { Q_OBJECT public: diff --git a/src/charts/domain/logxydomain_p.h b/src/charts/domain/logxydomain_p.h index 858a6d2e..9c85c7d7 100644 --- a/src/charts/domain/logxydomain_p.h +++ b/src/charts/domain/logxydomain_p.h @@ -45,7 +45,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT LogXYDomain: public AbstractDomain +class Q_CHARTS_PRIVATE_EXPORT LogXYDomain: public AbstractDomain { Q_OBJECT public: diff --git a/src/charts/domain/logxypolardomain_p.h b/src/charts/domain/logxypolardomain_p.h index 6057be1c..2697dc2c 100644 --- a/src/charts/domain/logxypolardomain_p.h +++ b/src/charts/domain/logxypolardomain_p.h @@ -45,7 +45,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT LogXYPolarDomain: public PolarDomain +class Q_CHARTS_PRIVATE_EXPORT LogXYPolarDomain: public PolarDomain { Q_OBJECT public: diff --git a/src/charts/domain/polardomain_p.h b/src/charts/domain/polardomain_p.h index 14dc4236..7631bd9e 100644 --- a/src/charts/domain/polardomain_p.h +++ b/src/charts/domain/polardomain_p.h @@ -45,7 +45,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT PolarDomain: public AbstractDomain +class Q_CHARTS_PRIVATE_EXPORT PolarDomain: public AbstractDomain { Q_OBJECT public: diff --git a/src/charts/domain/xlogydomain_p.h b/src/charts/domain/xlogydomain_p.h index f564f950..ddf174a7 100644 --- a/src/charts/domain/xlogydomain_p.h +++ b/src/charts/domain/xlogydomain_p.h @@ -45,7 +45,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT XLogYDomain: public AbstractDomain +class Q_CHARTS_PRIVATE_EXPORT XLogYDomain: public AbstractDomain { Q_OBJECT public: diff --git a/src/charts/domain/xlogypolardomain_p.h b/src/charts/domain/xlogypolardomain_p.h index e11d691e..4870cc67 100644 --- a/src/charts/domain/xlogypolardomain_p.h +++ b/src/charts/domain/xlogypolardomain_p.h @@ -45,7 +45,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT XLogYPolarDomain: public PolarDomain +class Q_CHARTS_PRIVATE_EXPORT XLogYPolarDomain: public PolarDomain { Q_OBJECT public: diff --git a/src/charts/domain/xydomain_p.h b/src/charts/domain/xydomain_p.h index 97c89989..5a586a32 100644 --- a/src/charts/domain/xydomain_p.h +++ b/src/charts/domain/xydomain_p.h @@ -45,7 +45,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT XYDomain: public AbstractDomain +class Q_CHARTS_PRIVATE_EXPORT XYDomain: public AbstractDomain { Q_OBJECT public: diff --git a/src/charts/domain/xypolardomain_p.h b/src/charts/domain/xypolardomain_p.h index 9d027661..5dc6de9e 100644 --- a/src/charts/domain/xypolardomain_p.h +++ b/src/charts/domain/xypolardomain_p.h @@ -44,7 +44,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT XYPolarDomain: public PolarDomain +class Q_CHARTS_PRIVATE_EXPORT XYPolarDomain: public PolarDomain { Q_OBJECT public: diff --git a/src/charts/layout/abstractchartlayout_p.h b/src/charts/layout/abstractchartlayout_p.h index 32d627a8..f120ea91 100644 --- a/src/charts/layout/abstractchartlayout_p.h +++ b/src/charts/layout/abstractchartlayout_p.h @@ -52,7 +52,7 @@ class ChartPresenter; class QLegend; class ChartBackground; -class QT_CHARTS_PRIVATE_EXPORT AbstractChartLayout : public QGraphicsLayout +class Q_CHARTS_PRIVATE_EXPORT AbstractChartLayout : public QGraphicsLayout { public: AbstractChartLayout(ChartPresenter *presenter); diff --git a/src/charts/layout/cartesianchartlayout_p.h b/src/charts/layout/cartesianchartlayout_p.h index 81c47598..b61d3a78 100644 --- a/src/charts/layout/cartesianchartlayout_p.h +++ b/src/charts/layout/cartesianchartlayout_p.h @@ -44,7 +44,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT CartesianChartLayout : public AbstractChartLayout +class Q_CHARTS_PRIVATE_EXPORT CartesianChartLayout : public AbstractChartLayout { public: CartesianChartLayout(ChartPresenter *presenter); diff --git a/src/charts/layout/polarchartlayout_p.h b/src/charts/layout/polarchartlayout_p.h index 18c1be34..a2f3ef80 100644 --- a/src/charts/layout/polarchartlayout_p.h +++ b/src/charts/layout/polarchartlayout_p.h @@ -44,7 +44,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT PolarChartLayout : public AbstractChartLayout +class Q_CHARTS_PRIVATE_EXPORT PolarChartLayout : public AbstractChartLayout { public: PolarChartLayout(ChartPresenter *presenter); diff --git a/src/charts/legend/legendlayout_p.h b/src/charts/legend/legendlayout_p.h index 7933c245..13593b16 100644 --- a/src/charts/legend/legendlayout_p.h +++ b/src/charts/legend/legendlayout_p.h @@ -47,7 +47,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QLegend; class LegendMarkerItem; -class QT_CHARTS_PRIVATE_EXPORT LegendLayout : public QGraphicsLayout +class Q_CHARTS_PRIVATE_EXPORT LegendLayout : public QGraphicsLayout { public: diff --git a/src/charts/legend/legendmarkeritem_p.h b/src/charts/legend/legendmarkeritem_p.h index d3d71de3..708c2709 100644 --- a/src/charts/legend/legendmarkeritem_p.h +++ b/src/charts/legend/legendmarkeritem_p.h @@ -53,7 +53,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QLegendMarkerPrivate; -class QT_CHARTS_PRIVATE_EXPORT LegendMarkerItem : public QGraphicsObject, public QGraphicsLayoutItem +class Q_CHARTS_PRIVATE_EXPORT LegendMarkerItem : public QGraphicsObject, public QGraphicsLayoutItem { Q_OBJECT Q_INTERFACES(QGraphicsLayoutItem) diff --git a/src/charts/legend/legendscroller_p.h b/src/charts/legend/legendscroller_p.h index fc57a9d3..919a27b8 100644 --- a/src/charts/legend/legendscroller_p.h +++ b/src/charts/legend/legendscroller_p.h @@ -47,7 +47,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT LegendScroller: public QLegend, public Scroller +class Q_CHARTS_PRIVATE_EXPORT LegendScroller: public QLegend, public Scroller { Q_OBJECT diff --git a/src/charts/legend/qarealegendmarker.h b/src/charts/legend/qarealegendmarker.h index 3d88fa08..13b774c7 100644 --- a/src/charts/legend/qarealegendmarker.h +++ b/src/charts/legend/qarealegendmarker.h @@ -38,7 +38,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QAreaLegendMarkerPrivate; -class QT_CHARTS_EXPORT QAreaLegendMarker : public QLegendMarker +class Q_CHARTS_EXPORT QAreaLegendMarker : public QLegendMarker { Q_OBJECT diff --git a/src/charts/legend/qarealegendmarker_p.h b/src/charts/legend/qarealegendmarker_p.h index f44f8e74..9bea4708 100644 --- a/src/charts/legend/qarealegendmarker_p.h +++ b/src/charts/legend/qarealegendmarker_p.h @@ -49,7 +49,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QAreaLegendMarker; -class QT_CHARTS_PRIVATE_EXPORT QAreaLegendMarkerPrivate : public QLegendMarkerPrivate +class Q_CHARTS_PRIVATE_EXPORT QAreaLegendMarkerPrivate : public QLegendMarkerPrivate { Q_OBJECT public: diff --git a/src/charts/legend/qbarlegendmarker.h b/src/charts/legend/qbarlegendmarker.h index e1b3dcda..43f1b2d1 100644 --- a/src/charts/legend/qbarlegendmarker.h +++ b/src/charts/legend/qbarlegendmarker.h @@ -39,7 +39,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QLegend; class QBarLegendMarkerPrivate; -class QT_CHARTS_EXPORT QBarLegendMarker : public QLegendMarker +class Q_CHARTS_EXPORT QBarLegendMarker : public QLegendMarker { Q_OBJECT public: diff --git a/src/charts/legend/qbarlegendmarker_p.h b/src/charts/legend/qbarlegendmarker_p.h index 7bfabd69..5618405e 100644 --- a/src/charts/legend/qbarlegendmarker_p.h +++ b/src/charts/legend/qbarlegendmarker_p.h @@ -50,7 +50,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QBarLegendMarker; -class QT_CHARTS_PRIVATE_EXPORT QBarLegendMarkerPrivate : public QLegendMarkerPrivate +class Q_CHARTS_PRIVATE_EXPORT QBarLegendMarkerPrivate : public QLegendMarkerPrivate { Q_OBJECT public: diff --git a/src/charts/legend/qboxplotlegendmarker.h b/src/charts/legend/qboxplotlegendmarker.h index db6e9edd..826c074a 100644 --- a/src/charts/legend/qboxplotlegendmarker.h +++ b/src/charts/legend/qboxplotlegendmarker.h @@ -38,7 +38,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QBoxPlotLegendMarkerPrivate; -class QT_CHARTS_EXPORT QBoxPlotLegendMarker : public QLegendMarker +class Q_CHARTS_EXPORT QBoxPlotLegendMarker : public QLegendMarker { Q_OBJECT diff --git a/src/charts/legend/qboxplotlegendmarker_p.h b/src/charts/legend/qboxplotlegendmarker_p.h index 5d82965f..baf8fadc 100644 --- a/src/charts/legend/qboxplotlegendmarker_p.h +++ b/src/charts/legend/qboxplotlegendmarker_p.h @@ -49,7 +49,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QBoxPlotLegendMarker; -class QT_CHARTS_PRIVATE_EXPORT QBoxPlotLegendMarkerPrivate : public QLegendMarkerPrivate +class Q_CHARTS_PRIVATE_EXPORT QBoxPlotLegendMarkerPrivate : public QLegendMarkerPrivate { Q_OBJECT public: diff --git a/src/charts/legend/qcandlesticklegendmarker.h b/src/charts/legend/qcandlesticklegendmarker.h index dad57c4f..f3153d06 100644 --- a/src/charts/legend/qcandlesticklegendmarker.h +++ b/src/charts/legend/qcandlesticklegendmarker.h @@ -37,7 +37,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QCandlestickLegendMarkerPrivate; -class QT_CHARTS_EXPORT QCandlestickLegendMarker : public QLegendMarker +class Q_CHARTS_EXPORT QCandlestickLegendMarker : public QLegendMarker { Q_OBJECT diff --git a/src/charts/legend/qcandlesticklegendmarker_p.h b/src/charts/legend/qcandlesticklegendmarker_p.h index b92ea626..8d605ff2 100644 --- a/src/charts/legend/qcandlesticklegendmarker_p.h +++ b/src/charts/legend/qcandlesticklegendmarker_p.h @@ -47,7 +47,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QCandlestickLegendMarker; class QCandlestickSeries; -class QT_CHARTS_PRIVATE_EXPORT QCandlestickLegendMarkerPrivate : public QLegendMarkerPrivate +class Q_CHARTS_PRIVATE_EXPORT QCandlestickLegendMarkerPrivate : public QLegendMarkerPrivate { Q_OBJECT public: diff --git a/src/charts/legend/qlegend.h b/src/charts/legend/qlegend.h index 7b5b3a2e..fe5641de 100644 --- a/src/charts/legend/qlegend.h +++ b/src/charts/legend/qlegend.h @@ -42,7 +42,7 @@ class QLegendPrivate; class QLegendMarker; class QAbstractSeries; -class QT_CHARTS_EXPORT QLegend : public QGraphicsWidget +class Q_CHARTS_EXPORT QLegend : public QGraphicsWidget { Q_OBJECT Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment) diff --git a/src/charts/legend/qlegend_p.h b/src/charts/legend/qlegend_p.h index 3ffff23d..138ebddb 100644 --- a/src/charts/legend/qlegend_p.h +++ b/src/charts/legend/qlegend_p.h @@ -50,7 +50,7 @@ class QAbstractSeries; class LegendLayout; class QLegendMarker; -class QT_CHARTS_PRIVATE_EXPORT QLegendPrivate : public QObject +class Q_CHARTS_PRIVATE_EXPORT QLegendPrivate : public QObject { Q_OBJECT public: diff --git a/src/charts/legend/qlegendmarker.h b/src/charts/legend/qlegendmarker.h index a3db411f..7b08d6a9 100644 --- a/src/charts/legend/qlegendmarker.h +++ b/src/charts/legend/qlegendmarker.h @@ -43,7 +43,7 @@ class QLegendMarkerPrivate; class QAbstractSeries; class QLegend; -class QT_CHARTS_EXPORT QLegendMarker : public QObject +class Q_CHARTS_EXPORT QLegendMarker : public QObject { Q_OBJECT diff --git a/src/charts/legend/qlegendmarker_p.h b/src/charts/legend/qlegendmarker_p.h index cd2ebea3..ccec65a5 100644 --- a/src/charts/legend/qlegendmarker_p.h +++ b/src/charts/legend/qlegendmarker_p.h @@ -54,7 +54,7 @@ class QLegend; class QLegendMarker; class LegendMarkerItem; -class QT_CHARTS_PRIVATE_EXPORT QLegendMarkerPrivate : public QObject +class Q_CHARTS_PRIVATE_EXPORT QLegendMarkerPrivate : public QObject { Q_OBJECT public: diff --git a/src/charts/legend/qpielegendmarker.h b/src/charts/legend/qpielegendmarker.h index a4a0463d..a0c65597 100644 --- a/src/charts/legend/qpielegendmarker.h +++ b/src/charts/legend/qpielegendmarker.h @@ -39,7 +39,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QPieLegendMarkerPrivate; -class QT_CHARTS_EXPORT QPieLegendMarker : public QLegendMarker +class Q_CHARTS_EXPORT QPieLegendMarker : public QLegendMarker { Q_OBJECT diff --git a/src/charts/legend/qpielegendmarker_p.h b/src/charts/legend/qpielegendmarker_p.h index 72bdd7ec..0649ef30 100644 --- a/src/charts/legend/qpielegendmarker_p.h +++ b/src/charts/legend/qpielegendmarker_p.h @@ -50,7 +50,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QPieLegendMarker; -class QT_CHARTS_PRIVATE_EXPORT QPieLegendMarkerPrivate : public QLegendMarkerPrivate +class Q_CHARTS_PRIVATE_EXPORT QPieLegendMarkerPrivate : public QLegendMarkerPrivate { Q_OBJECT public: diff --git a/src/charts/legend/qxylegendmarker.h b/src/charts/legend/qxylegendmarker.h index 0a714428..25634495 100644 --- a/src/charts/legend/qxylegendmarker.h +++ b/src/charts/legend/qxylegendmarker.h @@ -38,7 +38,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QXYLegendMarkerPrivate; -class QT_CHARTS_EXPORT QXYLegendMarker : public QLegendMarker +class Q_CHARTS_EXPORT QXYLegendMarker : public QLegendMarker { Q_OBJECT public: diff --git a/src/charts/legend/qxylegendmarker_p.h b/src/charts/legend/qxylegendmarker_p.h index 995a3226..548990fe 100644 --- a/src/charts/legend/qxylegendmarker_p.h +++ b/src/charts/legend/qxylegendmarker_p.h @@ -49,7 +49,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QXYLegendMarker; -class QT_CHARTS_PRIVATE_EXPORT QXYLegendMarkerPrivate : public QLegendMarkerPrivate +class Q_CHARTS_PRIVATE_EXPORT QXYLegendMarkerPrivate : public QLegendMarkerPrivate { Q_OBJECT public: diff --git a/src/charts/linechart/linechartitem_p.h b/src/charts/linechart/linechartitem_p.h index fd335168..ec10c066 100644 --- a/src/charts/linechart/linechartitem_p.h +++ b/src/charts/linechart/linechartitem_p.h @@ -50,7 +50,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QLineSeries; class ChartPresenter; -class QT_CHARTS_PRIVATE_EXPORT LineChartItem : public XYChart +class Q_CHARTS_PRIVATE_EXPORT LineChartItem : public XYChart { Q_OBJECT Q_INTERFACES(QGraphicsItem) diff --git a/src/charts/linechart/qlineseries.h b/src/charts/linechart/qlineseries.h index 654afac2..145f9d46 100644 --- a/src/charts/linechart/qlineseries.h +++ b/src/charts/linechart/qlineseries.h @@ -38,7 +38,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QLineSeriesPrivate; -class QT_CHARTS_EXPORT QLineSeries : public QXYSeries +class Q_CHARTS_EXPORT QLineSeries : public QXYSeries { Q_OBJECT diff --git a/src/charts/linechart/qlineseries_p.h b/src/charts/linechart/qlineseries_p.h index a59d39c7..26ee1324 100644 --- a/src/charts/linechart/qlineseries_p.h +++ b/src/charts/linechart/qlineseries_p.h @@ -45,7 +45,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT QLineSeriesPrivate: public QXYSeriesPrivate +class Q_CHARTS_PRIVATE_EXPORT QLineSeriesPrivate: public QXYSeriesPrivate { public: QLineSeriesPrivate(QLineSeries *q); diff --git a/src/charts/piechart/piechartitem_p.h b/src/charts/piechart/piechartitem_p.h index 53276313..55a3c583 100644 --- a/src/charts/piechart/piechartitem_p.h +++ b/src/charts/piechart/piechartitem_p.h @@ -54,7 +54,7 @@ class QPieSlice; class ChartPresenter; class PieAnimation; -class QT_CHARTS_PRIVATE_EXPORT PieChartItem : public ChartItem +class Q_CHARTS_PRIVATE_EXPORT PieChartItem : public ChartItem { Q_OBJECT diff --git a/src/charts/piechart/piesliceitem_p.h b/src/charts/piechart/piesliceitem_p.h index 832ae431..3756a1f6 100644 --- a/src/charts/piechart/piesliceitem_p.h +++ b/src/charts/piechart/piesliceitem_p.h @@ -56,7 +56,7 @@ class PieChartItem; class PieSliceLabel; class QPieSlice; -class QT_CHARTS_PRIVATE_EXPORT PieSliceItem : public QGraphicsObject +class Q_CHARTS_PRIVATE_EXPORT PieSliceItem : public QGraphicsObject { Q_OBJECT diff --git a/src/charts/piechart/qhpiemodelmapper.h b/src/charts/piechart/qhpiemodelmapper.h index aa25b9e6..96b3cf39 100644 --- a/src/charts/piechart/qhpiemodelmapper.h +++ b/src/charts/piechart/qhpiemodelmapper.h @@ -34,7 +34,7 @@ QT_CHARTS_BEGIN_NAMESPACE /* Comment line for syncqt to generate the fwd-include correctly, due to QTBUG-22432 */ -class QT_CHARTS_EXPORT QHPieModelMapper : public QPieModelMapper +class Q_CHARTS_EXPORT QHPieModelMapper : public QPieModelMapper { Q_OBJECT Q_PROPERTY(QtCharts::QPieSeries *series READ series WRITE setSeries NOTIFY seriesReplaced) diff --git a/src/charts/piechart/qpiemodelmapper.h b/src/charts/piechart/qpiemodelmapper.h index a9b07cf4..db1af9dd 100644 --- a/src/charts/piechart/qpiemodelmapper.h +++ b/src/charts/piechart/qpiemodelmapper.h @@ -42,7 +42,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QPieModelMapperPrivate; class QPieSeries; -class QT_CHARTS_EXPORT QPieModelMapper : public QObject +class Q_CHARTS_EXPORT QPieModelMapper : public QObject { Q_OBJECT diff --git a/src/charts/piechart/qpiemodelmapper_p.h b/src/charts/piechart/qpiemodelmapper_p.h index a590f4b6..892938ea 100644 --- a/src/charts/piechart/qpiemodelmapper_p.h +++ b/src/charts/piechart/qpiemodelmapper_p.h @@ -51,7 +51,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QPieSlice; -class QT_CHARTS_PRIVATE_EXPORT QPieModelMapperPrivate : public QObject +class Q_CHARTS_PRIVATE_EXPORT QPieModelMapperPrivate : public QObject { Q_OBJECT diff --git a/src/charts/piechart/qpieseries.h b/src/charts/piechart/qpieseries.h index 34d3b6c9..e04c93b6 100644 --- a/src/charts/piechart/qpieseries.h +++ b/src/charts/piechart/qpieseries.h @@ -36,7 +36,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QPieSeriesPrivate; -class QT_CHARTS_EXPORT QPieSeries : public QAbstractSeries +class Q_CHARTS_EXPORT QPieSeries : public QAbstractSeries { Q_OBJECT Q_PROPERTY(qreal horizontalPosition READ horizontalPosition WRITE setHorizontalPosition) diff --git a/src/charts/piechart/qpieseries_p.h b/src/charts/piechart/qpieseries_p.h index 887d8531..d2b6dbcf 100644 --- a/src/charts/piechart/qpieseries_p.h +++ b/src/charts/piechart/qpieseries_p.h @@ -46,7 +46,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QLegendPrivate; -class QT_CHARTS_PRIVATE_EXPORT QPieSeriesPrivate : public QAbstractSeriesPrivate +class Q_CHARTS_PRIVATE_EXPORT QPieSeriesPrivate : public QAbstractSeriesPrivate { Q_OBJECT diff --git a/src/charts/piechart/qpieslice.h b/src/charts/piechart/qpieslice.h index d508e001..84e474d1 100644 --- a/src/charts/piechart/qpieslice.h +++ b/src/charts/piechart/qpieslice.h @@ -40,7 +40,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QPieSlicePrivate; class QPieSeries; -class QT_CHARTS_EXPORT QPieSlice : public QObject +class Q_CHARTS_EXPORT QPieSlice : public QObject { Q_OBJECT Q_ENUMS(LabelPosition) diff --git a/src/charts/piechart/qpieslice_p.h b/src/charts/piechart/qpieslice_p.h index bb64b3d2..9b7d8826 100644 --- a/src/charts/piechart/qpieslice_p.h +++ b/src/charts/piechart/qpieslice_p.h @@ -47,7 +47,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QPieSeries; -class QT_CHARTS_PRIVATE_EXPORT QPieSlicePrivate : public QObject +class Q_CHARTS_PRIVATE_EXPORT QPieSlicePrivate : public QObject { Q_OBJECT diff --git a/src/charts/piechart/qvpiemodelmapper.h b/src/charts/piechart/qvpiemodelmapper.h index 2a7a5b2b..37eded87 100644 --- a/src/charts/piechart/qvpiemodelmapper.h +++ b/src/charts/piechart/qvpiemodelmapper.h @@ -34,7 +34,7 @@ QT_CHARTS_BEGIN_NAMESPACE /* Comment line for syncqt to generate the fwd-include correctly, due to QTBUG-22432 */ -class QT_CHARTS_EXPORT QVPieModelMapper : public QPieModelMapper +class Q_CHARTS_EXPORT QVPieModelMapper : public QPieModelMapper { Q_OBJECT Q_PROPERTY(QtCharts::QPieSeries *series READ series WRITE setSeries NOTIFY seriesReplaced) diff --git a/src/charts/qabstractseries.h b/src/charts/qabstractseries.h index 39368667..ce1511d8 100644 --- a/src/charts/qabstractseries.h +++ b/src/charts/qabstractseries.h @@ -40,7 +40,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QAbstractSeriesPrivate; class QChart; -class QT_CHARTS_EXPORT QAbstractSeries : public QObject +class Q_CHARTS_EXPORT QAbstractSeries : public QObject { Q_OBJECT Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) diff --git a/src/charts/qabstractseries_p.h b/src/charts/qabstractseries_p.h index 1941b92f..3bd8649d 100644 --- a/src/charts/qabstractseries_p.h +++ b/src/charts/qabstractseries_p.h @@ -62,7 +62,7 @@ class ChartAnimation; class ChartItem; class BoxPlotChartItem; -class QT_CHARTS_PRIVATE_EXPORT QAbstractSeriesPrivate : public QObject +class Q_CHARTS_PRIVATE_EXPORT QAbstractSeriesPrivate : public QObject { Q_OBJECT public: diff --git a/src/charts/qchart.h b/src/charts/qchart.h index 9ac70e45..e287500d 100644 --- a/src/charts/qchart.h +++ b/src/charts/qchart.h @@ -47,7 +47,7 @@ class QLegend; class QChartPrivate; class QBoxPlotSeries; -class QT_CHARTS_EXPORT QChart : public QGraphicsWidget +class Q_CHARTS_EXPORT QChart : public QGraphicsWidget { Q_OBJECT Q_PROPERTY(QChart::ChartTheme theme READ theme WRITE setTheme) diff --git a/src/charts/qchart_p.h b/src/charts/qchart_p.h index 7ed518b8..168a6fd9 100644 --- a/src/charts/qchart_p.h +++ b/src/charts/qchart_p.h @@ -50,7 +50,7 @@ class ChartPresenter; class QLegend; class ChartDataSet; -class QT_CHARTS_PRIVATE_EXPORT QChartPrivate +class Q_CHARTS_PRIVATE_EXPORT QChartPrivate { public: diff --git a/src/charts/qchartglobal.h b/src/charts/qchartglobal.h index 96160021..759293d0 100644 --- a/src/charts/qchartglobal.h +++ b/src/charts/qchartglobal.h @@ -44,15 +44,15 @@ #ifndef QT_STATIC # if defined(QT_BUILD_CHARTS_LIB) -# define QT_CHARTS_EXPORT Q_DECL_EXPORT +# define Q_CHARTS_EXPORT Q_DECL_EXPORT # else -# define QT_CHARTS_EXPORT Q_DECL_IMPORT +# define Q_CHARTS_EXPORT Q_DECL_IMPORT # endif #else -# define QT_CHARTS_EXPORT +# define Q_CHARTS_EXPORT #endif -#define QT_CHARTS_AUTOTEST_EXPORT Q_AUTOTEST_EXPORT +#define Q_CHARTS_AUTOTEST_EXPORT Q_AUTOTEST_EXPORT #ifndef Q_CLANG_QDOC #define QT_CHARTS_NAMESPACE QtCharts diff --git a/src/charts/qchartglobal_p.h b/src/charts/qchartglobal_p.h index 59bf62f8..24e4922b 100644 --- a/src/charts/qchartglobal_p.h +++ b/src/charts/qchartglobal_p.h @@ -43,6 +43,6 @@ #include "qchartglobal.h" -#define QT_CHARTS_PRIVATE_EXPORT QT_CHARTS_EXPORT +#define Q_CHARTS_PRIVATE_EXPORT Q_CHARTS_EXPORT #endif // QCHARTGLOBAL_P_H diff --git a/src/charts/qchartview.h b/src/charts/qchartview.h index 1cf719b3..f8056487 100644 --- a/src/charts/qchartview.h +++ b/src/charts/qchartview.h @@ -44,7 +44,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QChartViewPrivate; -class QT_CHARTS_EXPORT QChartView : public QGraphicsView +class Q_CHARTS_EXPORT QChartView : public QGraphicsView { Q_OBJECT Q_ENUMS(RubberBand) diff --git a/src/charts/qchartview_p.h b/src/charts/qchartview_p.h index 01c66908..5fb4ca2b 100644 --- a/src/charts/qchartview_p.h +++ b/src/charts/qchartview_p.h @@ -52,7 +52,7 @@ class QChart; class ChartPresenter; class QChartView; -class QT_CHARTS_PRIVATE_EXPORT QChartViewPrivate +class Q_CHARTS_PRIVATE_EXPORT QChartViewPrivate { public: explicit QChartViewPrivate(QChartView *q, QChart *chart = 0); diff --git a/src/charts/qpolarchart.h b/src/charts/qpolarchart.h index 8d3fa287..41bb4f78 100644 --- a/src/charts/qpolarchart.h +++ b/src/charts/qpolarchart.h @@ -37,7 +37,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QAbstractSeries; class QAbstractAxis; -class QT_CHARTS_EXPORT QPolarChart : public QChart +class Q_CHARTS_EXPORT QPolarChart : public QChart { Q_OBJECT Q_ENUMS(PolarOrientation) diff --git a/src/charts/scatterchart/qscatterseries.h b/src/charts/scatterchart/qscatterseries.h index ac3e5989..d79a2bd1 100644 --- a/src/charts/scatterchart/qscatterseries.h +++ b/src/charts/scatterchart/qscatterseries.h @@ -37,7 +37,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QScatterSeriesPrivate; -class QT_CHARTS_EXPORT QScatterSeries : public QXYSeries +class Q_CHARTS_EXPORT QScatterSeries : public QXYSeries { Q_OBJECT Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged) diff --git a/src/charts/scatterchart/qscatterseries_p.h b/src/charts/scatterchart/qscatterseries_p.h index 7d9c723f..f6253b36 100644 --- a/src/charts/scatterchart/qscatterseries_p.h +++ b/src/charts/scatterchart/qscatterseries_p.h @@ -44,7 +44,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT QScatterSeriesPrivate: public QXYSeriesPrivate +class Q_CHARTS_PRIVATE_EXPORT QScatterSeriesPrivate: public QXYSeriesPrivate { public: QScatterSeriesPrivate(QScatterSeries *q); diff --git a/src/charts/scatterchart/scatterchartitem_p.h b/src/charts/scatterchart/scatterchartitem_p.h index 5bf52af0..7188992f 100644 --- a/src/charts/scatterchart/scatterchartitem_p.h +++ b/src/charts/scatterchart/scatterchartitem_p.h @@ -50,7 +50,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QScatterSeries; -class QT_CHARTS_PRIVATE_EXPORT ScatterChartItem : public XYChart +class Q_CHARTS_PRIVATE_EXPORT ScatterChartItem : public XYChart { Q_OBJECT Q_INTERFACES(QGraphicsItem) @@ -103,7 +103,7 @@ private: bool m_mousePressed; }; -class QT_CHARTS_PRIVATE_EXPORT CircleMarker: public QGraphicsEllipseItem +class Q_CHARTS_PRIVATE_EXPORT CircleMarker: public QGraphicsEllipseItem { public: @@ -150,7 +150,7 @@ private: ScatterChartItem *m_parent; }; -class QT_CHARTS_PRIVATE_EXPORT RectangleMarker: public QGraphicsRectItem +class Q_CHARTS_PRIVATE_EXPORT RectangleMarker: public QGraphicsRectItem { public: diff --git a/src/charts/scroller_p.h b/src/charts/scroller_p.h index 3412a7ff..7cc7a4f6 100644 --- a/src/charts/scroller_p.h +++ b/src/charts/scroller_p.h @@ -55,7 +55,7 @@ QT_CHARTS_BEGIN_NAMESPACE class Scroller; class QLegend; -class QT_CHARTS_PRIVATE_EXPORT ScrollTicker : public QObject +class Q_CHARTS_PRIVATE_EXPORT ScrollTicker : public QObject { Q_OBJECT public: @@ -70,7 +70,7 @@ private: Scroller *m_scroller; }; -class QT_CHARTS_PRIVATE_EXPORT Scroller +class Q_CHARTS_PRIVATE_EXPORT Scroller { public: enum State { diff --git a/src/charts/splinechart/qsplineseries.h b/src/charts/splinechart/qsplineseries.h index 35ebcf31..6c05ad89 100644 --- a/src/charts/splinechart/qsplineseries.h +++ b/src/charts/splinechart/qsplineseries.h @@ -40,7 +40,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QSplineSeriesPrivate; -class QT_CHARTS_EXPORT QSplineSeries : public QLineSeries +class Q_CHARTS_EXPORT QSplineSeries : public QLineSeries { Q_OBJECT diff --git a/src/charts/splinechart/qsplineseries_p.h b/src/charts/splinechart/qsplineseries_p.h index dd3fc222..b7dba7d4 100644 --- a/src/charts/splinechart/qsplineseries_p.h +++ b/src/charts/splinechart/qsplineseries_p.h @@ -45,7 +45,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT QSplineSeriesPrivate: public QLineSeriesPrivate +class Q_CHARTS_PRIVATE_EXPORT QSplineSeriesPrivate: public QLineSeriesPrivate { Q_OBJECT public: diff --git a/src/charts/splinechart/splinechartitem_p.h b/src/charts/splinechart/splinechartitem_p.h index bc5f5661..66aae47a 100644 --- a/src/charts/splinechart/splinechartitem_p.h +++ b/src/charts/splinechart/splinechartitem_p.h @@ -47,7 +47,7 @@ QT_CHARTS_BEGIN_NAMESPACE class SplineAnimation; -class QT_CHARTS_PRIVATE_EXPORT SplineChartItem : public XYChart +class Q_CHARTS_PRIVATE_EXPORT SplineChartItem : public XYChart { Q_OBJECT Q_INTERFACES(QGraphicsItem) diff --git a/src/charts/themes/charttheme_p.h b/src/charts/themes/charttheme_p.h index bb128134..af56e0e1 100644 --- a/src/charts/themes/charttheme_p.h +++ b/src/charts/themes/charttheme_p.h @@ -46,7 +46,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT ChartTheme +class Q_CHARTS_PRIVATE_EXPORT ChartTheme { public: diff --git a/src/charts/themes/chartthemebluecerulean_p.h b/src/charts/themes/chartthemebluecerulean_p.h index 6bdcc10b..f683abcf 100644 --- a/src/charts/themes/chartthemebluecerulean_p.h +++ b/src/charts/themes/chartthemebluecerulean_p.h @@ -44,7 +44,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT ChartThemeBlueCerulean: public ChartTheme +class Q_CHARTS_PRIVATE_EXPORT ChartThemeBlueCerulean: public ChartTheme { public: ChartThemeBlueCerulean() : ChartTheme(QChart::ChartThemeBlueCerulean) { diff --git a/src/charts/themes/chartthemeblueicy_p.h b/src/charts/themes/chartthemeblueicy_p.h index 808c16e5..3066fb82 100644 --- a/src/charts/themes/chartthemeblueicy_p.h +++ b/src/charts/themes/chartthemeblueicy_p.h @@ -44,7 +44,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT ChartThemeBlueIcy: public ChartTheme +class Q_CHARTS_PRIVATE_EXPORT ChartThemeBlueIcy: public ChartTheme { public: ChartThemeBlueIcy() : ChartTheme(QChart::ChartThemeBlueIcy) diff --git a/src/charts/themes/chartthemebluencs_p.h b/src/charts/themes/chartthemebluencs_p.h index 94234224..22c9e2ba 100644 --- a/src/charts/themes/chartthemebluencs_p.h +++ b/src/charts/themes/chartthemebluencs_p.h @@ -44,7 +44,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT ChartThemeBlueNcs: public ChartTheme +class Q_CHARTS_PRIVATE_EXPORT ChartThemeBlueNcs: public ChartTheme { public: ChartThemeBlueNcs() : ChartTheme(QChart::ChartThemeBlueNcs) diff --git a/src/charts/themes/chartthemebrownsand_p.h b/src/charts/themes/chartthemebrownsand_p.h index 5e48fd80..3efc02f6 100644 --- a/src/charts/themes/chartthemebrownsand_p.h +++ b/src/charts/themes/chartthemebrownsand_p.h @@ -44,7 +44,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT ChartThemeBrownSand: public ChartTheme +class Q_CHARTS_PRIVATE_EXPORT ChartThemeBrownSand: public ChartTheme { public: ChartThemeBrownSand() : ChartTheme(QChart::ChartThemeBrownSand) diff --git a/src/charts/themes/chartthemedark_p.h b/src/charts/themes/chartthemedark_p.h index a8f9f477..ca49bd1c 100644 --- a/src/charts/themes/chartthemedark_p.h +++ b/src/charts/themes/chartthemedark_p.h @@ -44,7 +44,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT ChartThemeDark : public ChartTheme +class Q_CHARTS_PRIVATE_EXPORT ChartThemeDark : public ChartTheme { public: ChartThemeDark() : ChartTheme(QChart::ChartThemeDark) diff --git a/src/charts/themes/chartthemehighcontrast_p.h b/src/charts/themes/chartthemehighcontrast_p.h index b1cd8446..4a29cf19 100644 --- a/src/charts/themes/chartthemehighcontrast_p.h +++ b/src/charts/themes/chartthemehighcontrast_p.h @@ -44,7 +44,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT ChartThemeHighContrast : public ChartTheme +class Q_CHARTS_PRIVATE_EXPORT ChartThemeHighContrast : public ChartTheme { public: ChartThemeHighContrast() : ChartTheme(QChart::ChartThemeHighContrast) diff --git a/src/charts/themes/chartthemelight_p.h b/src/charts/themes/chartthemelight_p.h index e7ed47c0..64121335 100644 --- a/src/charts/themes/chartthemelight_p.h +++ b/src/charts/themes/chartthemelight_p.h @@ -44,7 +44,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT ChartThemeLight: public ChartTheme +class Q_CHARTS_PRIVATE_EXPORT ChartThemeLight: public ChartTheme { public: ChartThemeLight() : ChartTheme(QChart::ChartThemeLight) diff --git a/src/charts/themes/chartthemeqt_p.h b/src/charts/themes/chartthemeqt_p.h index af335a89..4a5c2fcf 100644 --- a/src/charts/themes/chartthemeqt_p.h +++ b/src/charts/themes/chartthemeqt_p.h @@ -44,7 +44,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT ChartThemeQt : public ChartTheme +class Q_CHARTS_PRIVATE_EXPORT ChartThemeQt : public ChartTheme { public: ChartThemeQt() : ChartTheme(QChart::ChartThemeQt) diff --git a/src/charts/themes/chartthemesystem_p.h b/src/charts/themes/chartthemesystem_p.h index a79ac201..f967815c 100644 --- a/src/charts/themes/chartthemesystem_p.h +++ b/src/charts/themes/chartthemesystem_p.h @@ -48,7 +48,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_CHARTS_PRIVATE_EXPORT ChartThemeSystem: public ChartTheme +class Q_CHARTS_PRIVATE_EXPORT ChartThemeSystem: public ChartTheme { public: // System theme not used at the moment (the user is not able to select this theme) diff --git a/src/charts/xychart/glxyseriesdata_p.h b/src/charts/xychart/glxyseriesdata_p.h index a5322d50..006a810c 100644 --- a/src/charts/xychart/glxyseriesdata_p.h +++ b/src/charts/xychart/glxyseriesdata_p.h @@ -79,7 +79,7 @@ public: typedef QMap<const QXYSeries *, GLXYSeriesData *> GLXYDataMap; typedef QMapIterator<const QXYSeries *, GLXYSeriesData *> GLXYDataMapIterator; -class QT_CHARTS_PRIVATE_EXPORT GLXYSeriesDataManager : public QObject +class Q_CHARTS_PRIVATE_EXPORT GLXYSeriesDataManager : public QObject { Q_OBJECT diff --git a/src/charts/xychart/qhxymodelmapper.h b/src/charts/xychart/qhxymodelmapper.h index 15d80dfd..76251602 100644 --- a/src/charts/xychart/qhxymodelmapper.h +++ b/src/charts/xychart/qhxymodelmapper.h @@ -34,7 +34,7 @@ QT_CHARTS_BEGIN_NAMESPACE /* Comment line for syncqt to generate the fwd-include correctly, due to QTBUG-22432 */ -class QT_CHARTS_EXPORT QHXYModelMapper : public QXYModelMapper +class Q_CHARTS_EXPORT QHXYModelMapper : public QXYModelMapper { Q_OBJECT Q_PROPERTY(QtCharts::QXYSeries *series READ series WRITE setSeries NOTIFY seriesReplaced) diff --git a/src/charts/xychart/qvxymodelmapper.h b/src/charts/xychart/qvxymodelmapper.h index 277cae00..867b0a02 100644 --- a/src/charts/xychart/qvxymodelmapper.h +++ b/src/charts/xychart/qvxymodelmapper.h @@ -34,7 +34,7 @@ QT_CHARTS_BEGIN_NAMESPACE /* Comment line for syncqt to generate the fwd-include correctly, due to QTBUG-22432 */ -class QT_CHARTS_EXPORT QVXYModelMapper : public QXYModelMapper +class Q_CHARTS_EXPORT QVXYModelMapper : public QXYModelMapper { Q_OBJECT Q_PROPERTY(QtCharts::QXYSeries *series READ series WRITE setSeries NOTIFY seriesReplaced) diff --git a/src/charts/xychart/qxymodelmapper.h b/src/charts/xychart/qxymodelmapper.h index c7d53284..7956aab8 100644 --- a/src/charts/xychart/qxymodelmapper.h +++ b/src/charts/xychart/qxymodelmapper.h @@ -42,7 +42,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QXYModelMapperPrivate; class QXYSeries; -class QT_CHARTS_EXPORT QXYModelMapper : public QObject +class Q_CHARTS_EXPORT QXYModelMapper : public QObject { Q_OBJECT diff --git a/src/charts/xychart/qxymodelmapper_p.h b/src/charts/xychart/qxymodelmapper_p.h index daa82342..86e557fe 100644 --- a/src/charts/xychart/qxymodelmapper_p.h +++ b/src/charts/xychart/qxymodelmapper_p.h @@ -54,7 +54,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QXYModelMapper; class QXYSeries; -class QT_CHARTS_PRIVATE_EXPORT QXYModelMapperPrivate : public QObject +class Q_CHARTS_PRIVATE_EXPORT QXYModelMapperPrivate : public QObject { Q_OBJECT diff --git a/src/charts/xychart/qxyseries.h b/src/charts/xychart/qxyseries.h index f81161ff..f2c55ba6 100644 --- a/src/charts/xychart/qxyseries.h +++ b/src/charts/xychart/qxyseries.h @@ -44,7 +44,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QXYSeriesPrivate; class QXYModelMapper; -class QT_CHARTS_EXPORT QXYSeries : public QAbstractSeries +class Q_CHARTS_EXPORT QXYSeries : public QAbstractSeries { Q_OBJECT Q_PROPERTY(bool pointsVisible READ pointsVisible WRITE setPointsVisible) diff --git a/src/charts/xychart/qxyseries_p.h b/src/charts/xychart/qxyseries_p.h index f803c52a..6d243154 100644 --- a/src/charts/xychart/qxyseries_p.h +++ b/src/charts/xychart/qxyseries_p.h @@ -47,7 +47,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QXYSeries; class QAbstractAxis; -class QT_CHARTS_PRIVATE_EXPORT QXYSeriesPrivate: public QAbstractSeriesPrivate +class Q_CHARTS_PRIVATE_EXPORT QXYSeriesPrivate: public QAbstractSeriesPrivate { Q_OBJECT diff --git a/src/charts/xychart/xychart_p.h b/src/charts/xychart/xychart_p.h index 64c51f33..3e1300ce 100644 --- a/src/charts/xychart/xychart_p.h +++ b/src/charts/xychart/xychart_p.h @@ -51,7 +51,7 @@ QT_CHARTS_BEGIN_NAMESPACE class ChartPresenter; class QXYSeries; -class QT_CHARTS_PRIVATE_EXPORT XYChart : public ChartItem +class Q_CHARTS_PRIVATE_EXPORT XYChart : public ChartItem { Q_OBJECT public: diff --git a/src/chartsqml2/declarativeabstractrendernode_p.h b/src/chartsqml2/declarativeabstractrendernode_p.h index 905b6385..1ee307f6 100644 --- a/src/chartsqml2/declarativeabstractrendernode_p.h +++ b/src/chartsqml2/declarativeabstractrendernode_p.h @@ -47,7 +47,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_QMLCHARTS_PRIVATE_EXPORT MouseEventResponse { +class Q_QMLCHARTS_PRIVATE_EXPORT MouseEventResponse { public: enum MouseEventType { None, @@ -71,7 +71,7 @@ public: const QXYSeries *series; }; -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeAbstractRenderNode : public QSGRootNode +class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeAbstractRenderNode : public QSGRootNode { public: DeclarativeAbstractRenderNode() {} diff --git a/src/chartsqml2/declarativeareaseries_p.h b/src/chartsqml2/declarativeareaseries_p.h index cc8b7421..18836768 100644 --- a/src/chartsqml2/declarativeareaseries_p.h +++ b/src/chartsqml2/declarativeareaseries_p.h @@ -46,7 +46,7 @@ QT_CHARTS_BEGIN_NAMESPACE class DeclarativeLineSeries; -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeAreaSeries : public QAreaSeries +class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeAreaSeries : public QAreaSeries { Q_OBJECT Q_PROPERTY(QtCharts::DeclarativeLineSeries *upperSeries READ upperSeries WRITE setUpperSeries) diff --git a/src/chartsqml2/declarativeaxes_p.h b/src/chartsqml2/declarativeaxes_p.h index fa328db8..c87f6a48 100644 --- a/src/chartsqml2/declarativeaxes_p.h +++ b/src/chartsqml2/declarativeaxes_p.h @@ -47,7 +47,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QAbstractAxis; -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeAxes : public QObject +class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeAxes : public QObject { Q_OBJECT Q_PROPERTY(QtCharts::QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged) diff --git a/src/chartsqml2/declarativebarseries_p.h b/src/chartsqml2/declarativebarseries_p.h index bba71dfa..d84f4155 100644 --- a/src/chartsqml2/declarativebarseries_p.h +++ b/src/chartsqml2/declarativebarseries_p.h @@ -56,7 +56,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QChart; -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeBarSet : public QBarSet +class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeBarSet : public QBarSet { Q_OBJECT Q_PROPERTY(QVariantList values READ values WRITE setValues) @@ -93,7 +93,7 @@ private: QImage m_brushImage; }; -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeBarSeries : public QBarSeries, public QQmlParserStatus +class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeBarSeries : public QBarSeries, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) @@ -140,7 +140,7 @@ public: DeclarativeAxes *m_axes; }; -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeStackedBarSeries : public QStackedBarSeries, public QQmlParserStatus +class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeStackedBarSeries : public QStackedBarSeries, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) @@ -187,7 +187,7 @@ public: DeclarativeAxes *m_axes; }; -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativePercentBarSeries : public QPercentBarSeries, public QQmlParserStatus +class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativePercentBarSeries : public QPercentBarSeries, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) @@ -234,7 +234,7 @@ public: DeclarativeAxes *m_axes; }; -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeHorizontalBarSeries : public QHorizontalBarSeries, public QQmlParserStatus +class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeHorizontalBarSeries : public QHorizontalBarSeries, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) @@ -281,7 +281,7 @@ public: DeclarativeAxes *m_axes; }; -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeHorizontalStackedBarSeries : public QHorizontalStackedBarSeries, public QQmlParserStatus +class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeHorizontalStackedBarSeries : public QHorizontalStackedBarSeries, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) @@ -328,7 +328,7 @@ public: DeclarativeAxes *m_axes; }; -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeHorizontalPercentBarSeries : public QHorizontalPercentBarSeries, public QQmlParserStatus +class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeHorizontalPercentBarSeries : public QHorizontalPercentBarSeries, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) diff --git a/src/chartsqml2/declarativeboxplotseries_p.h b/src/chartsqml2/declarativeboxplotseries_p.h index 19d549af..8cc5e84a 100644 --- a/src/chartsqml2/declarativeboxplotseries_p.h +++ b/src/chartsqml2/declarativeboxplotseries_p.h @@ -49,7 +49,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeBoxSet : public QBoxSet +class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeBoxSet : public QBoxSet { Q_OBJECT Q_PROPERTY(QVariantList values READ values WRITE setValues) @@ -93,7 +93,7 @@ private: QImage m_brushImage; }; -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeBoxPlotSeries : public QBoxPlotSeries, public QQmlParserStatus +class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeBoxPlotSeries : public QBoxPlotSeries, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) diff --git a/src/chartsqml2/declarativecandlestickseries_p.h b/src/chartsqml2/declarativecandlestickseries_p.h index 5ed0989c..643d4d2f 100644 --- a/src/chartsqml2/declarativecandlestickseries_p.h +++ b/src/chartsqml2/declarativecandlestickseries_p.h @@ -50,7 +50,7 @@ QT_CHARTS_BEGIN_NAMESPACE class DeclarativeAxes; class QAbstractAxis; -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeCandlestickSet : public QCandlestickSet +class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeCandlestickSet : public QCandlestickSet { Q_OBJECT Q_PROPERTY(QString brushFilename READ brushFilename WRITE setBrushFilename NOTIFY brushFilenameChanged) diff --git a/src/chartsqml2/declarativecategoryaxis_p.h b/src/chartsqml2/declarativecategoryaxis_p.h index e50844b2..9bcd7ba8 100644 --- a/src/chartsqml2/declarativecategoryaxis_p.h +++ b/src/chartsqml2/declarativecategoryaxis_p.h @@ -47,7 +47,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeCategoryRange : public QObject +class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeCategoryRange : public QObject { Q_OBJECT Q_PROPERTY(qreal endValue READ endValue WRITE setEndValue) diff --git a/src/chartsqml2/declarativechart.cpp b/src/chartsqml2/declarativechart.cpp index 040a8629..23ee2a11 100644 --- a/src/chartsqml2/declarativechart.cpp +++ b/src/chartsqml2/declarativechart.cpp @@ -445,7 +445,7 @@ DeclarativeChart::DeclarativeChart(QChart::ChartType type, QQuickItem *parent) // The symbol resides in qbarmodelmapper.cpp#548 in the C++ module. // Here, it gets imported and reset to the DeclarativeBarSet allocator #if defined(Q_OS_WIN) && !defined(QT_STATIC) -QT_CHARTS_EXPORT +Q_CHARTS_EXPORT #else extern #endif diff --git a/src/chartsqml2/declarativechart_p.h b/src/chartsqml2/declarativechart_p.h index a8441d87..0f45a3b8 100644 --- a/src/chartsqml2/declarativechart_p.h +++ b/src/chartsqml2/declarativechart_p.h @@ -57,7 +57,7 @@ class DeclarativeMargins; class Domain; class DeclarativeAxes; -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeChart : public QQuickItem +class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeChart : public QQuickItem { Q_OBJECT Q_PROPERTY(Theme theme READ theme WRITE setTheme) diff --git a/src/chartsqml2/declarativechartglobal_p.h b/src/chartsqml2/declarativechartglobal_p.h index a897d4ca..fb01a7c6 100644 --- a/src/chartsqml2/declarativechartglobal_p.h +++ b/src/chartsqml2/declarativechartglobal_p.h @@ -43,12 +43,12 @@ #ifndef QT_STATIC # if defined(QT_BUILD_QMLCHARTS_LIB) -# define QT_QMLCHARTS_PRIVATE_EXPORT Q_DECL_EXPORT +# define Q_QMLCHARTS_PRIVATE_EXPORT Q_DECL_EXPORT # else -# define QT_QMLCHARTS_PRIVATE_EXPORT Q_DECL_IMPORT +# define Q_QMLCHARTS_PRIVATE_EXPORT Q_DECL_IMPORT # endif #else -# define QT_QMLCHARTS_PRIVATE_EXPORT +# define Q_QMLCHARTS_PRIVATE_EXPORT #endif #endif // DECLARATIVECHARTGLOBAL_H diff --git a/src/chartsqml2/declarativelineseries_p.h b/src/chartsqml2/declarativelineseries_p.h index 70de3d05..c3c164fd 100644 --- a/src/chartsqml2/declarativelineseries_p.h +++ b/src/chartsqml2/declarativelineseries_p.h @@ -49,7 +49,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeLineSeries : public QLineSeries, public DeclarativeXySeries, public QQmlParserStatus +class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeLineSeries : public QLineSeries, public DeclarativeXySeries, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) diff --git a/src/chartsqml2/declarativemargins_p.h b/src/chartsqml2/declarativemargins_p.h index b9c7ab0a..19e69b93 100644 --- a/src/chartsqml2/declarativemargins_p.h +++ b/src/chartsqml2/declarativemargins_p.h @@ -46,7 +46,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeMargins : public QObject, public QMargins +class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeMargins : public QObject, public QMargins { Q_OBJECT Q_PROPERTY(int top READ top WRITE setTop NOTIFY topChanged) diff --git a/src/chartsqml2/declarativepieseries_p.h b/src/chartsqml2/declarativepieseries_p.h index 33ff7586..f0ab75cc 100644 --- a/src/chartsqml2/declarativepieseries_p.h +++ b/src/chartsqml2/declarativepieseries_p.h @@ -48,7 +48,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativePieSlice : public QPieSlice +class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativePieSlice : public QPieSlice { Q_OBJECT Q_PROPERTY(QString brushFilename READ brushFilename WRITE setBrushFilename NOTIFY brushFilenameChanged) diff --git a/src/chartsqml2/declarativepolarchart_p.h b/src/chartsqml2/declarativepolarchart_p.h index 3d82f822..d190be08 100644 --- a/src/chartsqml2/declarativepolarchart_p.h +++ b/src/chartsqml2/declarativepolarchart_p.h @@ -46,7 +46,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativePolarChart : public DeclarativeChart +class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativePolarChart : public DeclarativeChart { Q_OBJECT public: diff --git a/src/chartsqml2/declarativescatterseries_p.h b/src/chartsqml2/declarativescatterseries_p.h index e01ddb46..c160e360 100644 --- a/src/chartsqml2/declarativescatterseries_p.h +++ b/src/chartsqml2/declarativescatterseries_p.h @@ -49,7 +49,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeScatterSeries : public QScatterSeries, public DeclarativeXySeries, public QQmlParserStatus +class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeScatterSeries : public QScatterSeries, public DeclarativeXySeries, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) diff --git a/src/chartsqml2/declarativesplineseries_p.h b/src/chartsqml2/declarativesplineseries_p.h index c6e6689e..d9f29352 100644 --- a/src/chartsqml2/declarativesplineseries_p.h +++ b/src/chartsqml2/declarativesplineseries_p.h @@ -49,7 +49,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeSplineSeries : public QSplineSeries, public DeclarativeXySeries, public QQmlParserStatus +class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeSplineSeries : public QSplineSeries, public DeclarativeXySeries, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) diff --git a/src/chartsqml2/declarativexypoint_p.h b/src/chartsqml2/declarativexypoint_p.h index 316ff962..91ebc56d 100644 --- a/src/chartsqml2/declarativexypoint_p.h +++ b/src/chartsqml2/declarativexypoint_p.h @@ -46,7 +46,7 @@ QT_CHARTS_BEGIN_NAMESPACE -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeXYPoint : public QObject, public QPointF +class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeXYPoint : public QObject, public QPointF { Q_OBJECT Q_PROPERTY(qreal x READ x WRITE setX) diff --git a/src/chartsqml2/declarativexyseries_p.h b/src/chartsqml2/declarativexyseries_p.h index e78fde67..883c4dbe 100644 --- a/src/chartsqml2/declarativexyseries_p.h +++ b/src/chartsqml2/declarativexyseries_p.h @@ -47,7 +47,7 @@ QT_CHARTS_BEGIN_NAMESPACE class QChart; class QAbstractSeries; -class QT_QMLCHARTS_PRIVATE_EXPORT DeclarativeXySeries +class Q_QMLCHARTS_PRIVATE_EXPORT DeclarativeXySeries { public: explicit DeclarativeXySeries(); |