From 70baf5bc141d022f3cd99216c4628c9e38663d4d Mon Sep 17 00:00:00 2001 From: Jesus Fernandez Date: Mon, 21 Jan 2019 15:37:33 +0100 Subject: Fix the inclusion of MOC files before QT_CHARTS_END_NAMESPACE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Id4d50a674db619f15f8e9d05c663f2b83bb8b7e5 Reviewed-by: Qt CI Bot Reviewed-by: Friedemann Kleint Reviewed-by: Mårten Nordheim --- src/charts/animations/baranimation.cpp | 4 ++-- src/charts/animations/boxplotanimation.cpp | 4 ++-- src/charts/animations/boxwhiskersanimation.cpp | 4 ++-- src/charts/animations/candlestickanimation.cpp | 4 ++-- src/charts/animations/candlestickbodywicksanimation.cpp | 4 ++-- src/charts/animations/pieanimation.cpp | 4 ++-- src/charts/animations/xyanimation.cpp | 3 ++- src/charts/areachart/areachartitem.cpp | 4 ++-- src/charts/areachart/qareaseries.cpp | 3 +-- src/charts/axis/barcategoryaxis/chartbarcategoryaxisx.cpp | 4 ++-- src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp | 4 ++-- src/charts/axis/barcategoryaxis/qbarcategoryaxis.cpp | 4 ++-- src/charts/axis/cartesianchartaxis.cpp | 4 ++-- src/charts/axis/categoryaxis/chartcategoryaxisx.cpp | 4 ++-- src/charts/axis/categoryaxis/chartcategoryaxisy.cpp | 4 ++-- src/charts/axis/categoryaxis/polarchartcategoryaxisangular.cpp | 4 ++-- src/charts/axis/categoryaxis/polarchartcategoryaxisradial.cpp | 4 ++-- src/charts/axis/categoryaxis/qcategoryaxis.cpp | 4 ++-- src/charts/axis/chartaxiselement.cpp | 4 ++-- src/charts/axis/datetimeaxis/chartdatetimeaxisx.cpp | 4 ++-- src/charts/axis/datetimeaxis/chartdatetimeaxisy.cpp | 4 ++-- src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular.cpp | 4 ++-- src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial.cpp | 4 ++-- src/charts/axis/datetimeaxis/qdatetimeaxis.cpp | 4 ++-- src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp | 4 ++-- src/charts/axis/logvalueaxis/chartlogvalueaxisy.cpp | 4 ++-- src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular.cpp | 4 ++-- src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial.cpp | 4 ++-- src/charts/axis/logvalueaxis/qlogvalueaxis.cpp | 4 ++-- src/charts/axis/polarchartaxis.cpp | 4 ++-- src/charts/axis/polarchartaxisangular.cpp | 3 +-- src/charts/axis/polarchartaxisradial.cpp | 4 ++-- src/charts/axis/qabstractaxis.cpp | 4 +--- src/charts/axis/valueaxis/chartvalueaxisx.cpp | 4 ++-- src/charts/axis/valueaxis/chartvalueaxisy.cpp | 4 ++-- src/charts/axis/valueaxis/polarchartvalueaxisangular.cpp | 4 ++-- src/charts/axis/valueaxis/polarchartvalueaxisradial.cpp | 4 ++-- src/charts/axis/valueaxis/qvalueaxis.cpp | 4 ++-- src/charts/barchart/abstractbarchartitem.cpp | 4 ++-- src/charts/barchart/bar.cpp | 4 ++-- src/charts/barchart/horizontal/bar/horizontalbarchartitem.cpp | 4 ++-- src/charts/barchart/horizontal/bar/qhorizontalbarseries.cpp | 4 ++-- .../barchart/horizontal/percent/horizontalpercentbarchartitem.cpp | 3 +-- .../barchart/horizontal/percent/qhorizontalpercentbarseries.cpp | 4 ++-- .../barchart/horizontal/stacked/horizontalstackedbarchartitem.cpp | 3 +-- .../barchart/horizontal/stacked/qhorizontalstackedbarseries.cpp | 4 ++-- src/charts/barchart/qabstractbarseries.cpp | 4 ++-- src/charts/barchart/qbarmodelmapper.cpp | 4 ++-- src/charts/barchart/qbarset.cpp | 4 ++-- src/charts/barchart/qhbarmodelmapper.cpp | 4 ++-- src/charts/barchart/qvbarmodelmapper.cpp | 4 ++-- src/charts/barchart/vertical/bar/barchartitem.cpp | 4 ++-- src/charts/barchart/vertical/bar/qbarseries.cpp | 3 +-- src/charts/barchart/vertical/percent/percentbarchartitem.cpp | 4 ++-- src/charts/barchart/vertical/percent/qpercentbarseries.cpp | 3 +-- src/charts/barchart/vertical/stacked/qstackedbarseries.cpp | 3 +-- src/charts/barchart/vertical/stacked/stackedbarchartitem.cpp | 4 ++-- src/charts/boxplotchart/boxplotchartitem.cpp | 4 ++-- src/charts/boxplotchart/boxwhiskers.cpp | 4 ++-- src/charts/boxplotchart/qboxplotmodelmapper.cpp | 5 ++--- src/charts/boxplotchart/qboxplotseries.cpp | 5 ++--- src/charts/boxplotchart/qboxset.cpp | 4 ++-- src/charts/boxplotchart/qhboxplotmodelmapper.cpp | 3 +-- src/charts/boxplotchart/qvboxplotmodelmapper.cpp | 3 +-- src/charts/candlestickchart/candlestick.cpp | 4 ++-- src/charts/candlestickchart/candlestickchartitem.cpp | 4 ++-- src/charts/candlestickchart/qcandlestickmodelmapper.cpp | 4 ++-- src/charts/candlestickchart/qcandlestickseries.cpp | 4 ++-- src/charts/candlestickchart/qcandlestickset.cpp | 4 ++-- src/charts/candlestickchart/qhcandlestickmodelmapper.cpp | 4 ++-- src/charts/candlestickchart/qvcandlestickmodelmapper.cpp | 4 ++-- src/charts/chartdataset.cpp | 4 ++-- src/charts/chartitem.cpp | 4 ++-- src/charts/chartpresenter.cpp | 4 ++-- src/charts/chartthememanager.cpp | 4 ++-- src/charts/domain/abstractdomain.cpp | 3 +-- src/charts/domain/logxlogydomain.cpp | 4 ++-- src/charts/domain/logxlogypolardomain.cpp | 4 ++-- src/charts/domain/logxydomain.cpp | 4 ++-- src/charts/domain/logxypolardomain.cpp | 4 ++-- src/charts/domain/polardomain.cpp | 4 ++-- src/charts/domain/xlogydomain.cpp | 4 ++-- src/charts/domain/xlogypolardomain.cpp | 4 ++-- src/charts/domain/xydomain.cpp | 4 ++-- src/charts/domain/xypolardomain.cpp | 4 ++-- src/charts/legend/legendmarkeritem.cpp | 4 ++-- src/charts/legend/legendscroller.cpp | 2 +- src/charts/legend/qarealegendmarker.cpp | 4 ++-- src/charts/legend/qbarlegendmarker.cpp | 5 ++--- src/charts/legend/qboxplotlegendmarker.cpp | 5 ++--- src/charts/legend/qcandlesticklegendmarker.cpp | 4 ++-- src/charts/legend/qlegend.cpp | 4 ++-- src/charts/legend/qlegendmarker.cpp | 4 ++-- src/charts/legend/qpielegendmarker.cpp | 4 ++-- src/charts/legend/qxylegendmarker.cpp | 5 ++--- src/charts/linechart/linechartitem.cpp | 4 ++-- src/charts/linechart/qlineseries.cpp | 4 ++-- src/charts/piechart/piechartitem.cpp | 4 ++-- src/charts/piechart/piesliceitem.cpp | 3 +-- src/charts/piechart/qhpiemodelmapper.cpp | 4 ++-- src/charts/piechart/qpiemodelmapper.cpp | 4 ++-- src/charts/piechart/qpieseries.cpp | 3 +-- src/charts/piechart/qpieslice.cpp | 1 + src/charts/piechart/qvpiemodelmapper.cpp | 4 ++-- src/charts/qabstractseries.cpp | 6 ++---- src/charts/qchart.cpp | 4 ++-- src/charts/qchartview.cpp | 4 ++-- src/charts/qpolarchart.cpp | 4 ++-- src/charts/scatterchart/qscatterseries.cpp | 4 ++-- src/charts/scatterchart/scatterchartitem.cpp | 4 ++-- src/charts/scroller.cpp | 4 ++-- src/charts/splinechart/qsplineseries.cpp | 4 ++-- src/charts/splinechart/splinechartitem.cpp | 4 ++-- src/charts/xychart/qhxymodelmapper.cpp | 4 ++-- src/charts/xychart/qvxymodelmapper.cpp | 4 ++-- src/charts/xychart/qxymodelmapper.cpp | 4 ++-- src/charts/xychart/qxyseries.cpp | 4 ++-- src/charts/xychart/xychart.cpp | 4 ++-- src/chartsqml2/declarativeareaseries.cpp | 4 ++-- src/chartsqml2/declarativeaxes.cpp | 4 ++-- src/chartsqml2/declarativebarseries.cpp | 4 ++-- src/chartsqml2/declarativeboxplotseries.cpp | 4 ++-- src/chartsqml2/declarativecandlestickseries.cpp | 4 ++-- src/chartsqml2/declarativecategoryaxis.cpp | 4 ++-- src/chartsqml2/declarativechart.cpp | 4 ++-- src/chartsqml2/declarativelineseries.cpp | 4 ++-- src/chartsqml2/declarativemargins.cpp | 4 ++-- src/chartsqml2/declarativepieseries.cpp | 4 ++-- src/chartsqml2/declarativepolarchart.cpp | 4 ++-- src/chartsqml2/declarativescatterseries.cpp | 4 ++-- src/chartsqml2/declarativesplineseries.cpp | 4 ++-- src/chartsqml2/declarativexypoint.cpp | 4 ++-- 132 files changed, 249 insertions(+), 268 deletions(-) (limited to 'src') diff --git a/src/charts/animations/baranimation.cpp b/src/charts/animations/baranimation.cpp index 73ca952f..d5c5f7c1 100644 --- a/src/charts/animations/baranimation.cpp +++ b/src/charts/animations/baranimation.cpp @@ -85,7 +85,7 @@ void BarAnimation::setup(const QVector &oldLayout, const QVector setKeyValueAt(1.0, qVariantFromValue(newLayout)); } -#include "moc_baranimation_p.cpp" - QT_CHARTS_END_NAMESPACE +#include "moc_baranimation_p.cpp" + diff --git a/src/charts/animations/boxplotanimation.cpp b/src/charts/animations/boxplotanimation.cpp index 5c2480b1..a46b6b88 100644 --- a/src/charts/animations/boxplotanimation.cpp +++ b/src/charts/animations/boxplotanimation.cpp @@ -104,6 +104,6 @@ void BoxPlotAnimation::removeBoxAnimation(BoxWhiskers *box) m_animations.remove(box); } -#include "moc_boxplotanimation_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_boxplotanimation_p.cpp" diff --git a/src/charts/animations/boxwhiskersanimation.cpp b/src/charts/animations/boxwhiskersanimation.cpp index 563c5be9..c8bf584f 100644 --- a/src/charts/animations/boxwhiskersanimation.cpp +++ b/src/charts/animations/boxwhiskersanimation.cpp @@ -115,7 +115,7 @@ void BoxWhiskersAnimation::setStartData(const BoxWhiskersData &endData) setStartValue(qVariantFromValue(endData)); } -#include "moc_boxwhiskersanimation_p.cpp" - QT_CHARTS_END_NAMESPACE +#include "moc_boxwhiskersanimation_p.cpp" + diff --git a/src/charts/animations/candlestickanimation.cpp b/src/charts/animations/candlestickanimation.cpp index 5e141943..904aeb7d 100644 --- a/src/charts/animations/candlestickanimation.cpp +++ b/src/charts/animations/candlestickanimation.cpp @@ -111,6 +111,6 @@ void CandlestickAnimation::removeCandlestickAnimation(Candlestick *candlestick) m_animations.remove(candlestick); } -#include "moc_candlestickanimation_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_candlestickanimation_p.cpp" diff --git a/src/charts/animations/candlestickbodywicksanimation.cpp b/src/charts/animations/candlestickbodywicksanimation.cpp index 615f43c3..7e9be617 100644 --- a/src/charts/animations/candlestickbodywicksanimation.cpp +++ b/src/charts/animations/candlestickbodywicksanimation.cpp @@ -107,6 +107,6 @@ QVariant CandlestickBodyWicksAnimation::interpolated(const QVariant &from, const return qVariantFromValue(result); } -#include "moc_candlestickbodywicksanimation_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_candlestickbodywicksanimation_p.cpp" diff --git a/src/charts/animations/pieanimation.cpp b/src/charts/animations/pieanimation.cpp index 76993792..d55ffd6a 100644 --- a/src/charts/animations/pieanimation.cpp +++ b/src/charts/animations/pieanimation.cpp @@ -115,6 +115,6 @@ void PieAnimation::updateCurrentValue(const QVariant &) // nothing to do... } -#include "moc_pieanimation_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_pieanimation_p.cpp" diff --git a/src/charts/animations/xyanimation.cpp b/src/charts/animations/xyanimation.cpp index 01fbd8e9..b96bf7f6 100644 --- a/src/charts/animations/xyanimation.cpp +++ b/src/charts/animations/xyanimation.cpp @@ -160,5 +160,6 @@ void XYAnimation::updateState(QAbstractAnimation::State newState, QAbstractAnima } } -#include "moc_chartanimation_p.cpp" QT_CHARTS_END_NAMESPACE + +#include "moc_chartanimation_p.cpp" diff --git a/src/charts/areachart/areachartitem.cpp b/src/charts/areachart/areachartitem.cpp index d53500fe..58f2c367 100644 --- a/src/charts/areachart/areachartitem.cpp +++ b/src/charts/areachart/areachartitem.cpp @@ -346,6 +346,6 @@ void AreaChartItem::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) ChartItem::mouseDoubleClickEvent(event); } -#include "moc_areachartitem_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_areachartitem_p.cpp" diff --git a/src/charts/areachart/qareaseries.cpp b/src/charts/areachart/qareaseries.cpp index 41e21949..f8401785 100644 --- a/src/charts/areachart/qareaseries.cpp +++ b/src/charts/areachart/qareaseries.cpp @@ -822,8 +822,7 @@ void QAreaSeriesPrivate::initializeTheme(int index, ChartTheme* theme, bool forc } } +QT_CHARTS_END_NAMESPACE #include "moc_qareaseries.cpp" #include "moc_qareaseries_p.cpp" - -QT_CHARTS_END_NAMESPACE diff --git a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx.cpp b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx.cpp index c5fa68c2..a515d797 100644 --- a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx.cpp +++ b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx.cpp @@ -144,6 +144,6 @@ QSizeF ChartBarCategoryAxisX::sizeHint(Qt::SizeHint which, const QSizeF &constra return sh; } -#include "moc_chartbarcategoryaxisx_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_chartbarcategoryaxisx_p.cpp" diff --git a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp index 2943a38b..bc5bf97f 100644 --- a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp +++ b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp @@ -146,6 +146,6 @@ QSizeF ChartBarCategoryAxisY::sizeHint(Qt::SizeHint which, const QSizeF &constra return sh; } -#include "moc_chartbarcategoryaxisy_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_chartbarcategoryaxisy_p.cpp" diff --git a/src/charts/axis/barcategoryaxis/qbarcategoryaxis.cpp b/src/charts/axis/barcategoryaxis/qbarcategoryaxis.cpp index cf094ba2..899a26fa 100644 --- a/src/charts/axis/barcategoryaxis/qbarcategoryaxis.cpp +++ b/src/charts/axis/barcategoryaxis/qbarcategoryaxis.cpp @@ -628,7 +628,7 @@ void QBarCategoryAxisPrivate::initializeDomain(AbstractDomain *domain) } } +QT_CHARTS_END_NAMESPACE + #include "moc_qbarcategoryaxis.cpp" #include "moc_qbarcategoryaxis_p.cpp" - -QT_CHARTS_END_NAMESPACE diff --git a/src/charts/axis/cartesianchartaxis.cpp b/src/charts/axis/cartesianchartaxis.cpp index dbee904f..571af7a9 100644 --- a/src/charts/axis/cartesianchartaxis.cpp +++ b/src/charts/axis/cartesianchartaxis.cpp @@ -327,6 +327,6 @@ void CartesianChartAxis::handleShadesPenChanged(const QPen &pen) static_cast(item)->setPen(pen); } -#include "moc_cartesianchartaxis_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_cartesianchartaxis_p.cpp" diff --git a/src/charts/axis/categoryaxis/chartcategoryaxisx.cpp b/src/charts/axis/categoryaxis/chartcategoryaxisx.cpp index 6781e574..56f85e58 100644 --- a/src/charts/axis/categoryaxis/chartcategoryaxisx.cpp +++ b/src/charts/axis/categoryaxis/chartcategoryaxisx.cpp @@ -123,6 +123,6 @@ void ChartCategoryAxisX::handleCategoriesChanged() presenter()->layout()->invalidate(); } -#include "moc_chartcategoryaxisx_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_chartcategoryaxisx_p.cpp" diff --git a/src/charts/axis/categoryaxis/chartcategoryaxisy.cpp b/src/charts/axis/categoryaxis/chartcategoryaxisy.cpp index facd4bc4..a80355f4 100644 --- a/src/charts/axis/categoryaxis/chartcategoryaxisy.cpp +++ b/src/charts/axis/categoryaxis/chartcategoryaxisy.cpp @@ -123,6 +123,6 @@ void ChartCategoryAxisY::handleCategoriesChanged() presenter()->layout()->invalidate(); } -#include "moc_chartcategoryaxisy_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_chartcategoryaxisy_p.cpp" diff --git a/src/charts/axis/categoryaxis/polarchartcategoryaxisangular.cpp b/src/charts/axis/categoryaxis/polarchartcategoryaxisangular.cpp index 0320df2d..08d6b8a4 100644 --- a/src/charts/axis/categoryaxis/polarchartcategoryaxisangular.cpp +++ b/src/charts/axis/categoryaxis/polarchartcategoryaxisangular.cpp @@ -84,6 +84,6 @@ void PolarChartCategoryAxisAngular::handleCategoriesChanged() } -#include "moc_polarchartcategoryaxisangular_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_polarchartcategoryaxisangular_p.cpp" diff --git a/src/charts/axis/categoryaxis/polarchartcategoryaxisradial.cpp b/src/charts/axis/categoryaxis/polarchartcategoryaxisradial.cpp index 27ceb9fe..75766aa3 100644 --- a/src/charts/axis/categoryaxis/polarchartcategoryaxisradial.cpp +++ b/src/charts/axis/categoryaxis/polarchartcategoryaxisradial.cpp @@ -83,6 +83,6 @@ void PolarChartCategoryAxisRadial::handleCategoriesChanged() presenter()->layout()->invalidate(); } -#include "moc_polarchartcategoryaxisradial_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_polarchartcategoryaxisradial_p.cpp" diff --git a/src/charts/axis/categoryaxis/qcategoryaxis.cpp b/src/charts/axis/categoryaxis/qcategoryaxis.cpp index 0acc206d..5c53a552 100644 --- a/src/charts/axis/categoryaxis/qcategoryaxis.cpp +++ b/src/charts/axis/categoryaxis/qcategoryaxis.cpp @@ -381,7 +381,7 @@ void QCategoryAxisPrivate::initializeGraphics(QGraphicsItem *parent) QAbstractAxisPrivate::initializeGraphics(parent); } +QT_CHARTS_END_NAMESPACE + #include "moc_qcategoryaxis.cpp" #include "moc_qcategoryaxis_p.cpp" - -QT_CHARTS_END_NAMESPACE diff --git a/src/charts/axis/chartaxiselement.cpp b/src/charts/axis/chartaxiselement.cpp index 4a30d26c..fc2b3e27 100644 --- a/src/charts/axis/chartaxiselement.cpp +++ b/src/charts/axis/chartaxiselement.cpp @@ -507,6 +507,6 @@ void ChartAxisElement::axisSelected() emit clicked(); } -#include "moc_chartaxiselement_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_chartaxiselement_p.cpp" diff --git a/src/charts/axis/datetimeaxis/chartdatetimeaxisx.cpp b/src/charts/axis/datetimeaxis/chartdatetimeaxisx.cpp index ee885f08..111b3526 100644 --- a/src/charts/axis/datetimeaxis/chartdatetimeaxisx.cpp +++ b/src/charts/axis/datetimeaxis/chartdatetimeaxisx.cpp @@ -137,6 +137,6 @@ QSizeF ChartDateTimeAxisX::sizeHint(Qt::SizeHint which, const QSizeF &constraint return sh; } -#include "moc_chartdatetimeaxisx_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_chartdatetimeaxisx_p.cpp" diff --git a/src/charts/axis/datetimeaxis/chartdatetimeaxisy.cpp b/src/charts/axis/datetimeaxis/chartdatetimeaxisy.cpp index 934289c3..489ba3cd 100644 --- a/src/charts/axis/datetimeaxis/chartdatetimeaxisy.cpp +++ b/src/charts/axis/datetimeaxis/chartdatetimeaxisy.cpp @@ -138,6 +138,6 @@ QSizeF ChartDateTimeAxisY::sizeHint(Qt::SizeHint which, const QSizeF &constraint return sh; } -#include "moc_chartdatetimeaxisy_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_chartdatetimeaxisy_p.cpp" diff --git a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular.cpp b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular.cpp index 956d59c3..78f1de94 100644 --- a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular.cpp +++ b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular.cpp @@ -84,6 +84,6 @@ void PolarChartDateTimeAxisAngular::handleFormatChanged(const QString &format) presenter()->layout()->invalidate(); } -#include "moc_polarchartdatetimeaxisangular_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_polarchartdatetimeaxisangular_p.cpp" diff --git a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial.cpp b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial.cpp index 0cdc144d..7a787b7c 100644 --- a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial.cpp +++ b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial.cpp @@ -83,6 +83,6 @@ void PolarChartDateTimeAxisRadial::handleFormatChanged(const QString &format) presenter()->layout()->invalidate(); } -#include "moc_polarchartdatetimeaxisradial_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_polarchartdatetimeaxisradial_p.cpp" diff --git a/src/charts/axis/datetimeaxis/qdatetimeaxis.cpp b/src/charts/axis/datetimeaxis/qdatetimeaxis.cpp index f2886791..a7ccd37b 100644 --- a/src/charts/axis/datetimeaxis/qdatetimeaxis.cpp +++ b/src/charts/axis/datetimeaxis/qdatetimeaxis.cpp @@ -399,7 +399,7 @@ void QDateTimeAxisPrivate::initializeDomain(AbstractDomain *domain) } } +QT_CHARTS_END_NAMESPACE + #include "moc_qdatetimeaxis.cpp" #include "moc_qdatetimeaxis_p.cpp" - -QT_CHARTS_END_NAMESPACE diff --git a/src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp b/src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp index 4b33cc9c..d600696e 100644 --- a/src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp +++ b/src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp @@ -145,6 +145,6 @@ QSizeF ChartLogValueAxisX::sizeHint(Qt::SizeHint which, const QSizeF &constraint return sh; } -#include "moc_chartlogvalueaxisx_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_chartlogvalueaxisx_p.cpp" diff --git a/src/charts/axis/logvalueaxis/chartlogvalueaxisy.cpp b/src/charts/axis/logvalueaxis/chartlogvalueaxisy.cpp index 4eea7035..f1adb348 100644 --- a/src/charts/axis/logvalueaxis/chartlogvalueaxisy.cpp +++ b/src/charts/axis/logvalueaxis/chartlogvalueaxisy.cpp @@ -146,6 +146,6 @@ QSizeF ChartLogValueAxisY::sizeHint(Qt::SizeHint which, const QSizeF &constraint return sh; } -#include "moc_chartlogvalueaxisy_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_chartlogvalueaxisy_p.cpp" diff --git a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular.cpp b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular.cpp index 2312b809..b29136be 100644 --- a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular.cpp +++ b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular.cpp @@ -93,6 +93,6 @@ void PolarChartLogValueAxisAngular::handleLabelFormatChanged(const QString &form presenter()->layout()->invalidate(); } -#include "moc_polarchartlogvalueaxisangular_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_polarchartlogvalueaxisangular_p.cpp" diff --git a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial.cpp b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial.cpp index 98ae52e1..1df14ce7 100644 --- a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial.cpp +++ b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial.cpp @@ -92,6 +92,6 @@ void PolarChartLogValueAxisRadial::handleLabelFormatChanged(const QString &forma presenter()->layout()->invalidate(); } -#include "moc_polarchartlogvalueaxisradial_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_polarchartlogvalueaxisradial_p.cpp" diff --git a/src/charts/axis/logvalueaxis/qlogvalueaxis.cpp b/src/charts/axis/logvalueaxis/qlogvalueaxis.cpp index c9e639e8..5a14a854 100644 --- a/src/charts/axis/logvalueaxis/qlogvalueaxis.cpp +++ b/src/charts/axis/logvalueaxis/qlogvalueaxis.cpp @@ -518,7 +518,7 @@ void QLogValueAxisPrivate::initializeDomain(AbstractDomain *domain) } } +QT_CHARTS_END_NAMESPACE + #include "moc_qlogvalueaxis.cpp" #include "moc_qlogvalueaxis_p.cpp" - -QT_CHARTS_END_NAMESPACE diff --git a/src/charts/axis/polarchartaxis.cpp b/src/charts/axis/polarchartaxis.cpp index b37041fb..403d3b09 100644 --- a/src/charts/axis/polarchartaxis.cpp +++ b/src/charts/axis/polarchartaxis.cpp @@ -136,6 +136,6 @@ void PolarChartAxis::handleShadesPenChanged(const QPen &pen) static_cast(item)->setPen(pen); } -#include "moc_polarchartaxis_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_polarchartaxis_p.cpp" diff --git a/src/charts/axis/polarchartaxisangular.cpp b/src/charts/axis/polarchartaxisangular.cpp index 17f00ed7..bee1baa7 100644 --- a/src/charts/axis/polarchartaxisangular.cpp +++ b/src/charts/axis/polarchartaxisangular.cpp @@ -643,7 +643,6 @@ void PolarChartAxisAngular::updateMinorTickItems() } } +QT_CHARTS_END_NAMESPACE #include "moc_polarchartaxisangular_p.cpp" - -QT_CHARTS_END_NAMESPACE diff --git a/src/charts/axis/polarchartaxisradial.cpp b/src/charts/axis/polarchartaxisradial.cpp index 23ba1e41..9b303b1f 100644 --- a/src/charts/axis/polarchartaxisradial.cpp +++ b/src/charts/axis/polarchartaxisradial.cpp @@ -505,6 +505,6 @@ void PolarChartAxisRadial::updateMinorTickItems() } } -#include "moc_polarchartaxisradial_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_polarchartaxisradial_p.cpp" diff --git a/src/charts/axis/qabstractaxis.cpp b/src/charts/axis/qabstractaxis.cpp index 4fc9f41a..73fa5920 100644 --- a/src/charts/axis/qabstractaxis.cpp +++ b/src/charts/axis/qabstractaxis.cpp @@ -1071,9 +1071,7 @@ void QAbstractAxisPrivate::initializeAnimations(QChart::AnimationOptions options axis->setAnimation(0); } - +QT_CHARTS_END_NAMESPACE #include "moc_qabstractaxis.cpp" #include "moc_qabstractaxis_p.cpp" - -QT_CHARTS_END_NAMESPACE diff --git a/src/charts/axis/valueaxis/chartvalueaxisx.cpp b/src/charts/axis/valueaxis/chartvalueaxisx.cpp index c7e6e236..6eeda781 100644 --- a/src/charts/axis/valueaxis/chartvalueaxisx.cpp +++ b/src/charts/axis/valueaxis/chartvalueaxisx.cpp @@ -198,6 +198,6 @@ QSizeF ChartValueAxisX::sizeHint(Qt::SizeHint which, const QSizeF &constraint) c return sh; } -#include "moc_chartvalueaxisx_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_chartvalueaxisx_p.cpp" diff --git a/src/charts/axis/valueaxis/chartvalueaxisy.cpp b/src/charts/axis/valueaxis/chartvalueaxisy.cpp index 2f0212a0..961b292e 100644 --- a/src/charts/axis/valueaxis/chartvalueaxisy.cpp +++ b/src/charts/axis/valueaxis/chartvalueaxisy.cpp @@ -198,6 +198,6 @@ QSizeF ChartValueAxisY::sizeHint(Qt::SizeHint which, const QSizeF &constraint) c return sh; } -#include "moc_chartvalueaxisy_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_chartvalueaxisy_p.cpp" diff --git a/src/charts/axis/valueaxis/polarchartvalueaxisangular.cpp b/src/charts/axis/valueaxis/polarchartvalueaxisangular.cpp index f4eb98d8..88873736 100644 --- a/src/charts/axis/valueaxis/polarchartvalueaxisangular.cpp +++ b/src/charts/axis/valueaxis/polarchartvalueaxisangular.cpp @@ -96,6 +96,6 @@ void PolarChartValueAxisAngular::handleLabelFormatChanged(const QString &format) presenter()->layout()->invalidate(); } -#include "moc_polarchartvalueaxisangular_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_polarchartvalueaxisangular_p.cpp" diff --git a/src/charts/axis/valueaxis/polarchartvalueaxisradial.cpp b/src/charts/axis/valueaxis/polarchartvalueaxisradial.cpp index b6842185..f0559d7e 100644 --- a/src/charts/axis/valueaxis/polarchartvalueaxisradial.cpp +++ b/src/charts/axis/valueaxis/polarchartvalueaxisradial.cpp @@ -95,6 +95,6 @@ void PolarChartValueAxisRadial::handleLabelFormatChanged(const QString &format) presenter()->layout()->invalidate(); } -#include "moc_polarchartvalueaxisradial_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_polarchartvalueaxisradial_p.cpp" diff --git a/src/charts/axis/valueaxis/qvalueaxis.cpp b/src/charts/axis/valueaxis/qvalueaxis.cpp index d874e2dd..1d179e43 100644 --- a/src/charts/axis/valueaxis/qvalueaxis.cpp +++ b/src/charts/axis/valueaxis/qvalueaxis.cpp @@ -563,7 +563,7 @@ void QValueAxisPrivate::initializeDomain(AbstractDomain *domain) } } +QT_CHARTS_END_NAMESPACE + #include "moc_qvalueaxis.cpp" #include "moc_qvalueaxis_p.cpp" - -QT_CHARTS_END_NAMESPACE diff --git a/src/charts/barchart/abstractbarchartitem.cpp b/src/charts/barchart/abstractbarchartitem.cpp index 099079a6..36bf81e9 100644 --- a/src/charts/barchart/abstractbarchartitem.cpp +++ b/src/charts/barchart/abstractbarchartitem.cpp @@ -731,6 +731,6 @@ ChartAnimation *AbstractBarChartItem::animation() const return m_animation; } -#include "moc_abstractbarchartitem_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_abstractbarchartitem_p.cpp" diff --git a/src/charts/barchart/bar.cpp b/src/charts/barchart/bar.cpp index 58af2ba4..f6b9fc90 100644 --- a/src/charts/barchart/bar.cpp +++ b/src/charts/barchart/bar.cpp @@ -103,6 +103,6 @@ void Bar::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidg QGraphicsRectItem::paint(painter, &barOption, widget); } -#include "moc_bar_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_bar_p.cpp" diff --git a/src/charts/barchart/horizontal/bar/horizontalbarchartitem.cpp b/src/charts/barchart/horizontal/bar/horizontalbarchartitem.cpp index ee0822a9..6e42385d 100644 --- a/src/charts/barchart/horizontal/bar/horizontalbarchartitem.cpp +++ b/src/charts/barchart/horizontal/bar/horizontalbarchartitem.cpp @@ -126,6 +126,6 @@ QVector HorizontalBarChartItem::calculateLayout() return layout; } -#include "moc_horizontalbarchartitem_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_horizontalbarchartitem_p.cpp" diff --git a/src/charts/barchart/horizontal/bar/qhorizontalbarseries.cpp b/src/charts/barchart/horizontal/bar/qhorizontalbarseries.cpp index 3fe6db9e..bd6d331e 100644 --- a/src/charts/barchart/horizontal/bar/qhorizontalbarseries.cpp +++ b/src/charts/barchart/horizontal/bar/qhorizontalbarseries.cpp @@ -130,6 +130,6 @@ void QHorizontalBarSeriesPrivate::initializeGraphics(QGraphicsItem* parent) QAbstractSeriesPrivate::initializeGraphics(parent); } -#include "moc_qhorizontalbarseries.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_qhorizontalbarseries.cpp" diff --git a/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem.cpp b/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem.cpp index 8bda21ed..6a438d94 100644 --- a/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem.cpp +++ b/src/charts/barchart/horizontal/percent/horizontalpercentbarchartitem.cpp @@ -163,7 +163,6 @@ QVector HorizontalPercentBarChartItem::calculateLayout() return layout; } -#include "moc_horizontalpercentbarchartitem_p.cpp" - QT_CHARTS_END_NAMESPACE +#include "moc_horizontalpercentbarchartitem_p.cpp" diff --git a/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.cpp b/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.cpp index 24a96874..7aa9a044 100644 --- a/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.cpp +++ b/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.cpp @@ -135,6 +135,6 @@ void QHorizontalPercentBarSeriesPrivate::initializeGraphics(QGraphicsItem* paren QAbstractSeriesPrivate::initializeGraphics(parent); } -#include "moc_qhorizontalpercentbarseries.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_qhorizontalpercentbarseries.cpp" diff --git a/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem.cpp b/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem.cpp index 1d38c9ab..dcd5b42e 100644 --- a/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem.cpp +++ b/src/charts/barchart/horizontal/stacked/horizontalstackedbarchartitem.cpp @@ -175,7 +175,6 @@ QVector HorizontalStackedBarChartItem::calculateLayout() return layout; } -#include "moc_horizontalstackedbarchartitem_p.cpp" - QT_CHARTS_END_NAMESPACE +#include "moc_horizontalstackedbarchartitem_p.cpp" diff --git a/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.cpp b/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.cpp index ea1232f6..b5198f0c 100644 --- a/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.cpp +++ b/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.cpp @@ -123,6 +123,6 @@ void QHorizontalStackedBarSeriesPrivate::initializeGraphics(QGraphicsItem *paren QAbstractSeriesPrivate::initializeGraphics(parent); } -#include "moc_qhorizontalstackedbarseries.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_qhorizontalstackedbarseries.cpp" diff --git a/src/charts/barchart/qabstractbarseries.cpp b/src/charts/barchart/qabstractbarseries.cpp index 08ed2d18..6427365c 100644 --- a/src/charts/barchart/qabstractbarseries.cpp +++ b/src/charts/barchart/qabstractbarseries.cpp @@ -1260,7 +1260,7 @@ void QAbstractBarSeriesPrivate::initializeAnimations(QChart::AnimationOptions op QAbstractSeriesPrivate::initializeAnimations(options, duration, curve); } +QT_CHARTS_END_NAMESPACE + #include "moc_qabstractbarseries.cpp" #include "moc_qabstractbarseries_p.cpp" - -QT_CHARTS_END_NAMESPACE diff --git a/src/charts/barchart/qbarmodelmapper.cpp b/src/charts/barchart/qbarmodelmapper.cpp index 6a7e18d7..bf3391c6 100644 --- a/src/charts/barchart/qbarmodelmapper.cpp +++ b/src/charts/barchart/qbarmodelmapper.cpp @@ -582,7 +582,7 @@ void QBarModelMapperPrivate::initializeBarFromModel() blockSeriesSignals(false); } +QT_CHARTS_END_NAMESPACE + #include "moc_qbarmodelmapper.cpp" #include "moc_qbarmodelmapper_p.cpp" - -QT_CHARTS_END_NAMESPACE diff --git a/src/charts/barchart/qbarset.cpp b/src/charts/barchart/qbarset.cpp index 8cd25547..c1fcbd8a 100644 --- a/src/charts/barchart/qbarset.cpp +++ b/src/charts/barchart/qbarset.cpp @@ -756,7 +756,7 @@ qreal QBarSetPrivate::value(const int index) return m_values.at(index).y(); } +QT_CHARTS_END_NAMESPACE + #include "moc_qbarset.cpp" #include "moc_qbarset_p.cpp" - -QT_CHARTS_END_NAMESPACE diff --git a/src/charts/barchart/qhbarmodelmapper.cpp b/src/charts/barchart/qhbarmodelmapper.cpp index a62a9962..64643d4d 100644 --- a/src/charts/barchart/qhbarmodelmapper.cpp +++ b/src/charts/barchart/qhbarmodelmapper.cpp @@ -282,6 +282,6 @@ void QHBarModelMapper::setColumnCount(int columnCount) } } -#include "moc_qhbarmodelmapper.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_qhbarmodelmapper.cpp" diff --git a/src/charts/barchart/qvbarmodelmapper.cpp b/src/charts/barchart/qvbarmodelmapper.cpp index 38314158..1aaaf5a5 100644 --- a/src/charts/barchart/qvbarmodelmapper.cpp +++ b/src/charts/barchart/qvbarmodelmapper.cpp @@ -284,6 +284,6 @@ void QVBarModelMapper::setRowCount(int rowCount) } } -#include "moc_qvbarmodelmapper.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_qvbarmodelmapper.cpp" diff --git a/src/charts/barchart/vertical/bar/barchartitem.cpp b/src/charts/barchart/vertical/bar/barchartitem.cpp index f9c867b3..b50ca564 100644 --- a/src/charts/barchart/vertical/bar/barchartitem.cpp +++ b/src/charts/barchart/vertical/bar/barchartitem.cpp @@ -141,6 +141,6 @@ void BarChartItem::positionLabels() positionLabelsVertical(); } -#include "moc_barchartitem_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_barchartitem_p.cpp" diff --git a/src/charts/barchart/vertical/bar/qbarseries.cpp b/src/charts/barchart/vertical/bar/qbarseries.cpp index 4a6b32e6..aa45bca2 100644 --- a/src/charts/barchart/vertical/bar/qbarseries.cpp +++ b/src/charts/barchart/vertical/bar/qbarseries.cpp @@ -128,7 +128,6 @@ void QBarSeriesPrivate::initializeGraphics(QGraphicsItem* parent) QAbstractSeriesPrivate::initializeGraphics(parent); } -#include "moc_qbarseries.cpp" - QT_CHARTS_END_NAMESPACE +#include "moc_qbarseries.cpp" diff --git a/src/charts/barchart/vertical/percent/percentbarchartitem.cpp b/src/charts/barchart/vertical/percent/percentbarchartitem.cpp index 95867c78..c0521531 100644 --- a/src/charts/barchart/vertical/percent/percentbarchartitem.cpp +++ b/src/charts/barchart/vertical/percent/percentbarchartitem.cpp @@ -180,6 +180,6 @@ void PercentBarChartItem::positionLabels() positionLabelsVertical(); } -#include "moc_percentbarchartitem_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_percentbarchartitem_p.cpp" diff --git a/src/charts/barchart/vertical/percent/qpercentbarseries.cpp b/src/charts/barchart/vertical/percent/qpercentbarseries.cpp index 8cff1655..fcfba849 100644 --- a/src/charts/barchart/vertical/percent/qpercentbarseries.cpp +++ b/src/charts/barchart/vertical/percent/qpercentbarseries.cpp @@ -135,7 +135,6 @@ void QPercentBarSeriesPrivate::initializeGraphics(QGraphicsItem* parent) QAbstractSeriesPrivate::initializeGraphics(parent); } -#include "moc_qpercentbarseries.cpp" - QT_CHARTS_END_NAMESPACE +#include "moc_qpercentbarseries.cpp" diff --git a/src/charts/barchart/vertical/stacked/qstackedbarseries.cpp b/src/charts/barchart/vertical/stacked/qstackedbarseries.cpp index cd5a8f4a..af931f03 100644 --- a/src/charts/barchart/vertical/stacked/qstackedbarseries.cpp +++ b/src/charts/barchart/vertical/stacked/qstackedbarseries.cpp @@ -125,7 +125,6 @@ void QStackedBarSeriesPrivate::initializeGraphics(QGraphicsItem* parent) QAbstractSeriesPrivate::initializeGraphics(parent); } -#include "moc_qstackedbarseries.cpp" - QT_CHARTS_END_NAMESPACE +#include "moc_qstackedbarseries.cpp" diff --git a/src/charts/barchart/vertical/stacked/stackedbarchartitem.cpp b/src/charts/barchart/vertical/stacked/stackedbarchartitem.cpp index 42c02568..ba0e7874 100644 --- a/src/charts/barchart/vertical/stacked/stackedbarchartitem.cpp +++ b/src/charts/barchart/vertical/stacked/stackedbarchartitem.cpp @@ -189,6 +189,6 @@ void StackedBarChartItem::positionLabels() positionLabelsVertical(); } -#include "moc_stackedbarchartitem_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_stackedbarchartitem_p.cpp" diff --git a/src/charts/boxplotchart/boxplotchartitem.cpp b/src/charts/boxplotchart/boxplotchartitem.cpp index c238ac5b..701cc88b 100644 --- a/src/charts/boxplotchart/boxplotchartitem.cpp +++ b/src/charts/boxplotchart/boxplotchartitem.cpp @@ -239,6 +239,6 @@ bool BoxPlotChartItem::updateBoxGeometry(BoxWhiskers *box, int index) return changed; } -#include "moc_boxplotchartitem_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_boxplotchartitem_p.cpp" diff --git a/src/charts/boxplotchart/boxwhiskers.cpp b/src/charts/boxplotchart/boxwhiskers.cpp index 02eee1e7..df247489 100644 --- a/src/charts/boxplotchart/boxwhiskers.cpp +++ b/src/charts/boxplotchart/boxwhiskers.cpp @@ -218,6 +218,6 @@ void BoxWhiskers::updateGeometry(AbstractDomain *domain) m_boundingRect.adjust(-extra, -extra, extra, extra); } -#include "moc_boxwhiskers_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_boxwhiskers_p.cpp" diff --git a/src/charts/boxplotchart/qboxplotmodelmapper.cpp b/src/charts/boxplotchart/qboxplotmodelmapper.cpp index df2bbc3f..e9756a22 100644 --- a/src/charts/boxplotchart/qboxplotmodelmapper.cpp +++ b/src/charts/boxplotchart/qboxplotmodelmapper.cpp @@ -503,8 +503,7 @@ void QBoxPlotModelMapperPrivate::initializeBoxFromModel() blockSeriesSignals(false); } -#include "moc_qboxplotmodelmapper.cpp" -#include "moc_qboxplotmodelmapper_p.cpp" - QT_CHARTS_END_NAMESPACE +#include "moc_qboxplotmodelmapper.cpp" +#include "moc_qboxplotmodelmapper_p.cpp" diff --git a/src/charts/boxplotchart/qboxplotseries.cpp b/src/charts/boxplotchart/qboxplotseries.cpp index d4d5183e..6649c49f 100644 --- a/src/charts/boxplotchart/qboxplotseries.cpp +++ b/src/charts/boxplotchart/qboxplotseries.cpp @@ -718,8 +718,7 @@ qreal QBoxPlotSeriesPrivate::max() return max; } -#include "moc_qboxplotseries.cpp" -#include "moc_qboxplotseries_p.cpp" - QT_CHARTS_END_NAMESPACE +#include "moc_qboxplotseries.cpp" +#include "moc_qboxplotseries_p.cpp" diff --git a/src/charts/boxplotchart/qboxset.cpp b/src/charts/boxplotchart/qboxset.cpp index 78cec189..7d5f562d 100644 --- a/src/charts/boxplotchart/qboxset.cpp +++ b/src/charts/boxplotchart/qboxset.cpp @@ -368,7 +368,7 @@ qreal QBoxSetPrivate::value(const int index) return m_values[index]; } +QT_CHARTS_END_NAMESPACE + #include "moc_qboxset.cpp" #include "moc_qboxset_p.cpp" - -QT_CHARTS_END_NAMESPACE diff --git a/src/charts/boxplotchart/qhboxplotmodelmapper.cpp b/src/charts/boxplotchart/qhboxplotmodelmapper.cpp index 824f386e..356e3bb8 100644 --- a/src/charts/boxplotchart/qhboxplotmodelmapper.cpp +++ b/src/charts/boxplotchart/qhboxplotmodelmapper.cpp @@ -298,7 +298,6 @@ void QHBoxPlotModelMapper::setColumnCount(int columnCount) } } -#include "moc_qhboxplotmodelmapper.cpp" - QT_CHARTS_END_NAMESPACE +#include "moc_qhboxplotmodelmapper.cpp" diff --git a/src/charts/boxplotchart/qvboxplotmodelmapper.cpp b/src/charts/boxplotchart/qvboxplotmodelmapper.cpp index 4b42f7c9..9323d93c 100644 --- a/src/charts/boxplotchart/qvboxplotmodelmapper.cpp +++ b/src/charts/boxplotchart/qvboxplotmodelmapper.cpp @@ -300,7 +300,6 @@ void QVBoxPlotModelMapper::setRowCount(int rowCount) } } -#include "moc_qvboxplotmodelmapper.cpp" - QT_CHARTS_END_NAMESPACE +#include "moc_qvboxplotmodelmapper.cpp" diff --git a/src/charts/candlestickchart/candlestick.cpp b/src/charts/candlestickchart/candlestick.cpp index 9e8d8fa0..eb899d92 100644 --- a/src/charts/candlestickchart/candlestick.cpp +++ b/src/charts/candlestickchart/candlestick.cpp @@ -346,6 +346,6 @@ void Candlestick::updateGeometry(AbstractDomain *domain) m_boundingRect.adjust(-extra, -extra, extra, extra); } -#include "moc_candlestick_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_candlestick_p.cpp" diff --git a/src/charts/candlestickchart/candlestickchartitem.cpp b/src/charts/candlestickchart/candlestickchartitem.cpp index 0c7c9c71..3be2ca6c 100644 --- a/src/charts/candlestickchart/candlestickchartitem.cpp +++ b/src/charts/candlestickchart/candlestickchartitem.cpp @@ -343,6 +343,6 @@ void CandlestickChartItem::updateTimePeriod() m_timePeriod = timePeriod; } -#include "moc_candlestickchartitem_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_candlestickchartitem_p.cpp" diff --git a/src/charts/candlestickchart/qcandlestickmodelmapper.cpp b/src/charts/candlestickchart/qcandlestickmodelmapper.cpp index c5b2ffd0..8f876cd3 100644 --- a/src/charts/candlestickchart/qcandlestickmodelmapper.cpp +++ b/src/charts/candlestickchart/qcandlestickmodelmapper.cpp @@ -700,7 +700,7 @@ void QCandlestickModelMapperPrivate::blockSeriesSignals(bool block) m_seriesSignalsBlock = block; } +QT_CHARTS_END_NAMESPACE + #include "moc_qcandlestickmodelmapper.cpp" #include "moc_qcandlestickmodelmapper_p.cpp" - -QT_CHARTS_END_NAMESPACE diff --git a/src/charts/candlestickchart/qcandlestickseries.cpp b/src/charts/candlestickchart/qcandlestickseries.cpp index 85fe9cc6..b02bb5cd 100644 --- a/src/charts/candlestickchart/qcandlestickseries.cpp +++ b/src/charts/candlestickchart/qcandlestickseries.cpp @@ -1154,7 +1154,7 @@ void QCandlestickSeriesPrivate::populateBarCategories(QBarCategoryAxis *axis) } } +QT_CHARTS_END_NAMESPACE + #include "moc_qcandlestickseries.cpp" #include "moc_qcandlestickseries_p.cpp" - -QT_CHARTS_END_NAMESPACE diff --git a/src/charts/candlestickchart/qcandlestickset.cpp b/src/charts/candlestickchart/qcandlestickset.cpp index 411afd77..6d2cf77d 100644 --- a/src/charts/candlestickchart/qcandlestickset.cpp +++ b/src/charts/candlestickchart/qcandlestickset.cpp @@ -447,7 +447,7 @@ bool QCandlestickSetPrivate::setTimestamp(qreal timestamp) return true; } +QT_CHARTS_END_NAMESPACE + #include "moc_qcandlestickset.cpp" #include "moc_qcandlestickset_p.cpp" - -QT_CHARTS_END_NAMESPACE diff --git a/src/charts/candlestickchart/qhcandlestickmodelmapper.cpp b/src/charts/candlestickchart/qhcandlestickmodelmapper.cpp index b5a2121d..fd4c9f14 100644 --- a/src/charts/candlestickchart/qhcandlestickmodelmapper.cpp +++ b/src/charts/candlestickchart/qhcandlestickmodelmapper.cpp @@ -348,6 +348,6 @@ int QHCandlestickModelMapper::lastSetRow() const return QCandlestickModelMapper::lastSetSection(); } -#include "moc_qhcandlestickmodelmapper.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_qhcandlestickmodelmapper.cpp" diff --git a/src/charts/candlestickchart/qvcandlestickmodelmapper.cpp b/src/charts/candlestickchart/qvcandlestickmodelmapper.cpp index 1b54c875..3f9e8719 100644 --- a/src/charts/candlestickchart/qvcandlestickmodelmapper.cpp +++ b/src/charts/candlestickchart/qvcandlestickmodelmapper.cpp @@ -349,6 +349,6 @@ int QVCandlestickModelMapper::lastSetColumn() const return QCandlestickModelMapper::lastSetSection(); } -#include "moc_qvcandlestickmodelmapper.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_qvcandlestickmodelmapper.cpp" diff --git a/src/charts/chartdataset.cpp b/src/charts/chartdataset.cpp index 702dc8dd..3fe0f2eb 100644 --- a/src/charts/chartdataset.cpp +++ b/src/charts/chartdataset.cpp @@ -661,6 +661,6 @@ void ChartDataSet::reverseChanged() m_glXYSeriesDataManager->handleAxisReverseChanged(axis->d_ptr->m_series); } -#include "moc_chartdataset_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_chartdataset_p.cpp" diff --git a/src/charts/chartitem.cpp b/src/charts/chartitem.cpp index fd6e8610..60d51e75 100644 --- a/src/charts/chartitem.cpp +++ b/src/charts/chartitem.cpp @@ -57,6 +57,6 @@ void ChartItem::handleDomainUpdated() qWarning() << __FUNCTION__<< "Slot not implemented"; } -#include "moc_chartitem_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_chartitem_p.cpp" diff --git a/src/charts/chartpresenter.cpp b/src/charts/chartpresenter.cpp index 7b9e4275..6be0b141 100644 --- a/src/charts/chartpresenter.cpp +++ b/src/charts/chartpresenter.cpp @@ -611,6 +611,6 @@ void ChartPresenter::updateGLWidget() #endif } -#include "moc_chartpresenter_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_chartpresenter_p.cpp" diff --git a/src/charts/chartthememanager.cpp b/src/charts/chartthememanager.cpp index 6d6f6cb7..c6045e36 100644 --- a/src/charts/chartthememanager.cpp +++ b/src/charts/chartthememanager.cpp @@ -251,6 +251,6 @@ QColor ChartThemeManager::colorAt(const QGradient &gradient, qreal pos) return colorAt(prev.second, next.second, relativePos); } -#include "moc_chartthememanager_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_chartthememanager_p.cpp" diff --git a/src/charts/domain/abstractdomain.cpp b/src/charts/domain/abstractdomain.cpp index 9186686e..36e4974a 100644 --- a/src/charts/domain/abstractdomain.cpp +++ b/src/charts/domain/abstractdomain.cpp @@ -300,7 +300,6 @@ QRectF AbstractDomain::fixZoomRect(const QRectF &rect) return fixRect; } +QT_CHARTS_END_NAMESPACE #include "moc_abstractdomain_p.cpp" - -QT_CHARTS_END_NAMESPACE diff --git a/src/charts/domain/logxlogydomain.cpp b/src/charts/domain/logxlogydomain.cpp index 1651132c..04ba559f 100644 --- a/src/charts/domain/logxlogydomain.cpp +++ b/src/charts/domain/logxlogydomain.cpp @@ -298,6 +298,6 @@ QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const LogXLogYDomain &domain) return dbg.maybeSpace(); } -#include "moc_logxlogydomain_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_logxlogydomain_p.cpp" diff --git a/src/charts/domain/logxlogypolardomain.cpp b/src/charts/domain/logxlogypolardomain.cpp index e68391a8..f1a0df00 100644 --- a/src/charts/domain/logxlogypolardomain.cpp +++ b/src/charts/domain/logxlogypolardomain.cpp @@ -278,6 +278,6 @@ QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const LogXLogYPolarDomain &domai return dbg.maybeSpace(); } -#include "moc_logxlogypolardomain_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_logxlogypolardomain_p.cpp" diff --git a/src/charts/domain/logxydomain.cpp b/src/charts/domain/logxydomain.cpp index b5cef8db..fb77656c 100644 --- a/src/charts/domain/logxydomain.cpp +++ b/src/charts/domain/logxydomain.cpp @@ -268,6 +268,6 @@ QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const LogXYDomain &domain) return dbg.maybeSpace(); } -#include "moc_logxydomain_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_logxydomain_p.cpp" diff --git a/src/charts/domain/logxypolardomain.cpp b/src/charts/domain/logxypolardomain.cpp index e6dc5c41..359c8d55 100644 --- a/src/charts/domain/logxypolardomain.cpp +++ b/src/charts/domain/logxypolardomain.cpp @@ -247,6 +247,6 @@ QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const LogXYPolarDomain &domain) return dbg.maybeSpace(); } -#include "moc_logxypolardomain_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_logxypolardomain_p.cpp" diff --git a/src/charts/domain/polardomain.cpp b/src/charts/domain/polardomain.cpp index 3c6e6b57..59027d51 100644 --- a/src/charts/domain/polardomain.cpp +++ b/src/charts/domain/polardomain.cpp @@ -95,6 +95,6 @@ QPointF PolarDomain::polarCoordinateToPoint(qreal angularCoordinate, qreal radia return QPointF(dx, -dy); } -#include "moc_polardomain_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_polardomain_p.cpp" diff --git a/src/charts/domain/xlogydomain.cpp b/src/charts/domain/xlogydomain.cpp index 75187197..0cd995f3 100644 --- a/src/charts/domain/xlogydomain.cpp +++ b/src/charts/domain/xlogydomain.cpp @@ -264,6 +264,6 @@ QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const XLogYDomain &domain) return dbg.maybeSpace(); } -#include "moc_xlogydomain_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_xlogydomain_p.cpp" diff --git a/src/charts/domain/xlogypolardomain.cpp b/src/charts/domain/xlogypolardomain.cpp index f437f9dc..5f8cecdb 100644 --- a/src/charts/domain/xlogypolardomain.cpp +++ b/src/charts/domain/xlogypolardomain.cpp @@ -242,6 +242,6 @@ QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const XLogYPolarDomain &domain) return dbg.maybeSpace(); } -#include "moc_xlogypolardomain_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_xlogypolardomain_p.cpp" diff --git a/src/charts/domain/xydomain.cpp b/src/charts/domain/xydomain.cpp index a4458f1f..e023c71f 100644 --- a/src/charts/domain/xydomain.cpp +++ b/src/charts/domain/xydomain.cpp @@ -239,6 +239,6 @@ QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const XYDomain &domain) return dbg.maybeSpace(); } -#include "moc_xydomain_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_xydomain_p.cpp" diff --git a/src/charts/domain/xypolardomain.cpp b/src/charts/domain/xypolardomain.cpp index 8715bdac..1db3b9dc 100644 --- a/src/charts/domain/xypolardomain.cpp +++ b/src/charts/domain/xypolardomain.cpp @@ -188,6 +188,6 @@ QDebug Q_AUTOTEST_EXPORT operator<<(QDebug dbg, const XYPolarDomain &domain) return dbg.maybeSpace(); } -#include "moc_xypolardomain_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_xypolardomain_p.cpp" diff --git a/src/charts/legend/legendmarkeritem.cpp b/src/charts/legend/legendmarkeritem.cpp index 8b83a955..2986b687 100644 --- a/src/charts/legend/legendmarkeritem.cpp +++ b/src/charts/legend/legendmarkeritem.cpp @@ -370,6 +370,6 @@ bool LegendMarkerItem::useMaxWidth() const || m_marker->m_legend->alignment() == Qt::AlignRight); } -#include "moc_legendmarkeritem_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_legendmarkeritem_p.cpp" diff --git a/src/charts/legend/legendscroller.cpp b/src/charts/legend/legendscroller.cpp index 009c0cc8..1bff8086 100644 --- a/src/charts/legend/legendscroller.cpp +++ b/src/charts/legend/legendscroller.cpp @@ -78,6 +78,6 @@ void LegendScroller::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) } } +QT_CHARTS_END_NAMESPACE #include "moc_legendscroller_p.cpp" -QT_CHARTS_END_NAMESPACE diff --git a/src/charts/legend/qarealegendmarker.cpp b/src/charts/legend/qarealegendmarker.cpp index ae52fcd1..7729efb9 100644 --- a/src/charts/legend/qarealegendmarker.cpp +++ b/src/charts/legend/qarealegendmarker.cpp @@ -129,7 +129,7 @@ void QAreaLegendMarkerPrivate::updated() emit q_ptr->brushChanged(); } +QT_CHARTS_END_NAMESPACE + #include "moc_qarealegendmarker.cpp" #include "moc_qarealegendmarker_p.cpp" - -QT_CHARTS_END_NAMESPACE diff --git a/src/charts/legend/qbarlegendmarker.cpp b/src/charts/legend/qbarlegendmarker.cpp index 9eea7995..7c5e447a 100644 --- a/src/charts/legend/qbarlegendmarker.cpp +++ b/src/charts/legend/qbarlegendmarker.cpp @@ -148,8 +148,7 @@ void QBarLegendMarkerPrivate::updated() emit q_ptr->penChanged(); } -#include "moc_qbarlegendmarker.cpp" -#include "moc_qbarlegendmarker_p.cpp" - QT_CHARTS_END_NAMESPACE +#include "moc_qbarlegendmarker.cpp" +#include "moc_qbarlegendmarker_p.cpp" diff --git a/src/charts/legend/qboxplotlegendmarker.cpp b/src/charts/legend/qboxplotlegendmarker.cpp index 34f427a8..ad0e9a2a 100644 --- a/src/charts/legend/qboxplotlegendmarker.cpp +++ b/src/charts/legend/qboxplotlegendmarker.cpp @@ -128,8 +128,7 @@ void QBoxPlotLegendMarkerPrivate::updated() emit q_ptr->brushChanged(); } -#include "moc_qboxplotlegendmarker.cpp" -#include "moc_qboxplotlegendmarker_p.cpp" - QT_CHARTS_END_NAMESPACE +#include "moc_qboxplotlegendmarker.cpp" +#include "moc_qboxplotlegendmarker_p.cpp" diff --git a/src/charts/legend/qcandlesticklegendmarker.cpp b/src/charts/legend/qcandlesticklegendmarker.cpp index b46a30bc..52b734f3 100644 --- a/src/charts/legend/qcandlesticklegendmarker.cpp +++ b/src/charts/legend/qcandlesticklegendmarker.cpp @@ -140,7 +140,7 @@ void QCandlestickLegendMarkerPrivate::updated() emit q_ptr->brushChanged(); } +QT_CHARTS_END_NAMESPACE + #include "moc_qcandlesticklegendmarker.cpp" #include "moc_qcandlesticklegendmarker_p.cpp" - -QT_CHARTS_END_NAMESPACE diff --git a/src/charts/legend/qlegend.cpp b/src/charts/legend/qlegend.cpp index d11f2fe3..6cc9c7b6 100644 --- a/src/charts/legend/qlegend.cpp +++ b/src/charts/legend/qlegend.cpp @@ -836,8 +836,8 @@ void QLegendPrivate::updateToolTips() m->d_ptr->m_item->setToolTip(QString()); } } -#include "moc_qlegend.cpp" -#include "moc_qlegend_p.cpp" QT_CHARTS_END_NAMESPACE +#include "moc_qlegend.cpp" +#include "moc_qlegend_p.cpp" diff --git a/src/charts/legend/qlegendmarker.cpp b/src/charts/legend/qlegendmarker.cpp index 827fdb97..6768a765 100644 --- a/src/charts/legend/qlegendmarker.cpp +++ b/src/charts/legend/qlegendmarker.cpp @@ -352,7 +352,7 @@ void QLegendMarkerPrivate::handleShapeChange() m_legend->d_ptr->m_layout->invalidate(); } +QT_CHARTS_END_NAMESPACE + #include "moc_qlegendmarker.cpp" #include "moc_qlegendmarker_p.cpp" - -QT_CHARTS_END_NAMESPACE diff --git a/src/charts/legend/qpielegendmarker.cpp b/src/charts/legend/qpielegendmarker.cpp index 91e90a93..fa4617a8 100644 --- a/src/charts/legend/qpielegendmarker.cpp +++ b/src/charts/legend/qpielegendmarker.cpp @@ -147,7 +147,7 @@ void QPieLegendMarkerPrivate::updated() emit q_ptr->penChanged(); } +QT_CHARTS_END_NAMESPACE + #include "moc_qpielegendmarker.cpp" #include "moc_qpielegendmarker_p.cpp" - -QT_CHARTS_END_NAMESPACE diff --git a/src/charts/legend/qxylegendmarker.cpp b/src/charts/legend/qxylegendmarker.cpp index 1ef11bc8..6700e15d 100644 --- a/src/charts/legend/qxylegendmarker.cpp +++ b/src/charts/legend/qxylegendmarker.cpp @@ -156,8 +156,7 @@ void QXYLegendMarkerPrivate::updated() emit q_ptr->brushChanged(); } -#include "moc_qxylegendmarker.cpp" -#include "moc_qxylegendmarker_p.cpp" - QT_CHARTS_END_NAMESPACE +#include "moc_qxylegendmarker.cpp" +#include "moc_qxylegendmarker_p.cpp" diff --git a/src/charts/linechart/linechartitem.cpp b/src/charts/linechart/linechartitem.cpp index f31c69b4..b96d263a 100644 --- a/src/charts/linechart/linechartitem.cpp +++ b/src/charts/linechart/linechartitem.cpp @@ -467,6 +467,6 @@ void LineChartItem::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) QGraphicsItem::mouseDoubleClickEvent(event); } -#include "moc_linechartitem_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_linechartitem_p.cpp" diff --git a/src/charts/linechart/qlineseries.cpp b/src/charts/linechart/qlineseries.cpp index f1987675..93b2ffc8 100644 --- a/src/charts/linechart/qlineseries.cpp +++ b/src/charts/linechart/qlineseries.cpp @@ -188,6 +188,6 @@ void QLineSeriesPrivate::initializeTheme(int index, ChartTheme* theme, bool forc } } -#include "moc_qlineseries.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_qlineseries.cpp" diff --git a/src/charts/piechart/piechartitem.cpp b/src/charts/piechart/piechartitem.cpp index 35ba08fd..2fe0feff 100644 --- a/src/charts/piechart/piechartitem.cpp +++ b/src/charts/piechart/piechartitem.cpp @@ -271,6 +271,6 @@ PieSliceData PieChartItem::updateSliceGeometry(QPieSlice *slice) return sliceData; } -#include "moc_piechartitem_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_piechartitem_p.cpp" diff --git a/src/charts/piechart/piesliceitem.cpp b/src/charts/piechart/piesliceitem.cpp index 05a790e4..e5e28855 100644 --- a/src/charts/piechart/piesliceitem.cpp +++ b/src/charts/piechart/piesliceitem.cpp @@ -339,7 +339,6 @@ QPainterPath PieSliceItem::labelArmPath(QPointF start, qreal angle, qreal length return path; } -#include "moc_piesliceitem_p.cpp" - QT_CHARTS_END_NAMESPACE +#include "moc_piesliceitem_p.cpp" diff --git a/src/charts/piechart/qhpiemodelmapper.cpp b/src/charts/piechart/qhpiemodelmapper.cpp index a0b8ba12..243b9d28 100644 --- a/src/charts/piechart/qhpiemodelmapper.cpp +++ b/src/charts/piechart/qhpiemodelmapper.cpp @@ -277,6 +277,6 @@ void QHPieModelMapper::setColumnCount(int columnCount) } } -#include "moc_qhpiemodelmapper.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_qhpiemodelmapper.cpp" diff --git a/src/charts/piechart/qpiemodelmapper.cpp b/src/charts/piechart/qpiemodelmapper.cpp index 132c2cd3..d01c706e 100644 --- a/src/charts/piechart/qpiemodelmapper.cpp +++ b/src/charts/piechart/qpiemodelmapper.cpp @@ -572,7 +572,7 @@ void QPieModelMapperPrivate::initializePieFromModel() blockSeriesSignals(false); } +QT_CHARTS_END_NAMESPACE + #include "moc_qpiemodelmapper_p.cpp" #include "moc_qpiemodelmapper.cpp" - -QT_CHARTS_END_NAMESPACE diff --git a/src/charts/piechart/qpieseries.cpp b/src/charts/piechart/qpieseries.cpp index 0e127700..1dc6e0ec 100644 --- a/src/charts/piechart/qpieseries.cpp +++ b/src/charts/piechart/qpieseries.cpp @@ -1067,8 +1067,7 @@ void QPieSeriesPrivate::initializeTheme(int index, ChartTheme* theme, bool force } } +QT_CHARTS_END_NAMESPACE #include "moc_qpieseries.cpp" #include "moc_qpieseries_p.cpp" - -QT_CHARTS_END_NAMESPACE diff --git a/src/charts/piechart/qpieslice.cpp b/src/charts/piechart/qpieslice.cpp index cf84a0e4..ca5ac413 100644 --- a/src/charts/piechart/qpieslice.cpp +++ b/src/charts/piechart/qpieslice.cpp @@ -838,5 +838,6 @@ void QPieSlicePrivate::setAngleSpan(qreal span) QT_CHARTS_END_NAMESPACE QT_CHARTS_USE_NAMESPACE + #include "moc_qpieslice.cpp" #include "moc_qpieslice_p.cpp" diff --git a/src/charts/piechart/qvpiemodelmapper.cpp b/src/charts/piechart/qvpiemodelmapper.cpp index d497349e..baf6c6e8 100644 --- a/src/charts/piechart/qvpiemodelmapper.cpp +++ b/src/charts/piechart/qvpiemodelmapper.cpp @@ -281,6 +281,6 @@ void QVPieModelMapper::setRowCount(int rowCount) } } -#include "moc_qvpiemodelmapper.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_qvpiemodelmapper.cpp" diff --git a/src/charts/qabstractseries.cpp b/src/charts/qabstractseries.cpp index 005e3b21..48f7cf04 100644 --- a/src/charts/qabstractseries.cpp +++ b/src/charts/qabstractseries.cpp @@ -477,9 +477,7 @@ void QAbstractSeriesPrivate::setBlockOpenGL(bool enable) q_ptr->setUseOpenGL(false); } -#include "moc_qabstractseries.cpp" -#include "moc_qabstractseries_p.cpp" - QT_CHARTS_END_NAMESPACE - +#include "moc_qabstractseries.cpp" +#include "moc_qabstractseries_p.cpp" diff --git a/src/charts/qchart.cpp b/src/charts/qchart.cpp index a8af7710..4fad4baf 100644 --- a/src/charts/qchart.cpp +++ b/src/charts/qchart.cpp @@ -951,6 +951,6 @@ void QChartPrivate::scroll(qreal dx, qreal dy) m_presenter->setState(ChartPresenter::ShowState,QPointF()); } -#include "moc_qchart.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_qchart.cpp" diff --git a/src/charts/qchartview.cpp b/src/charts/qchartview.cpp index d9c12994..b8936f03 100644 --- a/src/charts/qchartview.cpp +++ b/src/charts/qchartview.cpp @@ -336,6 +336,6 @@ void QChartViewPrivate::resize() q_ptr->setSceneRect(m_chart->geometry()); } -#include "moc_qchartview.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_qchartview.cpp" diff --git a/src/charts/qpolarchart.cpp b/src/charts/qpolarchart.cpp index ba6a8268..dbfd3a58 100644 --- a/src/charts/qpolarchart.cpp +++ b/src/charts/qpolarchart.cpp @@ -145,6 +145,6 @@ QPolarChart::PolarOrientation QPolarChart::axisPolarOrientation(QAbstractAxis *a return PolarOrientationRadial; } -#include "moc_qpolarchart.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_qpolarchart.cpp" diff --git a/src/charts/scatterchart/qscatterseries.cpp b/src/charts/scatterchart/qscatterseries.cpp index 7cf00731..fe58fd9e 100644 --- a/src/charts/scatterchart/qscatterseries.cpp +++ b/src/charts/scatterchart/qscatterseries.cpp @@ -376,6 +376,6 @@ void QScatterSeriesPrivate::initializeAnimations(QChart::AnimationOptions option QAbstractSeriesPrivate::initializeAnimations(options, duration, curve); } -#include "moc_qscatterseries.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_qscatterseries.cpp" diff --git a/src/charts/scatterchart/scatterchartitem.cpp b/src/charts/scatterchart/scatterchartitem.cpp index 9fb81909..1558cc60 100644 --- a/src/charts/scatterchart/scatterchartitem.cpp +++ b/src/charts/scatterchart/scatterchartitem.cpp @@ -288,6 +288,6 @@ void ScatterChartItem::handleUpdated() update(); } -#include "moc_scatterchartitem_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_scatterchartitem_p.cpp" diff --git a/src/charts/scroller.cpp b/src/charts/scroller.cpp index 7d6f0960..09809973 100644 --- a/src/charts/scroller.cpp +++ b/src/charts/scroller.cpp @@ -220,6 +220,6 @@ void ScrollTicker::timerEvent(QTimerEvent *event) m_scroller->scrollTick(); } -#include "moc_scroller_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_scroller_p.cpp" diff --git a/src/charts/splinechart/qsplineseries.cpp b/src/charts/splinechart/qsplineseries.cpp index bddb5ec1..9f2b0f88 100644 --- a/src/charts/splinechart/qsplineseries.cpp +++ b/src/charts/splinechart/qsplineseries.cpp @@ -185,7 +185,7 @@ void QSplineSeriesPrivate::initializeAnimations(QtCharts::QChart::AnimationOptio QAbstractSeriesPrivate::initializeAnimations(options, duration, curve); } +QT_CHARTS_END_NAMESPACE + #include "moc_qsplineseries.cpp" #include "moc_qsplineseries_p.cpp" - -QT_CHARTS_END_NAMESPACE diff --git a/src/charts/splinechart/splinechartitem.cpp b/src/charts/splinechart/splinechartitem.cpp index 0f9c1e24..f873fd10 100644 --- a/src/charts/splinechart/splinechartitem.cpp +++ b/src/charts/splinechart/splinechartitem.cpp @@ -516,6 +516,6 @@ void SplineChartItem::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) QGraphicsItem::mouseDoubleClickEvent(event); } -#include "moc_splinechartitem_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_splinechartitem_p.cpp" diff --git a/src/charts/xychart/qhxymodelmapper.cpp b/src/charts/xychart/qhxymodelmapper.cpp index b2b08bc0..f11201c2 100644 --- a/src/charts/xychart/qhxymodelmapper.cpp +++ b/src/charts/xychart/qhxymodelmapper.cpp @@ -271,6 +271,6 @@ void QHXYModelMapper::setColumnCount(int columnCount) } } -#include "moc_qhxymodelmapper.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_qhxymodelmapper.cpp" diff --git a/src/charts/xychart/qvxymodelmapper.cpp b/src/charts/xychart/qvxymodelmapper.cpp index 8b176b78..9b5655b7 100644 --- a/src/charts/xychart/qvxymodelmapper.cpp +++ b/src/charts/xychart/qvxymodelmapper.cpp @@ -268,6 +268,6 @@ void QVXYModelMapper::setRowCount(int rowCount) } } -#include "moc_qvxymodelmapper.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_qvxymodelmapper.cpp" diff --git a/src/charts/xychart/qxymodelmapper.cpp b/src/charts/xychart/qxymodelmapper.cpp index b8930621..f3ed4e43 100644 --- a/src/charts/xychart/qxymodelmapper.cpp +++ b/src/charts/xychart/qxymodelmapper.cpp @@ -573,7 +573,7 @@ void QXYModelMapperPrivate::initializeXYFromModel() blockSeriesSignals(false); } +QT_CHARTS_END_NAMESPACE + #include "moc_qxymodelmapper.cpp" #include "moc_qxymodelmapper_p.cpp" - -QT_CHARTS_END_NAMESPACE diff --git a/src/charts/xychart/qxyseries.cpp b/src/charts/xychart/qxyseries.cpp index 547bdf63..039fe247 100644 --- a/src/charts/xychart/qxyseries.cpp +++ b/src/charts/xychart/qxyseries.cpp @@ -1031,7 +1031,7 @@ void QXYSeriesPrivate::drawSeriesPointLabels(QPainter *painter, const QVectorisEmpty() || m_series->points().isEmpty(); } -#include "moc_xychart_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_xychart_p.cpp" diff --git a/src/chartsqml2/declarativeareaseries.cpp b/src/chartsqml2/declarativeareaseries.cpp index be4b9037..737da0d8 100644 --- a/src/chartsqml2/declarativeareaseries.cpp +++ b/src/chartsqml2/declarativeareaseries.cpp @@ -119,6 +119,6 @@ QBrush DeclarativeAreaSeries::brush() const return QAreaSeries::brush(); } -#include "moc_declarativeareaseries_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_declarativeareaseries_p.cpp" diff --git a/src/chartsqml2/declarativeaxes.cpp b/src/chartsqml2/declarativeaxes.cpp index 334744c0..4082cb19 100644 --- a/src/chartsqml2/declarativeaxes.cpp +++ b/src/chartsqml2/declarativeaxes.cpp @@ -65,6 +65,6 @@ void DeclarativeAxes::setAxisYRight(QAbstractAxis *axis) emit axisYRightChanged(axis); } -#include "moc_declarativeaxes_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_declarativeaxes_p.cpp" diff --git a/src/chartsqml2/declarativebarseries.cpp b/src/chartsqml2/declarativebarseries.cpp index 36a811bb..f8197820 100644 --- a/src/chartsqml2/declarativebarseries.cpp +++ b/src/chartsqml2/declarativebarseries.cpp @@ -513,6 +513,6 @@ DeclarativeBarSet *DeclarativeHorizontalPercentBarSeries::insert(int index, QStr return 0; } -#include "moc_declarativebarseries_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_declarativebarseries_p.cpp" diff --git a/src/chartsqml2/declarativeboxplotseries.cpp b/src/chartsqml2/declarativeboxplotseries.cpp index 219d7a7d..30e3a85f 100644 --- a/src/chartsqml2/declarativeboxplotseries.cpp +++ b/src/chartsqml2/declarativeboxplotseries.cpp @@ -496,6 +496,6 @@ void DeclarativeBoxPlotSeries::handleBrushChanged() } } -#include "moc_declarativeboxplotseries_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_declarativeboxplotseries_p.cpp" diff --git a/src/chartsqml2/declarativecandlestickseries.cpp b/src/chartsqml2/declarativecandlestickseries.cpp index 97a5d557..e765a760 100644 --- a/src/chartsqml2/declarativecandlestickseries.cpp +++ b/src/chartsqml2/declarativecandlestickseries.cpp @@ -239,6 +239,6 @@ void DeclarativeCandlestickSeries::handleBrushChanged() } } -#include "moc_declarativecandlestickseries_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_declarativecandlestickseries_p.cpp" diff --git a/src/chartsqml2/declarativecategoryaxis.cpp b/src/chartsqml2/declarativecategoryaxis.cpp index dcfc928d..bf6afa58 100644 --- a/src/chartsqml2/declarativecategoryaxis.cpp +++ b/src/chartsqml2/declarativecategoryaxis.cpp @@ -133,6 +133,6 @@ void DeclarativeCategoryAxis::setLabelsPosition(AxisLabelsPosition position) } } -#include "moc_declarativecategoryaxis_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_declarativecategoryaxis_p.cpp" diff --git a/src/chartsqml2/declarativechart.cpp b/src/chartsqml2/declarativechart.cpp index 2437d4d5..5e83c87a 100644 --- a/src/chartsqml2/declarativechart.cpp +++ b/src/chartsqml2/declarativechart.cpp @@ -1497,6 +1497,6 @@ void DeclarativeChart::setPlotArea(const QRectF &rect) m_chart->setPlotArea(rect); } -#include "moc_declarativechart_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_declarativechart_p.cpp" diff --git a/src/chartsqml2/declarativelineseries.cpp b/src/chartsqml2/declarativelineseries.cpp index 73febddd..7f3e2b8d 100644 --- a/src/chartsqml2/declarativelineseries.cpp +++ b/src/chartsqml2/declarativelineseries.cpp @@ -109,6 +109,6 @@ void DeclarativeLineSeries::appendDeclarativeChildren(QQmlListProperty // Empty implementation, children are parsed in componentComplete } -#include "moc_declarativelineseries_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_declarativelineseries_p.cpp" diff --git a/src/chartsqml2/declarativemargins.cpp b/src/chartsqml2/declarativemargins.cpp index 66891e2a..a51cbd46 100644 --- a/src/chartsqml2/declarativemargins.cpp +++ b/src/chartsqml2/declarativemargins.cpp @@ -123,6 +123,6 @@ void DeclarativeMargins::setRight(int right) } } -#include "moc_declarativemargins_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_declarativemargins_p.cpp" diff --git a/src/chartsqml2/declarativepieseries.cpp b/src/chartsqml2/declarativepieseries.cpp index 300f5f37..72586b48 100644 --- a/src/chartsqml2/declarativepieseries.cpp +++ b/src/chartsqml2/declarativepieseries.cpp @@ -158,6 +158,6 @@ void DeclarativePieSeries::handleRemoved(QList slices) emit sliceRemoved(slice); } -#include "moc_declarativepieseries_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_declarativepieseries_p.cpp" diff --git a/src/chartsqml2/declarativepolarchart.cpp b/src/chartsqml2/declarativepolarchart.cpp index b342a6d2..1ab0516a 100644 --- a/src/chartsqml2/declarativepolarchart.cpp +++ b/src/chartsqml2/declarativepolarchart.cpp @@ -78,6 +78,6 @@ DeclarativePolarChart::~DeclarativePolarChart() { } -#include "moc_declarativepolarchart_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_declarativepolarchart_p.cpp" diff --git a/src/chartsqml2/declarativescatterseries.cpp b/src/chartsqml2/declarativescatterseries.cpp index e53b1984..604fa4c5 100644 --- a/src/chartsqml2/declarativescatterseries.cpp +++ b/src/chartsqml2/declarativescatterseries.cpp @@ -119,6 +119,6 @@ void DeclarativeScatterSeries::handleBrushChanged() } } -#include "moc_declarativescatterseries_p.cpp" - QT_CHARTS_END_NAMESPACE + +#include "moc_declarativescatterseries_p.cpp" diff --git a/src/chartsqml2/declarativesplineseries.cpp b/src/chartsqml2/declarativesplineseries.cpp index bcbfef14..6ade7b92 100644 --- a/src/chartsqml2/declarativesplineseries.cpp +++ b/src/chartsqml2/declarativesplineseries.cpp @@ -109,6 +109,6 @@ void DeclarativeSplineSeries::appendDeclarativeChildren(QQmlListProperty