HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r611:e622b3a8d8a0

Squashed bunch of warnings

Tero Ahola -

r611:e622b3a8d8a0

parent child

Context file:

r611:e622b3a8d8a0

Collapse all files

src/areachart/areachartitem.cpp +3 -2

             void AreaChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
-                Q_UNUSED(widget);
+                Q_UNUSED(widget)
-                Q_UNUSED(option);
+                Q_UNUSED(option)
                 painter->save();
                 painter->setPen(m_linePen);
                 painter->setBrush(m_brush);

src/axis/axisitem.cpp +3 -3

             void AxisItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
-                Q_UNUSED(painter);
+                Q_UNUSED(painter)
-                Q_UNUSED(option);
+                Q_UNUSED(option)
-                Q_UNUSED(widget);
+                Q_UNUSED(widget)
             }
             //TODO "nice numbers algorithm"

src/barchart/bar.cpp +3 0

             void Bar::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
+                Q_UNUSED(option)
+                Q_UNUSED(widget)
                 if (0 == mHeight) {
                     return;
                 }

src/barchart/barpresenterbase.cpp +8 -3

             void BarPresenterBase::handleModelChanged(int index)
             {
-            //    qDebug() << "BarPresenterBase::handleModelChanged" << index;
+                Q_UNUSED(index)
                 dataChanged();
             }
-            void BarPresenterBase::handleDomainChanged(const Domain& domain)
+            void BarPresenterBase::handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY)
             {
-                qDebug() << "BarPresenterBase::handleDomainChanged";
+                // TODO:
+                Q_UNUSED(minX)
+                Q_UNUSED(maxX)
+                Q_UNUSED(minY)
+                Q_UNUSED(maxY)
                 /*
                 int count = mSeries->categoryCount();
                 if (0 == count) {

src/barchart/barpresenterbase_p.h +1 -1

             public slots:
                 void handleModelChanged(int index);
-                void handleDomainChanged(const Domain& domain);
+                void handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY);
                 void handleGeometryChanged(const QRectF& size);
                 // Internal slots

src/barchart/barvalue.cpp +3 0

             void BarValue::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
+                Q_UNUSED(option)
+                Q_UNUSED(widget)
                 if (isVisible()) {
                     painter->setPen(mPen);
                     painter->drawText(boundingRect(),mValueString);

src/barchart/qbarseries.cpp +4 -4

                 return true;
             }
-            void QBarSeries::setModelMappingCategories(int modelColumn)
+            // TODO
+            void QBarSeries::setModelMappingCategories(int /*modelColumn*/)
             {
-                //
             }
-            void QBarSeries::setModelMappingBarRange(int bottomBoundry, int topBoundry)
+            // TODO
+            void QBarSeries::setModelMappingBarRange(int /*bottomBoundry*/, int /*topBoundry*/)
             {
-                //
             }
             #include "moc_qbarseries.cpp"

src/barchart/separator.cpp +3 0

             void Separator::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
+                Q_UNUSED(option)
+                Q_UNUSED(widget)
                 if (isVisible()) {
                     QPen pen(mColor);
                     painter->setPen(pen);

src/chartpresenter.cpp +4 -4

                     if(m_options.testFlag(QChart::SeriesAnimations)) {
                      //  m_animator->addAnimation(bar);
                     }
-                    m_chartTheme->decorate(bar, barSeries, m_dataset->seriesIndex(barSeries));
+                    m_chartTheme->decorate(barSeries, m_dataset->seriesIndex(barSeries));
                     QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),bar,SLOT(handleGeometryChanged(const QRectF&)));
                     QObject::connect(domain,SIGNAL(domainChanged(qreal,qreal,qreal,qreal)),bar,SLOT(handleDomainChanged(qreal,qreal,qreal,qreal)));
                     item=bar;
                     if(m_options.testFlag(QChart::SeriesAnimations)) {
                      //  m_animator->addAnimation(bar);
                     }
