diff --git a/src/sql/kernel/qsqlerror.cpp b/src/sql/kernel/qsqlerror.cpp index 7a1a91948c..478ca421d2 100644 --- a/src/sql/kernel/qsqlerror.cpp +++ b/src/sql/kernel/qsqlerror.cpp @@ -127,20 +127,6 @@ public: \since 5.10 */ -#if QT_DEPRECATED_SINCE(5, 3) -QSqlError::QSqlError(const QString& driverText, const QString& databaseText, ErrorType type, - int number) -{ - d = new QSqlErrorPrivate; - - d->driverError = driverText; - d->databaseError = databaseText; - d->errorType = type; - if (number != -1) - d->errorCode = QString::number(number); -} -#endif - /*! Constructs an error containing the driver error text \a driverText, the database-specific error text \a databaseText, the @@ -224,25 +210,6 @@ QString QSqlError::driverText() const return d->driverError; } -/*! - \fn void QSqlError::setDriverText(const QString &driverText) - \obsolete - - Sets the driver error text to the value of \a driverText. - - Use QSqlError(const QString &driverText, const QString &databaseText, - ErrorType type, int number) instead - - \sa driverText(), setDatabaseText(), text() -*/ - -#if QT_DEPRECATED_SINCE(5, 1) -void QSqlError::setDriverText(const QString& driverText) -{ - d->driverError = driverText; -} -#endif - /*! Returns the text of the error as reported by the database. This may contain database-specific descriptions; it may be empty. @@ -255,25 +222,6 @@ QString QSqlError::databaseText() const return d->databaseError; } -/*! - \fn void QSqlError::setDatabaseText(const QString &databaseText) - \obsolete - - Sets the database error text to the value of \a databaseText. - - Use QSqlError(const QString &driverText, const QString &databaseText, - ErrorType type, int number) instead - - \sa databaseText(), setDriverText(), text() -*/ - -#if QT_DEPRECATED_SINCE(5, 1) -void QSqlError::setDatabaseText(const QString& databaseText) -{ - d->databaseError = databaseText; -} -#endif - /*! Returns the error type, or -1 if the type cannot be determined. */ @@ -283,68 +231,6 @@ QSqlError::ErrorType QSqlError::type() const return d->errorType; } -/*! - \fn void QSqlError::setType(ErrorType type) - \obsolete - - Sets the error type to the value of \a type. - - Use QSqlError(const QString &driverText, const QString &databaseText, - ErrorType type, int number) instead - - \sa type() -*/ - -#if QT_DEPRECATED_SINCE(5, 1) -void QSqlError::setType(ErrorType type) -{ - d->errorType = type; -} -#endif - -/*! - \fn int QSqlError::number() const - \obsolete - - Returns the database-specific error number, or -1 if it cannot be - determined. - - Returns 0 if the error code is not an integer. - - \warning Some databases use alphanumeric error codes, which makes - number() unreliable if such a database is used. - - Use nativeErrorCode() instead - - \sa nativeErrorCode() -*/ - -#if QT_DEPRECATED_SINCE(5, 3) -int QSqlError::number() const -{ - return d->errorCode.isEmpty() ? -1 : d->errorCode.toInt(); -} -#endif - -/*! - \fn void QSqlError::setNumber(int number) - \obsolete - - Sets the database-specific error number to \a number. - - Use QSqlError(const QString &driverText, const QString &databaseText, - ErrorType type, int number) instead - - \sa number() -*/ - -#if QT_DEPRECATED_SINCE(5, 1) -void QSqlError::setNumber(int number) -{ - d->errorCode = QString::number(number); -} -#endif - /*! Returns the database-specific error code, or an empty string if it cannot be determined. diff --git a/src/sql/kernel/qsqlerror.h b/src/sql/kernel/qsqlerror.h index 7dfb6eb9ec..285ea88ee2 100644 --- a/src/sql/kernel/qsqlerror.h +++ b/src/sql/kernel/qsqlerror.h @@ -57,10 +57,6 @@ public: TransactionError, UnknownError }; -#if QT_DEPRECATED_SINCE(5, 3) - QT_DEPRECATED QSqlError(const QString &driverText, const QString &databaseText, - ErrorType type, int number); -#endif QSqlError(const QString &driverText = QString(), const QString &databaseText = QString(), ErrorType type = NoError, @@ -79,20 +75,10 @@ public: QString driverText() const; QString databaseText() const; ErrorType type() const; -#if QT_DEPRECATED_SINCE(5, 3) - QT_DEPRECATED int number() const; -#endif QString nativeErrorCode() const; QString text() const; bool isValid() const; -#if QT_DEPRECATED_SINCE(5, 1) - QT_DEPRECATED void setDriverText(const QString &driverText); - QT_DEPRECATED void setDatabaseText(const QString &databaseText); - QT_DEPRECATED void setType(ErrorType type); - QT_DEPRECATED void setNumber(int number); -#endif - private: // ### Qt6: Keep the pointer and remove the rest. QString unused1; 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()); }