HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1586:9c6a61adadc9

renamed barseries files to abstractbarseries

sauimone -

r1586:9c6a61adadc9

parent child

Context file:

r1586:9c6a61adadc9

Expand all files

demos/chartthemes/themewidget.cpp +1 -1

             #include <QChartView>
             #include <QPieSeries>
             #include <QPieSlice>
-            #include <QBarSeries>
+            #include <QAbstractBarSeries>
             #include <QPercentBarSeries>
             #include <QStackedBarSeries>
             #include <QBarSet>

src/barchart/barchart.pri +3 -3

                 $$PWD/barchartitem.cpp \
                 $$PWD/percentbarchartitem.cpp \
                 $$PWD/groupedbarchartitem.cpp \
-                $$PWD/qbarseries.cpp \
+                $$PWD/qabstractbarseries.cpp \
                 $$PWD/qbarset.cpp \
                 $$PWD/qpercentbarseries.cpp \
                 $$PWD/qstackedbarseries.cpp \
                 $$PWD/stackedbarchartitem_p.h \
                 $$PWD/groupedbarchartitem_p.h \
                 $$PWD/qbarset_p.h \
-                $$PWD/qbarseries_p.h \
+                $$PWD/qabstractbarseries_p.h \
                 $$PWD/qstackedbarseries_p.h\
                 $$PWD/qpercentbarseries_p.h \
                 $$PWD/qgroupedbarseries_p.h \
                 $$PWD/qbarmodelmapper_p.h
             PUBLIC_HEADERS += \
-                $$PWD/qbarseries.h \
+                $$PWD/qabstractbarseries.h \
                 $$PWD/qbarset.h \
                 $$PWD/qpercentbarseries.h \
                 $$PWD/qstackedbarseries.h \

src/barchart/barchartitem.cpp +2 -2

             #include "bar_p.h"
             #include "qbarset.h"
             #include "qbarset_p.h"
-            #include "qbarseries.h"
+            #include "qabstractbarseries.h"
-            #include "qbarseries_p.h"
+            #include "qabstractbarseries_p.h"
             #include "qchart.h"
             #include "chartpresenter_p.h"
             #include "chartanimator_p.h"

src/barchart/barchartitem_p.h +1 -1

             #define BARCHARTITEM_H
             #include "chartitem_p.h"
-            #include "qbarseries.h"
+            #include "qabstractbarseries.h"
             #include <QPen>
             #include <QBrush>

src/barchart/groupedbarchartitem.cpp +1 -1

             #include "groupedbarchartitem_p.h"
             #include "bar_p.h"
             #include "qbarset_p.h"
-            #include "qbarseries_p.h"
+            #include "qabstractbarseries_p.h"
             #include "qbarset.h"
             #include "qbarset_p.h"

src/barchart/percentbarchartitem.cpp +1 -1

             #include "percentbarchartitem_p.h"
             #include "bar_p.h"
-            #include "qbarseries_p.h"
+            #include "qabstractbarseries_p.h"
             #include "qbarset.h"
             #include "chartanimator_p.h"
             #include "qbarset_p.h"

src/barchart/qabstractbarseries.cpp ~~src/barchart/qbarseries.cpp~~ renamed +18 -18

             **
             ****************************************************************************/
-            #include "qbarseries.h"
+            #include "qabstractbarseries.h"
-            #include "qbarseries_p.h"
+            #include "qabstractbarseries_p.h"
             #include "qbarset.h"
             #include "qbarset_p.h"
             #include "domain_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
-                \class QBarSeries
+                \class QAbstractBarSeries
                 \brief Series for creating a bar chart
                 \mainclass
