Remove deprecated elements from APIs.

Task-number: QTRD-2098
Change-Id: Ib658c8a51af0b73ded5d6b13c8fa58762f859961
Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>

13 files changed, 7 insertions, 144 deletions

diff --git a/tests/auto/qabstractaxis/tst_qabstractaxis.cpp b/tests/auto/qabstractaxis/tst_qabstractaxis.cpp
index 44b65d27..df7ee496 100644
--- a/tests/auto/qabstractaxis/tst_qabstractaxis.cpp
+++ b/tests/auto/qabstractaxis/tst_qabstractaxis.cpp
@@ -56,7 +56,6 @@ void tst_QAbstractAxis::qabstractaxis()
     QCOMPARE(m_axis->labelsAngle(), 0);
     QCOMPARE(m_axis->labelsBrush(), QBrush());
     QCOMPARE(m_axis->labelsFont(), QFont());
-    QCOMPARE(m_axis->labelsPen(), QPen());
     QCOMPARE(m_axis->labelsVisible(), true);
     QCOMPARE(m_axis->orientation(), Qt::Orientation(0));
     m_axis->setLineVisible(false);
@@ -68,7 +67,6 @@ void tst_QAbstractAxis::qabstractaxis()
     m_axis->setLabelsBrush(QBrush());
     m_axis->setLabelsColor(QColor());
     m_axis->setLabelsFont(QFont());
-    m_axis->setLabelsPen(QPen());
     m_axis->setLabelsVisible(false);
     m_axis->setMax(QVariant());
     m_axis->setMin(QVariant());
@@ -443,48 +441,6 @@ void tst_QAbstractAxis::labelsFont()
 
 }
 
