From 5a7c2cbabbd00220e60771022785e5c31bbac1dc Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Thu, 30 May 2024 19:25:01 +0200 Subject: [PATCH] QSqlDatabase: Rename currentThread() to thread() ... to be in sync with QObject naming. This amends b4c63b89dfe136d0579bf1b6422c4d878cdd74ab. Change-Id: I25301f65aa880205d8c0cfd6f4bfa9fdba34a01c Reviewed-by: Volker Hilsheimer --- src/sql/kernel/qsqldatabase.cpp | 2 +- src/sql/kernel/qsqldatabase.h | 2 +- .../sql/kernel/qsqldatabase/tst_qsqldatabase.cpp | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/sql/kernel/qsqldatabase.cpp b/src/sql/kernel/qsqldatabase.cpp index 6aab93bd34f..c25fabf0a4b 100644 --- a/src/sql/kernel/qsqldatabase.cpp +++ b/src/sql/kernel/qsqldatabase.cpp @@ -1377,7 +1377,7 @@ bool QSqlDatabase::moveToThread(QThread *targetThread) Returns a pointer to the associated QThread instance. */ -QThread *QSqlDatabase::currentThread() const +QThread *QSqlDatabase::thread() const { if (auto drv = driver()) return drv->thread(); diff --git a/src/sql/kernel/qsqldatabase.h b/src/sql/kernel/qsqldatabase.h index 073ca89c529..85d6b4d9d91 100644 --- a/src/sql/kernel/qsqldatabase.h +++ b/src/sql/kernel/qsqldatabase.h @@ -82,7 +82,7 @@ public: void setNumericalPrecisionPolicy(QSql::NumericalPrecisionPolicy precisionPolicy); QSql::NumericalPrecisionPolicy numericalPrecisionPolicy() const; bool moveToThread(QThread *targetThread); - QThread *currentThread() const; + QThread *thread() const; QSqlDriver* driver() const; diff --git a/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp b/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp index 19afacf6f91..79fe9d6333b 100644 --- a/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp +++ b/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp @@ -2344,20 +2344,20 @@ void tst_QSqlDatabase::moveToThread() auto clonedDb = QSqlDatabase::cloneDatabase(db, "clonedDb"); auto mainThread = QThread::currentThread(); CHECK_DATABASE(db); - QCOMPARE(db.currentThread(), mainThread); - QCOMPARE(clonedDb.currentThread(), mainThread); + QCOMPARE(db.thread(), mainThread); + QCOMPARE(clonedDb.thread(), mainThread); std::unique_ptr t(QThread::create([&] { db.moveToThread(mainThread); QThread::currentThread()->exit(); })); db.moveToThread(t.get()); - QCOMPARE(db.currentThread(), t.get()); - QCOMPARE(clonedDb.currentThread(), mainThread); + QCOMPARE(db.thread(), t.get()); + QCOMPARE(clonedDb.thread(), mainThread); t->start(); QTRY_VERIFY(t->isRunning()); QTRY_VERIFY(t->wait(30000)); - QCOMPARE(db.currentThread(), mainThread); - QCOMPARE(clonedDb.currentThread(), mainThread); + QCOMPARE(db.thread(), mainThread); + QCOMPARE(clonedDb.thread(), mainThread); db = QSqlDatabase(); clonedDb = QSqlDatabase(); QSqlDatabase::removeDatabase("clonedDb");