diff options
author | Marek Rosa <marek.rosa@digia.com> | 2012-08-30 15:00:06 +0300 |
---|---|---|
committer | Marek Rosa <marek.rosa@digia.com> | 2012-08-30 15:01:01 +0300 |
commit | a404d0b7b27fad889e835697d2f51a71e3359a6b (patch) | |
tree | 9e607cb03fccd6a2e3dbdaa6c4efecfb8ecaf137 /src | |
parent | 2390e49cbc5174f49d3b2803bd10edfb9e92797a (diff) |
Renamed barcategory grephics item class which has been previously ommited
Diffstat (limited to 'src')
-rw-r--r-- | src/axis/barcategoryaxis/chartbarcategoryaxisx.cpp | 12 | ||||
-rw-r--r-- | src/axis/barcategoryaxis/chartbarcategoryaxisx_p.h | 6 | ||||
-rw-r--r-- | src/axis/barcategoryaxis/chartbarcategoryaxisy.cpp | 12 | ||||
-rw-r--r-- | src/axis/barcategoryaxis/chartbarcategoryaxisy_p.h | 6 | ||||
-rw-r--r-- | src/axis/barcategoryaxis/qbarcategoryaxis.cpp | 4 | ||||
-rw-r--r-- | src/axis/barcategoryaxis/qbarcategoryaxis.h | 4 |
6 files changed, 22 insertions, 22 deletions
diff --git a/src/axis/barcategoryaxis/chartbarcategoryaxisx.cpp b/src/axis/barcategoryaxis/chartbarcategoryaxisx.cpp index e10367fb..072c1fd2 100644 --- a/src/axis/barcategoryaxis/chartbarcategoryaxisx.cpp +++ b/src/axis/barcategoryaxis/chartbarcategoryaxisx.cpp @@ -28,17 +28,17 @@ static int label_padding = 5; QTCOMMERCIALCHART_BEGIN_NAMESPACE -ChartCategoriesAxisX::ChartCategoriesAxisX(QBarCategoryAxis *axis,ChartPresenter *presenter) : ChartAxis(axis,presenter), +ChartBarCategoryAxisX::ChartBarCategoryAxisX(QBarCategoryAxis *axis,ChartPresenter *presenter) : ChartAxis(axis,presenter), m_categoriesAxis(axis) { } -ChartCategoriesAxisX::~ChartCategoriesAxisX() +ChartBarCategoryAxisX::~ChartBarCategoryAxisX() { } -QVector<qreal> ChartCategoriesAxisX::calculateLayout() const +QVector<qreal> ChartBarCategoryAxisX::calculateLayout() const { int count = m_categoriesAxis->d_ptr->count(); @@ -69,7 +69,7 @@ QVector<qreal> ChartCategoriesAxisX::calculateLayout() const return points; } -QStringList ChartCategoriesAxisX::createCategoryLabels(const QVector<qreal>& layout) const +QStringList ChartBarCategoryAxisX::createCategoryLabels(const QVector<qreal>& layout) const { QStringList result; qreal d = (m_max - m_min)/m_rect.width(); @@ -88,7 +88,7 @@ QStringList ChartCategoriesAxisX::createCategoryLabels(const QVector<qreal>& lay } -void ChartCategoriesAxisX::updateGeometry() +void ChartBarCategoryAxisX::updateGeometry() { const QVector<qreal>& layout = ChartAxis::layout(); @@ -148,7 +148,7 @@ void ChartCategoriesAxisX::updateGeometry() } } -void ChartCategoriesAxisX::handleAxisUpdated() +void ChartBarCategoryAxisX::handleAxisUpdated() { if(m_categoriesAxis->categories()!=m_categories) { diff --git a/src/axis/barcategoryaxis/chartbarcategoryaxisx_p.h b/src/axis/barcategoryaxis/chartbarcategoryaxisx_p.h index 33ed4e2b..8bca2325 100644 --- a/src/axis/barcategoryaxis/chartbarcategoryaxisx_p.h +++ b/src/axis/barcategoryaxis/chartbarcategoryaxisx_p.h @@ -38,11 +38,11 @@ class QAbstractAxis; class ChartPresenter; class QBarCategoryAxis; -class ChartCategoriesAxisX : public ChartAxis +class ChartBarCategoryAxisX : public ChartAxis { public: - ChartCategoriesAxisX(QBarCategoryAxis *axis, ChartPresenter *presenter); - ~ChartCategoriesAxisX(); + ChartBarCategoryAxisX(QBarCategoryAxis *axis, ChartPresenter *presenter); + ~ChartBarCategoryAxisX(); AxisType axisType() const { return X_AXIS;} diff --git a/src/axis/barcategoryaxis/chartbarcategoryaxisy.cpp b/src/axis/barcategoryaxis/chartbarcategoryaxisy.cpp index 45cc954c..f5602368 100644 --- a/src/axis/barcategoryaxis/chartbarcategoryaxisy.cpp +++ b/src/axis/barcategoryaxis/chartbarcategoryaxisy.cpp @@ -28,16 +28,16 @@ static int label_padding = 5; QTCOMMERCIALCHART_BEGIN_NAMESPACE -ChartCategoriesAxisY::ChartCategoriesAxisY(QBarCategoryAxis *axis,ChartPresenter *presenter) : ChartAxis(axis,presenter), +ChartBarCategoryAxisY::ChartBarCategoryAxisY(QBarCategoryAxis *axis,ChartPresenter *presenter) : ChartAxis(axis,presenter), m_categoriesAxis(axis) { } -ChartCategoriesAxisY::~ChartCategoriesAxisY() +ChartBarCategoryAxisY::~ChartBarCategoryAxisY() { } -QVector<qreal> ChartCategoriesAxisY::calculateLayout() const +QVector<qreal> ChartBarCategoryAxisY::calculateLayout() const { int count = m_categoriesAxis->d_ptr->count(); @@ -68,7 +68,7 @@ QVector<qreal> ChartCategoriesAxisY::calculateLayout() const return points; } -QStringList ChartCategoriesAxisY::createCategoryLabels(const QVector<qreal>& layout) const +QStringList ChartBarCategoryAxisY::createCategoryLabels(const QVector<qreal>& layout) const { QStringList result; qreal d = (m_max - m_min)/m_rect.height(); @@ -86,7 +86,7 @@ QStringList ChartCategoriesAxisY::createCategoryLabels(const QVector<qreal>& lay return result; } -void ChartCategoriesAxisY::updateGeometry() +void ChartBarCategoryAxisY::updateGeometry() { const QVector<qreal>& layout = ChartAxis::layout(); @@ -147,7 +147,7 @@ void ChartCategoriesAxisY::updateGeometry() } } -void ChartCategoriesAxisY::handleAxisUpdated() +void ChartBarCategoryAxisY::handleAxisUpdated() { if(m_categoriesAxis->categories()!=m_categories) diff --git a/src/axis/barcategoryaxis/chartbarcategoryaxisy_p.h b/src/axis/barcategoryaxis/chartbarcategoryaxisy_p.h index 1a0b7c0e..4ac4dba3 100644 --- a/src/axis/barcategoryaxis/chartbarcategoryaxisy_p.h +++ b/src/axis/barcategoryaxis/chartbarcategoryaxisy_p.h @@ -38,11 +38,11 @@ class QAbstractAxis; class QBarCategoryAxis; class ChartPresenter; -class ChartCategoriesAxisY : public ChartAxis +class ChartBarCategoryAxisY : public ChartAxis { public: - ChartCategoriesAxisY(QBarCategoryAxis *axis, ChartPresenter *presenter); - ~ChartCategoriesAxisY(); + ChartBarCategoryAxisY(QBarCategoryAxis *axis, ChartPresenter *presenter); + ~ChartBarCategoryAxisY(); AxisType axisType() const { return Y_AXIS;} diff --git a/src/axis/barcategoryaxis/qbarcategoryaxis.cpp b/src/axis/barcategoryaxis/qbarcategoryaxis.cpp index 50133593..b61d0692 100644 --- a/src/axis/barcategoryaxis/qbarcategoryaxis.cpp +++ b/src/axis/barcategoryaxis/qbarcategoryaxis.cpp @@ -446,9 +446,9 @@ ChartAxis* QBarCategoryAxisPrivate::createGraphics(ChartPresenter* presenter) { Q_Q(QBarCategoryAxis); if(m_orientation == Qt::Vertical){ - return new ChartCategoriesAxisY(q,presenter); + return new ChartBarCategoryAxisY(q,presenter); }else{ - return new ChartCategoriesAxisX(q,presenter); + return new ChartBarCategoryAxisX(q,presenter); } } diff --git a/src/axis/barcategoryaxis/qbarcategoryaxis.h b/src/axis/barcategoryaxis/qbarcategoryaxis.h index cb26bb47..2a4e5077 100644 --- a/src/axis/barcategoryaxis/qbarcategoryaxis.h +++ b/src/axis/barcategoryaxis/qbarcategoryaxis.h @@ -70,8 +70,8 @@ Q_SIGNALS: private: Q_DECLARE_PRIVATE(QBarCategoryAxis) Q_DISABLE_COPY(QBarCategoryAxis) - friend class ChartCategoriesAxisX; - friend class ChartCategoriesAxisY; + friend class ChartBarCategoryAxisX; + friend class ChartBarCategoryAxisY; }; QTCOMMERCIALCHART_END_NAMESPACE |