-                    m_chartTheme->decorate(bar, stackedBarSeries, m_dataset->seriesIndex(stackedBarSeries));
+                    m_chartTheme->decorate(stackedBarSeries, m_dataset->seriesIndex(stackedBarSeries));
                     QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),bar,SLOT(handleGeometryChanged(const QRectF&)));
                     QObject::connect(domain,SIGNAL(domainChanged(qreal,qreal,qreal,qreal)),bar,SLOT(handleDomainChanged(qreal,qreal,qreal,qreal)));
                     item=bar;
                     if(m_options.testFlag(QChart::SeriesAnimations)) {
                      //  m_animator->addAnimation(bar);
                     }
-                    m_chartTheme->decorate(bar, percentBarSeries, m_dataset->seriesIndex(percentBarSeries));
+                    m_chartTheme->decorate(percentBarSeries, m_dataset->seriesIndex(percentBarSeries));
                     QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),bar,SLOT(handleGeometryChanged(const QRectF&)));
                     QObject::connect(domain,SIGNAL(domainChanged(qreal,qreal,qreal,qreal)),bar,SLOT(handleDomainChanged(qreal,qreal,qreal,qreal)));
                     item=bar;
                     if(m_options.testFlag(QChart::SeriesAnimations)) {
                        // m_animator->addAnimation(pie);
                     }
-                    m_chartTheme->decorate(pie, pieSeries, m_dataset->seriesIndex(series));
+                    m_chartTheme->decorate(pieSeries, m_dataset->seriesIndex(series));
                     QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),pie,SLOT(handleGeometryChanged(const QRectF&)));
                     QObject::connect(domain,SIGNAL(domainChanged(qreal,qreal,qreal,qreal)),pie,SLOT(handleDomainChanged(qreal,qreal,qreal,qreal)));
                     // Hide all from background when there is only piechart

src/charttheme.cpp +4 -4

                 }
             }
-            void ChartTheme::decorate(BarPresenter* item, QBarSeries* series,int index)
+            void ChartTheme::decorate(QBarSeries* series,int index)
             {
                 QList<QBarSet*> sets = series->barSets();
                 for (int i=0; i<sets.count(); i++) {
                 }
             }
-            void ChartTheme::decorate(StackedBarPresenter* item, QStackedBarSeries* series,int index)
+            void ChartTheme::decorate(QStackedBarSeries* series,int index)
             {
                 QList<QBarSet*> sets = series->barSets();
                 for (int i=0; i<sets.count(); i++) {
                 }
             }
-            void ChartTheme::decorate(PercentBarPresenter* item, QPercentBarSeries* series,int index)
+            void ChartTheme::decorate(QPercentBarSeries* series,int index)
             {
                 QList<QBarSet*> sets = series->barSets();
                 for (int i=0; i<sets.count(); i++) {
                 }
             }
