From: Shane Jaroch Date: Wed, 21 Jan 2026 19:44:36 +0000 (-0500) Subject: lint/tidy X-Git-Url: https://git.nutra.tk/v1?a=commitdiff_plain;h=a0a6b20751c4f7a076de8126db700f3e48142403;p=nutratech%2Fgui.git lint/tidy --- diff --git a/CMakeLists.txt b/CMakeLists.txt index e5d7ea7..3868ffa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,11 +13,9 @@ set(CMAKE_AUTOUIC ON) find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets Sql) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets Sql) -file(GLOB_RECURSE PROJECT_SOURCES - "src/*.cpp" - "include/*.h" - "resources.qrc" -) +file(GLOB_RECURSE SOURCES CONFIGURE_DEPENDS "src/*.cpp") +file(GLOB_RECURSE HEADERS CONFIGURE_DEPENDS "include/*.h") +set(PROJECT_SOURCES ${SOURCES} ${HEADERS} "resources.qrc") # Versioning if(NOT NUTRA_VERSION) diff --git a/src/db/databasemanager.cpp b/src/db/databasemanager.cpp index 95b8ead..0ffa993 100644 --- a/src/db/databasemanager.cpp +++ b/src/db/databasemanager.cpp @@ -20,6 +20,9 @@ DatabaseManager::~DatabaseManager() { if (m_db.isOpen()) { m_db.close(); } + if (m_userDb.isOpen()) { + m_userDb.close(); + } } bool DatabaseManager::isValidNutraDatabase(const QSqlDatabase& db) { diff --git a/src/db/foodrepository.cpp b/src/db/foodrepository.cpp index 2a71346..05d4d32 100644 --- a/src/db/foodrepository.cpp +++ b/src/db/foodrepository.cpp @@ -248,9 +248,11 @@ void FoodRepository::updateRda(int nutrId, double value) { if (!userDb.isOpen()) return; QSqlQuery query(userDb); - query.prepare( - "INSERT OR REPLACE INTO rda (profile_id, nutr_id, rda) " - "VALUES (1, ?, ?)"); + if (!query.prepare("INSERT OR REPLACE INTO rda (profile_id, nutr_id, rda) " + "VALUES (1, ?, ?)")) { + qCritical() << "Failed to prepare RDA update:" << query.lastError().text(); + return; + } query.bindValue(0, nutrId); query.bindValue(1, value); diff --git a/src/db/mealrepository.cpp b/src/db/mealrepository.cpp index eba8078..77a492f 100644 --- a/src/db/mealrepository.cpp +++ b/src/db/mealrepository.cpp @@ -148,5 +148,8 @@ void MealRepository::removeLogEntry(int logId) { QSqlQuery query(db); query.prepare("DELETE FROM log_food WHERE id = ?"); query.addBindValue(logId); - query.exec(); + query.addBindValue(logId); + if (!query.exec()) { + qCritical() << "Failed to remove log entry:" << query.lastError().text(); + } }