From f1a8cd777029ce73426630302fbe7799bf05893a 2012-08-22 10:45:55 From: Marek Rosa Date: 2012-08-22 10:45:55 Subject: [PATCH] QBarCategoriesAxis renamed to QBarCategoryAxis --- diff --git a/examples/barchart/main.cpp b/examples/barchart/main.cpp index f324d31..96e0347 100644 --- a/examples/barchart/main.cpp +++ b/examples/barchart/main.cpp @@ -66,7 +66,7 @@ int main(int argc, char *argv[]) //![4] QStringList categories; categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; - QBarCategoriesAxis* axis = new QBarCategoriesAxis(); + QBarCategoryAxis* axis = new QBarCategoryAxis(); axis->append(categories); chart->setAxisX(axis,series); //![4] diff --git a/examples/barmodelmapper/tablewidget.cpp b/examples/barmodelmapper/tablewidget.cpp index ede86a3..3d45009 100644 --- a/examples/barmodelmapper/tablewidget.cpp +++ b/examples/barmodelmapper/tablewidget.cpp @@ -88,7 +88,7 @@ TableWidget::TableWidget(QWidget *parent) //! [6] QStringList categories; categories << "April" << "May" << "June" << "July" << "August"; - QBarCategoriesAxis* axis = new QBarCategoriesAxis(); + QBarCategoryAxis* axis = new QBarCategoryAxis(); axis->append(categories); chart->createDefaultAxes(); chart->setAxisX(axis, series); diff --git a/examples/horizontalbarchart/main.cpp b/examples/horizontalbarchart/main.cpp index 1dcff73..cb3d3cb 100644 --- a/examples/horizontalbarchart/main.cpp +++ b/examples/horizontalbarchart/main.cpp @@ -68,7 +68,7 @@ int main(int argc, char *argv[]) //![4] QStringList categories; categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; - QBarCategoriesAxis* axis = new QBarCategoriesAxis(); + QBarCategoryAxis* axis = new QBarCategoryAxis(); axis->append(categories); chart->setAxisY(axis,series); //![4] diff --git a/examples/horizontalpercentbarchart/main.cpp b/examples/horizontalpercentbarchart/main.cpp index 989600a..f8bf5a1 100644 --- a/examples/horizontalpercentbarchart/main.cpp +++ b/examples/horizontalpercentbarchart/main.cpp @@ -68,7 +68,7 @@ int main(int argc, char *argv[]) //![4] QStringList categories; categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; - QBarCategoriesAxis* axis = new QBarCategoriesAxis(); + QBarCategoryAxis* axis = new QBarCategoryAxis(); axis->append(categories); chart->createDefaultAxes(); chart->setAxisY(axis,series); diff --git a/examples/horizontalstackedbarchart/main.cpp b/examples/horizontalstackedbarchart/main.cpp index c0498ea..e1ea925 100644 --- a/examples/horizontalstackedbarchart/main.cpp +++ b/examples/horizontalstackedbarchart/main.cpp @@ -68,7 +68,7 @@ int main(int argc, char *argv[]) //![4] QStringList categories; categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; - QBarCategoriesAxis* axis = new QBarCategoriesAxis(); + QBarCategoryAxis* axis = new QBarCategoryAxis(); axis->append(categories); chart->createDefaultAxes(); chart->setAxisY(axis,series); diff --git a/examples/lineandbar/main.cpp b/examples/lineandbar/main.cpp index 1c6165b..27a219c 100644 --- a/examples/lineandbar/main.cpp +++ b/examples/lineandbar/main.cpp @@ -78,7 +78,7 @@ int main(int argc, char *argv[]) //![4] QStringList categories; categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; - QBarCategoriesAxis* axisX = new QBarCategoriesAxis(); + QBarCategoryAxis* axisX = new QBarCategoryAxis(); axisX->append(categories); chart->setAxisX(axisX,lineseries); chart->setAxisX(axisX,barseries); diff --git a/examples/percentbarchart/main.cpp b/examples/percentbarchart/main.cpp index 45fcbcf..7535f87 100644 --- a/examples/percentbarchart/main.cpp +++ b/examples/percentbarchart/main.cpp @@ -64,7 +64,7 @@ int main(int argc, char *argv[]) //![4] QStringList categories; categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; - QBarCategoriesAxis* axis = new QBarCategoriesAxis(); + QBarCategoryAxis* axis = new QBarCategoryAxis(); axis->append(categories); chart->createDefaultAxes(); chart->setAxisX(axis,series); diff --git a/examples/populationpyramid/main.cpp b/examples/populationpyramid/main.cpp index 933f699..3a705dc 100644 --- a/examples/populationpyramid/main.cpp +++ b/examples/populationpyramid/main.cpp @@ -67,7 +67,7 @@ int main(int argc, char *argv[]) categories << "0-4" << "5-9" << "10-14" << "15-19" << "20-24" << "25-29" << "30-34" << "35-39" << "40-44" << "45-49" << "50-54" << "55-59" << "60-64" << "65-69" << "70-74" << "75-79" << "80-84" << "85-89" << "90-"; - QBarCategoriesAxis* axis = new QBarCategoriesAxis(); + QBarCategoryAxis* axis = new QBarCategoryAxis(); axis->append(categories); chart->setAxisY(axis,series); //![4] diff --git a/examples/scrollchart/main.cpp b/examples/scrollchart/main.cpp index 5daf6b5..7783739 100644 --- a/examples/scrollchart/main.cpp +++ b/examples/scrollchart/main.cpp @@ -71,7 +71,7 @@ int main(int argc, char *argv[]) QStringList categories; categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; - QBarCategoriesAxis* axis = new QBarCategoriesAxis(); + QBarCategoryAxis* axis = new QBarCategoryAxis(); axis->append(categories); chart->setAxisX(axis, series2); diff --git a/examples/stackedbarchart/main.cpp b/examples/stackedbarchart/main.cpp index cf9b312..da6d4d2 100644 --- a/examples/stackedbarchart/main.cpp +++ b/examples/stackedbarchart/main.cpp @@ -65,7 +65,7 @@ int main(int argc, char *argv[]) //![4] QStringList categories; categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun"; - QBarCategoriesAxis* axis = new QBarCategoriesAxis(); + QBarCategoryAxis* axis = new QBarCategoryAxis(); axis->append(categories); chart->setAxisX(axis,series); //![4] diff --git a/examples/stackedbarchartdrilldown/drilldownchart.cpp b/examples/stackedbarchartdrilldown/drilldownchart.cpp index 5844448..b6cb708 100644 --- a/examples/stackedbarchartdrilldown/drilldownchart.cpp +++ b/examples/stackedbarchartdrilldown/drilldownchart.cpp @@ -38,7 +38,7 @@ void DrilldownChart::changeSeries(DrilldownBarSeries *series) m_currentSeries = series; // Reset axis - QBarCategoriesAxis* axis = new QBarCategoriesAxis(); + QBarCategoryAxis* axis = new QBarCategoryAxis(); axis->append(m_currentSeries->categories()); addSeries(series); diff --git a/plugins/declarative/plugin.cpp b/plugins/declarative/plugin.cpp index fa60094..33f2b22 100644 --- a/plugins/declarative/plugin.cpp +++ b/plugins/declarative/plugin.cpp @@ -69,7 +69,7 @@ public: qmlRegisterType(uri, 1, 0, "HBarModelMapper"); qmlRegisterType(uri, 1, 0, "VBarModelMapper"); qmlRegisterType(uri, 1, 0, "ValuesAxis"); - qmlRegisterType(uri, 1, 0, "BarCategoriesAxis"); + qmlRegisterType(uri, 1, 0, "BarCategoriesAxis"); qmlRegisterUncreatableType(uri, 1, 0, "Legend", QLatin1String("Trying to create uncreatable: Legend.")); diff --git a/src/axis/categoriesaxis/chartcategoriesaxisx.cpp b/src/axis/categoriesaxis/chartcategoriesaxisx.cpp index 40bd81d..490a582 100644 --- a/src/axis/categoriesaxis/chartcategoriesaxisx.cpp +++ b/src/axis/categoriesaxis/chartcategoriesaxisx.cpp @@ -28,7 +28,7 @@ static int label_padding = 5; QTCOMMERCIALCHART_BEGIN_NAMESPACE -ChartCategoriesAxisX::ChartCategoriesAxisX(QBarCategoriesAxis *axis,ChartPresenter *presenter) : ChartAxis(axis,presenter), +ChartCategoriesAxisX::ChartCategoriesAxisX(QBarCategoryAxis *axis,ChartPresenter *presenter) : ChartAxis(axis,presenter), m_categoriesAxis(axis) { diff --git a/src/axis/categoriesaxis/chartcategoriesaxisx_p.h b/src/axis/categoriesaxis/chartcategoriesaxisx_p.h index 3bed620..33ed4e2 100644 --- a/src/axis/categoriesaxis/chartcategoriesaxisx_p.h +++ b/src/axis/categoriesaxis/chartcategoriesaxisx_p.h @@ -36,12 +36,12 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE class QAbstractAxis; class ChartPresenter; -class QBarCategoriesAxis; +class QBarCategoryAxis; class ChartCategoriesAxisX : public ChartAxis { public: - ChartCategoriesAxisX(QBarCategoriesAxis *axis, ChartPresenter *presenter); + ChartCategoriesAxisX(QBarCategoryAxis *axis, ChartPresenter *presenter); ~ChartCategoriesAxisX(); AxisType axisType() const { return X_AXIS;} @@ -56,7 +56,7 @@ Q_SLOTS private: QStringList m_categories; - QBarCategoriesAxis *m_categoriesAxis; + QBarCategoryAxis *m_categoriesAxis; }; QTCOMMERCIALCHART_END_NAMESPACE diff --git a/src/axis/categoriesaxis/chartcategoriesaxisy.cpp b/src/axis/categoriesaxis/chartcategoriesaxisy.cpp index 4495fe1..798e36d 100644 --- a/src/axis/categoriesaxis/chartcategoriesaxisy.cpp +++ b/src/axis/categoriesaxis/chartcategoriesaxisy.cpp @@ -27,7 +27,7 @@ static int label_padding = 5; QTCOMMERCIALCHART_BEGIN_NAMESPACE -ChartCategoriesAxisY::ChartCategoriesAxisY(QBarCategoriesAxis *axis,ChartPresenter *presenter) : ChartAxis(axis,presenter), +ChartCategoriesAxisY::ChartCategoriesAxisY(QBarCategoryAxis *axis,ChartPresenter *presenter) : ChartAxis(axis,presenter), m_categoriesAxis(axis) { } diff --git a/src/axis/categoriesaxis/chartcategoriesaxisy_p.h b/src/axis/categoriesaxis/chartcategoriesaxisy_p.h index 0acbed0..1a0b7c0 100644 --- a/src/axis/categoriesaxis/chartcategoriesaxisy_p.h +++ b/src/axis/categoriesaxis/chartcategoriesaxisy_p.h @@ -35,13 +35,13 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE class QAbstractAxis; -class QBarCategoriesAxis; +class QBarCategoryAxis; class ChartPresenter; class ChartCategoriesAxisY : public ChartAxis { public: - ChartCategoriesAxisY(QBarCategoriesAxis *axis, ChartPresenter *presenter); + ChartCategoriesAxisY(QBarCategoryAxis *axis, ChartPresenter *presenter); ~ChartCategoriesAxisY(); AxisType axisType() const { return Y_AXIS;} @@ -55,7 +55,7 @@ Q_SLOTS void handleAxisUpdated(); private: QStringList m_categories; - QBarCategoriesAxis *m_categoriesAxis; + QBarCategoryAxis *m_categoriesAxis; }; QTCOMMERCIALCHART_END_NAMESPACE diff --git a/src/axis/categoriesaxis/qbarcategoriesaxis.cpp b/src/axis/categoriesaxis/qbarcategoriesaxis.cpp index 5cc4fd6..c7beef1 100644 --- a/src/axis/categoriesaxis/qbarcategoriesaxis.cpp +++ b/src/axis/categoriesaxis/qbarcategoriesaxis.cpp @@ -114,17 +114,17 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE /*! Constructs an axis object which is a child of \a parent. */ -QBarCategoriesAxis::QBarCategoriesAxis(QObject *parent): - QAbstractAxis(*new QBarCategoriesAxisPrivate(this),parent) +QBarCategoryAxis::QBarCategoryAxis(QObject *parent): + QAbstractAxis(*new QBarCategoryAxisPrivate(this),parent) { } /*! Destroys the object */ -QBarCategoriesAxis::~QBarCategoriesAxis() +QBarCategoryAxis::~QBarCategoryAxis() { - Q_D(QBarCategoriesAxis); + Q_D(QBarCategoryAxis); if(d->m_dataset){ d->m_dataset->removeAxis(this); } @@ -133,7 +133,7 @@ QBarCategoriesAxis::~QBarCategoriesAxis() /*! \internal */ -QBarCategoriesAxis::QBarCategoriesAxis(QBarCategoriesAxisPrivate &d,QObject *parent):QAbstractAxis(d,parent) +QBarCategoryAxis::QBarCategoryAxis(QBarCategoryAxisPrivate &d,QObject *parent):QAbstractAxis(d,parent) { } @@ -141,11 +141,11 @@ QBarCategoriesAxis::QBarCategoriesAxis(QBarCategoriesAxisPrivate &d,QObject *par /*! Appends \a categories to axis */ -void QBarCategoriesAxis::append(const QStringList &categories) +void QBarCategoryAxis::append(const QStringList &categories) { if(categories.isEmpty()) return; - Q_D(QBarCategoriesAxis); + Q_D(QBarCategoryAxis); if (d->m_categories.isEmpty()) { d->m_categories.append(categories); setRange(categories.first(),categories.last()); @@ -159,9 +159,9 @@ void QBarCategoriesAxis::append(const QStringList &categories) /*! Appends \a category to axis */ -void QBarCategoriesAxis::append(const QString &category) +void QBarCategoryAxis::append(const QString &category) { - Q_D(QBarCategoriesAxis); + Q_D(QBarCategoryAxis); if (d->m_categories.isEmpty()) { d->m_categories.append(category); setRange(category,category); @@ -175,9 +175,9 @@ void QBarCategoriesAxis::append(const QString &category) /*! Removes \a category from axis */ -void QBarCategoriesAxis::remove(const QString &category) +void QBarCategoryAxis::remove(const QString &category) { - Q_D(QBarCategoriesAxis); + Q_D(QBarCategoryAxis); if (d->m_categories.contains(category)) { d->m_categories.removeAt(d->m_categories.indexOf(category)); if(!d->m_categories.isEmpty()) @@ -191,9 +191,9 @@ void QBarCategoriesAxis::remove(const QString &category) /*! Inserts \a category to axis at \a index */ -void QBarCategoriesAxis::insert(int index, const QString &category) +void QBarCategoryAxis::insert(int index, const QString &category) { - Q_D(QBarCategoriesAxis); + Q_D(QBarCategoryAxis); if (d->m_categories.isEmpty()) { d->m_categories.insert(index,category); setRange(category,category); @@ -208,9 +208,9 @@ void QBarCategoriesAxis::insert(int index, const QString &category) Replaces \a oldCategory with \a newCategory. If \a oldCategory does not exits on the axis nothing is done. */ -void QBarCategoriesAxis::replace(const QString &oldCategory, const QString &newCategory) +void QBarCategoryAxis::replace(const QString &oldCategory, const QString &newCategory) { - Q_D(QBarCategoriesAxis); + Q_D(QBarCategoryAxis); int pos = d->m_categories.indexOf(oldCategory); if (pos != -1) { d->m_categories.replace(pos, newCategory); @@ -222,17 +222,17 @@ void QBarCategoriesAxis::replace(const QString &oldCategory, const QString &newC /*! Removes all categories. */ -void QBarCategoriesAxis::clear() +void QBarCategoryAxis::clear() { - Q_D(QBarCategoriesAxis); + Q_D(QBarCategoryAxis); d->m_categories.clear(); setRange(QString::null,QString::null); emit categoriesChanged(); } -void QBarCategoriesAxis::setCategories(const QStringList &categories) +void QBarCategoryAxis::setCategories(const QStringList &categories) { - Q_D(QBarCategoriesAxis); + Q_D(QBarCategoryAxis); if(d->m_categories!=categories) { d->m_categories = categories; setRange(categories.first(),categories.last()); @@ -240,72 +240,72 @@ void QBarCategoriesAxis::setCategories(const QStringList &categories) } } -QStringList QBarCategoriesAxis::categories() +QStringList QBarCategoryAxis::categories() { - Q_D(QBarCategoriesAxis); + Q_D(QBarCategoryAxis); return d->m_categories; } /*! Returns number of categories. */ -int QBarCategoriesAxis::count() const +int QBarCategoryAxis::count() const { - Q_D(const QBarCategoriesAxis); + Q_D(const QBarCategoryAxis); return d->m_categories.count(); } /*! Returns category at \a index. Index must be valid. */ -QString QBarCategoriesAxis::at(int index) const +QString QBarCategoryAxis::at(int index) const { - Q_D(const QBarCategoriesAxis); + Q_D(const QBarCategoryAxis); return d->m_categories.at(index); } /*! Sets minimum category to \a min. */ -void QBarCategoriesAxis::setMin(const QString& min) +void QBarCategoryAxis::setMin(const QString& min) { - Q_D(QBarCategoriesAxis); + Q_D(QBarCategoryAxis); setRange(min,d->m_maxCategory); } /*! Returns minimum category. */ -QString QBarCategoriesAxis::min() const +QString QBarCategoryAxis::min() const { - Q_D(const QBarCategoriesAxis); + Q_D(const QBarCategoryAxis); return d->m_minCategory; } /*! Sets maximum category to \a max. */ -void QBarCategoriesAxis::setMax(const QString& max) +void QBarCategoryAxis::setMax(const QString& max) { - Q_D(QBarCategoriesAxis); + Q_D(QBarCategoryAxis); setRange(d->m_minCategory,max); } /*! Returns maximum category */ -QString QBarCategoriesAxis::max() const +QString QBarCategoryAxis::max() const { - Q_D(const QBarCategoriesAxis); + Q_D(const QBarCategoryAxis); return d->m_maxCategory; } /*! Sets range from \a minCategory to \a maxCategory */ -void QBarCategoriesAxis::setRange(const QString& minCategory, const QString& maxCategory) +void QBarCategoryAxis::setRange(const QString& minCategory, const QString& maxCategory) { - Q_D(QBarCategoriesAxis); + Q_D(QBarCategoryAxis); bool changed = false; @@ -348,14 +348,14 @@ void QBarCategoriesAxis::setRange(const QString& minCategory, const QString& max /*! Returns the type of the axis */ -QAbstractAxis::AxisType QBarCategoriesAxis::type() const +QAbstractAxis::AxisType QBarCategoryAxis::type() const { return AxisTypeCategories; } ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -QBarCategoriesAxisPrivate::QBarCategoriesAxisPrivate(QBarCategoriesAxis* q): +QBarCategoryAxisPrivate::QBarCategoryAxisPrivate(QBarCategoryAxis* q): QAbstractAxisPrivate(q), m_min(0.0), m_max(0.0), @@ -364,32 +364,32 @@ QBarCategoriesAxisPrivate::QBarCategoriesAxisPrivate(QBarCategoriesAxis* q): } -QBarCategoriesAxisPrivate::~QBarCategoriesAxisPrivate() +QBarCategoryAxisPrivate::~QBarCategoryAxisPrivate() { } -void QBarCategoriesAxisPrivate::setMin(const QVariant &min) +void QBarCategoryAxisPrivate::setMin(const QVariant &min) { setRange(min,m_maxCategory); } -void QBarCategoriesAxisPrivate::setMax(const QVariant &max) +void QBarCategoryAxisPrivate::setMax(const QVariant &max) { setRange(m_minCategory,max); } -void QBarCategoriesAxisPrivate::setRange(const QVariant &min, const QVariant &max) +void QBarCategoryAxisPrivate::setRange(const QVariant &min, const QVariant &max) { - Q_Q(QBarCategoriesAxis); + Q_Q(QBarCategoryAxis); QString value1 = min.toString(); QString value2 = max.toString(); q->setRange(value1,value2); } -void QBarCategoriesAxisPrivate::handleDomainUpdated() +void QBarCategoryAxisPrivate::handleDomainUpdated() { - Q_Q(QBarCategoriesAxis); + Q_Q(QBarCategoryAxis); Domain* domain = qobject_cast(sender()); if(m_orientation==Qt::Horizontal) { @@ -426,9 +426,9 @@ void QBarCategoriesAxisPrivate::handleDomainUpdated() } } -ChartAxis* QBarCategoriesAxisPrivate::createGraphics(ChartPresenter* presenter) +ChartAxis* QBarCategoryAxisPrivate::createGraphics(ChartPresenter* presenter) { - Q_Q(QBarCategoriesAxis); + Q_Q(QBarCategoryAxis); if(m_orientation == Qt::Vertical){ return new ChartCategoriesAxisY(q,presenter); }else{ @@ -436,10 +436,10 @@ ChartAxis* QBarCategoriesAxisPrivate::createGraphics(ChartPresenter* presenter) } } -void QBarCategoriesAxisPrivate::intializeDomain(Domain* domain) +void QBarCategoryAxisPrivate::intializeDomain(Domain* domain) { - Q_Q(QBarCategoriesAxis); + Q_Q(QBarCategoryAxis); if(m_max==m_min) { int min; int max; diff --git a/src/axis/categoriesaxis/qbarcategoriesaxis.h b/src/axis/categoriesaxis/qbarcategoriesaxis.h index 3c06356..cb26bb4 100644 --- a/src/axis/categoriesaxis/qbarcategoriesaxis.h +++ b/src/axis/categoriesaxis/qbarcategoriesaxis.h @@ -25,9 +25,9 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE -class QBarCategoriesAxisPrivate; +class QBarCategoryAxisPrivate; -class QTCOMMERCIALCHART_EXPORT QBarCategoriesAxis : public QAbstractAxis +class QTCOMMERCIALCHART_EXPORT QBarCategoryAxis : public QAbstractAxis { Q_OBJECT Q_PROPERTY(QStringList categories READ categories WRITE setCategories NOTIFY categoriesChanged) @@ -35,11 +35,11 @@ class QTCOMMERCIALCHART_EXPORT QBarCategoriesAxis : public QAbstractAxis Q_PROPERTY(QString max READ max WRITE setMax NOTIFY maxChanged) public: - explicit QBarCategoriesAxis(QObject *parent = 0); - ~QBarCategoriesAxis(); + explicit QBarCategoryAxis(QObject *parent = 0); + ~QBarCategoryAxis(); protected: - QBarCategoriesAxis(QBarCategoriesAxisPrivate &d,QObject *parent = 0); + QBarCategoryAxis(QBarCategoryAxisPrivate &d,QObject *parent = 0); public: AxisType type() const; @@ -68,8 +68,8 @@ Q_SIGNALS: void rangeChanged(const QString &min, const QString &max); private: - Q_DECLARE_PRIVATE(QBarCategoriesAxis) - Q_DISABLE_COPY(QBarCategoriesAxis) + Q_DECLARE_PRIVATE(QBarCategoryAxis) + Q_DISABLE_COPY(QBarCategoryAxis) friend class ChartCategoriesAxisX; friend class ChartCategoriesAxisY; }; diff --git a/src/axis/categoriesaxis/qbarcategoriesaxis_p.h b/src/axis/categoriesaxis/qbarcategoriesaxis_p.h index a7b8f73..1f91a3d 100644 --- a/src/axis/categoriesaxis/qbarcategoriesaxis_p.h +++ b/src/axis/categoriesaxis/qbarcategoriesaxis_p.h @@ -37,21 +37,21 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE class Domain; -class QBarCategoriesAxisPrivate : public QAbstractAxisPrivate +class QBarCategoryAxisPrivate : public QAbstractAxisPrivate { Q_OBJECT public: - QBarCategoriesAxisPrivate(QBarCategoriesAxis *q); - ~QBarCategoriesAxisPrivate(); + QBarCategoryAxisPrivate(QBarCategoryAxis *q); + ~QBarCategoryAxisPrivate(); public: ChartAxis* createGraphics(ChartPresenter* presenter); void intializeDomain(Domain* domain); void handleDomainUpdated(); - qreal min() { return m_min;}; - qreal max() { return m_max;}; - int count() const { return m_count; }; + qreal min() { return m_min;} + qreal max() { return m_max;} + int count() const { return m_count; } private: //range handling @@ -68,7 +68,7 @@ private: int m_count; private: - Q_DECLARE_PUBLIC(QBarCategoriesAxis); + Q_DECLARE_PUBLIC(QBarCategoryAxis); }; QTCOMMERCIALCHART_END_NAMESPACE diff --git a/src/barchart/qabstractbarseries.cpp b/src/barchart/qabstractbarseries.cpp index 76ded6c..15137eb 100644 --- a/src/barchart/qabstractbarseries.cpp +++ b/src/barchart/qabstractbarseries.cpp @@ -754,7 +754,7 @@ void QAbstractBarSeriesPrivate::initializeAxis(QAbstractAxis* axis) if(axis->orientation()==Qt::Vertical) { - populateCategories(qobject_cast(axis)); + populateCategories(qobject_cast(axis)); } break; } @@ -764,7 +764,7 @@ void QAbstractBarSeriesPrivate::initializeAxis(QAbstractAxis* axis) if(axis->orientation()==Qt::Horizontal) { - populateCategories(qobject_cast(axis)); + populateCategories(qobject_cast(axis)); } break; } @@ -811,7 +811,7 @@ QAbstractAxis::AxisType QAbstractBarSeriesPrivate::defaultAxisType(Qt::Orientati } -void QAbstractBarSeriesPrivate::populateCategories(QBarCategoriesAxis* axis) +void QAbstractBarSeriesPrivate::populateCategories(QBarCategoryAxis* axis) { QStringList categories; if(axis->categories().isEmpty()) { diff --git a/src/barchart/qabstractbarseries_p.h b/src/barchart/qabstractbarseries_p.h index 6212484..7c419b6 100644 --- a/src/barchart/qabstractbarseries_p.h +++ b/src/barchart/qabstractbarseries_p.h @@ -38,7 +38,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE class QBarModelMapper; -class QBarCategoriesAxis; +class QBarCategoryAxis; class QAbstractBarSeriesPrivate : public QAbstractSeriesPrivate { @@ -85,7 +85,7 @@ Q_SIGNALS: void labelsVisibleChanged(bool visible); private: - void populateCategories(QBarCategoriesAxis* axis); + void populateCategories(QBarCategoryAxis* axis); protected: QList m_barSets; diff --git a/src/chartdataset.cpp b/src/chartdataset.cpp index e799002..24ca69a 100644 --- a/src/chartdataset.cpp +++ b/src/chartdataset.cpp @@ -180,7 +180,7 @@ QAbstractAxis* ChartDataSet::createAxis(QAbstractAxis::AxisType type,Qt::Orienta axis = new QValueAxis(this); break; case QAbstractAxis::AxisTypeCategories: - axis = new QBarCategoriesAxis(this); + axis = new QBarCategoryAxis(this); break; case QAbstractAxis::AxisTypeIntervals: axis = new QIntervalsAxis(this); diff --git a/tests/auto/qbarcategoriesaxis/tst_qbarcategoriesaxis.cpp b/tests/auto/qbarcategoriesaxis/tst_qbarcategoriesaxis.cpp index efd01ad..940cc68 100644 --- a/tests/auto/qbarcategoriesaxis/tst_qbarcategoriesaxis.cpp +++ b/tests/auto/qbarcategoriesaxis/tst_qbarcategoriesaxis.cpp @@ -75,7 +75,7 @@ private slots: void autoscale(); private: - QBarCategoriesAxis* m_baraxis; + QBarCategoryAxis* m_baraxis; QBarSeries* m_series; }; @@ -89,7 +89,7 @@ void tst_QBarCategoriesAxis::cleanupTestCase() void tst_QBarCategoriesAxis::init() { - m_baraxis = new QBarCategoriesAxis(); + m_baraxis = new QBarCategoryAxis(); m_series = new QBarSeries(); QBarSet *set0 = new QBarSet("Jane"); @@ -136,7 +136,7 @@ void tst_QBarCategoriesAxis::qbarcategoriesaxis_data() void tst_QBarCategoriesAxis::qbarcategoriesaxis() { qabstractaxis(); - QBarCategoriesAxis axis; + QBarCategoryAxis axis; axis.append(QStringList()); axis.append(QString()); QCOMPARE(axis.at(0), QString()); @@ -167,7 +167,7 @@ void tst_QBarCategoriesAxis::append() { QFETCH(QStringList, categories); - QBarCategoriesAxis axis; + QBarCategoryAxis axis; QSignalSpy spy0(&axis, SIGNAL(categoriesChanged())); QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString const&))); @@ -208,7 +208,7 @@ void tst_QBarCategoriesAxis::at() QFETCH(QString, string); QFETCH(QStringList, categories); - QBarCategoriesAxis axis; + QBarCategoryAxis axis; axis.append(categories); QSignalSpy spy0(&axis, SIGNAL(categoriesChanged())); @@ -244,7 +244,7 @@ void tst_QBarCategoriesAxis::categories() { QFETCH(QStringList, categories); - QBarCategoriesAxis axis; + QBarCategoryAxis axis; QSignalSpy spy0(&axis, SIGNAL(categoriesChanged())); QSignalSpy spy1(&axis, SIGNAL(maxChanged(QString const&))); @@ -281,7 +281,7 @@ void tst_QBarCategoriesAxis::clear() { QFETCH(QStringList, categories); - QBarCategoriesAxis axis; + QBarCategoryAxis axis; axis.setCategories(categories); QCOMPARE(axis.categories(), categories); @@ -329,7 +329,7 @@ void tst_QBarCategoriesAxis::count() QFETCH(QStringList, categories); QFETCH(int, count); - QBarCategoriesAxis axis; + QBarCategoryAxis axis; axis.setCategories(categories); QSignalSpy spy0(&axis, SIGNAL(categoriesChanged())); @@ -366,7 +366,7 @@ void tst_QBarCategoriesAxis::insert() QFETCH(int, index); QFETCH(QString, category); - QBarCategoriesAxis axis; + QBarCategoryAxis axis; axis.append(categories); QSignalSpy spy0(&axis, SIGNAL(categoriesChanged())); @@ -402,7 +402,7 @@ void tst_QBarCategoriesAxis::remove() QFETCH(QString, category); QFETCH(QStringList, result); - QBarCategoriesAxis axis; + QBarCategoryAxis axis; axis.append(categories); int maxCount = axis.max() == category; @@ -623,7 +623,7 @@ void tst_QBarCategoriesAxis::autoscale_data() void tst_QBarCategoriesAxis::autoscale() { delete m_baraxis; - m_baraxis = new QBarCategoriesAxis(); + m_baraxis = new QBarCategoryAxis(); QSignalSpy spy0(m_baraxis, SIGNAL(maxChanged(QString))); QSignalSpy spy1(m_baraxis, SIGNAL(minChanged(QString))); diff --git a/tests/auto/qchart/tst_qchart.cpp b/tests/auto/qchart/tst_qchart.cpp index 2b813cb..4e0cbe7 100644 --- a/tests/auto/qchart/tst_qchart.cpp +++ b/tests/auto/qchart/tst_qchart.cpp @@ -36,7 +36,7 @@ QTCOMMERCIALCHART_USE_NAMESPACE Q_DECLARE_METATYPE(QAbstractAxis *) Q_DECLARE_METATYPE(QValueAxis *) -Q_DECLARE_METATYPE(QBarCategoriesAxis *) +Q_DECLARE_METATYPE(QBarCategoryAxis *) Q_DECLARE_METATYPE(QAbstractSeries *) Q_DECLARE_METATYPE(QChart::AnimationOption) Q_DECLARE_METATYPE(QBrush) @@ -247,14 +247,14 @@ void tst_QChart::axisX_data() QTest::addColumn("axis"); QTest::addColumn("series"); - QTest::newRow("categories,lineSeries") << (QAbstractAxis*) new QBarCategoriesAxis() << (QAbstractSeries*) new QLineSeries(this); - QTest::newRow("categories,areaSeries") << (QAbstractAxis*) new QBarCategoriesAxis() << (QAbstractSeries*) new QAreaSeries(new QLineSeries(this)); - QTest::newRow("categories,scatterSeries") << (QAbstractAxis*) new QBarCategoriesAxis() << (QAbstractSeries*) new QScatterSeries(this); - QTest::newRow("categories,splineSeries") << (QAbstractAxis*) new QBarCategoriesAxis() << (QAbstractSeries*) new QSplineSeries(this); - QTest::newRow("categories,pieSeries") << (QAbstractAxis*) new QBarCategoriesAxis() << (QAbstractSeries*) new QPieSeries(this); - QTest::newRow("categories,barSeries") << (QAbstractAxis*) new QBarCategoriesAxis() << (QAbstractSeries*) new QBarSeries(this); - QTest::newRow("categories,percentBarSeries") << (QAbstractAxis*) new QBarCategoriesAxis() << (QAbstractSeries*) new QPercentBarSeries(this); - QTest::newRow("categories,stackedBarSeries") << (QAbstractAxis*) new QBarCategoriesAxis() << (QAbstractSeries*) new QStackedBarSeries(this); + QTest::newRow("categories,lineSeries") << (QAbstractAxis*) new QBarCategoryAxis() << (QAbstractSeries*) new QLineSeries(this); + QTest::newRow("categories,areaSeries") << (QAbstractAxis*) new QBarCategoryAxis() << (QAbstractSeries*) new QAreaSeries(new QLineSeries(this)); + QTest::newRow("categories,scatterSeries") << (QAbstractAxis*) new QBarCategoryAxis() << (QAbstractSeries*) new QScatterSeries(this); + QTest::newRow("categories,splineSeries") << (QAbstractAxis*) new QBarCategoryAxis() << (QAbstractSeries*) new QSplineSeries(this); + QTest::newRow("categories,pieSeries") << (QAbstractAxis*) new QBarCategoryAxis() << (QAbstractSeries*) new QPieSeries(this); + QTest::newRow("categories,barSeries") << (QAbstractAxis*) new QBarCategoryAxis() << (QAbstractSeries*) new QBarSeries(this); + QTest::newRow("categories,percentBarSeries") << (QAbstractAxis*) new QBarCategoryAxis() << (QAbstractSeries*) new QPercentBarSeries(this); + QTest::newRow("categories,stackedBarSeries") << (QAbstractAxis*) new QBarCategoryAxis() << (QAbstractSeries*) new QStackedBarSeries(this); QTest::newRow("value,lineSeries") << (QAbstractAxis*) new QValueAxis() << (QAbstractSeries*) new QLineSeries(this); QTest::newRow("value,areaSeries") << (QAbstractAxis*) new QValueAxis() << (QAbstractSeries*) new QAreaSeries(new QLineSeries(this)); @@ -494,7 +494,7 @@ void tst_QChart::scroll_right() break; } case QAbstractAxis::AxisTypeCategories:{ - QBarCategoriesAxis* caxis = qobject_cast(axis); + QBarCategoryAxis* caxis = qobject_cast(axis); QVERIFY(caxis!=0); qreal min = caxis->min().toDouble(); qreal max = caxis->max().toDouble(); @@ -537,7 +537,7 @@ void tst_QChart::scroll_left() break; } case QAbstractAxis::AxisTypeCategories:{ - QBarCategoriesAxis* caxis = qobject_cast(axis); + QBarCategoryAxis* caxis = qobject_cast(axis); QVERIFY(caxis!=0); qreal min = caxis->min().toDouble(); qreal max = caxis->max().toDouble(); @@ -580,7 +580,7 @@ void tst_QChart::scroll_up() break; } case QAbstractAxis::AxisTypeCategories:{ - QBarCategoriesAxis* caxis = qobject_cast(axis); + QBarCategoryAxis* caxis = qobject_cast(axis); QVERIFY(caxis!=0); qreal min = caxis->min().toDouble(); qreal max = caxis->max().toDouble(); @@ -623,7 +623,7 @@ void tst_QChart::scroll_down() break; } case QAbstractAxis::AxisTypeCategories:{ - QBarCategoriesAxis* caxis = qobject_cast(axis); + QBarCategoryAxis* caxis = qobject_cast(axis); QVERIFY(caxis!=0); qreal min = caxis->min().toDouble(); qreal max = caxis->max().toDouble(); diff --git a/tests/chartwidgettest/mainwidget.cpp b/tests/chartwidgettest/mainwidget.cpp index e11dc6f..7f0b831 100644 --- a/tests/chartwidgettest/mainwidget.cpp +++ b/tests/chartwidgettest/mainwidget.cpp @@ -294,17 +294,17 @@ void MainWidget::addSeries(QString seriesName, int columnCount, int rowCount, QS QAbstractBarSeries* series = 0; if (seriesName == "Bar") { series = new QBarSeries(this); - QBarCategoriesAxis* axis = new QBarCategoriesAxis(); + QBarCategoryAxis* axis = new QBarCategoryAxis(); axis->append(category); m_chart->setAxisX(axis,series); } else if (seriesName == "Stacked bar") { series = new QStackedBarSeries(this); - QBarCategoriesAxis* axis = new QBarCategoriesAxis(); + QBarCategoryAxis* axis = new QBarCategoryAxis(); axis->append(category); m_chart->setAxisX(axis,series); } else { series = new QPercentBarSeries(this); - QBarCategoriesAxis* axis = new QBarCategoriesAxis(); + QBarCategoryAxis* axis = new QBarCategoryAxis(); axis->append(category); m_chart->setAxisX(axis,series); }