-            void ChartTheme::decorate(PieChartItem* item, QPieSeries* series, int index)
+            void ChartTheme::decorate(QPieSeries* series, int index)
             {
                 // Get color for a slice from a gradient linearly, beginning from the start of the gradient
                 for (int i(0); i < series->slices().count(); i++) {

src/charttheme_p.h +4 -4

                 void decorate(QChart* chart);
                 void decorate(QLegend* legend);
                 //void decorate(ChartItem* item, QSeries* series,int index);
-                void decorate(BarPresenter* item, QBarSeries* series, int index);
+                void decorate(QBarSeries* series, int index);
-                void decorate(StackedBarPresenter* item, QStackedBarSeries* series, int index);
+                void decorate(QStackedBarSeries* series, int index);
-                void decorate(PercentBarPresenter* item, QPercentBarSeries* series, int index);
+                void decorate(QPercentBarSeries* series, int index);
                 void decorate(QLineSeries* series, int index);
                 void decorate(QAreaSeries* series, int index);
                 void decorate(QScatterSeries* series, int index);
-                void decorate(PieChartItem* item, QPieSeries* series, int index);
+                void decorate(QPieSeries* series, int index);
                 void decorate(QSplineSeries* series, int index);
                 void decorate(QChartAxis* axis, bool axisX);

src/legendmarker.cpp +3 0

             void LegendMarker::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
+                Q_UNUSED(option)
+                Q_UNUSED(widget)
                 painter->setBrush(mBrush);
                 painter->drawRect(mMarkerBoundingRect);
             }

src/linechart/linechartitem.cpp +3 -2

             void LineChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
-                Q_UNUSED(widget);
+                Q_UNUSED(widget)
-                Q_UNUSED(option);
+                Q_UNUSED(option)
                 painter->save();
                 painter->setPen(m_linePen);
                 painter->setClipRect(clipRect());

src/piechart/piechartitem.cpp +1 0

             void PieChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
             {
+                Q_UNUSED(painter)
                 // TODO: paint shadows for all components
                 // - get paths from items & merge & offset and draw with shadow color?
                 //painter->setBrush(QBrush(Qt::red));

src/piechart/qpieseries.cpp +7 0

             void QPieSeries::modelUpdated(QModelIndex topLeft, QModelIndex bottomRight)
             {
+                Q_UNUSED(bottomRight)
                 if (m_mapOrientation == Qt::Vertical)
                 {
                     //        slices().at(topLeft.row())->setValue(m_model->data(m_model->index(topLeft.row(), topLeft.column()), Qt::DisplayRole).toDouble());
             void QPieSeries::modelDataAdded(QModelIndex parent, int start, int end)
             {
+                Q_UNUSED(parent)
+                Q_UNUSED(end)
                 QPieSlice* newSlice = new QPieSlice;
                 newSlice->setLabelVisible(true);
                 if (m_mapOrientation == Qt::Vertical)
             void QPieSeries::modelDataRemoved(QModelIndex parent, int start, int end)
             {
+                Q_UNUSED(parent)
+                Q_UNUSED(end)
                 remove(slices().at(start));
             }

src/qlegend.cpp +6 -1

             void QLegend::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
+                Q_UNUSED(option)
+                Q_UNUSED(widget)
                 painter->setBrush(mBackgroundBrush);
                 painter->drawRect(mBoundingRect);
             }
                 mMinimumSize = size;
             }
-            void QLegend::handleSeriesAdded(QSeries* series,Domain* domain)
+            void QLegend::handleSeriesAdded(QSeries* series, Domain* domain)
             {
+                Q_UNUSED(domain)
                 mSeriesList.append(series);
                 createMarkers(series);
                 layoutChanged();

src/scatterseries/scatterchartitem.cpp +3 -7

             void ScatterChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
-                Q_UNUSED(painter);
+                Q_UNUSED(painter)
-                Q_UNUSED(option);
+                Q_UNUSED(option)
-                Q_UNUSED(widget);
+                Q_UNUSED(widget)
             }
             void ScatterChartItem::setPen(const QPen& pen)
             }
-            void ScatterChartItem::mousePressEvent( QGraphicsSceneMouseEvent * event )
             #include "moc_scatterchartitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/scatterseries/scatterchartitem_p.h +2 -1

             protected:
-               void mousePressEvent( QGraphicsSceneMouseEvent * event )
+               void mousePressEvent(QGraphicsSceneMouseEvent *event)
                {
+                   Q_UNUSED(event)
                    m_parent->markerSelected(this);
                }

src/splinechart/splinechartitem.cpp +3 -2

             void SplineChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
-                Q_UNUSED(widget);
+                Q_UNUSED(widget)
-                Q_UNUSED(option);
+                Q_UNUSED(option)
                 painter->save();
                 painter->setClipRect(clipRect());
                 painter->setPen(m_linePen);

src/xychart/qxyseries.cpp +6 0

             void QXYSeries::modelUpdated(QModelIndex topLeft, QModelIndex bottomRight)
             {
+                Q_UNUSED(bottomRight)
                 if (m_mapOrientation == Qt::Vertical)
                     emit pointReplaced(topLeft.row());
                 else
             void QXYSeries::modelDataAdded(QModelIndex parent, int start, int end)
             {
+                Q_UNUSED(parent)
+                Q_UNUSED(end)
                 emit pointAdded(start);
             }
             void QXYSeries::modelDataRemoved(QModelIndex parent, int start, int end)
             {
+                Q_UNUSED(parent)
+                Q_UNUSED(end)
                 emit pointRemoved(start);
             }

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