From 0c780eb19927884c95e74453760f033e22214ffd Mon Sep 17 00:00:00 2001
From: Tobias Fella <fella@posteo.de>
Date: Sat, 29 Feb 2020 00:55:16 +0100
Subject: [PATCH] improve query definition

---
 src/entryListModel.cpp | 2 +-
 src/feedListModel.cpp  | 6 +++---
 src/fetcher.cpp        | 2 +-
 src/main.cpp           | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/entryListModel.cpp b/src/entryListModel.cpp
index 6f9a9b10..f256f36f 100644
--- a/src/entryListModel.cpp
+++ b/src/entryListModel.cpp
@@ -69,7 +69,7 @@ void EntryListModel::fetch()
 {
     connect(&Fetcher::instance(), &Fetcher::finished, this, [this]() {
         beginResetModel();
-        QSqlQuery query = QSqlQuery(QSqlDatabase::database());
+        QSqlQuery query(QSqlDatabase::database());
         query.prepare(QStringLiteral("SELECT id, title, content FROM Entries WHERE feed=:feed;"));
         query.bindValue(QStringLiteral(":feed"), m_feed);
         query.exec();
diff --git a/src/feedListModel.cpp b/src/feedListModel.cpp
index a87ee833..6cfce309 100644
--- a/src/feedListModel.cpp
+++ b/src/feedListModel.cpp
@@ -30,7 +30,7 @@
 FeedListModel::FeedListModel(QObject *parent)
     : QAbstractListModel(parent)
 {
-    QSqlQuery query = QSqlQuery(QSqlDatabase::database());
+    QSqlQuery query(QSqlDatabase::database());
     query.exec(QStringLiteral("SELECT name, url FROM Feeds"));
     beginInsertRows(QModelIndex(), 0, query.size());
     while (query.next()) {
@@ -66,7 +66,7 @@ void FeedListModel::add_feed(QString url)
     beginInsertRows(QModelIndex(), feeds.size(), feeds.size());
     feeds.append(Feed(url));
     endInsertRows();
-    QSqlQuery query = QSqlQuery(QSqlDatabase::database());
+    QSqlQuery query(QSqlDatabase::database());
     query.prepare(QStringLiteral("INSERT INTO Feeds VALUES (:url, :name);"));
     query.bindValue(QStringLiteral(":url"), url);
     query.bindValue(QStringLiteral(":name"), url);
@@ -76,7 +76,7 @@ void FeedListModel::add_feed(QString url)
 void FeedListModel::remove_feed(int index)
 {
     Feed toRemove = feeds[index];
-    QSqlQuery query = QSqlQuery(QSqlDatabase::database());
+    QSqlQuery query(QSqlDatabase::database());
     query.prepare(QStringLiteral("DELETE FROM Feeds WHERE name=:name AND url=url;"));
     query.bindValue(QStringLiteral(":url"), toRemove.url());
     query.bindValue(QStringLiteral(":name"), toRemove.name());
diff --git a/src/fetcher.cpp b/src/fetcher.cpp
index d4c3d3b7..7008e8f0 100644
--- a/src/fetcher.cpp
+++ b/src/fetcher.cpp
@@ -44,7 +44,7 @@ void Fetcher::fetch(QUrl url)
         Syndication::FeedPtr feed = Syndication::parserCollection()->parse(*document, QStringLiteral("Atom"));
 
         QSqlDatabase db = QSqlDatabase::database();
-        QSqlQuery query = QSqlQuery(db);
+        QSqlQuery query(db);
 
         for (const auto &entry : feed->items()) {
             query = QSqlQuery(db);
diff --git a/src/main.cpp b/src/main.cpp
index 4ca3e61f..d412fcbf 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
     db.setDatabaseName(databasePath + "/database.db3");
     db.open();
 
-    QSqlQuery query = QSqlQuery(db);
+    QSqlQuery query(db);
     query.exec(QStringLiteral("CREATE TABLE IF NOT EXISTS Feeds (name TEXT, url TEXT);"));
     query.exec(QStringLiteral("CREATE TABLE IF NOT EXISTS Entries (feed TEXT, id TEXT UNIQUE, title TEXT, content TEXT);"));
     query.exec(QStringLiteral("CREATE TABLE IF NOT EXISTS Authors (id TEXT, name TEXT, uri TEXT, email TEXT);"));