dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Database: Replace BOOST_SCOPE_EXIT with QScopeGuard

Browse Source
This commit is contained in:
Jonas Kvinge
2023-08-03 17:29:11 +02:00
parent e0c9a9dc17
commit f06591fde8
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/database.cpp
View File

@@ -22,7 +22,6 @@
#include "config.h" #include "config.h"
#include <sqlite3.h> #include <sqlite3.h>
#include <boost/scope_exit.hpp>
#include <QObject> #include <QObject>
#include <QThread> #include <QThread>
@@ -39,6 +38,7 @@
#include <QSqlDatabase> #include <QSqlDatabase>
#include <QSqlError> #include <QSqlError>
#include <QStandardPaths> #include <QStandardPaths>
#include <QScopeGuard>
#include "core/logging.h" #include "core/logging.h"
#include "taskmanager.h" #include "taskmanager.h"
@@ -559,13 +559,15 @@ void Database::BackupFile(const QString &filename) {
sqlite3 *source_connection = nullptr; sqlite3 *source_connection = nullptr;
sqlite3 *dest_connection = nullptr; sqlite3 *dest_connection = nullptr;
BOOST_SCOPE_EXIT((&source_connection)(&dest_connection)(task_id)(app_)) { // clazy:exclude=rule-of-three NOLINT(google-explicit-constructor) const QScopeGuard db_backup_finish = qScopeGuard([this, task_id, &source_connection, &dest_connection]() {
// Harmless to call sqlite3_close() with a nullptr pointer. if (source_connection) {
sqlite3_close(source_connection); sqlite3_close(source_connection);
sqlite3_close(dest_connection); }
if (dest_connection) {
sqlite3_close(dest_connection);
}
app_->task_manager()->SetTaskFinished(task_id); app_->task_manager()->SetTaskFinished(task_id);
} });
BOOST_SCOPE_EXIT_END
bool success = OpenDatabase(filename, &source_connection); bool success = OpenDatabase(filename, &source_connection);
if (!success) { if (!success) {