QSqlError: Remove deprecated methods

Change-Id: I4eb9918e65bc7990effb8a643332ba232e975893
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>

1 files changed, 0 insertions, 80 deletions

diff --git a/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp b/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp
index 871ac24be4..db64e5aa47 100644
--- a/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp
+++ b/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp
@@ -42,9 +42,6 @@ public:
     virtual ~tst_QSqlError();
 
 private slots:
-#if QT_DEPRECATED_SINCE(5, 1)
-    void getSetCheck();
-#endif
     void construction();
     void moveOperator();
     void operators();
@@ -59,55 +56,12 @@ tst_QSqlError::~tst_QSqlError()
 {
 }
 
-#if QT_DEPRECATED_SINCE(5, 1)
-// Testing get/set functions
-void tst_QSqlError::getSetCheck()
-{
-    QSqlError obj1;
-    // ErrorType QSqlError::type()
-    // void QSqlError::setType(ErrorType)
-    obj1.setType(QSqlError::ErrorType(QSqlError::NoError));
-    QCOMPARE(QSqlError::ErrorType(QSqlError::NoError), obj1.type());
-    obj1.setType(QSqlError::ErrorType(QSqlError::ConnectionError));
-    QCOMPARE(QSqlError::ErrorType(QSqlError::ConnectionError), obj1.type());
-    obj1.setType(QSqlError::ErrorType(QSqlError::StatementError));
-    QCOMPARE(QSqlError::ErrorType(QSqlError::StatementError), obj1.type());
-    obj1.setType(QSqlError::ErrorType(QSqlError::TransactionError));
-    QCOMPARE(QSqlError::ErrorType(QSqlError::TransactionError), obj1.type());
-    obj1.setType(QSqlError::ErrorType(QSqlError::UnknownError));
-    QCOMPARE(QSqlError::ErrorType(QSqlError::UnknownError), obj1.type());
-
-    // int QSqlError::number()
-    // void QSqlError::setNumber(int)
-    obj1.setNumber(0);
-    QCOMPARE(0, obj1.number());
-    obj1.setNumber(INT_MIN);
-    QCOMPARE(INT_MIN, obj1.number());
-    obj1.setNumber(INT_MAX);
-    QCOMPARE(INT_MAX, obj1.number());
-}
-#endif
-
 void tst_QSqlError::construction()
 {
-#if QT_DEPRECATED_SINCE(5, 3)
-   {
-       QSqlError obj1("drivertext", "databasetext", QSqlError::UnknownError, 123);
-       QCOMPARE(obj1.driverText(), QString("drivertext"));
-       QCOMPARE(obj1.databaseText(), QString("databasetext"));
-       QCOMPARE(obj1.type(), QSqlError::UnknownError);
-       QCOMPARE(obj1.number(), 123);
-       QCOMPARE(obj1.nativeErrorCode(), QStringLiteral("123"));
-       QVERIFY(obj1.isValid());
-   }
-#endif
    QSqlError obj1("drivertext", "databasetext", QSqlError::UnknownError, QStringLiteral("123"));
    QCOMPARE(obj1.driverText(), QString("drivertext"));
    QCOMPARE(obj1.databaseText(), QString("databasetext"));
    QCOMPARE(obj1.type(), QSqlError::UnknownError);
-#if QT_DEPRECATED_SINCE(5, 3)
-   QCOMPARE(obj1.number(), 123);
-#endif
    QCOMPARE(obj1.nativeErrorCode(), QStringLiteral("123"));
    QVERIFY(obj1.isValid());
 
@@ -115,9 +69,6 @@ void tst_QSqlError::construction()
    QCOMPARE(obj2.driverText(), obj1.driverText());
    QCOMPARE(obj2.databaseText(), obj1.databaseText());
    QCOMPARE(obj2.type(), obj1.type());
-#if QT_DEPRECATED_SINCE(5, 3)
-   QCOMPARE(obj2.number(), obj1.number());
-#endif
    QCOMPARE(obj2.nativeErrorCode(), obj1.nativeErrorCode());
    QVERIFY(obj2.isValid());
 
@@ -125,9 +76,6 @@ void tst_QSqlError::construction()
    QCOMPARE(obj3.driverText(), obj2.driverText());
    QCOMPARE(obj3.databaseText(), obj2.databaseText());
    QCOMPARE(obj3.type(), obj2.type());
-#if QT_DEPRECATED_SINCE(5, 3)
-   QCOMPARE(obj3.number(), obj2.number());
-#endif
    QCOMPARE(obj3.nativeErrorCode(), obj2.nativeErrorCode());
    QVERIFY(obj3.isValid());
 
@@ -137,9 +85,6 @@ void tst_QSqlError::construction()
    QCOMPARE(obj4.databaseText(), QString());
    QCOMPARE(obj4.text(), QString());
    QCOMPARE(obj4.type(), QSqlError::NoError);
-#if QT_DEPRECATED_SINCE(5, 3)
-   QCOMPARE(obj4.number(), -1);
-#endif
    QCOMPARE(obj4.nativeErrorCode(), QString());
 
    QSqlError obj5(QStringLiteral("drivertext"), QStringLiteral("databasetext"),
@@ -147,9 +92,6 @@ void tst_QSqlError::construction()
    QCOMPARE(obj5.driverText(), QString("drivertext"));
    QCOMPARE(obj5.databaseText(), QString("databasetext"));
    QCOMPARE(obj5.type(), QSqlError::UnknownError);
-#if QT_DEPRECATED_SINCE(5, 3)
-   QCOMPARE(obj5.number(), 123);
-#endif
    QCOMPARE(obj5.nativeErrorCode(), QStringLiteral("123"));
    QVERIFY(obj5.isValid());
 
@@ -158,25 +100,9 @@ void tst_QSqlError::construction()
    QCOMPARE(obj6.driverText(), QString("drivertext"));
    QCOMPARE(obj6.databaseText(), QString("databasetext"));
    QCOMPARE(obj6.type(), QSqlError::UnknownError);
-#if QT_DEPRECATED_SINCE(5, 3)
-   QCOMPARE(obj6.number(), 0);
-#endif
    QCOMPARE(obj6.nativeErrorCode(), QStringLiteral("Err123"));
    QVERIFY(obj6.isValid());
 
-#if QT_DEPRECATED_SINCE(5, 3)
-   {
-        // Default constructed object as constructed before Qt 5.3
-       QSqlError obj7(QString(), QString(), QSqlError::NoError, -1);
-       QVERIFY(!obj7.isValid());
-       QCOMPARE(obj7.driverText(), QString());
-       QCOMPARE(obj7.databaseText(), QString());
-       QCOMPARE(obj7.type(), QSqlError::NoError);
-       QCOMPARE(obj7.number(), -1);
-       QCOMPARE(obj7.nativeErrorCode(), QString());
-   }
-#endif
-
    // Default constructed object
    QSqlError obj7;
    QVERIFY(!obj7.isValid());
@@ -190,9 +116,6 @@ void tst_QSqlError::construction()
    QCOMPARE(obj8.driverText(), obj2.driverText());
    QCOMPARE(obj8.databaseText(), obj2.databaseText());
    QCOMPARE(obj8.type(), obj2.type());
-#if QT_DEPRECATED_SINCE(5, 3)
-   QCOMPARE(obj8.number(), obj2.number());
-#endif
    QCOMPARE(obj8.nativeErrorCode(), obj2.nativeErrorCode());
    QVERIFY(obj8.isValid());
 }
@@ -204,9 +127,6 @@ void tst_QSqlError::moveOperator()
    QCOMPARE(obj2.driverText(), QString("drivertext"));
    QCOMPARE(obj2.databaseText(), QString("databasetext"));
    QCOMPARE(obj2.type(), QSqlError::UnknownError);
-#if QT_DEPRECATED_SINCE(5, 3)
-   QCOMPARE(obj2.number(), 123);
-#endif
    QCOMPARE(obj2.nativeErrorCode(), QStringLiteral("123"));
    QVERIFY(obj2.isValid());
 }