some minor fixups

martinrotter · Dec 8, 2023 · c1ada2f · c1ada2f
1 parent fbcae2b
commit c1ada2f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 62 deletions.
diff --git a/src/librssguard/CMakeLists.txt b/src/librssguard/CMakeLists.txt
@@ -462,7 +462,6 @@ set(UI_FILES
   gui/dialogs/formsettings.ui
   gui/dialogs/formupdate.ui
   gui/itemdetails.ui
-  gui/newspaperpreviewer.ui
   gui/notifications/articlelistnotification.ui
   gui/notifications/notificationseditor.ui
   gui/notifications/singlenotificationeditor.ui

diff --git a/src/librssguard/database/databasequeries.cpp b/src/librssguard/database/databasequeries.cpp
@@ -1765,12 +1765,15 @@ UpdatedArticles DatabaseQueries::updateMessages(const QSqlDatabase& db,
   // just to keep the data consistent.
   QMutexLocker lck(db_mutex);
 
-  if (db.exec("UPDATE Messages "
-              "SET custom_id = id "
-              "WHERE custom_id IS NULL OR custom_id = '';")
-        .lastError()
-        .isValid()) {
-    qCriticalNN << LOGSEC_DB << "Failed to set custom ID for all messages:" << QUOTE_W_SPACE_DOT(db.lastError().text());
+  QSqlQuery fixup_custom_ids_query(QSL("UPDATE Messages "
+                                       "SET custom_id = id "
+                                       "WHERE custom_id IS NULL OR custom_id = '';"),
+                                   db);
+  QSqlError fixup_custom_ids_error = fixup_custom_ids_query.lastError();
+
+  if (fixup_custom_ids_error.isValid()) {
+    qCriticalNN << LOGSEC_DB
+                << "Failed to set custom ID for all messages:" << QUOTE_W_SPACE_DOT(fixup_custom_ids_error.text());
   }
 
   if (ok != nullptr) {

diff --git a/src/librssguard/gui/newspaperpreviewer.cpp b/src/librssguard/gui/newspaperpreviewer.cpp