-void tst_QAbstractAxis::labelsPen_data()
-{
-    QTest::addColumn<QPen>("labelsPen");
-    QTest::newRow("null") << QPen();
-    QTest::newRow("blue") << QPen(Qt::blue);
-    QTest::newRow("black") << QPen(Qt::black);
-    QTest::newRow("red") << QPen(Qt::red);
-}
-
-void tst_QAbstractAxis::labelsPen()
-{
-    QFETCH(QPen, labelsPen);
-
-    QSignalSpy spy0(m_axis, SIGNAL(lineVisibleChanged(bool)));
-    QSignalSpy spy1(m_axis, SIGNAL(colorChanged(QColor)));
-    QSignalSpy spy2(m_axis, SIGNAL(gridVisibleChanged(bool)));
-    QSignalSpy spy3(m_axis, SIGNAL(labelsColorChanged(QColor)));
-    QSignalSpy spy4(m_axis, SIGNAL(labelsVisibleChanged(bool)));
-    QSignalSpy spy5(m_axis, SIGNAL(shadesBorderColorChanged(QColor)));
-    QSignalSpy spy6(m_axis, SIGNAL(shadesColorChanged(QColor)));
-    QSignalSpy spy7(m_axis, SIGNAL(shadesVisibleChanged(bool)));
-    QSignalSpy spy8(m_axis, SIGNAL(visibleChanged(bool)));
-
-    m_axis->setLabelsPen(labelsPen);
-    QCOMPARE(m_axis->labelsPen(), labelsPen);
-
-    QCOMPARE(spy0.count(), 0);
-    QCOMPARE(spy1.count(), 0);
-    QCOMPARE(spy2.count(), 0);
-    QCOMPARE(spy3.count(), 0);
-    QCOMPARE(spy4.count(), 0);
-    QCOMPARE(spy5.count(), 0);
-    QCOMPARE(spy6.count(), 0);
-    QCOMPARE(spy7.count(), 0);
-    QCOMPARE(spy8.count(), 0);
-
-    m_chart->setAxisX(m_axis, m_series);
-    m_view->show();
-    QTest::qWaitForWindowShown(m_view);
-    //TODO QCOMPARE(m_axis->labelsPen(), labelsPen);
-}
-
 void tst_QAbstractAxis::labelsVisible_data()
 {
     QTest::addColumn<bool>("labelsVisible");
diff --git a/tests/auto/qabstractaxis/tst_qabstractaxis.h b/tests/auto/qabstractaxis/tst_qabstractaxis.h
index 68b29ef2..72b3f7a1 100644
--- a/tests/auto/qabstractaxis/tst_qabstractaxis.h
+++ b/tests/auto/qabstractaxis/tst_qabstractaxis.h
@@ -57,8 +57,6 @@ private slots:
     void labelsColor();
     void labelsFont_data();
     void labelsFont();
-    void labelsPen_data();
-    void labelsPen();
     void labelsVisible_data();
     void labelsVisible();
     void orientation_data();
diff --git a/tests/auto/qchartview/tst_qchartview.cpp b/tests/auto/qchartview/tst_qchartview.cpp
index 42dc9377..14ab9db8 100644
--- a/tests/auto/qchartview/tst_qchartview.cpp
+++ b/tests/auto/qchartview/tst_qchartview.cpp
@@ -120,11 +120,11 @@ void tst_QChartView::rubberBand_data()
     QTest::addColumn<QPoint>("max");
 
     if (isPolarTest()) {
-        QTest::newRow("HorizonalRubberBand") << QChartView::RubberBands(QChartView::HorizonalRubberBand) << 0 << 0 << QPoint(5,5) << QPoint(5,5);
+        QTest::newRow("HorizontalRubberBand") << QChartView::RubberBands(QChartView::HorizontalRubberBand) << 0 << 0 << QPoint(5,5) << QPoint(5,5);
         QTest::newRow("VerticalRubberBand") <<  QChartView::RubberBands(QChartView::VerticalRubberBand) << 0 << 0 << QPoint(5,5) << QPoint(5,5);
         QTest::newRow("RectangleRubberBand") <<  QChartView::RubberBands(QChartView::RectangleRubberBand) << 0 << 0 << QPoint(5,5) << QPoint(5,5);
     } else {
-        QTest::newRow("HorizonalRubberBand") << QChartView::RubberBands(QChartView::HorizonalRubberBand) << 0 << 1 << QPoint(5,5) << QPoint(5,5);
+        QTest::newRow("HorizontalRubberBand") << QChartView::RubberBands(QChartView::HorizontalRubberBand) << 0 << 1 << QPoint(5,5) << QPoint(5,5);
         QTest::newRow("VerticalRubberBand") <<  QChartView::RubberBands(QChartView::VerticalRubberBand) << 1 << 0 << QPoint(5,5) << QPoint(5,5);
         QTest::newRow("RectangleRubberBand") <<  QChartView::RubberBands(QChartView::RectangleRubberBand) << 1 << 1 << QPoint(5,5) << QPoint(5,5);
     }
diff --git a/tests/auto/qml-qtquicktest/tst_chartview_1_1.qml b/tests/auto/qml-qtquicktest/tst_chartview_1_1.qml
index e8236100..f485aad1 100644
--- a/tests/auto/qml-qtquicktest/tst_chartview_1_1.qml
+++ b/tests/auto/qml-qtquicktest/tst_chartview_1_1.qml
@@ -32,10 +32,6 @@ Rectangle {
         function test_chartViewProperties() {
             compare(chartView.animationOptions, ChartView.NoAnimation, "ChartView.animationOptions");
             verify(chartView.backgroundColor != undefined);
-            verify(chartView.bottomMargin > 0, "ChartView.bottomMargin");
-            verify(chartView.topMargin > 0, "ChartView.topMargin");
-            verify(chartView.leftMargin > 0, "ChartView.leftMargin");
-            verify(chartView.rightMargin > 0, "ChartView.rightMargin");
             compare(chartView.count, 0, "ChartView.count");
             compare(chartView.dropShadowEnabled, false, "ChartView.dropShadowEnabled");
             verify(chartView.plotArea.height > 0, "ChartView.plotArea.height");
diff --git a/tests/auto/qvalueaxis/tst_qvalueaxis.cpp b/tests/auto/qvalueaxis/tst_qvalueaxis.cpp
index 66b7af3c..024de09d 100644
--- a/tests/auto/qvalueaxis/tst_qvalueaxis.cpp
+++ b/tests/auto/qvalueaxis/tst_qvalueaxis.cpp
@@ -103,7 +103,6 @@ void tst_QValueAxis::qvalueaxis()
 
     QVERIFY(qFuzzyCompare(m_valuesaxis->max(), 0));
     QVERIFY(qFuzzyCompare(m_valuesaxis->min(), 0));
-    QCOMPARE(m_valuesaxis->niceNumbersEnabled(), false);
     QCOMPARE(m_valuesaxis->tickCount(), 5);
     QCOMPARE(m_valuesaxis->type(), QAbstractAxis::AxisTypeValue);
 
@@ -113,7 +112,6 @@ void tst_QValueAxis::qvalueaxis()
 
     QVERIFY(!qFuzzyCompare(m_valuesaxis->max(), 0));
     QVERIFY(!qFuzzyCompare(m_valuesaxis->min(), 0));
-    QCOMPARE(m_valuesaxis->niceNumbersEnabled(), false);
     QCOMPARE(m_valuesaxis->tickCount(), 5);
 }
 
diff --git a/tests/manual/chartwidgettest/mainwidget.cpp b/tests/manual/chartwidgettest/mainwidget.cpp
index 318710d9..f761e42a 100644
--- a/tests/manual/chartwidgettest/mainwidget.cpp
+++ b/tests/manual/chartwidgettest/mainwidget.cpp
@@ -68,7 +68,7 @@ MainWidget::MainWidget(QWidget *parent) :
 
     // Create chart view with the chart
     m_chartView = new QChartView(m_chart, this);
-    m_chartView->setRubberBand(QChartView::HorizonalRubberBand);
+    m_chartView->setRubberBand(QChartView::HorizontalRubberBand);
 
     // Another grid layout as a main layout
     QGridLayout *mainLayout = new QGridLayout();
diff --git a/tests/manual/polarcharttest/mainwindow.cpp b/tests/manual/polarcharttest/mainwindow.cpp
index bb7e1ef7..a38efbcc 100644
--- a/tests/manual/polarcharttest/mainwindow.cpp
+++ b/tests/manual/polarcharttest/mainwindow.cpp
@@ -60,8 +60,6 @@ MainWindow::MainWindow(QWidget *parent) :
     m_plotAreaBackgroundBrush(new QBrush(Qt::NoBrush)),
     m_angularShadesPen(new QPen(Qt::NoPen)),
     m_radialShadesPen(new QPen(Qt::NoPen)),
-    m_labelPen(new QPen(Qt::NoPen)),
-    m_titlePen(new QPen(Qt::NoPen)),
     m_gridPen(new QPen(QRgb(0x010101))),  // Note: Pure black is default color, so it gets overridden by
     m_arrowPen(new QPen(QRgb(0x010101))), // default theme if set to that initially. This is an example of workaround.
     m_backgroundPen(new QPen(Qt::NoPen)),
@@ -429,14 +427,12 @@ void MainWindow::setAngularAxis(MainWindow::AxisMode mode)
     m_angularAxis->setLabelsAngle(m_labelsAngle);
     m_angularAxis->setLabelsFont(m_currentLabelFont);
     m_angularAxis->setLabelsBrush(*m_labelBrush);
-    m_angularAxis->setLabelsPen(*m_labelPen);
     m_angularAxis->setLabelsVisible(m_labelsVisible);
     m_angularAxis->setShadesBrush(*m_angularShadesBrush);
     m_angularAxis->setShadesPen(*m_angularShadesPen);
     m_angularAxis->setShadesVisible(m_angularShadesVisible);
     m_angularAxis->setTitleFont(m_currentTitleFont);
     m_angularAxis->setTitleBrush(*m_titleBrush);
-    m_angularAxis->setTitlePen(*m_titlePen);
     m_angularAxis->setTitleVisible(m_titleVisible);
     m_angularAxis->setTitleText(m_angularTitle);
     m_angularAxis->setGridLinePen(*m_gridPen);
@@ -499,14 +495,12 @@ void MainWindow::setRadialAxis(MainWindow::AxisMode mode)
     m_radialAxis->setLabelsAngle(m_labelsAngle);
     m_radialAxis->setLabelsFont(m_currentLabelFont);
     m_radialAxis->setLabelsBrush(*m_labelBrush);
-    m_radialAxis->setLabelsPen(*m_labelPen);
     m_radialAxis->setLabelsVisible(m_labelsVisible);
     m_radialAxis->setShadesBrush(*m_radialShadesBrush);
     m_radialAxis->setShadesPen(*m_radialShadesPen);
     m_radialAxis->setShadesVisible(m_radialShadesVisible);
     m_radialAxis->setTitleFont(m_currentTitleFont);
     m_radialAxis->setTitleBrush(*m_titleBrush);
-    m_radialAxis->setTitlePen(*m_titlePen);
     m_radialAxis->setTitleVisible(m_titleVisible);
     m_radialAxis->setTitleText(m_radialTitle);
     m_radialAxis->setGridLinePen(*m_gridPen);
@@ -750,22 +744,18 @@ void MainWindow::animationIndexChanged(int index)
 void MainWindow::labelsIndexChanged(int index)
 {
     delete m_labelBrush;
-    delete m_labelPen;
 
     switch (index) {
     case 0:
         m_labelBrush = new QBrush(Qt::NoBrush);
-        m_labelPen = new QPen(Qt::NoPen);
         m_labelsVisible = false;
         break;
     case 1:
         m_labelBrush = new QBrush(Qt::black);
-        m_labelPen = new QPen(Qt::NoPen);
         m_labelsVisible = true;
         break;
     case 2:
         m_labelBrush = new QBrush(Qt::white);
-        m_labelPen = new QPen(Qt::blue);
         m_labelsVisible = true;
         break;
     default:
@@ -773,50 +763,42 @@ void MainWindow::labelsIndexChanged(int index)
     }
 
     m_radialAxis->setLabelsBrush(*m_labelBrush);
-    m_radialAxis->setLabelsPen(*m_labelPen);
     m_radialAxis->setLabelsVisible(m_labelsVisible);
     m_angularAxis->setLabelsBrush(*m_labelBrush);
-    m_angularAxis->setLabelsPen(*m_labelPen);
     m_angularAxis->setLabelsVisible(m_labelsVisible);
 }
 
 void MainWindow::titleIndexChanged(int index)
 {
     delete m_titleBrush;
-    delete m_titlePen;
 
     switch (index) {
     case 0:
         m_titleBrush = new QBrush(Qt::NoBrush);
-        m_titlePen = new QPen(Qt::NoPen);
         m_titleVisible = false;
         m_angularTitle = QString();
         m_radialTitle = QString();
         break;
     case 1:
         m_titleBrush = new QBrush(Qt::NoBrush);
-        m_titlePen = new QPen(Qt::NoPen);
         m_titleVisible = true;
         m_angularTitle = QString();
         m_radialTitle = QString();
         break;
     case 2:
         m_titleBrush = new QBrush(Qt::NoBrush);
-        m_titlePen = new QPen(Qt::NoPen);
         m_titleVisible = false;
         m_angularTitle = QString("Invisible Ang. Title!");
         m_radialTitle = QString("Invisible Rad. Title!");
         break;
     case 3:
         m_titleBrush = new QBrush(Qt::black);
-        m_titlePen = new QPen(Qt::NoPen);
         m_titleVisible = true;
         m_angularTitle = QString("Angular Title");
         m_radialTitle = QString("Radial Title");
         break;
     case 4:
         m_titleBrush = new QBrush(Qt::white);
-        m_titlePen = new QPen(Qt::blue);
         m_titleVisible = true;
         m_angularTitle = QString("Angular Blue Title");
         m_radialTitle = QString("Radial Blue Title");
@@ -826,11 +808,9 @@ void MainWindow::titleIndexChanged(int index)
     }
 
     m_radialAxis->setTitleBrush(*m_titleBrush);
-    m_radialAxis->setTitlePen(*m_titlePen);
     m_radialAxis->setTitleVisible(m_titleVisible);
     m_radialAxis->setTitleText(m_radialTitle);
     m_angularAxis->setTitleBrush(*m_titleBrush);
-    m_angularAxis->setTitlePen(*m_titlePen);
     m_angularAxis->setTitleVisible(m_titleVisible);
     m_angularAxis->setTitleText(m_angularTitle);
 }
diff --git a/tests/manual/polarcharttest/mainwindow.h b/tests/manual/polarcharttest/mainwindow.h
index 693a224d..237e262a 100644
--- a/tests/manual/polarcharttest/mainwindow.h
+++ b/tests/manual/polarcharttest/mainwindow.h
@@ -125,8 +125,6 @@ private:
     QBrush *m_plotAreaBackgroundBrush;
     QPen *m_angularShadesPen;
     QPen *m_radialShadesPen;
-    QPen *m_labelPen;
-    QPen *m_titlePen;
     QPen *m_gridPen;
     QPen *m_arrowPen;
     QPen *m_backgroundPen;
diff --git a/tests/manual/qmlchartaxis/qml/qmlchartaxis/Legacy.qml b/tests/manual/qmlchartaxis/qml/qmlchartaxis/Legacy.qml
deleted file mode 100644
index 7649f1c0..00000000
--- a/tests/manual/qmlchartaxis/qml/qmlchartaxis/Legacy.qml
+++ /dev/null
@@ -1,54 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.io
-**
-** This file is part of the Qt Charts module.
-**
-** Licensees holding valid commercial license for Qt may use this file in
-** accordance with the Qt License Agreement provided with the Software
-** or, alternatively, in accordance with the terms contained in a written
-** agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.io
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtCharts 2.0
-
-ChartView {
-    id: chartView
-    title: "Deprecated code"
-    property int index: 0
-
-    Component.onCompleted: {
-        // Calling createDefaultAxes in onCompleted is now deprecated. It needs to be tested,
-        // though, because some application may still use it
-        chartView.createDefaultAxes();
-    }
-
-    LineSeries {
-        name: "line series"
-        XYPoint { x: 0; y: 0 }
-        XYPoint { x: 1; y: 1 }
-        XYPoint { x: 2; y: 2 }
-        XYPoint { x: 3; y: 3 }
-        XYPoint { x: 4; y: 4 }
-    }
-
-    ScatterSeries {
-        name: "scatter series"
-        XYPoint { x: 0; y: 0 }
-        XYPoint { x: 0.5; y: 1 }
-        XYPoint { x: 1; y: 2 }
-        XYPoint { x: 1.5; y: 3 }
-        XYPoint { x: 2; y: 4 }
-        XYPoint { x: 1; y: 1 }
-        XYPoint { x: 2; y: 2 }
-        XYPoint { x: 3; y: 3 }
-        XYPoint { x: 4; y: 4 }
-    }
-}
diff --git a/tests/manual/qmlchartaxis/qml/qmlchartaxis/main.qml b/tests/manual/qmlchartaxis/qml/qmlchartaxis/main.qml
index 4b6bc30d..52b11c5d 100644
--- a/tests/manual/qmlchartaxis/qml/qmlchartaxis/main.qml
+++ b/tests/manual/qmlchartaxis/qml/qmlchartaxis/main.qml
@@ -85,10 +85,6 @@ Rectangle {
                 text: "Default + User defined"
                 onClicked: viewName = "DefaultAndUserDefined";
             }
-            Button {
-                text: "Legacy"
-                onClicked: viewName = "Legacy";
-            }
         }
     }
 }
