From 8946feb2c29e32e2039e27bd3e73ebcee15ced12 2013-03-15 09:42:32 From: Miikka Heikkinen Date: 2013-03-15 09:42:32 Subject: [PATCH] Remove cryptic/obsolete TODOs --- diff --git a/plugins/designer/qchartsplugin.cpp b/plugins/designer/qchartsplugin.cpp index 29a97e6..213b836 100644 --- a/plugins/designer/qchartsplugin.cpp +++ b/plugins/designer/qchartsplugin.cpp @@ -27,12 +27,10 @@ QTCOMMERCIALCHART_USE_NAMESPACE QChartsPlugin::QChartsPlugin(QObject *parent) : QObject(parent) { - // TODO Auto-generated constructor stub } QChartsPlugin::~QChartsPlugin() { - // TODO Auto-generated destructor stub } QString QChartsPlugin::name() const diff --git a/src/areachart/areachartitem.cpp b/src/areachart/areachartitem.cpp index 23a9dce..92f8999 100644 --- a/src/areachart/areachartitem.cpp +++ b/src/areachart/areachartitem.cpp @@ -34,7 +34,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE //TODO: optimize : remove points which are not visible AreaChartItem::AreaChartItem(QAreaSeries *areaSeries, QGraphicsItem* item) - : ChartItem(areaSeries->d_func(),item), //TODO: fix me + : ChartItem(areaSeries->d_func(),item), m_series(areaSeries), m_upper(0), m_lower(0), diff --git a/src/areachart/qareaseries.cpp b/src/areachart/qareaseries.cpp index 285b3d0..9e9d1fc 100644 --- a/src/areachart/qareaseries.cpp +++ b/src/areachart/qareaseries.cpp @@ -212,10 +212,8 @@ QAbstractSeries::SeriesType QAreaSeries::type() const void QAreaSeries::setUpperSeries(QLineSeries *series) { Q_D(QAreaSeries); - if(d->m_upperSeries!=series){ + if (d->m_upperSeries != series) d->m_upperSeries = series; - //TODO: - } } QLineSeries *QAreaSeries::upperSeries() const diff --git a/src/axis/categoryaxis/chartcategoryaxisx.cpp b/src/axis/categoryaxis/chartcategoryaxisx.cpp index a15a29d..2309224 100644 --- a/src/axis/categoryaxis/chartcategoryaxisx.cpp +++ b/src/axis/categoryaxis/chartcategoryaxisx.cpp @@ -75,7 +75,6 @@ void ChartCategoryAxisX::updateGeometry() void ChartCategoryAxisX::handleAxisUpdated() { updateGeometry(); - //TODO :: ChartAxis::handleAxisUpdated(); } QSizeF ChartCategoryAxisX::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const diff --git a/src/axis/categoryaxis/chartcategoryaxisy.cpp b/src/axis/categoryaxis/chartcategoryaxisy.cpp index 292c311..b957856 100644 --- a/src/axis/categoryaxis/chartcategoryaxisy.cpp +++ b/src/axis/categoryaxis/chartcategoryaxisy.cpp @@ -75,7 +75,6 @@ void ChartCategoryAxisY::updateGeometry() void ChartCategoryAxisY::handleAxisUpdated() { updateGeometry(); - //TODO:: ChartAxis::handleAxisUpdated(); } QSizeF ChartCategoryAxisY::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const diff --git a/src/axis/chartaxis.cpp b/src/axis/chartaxis.cpp index 3a06db6..7e565ac 100644 --- a/src/axis/chartaxis.cpp +++ b/src/axis/chartaxis.cpp @@ -427,14 +427,10 @@ void ChartAxis::handleRangeChanged(qreal min, qreal max) QStringList ChartAxis::createValueLabels(qreal min, qreal max, int ticks,const QString& format) { - //TODO: Q_ASSERT(m_max > m_min); - //TODO: Q_ASSERT(ticks > 1); - QStringList labels; - if(max <= min || ticks < 1){ + if (max <= min || ticks < 1) return labels; - } int n = qMax(int(-qFloor(log10((max - min) / (ticks - 1)))), 0); n++; @@ -517,11 +513,9 @@ QStringList ChartAxis::createLogValueLabels(qreal min, qreal max, qreal base, in QStringList ChartAxis::createDateTimeLabels(qreal min, qreal max,int ticks,const QString& format) { - //TODO: Q_ASSERT(m_max > m_min); - //TODO: Q_ASSERT(ticks > 1); QStringList labels; - if(max <= min || ticks < 1) { + if (max <= min || ticks < 1) { return labels; } diff --git a/src/axis/qabstractaxis.cpp b/src/axis/qabstractaxis.cpp index c53d60c..60e071d 100644 --- a/src/axis/qabstractaxis.cpp +++ b/src/axis/qabstractaxis.cpp @@ -468,7 +468,7 @@ QPen QAbstractAxis::linePen() const return d_ptr->m_axisPen; } -//TODO: remove me +//TODO: remove me 2.0 void QAbstractAxis::setLinePenColor(QColor color) { QPen p = d_ptr->m_axisPen; @@ -614,7 +614,7 @@ int QAbstractAxis::labelsAngle() const { return d_ptr->m_labelsAngle; } -//TODO: remove me +//TODO: remove me 2.0 void QAbstractAxis::setLabelsColor(QColor color) { QBrush b = d_ptr->m_labelsBrush; @@ -956,7 +956,6 @@ void QAbstractAxisPrivate::initializeTheme(ChartTheme* theme, bool forced) if (forced || pen == m_titlePen){ q_ptr->setTitlePen(Qt::NoPen);// Noen for performance reasons } - //TODO: discuss with Tero if (forced || font == m_titleFont){ QFont font(m_labelsFont); font.setBold(true); diff --git a/src/axis/qabstractaxis.h b/src/axis/qabstractaxis.h index e1fcd32..5ebd797 100644 --- a/src/axis/qabstractaxis.h +++ b/src/axis/qabstractaxis.h @@ -43,7 +43,6 @@ class QTCOMMERCIALCHART_EXPORT QAbstractAxis : public QObject Q_PROPERTY(bool labelsVisible READ labelsVisible WRITE setLabelsVisible NOTIFY labelsVisibleChanged) Q_PROPERTY(QPen labelsPen READ labelsPen WRITE setLabelsPen NOTIFY labelsPenChanged) Q_PROPERTY(QBrush labelsBrush READ labelsBrush WRITE setLabelsBrush NOTIFY labelsBrushChanged) - //TODO: fix labels angles to work with layout Q_PROPERTY(int labelsAngle READ labelsAngle WRITE setLabelsAngle NOTIFY labelsAngleChanged) Q_PROPERTY(QFont labelsFont READ labelsFont WRITE setLabelsFont NOTIFY labelsFontChanged) Q_PROPERTY(QColor labelsColor READ labelsColor WRITE setLabelsColor NOTIFY labelsColorChanged) @@ -146,7 +145,7 @@ public: void setShadesBorderColor(QColor color); QColor shadesBorderColor() const; - Qt::Orientation orientation(); //TODO: missing const <- BC + Qt::Orientation orientation(); //TODO: missing const <- BC (2.0) Qt::Alignment alignment() const; //range handling diff --git a/src/axis/valueaxis/qvalueaxis.h b/src/axis/valueaxis/qvalueaxis.h index 48fb996..b87d5b2 100644 --- a/src/axis/valueaxis/qvalueaxis.h +++ b/src/axis/valueaxis/qvalueaxis.h @@ -60,7 +60,7 @@ public: void setLabelFormat(const QString &format); QString labelFormat() const; - //TODO: depreciated ! + //TODO: deprecated! (2.0) void setNiceNumbersEnabled(bool enable = true); bool niceNumbersEnabled() const; diff --git a/src/axis/valueaxis/qvalueaxis_p.h b/src/axis/valueaxis/qvalueaxis_p.h index e77ed3d..ce6a6db 100644 --- a/src/axis/valueaxis/qvalueaxis_p.h +++ b/src/axis/valueaxis/qvalueaxis_p.h @@ -61,7 +61,7 @@ private: int m_tickCount; QString m_format; bool m_applying; - bool m_niceNumbersEnabled; //TODO: this depreciated + bool m_niceNumbersEnabled; //TODO: this deprecated (2.0) Q_DECLARE_PUBLIC(QValueAxis) }; diff --git a/src/chartlayout.cpp b/src/chartlayout.cpp index 5dc6fec..b3f34b7 100644 --- a/src/chartlayout.cpp +++ b/src/chartlayout.cpp @@ -216,8 +216,6 @@ QRectF ChartLayout::calculateAxisGeometry(const QRectF &geometry, const QList(axisElement); if (!axis->isVisible()) diff --git a/src/chartpresenter_p.h b/src/chartpresenter_p.h index 8cf9f9c..9f1c8b8 100644 --- a/src/chartpresenter_p.h +++ b/src/chartpresenter_p.h @@ -31,7 +31,7 @@ #define CHARTPRESENTER_H #include "qchartglobal.h" -#include "qchart.h" //becouse of QChart::ChartThemeId //TODO +#include "qchart.h" //because of QChart::ChartThemeId #include #include diff --git a/src/qabstractseries.cpp b/src/qabstractseries.cpp index e7a1635..9dae53b 100644 --- a/src/qabstractseries.cpp +++ b/src/qabstractseries.cpp @@ -204,11 +204,6 @@ QChart *QAbstractSeries::chart() const return d_ptr->m_chart; } -//void QAbstractSeries::adjustView() -//{ -// //TODO: -//} - /*! \brief Sets the visibility of the series to true diff --git a/src/qchart.cpp b/src/qchart.cpp index 83329c0..43fae05 100644 --- a/src/qchart.cpp +++ b/src/qchart.cpp @@ -118,8 +118,6 @@ QChart::QChart(QGraphicsItem *parent, Qt::WindowFlags wFlags) { d_ptr->m_legend = new LegendScroller(this); setTheme(QChart::ChartThemeLight); - //TODO: what is that ? - //connect(d_ptr->m_presenter, SIGNAL(marginsChanged(QRectF)), this, SIGNAL(marginsChanged(QRectF))); setLayout(d_ptr->m_presenter->layout()); } @@ -451,7 +449,7 @@ QRectF QChart::plotArea() const ///*! // TODO: Dummy. -// Adjest the ranges of the axes so that all the data of the specified \a series is visible +// Adjust the ranges of the axes so that all the data of the specified \a series is visible // */ //void QChart::adjustViewToSeries(QAbstractSeries* series) //{ diff --git a/tests/auto/qabstractaxis/tst_qabstractaxis.cpp b/tests/auto/qabstractaxis/tst_qabstractaxis.cpp index 6a83f33..a66c21d 100644 --- a/tests/auto/qabstractaxis/tst_qabstractaxis.cpp +++ b/tests/auto/qabstractaxis/tst_qabstractaxis.cpp @@ -50,14 +50,12 @@ void tst_QAbstractAxis::cleanup() void tst_QAbstractAxis::qabstractaxis() { QCOMPARE(m_axis->linePen(), QPen()); - //TODO QCOMPARE(m_axis->axisPenColor(), QColor()); QCOMPARE(m_axis->gridLinePen(), QPen()); QCOMPARE(m_axis->isLineVisible(), true); QCOMPARE(m_axis->isGridLineVisible(), true); QCOMPARE(m_axis->isVisible(), true); QCOMPARE(m_axis->labelsAngle(), 0); QCOMPARE(m_axis->labelsBrush(), QBrush()); - //TODO QCOMPARE(m_axis->labelsColor(), QColor()); QCOMPARE(m_axis->labelsFont(), QFont()); QCOMPARE(m_axis->labelsPen(), QPen()); QCOMPARE(m_axis->labelsVisible(), true); @@ -82,9 +80,7 @@ void tst_QAbstractAxis::qabstractaxis() m_axis->setShadesPen(QPen()); m_axis->setShadesVisible(false); m_axis->setVisible(false); - //TODO QCOMPARE(m_axis->shadesBorderColor(), QColor()); //TODO QCOMPARE(m_axis->shadesBrush(), QBrush()); - //TODO QCOMPARE(m_axis->shadesColor(), QColor()); QCOMPARE(m_axis->shadesPen(), QPen()); QCOMPARE(m_axis->shadesVisible(), false); m_axis->show(); diff --git a/tests/chartdesigner/engine.cpp b/tests/chartdesigner/engine.cpp index dd74bd9..685de0a 100644 --- a/tests/chartdesigner/engine.cpp +++ b/tests/chartdesigner/engine.cpp @@ -118,7 +118,6 @@ QList Engine::addSeries(QAbstractSeries::SeriesType type) } case QAbstractSeries::SeriesTypeBar: { - //TODO: fix me QBarSeries *bar = new QBarSeries(); setupBarSeries(bar,keys,minRow,maxRow); result << bar; diff --git a/tests/chartwidgettest/mainwidget.cpp b/tests/chartwidgettest/mainwidget.cpp index 1dd905c..be4bed1 100644 --- a/tests/chartwidgettest/mainwidget.cpp +++ b/tests/chartwidgettest/mainwidget.cpp @@ -202,7 +202,6 @@ void MainWidget::addSeries() QList MainWidget::generateTestData(int columnCount, int rowCount, QString dataCharacteristics) { - // TODO: dataCharacteristics QList testData; for (int j(0); j < columnCount; j++) { QList newColumn;