-                QBarSeries represents a series of data shown as bars. The purpose of this class is to draw bars to
+                QAbstractBarSeries represents a series of data shown as bars. The purpose of this class is to draw bars to
                 the position defined by data. Single bar is defined by QPointF, where x value is the x-coordinate of the bar
                 and y-value is the height of the bar. The category names are ignored with this series and x-axis
                 shows the x-values.
                 \sa QBarSet, QStackedBarSeries, QPercentBarSeries
             */
             /*!
-                \qmlclass BarSeries QBarSeries
+                \qmlclass BarSeries QAbstractBarSeries
                 \inherits AbstractSeries
                 The following QML shows how to create a simple bar chart:
             */
             /*!
-                \property QBarSeries::barWidth
+                \property QAbstractBarSeries::barWidth
                 The width of the bars of the series. The unit of \a width is the unit of x-axis. The minimum width for bars
                 is zero and negative values are treated as zero. Setting the width to zero means that width of the bar on screen
                 is one pixel no matter what the scale of x-axis is. Bars wider than zero are scaled with x-axis.
             */
             /*!
-                \property QBarSeries::count
+                \property QAbstractBarSeries::count
                 Holds the number of sets in series.
             */
             /*!
             */
             /*!
-                \property QBarSeries::labelsVisible
+                \property QAbstractBarSeries::labelsVisible
                 Defines the visibility of the labels in series
             */
             /*!
             */
             /*!
-                \fn void QBarSeries::clicked(int index, QBarSet *barset)
+                \fn void QAbstractBarSeries::clicked(int index, QBarSet *barset)
                 The signal is emitted if the user clicks with a mouse on top of QBarSet \a barset.
                 Clicked bar inside set is indexed by \a index
             */
             */
             /*!
-                \fn void QBarSeries::hovered(bool status, QBarSet* barset)
+                \fn void QAbstractBarSeries::hovered(bool status, QBarSet* barset)
                 The signal is emitted if mouse is hovered on top of series.
                 Parameter \a barset is the pointer of barset, where hover happened.
             */
             /*!
-                \fn void QBarSeries::countChanged()
+                \fn void QAbstractBarSeries::countChanged()
                 This signal is emitted when barset count has been changed, for example by append or remove.
             */
             /*!
             */
             /*!
-                \fn void QBarSeries::labelsVisibleChanged()
+                \fn void QAbstractBarSeries::labelsVisibleChanged()
                 This signal is emitted when labels visibility have changed.
                 \sa isLabelsVisible(), setLabelsVisible()
             */
             /*!
-                \fn void QBarSeries::barsetsAdded(QList<QBarSet*> sets)
+                \fn void QAbstractBarSeries::barsetsAdded(QList<QBarSet*> sets)
                 This signal is emitted when \a sets have been added to the series.
                 \sa append(), insert()
             */
             */
             /*!
-                \fn void QBarSeries::barsetsRemoved(QList<QBarSet*> sets)
+                \fn void QAbstractBarSeries::barsetsRemoved(QList<QBarSet*> sets)
                 This signal is emitted when \a sets have been removed from the series.
                 \sa remove()
             */
             */
             /*!
-                Constructs empty QBarSeries.
+                Constructs empty QAbstractBarSeries.
-                QBarSeries is QObject which is a child of a \a parent.
+                QAbstractBarSeries is QObject which is a child of a \a parent.
             */
             QAbstractBarSeries::QAbstractBarSeries(QObject *parent) :
                 QAbstractSeries(*new QAbstractBarSeriesPrivate(this),parent)
                 return true;
             }
-            #include "moc_qbarseries.cpp"
+            #include "moc_qabstractbarseries.cpp"
-            #include "moc_qbarseries_p.cpp"
+            #include "moc_qabstractbarseries_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qabstractbarseries.h ~~src/barchart/qbarseries.h~~ renamed 0 0

NO CONTENT: file renamed from src/barchart/qbarseries.h to src/barchart/qabstractbarseries.h

src/barchart/qabstractbarseries_p.h ~~src/barchart/qbarseries_p.h~~ renamed +4 -4

             //
             // We mean it.
-            #ifndef QBARSERIES_P_H
+            #ifndef QABSTRACTBARSERIES_P_H
-            #define QBARSERIES_P_H
+            #define QABSTRACTBARSERIES_P_H
-            #include "qbarseries.h"
+            #include "qabstractbarseries.h"
             #include "qabstractseries_p.h"
             #include <QStringList>
             #include <QAbstractSeries>
             QTCOMMERCIALCHART_END_NAMESPACE
-            #endif // QBARSERIESPRIVATE_P_H
+            #endif // QABSTRACTBARSERIES_P_H

src/barchart/qbarmodelmapper.cpp +3 -3

             #include "qbarmodelmapper.h"
             #include "qbarmodelmapper_p.h"
-            #include "qbarseries.h"
+            #include "qabstractbarseries.h"
             #include "qbarset.h"
             #include "qchart.h"
             #include <QAbstractItemModel>
             }
             /*!
-                Returns the number of rows/columns of the model that are mapped as the data for QBarSeries
+                Returns the number of rows/columns of the model that are mapped as the data for QAbstractBarSeries
                 Minimal and default value is: -1 (count limited by the number of rows/columns in the model)
             */
             int QBarModelMapper::count() const
             }
             /*!
-                Sets the \a count of rows/columns of the model that are mapped as the data for QBarSeries
+                Sets the \a count of rows/columns of the model that are mapped as the data for QAbstractBarSeries
                 Minimal and default value is: -1 (count limited by the number of rows/columns in the model)
             */
             void QBarModelMapper::setCount(int count)

src/barchart/qbarset.cpp +1 -1

                 \mainclass
