HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2504:54fd83ddb7ed

Fix some warnings for android build....

Miikka Heikkinen -

r2504:54fd83ddb7ed

parent child

Context file:

r2504:54fd83ddb7ed

Collapse all files

src/axis/polarchartaxis.cpp +6 0

                 if (animation()) {
                     switch (presenter()->state()) {
+                    case ChartPresenter::ZoomInState:
+                    case ChartPresenter::ZoomOutState:
+                    case ChartPresenter::ScrollUpState:
+                    case ChartPresenter::ScrollLeftState:
+                    case ChartPresenter::ScrollDownState:
+                    case ChartPresenter::ScrollRightState:
                     case ChartPresenter::ShowState:
                         animation()->setAnimationType(AxisAnimation::DefaultAnimation);
                         break;

src/axis/polarchartaxisangular.cpp +4 -7

                         if (i == (layout.size() - 1))
                             farEdge = 360.0;
                         else
-                            farEdge = qMin(360.0, layout.at(i + 1));
+                            farEdge = qMin(qreal(360.0), layout.at(i + 1));
                         // Adjust the labelCoordinate to show it if next tick is visible
                         if (nextTickVisible)
-                            labelCoordinate = qMax(0.0, labelCoordinate);
+                            labelCoordinate = qMax(qreal(0.0), labelCoordinate);
                         labelCoordinate = (labelCoordinate + farEdge) / 2.0;
                         // Don't display label once the category gets too small near the axis
                 if (maxSize.width() < maxSize.height())
                     radius = maxSize.width() / 2.0;
-                int labelHeight = 0;
                 if (axis()->labelsVisible()) {
                     QVector<qreal> layout = calculateLayout();
                     if (layout.isEmpty())
                             if (i == (layout.size() - 1))
                                 farEdge = 360.0;
                             else
-                                farEdge = qMin(360.0, layout.at(i + 1));
+                                farEdge = qMin(qreal(360.0), layout.at(i + 1));
                             // Adjust the labelCoordinate to show it if next tick is visible
                             if (nextTickVisible)
-                                labelCoordinate = qMax(0.0, labelCoordinate);
+                                labelCoordinate = qMax(qreal(0.0), labelCoordinate);
                             labelCoordinate = (labelCoordinate + farEdge) / 2.0;
                         }
                         }
                         QRectF boundingRect = labelBoundingRect(fm, labelList.at(i));
-                        labelHeight = boundingRect.height();
                         QPointF labelPoint = QLineF::fromPolar(radius + tickWidth(), 90.0 - labelCoordinate).p2();
                         boundingRect = moveLabelToPosition(labelCoordinate, labelPoint, boundingRect);

src/axis/polarchartaxisradial.cpp +1 -1

                         // Adjust the labelCoordinate to show it if next tick is visible
                         if (nextTickVisible)
-                            labelCoordinate = qMax(0.0, labelCoordinate);
+                            labelCoordinate = qMax(qreal(0.0), labelCoordinate);
                         labelCoordinate = (labelCoordinate + farEdge) / 2.0;
                         if (labelCoordinate > 0.0 && labelCoordinate < radius)

src/chartconfig_p.h +2 -2

                 }
                 QString compilationTime() {
-                    return buildTime;
+                    return QString(buildTime);
                 }
                 QString compilationHead() {
-                    return gitHead;
+                    return QString(gitHead);
                 }
             private:

src/qchart.cpp +2 -2

             QChartPrivate::QChartPrivate(QChart *q, QChart::ChartType type):
                 q_ptr(q),
-                m_type(type),
                 m_legend(0),
                 m_dataset(new ChartDataSet(q)),
                 m_presenter(new ChartPresenter(q, type)),
-                m_themeManager(new ChartThemeManager(q))
+                m_themeManager(new ChartThemeManager(q)),
+                m_type(type)
             {
                 QObject::connect(m_dataset, SIGNAL(seriesAdded(QAbstractSeries*)), m_presenter, SLOT(handleSeriesAdded(QAbstractSeries*)));
                 QObject::connect(m_dataset, SIGNAL(seriesRemoved(QAbstractSeries*)), m_presenter, SLOT(handleSeriesRemoved(QAbstractSeries*)));

src/qchartview.cpp +2 -1

             #include "qchart_p.h"
             #include <QGraphicsScene>
             #include <QRubberBand>
+            #include <qmath.h>
             /*!
                 \enum QChartView::RubberBand
             {
                 // Flip chart width and height if the view has been rotated
                 // more than 45 degrees from the horizontal so it fits better into the view.
-                qreal angle = acos(q_ptr->transform().m11()) * rad2deg;
+                qreal angle = qAcos(q_ptr->transform().m11()) * rad2deg;
                 QSize chartSize = q_ptr->size();
                 if (angle > 45.0 && angle < 135.0) {

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