From 8a5c74421017d701150c53571aa5cd907f493250 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Fri, 12 Apr 2019 07:35:28 +0200 Subject: [PATCH] refactoring pt. 1 --- src/miscellaneous/databasefactory.cpp | 4 +- src/miscellaneous/databasefactory.h | 4 +- src/miscellaneous/databasequeries.cpp | 140 +++++++++++++------------- src/miscellaneous/databasequeries.h | 128 +++++++++++------------ src/miscellaneous/debugging.cpp | 5 +- src/miscellaneous/debugging.h | 4 +- src/miscellaneous/externaltool.cpp | 9 +- src/miscellaneous/externaltool.h | 2 +- src/miscellaneous/feedreader.cpp | 4 +- src/miscellaneous/feedreader.h | 6 +- src/miscellaneous/iofactory.cpp | 2 +- src/miscellaneous/localization.cpp | 6 +- src/miscellaneous/settings.cpp | 2 +- src/miscellaneous/simpleregexp.cpp | 2 +- src/miscellaneous/skinfactory.cpp | 4 +- src/miscellaneous/systemfactory.cpp | 16 +-- src/miscellaneous/textfactory.cpp | 4 +- 17 files changed, 171 insertions(+), 171 deletions(-) diff --git a/src/miscellaneous/databasefactory.cpp b/src/miscellaneous/databasefactory.cpp index 4e1b5da6b..404b0f3f9 100755 --- a/src/miscellaneous/databasefactory.cpp +++ b/src/miscellaneous/databasefactory.cpp @@ -369,7 +369,7 @@ QString DatabaseFactory::sqliteDatabaseFilePath() const { return m_sqliteDatabaseFilePath + QDir::separator() + APP_DB_SQLITE_FILE; } -bool DatabaseFactory::sqliteUpdateDatabaseSchema(QSqlDatabase database, const QString& source_db_schema_version) { +bool DatabaseFactory::sqliteUpdateDatabaseSchema(const QSqlDatabase& database, const QString& source_db_schema_version) { int working_version = QString(source_db_schema_version).remove('.').toInt(); const int current_version = QString(APP_DB_SCHEMA_VERSION).remove('.').toInt(); @@ -415,7 +415,7 @@ bool DatabaseFactory::sqliteUpdateDatabaseSchema(QSqlDatabase database, const QS return true; } -bool DatabaseFactory::mysqlUpdateDatabaseSchema(QSqlDatabase database, const QString& source_db_schema_version, const QString& db_name) { +bool DatabaseFactory::mysqlUpdateDatabaseSchema(const QSqlDatabase& database, const QString& source_db_schema_version, const QString& db_name) { int working_version = QString(source_db_schema_version).remove('.').toInt(); const int current_version = QString(APP_DB_SCHEMA_VERSION).remove('.').toInt(); diff --git a/src/miscellaneous/databasefactory.h b/src/miscellaneous/databasefactory.h index 1f5546f75..60cbe70d4 100755 --- a/src/miscellaneous/databasefactory.h +++ b/src/miscellaneous/databasefactory.h @@ -123,7 +123,7 @@ class DatabaseFactory : public QObject { QSqlDatabase mysqlInitializeDatabase(const QString& connection_name); // Updates database schema. - bool mysqlUpdateDatabaseSchema(QSqlDatabase database, const QString& source_db_schema_version, const QString& db_name); + bool mysqlUpdateDatabaseSchema(const QSqlDatabase& database, const QString& source_db_schema_version, const QString& db_name); // Runs "VACUUM" on the database. bool mysqlVacuumDatabase(); @@ -149,7 +149,7 @@ class DatabaseFactory : public QObject { void sqliteAssemblyDatabaseFilePath(); // Updates database schema. - bool sqliteUpdateDatabaseSchema(QSqlDatabase database, const QString& source_db_schema_version); + bool sqliteUpdateDatabaseSchema(const QSqlDatabase& database, const QString& source_db_schema_version); // Creates new connection, initializes database and // returns opened connections. diff --git a/src/miscellaneous/databasequeries.cpp b/src/miscellaneous/databasequeries.cpp index a387e9293..cac8d711d 100755 --- a/src/miscellaneous/databasequeries.cpp +++ b/src/miscellaneous/databasequeries.cpp @@ -30,7 +30,7 @@ #include #include -bool DatabaseQueries::markMessagesReadUnread(QSqlDatabase db, const QStringList& ids, RootItem::ReadStatus read) { +bool DatabaseQueries::markMessagesReadUnread(const QSqlDatabase& db, const QStringList& ids, RootItem::ReadStatus read) { QSqlQuery q(db); q.setForwardOnly(true); @@ -38,7 +38,7 @@ bool DatabaseQueries::markMessagesReadUnread(QSqlDatabase db, const QStringList& .arg(ids.join(QSL(", ")), read == RootItem::Read ? QSL("1") : QSL("0"))); } -bool DatabaseQueries::markMessageImportant(QSqlDatabase db, int id, RootItem::Importance importance) { +bool DatabaseQueries::markMessageImportant(const QSqlDatabase& db, int id, RootItem::Importance importance) { QSqlQuery q(db); q.setForwardOnly(true); @@ -55,7 +55,7 @@ bool DatabaseQueries::markMessageImportant(QSqlDatabase db, int id, RootItem::Im return q.exec(); } -bool DatabaseQueries::markFeedsReadUnread(QSqlDatabase db, const QStringList& ids, int account_id, RootItem::ReadStatus read) { +bool DatabaseQueries::markFeedsReadUnread(const QSqlDatabase& db, const QStringList& ids, int account_id, RootItem::ReadStatus read) { QSqlQuery q(db); q.setForwardOnly(true); @@ -66,7 +66,7 @@ bool DatabaseQueries::markFeedsReadUnread(QSqlDatabase db, const QStringList& id return q.exec(); } -bool DatabaseQueries::markBinReadUnread(QSqlDatabase db, int account_id, RootItem::ReadStatus read) { +bool DatabaseQueries::markBinReadUnread(const QSqlDatabase& db, int account_id, RootItem::ReadStatus read) { QSqlQuery q(db); q.setForwardOnly(true); @@ -77,7 +77,7 @@ bool DatabaseQueries::markBinReadUnread(QSqlDatabase db, int account_id, RootIte return q.exec(); } -bool DatabaseQueries::markAccountReadUnread(QSqlDatabase db, int account_id, RootItem::ReadStatus read) { +bool DatabaseQueries::markAccountReadUnread(const QSqlDatabase& db, int account_id, RootItem::ReadStatus read) { QSqlQuery q(db); q.setForwardOnly(true); @@ -87,21 +87,21 @@ bool DatabaseQueries::markAccountReadUnread(QSqlDatabase db, int account_id, Roo return q.exec(); } -bool DatabaseQueries::switchMessagesImportance(QSqlDatabase db, const QStringList& ids) { +bool DatabaseQueries::switchMessagesImportance(const QSqlDatabase& db, const QStringList& ids) { QSqlQuery q(db); q.setForwardOnly(true); return q.exec(QString(QSL("UPDATE Messages SET is_important = NOT is_important WHERE id IN (%1);")).arg(ids.join(QSL(", ")))); } -bool DatabaseQueries::permanentlyDeleteMessages(QSqlDatabase db, const QStringList& ids) { +bool DatabaseQueries::permanentlyDeleteMessages(const QSqlDatabase& db, const QStringList& ids) { QSqlQuery q(db); q.setForwardOnly(true); return q.exec(QString(QSL("UPDATE Messages SET is_pdeleted = 1 WHERE id IN (%1);")).arg(ids.join(QSL(", ")))); } -bool DatabaseQueries::deleteOrRestoreMessagesToFromBin(QSqlDatabase db, const QStringList& ids, bool deleted) { +bool DatabaseQueries::deleteOrRestoreMessagesToFromBin(const QSqlDatabase& db, const QStringList& ids, bool deleted) { QSqlQuery q(db); q.setForwardOnly(true); @@ -110,7 +110,7 @@ bool DatabaseQueries::deleteOrRestoreMessagesToFromBin(QSqlDatabase db, const QS QString::number(0))); } -bool DatabaseQueries::restoreBin(QSqlDatabase db, int account_id) { +bool DatabaseQueries::restoreBin(const QSqlDatabase& db, int account_id) { QSqlQuery q(db); q.setForwardOnly(true); @@ -120,7 +120,7 @@ bool DatabaseQueries::restoreBin(QSqlDatabase db, int account_id) { return q.exec(); } -bool DatabaseQueries::purgeImportantMessages(QSqlDatabase db) { +bool DatabaseQueries::purgeImportantMessages(const QSqlDatabase& db) { QSqlQuery q(db); q.setForwardOnly(true); @@ -128,7 +128,7 @@ bool DatabaseQueries::purgeImportantMessages(QSqlDatabase db) { return q.exec(); } -bool DatabaseQueries::purgeReadMessages(QSqlDatabase db) { +bool DatabaseQueries::purgeReadMessages(const QSqlDatabase& db) { QSqlQuery q(db); q.setForwardOnly(true); @@ -143,7 +143,7 @@ bool DatabaseQueries::purgeReadMessages(QSqlDatabase db) { return q.exec(); } -bool DatabaseQueries::purgeOldMessages(QSqlDatabase db, int older_than_days) { +bool DatabaseQueries::purgeOldMessages(const QSqlDatabase& db, int older_than_days) { QSqlQuery q(db); const qint64 since_epoch = QDateTime::currentDateTimeUtc().addDays(-older_than_days).toMSecsSinceEpoch(); @@ -156,7 +156,7 @@ bool DatabaseQueries::purgeOldMessages(QSqlDatabase db, int older_than_days) { return q.exec(); } -bool DatabaseQueries::purgeRecycleBin(QSqlDatabase db) { +bool DatabaseQueries::purgeRecycleBin(const QSqlDatabase& db) { QSqlQuery q(db); q.setForwardOnly(true); @@ -168,7 +168,7 @@ bool DatabaseQueries::purgeRecycleBin(QSqlDatabase db) { return q.exec(); } -QMap> DatabaseQueries::getMessageCountsForCategory(QSqlDatabase db, const QString& custom_id, int account_id, +QMap> DatabaseQueries::getMessageCountsForCategory(const QSqlDatabase& db, const QString& custom_id, int account_id, bool including_total_counts, bool* ok) { QMap> counts; QSqlQuery q(db); @@ -217,7 +217,7 @@ QMap> DatabaseQueries::getMessageCountsForCategory(QSql return counts; } -QMap> DatabaseQueries::getMessageCountsForAccount(QSqlDatabase db, int account_id, +QMap> DatabaseQueries::getMessageCountsForAccount(const QSqlDatabase& db, int account_id, bool including_total_counts, bool* ok) { QMap> counts; QSqlQuery q(db); @@ -265,7 +265,7 @@ QMap> DatabaseQueries::getMessageCountsForAccount(QSqlD return counts; } -int DatabaseQueries::getMessageCountsForFeed(QSqlDatabase db, const QString& feed_custom_id, +int DatabaseQueries::getMessageCountsForFeed(const QSqlDatabase& db, const QString& feed_custom_id, int account_id, bool including_total_counts, bool* ok) { QSqlQuery q(db); @@ -299,7 +299,7 @@ int DatabaseQueries::getMessageCountsForFeed(QSqlDatabase db, const QString& fee } } -int DatabaseQueries::getMessageCountsForBin(QSqlDatabase db, int account_id, bool including_total_counts, bool* ok) { +int DatabaseQueries::getMessageCountsForBin(const QSqlDatabase& db, int account_id, bool including_total_counts, bool* ok) { QSqlQuery q(db); q.setForwardOnly(true); @@ -331,7 +331,7 @@ int DatabaseQueries::getMessageCountsForBin(QSqlDatabase db, int account_id, boo } } -QList DatabaseQueries::getUndeletedMessagesForFeed(QSqlDatabase db, const QString& feed_custom_id, int account_id, bool* ok) { +QList DatabaseQueries::getUndeletedMessagesForFeed(const QSqlDatabase& db, const QString& feed_custom_id, int account_id, bool* ok) { QList messages; QSqlQuery q(db); @@ -365,7 +365,7 @@ QList DatabaseQueries::getUndeletedMessagesForFeed(QSqlDatabase db, con return messages; } -QList DatabaseQueries::getUndeletedMessagesForBin(QSqlDatabase db, int account_id, bool* ok) { +QList DatabaseQueries::getUndeletedMessagesForBin(const QSqlDatabase& db, int account_id, bool* ok) { QList messages; QSqlQuery q(db); @@ -398,7 +398,7 @@ QList DatabaseQueries::getUndeletedMessagesForBin(QSqlDatabase db, int return messages; } -QList DatabaseQueries::getUndeletedMessagesForAccount(QSqlDatabase db, int account_id, bool* ok) { +QList DatabaseQueries::getUndeletedMessagesForAccount(const QSqlDatabase& db, int account_id, bool* ok) { QList messages; QSqlQuery q(db); @@ -664,7 +664,7 @@ int DatabaseQueries::updateMessages(QSqlDatabase db, return updated_messages; } -bool DatabaseQueries::purgeMessagesFromBin(QSqlDatabase db, bool clear_only_read, int account_id) { +bool DatabaseQueries::purgeMessagesFromBin(const QSqlDatabase& db, bool clear_only_read, int account_id) { QSqlQuery q(db); q.setForwardOnly(true); @@ -680,7 +680,7 @@ bool DatabaseQueries::purgeMessagesFromBin(QSqlDatabase db, bool clear_only_read return q.exec(); } -bool DatabaseQueries::deleteAccount(QSqlDatabase db, int account_id) { +bool DatabaseQueries::deleteAccount(const QSqlDatabase& db, int account_id) { QSqlQuery query(db); query.setForwardOnly(true); @@ -707,7 +707,7 @@ bool DatabaseQueries::deleteAccount(QSqlDatabase db, int account_id) { return true; } -bool DatabaseQueries::deleteAccountData(QSqlDatabase db, int account_id, bool delete_messages_too) { +bool DatabaseQueries::deleteAccountData(const QSqlDatabase& db, int account_id, bool delete_messages_too) { bool result = true; QSqlQuery q(db); @@ -730,7 +730,7 @@ bool DatabaseQueries::deleteAccountData(QSqlDatabase db, int account_id, bool de return result; } -bool DatabaseQueries::cleanFeeds(QSqlDatabase db, const QStringList& ids, bool clean_read_only, int account_id) { +bool DatabaseQueries::cleanFeeds(const QSqlDatabase& db, const QStringList& ids, bool clean_read_only, int account_id) { QSqlQuery q(db); q.setForwardOnly(true); @@ -758,7 +758,7 @@ bool DatabaseQueries::cleanFeeds(QSqlDatabase db, const QStringList& ids, bool c } } -bool DatabaseQueries::purgeLeftoverMessages(QSqlDatabase db, int account_id) { +bool DatabaseQueries::purgeLeftoverMessages(const QSqlDatabase& db, int account_id) { QSqlQuery q(db); q.setForwardOnly(true); @@ -775,7 +775,7 @@ bool DatabaseQueries::purgeLeftoverMessages(QSqlDatabase db, int account_id) { } } -bool DatabaseQueries::storeAccountTree(QSqlDatabase db, RootItem* tree_root, int account_id) { +bool DatabaseQueries::storeAccountTree(const QSqlDatabase& db, RootItem* tree_root, int account_id) { QSqlQuery query_category(db); QSqlQuery query_feed(db); @@ -825,7 +825,7 @@ bool DatabaseQueries::storeAccountTree(QSqlDatabase db, RootItem* tree_root, int return true; } -QStringList DatabaseQueries::customIdsOfMessagesFromAccount(QSqlDatabase db, int account_id, bool* ok) { +QStringList DatabaseQueries::customIdsOfMessagesFromAccount(const QSqlDatabase& db, int account_id, bool* ok) { QSqlQuery q(db); QStringList ids; @@ -847,7 +847,7 @@ QStringList DatabaseQueries::customIdsOfMessagesFromAccount(QSqlDatabase db, int return ids; } -QStringList DatabaseQueries::customIdsOfMessagesFromBin(QSqlDatabase db, int account_id, bool* ok) { +QStringList DatabaseQueries::customIdsOfMessagesFromBin(const QSqlDatabase& db, int account_id, bool* ok) { QSqlQuery q(db); QStringList ids; @@ -869,7 +869,7 @@ QStringList DatabaseQueries::customIdsOfMessagesFromBin(QSqlDatabase db, int acc return ids; } -QStringList DatabaseQueries::customIdsOfMessagesFromFeed(QSqlDatabase db, const QString& feed_custom_id, int account_id, bool* ok) { +QStringList DatabaseQueries::customIdsOfMessagesFromFeed(const QSqlDatabase& db, const QString& feed_custom_id, int account_id, bool* ok) { QSqlQuery q(db); QStringList ids; @@ -892,14 +892,14 @@ QStringList DatabaseQueries::customIdsOfMessagesFromFeed(QSqlDatabase db, const return ids; } -QList DatabaseQueries::getOwnCloudAccounts(QSqlDatabase db, bool* ok) { +QList DatabaseQueries::getOwnCloudAccounts(const QSqlDatabase& db, bool* ok) { QSqlQuery query(db); QList roots; if (query.exec("SELECT * FROM OwnCloudAccounts;")) { while (query.next()) { - OwnCloudServiceRoot* root = new OwnCloudServiceRoot(); + auto* root = new OwnCloudServiceRoot(); root->setId(query.value(0).toInt()); root->setAccountId(query.value(0).toInt()); @@ -927,14 +927,14 @@ QList DatabaseQueries::getOwnCloudAccounts(QSqlDatabase db, bool* return roots; } -QList DatabaseQueries::getTtRssAccounts(QSqlDatabase db, bool* ok) { +QList DatabaseQueries::getTtRssAccounts(const QSqlDatabase& db, bool* ok) { QSqlQuery query(db); QList roots; if (query.exec("SELECT * FROM TtRssAccounts;")) { while (query.next()) { - TtRssServiceRoot* root = new TtRssServiceRoot(); + auto* root = new TtRssServiceRoot(); root->setId(query.value(0).toInt()); root->setAccountId(query.value(0).toInt()); @@ -964,7 +964,7 @@ QList DatabaseQueries::getTtRssAccounts(QSqlDatabase db, bool* ok) return roots; } -bool DatabaseQueries::deleteOwnCloudAccount(QSqlDatabase db, int account_id) { +bool DatabaseQueries::deleteOwnCloudAccount(const QSqlDatabase& db, int account_id) { QSqlQuery q(db); q.setForwardOnly(true); @@ -973,7 +973,7 @@ bool DatabaseQueries::deleteOwnCloudAccount(QSqlDatabase db, int account_id) { return q.exec(); } -bool DatabaseQueries::overwriteOwnCloudAccount(QSqlDatabase db, const QString& username, const QString& password, +bool DatabaseQueries::overwriteOwnCloudAccount(const QSqlDatabase& db, const QString& username, const QString& password, const QString& url, bool force_server_side_feed_update, int batch_size, int account_id) { QSqlQuery query(db); @@ -996,7 +996,7 @@ bool DatabaseQueries::overwriteOwnCloudAccount(QSqlDatabase db, const QString& u } } -bool DatabaseQueries::createOwnCloudAccount(QSqlDatabase db, int id_to_assign, const QString& username, +bool DatabaseQueries::createOwnCloudAccount(const QSqlDatabase& db, int id_to_assign, const QString& username, const QString& password, const QString& url, bool force_server_side_feed_update, int batch_size) { QSqlQuery q(db); @@ -1019,7 +1019,7 @@ bool DatabaseQueries::createOwnCloudAccount(QSqlDatabase db, int id_to_assign, c } } -int DatabaseQueries::createAccount(QSqlDatabase db, const QString& code, bool* ok) { +int DatabaseQueries::createAccount(const QSqlDatabase& db, const QString& code, bool* ok) { QSqlQuery q(db); // First obtain the ID, which can be assigned to this new account. @@ -1056,7 +1056,7 @@ int DatabaseQueries::createAccount(QSqlDatabase db, const QString& code, bool* o } } -Assignment DatabaseQueries::getOwnCloudFeeds(QSqlDatabase db, int account_id, bool* ok) { +Assignment DatabaseQueries::getOwnCloudFeeds(const QSqlDatabase& db, int account_id, bool* ok) { Assignment feeds; QSqlQuery q(db); @@ -1087,7 +1087,7 @@ Assignment DatabaseQueries::getOwnCloudFeeds(QSqlDatabase db, int account_id, bo return feeds; } -bool DatabaseQueries::deleteFeed(QSqlDatabase db, int feed_custom_id, int account_id) { +bool DatabaseQueries::deleteFeed(const QSqlDatabase& db, int feed_custom_id, int account_id) { QSqlQuery q(db); q.setForwardOnly(true); @@ -1108,7 +1108,7 @@ bool DatabaseQueries::deleteFeed(QSqlDatabase db, int feed_custom_id, int accoun return q.exec(); } -bool DatabaseQueries::deleteCategory(QSqlDatabase db, int id) { +bool DatabaseQueries::deleteCategory(const QSqlDatabase& db, int id) { QSqlQuery q(db); // Remove this category from database. @@ -1118,8 +1118,8 @@ bool DatabaseQueries::deleteCategory(QSqlDatabase db, int id) { return q.exec(); } -int DatabaseQueries::addCategory(QSqlDatabase db, int parent_id, int account_id, const QString& title, - const QString& description, QDateTime creation_date, const QIcon& icon, +int DatabaseQueries::addCategory(const QSqlDatabase& db, int parent_id, int account_id, const QString& title, + const QString& description, const QDateTime& creation_date, const QIcon& icon, bool* ok) { QSqlQuery q(db); @@ -1160,7 +1160,7 @@ int DatabaseQueries::addCategory(QSqlDatabase db, int parent_id, int account_id, } } -bool DatabaseQueries::editCategory(QSqlDatabase db, int parent_id, int category_id, +bool DatabaseQueries::editCategory(const QSqlDatabase& db, int parent_id, int category_id, const QString& title, const QString& description, const QIcon& icon) { QSqlQuery q(db); @@ -1176,8 +1176,8 @@ bool DatabaseQueries::editCategory(QSqlDatabase db, int parent_id, int category_ return q.exec(); } -int DatabaseQueries::addFeed(QSqlDatabase db, int parent_id, int account_id, const QString& title, - const QString& description, QDateTime creation_date, const QIcon& icon, +int DatabaseQueries::addFeed(const QSqlDatabase& db, int parent_id, int account_id, const QString& title, + const QString& description, const QDateTime& creation_date, const QIcon& icon, const QString& encoding, const QString& url, bool is_protected, const QString& username, const QString& password, Feed::AutoUpdateType auto_update_type, @@ -1236,7 +1236,7 @@ int DatabaseQueries::addFeed(QSqlDatabase db, int parent_id, int account_id, con } } -bool DatabaseQueries::editFeed(QSqlDatabase db, int parent_id, int feed_id, const QString& title, +bool DatabaseQueries::editFeed(const QSqlDatabase& db, int parent_id, int feed_id, const QString& title, const QString& description, const QIcon& icon, const QString& encoding, const QString& url, bool is_protected, const QString& username, const QString& password, @@ -1271,7 +1271,7 @@ bool DatabaseQueries::editFeed(QSqlDatabase db, int parent_id, int feed_id, cons return q.exec(); } -bool DatabaseQueries::editBaseFeed(QSqlDatabase db, int feed_id, Feed::AutoUpdateType auto_update_type, +bool DatabaseQueries::editBaseFeed(const QSqlDatabase& db, int feed_id, Feed::AutoUpdateType auto_update_type, int auto_update_interval) { QSqlQuery q(db); @@ -1285,7 +1285,7 @@ bool DatabaseQueries::editBaseFeed(QSqlDatabase db, int feed_id, Feed::AutoUpdat return q.exec(); } -QList DatabaseQueries::getAccounts(QSqlDatabase db, bool* ok) { +QList DatabaseQueries::getAccounts(const QSqlDatabase& db, bool* ok) { QSqlQuery q(db); QList roots; @@ -1295,7 +1295,7 @@ QList DatabaseQueries::getAccounts(QSqlDatabase db, bool* ok) { if (q.exec()) { while (q.next()) { - StandardServiceRoot* root = new StandardServiceRoot(); + auto* root = new StandardServiceRoot(); root->setAccountId(q.value(0).toInt()); roots.append(root); @@ -1314,7 +1314,7 @@ QList DatabaseQueries::getAccounts(QSqlDatabase db, bool* ok) { return roots; } -Assignment DatabaseQueries::getStandardCategories(QSqlDatabase db, int account_id, bool* ok) { +Assignment DatabaseQueries::getStandardCategories(const QSqlDatabase& db, int account_id, bool* ok) { Assignment categories; // Obtain data for categories from the database. @@ -1349,7 +1349,7 @@ Assignment DatabaseQueries::getStandardCategories(QSqlDatabase db, int account_i return categories; } -Assignment DatabaseQueries::getStandardFeeds(QSqlDatabase db, int account_id, bool* ok) { +Assignment DatabaseQueries::getStandardFeeds(const QSqlDatabase& db, int account_id, bool* ok) { Assignment feeds; QSqlQuery q(db); @@ -1396,7 +1396,7 @@ Assignment DatabaseQueries::getStandardFeeds(QSqlDatabase db, int account_id, bo return feeds; } -bool DatabaseQueries::deleteTtRssAccount(QSqlDatabase db, int account_id) { +bool DatabaseQueries::deleteTtRssAccount(const QSqlDatabase& db, int account_id) { QSqlQuery q(db); q.setForwardOnly(true); @@ -1408,7 +1408,7 @@ bool DatabaseQueries::deleteTtRssAccount(QSqlDatabase db, int account_id) { return q.exec(); } -bool DatabaseQueries::overwriteTtRssAccount(QSqlDatabase db, const QString& username, const QString& password, +bool DatabaseQueries::overwriteTtRssAccount(const QSqlDatabase& db, const QString& username, const QString& password, bool auth_protected, const QString& auth_username, const QString& auth_password, const QString& url, bool force_server_side_feed_update, int account_id) { QSqlQuery q(db); @@ -1435,7 +1435,7 @@ bool DatabaseQueries::overwriteTtRssAccount(QSqlDatabase db, const QString& user } } -bool DatabaseQueries::createTtRssAccount(QSqlDatabase db, int id_to_assign, const QString& username, +bool DatabaseQueries::createTtRssAccount(const QSqlDatabase& db, int id_to_assign, const QString& username, const QString& password, bool auth_protected, const QString& auth_username, const QString& auth_password, const QString& url, bool force_server_side_feed_update) { @@ -1461,7 +1461,7 @@ bool DatabaseQueries::createTtRssAccount(QSqlDatabase db, int id_to_assign, cons } } -Assignment DatabaseQueries::getCategories(QSqlDatabase db, int account_id, bool* ok) { +Assignment DatabaseQueries::getCategories(const QSqlDatabase& db, int account_id, bool* ok) { Assignment categories; // Obtain data for categories from the database. @@ -1495,7 +1495,7 @@ Assignment DatabaseQueries::getCategories(QSqlDatabase db, int account_id, bool* return categories; } -Assignment DatabaseQueries::getGmailFeeds(QSqlDatabase db, int account_id, bool* ok) { +Assignment DatabaseQueries::getGmailFeeds(const QSqlDatabase& db, int account_id, bool* ok) { Assignment feeds; QSqlQuery q(db); @@ -1526,14 +1526,14 @@ Assignment DatabaseQueries::getGmailFeeds(QSqlDatabase db, int account_id, bool* return feeds; } -QList DatabaseQueries::getGmailAccounts(QSqlDatabase db, bool* ok) { +QList DatabaseQueries::getGmailAccounts(const QSqlDatabase& db, bool* ok) { QSqlQuery query(db); QList roots; if (query.exec("SELECT * FROM GmailAccounts;")) { while (query.next()) { - GmailServiceRoot* root = new GmailServiceRoot(nullptr); + auto* root = new GmailServiceRoot(nullptr); root->setId(query.value(0).toInt()); root->setAccountId(query.value(0).toInt()); @@ -1562,7 +1562,7 @@ QList DatabaseQueries::getGmailAccounts(QSqlDatabase db, bool* ok) return roots; } -bool DatabaseQueries::deleteGmailAccount(QSqlDatabase db, int account_id) { +bool DatabaseQueries::deleteGmailAccount(const QSqlDatabase& db, int account_id) { QSqlQuery q(db); q.setForwardOnly(true); @@ -1571,7 +1571,7 @@ bool DatabaseQueries::deleteGmailAccount(QSqlDatabase db, int account_id) { return q.exec(); } -bool DatabaseQueries::deleteInoreaderAccount(QSqlDatabase db, int account_id) { +bool DatabaseQueries::deleteInoreaderAccount(const QSqlDatabase& db, int account_id) { QSqlQuery q(db); q.setForwardOnly(true); @@ -1580,7 +1580,7 @@ bool DatabaseQueries::deleteInoreaderAccount(QSqlDatabase db, int account_id) { return q.exec(); } -Assignment DatabaseQueries::getInoreaderFeeds(QSqlDatabase db, int account_id, bool* ok) { +Assignment DatabaseQueries::getInoreaderFeeds(const QSqlDatabase& db, int account_id, bool* ok) { Assignment feeds; QSqlQuery q(db); @@ -1611,7 +1611,7 @@ Assignment DatabaseQueries::getInoreaderFeeds(QSqlDatabase db, int account_id, b return feeds; } -bool DatabaseQueries::storeNewInoreaderTokens(QSqlDatabase db, const QString& refresh_token, int account_id) { +bool DatabaseQueries::storeNewInoreaderTokens(const QSqlDatabase& db, const QString& refresh_token, int account_id) { QSqlQuery query(db); query.prepare("UPDATE InoreaderAccounts " @@ -1629,14 +1629,14 @@ bool DatabaseQueries::storeNewInoreaderTokens(QSqlDatabase db, const QString& re } } -QList DatabaseQueries::getInoreaderAccounts(QSqlDatabase db, bool* ok) { +QList DatabaseQueries::getInoreaderAccounts(const QSqlDatabase& db, bool* ok) { QSqlQuery query(db); QList roots; if (query.exec("SELECT * FROM InoreaderAccounts;")) { while (query.next()) { - InoreaderServiceRoot* root = new InoreaderServiceRoot(nullptr); + auto* root = new InoreaderServiceRoot(nullptr); root->setId(query.value(0).toInt()); root->setAccountId(query.value(0).toInt()); @@ -1665,7 +1665,7 @@ QList DatabaseQueries::getInoreaderAccounts(QSqlDatabase db, bool* return roots; } -bool DatabaseQueries::overwriteGmailAccount(QSqlDatabase db, const QString& username, const QString& app_id, +bool DatabaseQueries::overwriteGmailAccount(const QSqlDatabase& db, const QString& username, const QString& app_id, const QString& app_key, const QString& redirect_url, const QString& refresh_token, int batch_size, int account_id) { QSqlQuery query(db); @@ -1691,7 +1691,7 @@ bool DatabaseQueries::overwriteGmailAccount(QSqlDatabase db, const QString& user } } -bool DatabaseQueries::createGmailAccount(QSqlDatabase db, int id_to_assign, const QString& username, +bool DatabaseQueries::createGmailAccount(const QSqlDatabase& db, int id_to_assign, const QString& username, const QString& app_id, const QString& app_key, const QString& redirect_url, const QString& refresh_token, int batch_size) { QSqlQuery q(db); @@ -1715,7 +1715,7 @@ bool DatabaseQueries::createGmailAccount(QSqlDatabase db, int id_to_assign, cons } } -bool DatabaseQueries::overwriteInoreaderAccount(QSqlDatabase db, const QString& username, const QString& app_id, +bool DatabaseQueries::overwriteInoreaderAccount(const QSqlDatabase& db, const QString& username, const QString& app_id, const QString& app_key, const QString& redirect_url, const QString& refresh_token, int batch_size, int account_id) { QSqlQuery query(db); @@ -1741,7 +1741,7 @@ bool DatabaseQueries::overwriteInoreaderAccount(QSqlDatabase db, const QString& } } -bool DatabaseQueries::createInoreaderAccount(QSqlDatabase db, int id_to_assign, const QString& username, +bool DatabaseQueries::createInoreaderAccount(const QSqlDatabase& db, int id_to_assign, const QString& username, const QString& app_id, const QString& app_key, const QString& redirect_url, const QString& refresh_token, int batch_size) { QSqlQuery q(db); @@ -1765,7 +1765,7 @@ bool DatabaseQueries::createInoreaderAccount(QSqlDatabase db, int id_to_assign, } } -Assignment DatabaseQueries::getTtRssFeeds(QSqlDatabase db, int account_id, bool* ok) { +Assignment DatabaseQueries::getTtRssFeeds(const QSqlDatabase& db, int account_id, bool* ok) { Assignment feeds; // All categories are now loaded. @@ -1803,4 +1803,4 @@ QString DatabaseQueries::unnulifyString(const QString& str) { return str.isNull() ? "" : str; } -DatabaseQueries::DatabaseQueries() {} +DatabaseQueries::DatabaseQueries() = default; diff --git a/src/miscellaneous/databasequeries.h b/src/miscellaneous/databasequeries.h index fe502d0b7..8fd13f43e 100755 --- a/src/miscellaneous/databasequeries.h +++ b/src/miscellaneous/databasequeries.h @@ -14,120 +14,120 @@ class DatabaseQueries { public: // Mark read/unread/starred/delete messages. - static bool markMessagesReadUnread(QSqlDatabase db, const QStringList& ids, RootItem::ReadStatus read); - static bool markMessageImportant(QSqlDatabase db, int id, RootItem::Importance importance); - static bool markFeedsReadUnread(QSqlDatabase db, const QStringList& ids, int account_id, RootItem::ReadStatus read); - static bool markBinReadUnread(QSqlDatabase db, int account_id, RootItem::ReadStatus read); - static bool markAccountReadUnread(QSqlDatabase db, int account_id, RootItem::ReadStatus read); - static bool switchMessagesImportance(QSqlDatabase db, const QStringList& ids); - static bool permanentlyDeleteMessages(QSqlDatabase db, const QStringList& ids); - static bool deleteOrRestoreMessagesToFromBin(QSqlDatabase db, const QStringList& ids, bool deleted); - static bool restoreBin(QSqlDatabase db, int account_id); + static bool markMessagesReadUnread(const QSqlDatabase& db, const QStringList& ids, RootItem::ReadStatus read); + static bool markMessageImportant(const QSqlDatabase& db, int id, RootItem::Importance importance); + static bool markFeedsReadUnread(const QSqlDatabase& db, const QStringList& ids, int account_id, RootItem::ReadStatus read); + static bool markBinReadUnread(const QSqlDatabase& db, int account_id, RootItem::ReadStatus read); + static bool markAccountReadUnread(const QSqlDatabase& db, int account_id, RootItem::ReadStatus read); + static bool switchMessagesImportance(const QSqlDatabase& db, const QStringList& ids); + static bool permanentlyDeleteMessages(const QSqlDatabase& db, const QStringList& ids); + static bool deleteOrRestoreMessagesToFromBin(const QSqlDatabase& db, const QStringList& ids, bool deleted); + static bool restoreBin(const QSqlDatabase& db, int account_id); // Purge database. - static bool purgeImportantMessages(QSqlDatabase db); - static bool purgeReadMessages(QSqlDatabase db); - static bool purgeOldMessages(QSqlDatabase db, int older_than_days); - static bool purgeRecycleBin(QSqlDatabase db); - static bool purgeMessagesFromBin(QSqlDatabase db, bool clear_only_read, int account_id); - static bool purgeLeftoverMessages(QSqlDatabase db, int account_id); + static bool purgeImportantMessages(const QSqlDatabase& db); + static bool purgeReadMessages(const QSqlDatabase& db); + static bool purgeOldMessages(const QSqlDatabase& db, int older_than_days); + static bool purgeRecycleBin(const QSqlDatabase& db); + static bool purgeMessagesFromBin(const QSqlDatabase& db, bool clear_only_read, int account_id); + static bool purgeLeftoverMessages(const QSqlDatabase& db, int account_id); // Obtain counts of unread/all messages. - static QMap> getMessageCountsForCategory(QSqlDatabase db, const QString& custom_id, int account_id, + static QMap> getMessageCountsForCategory(const QSqlDatabase& db, const QString& custom_id, int account_id, bool including_total_counts, bool* ok = nullptr); - static QMap> getMessageCountsForAccount(QSqlDatabase db, int account_id, + static QMap> getMessageCountsForAccount(const QSqlDatabase& db, int account_id, bool including_total_counts, bool* ok = nullptr); - static int getMessageCountsForFeed(QSqlDatabase db, const QString& feed_custom_id, int account_id, + static int getMessageCountsForFeed(const QSqlDatabase& db, const QString& feed_custom_id, int account_id, bool including_total_counts, bool* ok = nullptr); - static int getMessageCountsForBin(QSqlDatabase db, int account_id, bool including_total_counts, bool* ok = nullptr); + static int getMessageCountsForBin(const QSqlDatabase& db, int account_id, bool including_total_counts, bool* ok = nullptr); // Get messages (for newspaper view for example). - static QList getUndeletedMessagesForFeed(QSqlDatabase db, const QString& feed_custom_id, int account_id, bool* ok = nullptr); - static QList getUndeletedMessagesForBin(QSqlDatabase db, int account_id, bool* ok = nullptr); - static QList getUndeletedMessagesForAccount(QSqlDatabase db, int account_id, bool* ok = nullptr); + static QList getUndeletedMessagesForFeed(const QSqlDatabase& db, const QString& feed_custom_id, int account_id, bool* ok = nullptr); + static QList getUndeletedMessagesForBin(const QSqlDatabase& db, int account_id, bool* ok = nullptr); + static QList getUndeletedMessagesForAccount(const QSqlDatabase& db, int account_id, bool* ok = nullptr); // Custom ID accumulators. - static QStringList customIdsOfMessagesFromAccount(QSqlDatabase db, int account_id, bool* ok = nullptr); - static QStringList customIdsOfMessagesFromBin(QSqlDatabase db, int account_id, bool* ok = nullptr); - static QStringList customIdsOfMessagesFromFeed(QSqlDatabase db, const QString& feed_custom_id, int account_id, bool* ok = nullptr); + static QStringList customIdsOfMessagesFromAccount(const QSqlDatabase& db, int account_id, bool* ok = nullptr); + static QStringList customIdsOfMessagesFromBin(const QSqlDatabase& db, int account_id, bool* ok = nullptr); + static QStringList customIdsOfMessagesFromFeed(const QSqlDatabase& db, const QString& feed_custom_id, int account_id, bool* ok = nullptr); // Common accounts methods. static int updateMessages(QSqlDatabase db, const QList& messages, const QString& feed_custom_id, int account_id, const QString& url, bool* any_message_changed, bool* ok = nullptr); - static bool deleteAccount(QSqlDatabase db, int account_id); - static bool deleteAccountData(QSqlDatabase db, int account_id, bool delete_messages_too); - static bool cleanFeeds(QSqlDatabase db, const QStringList& ids, bool clean_read_only, int account_id); - static bool storeAccountTree(QSqlDatabase db, RootItem* tree_root, int account_id); - static bool editBaseFeed(QSqlDatabase db, int feed_id, Feed::AutoUpdateType auto_update_type, + static bool deleteAccount(const QSqlDatabase& db, int account_id); + static bool deleteAccountData(const QSqlDatabase& db, int account_id, bool delete_messages_too); + static bool cleanFeeds(const QSqlDatabase& db, const QStringList& ids, bool clean_read_only, int account_id); + static bool storeAccountTree(const QSqlDatabase& db, RootItem* tree_root, int account_id); + static bool editBaseFeed(const QSqlDatabase& db, int feed_id, Feed::AutoUpdateType auto_update_type, int auto_update_interval); - static Assignment getCategories(QSqlDatabase db, int account_id, bool* ok = nullptr); + static Assignment getCategories(const QSqlDatabase& db, int account_id, bool* ok = nullptr); // Gmail account. - static Assignment getGmailFeeds(QSqlDatabase db, int account_id, bool* ok = nullptr); - static bool deleteGmailAccount(QSqlDatabase db, int account_id); - static QList getGmailAccounts(QSqlDatabase db, bool* ok = nullptr); - static bool overwriteGmailAccount(QSqlDatabase db, const QString& username, const QString& app_id, + static Assignment getGmailFeeds(const QSqlDatabase& db, int account_id, bool* ok = nullptr); + static bool deleteGmailAccount(const QSqlDatabase& db, int account_id); + static QList getGmailAccounts(const QSqlDatabase& db, bool* ok = nullptr); + static bool overwriteGmailAccount(const QSqlDatabase& db, const QString& username, const QString& app_id, const QString& app_key, const QString& redirect_url, const QString& refresh_token, int batch_size, int account_id); - static bool createGmailAccount(QSqlDatabase db, int id_to_assign, const QString& username, + static bool createGmailAccount(const QSqlDatabase& db, int id_to_assign, const QString& username, const QString& app_id, const QString& app_key, const QString& redirect_url, const QString& refresh_token, int batch_size); // Inoreader account. - static bool deleteInoreaderAccount(QSqlDatabase db, int account_id); - static Assignment getInoreaderFeeds(QSqlDatabase db, int account_id, bool* ok = nullptr); - static bool storeNewInoreaderTokens(QSqlDatabase db, const QString& refresh_token, int account_id); - static QList getInoreaderAccounts(QSqlDatabase db, bool* ok = nullptr); - static bool overwriteInoreaderAccount(QSqlDatabase db, const QString& username, const QString& app_id, + static bool deleteInoreaderAccount(const QSqlDatabase& db, int account_id); + static Assignment getInoreaderFeeds(const QSqlDatabase& db, int account_id, bool* ok = nullptr); + static bool storeNewInoreaderTokens(const QSqlDatabase& db, const QString& refresh_token, int account_id); + static QList getInoreaderAccounts(const QSqlDatabase& db, bool* ok = nullptr); + static bool overwriteInoreaderAccount(const QSqlDatabase& db, const QString& username, const QString& app_id, const QString& app_key, const QString& redirect_url, const QString& refresh_token, int batch_size, int account_id); - static bool createInoreaderAccount(QSqlDatabase db, int id_to_assign, const QString& username, + static bool createInoreaderAccount(const QSqlDatabase& db, int id_to_assign, const QString& username, const QString& app_id, const QString& app_key, const QString& redirect_url, const QString& refresh_token, int batch_size); // ownCloud account. - static QList getOwnCloudAccounts(QSqlDatabase db, bool* ok = nullptr); - static bool deleteOwnCloudAccount(QSqlDatabase db, int account_id); - static bool overwriteOwnCloudAccount(QSqlDatabase db, const QString& username, const QString& password, + static QList getOwnCloudAccounts(const QSqlDatabase& db, bool* ok = nullptr); + static bool deleteOwnCloudAccount(const QSqlDatabase& db, int account_id); + static bool overwriteOwnCloudAccount(const QSqlDatabase& db, const QString& username, const QString& password, const QString& url, bool force_server_side_feed_update, int batch_size, int account_id); - static bool createOwnCloudAccount(QSqlDatabase db, int id_to_assign, const QString& username, const QString& password, + static bool createOwnCloudAccount(const QSqlDatabase& db, int id_to_assign, const QString& username, const QString& password, const QString& url, bool force_server_side_feed_update, int batch_size); - static int createAccount(QSqlDatabase db, const QString& code, bool* ok = nullptr); - static Assignment getOwnCloudFeeds(QSqlDatabase db, int account_id, bool* ok = nullptr); + static int createAccount(const QSqlDatabase& db, const QString& code, bool* ok = nullptr); + static Assignment getOwnCloudFeeds(const QSqlDatabase& db, int account_id, bool* ok = nullptr); // Standard account. - static bool deleteFeed(QSqlDatabase db, int feed_custom_id, int account_id); - static bool deleteCategory(QSqlDatabase db, int id); - static int addCategory(QSqlDatabase db, int parent_id, int account_id, const QString& title, - const QString& description, QDateTime creation_date, const QIcon& icon, bool* ok = nullptr); - static bool editCategory(QSqlDatabase db, int parent_id, int category_id, + static bool deleteFeed(const QSqlDatabase& db, int feed_custom_id, int account_id); + static bool deleteCategory(const QSqlDatabase& db, int id); + static int addCategory(const QSqlDatabase& db, int parent_id, int account_id, const QString& title, + const QString& description, const QDateTime& creation_date, const QIcon& icon, bool* ok = nullptr); + static bool editCategory(const QSqlDatabase& db, int parent_id, int category_id, const QString& title, const QString& description, const QIcon& icon); - static int addFeed(QSqlDatabase db, int parent_id, int account_id, const QString& title, - const QString& description, QDateTime creation_date, const QIcon& icon, + static int addFeed(const QSqlDatabase& db, int parent_id, int account_id, const QString& title, + const QString& description, const QDateTime& creation_date, const QIcon& icon, const QString& encoding, const QString& url, bool is_protected, const QString& username, const QString& password, Feed::AutoUpdateType auto_update_type, int auto_update_interval, StandardFeed::Type feed_format, bool* ok = nullptr); - static bool editFeed(QSqlDatabase db, int parent_id, int feed_id, const QString& title, + static bool editFeed(const QSqlDatabase& db, int parent_id, int feed_id, const QString& title, const QString& description, const QIcon& icon, const QString& encoding, const QString& url, bool is_protected, const QString& username, const QString& password, Feed::AutoUpdateType auto_update_type, int auto_update_interval, StandardFeed::Type feed_format); - static QList getAccounts(QSqlDatabase db, bool* ok = nullptr); - static Assignment getStandardCategories(QSqlDatabase db, int account_id, bool* ok = nullptr); - static Assignment getStandardFeeds(QSqlDatabase db, int account_id, bool* ok = nullptr); + static QList getAccounts(const QSqlDatabase& db, bool* ok = nullptr); + static Assignment getStandardCategories(const QSqlDatabase& db, int account_id, bool* ok = nullptr); + static Assignment getStandardFeeds(const QSqlDatabase& db, int account_id, bool* ok = nullptr); // TT-RSS acccount. - static QList getTtRssAccounts(QSqlDatabase db, bool* ok = nullptr); - static bool deleteTtRssAccount(QSqlDatabase db, int account_id); - static bool overwriteTtRssAccount(QSqlDatabase db, const QString& username, const QString& password, + static QList getTtRssAccounts(const QSqlDatabase& db, bool* ok = nullptr); + static bool deleteTtRssAccount(const QSqlDatabase& db, int account_id); + static bool overwriteTtRssAccount(const QSqlDatabase& db, const QString& username, const QString& password, bool auth_protected, const QString& auth_username, const QString& auth_password, const QString& url, bool force_server_side_feed_update, int account_id); - static bool createTtRssAccount(QSqlDatabase db, int id_to_assign, const QString& username, + static bool createTtRssAccount(const QSqlDatabase& db, int id_to_assign, const QString& username, const QString& password, bool auth_protected, const QString& auth_username, const QString& auth_password, const QString& url, bool force_server_side_feed_update); - static Assignment getTtRssFeeds(QSqlDatabase db, int account_id, bool* ok = nullptr); + static Assignment getTtRssFeeds(const QSqlDatabase& db, int account_id, bool* ok = nullptr); private: static QString unnulifyString(const QString& str); diff --git a/src/miscellaneous/debugging.cpp b/src/miscellaneous/debugging.cpp index ad25c7a94..1510dfa1f 100755 --- a/src/miscellaneous/debugging.cpp +++ b/src/miscellaneous/debugging.cpp @@ -45,7 +45,7 @@ void Debugging::performLog(const char* message, QtMsgType type, const char* file if (instance()->targetFile().isEmpty()) { // Write to console. - if (file == 0 || function == 0 || line < 0) { + if (file == nullptr || function == nullptr || line < 0) { fprintf(stderr, "[%s] %s: %s (%s)\n", APP_LOW_NAME, type_string, message, mbstr); } else { @@ -88,8 +88,7 @@ const char* Debugging::typeToString(QtMsgType type) { } } -Debugging::Debugging() {} - +Debugging::Debugging() = default; void Debugging::debugHandler(QtMsgType type, const QMessageLogContext& placement, const QString& message) { #ifndef QT_NO_DEBUG_OUTPUT performLog(qPrintable(message), type, placement.file, placement.function, placement.line); diff --git a/src/miscellaneous/debugging.h b/src/miscellaneous/debugging.h index ddec493b7..53d7ccc71 100755 --- a/src/miscellaneous/debugging.h +++ b/src/miscellaneous/debugging.h @@ -15,7 +15,7 @@ class Debugging { // Specifies format of output console messages. // NOTE: QT_NO_DEBUG_OUTPUT - disables debug outputs completely!!! static void debugHandler(QtMsgType type, const QMessageLogContext& placement, const QString& message); - static void performLog(const char* message, QtMsgType type, const char* file = 0, const char* function = 0, int line = -1); + static void performLog(const char* message, QtMsgType type, const char* file = nullptr, const char* function = nullptr, int line = -1); static const char* typeToString(QtMsgType type); // Returns pointer to global silent network manager @@ -28,7 +28,7 @@ class Debugging { private: QString m_targetFile; - QFile* m_targetFileHandle; + QFile* m_targetFileHandle{}; }; #endif // DEBUGGING_H diff --git a/src/miscellaneous/externaltool.cpp b/src/miscellaneous/externaltool.cpp index 7618ef7d6..0ae87f2a5 100755 --- a/src/miscellaneous/externaltool.cpp +++ b/src/miscellaneous/externaltool.cpp @@ -8,6 +8,7 @@ #include #include +#include void ExternalTool::sanitizeParameters() { m_executable = QDir::toNativeSeparators(m_executable); @@ -15,12 +16,12 @@ void ExternalTool::sanitizeParameters() { m_parameters.removeAll(QString()); } -ExternalTool::ExternalTool() {} +ExternalTool::ExternalTool() = default; ExternalTool::ExternalTool(const ExternalTool& other) : ExternalTool(other.executable(), other.parameters()) {} -ExternalTool::ExternalTool(const QString& executable, const QStringList& parameters) - : m_executable(executable), m_parameters(parameters) { +ExternalTool::ExternalTool(QString executable, QStringList parameters) + : m_executable(std::move(executable)), m_parameters(std::move(parameters)) { sanitizeParameters(); } @@ -44,7 +45,7 @@ ExternalTool ExternalTool::fromString(const QString& str) { throw ApplicationException(QObject::tr("Passed external tool representation is not valid.")); } else { - const QString executable = outer.at(0); + const QString& executable = outer.at(0); const QStringList parameters = outer.at(1).split(EXTERNAL_TOOL_PARAM_SEPARATOR); return ExternalTool(executable, parameters); diff --git a/src/miscellaneous/externaltool.h b/src/miscellaneous/externaltool.h index dd72f704e..e9bd5c737 100755 --- a/src/miscellaneous/externaltool.h +++ b/src/miscellaneous/externaltool.h @@ -10,7 +10,7 @@ class ExternalTool { public: explicit ExternalTool(); ExternalTool(const ExternalTool& other); - explicit ExternalTool(const QString& executable, const QStringList& parameters); + explicit ExternalTool(QString executable, QStringList parameters); QString toString(); QString executable() const; diff --git a/src/miscellaneous/feedreader.cpp b/src/miscellaneous/feedreader.cpp index 42d5e8b54..c794ec4bc 100755 --- a/src/miscellaneous/feedreader.cpp +++ b/src/miscellaneous/feedreader.cpp @@ -22,7 +22,7 @@ #include FeedReader::FeedReader(QObject* parent) - : QObject(parent), m_feedServices(QList()), + : QObject(parent), m_autoUpdateTimer(new QTimer(this)), m_feedDownloader(nullptr) { m_feedsModel = new FeedsModel(this); m_feedsProxyModel = new FeedsProxyModel(m_feedsModel, this); @@ -174,7 +174,7 @@ void FeedReader::executeNextAutoUpdate() { // of scheduled update can be shown now. if (qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::EnableAutoUpdateNotification)).toBool()) { qApp->showGuiMessage(tr("Starting auto-update of some feeds"), - tr("I will auto-update %n feed(s).", 0, feeds_for_update.size()), + tr("I will auto-update %n feed(s).", nullptr, feeds_for_update.size()), QSystemTrayIcon::Information); } } diff --git a/src/miscellaneous/feedreader.h b/src/miscellaneous/feedreader.h index face6e306..592339252 100755 --- a/src/miscellaneous/feedreader.h +++ b/src/miscellaneous/feedreader.h @@ -78,9 +78,9 @@ class FeedReader : public QObject { // Auto-update stuff. QTimer* m_autoUpdateTimer; - bool m_globalAutoUpdateEnabled; - int m_globalAutoUpdateInitialInterval; - int m_globalAutoUpdateRemainingInterval; + bool m_globalAutoUpdateEnabled{}; + int m_globalAutoUpdateInitialInterval{}; + int m_globalAutoUpdateRemainingInterval{}; FeedDownloader* m_feedDownloader; }; diff --git a/src/miscellaneous/iofactory.cpp b/src/miscellaneous/iofactory.cpp index fa3b0dcf8..117ef9259 100755 --- a/src/miscellaneous/iofactory.cpp +++ b/src/miscellaneous/iofactory.cpp @@ -12,7 +12,7 @@ #include #include -IOFactory::IOFactory() {} +IOFactory::IOFactory() = default; bool IOFactory::isFolderWritable(const QString& folder) { QString real_file = folder; diff --git a/src/miscellaneous/localization.cpp b/src/miscellaneous/localization.cpp index 137c9e9db..edd968b96 100755 --- a/src/miscellaneous/localization.cpp +++ b/src/miscellaneous/localization.cpp @@ -12,15 +12,15 @@ Localization::Localization(QObject* parent) : QObject(parent) {} -Localization::~Localization() {} +Localization::~Localization() = default; QString Localization::desiredLanguage() const { return qApp->settings()->value(GROUP(General), SETTING(General::Language)).toString(); } void Localization::loadActiveLanguage() { - QTranslator* qt_translator = new QTranslator(qApp); - QTranslator* app_translator = new QTranslator(qApp); + auto* qt_translator = new QTranslator(qApp); + auto* app_translator = new QTranslator(qApp); QString desired_localization = desiredLanguage(); qDebug("Starting to load active localization. Desired localization is '%s'.", qPrintable(desired_localization)); diff --git a/src/miscellaneous/settings.cpp b/src/miscellaneous/settings.cpp index 85f9bc3e6..2678c06ce 100755 --- a/src/miscellaneous/settings.cpp +++ b/src/miscellaneous/settings.cpp @@ -354,7 +354,7 @@ DKEY CategoriesExpandStates::ID = "categories_expand_states"; Settings::Settings(const QString& file_name, Format format, const SettingsProperties::SettingsType& status, QObject* parent) : QSettings(file_name, format, parent), m_initializationStatus(status) {} -Settings::~Settings() {} +Settings::~Settings() = default; QString Settings::pathName() const { return QFileInfo(fileName()).absolutePath(); diff --git a/src/miscellaneous/simpleregexp.cpp b/src/miscellaneous/simpleregexp.cpp index d74002578..8d2b845c7 100755 --- a/src/miscellaneous/simpleregexp.cpp +++ b/src/miscellaneous/simpleregexp.cpp @@ -46,7 +46,7 @@ void SimpleRegExp::setMinimal(bool minimal) { } int SimpleRegExp::indexIn(const QString& str, int offset) const { - SimpleRegExp* that = const_cast(this); + auto* that = const_cast(this); QRegularExpressionMatch m = match(str, offset); if (!m.hasMatch()) { diff --git a/src/miscellaneous/skinfactory.cpp b/src/miscellaneous/skinfactory.cpp index 3a7df8306..9d5c982cf 100755 --- a/src/miscellaneous/skinfactory.cpp +++ b/src/miscellaneous/skinfactory.cpp @@ -11,7 +11,7 @@ SkinFactory::SkinFactory(QObject* parent) : QObject(parent) {} -SkinFactory::~SkinFactory() {} +SkinFactory::~SkinFactory() = default; void SkinFactory::loadCurrentSkin() { QList skin_names_to_try; @@ -63,7 +63,7 @@ QString SkinFactory::selectedSkinName() const { QString SkinFactory::adBlockedPage(const QString& subscription, const QString& rule) { const QString& adblocked = currentSkin().m_adblocked.arg(tr("This page was blocked by AdBlock"), - tr("Blocked by set: \"%1\"
Blocked by filter: \"%2\"") + tr(R"(Blocked by set: "%1"
Blocked by filter: "%2")") .arg(subscription, rule)); diff --git a/src/miscellaneous/systemfactory.cpp b/src/miscellaneous/systemfactory.cpp index 00c92c016..59581ec14 100755 --- a/src/miscellaneous/systemfactory.cpp +++ b/src/miscellaneous/systemfactory.cpp @@ -22,11 +22,11 @@ #include #include -typedef QPair UpdateCheck; +using UpdateCheck = QPair; SystemFactory::SystemFactory(QObject* parent) : QObject(parent) {} -SystemFactory::~SystemFactory() {} +SystemFactory::~SystemFactory() = default; QRegularExpression SystemFactory::supportedUpdateFiles() { #if defined(Q_OS_WIN) @@ -202,7 +202,7 @@ QString SystemFactory::loggedInUser() const { } void SystemFactory::checkForUpdates() const { - Downloader* downloader = new Downloader(); + auto* downloader = new Downloader(); connect(downloader, &Downloader::completed, this, [this, downloader]() { QPair, QNetworkReply::NetworkError> result; @@ -269,8 +269,8 @@ QList SystemFactory::parseUpdatesFile(const QByteArray& updates_file QList updates; QJsonArray document = QJsonDocument::fromJson(updates_file).array(); - for (int i = 0; i < document.size(); i++) { - QJsonObject release = document.at(i).toObject(); + for (QJsonValueRef i : document) { + QJsonObject release = i.toObject(); UpdateInfo update; update.m_date = QDateTime::fromString(release["published_at"].toString(), QSL("yyyy-MM-ddTHH:mm:ssZ")); @@ -278,8 +278,8 @@ QList SystemFactory::parseUpdatesFile(const QByteArray& updates_file update.m_changes = release["body"].toString(); QJsonArray assets = release["assets"].toArray(); - for (int j = 0; j < assets.size(); j++) { - QJsonObject asset = assets.at(j).toObject(); + for (QJsonValueRef j : assets) { + QJsonObject asset = j.toObject(); UpdateUrl url; url.m_fileUrl = asset["browser_download_url"].toString(); @@ -291,7 +291,7 @@ QList SystemFactory::parseUpdatesFile(const QByteArray& updates_file updates.append(update); } - qSort(updates.begin(), updates.end(), [](const UpdateInfo& a, const UpdateInfo& b) -> bool { + std::sort(updates.begin(), updates.end(), [](const UpdateInfo& a, const UpdateInfo& b) -> bool { return a.m_date > b.m_date; }); return updates; diff --git a/src/miscellaneous/textfactory.cpp b/src/miscellaneous/textfactory.cpp index 8a92b184f..53451d639 100755 --- a/src/miscellaneous/textfactory.cpp +++ b/src/miscellaneous/textfactory.cpp @@ -16,7 +16,7 @@ quint64 TextFactory::s_encryptionKey = 0x0; -TextFactory::TextFactory() {} +TextFactory::TextFactory() = default; int TextFactory::stringHeight(const QString& string, const QFontMetrics& metrics) { const int count_lines = string.split(QL1C('\n')).size(); @@ -130,7 +130,7 @@ quint64 TextFactory::initializeSecretEncryptionKey() { try { s_encryptionKey = quint64(QString(IOFactory::readFile(encryption_file_path)).toLongLong()); } - catch (ApplicationException) { + catch (ApplicationException&) { // Well, key does not exist or is invalid, generate and save one. s_encryptionKey = generateSecretEncryptionKey();