HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2241:9223452f638c

0

demos/piechartcustomization/brushtool.cpp +15 -15

@@ -31,21 +31,21 BrushTool::BrushTool(QString title, QWidget *parent)
31		31
32	m_colorButton = new QPushButton();	32	m_colorButton = new QPushButton();
33	m_styleCombo = new QComboBox();	33	m_styleCombo = new QComboBox();
34	m_styleCombo->addItem("Nobrush", Qt::NoBrush);	34	m_styleCombo->addItem("Nobrush", (int) Qt::NoBrush);
35	m_styleCombo->addItem("Solidpattern", Qt::SolidPattern);	35	m_styleCombo->addItem("Solidpattern", (int) Qt::SolidPattern);
36	m_styleCombo->addItem("Dense1pattern", Qt::Dense1Pattern);	36	m_styleCombo->addItem("Dense1pattern", (int) Qt::Dense1Pattern);
37	m_styleCombo->addItem("Dense2attern", Qt::Dense2Pattern);	37	m_styleCombo->addItem("Dense2attern", (int) Qt::Dense2Pattern);
38	m_styleCombo->addItem("Dense3Pattern", Qt::Dense3Pattern);	38	m_styleCombo->addItem("Dense3Pattern", (int) Qt::Dense3Pattern);
39	m_styleCombo->addItem("Dense4Pattern", Qt::Dense4Pattern);	39	m_styleCombo->addItem("Dense4Pattern", (int) Qt::Dense4Pattern);
40	m_styleCombo->addItem("Dense5Pattern", Qt::Dense5Pattern);	40	m_styleCombo->addItem("Dense5Pattern", (int) Qt::Dense5Pattern);
41	m_styleCombo->addItem("Dense6Pattern", Qt::Dense6Pattern);	41	m_styleCombo->addItem("Dense6Pattern", (int) Qt::Dense6Pattern);
42	m_styleCombo->addItem("Dense7Pattern", Qt::Dense7Pattern);	42	m_styleCombo->addItem("Dense7Pattern", (int) Qt::Dense7Pattern);
43	m_styleCombo->addItem("HorPattern", Qt::HorPattern);	43	m_styleCombo->addItem("HorPattern", (int) Qt::HorPattern);
44	m_styleCombo->addItem("VerPattern", Qt::VerPattern);	44	m_styleCombo->addItem("VerPattern", (int) Qt::VerPattern);
45	m_styleCombo->addItem("CrossPattern", Qt::CrossPattern);	45	m_styleCombo->addItem("CrossPattern", (int) Qt::CrossPattern);
46	m_styleCombo->addItem("BDiagPattern", Qt::BDiagPattern);	46	m_styleCombo->addItem("BDiagPattern", (int) Qt::BDiagPattern);
47	m_styleCombo->addItem("FDiagPattern", Qt::FDiagPattern);	47	m_styleCombo->addItem("FDiagPattern", (int) Qt::FDiagPattern);
48	m_styleCombo->addItem("DiagCrossPattern", Qt::DiagCrossPattern);	48	m_styleCombo->addItem("DiagCrossPattern", (int) Qt::DiagCrossPattern);
49		49
50	QFormLayout *layout = new QFormLayout();	50	QFormLayout *layout = new QFormLayout();
51	layout->addRow("Color", m_colorButton);	51	layout->addRow("Color", m_colorButton);

0

examples/barmodelmapper/tablewidget.cpp +5 0

                 QTableView *tableView = new QTableView;
                 tableView->setModel(model);
                 tableView->setMinimumWidth(300);
+            #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+                tableView->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
+                tableView->verticalHeader()->setSectionResizeMode(QHeaderView::Stretch);
+            #else
                 tableView->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
                 tableView->verticalHeader()->setResizeMode(QHeaderView::Stretch);
+            #endif
                 //! [2]
                 //! [3]

0

examples/modeldata/tablewidget.cpp +5 0

                 // create table view and add model to it
                 QTableView *tableView = new QTableView;
                 tableView->setModel(model);
+            #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+                tableView->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
+                tableView->verticalHeader()->setSectionResizeMode(QHeaderView::Stretch);
+            #else
                 tableView->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
                 tableView->verticalHeader()->setResizeMode(QHeaderView::Stretch);
+            #endif
                 //! [2]
                 //! [3]

0

src/animations/abstractbaranimation.cpp +1 -1

             void AbstractBarAnimation::updateCurrentValue(const QVariant &value)
             {
-                QVector<QRectF> layout = qVariantValue<QVector<QRectF> >(value);
+                QVector<QRectF> layout = qvariant_cast<QVector<QRectF> >(value);
                 m_item->setLayout(layout);
             }

0

