HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1831:08849c38dd18

Removed unneeded includes from declarative plugin

Tero Ahola -

r1831:08849c38dd18

parent child

Context file:

r1831:08849c38dd18

Collapse all files

plugins/declarative/declarativeareaseries.cpp +1 0

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "declarativeareaseries.h"
+            #include "declarativelineseries.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             DeclarativeAreaSeries::DeclarativeAreaSeries(QObject *parent) :
                 QAreaSeries(parent),
                 m_axisX(0),
                 m_axisY(0)
             {
             }
             void DeclarativeAreaSeries::setUpperSeries(DeclarativeLineSeries* series)
             {
                 QAreaSeries::setUpperSeries(series);
             }
             DeclarativeLineSeries* DeclarativeAreaSeries::upperSeries() const
             {
                 return qobject_cast<DeclarativeLineSeries *>(QAreaSeries::upperSeries());
             }
             void DeclarativeAreaSeries::setLowerSeries(DeclarativeLineSeries* series)
             {
                 QAreaSeries::setLowerSeries(series);
             }
             DeclarativeLineSeries* DeclarativeAreaSeries::lowerSeries() const
             {
                 return qobject_cast<DeclarativeLineSeries *>(QAreaSeries::lowerSeries());
             }
             #include "moc_declarativeareaseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

plugins/declarative/declarativeareaseries.h +1 -1

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef DECLARATIVEAREASERIES_H
             #define DECLARATIVEAREASERIES_H
             #include "qareaseries.h"
-            #include "declarativelineseries.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
+            class DeclarativeLineSeries;
             class DeclarativeAreaSeries : public QAreaSeries
             {
                 Q_OBJECT
                 Q_PROPERTY(DeclarativeLineSeries *upperSeries READ upperSeries WRITE setUpperSeries)
                 Q_PROPERTY(DeclarativeLineSeries *lowerSeries READ lowerSeries WRITE setLowerSeries)
                 Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged)
                 Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged)
             public:
                 explicit DeclarativeAreaSeries(QObject *parent = 0);
                 void setUpperSeries(DeclarativeLineSeries* series);
                 DeclarativeLineSeries* upperSeries() const;
                 void setLowerSeries(DeclarativeLineSeries* series);
                 DeclarativeLineSeries* lowerSeries() const;
                 QAbstractAxis *axisX() { return m_axisX; }
                 void setAxisX(QAbstractAxis *axis) { m_axisX = axis; emit axisXChanged(axis); }
                 QAbstractAxis *axisY() { return m_axisY; }
                 void setAxisY(QAbstractAxis *axis) { m_axisY = axis; emit axisYChanged(axis); }
             Q_SIGNALS:
                 void axisXChanged(QAbstractAxis *axis);
                 void axisYChanged(QAbstractAxis *axis);
             private:
                 QAbstractAxis *m_axisX;
                 QAbstractAxis *m_axisY;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVEAREASERIES_H

