From 1d265b4c1f7659dbe4ebb61a36146e096185217d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Karas?= Date: Wed, 6 Sep 2023 23:03:31 +0200 Subject: [PATCH] fixup! replace remaining Qt classes from DBInstance --- libosmscout-client-qt/src/osmscoutclientqt/DBThread.cpp | 4 ++-- libosmscout-client/include/osmscoutclient/DBInstance.h | 4 ++-- libosmscout-client/src/osmscoutclient/DBInstance.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libosmscout-client-qt/src/osmscoutclientqt/DBThread.cpp b/libosmscout-client-qt/src/osmscoutclientqt/DBThread.cpp index ea6b0c7d6..b4ec402d5 100644 --- a/libosmscout-client-qt/src/osmscoutclientqt/DBThread.cpp +++ b/libosmscout-client-qt/src/osmscoutclientqt/DBThread.cpp @@ -84,7 +84,7 @@ DBThread::~DBThread() } for (auto& db:databases){ - db->close(); + db->Close(); } databases.clear(); backgroundThread->quit(); // deleteLater() is invoked when thread is finished @@ -187,7 +187,7 @@ void DBThread::onDatabaseListChanged(QList databaseDirectories) } for (const auto& db:databases){ - db->close(); + db->Close(); } databases.clear(); osmscout::GeoBox boundingBox; diff --git a/libosmscout-client/include/osmscoutclient/DBInstance.h b/libosmscout-client/include/osmscoutclient/DBInstance.h index 877688085..9a78c9c1b 100644 --- a/libosmscout-client/include/osmscoutclient/DBInstance.h +++ b/libosmscout-client/include/osmscoutclient/DBInstance.h @@ -91,7 +91,7 @@ class OSMSCOUT_CLIENT_API DBInstance virtual ~DBInstance() { - close(); + Close(); }; osmscout::GeoBox GetDBGeoBox() const @@ -188,7 +188,7 @@ class OSMSCOUT_CLIENT_API DBInstance return res; } - void close(); + void Close(); private: void OnThreadFinished(const std::thread::id &id); diff --git a/libosmscout-client/src/osmscoutclient/DBInstance.cpp b/libosmscout-client/src/osmscoutclient/DBInstance.cpp index b8458b811..7e365d33b 100644 --- a/libosmscout-client/src/osmscoutclient/DBInstance.cpp +++ b/libosmscout-client/src/osmscoutclient/DBInstance.cpp @@ -84,7 +84,7 @@ void DBInstance::OnThreadFinished(const std::thread::id &id) } } -void DBInstance::close() +void DBInstance::Close() { std::scoped_lock lock(mutex);