summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/sql/kernel/qsqlerror.cpp7
-rw-r--r--src/sql/kernel/qsqlerror.h12
2 files changed, 3 insertions, 16 deletions
diff --git a/src/sql/kernel/qsqlerror.cpp b/src/sql/kernel/qsqlerror.cpp
index 002e0dc076..2f51debdd0 100644
--- a/src/sql/kernel/qsqlerror.cpp
+++ b/src/sql/kernel/qsqlerror.cpp
@@ -128,9 +128,8 @@ public:
*/
QSqlError::QSqlError(const QString &driverText, const QString &databaseText,
ErrorType type, const QString &code)
+ : d(new QSqlErrorPrivate)
{
- d = new QSqlErrorPrivate;
-
d->driverError = driverText;
d->databaseError = databaseText;
d->errorType = type;
@@ -142,10 +141,8 @@ QSqlError::QSqlError(const QString &driverText, const QString &databaseText,
Creates a copy of \a other.
*/
QSqlError::QSqlError(const QSqlError& other)
+ : d(new QSqlErrorPrivate(*other.d))
{
- d = new QSqlErrorPrivate;
-
- *d = *other.d;
}
/*!
diff --git a/src/sql/kernel/qsqlerror.h b/src/sql/kernel/qsqlerror.h
index fd147852c0..a956a54f7b 100644
--- a/src/sql/kernel/qsqlerror.h
+++ b/src/sql/kernel/qsqlerror.h
@@ -80,17 +80,7 @@ public:
bool isValid() const;
private:
- // ### Qt6: Keep the pointer and remove the rest.
- QString unused1;
- QString unused2;
- struct Unused {
- ErrorType unused3;
- int unused4;
- };
- union {
- QSqlErrorPrivate *d;
- Unused unused5;
- };
+ QSqlErrorPrivate *d = nullptr;
};
Q_DECLARE_SHARED(QSqlError)