plugins/declarative/declarativebarseries.cpp +3 -3

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "declarativebarseries.h"
-            #include <QBarSet>
+            #include "qbarset.h"
-            #include <QVBarModelMapper>
+            #include "qvbarmodelmapper.h"
-            #include <QHBarModelMapper>
+            #include "qhbarmodelmapper.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             DeclarativeBarSet::DeclarativeBarSet(QObject *parent) :
                 QBarSet("", parent)
             {
                 connect(this, SIGNAL(valuesAdded(int,int)), this, SLOT(handleCountChanged(int, int)));
                 connect(this, SIGNAL(valuesRemoved(int,int)), this, SLOT(handleCountChanged(int, int)));
             }
             void DeclarativeBarSet::handleCountChanged(int index, int count)
             {
                 Q_UNUSED(index)
                 Q_UNUSED(count)
                 emit countChanged(QBarSet::count());
             }
             QVariantList DeclarativeBarSet::values()
             {
                 QVariantList values;
                 for (int i(0); i < count(); i++)
                     values.append(QVariant(QBarSet::at(i)));
                 return values;
             }
             void DeclarativeBarSet::setValues(QVariantList values)
             {
                 while (count())
                     remove(count() - 1);
                 for (int i(0); i < values.count(); i++) {
                     if (values.at(i).canConvert(QVariant::Double))
                         QBarSet::append(values[i].toDouble());
                 }
             }
             // Declarative bar series ======================================================================================
             DeclarativeBarSeries::DeclarativeBarSeries(QDeclarativeItem *parent) :
                 QBarSeries(parent),
                 m_axisX(0),
                 m_axisY(0)
             {
             }
             void DeclarativeBarSeries::classBegin()
             {
             }
             void DeclarativeBarSeries::componentComplete()
             {
                 foreach(QObject *child, children()) {
                     if (qobject_cast<DeclarativeBarSet *>(child)) {
                         QAbstractBarSeries::append(qobject_cast<DeclarativeBarSet *>(child));
                     } else if(qobject_cast<QVBarModelMapper *>(child)) {
                         QVBarModelMapper *mapper = qobject_cast<QVBarModelMapper *>(child);
                         mapper->setSeries(this);
                     } else if(qobject_cast<QHBarModelMapper *>(child)) {
                         QHBarModelMapper *mapper = qobject_cast<QHBarModelMapper *>(child);
                         mapper->setSeries(this);
                     }
                 }
             }
             QDeclarativeListProperty<QObject> DeclarativeBarSeries::seriesChildren()
             {
                 return QDeclarativeListProperty<QObject>(this, 0, &DeclarativeBarSeries::appendSeriesChildren);
             }
             void DeclarativeBarSeries::appendSeriesChildren(QDeclarativeListProperty<QObject> * list, QObject *element)
             {
                 // Empty implementation; the children are parsed in componentComplete instead
                 Q_UNUSED(list);
                 Q_UNUSED(element);
             }
             DeclarativeBarSet *DeclarativeBarSeries::at(int index)
             {
                 QList<QBarSet*> setList = barSets();
                 if (index >= 0 && index < setList.count())
                     return qobject_cast<DeclarativeBarSet *>(setList[index]);
                 return 0;
             }
             DeclarativeBarSet *DeclarativeBarSeries::insert(int index, QString label, QVariantList values)
             {
                 DeclarativeBarSet *barset = new DeclarativeBarSet(this);
                 barset->setLabel(label);
                 barset->setValues(values);
                 if (QBarSeries::insert(index, barset))
                     return barset;
                 delete barset;
                 return 0;
             }
             // Declarative stacked bar series ==============================================================================
             DeclarativeStackedBarSeries::DeclarativeStackedBarSeries(QDeclarativeItem *parent) :
                 QStackedBarSeries(parent),
                 m_axisX(0),
                 m_axisY(0)
             {
             }
             void DeclarativeStackedBarSeries::classBegin()
             {
             }
             void DeclarativeStackedBarSeries::componentComplete()
             {
                 foreach(QObject *child, children()) {
                     if (qobject_cast<DeclarativeBarSet *>(child)) {
                         QAbstractBarSeries::append(qobject_cast<DeclarativeBarSet *>(child));
                     } else if(qobject_cast<QVBarModelMapper *>(child)) {
                         QVBarModelMapper *mapper = qobject_cast<QVBarModelMapper *>(child);
                         mapper->setSeries(this);
                     } else if(qobject_cast<QHBarModelMapper *>(child)) {
                         QHBarModelMapper *mapper = qobject_cast<QHBarModelMapper *>(child);
                         mapper->setSeries(this);
                     }
                 }
             }
             QDeclarativeListProperty<QObject> DeclarativeStackedBarSeries::seriesChildren()
             {
                 return QDeclarativeListProperty<QObject>(this, 0, &DeclarativeBarSeries::appendSeriesChildren);
             }
             void DeclarativeStackedBarSeries::appendSeriesChildren(QDeclarativeListProperty<QObject> * list, QObject *element)
             {
                 // Empty implementation; the children are parsed in componentComplete instead
                 Q_UNUSED(list);
                 Q_UNUSED(element);
             }
             DeclarativeBarSet *DeclarativeStackedBarSeries::at(int index)
             {
                 QList<QBarSet*> setList = barSets();
                 if (index >= 0 && index < setList.count())
                     return qobject_cast<DeclarativeBarSet *>(setList[index]);
                 return 0;
             }
             DeclarativeBarSet *DeclarativeStackedBarSeries::insert(int index, QString label, QVariantList values)
             {
                 DeclarativeBarSet *barset = new DeclarativeBarSet(this);
                 barset->setLabel(label);
                 barset->setValues(values);
                 if (QStackedBarSeries::insert(index, barset))
                     return barset;
                 delete barset;
                 return 0;
             }
             // Declarative percent bar series ==============================================================================
             DeclarativePercentBarSeries::DeclarativePercentBarSeries(QDeclarativeItem *parent) :
                 QPercentBarSeries(parent),
                 m_axisX(0),
                 m_axisY(0)
             {
             }
             void DeclarativePercentBarSeries::classBegin()
             {
             }
             void DeclarativePercentBarSeries::componentComplete()
             {
                 foreach(QObject *child, children()) {
                     if (qobject_cast<DeclarativeBarSet *>(child)) {
                         QAbstractBarSeries::append(qobject_cast<DeclarativeBarSet *>(child));
                     } else if(qobject_cast<QVBarModelMapper *>(child)) {
                         QVBarModelMapper *mapper = qobject_cast<QVBarModelMapper *>(child);
                         mapper->setSeries(this);
                     } else if(qobject_cast<QHBarModelMapper *>(child)) {
                         QHBarModelMapper *mapper = qobject_cast<QHBarModelMapper *>(child);
                         mapper->setSeries(this);
                     }
                 }
             }
             QDeclarativeListProperty<QObject> DeclarativePercentBarSeries::seriesChildren()
             {
                 return QDeclarativeListProperty<QObject>(this, 0, &DeclarativeBarSeries::appendSeriesChildren);
             }
             void DeclarativePercentBarSeries::appendSeriesChildren(QDeclarativeListProperty<QObject> * list, QObject *element)
             {
                 // Empty implementation; the children are parsed in componentComplete instead
                 Q_UNUSED(list);
                 Q_UNUSED(element);
             }
             DeclarativeBarSet *DeclarativePercentBarSeries::at(int index)
             {
                 QList<QBarSet*> setList = barSets();
                 if (index >= 0 && index < setList.count())
                     return qobject_cast<DeclarativeBarSet *>(setList[index]);
                 return 0;
             }
             DeclarativeBarSet *DeclarativePercentBarSeries::insert(int index, QString label, QVariantList values)
             {
                 DeclarativeBarSet *barset = new DeclarativeBarSet(this);
                 barset->setLabel(label);
                 barset->setValues(values);
                 if (QPercentBarSeries::insert(index, barset))
                     return barset;
                 delete barset;
                 return 0;
             }
             // Declarative horizontal bar series ===========================================================================
             DeclarativeHorizontalBarSeries::DeclarativeHorizontalBarSeries(QDeclarativeItem *parent) :
                 QHorizontalBarSeries(parent),
                 m_axisX(0),
                 m_axisY(0)
             {
             }
             void DeclarativeHorizontalBarSeries::classBegin()
             {
             }
             void DeclarativeHorizontalBarSeries::componentComplete()
             {
                 foreach(QObject *child, children()) {
                     if (qobject_cast<DeclarativeBarSet *>(child)) {
                         QAbstractBarSeries::append(qobject_cast<DeclarativeBarSet *>(child));
                     } else if(qobject_cast<QVBarModelMapper *>(child)) {
                         QVBarModelMapper *mapper = qobject_cast<QVBarModelMapper *>(child);
                         mapper->setSeries(this);
                     } else if(qobject_cast<QHBarModelMapper *>(child)) {
                         QHBarModelMapper *mapper = qobject_cast<QHBarModelMapper *>(child);
                         mapper->setSeries(this);
                     }
                 }
             }
             QDeclarativeListProperty<QObject> DeclarativeHorizontalBarSeries::seriesChildren()
             {
                 return QDeclarativeListProperty<QObject>(this, 0, &DeclarativeHorizontalBarSeries::appendSeriesChildren);
             }
             void DeclarativeHorizontalBarSeries::appendSeriesChildren(QDeclarativeListProperty<QObject> * list, QObject *element)
             {
                 // Empty implementation; the children are parsed in componentComplete instead
                 Q_UNUSED(list);
                 Q_UNUSED(element);
             }
             DeclarativeBarSet *DeclarativeHorizontalBarSeries::at(int index)
             {
                 QList<QBarSet*> setList = barSets();
                 if (index >= 0 && index < setList.count())
                     return qobject_cast<DeclarativeBarSet *>(setList[index]);
                 return 0;
             }
             DeclarativeBarSet *DeclarativeHorizontalBarSeries::insert(int index, QString label, QVariantList values)
             {
                 DeclarativeBarSet *barset = new DeclarativeBarSet(this);
                 barset->setLabel(label);
                 barset->setValues(values);
                 if (QHorizontalBarSeries::insert(index, barset))
                     return barset;
                 delete barset;
                 return 0;
             }
             // Declarative horizontal stacked bar series ===================================================================
             DeclarativeHorizontalStackedBarSeries::DeclarativeHorizontalStackedBarSeries(QDeclarativeItem *parent) :
                 QHorizontalStackedBarSeries(parent),
                 m_axisX(0),
                 m_axisY(0)
             {
             }
             void DeclarativeHorizontalStackedBarSeries::classBegin()
             {
             }
             void DeclarativeHorizontalStackedBarSeries::componentComplete()
             {
                 foreach(QObject *child, children()) {
                     if (qobject_cast<DeclarativeBarSet *>(child)) {
                         QAbstractBarSeries::append(qobject_cast<DeclarativeBarSet *>(child));
                     } else if(qobject_cast<QVBarModelMapper *>(child)) {
                         QVBarModelMapper *mapper = qobject_cast<QVBarModelMapper *>(child);
                         mapper->setSeries(this);
                     } else if(qobject_cast<QHBarModelMapper *>(child)) {
                         QHBarModelMapper *mapper = qobject_cast<QHBarModelMapper *>(child);
                         mapper->setSeries(this);
                     }
                 }
             }
             QDeclarativeListProperty<QObject> DeclarativeHorizontalStackedBarSeries::seriesChildren()
             {
                 return QDeclarativeListProperty<QObject>(this, 0, &DeclarativeHorizontalStackedBarSeries::appendSeriesChildren);
             }
             void DeclarativeHorizontalStackedBarSeries::appendSeriesChildren(QDeclarativeListProperty<QObject> * list, QObject *element)
             {
                 // Empty implementation; the children are parsed in componentComplete instead
                 Q_UNUSED(list);
                 Q_UNUSED(element);
             }
             DeclarativeBarSet *DeclarativeHorizontalStackedBarSeries::at(int index)
             {
                 QList<QBarSet*> setList = barSets();
                 if (index >= 0 && index < setList.count())
                     return qobject_cast<DeclarativeBarSet *>(setList[index]);
                 return 0;
             }
             DeclarativeBarSet *DeclarativeHorizontalStackedBarSeries::insert(int index, QString label, QVariantList values)
             {
                 DeclarativeBarSet *barset = new DeclarativeBarSet(this);
                 barset->setLabel(label);
                 barset->setValues(values);
                 if (QHorizontalStackedBarSeries::insert(index, barset))
                     return barset;
                 delete barset;
                 return 0;
             }
             // Declarative horizontal percent bar series ===================================================================
             DeclarativeHorizontalPercentBarSeries::DeclarativeHorizontalPercentBarSeries(QDeclarativeItem *parent) :
                 QHorizontalPercentBarSeries(parent),
                 m_axisX(0),
                 m_axisY(0)
             {
             }
             void DeclarativeHorizontalPercentBarSeries::classBegin()
             {
             }
             void DeclarativeHorizontalPercentBarSeries::componentComplete()
             {
                 foreach(QObject *child, children()) {
                     if (qobject_cast<DeclarativeBarSet *>(child)) {
                         QAbstractBarSeries::append(qobject_cast<DeclarativeBarSet *>(child));
                     } else if(qobject_cast<QVBarModelMapper *>(child)) {
                         QVBarModelMapper *mapper = qobject_cast<QVBarModelMapper *>(child);
                         mapper->setSeries(this);
                     } else if(qobject_cast<QHBarModelMapper *>(child)) {
                         QHBarModelMapper *mapper = qobject_cast<QHBarModelMapper *>(child);
                         mapper->setSeries(this);
                     }
                 }
             }
             QDeclarativeListProperty<QObject> DeclarativeHorizontalPercentBarSeries::seriesChildren()
             {
                 return QDeclarativeListProperty<QObject>(this, 0, &DeclarativeHorizontalPercentBarSeries::appendSeriesChildren);
             }
             void DeclarativeHorizontalPercentBarSeries::appendSeriesChildren(QDeclarativeListProperty<QObject> * list, QObject *element)
             {
                 // Empty implementation; the children are parsed in componentComplete instead
                 Q_UNUSED(list);
                 Q_UNUSED(element);
             }
             DeclarativeBarSet *DeclarativeHorizontalPercentBarSeries::at(int index)
             {
                 QList<QBarSet*> setList = barSets();
                 if (index >= 0 && index < setList.count())
                     return qobject_cast<DeclarativeBarSet *>(setList[index]);
                 return 0;
             }
             DeclarativeBarSet *DeclarativeHorizontalPercentBarSeries::insert(int index, QString label, QVariantList values)
             {
                 DeclarativeBarSet *barset = new DeclarativeBarSet(this);
                 barset->setLabel(label);
                 barset->setValues(values);
                 if (QHorizontalPercentBarSeries::insert(index, barset))
                     return barset;
                 delete barset;
                 return 0;
             }
             #include "moc_declarativebarseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

