diff options
Diffstat (limited to 'src/charts/barchart')
19 files changed, 33 insertions, 38 deletions
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<QRectF> 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<QRectF> 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<QRectF> 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" |