From 3f165c8831b97b4b814b798c653d994b3050f6c5 Mon Sep 17 00:00:00 2001 From: Shane Jaroch Date: Sat, 24 Jan 2026 02:03:59 -0500 Subject: [PATCH] lint fixes --- CMakeLists.txt | 1 + Makefile | 2 +- src/db/reciperepository.cpp | 13 ++++++++----- src/widgets/recipewidget.cpp | 6 ++++-- tests/test_databasemanager.cpp | 2 ++ 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4398ff3..08ba242 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -96,4 +96,5 @@ if(LINUXDEPLOY) COMMENT "Generating AppImage..." VERBATIM ) + add_dependencies(appimage nutra) endif() diff --git a/Makefile b/Makefile index 07dfbe7..dc5d837 100644 --- a/Makefile +++ b/Makefile @@ -66,7 +66,7 @@ lint: config cppcheck --enable=warning,performance,portability \ --language=c++ --std=c++17 \ --suppress=missingIncludeSystem \ - -Dslots= -Dsignals= -Demit= \ + -Dslots= -Dsignals= -Demit= -DQT_VERSION_CHECK\(major,minor,patch\)=0 \ --quiet --error-exitcode=1 \ $(SRC_DIRS) include tests @if [ ! -f $(BUILD_DIR)/compile_commands.json ]; then \ diff --git a/src/db/reciperepository.cpp b/src/db/reciperepository.cpp index 09d51a0..bfc715f 100644 --- a/src/db/reciperepository.cpp +++ b/src/db/reciperepository.cpp @@ -8,7 +8,7 @@ #include "db/databasemanager.h" -RecipeRepository::RecipeRepository() {} +RecipeRepository::RecipeRepository() = default; int RecipeRepository::createRecipe(const QString& name, const QString& instructions) { QSqlDatabase db = DatabaseManager::instance().userDatabase(); @@ -21,10 +21,9 @@ int RecipeRepository::createRecipe(const QString& name, const QString& instructi if (query.exec()) { return query.lastInsertId().toInt(); - } else { - qCritical() << "Failed to create recipe:" << query.lastError().text(); - return -1; } + qCritical() << "Failed to create recipe:" << query.lastError().text(); + return -1; } bool RecipeRepository::updateRecipe(int id, const QString& name, const QString& instructions) { @@ -37,7 +36,11 @@ bool RecipeRepository::updateRecipe(int id, const QString& name, const QString& query.addBindValue(instructions); query.addBindValue(id); - return query.exec(); + if (query.exec()) { + return true; + } + qCritical() << "Failed to update recipe:" << query.lastError().text(); + return false; } bool RecipeRepository::deleteRecipe(int id) { diff --git a/src/widgets/recipewidget.cpp b/src/widgets/recipewidget.cpp index 6784edf..f97e6e1 100644 --- a/src/widgets/recipewidget.cpp +++ b/src/widgets/recipewidget.cpp @@ -156,7 +156,7 @@ void RecipeWidget::loadRecipeDetails(int recipeId) { // Load ingredients ingredientsTable->setRowCount(0); auto ingredients = repository.getIngredients(recipeId); - ingredientsTable->setRowCount(ingredients.size()); + ingredientsTable->setRowCount(static_cast(ingredients.size())); for (int i = 0; i < ingredients.size(); ++i) { const auto& ing = ingredients[i]; ingredientsTable->setItem(i, 0, new QTableWidgetItem(QString::number(ing.foodId))); @@ -277,7 +277,9 @@ void RecipeWidget::onRemoveIngredient() { int row = ingredientsTable->currentRow(); if (row < 0) return; - int foodId = ingredientsTable->item(row, 0)->text().toInt(); + auto* item = ingredientsTable->item(row, 0); + if (item == nullptr) return; + int foodId = item->text().toInt(); if (repository.removeIngredient(currentRecipeId, foodId)) { ingredientsTable->removeRow(row); diff --git a/tests/test_databasemanager.cpp b/tests/test_databasemanager.cpp index a4b7538..a57712e 100644 --- a/tests/test_databasemanager.cpp +++ b/tests/test_databasemanager.cpp @@ -25,6 +25,7 @@ void TestDatabaseManager::testUserDatabaseInit() { q.exec("CREATE TABLE log_food (id int)"); db.close(); + db = QSqlDatabase(); // Clear the object so it doesn't hold reference auto info = DatabaseManager::instance().getDatabaseInfo(dbPath); QCOMPARE(info.type, QString("User")); @@ -44,6 +45,7 @@ void TestDatabaseManager::testInvalidDatabase() { QVERIFY(db.open()); // Empty DB db.close(); + db = QSqlDatabase(); // Clear the object so it doesn't hold reference auto info = DatabaseManager::instance().getDatabaseInfo(dbPath); QVERIFY(info.isValid == false); -- 2.52.0