plugins/declarative/declarativechart.h +1 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef DECLARATIVECHART_H
             #define DECLARATIVECHART_H
             #include <QtCore/QtGlobal>
             #include <QDeclarativeItem>
-            #include <qchart.h>
+            #include "qchart.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class DeclarativeChart : public QDeclarativeItem
             // TODO: for QTQUICK2: extend QQuickPainterItem instead
             //class DeclarativeChart : public QQuickPaintedItem, public Chart
             {
                 Q_OBJECT
                 Q_PROPERTY(Theme theme READ theme WRITE setTheme)
                 Q_PROPERTY(Animation animationOptions READ animationOptions WRITE setAnimationOptions)
                 Q_PROPERTY(QString title READ title WRITE setTitle)
                 Q_PROPERTY(QFont titleFont READ titleFont WRITE setTitleFont)
                 Q_PROPERTY(QColor titleColor READ titleColor WRITE setTitleColor NOTIFY titleColorChanged)
                 Q_PROPERTY(QLegend *legend READ legend)
                 Q_PROPERTY(int count READ count)
                 Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColor NOTIFY backgroundColorChanged)
                 Q_PROPERTY(bool dropShadowEnabled READ dropShadowEnabled WRITE setDropShadowEnabled NOTIFY dropShadowEnabledChanged)
                 Q_PROPERTY(qreal topMargin READ topMargin NOTIFY topMarginChanged)
                 Q_PROPERTY(qreal bottomMargin READ bottomMargin NOTIFY bottomMarginChanged)
                 Q_PROPERTY(qreal leftMargin READ leftMargin NOTIFY leftMarginChanged)
                 Q_PROPERTY(qreal rightMargin READ rightMargin NOTIFY rightMarginChanged)
                 Q_ENUMS(Animation)
                 Q_ENUMS(Theme)
                 Q_ENUMS(SeriesType)