-                \sa QBarSeries, QGroupedBarSeries, QStackedBarSeries, QPercentBarSeries
+                \sa QAbstractBarSeries, QGroupedBarSeries, QStackedBarSeries, QPercentBarSeries
             */
             /*!
                 \qmlclass BarSet QBarSet

src/barchart/qbarset.h +1 -1

             private:
                 QScopedPointer<QBarSetPrivate> d_ptr;
                 Q_DISABLE_COPY(QBarSet)
-                friend class QBarSeries;
+                friend class QAbstractBarSeries;
                 friend class BarLegendMarker;
                 friend class BarChartItem;
                 friend class QAbstractBarSeriesPrivate;

src/barchart/qgroupedbarseries.cpp +1 -1

                 See the \l {GroupedbarChart Example} {grouped bar chart example} to learn how to create a grouped bar chart.
                 \image examples_groupedbarchart.png
-                \sa QBarSet, QPercentBarSeries, QBarSeries, QStackedBarSeries
+                \sa QBarSet, QPercentBarSeries, QAbstractBarSeries, QStackedBarSeries
             */
             /*!
                 \qmlclass GroupedBarSeries QGroupedBarSeries

src/barchart/qgroupedbarseries.h +1 -1

             #define GROUPEDBARSERIES_H
             #include <QStringList>
-            #include <qbarseries.h>
+            #include <qabstractbarseries.h>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE

src/barchart/qgroupedbarseries_p.h +1 -1

             #ifndef QGROUPEDBARSERIES_P_H
             #define QGROUPEDBARSERIES_P_H
-            #include "qbarseries_p.h"
+            #include "qabstractbarseries_p.h"
             #include "domain_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE

src/barchart/qhbarmodelmapper.cpp +3 -3

                 \mainclass
                 Model mappers allow you to use QAbstractItemModel derived models as a data source for a chart series.
-                Horizontal model mapper is used to create a connection between QBarSeries and QAbstractItemModel derived model object.
+                Horizontal model mapper is used to create a connection between QAbstractBarSeries and QAbstractItemModel derived model object.
                 Model mapper maintains equal size of all the BarSets.
                 Adding/removing value from the BarSet causes the the same change in the rest of the BarSets added to the same series.
                 NOTE: used model has to support adding/removing rows/columns and modifying the data of the cells.
             /*!
                 \property QHBarModelMapper::columnCount
-                \brief Defines the number of columns of the model that are mapped as the data for QBarSeries
+                \brief Defines the number of columns of the model that are mapped as the data for QAbstractBarSeries
                 Minimal and default value is: -1 (count limited by the number of columns in the model)
             */
             /*!
                 \qmlproperty int HBarModelMapper::columnCount
-                Defines the number of columns of the model that are mapped as the data for QBarSeries. The default value is
+                Defines the number of columns of the model that are mapped as the data for QAbstractBarSeries. The default value is
                 -1 (count limited by the number of columns in the model)
             */

src/barchart/qpercentbarseries.cpp +1 -1

                 See the \l {PercentbarChart Example} {percent bar chart example} to learn how to create a percent bar chart.
                 \image examples_percentbarchart.png
-                \sa QBarSet, QStackedBarSeries, QBarSeries
+                \sa QBarSet, QStackedBarSeries, QAbstractBarSeries
             */
             /*!
                 \qmlclass PercentBarSeries QPercentBarSeries

src/barchart/qpercentbarseries.h +1 -1

             #define PERCENTBARSERIES_H
             #include <QStringList>
-            #include <qbarseries.h>
+            #include <qabstractbarseries.h>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE

src/barchart/qpercentbarseries_p.h +1 -1

             #ifndef QPERCENTBARSERIES_P_H
             #define QPERCENTBARSERIES_P_H
-            #include "qbarseries_p.h"
+            #include "qabstractbarseries_p.h"
             #include "domain_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE

src/barchart/qstackedbarseries.cpp +1 -1

                 See the \l {StackedbarChart Example} {stacked bar chart example} to learn how to create a stacked bar chart.
                 \image examples_stackedbarchart.png
-                \sa QBarSet, QPercentBarSeries, QBarSeries
+                \sa QBarSet, QPercentBarSeries, QAbstractBarSeries
             */
             /*!

src/barchart/qstackedbarseries.h +1 -1

             #define STACKEDBARSERIES_H
             #include <QStringList>
-            #include <qbarseries.h>
+            #include <qabstractbarseries.h>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE

src/barchart/qstackedbarseries_p.h +1 -1

             #ifndef QSTACKEDBARSERIES_P_H
             #define QSTACKEDBARSERIES_P_H
-            #include "qbarseries_p.h"
+            #include "qabstractbarseries_p.h"
             #include "domain_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE

src/barchart/qvbarmodelmapper.cpp +3 -3

                 \mainclass
                 Model mappers allow you to use QAbstractItemModel derived models as a data source for a chart series.
-                Vertical model mapper is used to create a connection between QBarSeries and QAbstractItemModel derived model object.
+                Vertical model mapper is used to create a connection between QAbstractBarSeries and QAbstractItemModel derived model object.
                 Model mapper maintains equal size of all the BarSets.
                 Adding/removing value from the BarSet causes the the same change in the rest of the BarSets added to the same series.
                 NOTE: used model has to support adding/removing rows/columns and modifying the data of the cells.
             /*!
                 \property QVBarModelMapper::rowCount
-                \brief Defines the number of rows of the model that are mapped as the data for QBarSeries
+                \brief Defines the number of rows of the model that are mapped as the data for QAbstractBarSeries
                 Minimal and default value is: -1 (count limited by the number of rows in the model)
             */
             /*!
                 \qmlproperty int VBarModelMapper::rowCount
-                Defines the number of rows of the model that are mapped as the data for QBarSeries. The default value is
+                Defines the number of rows of the model that are mapped as the data for QAbstractBarSeries. The default value is
                 -1 (count limited by the number of rows in the model)
             */