src/animations/axisanimation.cpp +3 -3

             QVariant AxisAnimation::interpolated(const QVariant &start, const QVariant &end, qreal progress) const
             {
-                QVector<qreal> startVector = qVariantValue<QVector<qreal> >(start);
+                QVector<qreal> startVector = qvariant_cast<QVector<qreal> >(start);
-                QVector<qreal> endVecotr = qVariantValue<QVector<qreal> >(end);
+                QVector<qreal> endVecotr = qvariant_cast<QVector<qreal> >(end);
                 QVector<qreal> result;
                 Q_ASSERT(startVector.count() == endVecotr.count()) ;
             void AxisAnimation::updateCurrentValue(const QVariant &value)
             {
                 if (state() != QAbstractAnimation::Stopped) { //workaround
-                    QVector<qreal> vector = qVariantValue<QVector<qreal> >(value);
+                    QVector<qreal> vector = qvariant_cast<QVector<qreal> >(value);
                     Q_ASSERT(vector.count() != 0);
                     m_axis->setLayout(vector);
                     m_axis->updateGeometry();

0

src/animations/baranimation.cpp +2 -2

             QVariant BarAnimation::interpolated(const QVariant &from, const QVariant &to, qreal progress) const
             {
-                QVector<QRectF> startVector = qVariantValue<QVector<QRectF> >(from);
+                QVector<QRectF> startVector = qvariant_cast<QVector<QRectF> >(from);
-                QVector<QRectF> endVector = qVariantValue<QVector<QRectF> >(to);
+                QVector<QRectF> endVector = qvariant_cast<QVector<QRectF> >(to);
                 QVector<QRectF> result;
                 Q_ASSERT(startVector.count() == endVector.count());

0

src/animations/horizontalbaranimation.cpp +2 -2

             QVariant HorizontalBarAnimation::interpolated(const QVariant &from, const QVariant &to, qreal progress) const
             {
-                QVector<QRectF> startVector = qVariantValue<QVector<QRectF> >(from);
+                QVector<QRectF> startVector = qvariant_cast<QVector<QRectF> >(from);
-                QVector<QRectF> endVector = qVariantValue<QVector<QRectF> >(to);
+                QVector<QRectF> endVector = qvariant_cast<QVector<QRectF> >(to);
                 QVector<QRectF> result;
                 Q_ASSERT(startVector.count() == endVector.count());

0

src/animations/horizontalpercentbaranimation.cpp +2 -2

             QVariant HorizontalPercentBarAnimation::interpolated(const QVariant &from, const QVariant &to, qreal progress) const
             {
-                QVector<QRectF> startVector = qVariantValue<QVector<QRectF> >(from);
+                QVector<QRectF> startVector = qvariant_cast<QVector<QRectF> >(from);
-                QVector<QRectF> endVector = qVariantValue<QVector<QRectF> >(to);
+                QVector<QRectF> endVector = qvariant_cast<QVector<QRectF> >(to);
                 QVector<QRectF> result;
                 Q_ASSERT(startVector.count() == endVector.count());

0

src/animations/horizontalstackedbaranimation.cpp +2 -2

             QVariant HorizontalStackedBarAnimation::interpolated(const QVariant &from, const QVariant &to, qreal progress) const
             {
-                QVector<QRectF> startVector = qVariantValue<QVector<QRectF> >(from);
+                QVector<QRectF> startVector = qvariant_cast<QVector<QRectF> >(from);
-                QVector<QRectF> endVector = qVariantValue<QVector<QRectF> >(to);
+                QVector<QRectF> endVector = qvariant_cast<QVector<QRectF> >(to);
                 QVector<QRectF> result;
                 Q_ASSERT(startVector.count() == endVector.count());

0

src/animations/percentbaranimation.cpp +2 -2

             QVariant PercentBarAnimation::interpolated(const QVariant &from, const QVariant &to, qreal progress) const
             {
-                QVector<QRectF> startVector = qVariantValue<QVector<QRectF> >(from);
+                QVector<QRectF> startVector = qvariant_cast<QVector<QRectF> >(from);
-                QVector<QRectF> endVector = qVariantValue<QVector<QRectF> >(to);
+                QVector<QRectF> endVector = qvariant_cast<QVector<QRectF> >(to);
                 QVector<QRectF> result;
                 Q_ASSERT(startVector.count() == endVector.count());

0

src/animations/piesliceanimation.cpp +3 -3

             QVariant PieSliceAnimation::interpolated(const QVariant &start, const QVariant &end, qreal progress) const
             {
-                PieSliceData startValue = qVariantValue<PieSliceData>(start);
+                PieSliceData startValue = qvariant_cast<PieSliceData>(start);
-                PieSliceData endValue = qVariantValue<PieSliceData>(end);
+                PieSliceData endValue = qvariant_cast<PieSliceData>(end);
                 PieSliceData result;
                 result = endValue;
             void PieSliceAnimation::updateCurrentValue(const QVariant &value)
             {
                 if (state() != QAbstractAnimation::Stopped) { //workaround
-                    m_currentValue = qVariantValue<PieSliceData>(value);
+                    m_currentValue = qvariant_cast<PieSliceData>(value);
                     m_sliceItem->setLayout(m_currentValue);
                 }
             }

0

src/animations/splineanimation.cpp +3 -3

             QVariant SplineAnimation::interpolated(const QVariant &start, const QVariant &end, qreal progress) const
             {
-                SplineVector startPair = qVariantValue< SplineVector >(start);
+                SplineVector startPair = qvariant_cast< SplineVector >(start);
-                SplineVector endPair = qVariantValue< SplineVector >(end);
+                SplineVector endPair = qvariant_cast< SplineVector >(end);
                 SplineVector result;
                 switch (animationType()) {
             void SplineAnimation::updateCurrentValue(const QVariant &value)
             {
                 if (state() != QAbstractAnimation::Stopped && m_valid) { //workaround
-                    QPair<QVector<QPointF >, QVector<QPointF > > pair = qVariantValue< QPair< QVector<QPointF>, QVector<QPointF> > >(value);
+                    QPair<QVector<QPointF >, QVector<QPointF > > pair = qvariant_cast< QPair< QVector<QPointF>, QVector<QPointF> > >(value);
                     m_item->setGeometryPoints(pair.first);
                     m_item->setControlGeometryPoints(pair.second);
                     m_item->updateGeometry();

0

src/animations/stackedbaranimation.cpp +2 -2

             QVariant StackedBarAnimation::interpolated(const QVariant &from, const QVariant &to, qreal progress) const
             {
-                QVector<QRectF> startVector = qVariantValue<QVector<QRectF> >(from);
+                QVector<QRectF> startVector = qvariant_cast<QVector<QRectF> >(from);
-                QVector<QRectF> endVector = qVariantValue<QVector<QRectF> >(to);
+                QVector<QRectF> endVector = qvariant_cast<QVector<QRectF> >(to);
                 QVector<QRectF> result;
                 Q_ASSERT(startVector.count() == endVector.count());

0

src/animations/xyanimation.cpp +3 -3

             QVariant XYAnimation::interpolated(const QVariant &start, const QVariant &end, qreal progress) const
             {
-                QVector<QPointF> startVector = qVariantValue<QVector<QPointF> >(start);
+                QVector<QPointF> startVector = qvariant_cast<QVector<QPointF> >(start);
-                QVector<QPointF> endVector = qVariantValue<QVector<QPointF> >(end);
+                QVector<QPointF> endVector = qvariant_cast<QVector<QPointF> >(end);
                 QVector<QPointF> result;
                 switch (m_type) {
             {
                 if (state() != QAbstractAnimation::Stopped) { //workaround
-                    QVector<QPointF> vector = qVariantValue<QVector<QPointF> >(value);
+                    QVector<QPointF> vector = qvariant_cast<QVector<QPointF> >(value);
                     m_item->setGeometryPoints(vector);
                     m_item->updateGeometry();
                     m_item->setDirty(true);

0

src/axis/chartaxis.cpp +3 -3

             void ChartAxis::createItems(int count)
             {
-                if (m_arrow->children().size() == 0)
+                if (m_arrow->childItems().size() == 0)
                     m_arrow->addToGroup(new AxisItem(this, presenter()->rootItem()));
-                if (m_intervalAxis && m_grid->children().size() == 0) {
+                if (m_intervalAxis && m_grid->childItems().size() == 0) {
                     for (int i = 0 ; i < 2 ; i  ++)
                         m_grid->addToGroup(new QGraphicsLineItem(presenter()->rootItem()));
                 }
                         labels << QString::number(value, 'f', n);
                     }
                 } else {
-                    QByteArray array = format.toAscii();
+                    QByteArray array = format.toLatin1();
                     for (int i = 0; i < ticks; i++) {
                         qreal value = m_min + (i * (m_max - m_min) / (ticks - 1));
                         labels << QString().sprintf(array, value);

0

src/legend/legendmarkeritem.cpp +1 -1

                 m_pressPos(0, 0)
             {
                 m_rectItem->setRect(m_markerRect);
-                setAcceptsHoverEvents(true);
+                setAcceptHoverEvents(true);
             }
             LegendMarkerItem::~LegendMarkerItem()

0

tests/auto/inc/tst_definitions.h +11 0

@@ -24,6 +24,17
24	#include <QtTest/QtTest>	24	#include <QtTest/QtTest>
25	#include <QPushButton>	25	#include <QPushButton>
26		26
		27	#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
		28	namespace QTest
		29	{
		30	// This was deprecated in Qt5. This is a small hack for the sake of compatibility.
		31	inline static bool qWaitForWindowShown(QWidget *window)
		32	{
		33	return QTest::qWaitForWindowExposed(window);
		34	}
		35	}
		36	#endif
		37
27	#define TRY_COMPARE(actual, expected) { \	38	#define TRY_COMPARE(actual, expected) { \
28	do { \	39	do { \
29	const int timeout(1000); \	40	const int timeout(1000); \

0

tests/auto/qbarset/tst_qbarset.cpp +1 0

             #include <qbarset.h>
             #include <qbarseries.h>
             #include <qchartview.h>
+            #include "tst_definitions.h"
             QTCOMMERCIALCHART_USE_NAMESPACE

0

tests/auto/qchart/tst_qchart.cpp +1 0

             #include <qstackedbarseries.h>
             #include <qvalueaxis.h>
             #include <qbarcategoryaxis.h>
+            #include "tst_definitions.h"
             QTCOMMERCIALCHART_USE_NAMESPACE

	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