-            //    Q_ENUMS(AxisType)
             public:
                 // duplicating enums from QChart to make the QML api namings 1-to-1 with the C++ api
                 enum Theme {
                     ChartThemeLight = 0,
                     ChartThemeBlueCerulean,
                     ChartThemeDark,
                     ChartThemeBrownSand,
                     ChartThemeBlueNcs,
                     ChartThemeHighContrast,
                     ChartThemeBlueIcy
                 };
                 enum Animation {
                     NoAnimation = 0x0,
                     GridAxisAnimations = 0x1,
                     SeriesAnimations =0x2,
                     AllAnimations = 0x3
                 };
                 enum SeriesType {
                     SeriesTypeLine,
                     SeriesTypeArea,
                     SeriesTypeBar,
                     SeriesTypeStackedBar,
                     SeriesTypePercentBar,
                     SeriesTypePie,
                     SeriesTypeScatter,
                     SeriesTypeSpline,
                     SeriesTypeHorizontalBar,
                     SeriesTypeHorizontalStackedBar,
                     SeriesTypeHorizontalPercentBar
                 };
             public:
                 DeclarativeChart(QDeclarativeItem *parent = 0);
                 ~DeclarativeChart();
             public: // From QDeclarativeItem/QGraphicsItem
                 void childEvent(QChildEvent *event);
                 void componentComplete();
                 void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry);
                 void paint (QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
             public:
                 void setTheme(DeclarativeChart::Theme theme);
                 DeclarativeChart::Theme theme();
                 void setAnimationOptions(DeclarativeChart::Animation animations);
                 DeclarativeChart::Animation animationOptions();
                 void setTitle(QString title);
                 QString title();
                 QLegend *legend();
                 QFont titleFont() const;
                 void setTitleFont(const QFont& font);
                 void setTitleColor(QColor color);
                 QColor titleColor();
                 void setBackgroundColor(QColor color);
                 QColor backgroundColor();
                 int count();
                 void setDropShadowEnabled(bool enabled);
                 bool dropShadowEnabled();
                 qreal topMargin();
                 qreal bottomMargin();
                 qreal leftMargin();
                 qreal rightMargin();
                 void createDefaultAxes(QAbstractSeries* series);
             public:
                 Q_INVOKABLE QAbstractSeries *series(int index);
                 Q_INVOKABLE QAbstractSeries *series(QString seriesName);
                 Q_INVOKABLE QAbstractSeries *createSeries(DeclarativeChart::SeriesType type, QString name = "");
                 Q_INVOKABLE void setAxisX(QAbstractAxis *axis, QAbstractSeries *series = 0);
                 Q_INVOKABLE void setAxisY(QAbstractAxis *axis, QAbstractSeries *series = 0);
                 Q_INVOKABLE void createDefaultAxes();
                 Q_INVOKABLE QAbstractAxis *axisX(QAbstractSeries *series = 0);
                 Q_INVOKABLE QAbstractAxis *axisY(QAbstractSeries *series = 0);
                 Q_INVOKABLE void zoom(qreal factor);
                 Q_INVOKABLE void scrollLeft(qreal pixels);
                 Q_INVOKABLE void scrollRight(qreal pixels);
                 Q_INVOKABLE void scrollUp(qreal pixels);
                 Q_INVOKABLE void scrollDown(qreal pixels);
             Q_SIGNALS:
                 void axisLabelsChanged();
                 void titleColorChanged(QColor color);
                 void backgroundColorChanged();
                 void dropShadowEnabledChanged(bool enabled);
                 void topMarginChanged(qreal margin);
                 void bottomMarginChanged(qreal margin);
                 void leftMarginChanged(qreal margin);
                 void rightMarginChanged(qreal margin);
             public Q_SLOTS:
                 void handleMarginsChanged(QRectF newMargins);
                 void handleAxisXSet(QAbstractAxis *axis);
                 void handleAxisYSet(QAbstractAxis *axis);
             private:
                 // Extending QChart with DeclarativeChart is not possible because QObject does not support
                 // multi inheritance, so we now have a QChart as a member instead
                 QChart *m_chart;
                 QRectF m_chartMargins;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVECHART_H

plugins/declarative/declarativepieseries.cpp +3 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "declarativepieseries.h"
-            #include <QVPieModelMapper>
+            #include "qpieslice.h"
-            #include <QHPieModelMapper>
+            #include "qvpiemodelmapper.h"
+            #include "qhpiemodelmapper.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             DeclarativePieSeries::DeclarativePieSeries(QDeclarativeItem *parent) :
                 QPieSeries(parent)
             {
                 connect(this, SIGNAL(added(QList<QPieSlice*>)), this, SLOT(handleAdded(QList<QPieSlice*>)));
                 connect(this, SIGNAL(removed(QList<QPieSlice*>)), this, SLOT(handleRemoved(QList<QPieSlice*>)));
             }
             void DeclarativePieSeries::classBegin()
             {
             }
             void DeclarativePieSeries::componentComplete()
             {
                 foreach(QObject *child, children()) {
                     if (qobject_cast<QPieSlice *>(child)) {
                         QPieSeries::append(qobject_cast<QPieSlice *>(child));
                     } else if(qobject_cast<QVPieModelMapper *>(child)) {
                         QVPieModelMapper *mapper = qobject_cast<QVPieModelMapper *>(child);
                         mapper->setSeries(this);
                     } else if(qobject_cast<QHPieModelMapper *>(child)) {
                         QHPieModelMapper *mapper = qobject_cast<QHPieModelMapper *>(child);
                         mapper->setSeries(this);
                     }
                 }
             }
             QDeclarativeListProperty<QObject> DeclarativePieSeries::seriesChildren()
             {
                 return QDeclarativeListProperty<QObject>(this, 0, &DeclarativePieSeries::appendSeriesChildren);
             }
             void DeclarativePieSeries::appendSeriesChildren(QDeclarativeListProperty<QObject> * list, QObject *element)
             {
                 // Empty implementation; the children are parsed in componentComplete instead
                 Q_UNUSED(list);
                 Q_UNUSED(element);
             }
             QPieSlice *DeclarativePieSeries::at(int index)
             {
                 QList<QPieSlice*> sliceList = slices();
                 if (index >= 0 && index < sliceList.count())
                     return sliceList[index];
                 return 0;
             }
             QPieSlice* DeclarativePieSeries::find(QString label)
             {
                 foreach (QPieSlice *slice, slices()) {
                     if (slice->label() == label)
                         return slice;
                 }
                 return 0;
             }
             QPieSlice* DeclarativePieSeries::append(QString label, qreal value)
             {
                 // TODO: parameter order is wrong, switch it:
                 QPieSlice *slice = new QPieSlice(this);
                 slice->setLabel(label);
                 slice->setValue(value);
                 QPieSeries::append(slice);
                 return slice;
             }
             bool DeclarativePieSeries::remove(QPieSlice *slice)
             {
                 return QPieSeries::remove(slice);
             }
             void DeclarativePieSeries::clear()
             {
                 QPieSeries::clear();
             }
             void DeclarativePieSeries::handleAdded(QList<QPieSlice*> slices)
             {
                 foreach(QPieSlice *slice, slices)
                     emit sliceAdded(slice);
             }
             void DeclarativePieSeries::handleRemoved(QList<QPieSlice*> slices)
             {
                 foreach(QPieSlice *slice, slices)
                     emit sliceRemoved(slice);
             }
             #include "moc_declarativepieseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

plugins/declarative/declarativepieseries.h +1 -1

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef DECLARATIVEPIESERIES_H
             #define DECLARATIVEPIESERIES_H
-            #include "qpieslice.h"
             #include "qpieseries.h"
             #include <QDeclarativeItem>
             #include <QDeclarativeParserStatus>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
+            class QPieSlice;
             class DeclarativePieSeries : public QPieSeries, public QDeclarativeParserStatus
             {
                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> seriesChildren READ seriesChildren)
                 Q_CLASSINFO("DefaultProperty", "seriesChildren")
             public:
                 explicit DeclarativePieSeries(QDeclarativeItem *parent = 0);
                 QDeclarativeListProperty<QObject> seriesChildren();
                 Q_INVOKABLE QPieSlice *at(int index);
                 Q_INVOKABLE QPieSlice *find(QString label);
                 Q_INVOKABLE QPieSlice *append(QString label, qreal value);
                 Q_INVOKABLE bool remove(QPieSlice *slice);
                 Q_INVOKABLE void clear();
             public:
                 void classBegin();
                 void componentComplete();
             Q_SIGNALS:
                 void sliceAdded(QPieSlice* slice);
                 void sliceRemoved(QPieSlice* slice);
             public Q_SLOTS:
                 static void appendSeriesChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
                 void handleAdded(QList<QPieSlice*> slices);
                 void handleRemoved(QList<QPieSlice*> slices);
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVEPIESERIES_H

plugins/declarative/declarativexypoint.cpp +1 0

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "declarativexypoint.h"
+            #include <QDataStream>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 \qmlclass XYPoint QPointF
                 XYPoint is a convenience element for initializing XY-series with static coordinate data. To
                 manipulate an XY-series dynamically, use it's data manipulation functions instead.
                 \sa LineSeries, AreaSeries, ScatterSeries, SplineSeries
             */
             /*!
                 \qmlproperty real XYPoint::x
                 The x-coordinate of the point.
             */
             /*!
                 \qmlproperty real XYPoint::y
                 The y-coordinate of the point.
             */
             DeclarativeXYPoint::DeclarativeXYPoint(QObject *parent) :
                 QObject(parent)
             {
                 setX(0.0);
                 setY(0.0);
             }
             #include "moc_declarativexypoint.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

plugins/declarative/declarativexypoint.h 0 -1

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef DECLARATIVE_XY_POINT_H
             #define DECLARATIVE_XY_POINT_H
             #include "qchartglobal.h"
             #include <QObject>
             #include <QPointF>
-            #include <QDataStream>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class DeclarativeXYPoint : public QObject, public QPointF
             {
                 Q_OBJECT
                 // TODO: make the setters change the value, if parented by a series
                 Q_PROPERTY(qreal x READ x WRITE setX /*NOTIFY dataXChanged*/)
                 Q_PROPERTY(qreal y READ y WRITE setY /*NOTIFY dataYChanged*/)
             public:
                 explicit DeclarativeXYPoint(QObject *parent = 0);
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVE_XY_POINT_H

plugins/declarative/declarativexyseries.cpp +3 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "declarativexyseries.h"
-            #include <QVXYModelMapper>
+            #include "declarativexypoint.h"
-            #include <QHXYModelMapper>
+            #include "qvxymodelmapper.h"
+            #include "qhxymodelmapper.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             DeclarativeXySeries::DeclarativeXySeries()
             {
             }
             DeclarativeXySeries::~DeclarativeXySeries()
             {
             }
             void DeclarativeXySeries::classBegin()
             {
             }
             void DeclarativeXySeries::componentComplete()
             {
                 QXYSeries *series = qobject_cast<QXYSeries *>(xySeries());
                 Q_ASSERT(series);
                 foreach(QObject *child, series->children()) {
                     if (qobject_cast<DeclarativeXYPoint *>(child)) {
                         DeclarativeXYPoint *point = qobject_cast<DeclarativeXYPoint *>(child);
                         series->append(point->x(), point->y());
                     } else if(qobject_cast<QVXYModelMapper *>(child)) {
                         QVXYModelMapper *mapper = qobject_cast<QVXYModelMapper *>(child);
                         mapper->setSeries(series);
                     } else if(qobject_cast<QHXYModelMapper *>(child)) {
                         QHXYModelMapper *mapper = qobject_cast<QHXYModelMapper *>(child);
                         mapper->setSeries(series);
                     }
                 }
             }
             void DeclarativeXySeries::append(qreal x, qreal y)
             {
                 QXYSeries *series = qobject_cast<QXYSeries *>(xySeries());
                 Q_ASSERT(series);
                 series->append(x, y);
             }
             void DeclarativeXySeries::replace(qreal oldX, qreal oldY, qreal newX, qreal newY)
             {
                 QXYSeries *series = qobject_cast<QXYSeries *>(xySeries());
                 Q_ASSERT(series);
                 series->replace(oldX, oldY, newX, newY);
             }
             void DeclarativeXySeries::remove(qreal x, qreal y)
             {
                 QXYSeries *series = qobject_cast<QXYSeries *>(xySeries());
                 Q_ASSERT(series);
                 series->remove(x, y);
             }
             void DeclarativeXySeries::insert(int index, qreal x, qreal y)
             {
                 QXYSeries *series = qobject_cast<QXYSeries *>(xySeries());
                 Q_ASSERT(series);
                 series->insert(index, QPointF(x, y));
             }
             void DeclarativeXySeries::clear()
             {
                 QXYSeries *series = qobject_cast<QXYSeries *>(xySeries());
                 Q_ASSERT(series);
                 series->clear();
             }
             QPointF DeclarativeXySeries::at(int index)
             {
                 QXYSeries *series = qobject_cast<QXYSeries *>(xySeries());
                 Q_ASSERT(series);
                 if (index >= 0 || index < series->count())
                     return series->points().at(index);
                 return QPointF(0, 0);
             }
             QTCOMMERCIALCHART_END_NAMESPACE

plugins/declarative/declarativexyseries.h 0 -1

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef DECLARATIVE_XY_SERIES_H
             #define DECLARATIVE_XY_SERIES_H
-            #include "declarativexypoint.h"
             #include <QXYSeries>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChart;
             class QAbstractSeries;
             class DeclarativeXySeries
             {
             public:
                 explicit DeclarativeXySeries();
                 ~DeclarativeXySeries();
             public:
                 void classBegin();
                 void componentComplete();
                 virtual QXYSeries *xySeries() = 0;
                 void append(qreal x, qreal y);
                 void replace(qreal oldX, qreal oldY, qreal newX, qreal newY);
                 void remove(qreal x, qreal y);
                 void insert(int index, qreal x, qreal y);
                 void clear();
                 QPointF at(int index);
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // DECLARATIVE_XY_SERIES_H

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages