diff options
author | Jesus Fernandez <jesus.fernandez@qt.io> | 2019-01-21 15:37:33 +0100 |
---|---|---|
committer | Jesus Fernandez <Jesus.Fernandez@qt.io> | 2019-01-21 15:54:20 +0000 |
commit | 70baf5bc141d022f3cd99216c4628c9e38663d4d (patch) | |
tree | 4f122aa55d48195b824dc0d556f79d025ce93477 /src/charts/animations | |
parent | acbd92f90c139839277a60db84753a102dffbcf2 (diff) |
Fix the inclusion of MOC files before QT_CHARTS_END_NAMESPACE
Change-Id: Id4d50a674db619f15f8e9d05c663f2b83bb8b7e5
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/charts/animations')
-rw-r--r-- | src/charts/animations/baranimation.cpp | 4 | ||||
-rw-r--r-- | src/charts/animations/boxplotanimation.cpp | 4 | ||||
-rw-r--r-- | src/charts/animations/boxwhiskersanimation.cpp | 4 | ||||
-rw-r--r-- | src/charts/animations/candlestickanimation.cpp | 4 | ||||
-rw-r--r-- | src/charts/animations/candlestickbodywicksanimation.cpp | 4 | ||||
-rw-r--r-- | src/charts/animations/pieanimation.cpp | 4 | ||||
-rw-r--r-- | src/charts/animations/xyanimation.cpp | 3 |
7 files changed, 14 insertions, 13 deletions
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<QRectF> &oldLayout, const QVector<QRectF> 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" |