From 5a7c2cbabbd00220e60771022785e5c31bbac1dc Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Thu, 30 May 2024 19:25:01 +0200 Subject: QSqlDatabase: Rename currentThread() to thread() ... to be in sync with QObject naming. This amends b4c63b89dfe136d0579bf1b6422c4d878cdd74ab. Change-Id: I25301f65aa880205d8c0cfd6f4bfa9fdba34a01c Reviewed-by: Volker Hilsheimer --- tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp') 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"); -- cgit v1.2.3