src/barchart/stackedbarchartitem.cpp +1 -1

             #include "stackedbarchartitem_p.h"
             #include "bar_p.h"
             #include "qbarset_p.h"
-            #include "qbarseries_p.h"
+            #include "qabstractbarseries_p.h"
             #include "qbarset.h"
             #include "chartanimator_p.h"

src/chartdataset.cpp +1 -1

             #include "qvaluesaxis.h"
             #include "qvaluesaxis_p.h"
             #include "qabstractseries_p.h"
-            #include "qbarseries.h"
+            #include "qabstractbarseries.h"
             #include "qstackedbarseries.h"
             #include "qpercentbarseries.h"
             #include "qpieseries.h"

src/charttheme.cpp +1 -1

             //series
             #include "qbarset.h"
-            #include "qbarseries.h"
+            #include "qabstractbarseries.h"
             #include "qstackedbarseries.h"
             #include "qpercentbarseries.h"
             #include "qlineseries.h"

src/legend/legendmarker.cpp +1 -1

             #include "qxyseries.h"
             #include "qxyseries_p.h"
             #include "qlegend.h"
-            #include "qbarseries.h"
+            #include "qabstractbarseries.h"
             #include "qpieseries.h"
             #include "qpieslice.h"
             #include "qbarset.h"

src/legend/qlegend.cpp +1 -1

             #include "qareaseries.h"
             #include "qscatterseries.h"
             #include "qsplineseries.h"
-            #include "qbarseries.h"
+            #include "qabstractbarseries.h"
             #include "qstackedbarseries.h"
             #include "qpercentbarseries.h"
             #include "qbarset.h"

src/legend/qlegend.h +1 -1

             class QPieSlice;
             class QXYSeries;
             class QBarSet;
-            class QBarSeries;
+            class QAbstractBarSeries;
             class QPieSeries;
             class QAreaSeries;
             class LegendScrollButton;

src/qabstractseries.cpp +1 -1

                 \mainclass
                 Usually you use the series type specific inherited classes instead of the base class.
-                \sa QXYSeries, QLineSeries, QSplineSeries, QScatterSeries, QAreaSeries, QBarSeries, QStackedBarSeries,
+                \sa QXYSeries, QLineSeries, QSplineSeries, QScatterSeries, QAreaSeries, QAbstractBarSeries, QStackedBarSeries,
                 QPercentBarSeries, QPieSeries
             */
             /*!

tests/auto/chartdataset/tst_chartdataset.cpp +1 -1

             #include <qscatterseries.h>
             #include <qsplineseries.h>
             #include <qpieseries.h>
-            #include <qbarseries.h>
+            #include <qabstractbarseries.h>
             #include <qpercentbarseries.h>
             #include <qstackedbarseries.h>
             #include <private/chartdataset_p.h>

tests/auto/qbarseries/tst_qbarseries.cpp +1 -1

             ****************************************************************************/
             #include <QtTest/QtTest>
-            #include <qbarseries.h>
+            #include <qabstractbarseries.h>
             #include <qbarset.h>
             #include <qchartview.h>
             #include <qchart.h>

tests/auto/qchart/tst_qchart.cpp +1 -1

             #include <qscatterseries.h>
             #include <qsplineseries.h>
             #include <qpieseries.h>
-            #include <qbarseries.h>
+            #include <qabstractbarseries.h>
             #include <qpercentbarseries.h>
             #include <qstackedbarseries.h>
             #include <qvaluesaxis.h>

tests/chartwidgettest/mainwidget.cpp +1 -1

             #include <qareaseries.h>
             #include <qsplineseries.h>
             #include <qbarset.h>
-            #include <qbarseries.h>
+            #include <qabstractbarseries.h>
             #include <qgroupedbarseries.h>
             #include <qstackedbarseries.h>
             #include <qpercentbarseries.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