HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1591:518376bc2c18

DeclarativeBarSeries to DeclarativeAbstractBarSeries

sauimone -

r1591:518376bc2c18

parent child

Context file:

r1591:518376bc2c18

Collapse all files

plugins/declarative/declarativebarseries.cpp +18 -18

                 }
             }
-            DeclarativeBarSeries::DeclarativeBarSeries(QDeclarativeItem *parent) :
+            DeclarativeAbstractBarSeries::DeclarativeAbstractBarSeries(QDeclarativeItem *parent) :
                 QAbstractBarSeries(parent)
             {
                 connect(this, SIGNAL(barsetsAdded(QList<QBarSet*>)), this, SLOT(handleAdded(QList<QBarSet*>)));
                 connect(this, SIGNAL(barsetsRemoved(QList<QBarSet*>)), this, SLOT(handleRemoved(QList<QBarSet*>)));
             }
-            void DeclarativeBarSeries::handleAdded(QList<QBarSet* > barsets)
+            void DeclarativeAbstractBarSeries::handleAdded(QList<QBarSet* > barsets)
             {
                 foreach(QBarSet *b, barsets) {
                     DeclarativeBarSet *barset = qobject_cast<DeclarativeBarSet *>(b);
                 }
             }
-            void DeclarativeBarSeries::handleRemoved(QList<QBarSet* > barsets)
+            void DeclarativeAbstractBarSeries::handleRemoved(QList<QBarSet* > barsets)
             {
                 foreach(QBarSet *b, barsets) {
                     DeclarativeBarSet *barset = qobject_cast<DeclarativeBarSet *>(b);
                 }
             }
-            void DeclarativeBarSeries::classBegin()
+            void DeclarativeAbstractBarSeries::classBegin()
             {
             }
-            void DeclarativeBarSeries::componentComplete()
+            void DeclarativeAbstractBarSeries::componentComplete()
             {
                 foreach(QObject *child, children()) {
                     if (qobject_cast<DeclarativeBarSet *>(child)) {
                 }
             }
-            void DeclarativeBarSeries::setAxisX(QAbstractAxis *axis)
+            void DeclarativeAbstractBarSeries::setAxisX(QAbstractAxis *axis)
             {
                 chart()->setAxisX(axis, this);
             }
-            QAbstractAxis *DeclarativeBarSeries::axisX()
+            QAbstractAxis *DeclarativeAbstractBarSeries::axisX()
             {
                 return chart()->axisX(this);
             }
-            void DeclarativeBarSeries::setAxisY(QAbstractAxis *axis)
+            void DeclarativeAbstractBarSeries::setAxisY(QAbstractAxis *axis)
             {
                 chart()->setAxisY(axis, this);
             }
-            QAbstractAxis *DeclarativeBarSeries::axisY()
+            QAbstractAxis *DeclarativeAbstractBarSeries::axisY()
             {
                 return chart()->axisY(this);
             }
-            QDeclarativeListProperty<QObject> DeclarativeBarSeries::seriesChildren()
+            QDeclarativeListProperty<QObject> DeclarativeAbstractBarSeries::seriesChildren()
             {
-                return QDeclarativeListProperty<QObject>(this, 0, &DeclarativeBarSeries::appendSeriesChildren);
+                return QDeclarativeListProperty<QObject>(this, 0, &DeclarativeAbstractBarSeries::appendSeriesChildren);
             }
-            void DeclarativeBarSeries::appendSeriesChildren(QDeclarativeListProperty<QObject> * list, QObject *element)
+            void DeclarativeAbstractBarSeries::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)
+            DeclarativeBarSet *DeclarativeAbstractBarSeries::at(int index)
             {
                 QList<QBarSet*> setList = barSets();
                 if (index >= 0 && index < setList.count())
                 return 0;
             }
-            DeclarativeBarSet *DeclarativeBarSeries::insert(int index, QString label, QVariantList values)
+            DeclarativeBarSet *DeclarativeAbstractBarSeries::insert(int index, QString label, QVariantList values)
             {
                 int insertIndex = index;
                 if (insertIndex < 0)
             QDeclarativeListProperty<QObject> DeclarativeGroupedBarSeries::seriesChildren()
             {
-                return QDeclarativeListProperty<QObject>(this, 0, &DeclarativeBarSeries::appendSeriesChildren);
+                return QDeclarativeListProperty<QObject>(this, 0, &DeclarativeAbstractBarSeries::appendSeriesChildren);
             }
             void DeclarativeGroupedBarSeries::appendSeriesChildren(QDeclarativeListProperty<QObject> * list, QObject *element)
             QDeclarativeListProperty<QObject> DeclarativeStackedBarSeries::seriesChildren()
             {
-                return QDeclarativeListProperty<QObject>(this, 0, &DeclarativeBarSeries::appendSeriesChildren);
+                return QDeclarativeListProperty<QObject>(this, 0, &DeclarativeAbstractBarSeries::appendSeriesChildren);
             }
             void DeclarativeStackedBarSeries::appendSeriesChildren(QDeclarativeListProperty<QObject> * list, QObject *element)
             QDeclarativeListProperty<QObject> DeclarativePercentBarSeries::seriesChildren()
             {
-                return QDeclarativeListProperty<QObject>(this, 0, &DeclarativeBarSeries::appendSeriesChildren);
+                return QDeclarativeListProperty<QObject>(this, 0, &DeclarativeAbstractBarSeries::appendSeriesChildren);
             }
             void DeclarativePercentBarSeries::appendSeriesChildren(QDeclarativeListProperty<QObject> * list, QObject *element)
                 return 0;
             }
-            #include "moc_declarativebarseries.cpp"
+            #include "moc_declarativeabstractbarseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

plugins/declarative/declarativebarseries.h +2 -2

                 void handleCountChanged(int index, int count);
             };
-            class DeclarativeBarSeries : public QAbstractBarSeries, public QDeclarativeParserStatus
+            class DeclarativeAbstractBarSeries : public QAbstractBarSeries, public QDeclarativeParserStatus
             {
                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
                 Q_CLASSINFO("DefaultProperty", "seriesChildren")
             public:
-                explicit DeclarativeBarSeries(QDeclarativeItem *parent = 0);
+                explicit DeclarativeAbstractBarSeries(QDeclarativeItem *parent = 0);
                 void setAxisX(QAbstractAxis *axis);
                 QAbstractAxis *axisX();
                 void setAxisY(QAbstractAxis *axis);

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