Skip to content

Commit

Permalink
fixup! replace remaining Qt classes from DBInstance
Browse files Browse the repository at this point in the history
  • Loading branch information
Karry committed Sep 6, 2023
1 parent 637fb61 commit 1d265b4
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions libosmscout-client-qt/src/osmscoutclientqt/DBThread.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -187,7 +187,7 @@ void DBThread::onDatabaseListChanged(QList<QDir> databaseDirectories)
}

for (const auto& db:databases){
db->close();
db->Close();
}
databases.clear();
osmscout::GeoBox boundingBox;
Expand Down
4 changes: 2 additions & 2 deletions libosmscout-client/include/osmscoutclient/DBInstance.h
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ class OSMSCOUT_CLIENT_API DBInstance

virtual ~DBInstance()
{
close();
Close();
};

osmscout::GeoBox GetDBGeoBox() const
Expand Down Expand Up @@ -188,7 +188,7 @@ class OSMSCOUT_CLIENT_API DBInstance
return res;
}

void close();
void Close();

private:
void OnThreadFinished(const std::thread::id &id);
Expand Down
2 changes: 1 addition & 1 deletion libosmscout-client/src/osmscoutclient/DBInstance.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ void DBInstance::OnThreadFinished(const std::thread::id &id)
}
}

void DBInstance::close()
void DBInstance::Close()
{
std::scoped_lock lock(mutex);

Expand Down

0 comments on commit 1d265b4

Please sign in to comment.