diff --git a/tests/manual/qmlchartaxis/resources.qrc b/tests/manual/qmlchartaxis/resources.qrc
index 2f9f4b67..260f3b13 100644
--- a/tests/manual/qmlchartaxis/resources.qrc
+++ b/tests/manual/qmlchartaxis/resources.qrc
@@ -13,6 +13,5 @@
         <file>qml/qmlchartaxis/CreatingDynamically.qml</file>
         <file>qml/qmlchartaxis/SwitchingDynamically.qml</file>
         <file>qml/qmlchartaxis/DefaultAndUserDefined.qml</file>
-        <file>qml/qmlchartaxis/Legacy.qml</file>
     </qresource>
 </RCC>
diff --git a/tests/manual/qmlchartproperties/qml/qmlchartproperties/Chart.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/Chart.qml
index acfbdaba..6767b3b1 100644
--- a/tests/manual/qmlchartproperties/qml/qmlchartproperties/Chart.qml
+++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/Chart.qml
@@ -95,10 +95,10 @@ ChartView {
         color: "transparent"
         border.color: "red"
         anchors.fill: parent
-        anchors.topMargin: chartView.minimumMargins.top
-        anchors.bottomMargin: chartView.minimumMargins.bottom
-        anchors.leftMargin: chartView.minimumMargins.left
-        anchors.rightMargin: chartView.minimumMargins.right
+        anchors.topMargin: chartView.margins.top
+        anchors.bottomMargin: chartView.margins.bottom
+        anchors.leftMargin: chartView.margins.left
+        anchors.rightMargin: chartView.margins.right
         opacity: 0.0
         onOpacityChanged: if (opacity > 0.9) opacity = 0.0;
         Behavior on opacity {
diff --git a/tests/manual/qmlchartproperties/qml/qmlchartproperties/ChartEditorAxis.qml b/tests/manual/qmlchartproperties/qml/qmlchartproperties/ChartEditorAxis.qml
index ab2cdeb0..1ea2f530 100644
--- a/tests/manual/qmlchartproperties/qml/qmlchartproperties/ChartEditorAxis.qml
+++ b/tests/manual/qmlchartproperties/qml/qmlchartproperties/ChartEditorAxis.qml
@@ -105,10 +105,6 @@ Row {
 
             onClicked: axis.tickCount--;
         }
-        Button {
-            text: "axis nice nmb"
-            onClicked: axis.niceNumbersEnabled = !axis.niceNumbersEnabled;
-        }
 
         FontEditor {
             id: fontEditor