diff --git a/src/librssguard/CMakeLists.txt b/src/librssguard/CMakeLists.txt index dea810f1f..d51db2497 100644 --- a/src/librssguard/CMakeLists.txt +++ b/src/librssguard/CMakeLists.txt @@ -525,6 +525,7 @@ endif() if(SQLite3_FOUND) # Include directory and library are linked to below. + message(STATUS "Using system SQLite3 ${SQLite3_VERSION}.") else() message(STATUS "Using bundled SQLite3.") @@ -660,6 +661,12 @@ if(SQLite3_FOUND) ${SQLite3_INCLUDE_DIRS} ) + target_compile_definitions(rssguard + PRIVATE + + SYSTEM_SQLITE3 + ) + target_link_libraries(rssguard PRIVATE ${SQLite3_LIBRARIES} ) diff --git a/src/librssguard/core/feeddownloader.cpp b/src/librssguard/core/feeddownloader.cpp index 3088fce5b..ba2eff232 100644 --- a/src/librssguard/core/feeddownloader.cpp +++ b/src/librssguard/core/feeddownloader.cpp @@ -3,7 +3,6 @@ #include "core/feeddownloader.h" #include "3rd-party/boolinq/boolinq.h" -#include "core/feedsmodel.h" #include "core/messagefilter.h" #include "database/databasequeries.h" #include "definitions/definitions.h" diff --git a/src/librssguard/core/feedsmodel.cpp b/src/librssguard/core/feedsmodel.cpp index 25878a62a..6414457f5 100644 --- a/src/librssguard/core/feedsmodel.cpp +++ b/src/librssguard/core/feedsmodel.cpp @@ -10,12 +10,10 @@ #include "gui/messagebox.h" #include "miscellaneous/feedreader.h" #include "miscellaneous/iconfactory.h" -#include "miscellaneous/textfactory.h" #include "services/abstract/feed.h" #include "services/abstract/recyclebin.h" #include "services/abstract/serviceentrypoint.h" #include "services/abstract/serviceroot.h" -#include "services/standard/standardserviceroot.h" #include #include diff --git a/src/librssguard/core/message.cpp b/src/librssguard/core/message.cpp index 8ec33f85a..181cee753 100644 --- a/src/librssguard/core/message.cpp +++ b/src/librssguard/core/message.cpp @@ -2,7 +2,6 @@ #include "core/message.h" -#include "3rd-party/boolinq/boolinq.h" #include "miscellaneous/textfactory.h" #include "services/abstract/feed.h" #include "services/abstract/label.h" diff --git a/src/librssguard/core/messagesproxymodel.cpp b/src/librssguard/core/messagesproxymodel.cpp index bcec17972..fb4c16a37 100644 --- a/src/librssguard/core/messagesproxymodel.cpp +++ b/src/librssguard/core/messagesproxymodel.cpp @@ -5,9 +5,7 @@ #include "core/messagesmodel.h" #include "core/messagesmodelcache.h" #include "definitions/globals.h" -#include "miscellaneous/application.h" #include "miscellaneous/regexfactory.h" -#include "miscellaneous/settings.h" #include diff --git a/src/librssguard/database/databasedriver.cpp b/src/librssguard/database/databasedriver.cpp index 6003efabf..34279957b 100644 --- a/src/librssguard/database/databasedriver.cpp +++ b/src/librssguard/database/databasedriver.cpp @@ -3,7 +3,7 @@ #include "database/databasedriver.h" #include "definitions/definitions.h" -#include "exceptions/ioexception.h" +#include "exceptions/applicationexception.h" #include "miscellaneous/iofactory.h" #include diff --git a/src/librssguard/database/databasequeries.cpp b/src/librssguard/database/databasequeries.cpp index 485e01030..c42699e1e 100644 --- a/src/librssguard/database/databasequeries.cpp +++ b/src/librssguard/database/databasequeries.cpp @@ -6,7 +6,6 @@ #include "exceptions/applicationexception.h" #include "miscellaneous/application.h" #include "miscellaneous/iconfactory.h" -#include "network-web/oauth2service.h" #include "services/abstract/category.h" #include diff --git a/src/librssguard/database/sqlitedriver.cpp b/src/librssguard/database/sqlitedriver.cpp index d03cbabc5..64b88572a 100644 --- a/src/librssguard/database/sqlitedriver.cpp +++ b/src/librssguard/database/sqlitedriver.cpp @@ -5,7 +5,11 @@ #include "exceptions/applicationexception.h" #include "miscellaneous/application.h" +#if defined(SYSTEM_SQLITE3) +#include +#else #include "3rd-party/sqlite/sqlite3.h" +#endif #include #include diff --git a/src/librssguard/dynamic-shortcuts/dynamicshortcuts.cpp b/src/librssguard/dynamic-shortcuts/dynamicshortcuts.cpp index 85832e15b..4af797920 100644 --- a/src/librssguard/dynamic-shortcuts/dynamicshortcuts.cpp +++ b/src/librssguard/dynamic-shortcuts/dynamicshortcuts.cpp @@ -2,7 +2,6 @@ #include "dynamic-shortcuts/dynamicshortcuts.h" -#include "definitions/definitions.h" #include "miscellaneous/application.h" #include "miscellaneous/settings.h" @@ -20,9 +19,9 @@ void DynamicShortcuts::load(const QList& actions) { Settings* settings = qApp->settings(); for (QAction* action : actions) { - QString shortcut_for_action = settings->value(GROUP(Keyboard), - action->objectName(), - action->shortcut().toString(QKeySequence::PortableText)).toString(); + QString shortcut_for_action = + settings->value(GROUP(Keyboard), action->objectName(), action->shortcut().toString(QKeySequence::PortableText)) + .toString(); action->setShortcut(QKeySequence::fromString(shortcut_for_action, QKeySequence::PortableText)); } diff --git a/src/librssguard/gui/dialogs/formabout.cpp b/src/librssguard/gui/dialogs/formabout.cpp index 707adcd95..c9ccd969e 100644 --- a/src/librssguard/gui/dialogs/formabout.cpp +++ b/src/librssguard/gui/dialogs/formabout.cpp @@ -2,10 +2,7 @@ #include "gui/dialogs/formabout.h" -#include "database/databasedriver.h" -#include "database/databasefactory.h" #include "definitions/definitions.h" -#include "exceptions/applicationexception.h" #include "gui/guiutilities.h" #include "miscellaneous/application.h" #include "miscellaneous/iconfactory.h" diff --git a/src/librssguard/gui/dialogs/formaddaccount.cpp b/src/librssguard/gui/dialogs/formaddaccount.cpp index b74b22515..a1c05a6bb 100644 --- a/src/librssguard/gui/dialogs/formaddaccount.cpp +++ b/src/librssguard/gui/dialogs/formaddaccount.cpp @@ -6,7 +6,7 @@ #include "gui/guiutilities.h" #include "miscellaneous/application.h" #include "miscellaneous/iconfactory.h" -#include "services/standard/standardserviceentrypoint.h" +#include "services/abstract/serviceentrypoint.h" #include #include diff --git a/src/librssguard/gui/dialogs/formmain.cpp b/src/librssguard/gui/dialogs/formmain.cpp index 3c603546f..e895d57a8 100644 --- a/src/librssguard/gui/dialogs/formmain.cpp +++ b/src/librssguard/gui/dialogs/formmain.cpp @@ -2,7 +2,6 @@ #include "gui/dialogs/formmain.h" -#include "database/databasefactory.h" #include "definitions/definitions.h" #include "gui/dialogs/formabout.h" #include "gui/dialogs/formaddaccount.h" @@ -13,10 +12,8 @@ #include "gui/dialogs/formupdate.h" #include "gui/feedmessageviewer.h" #include "gui/feedsview.h" -#include "gui/messagebox.h" #include "gui/messagepreviewer.h" #include "gui/messagesview.h" -#include "gui/reusable/plaintoolbutton.h" #include "gui/reusable/searchlineedit.h" #include "gui/systemtrayicon.h" #include "gui/tabbar.h" @@ -28,14 +25,11 @@ #include "miscellaneous/iconfactory.h" #include "miscellaneous/mutex.h" #include "miscellaneous/settings.h" -#include "miscellaneous/systemfactory.h" #include "network-web/adblock/adblockicon.h" #include "network-web/adblock/adblockmanager.h" #include "network-web/webfactory.h" #include "services/abstract/recyclebin.h" #include "services/abstract/serviceroot.h" -#include "services/owncloud/owncloudnetworkfactory.h" -#include "services/standard/gui/formstandardimportexport.h" #include #include diff --git a/src/librssguard/gui/dialogs/formmessagefiltersmanager.cpp b/src/librssguard/gui/dialogs/formmessagefiltersmanager.cpp index f5a86f3d1..7572ff87c 100644 --- a/src/librssguard/gui/dialogs/formmessagefiltersmanager.cpp +++ b/src/librssguard/gui/dialogs/formmessagefiltersmanager.cpp @@ -1,9 +1,5 @@ // For license of this file, see /LICENSE.md. -#include -#include -#include - #include "gui/dialogs/formmessagefiltersmanager.h" #include "3rd-party/boolinq/boolinq.h" @@ -20,7 +16,10 @@ #include "network-web/webfactory.h" #include "services/abstract/accountcheckmodel.h" #include "services/abstract/feed.h" -#include "services/abstract/labelsnode.h" + +#include +#include +#include FormMessageFiltersManager::FormMessageFiltersManager(FeedReader* reader, const QList& accounts, diff --git a/src/librssguard/gui/dialogs/formrestoredatabasesettings.cpp b/src/librssguard/gui/dialogs/formrestoredatabasesettings.cpp index 40b0d338c..78954a30f 100644 --- a/src/librssguard/gui/dialogs/formrestoredatabasesettings.cpp +++ b/src/librssguard/gui/dialogs/formrestoredatabasesettings.cpp @@ -3,12 +3,10 @@ #include "gui/dialogs/formrestoredatabasesettings.h" #include "exceptions/applicationexception.h" -#include "gui/dialogs/formmain.h" #include "gui/guiutilities.h" -#include "gui/messagebox.h" #include "miscellaneous/iconfactory.h" -#include "QFileDialog" +#include FormRestoreDatabaseSettings::FormRestoreDatabaseSettings(QWidget& parent) : QDialog(&parent), m_shouldRestart(false) { m_ui.setupUi(this); diff --git a/src/librssguard/gui/dialogs/formupdate.cpp b/src/librssguard/gui/dialogs/formupdate.cpp index 1bfc51321..825c8373c 100644 --- a/src/librssguard/gui/dialogs/formupdate.cpp +++ b/src/librssguard/gui/dialogs/formupdate.cpp @@ -4,9 +4,7 @@ #include "definitions/definitions.h" #include "gui/guiutilities.h" -#include "gui/messagebox.h" #include "miscellaneous/iconfactory.h" -#include "miscellaneous/iofactory.h" #include "network-web/downloader.h" #include "network-web/networkfactory.h" #include "network-web/webfactory.h" diff --git a/src/librssguard/gui/feedmessageviewer.cpp b/src/librssguard/gui/feedmessageviewer.cpp index 897e26f66..f517493bb 100644 --- a/src/librssguard/gui/feedmessageviewer.cpp +++ b/src/librssguard/gui/feedmessageviewer.cpp @@ -2,33 +2,16 @@ #include "gui/feedmessageviewer.h" -#include "3rd-party/boolinq/boolinq.h" -#include "core/feeddownloader.h" -#include "core/feedsproxymodel.h" #include "core/messagesproxymodel.h" -#include "database/databasecleaner.h" -#include "database/databasefactory.h" -#include "exceptions/applicationexception.h" -#include "gui/dialogs/formdatabasecleanup.h" #include "gui/dialogs/formmain.h" #include "gui/feedsview.h" -#include "gui/messagebox.h" #include "gui/messagepreviewer.h" #include "gui/messagesview.h" -#include "gui/systemtrayicon.h" #include "gui/toolbars/feedstoolbar.h" #include "gui/toolbars/messagestoolbar.h" -#include "gui/toolbars/statusbar.h" #include "gui/webbrowser.h" -#include "miscellaneous/feedreader.h" -#include "miscellaneous/iconfactory.h" -#include "miscellaneous/mutex.h" #include "miscellaneous/settings.h" -#include "miscellaneous/systemfactory.h" #include "miscellaneous/templates.h" -#include "services/standard/standardfeed.h" -#include "services/standard/standardfeedsimportexportmodel.h" -#include "services/standard/standardserviceroot.h" #include #include diff --git a/src/librssguard/gui/feedsview.cpp b/src/librssguard/gui/feedsview.cpp index 590a87017..e5de2461b 100644 --- a/src/librssguard/gui/feedsview.cpp +++ b/src/librssguard/gui/feedsview.cpp @@ -8,16 +8,11 @@ #include "gui/dialogs/formmain.h" #include "gui/messagebox.h" #include "gui/reusable/styleditemdelegatewithoutfocus.h" -#include "gui/systemtrayicon.h" #include "miscellaneous/feedreader.h" #include "miscellaneous/mutex.h" -#include "miscellaneous/systemfactory.h" #include "services/abstract/feed.h" -#include "services/abstract/gui/formcategorydetails.h" #include "services/abstract/rootitem.h" #include "services/abstract/serviceroot.h" -#include "services/standard/standardcategory.h" -#include "services/standard/standardfeed.h" #include #include diff --git a/src/librssguard/gui/messagepreviewer.cpp b/src/librssguard/gui/messagepreviewer.cpp index 198629210..7d7ef6a36 100644 --- a/src/librssguard/gui/messagepreviewer.cpp +++ b/src/librssguard/gui/messagepreviewer.cpp @@ -2,21 +2,14 @@ #include "gui/messagepreviewer.h" -#include "3rd-party/boolinq/boolinq.h" #include "database/databasequeries.h" -#include "gui/dialogs/formmain.h" #include "gui/itemdetails.h" -#include "gui/messagebox.h" -#include "gui/reusable/plaintoolbutton.h" -#include "gui/reusable/searchtextwidget.h" #include "gui/webbrowser.h" #include "miscellaneous/application.h" -#include "network-web/webfactory.h" #include "services/abstract/gui/custommessagepreviewer.h" #include "services/abstract/label.h" #include "services/abstract/labelsnode.h" #include "services/abstract/serviceroot.h" -#include "services/gmail/gui/emailpreviewer.h" #include #include diff --git a/src/librssguard/gui/messagesview.cpp b/src/librssguard/gui/messagesview.cpp index c5d514c90..4190e497d 100644 --- a/src/librssguard/gui/messagesview.cpp +++ b/src/librssguard/gui/messagesview.cpp @@ -15,7 +15,6 @@ #include "miscellaneous/externaltool.h" #include "miscellaneous/feedreader.h" #include "miscellaneous/settings.h" -#include "network-web/networkfactory.h" #include "network-web/webfactory.h" #include "qnamespace.h" #include "services/abstract/labelsnode.h" diff --git a/src/librssguard/gui/reusable/colortoolbutton.cpp b/src/librssguard/gui/reusable/colortoolbutton.cpp index 550c48a48..a0ef89a15 100644 --- a/src/librssguard/gui/reusable/colortoolbutton.cpp +++ b/src/librssguard/gui/reusable/colortoolbutton.cpp @@ -2,7 +2,6 @@ #include "gui/reusable/colortoolbutton.h" -#include "definitions/definitions.h" #include "miscellaneous/textfactory.h" #include diff --git a/src/librssguard/gui/reusable/helpspoiler.cpp b/src/librssguard/gui/reusable/helpspoiler.cpp index d93184a8f..71a79a010 100644 --- a/src/librssguard/gui/reusable/helpspoiler.cpp +++ b/src/librssguard/gui/reusable/helpspoiler.cpp @@ -3,7 +3,6 @@ #include "gui/reusable/helpspoiler.h" #include "definitions/definitions.h" -#include "gui/guiutilities.h" #include "gui/reusable/plaintoolbutton.h" #include "miscellaneous/application.h" #include "miscellaneous/iconfactory.h" diff --git a/src/librssguard/gui/reusable/jssyntaxhighlighter.cpp b/src/librssguard/gui/reusable/jssyntaxhighlighter.cpp index c34cbba33..ba9e77137 100755 --- a/src/librssguard/gui/reusable/jssyntaxhighlighter.cpp +++ b/src/librssguard/gui/reusable/jssyntaxhighlighter.cpp @@ -20,7 +20,7 @@ JsSyntaxHighlighter::JsSyntaxHighlighter(QTextDocument* parent) : QSyntaxHighlig keywords = FROM_STD_LIST(QStringList, std_keywords); - for (const QString& pattern : keywords) { + for (const QString& pattern : qAsConst(keywords)) { rule.m_pattern = QRegularExpression(pattern); rule.m_format = m_keywordFormat; diff --git a/src/librssguard/gui/reusable/progressbarwithtext.cpp b/src/librssguard/gui/reusable/progressbarwithtext.cpp index 790d31edf..e27b28b9c 100644 --- a/src/librssguard/gui/reusable/progressbarwithtext.cpp +++ b/src/librssguard/gui/reusable/progressbarwithtext.cpp @@ -3,7 +3,6 @@ #include "gui/reusable/progressbarwithtext.h" #include "definitions/definitions.h" -#include "miscellaneous/application.h" ProgressBarWithText::ProgressBarWithText(QWidget* parent) : QProgressBar(parent) {} diff --git a/src/librssguard/gui/reusable/styleditemdelegatewithoutfocus.cpp b/src/librssguard/gui/reusable/styleditemdelegatewithoutfocus.cpp index bf26fbffe..c61c92273 100644 --- a/src/librssguard/gui/reusable/styleditemdelegatewithoutfocus.cpp +++ b/src/librssguard/gui/reusable/styleditemdelegatewithoutfocus.cpp @@ -2,7 +2,7 @@ #include "gui/reusable/styleditemdelegatewithoutfocus.h" -#include "miscellaneous/application.h" +#include "definitions/definitions.h" StyledItemDelegateWithoutFocus::StyledItemDelegateWithoutFocus(int height_row, int padding_row, QObject* parent) : QStyledItemDelegate(parent), m_rowHeight(height_row), m_rowPadding(padding_row) {} diff --git a/src/librssguard/gui/settings/settingsbrowsermail.cpp b/src/librssguard/gui/settings/settingsbrowsermail.cpp index f36f0317f..6df854ea4 100644 --- a/src/librssguard/gui/settings/settingsbrowsermail.cpp +++ b/src/librssguard/gui/settings/settingsbrowsermail.cpp @@ -3,7 +3,6 @@ #include "gui/settings/settingsbrowsermail.h" #include "exceptions/applicationexception.h" -#include "gui/guiutilities.h" #include "gui/reusable/networkproxydetails.h" #include "miscellaneous/application.h" #include "miscellaneous/externaltool.h" diff --git a/src/librssguard/gui/settings/settingsdatabase.cpp b/src/librssguard/gui/settings/settingsdatabase.cpp index 6eb310251..42bf463af 100644 --- a/src/librssguard/gui/settings/settingsdatabase.cpp +++ b/src/librssguard/gui/settings/settingsdatabase.cpp @@ -5,7 +5,6 @@ #include "database/databasefactory.h" #include "database/mariadbdriver.h" #include "definitions/definitions.h" -#include "gui/guiutilities.h" #include "miscellaneous/application.h" SettingsDatabase::SettingsDatabase(Settings* settings, QWidget* parent) diff --git a/src/librssguard/gui/settings/settingsfeedsmessages.cpp b/src/librssguard/gui/settings/settingsfeedsmessages.cpp index d692df0f3..451b7fad5 100644 --- a/src/librssguard/gui/settings/settingsfeedsmessages.cpp +++ b/src/librssguard/gui/settings/settingsfeedsmessages.cpp @@ -2,12 +2,10 @@ #include "gui/settings/settingsfeedsmessages.h" +#include "core/feedsmodel.h" #include "definitions/definitions.h" #include "gui/dialogs/formmain.h" #include "gui/feedmessageviewer.h" -#include "gui/feedsview.h" -#include "gui/guiutilities.h" -#include "gui/messagesview.h" #include "gui/reusable/timespinbox.h" #include "miscellaneous/application.h" #include "miscellaneous/feedreader.h" diff --git a/src/librssguard/gui/settings/settingsgui.cpp b/src/librssguard/gui/settings/settingsgui.cpp index 468e928e2..5e545f618 100644 --- a/src/librssguard/gui/settings/settingsgui.cpp +++ b/src/librssguard/gui/settings/settingsgui.cpp @@ -2,7 +2,6 @@ #include "gui/settings/settingsgui.h" -#include "3rd-party/boolinq/boolinq.h" #include "core/feedsmodel.h" #include "gui/dialogs/formmain.h" #include "gui/feedmessageviewer.h" diff --git a/src/librssguard/gui/settings/settingsnotifications.cpp b/src/librssguard/gui/settings/settingsnotifications.cpp index 597bd5330..8c462a689 100644 --- a/src/librssguard/gui/settings/settingsnotifications.cpp +++ b/src/librssguard/gui/settings/settingsnotifications.cpp @@ -2,8 +2,6 @@ #include "gui/settings/settingsnotifications.h" -#include "3rd-party/boolinq/boolinq.h" -#include "gui/guiutilities.h" #include "gui/notifications/notificationseditor.h" #include "miscellaneous/application.h" #include "miscellaneous/notificationfactory.h" @@ -14,9 +12,10 @@ SettingsNotifications::SettingsNotifications(Settings* settings, QWidget* parent) : SettingsPanel(settings, parent) { m_ui.setupUi(this); - m_ui.m_lblInfo->setHelpText(tr("You must have \"tray icon\" activated to have balloon notifications working.\n\n" - "Also, there are some built-in sounds. Just start typing \":\" and they will show up."), - true); + m_ui.m_lblInfo + ->setHelpText(tr("You must have \"tray icon\" activated to have balloon notifications working.\n\n" + "Also, there are some built-in sounds. Just start typing \":\" and they will show up."), + true); connect(m_ui.m_checkEnableNotifications, &QCheckBox::toggled, this, &SettingsNotifications::dirtifySettings); connect(m_ui.m_editor, &NotificationsEditor::someNotificationChanged, this, &SettingsNotifications::dirtifySettings); @@ -26,7 +25,8 @@ void SettingsNotifications::loadSettings() { onBeginLoadSettings(); // Load fancy notification settings. - m_ui.m_checkEnableNotifications->setChecked(settings()->value(GROUP(GUI), SETTING(GUI::EnableNotifications)).toBool()); + m_ui.m_checkEnableNotifications + ->setChecked(settings()->value(GROUP(GUI), SETTING(GUI::EnableNotifications)).toBool()); m_ui.m_editor->loadNotifications(qApp->notifications()->allNotifications()); onEndLoadSettings(); diff --git a/src/librssguard/gui/systemtrayicon.cpp b/src/librssguard/gui/systemtrayicon.cpp index f9808247f..dd5388e07 100644 --- a/src/librssguard/gui/systemtrayicon.cpp +++ b/src/librssguard/gui/systemtrayicon.cpp @@ -4,7 +4,6 @@ #include "definitions/definitions.h" #include "gui/dialogs/formmain.h" -#include "gui/dialogs/formsettings.h" #include "miscellaneous/application.h" #include "miscellaneous/settings.h" diff --git a/src/librssguard/gui/tabbar.cpp b/src/librssguard/gui/tabbar.cpp index 84d932c67..68d232e2f 100644 --- a/src/librssguard/gui/tabbar.cpp +++ b/src/librssguard/gui/tabbar.cpp @@ -5,7 +5,6 @@ #include "definitions/definitions.h" #include "gui/reusable/plaintoolbutton.h" #include "miscellaneous/settings.h" -#include "miscellaneous/templates.h" #include #include @@ -21,9 +20,8 @@ TabBar::~TabBar() { } void TabBar::setTabType(int index, TabBar::TabType type) { - const auto button_position = static_cast(style()->styleHint(QStyle::StyleHint::SH_TabBar_CloseButtonPosition, - nullptr, - this)); + const auto button_position = + static_cast(style()->styleHint(QStyle::StyleHint::SH_TabBar_CloseButtonPosition, nullptr, this)); switch (type) { case TabBar::TabType::DownloadManager: @@ -51,9 +49,8 @@ void TabBar::setTabType(int index, TabBar::TabType type) { void TabBar::closeTabViaButton() { const auto* close_button = qobject_cast(sender()); - const auto button_position = static_cast(style()->styleHint(QStyle::StyleHint::SH_TabBar_CloseButtonPosition, - nullptr, - this)); + const auto button_position = + static_cast(style()->styleHint(QStyle::StyleHint::SH_TabBar_CloseButtonPosition, nullptr, this)); if (close_button != nullptr) { // Find index of tab for this close button. @@ -75,15 +72,11 @@ void TabBar::wheelEvent(QWheelEvent* event) { if (number_of_tabs > 1) { if (event->angleDelta().y() > 0) { // Scroll to the LEFT tab. - setCurrentIndex(current_index == 0 - ? number_of_tabs - 1 - : current_index - 1); + setCurrentIndex(current_index == 0 ? number_of_tabs - 1 : current_index - 1); } else if (event->angleDelta().y() < 0) { // Scroll to the RIGHT tab. - setCurrentIndex(current_index == number_of_tabs - 1 - ? 0 - : current_index + 1); + setCurrentIndex(current_index == number_of_tabs - 1 ? 0 : current_index + 1); } } } diff --git a/src/librssguard/gui/tabwidget.cpp b/src/librssguard/gui/tabwidget.cpp index 3512ada7b..2c53a4c6f 100644 --- a/src/librssguard/gui/tabwidget.cpp +++ b/src/librssguard/gui/tabwidget.cpp @@ -14,7 +14,6 @@ #include "miscellaneous/iconfactory.h" #include "miscellaneous/settings.h" #include "miscellaneous/textfactory.h" -#include "network-web/webfactory.h" #include #include diff --git a/src/librssguard/gui/toolbars/basetoolbar.cpp b/src/librssguard/gui/toolbars/basetoolbar.cpp index 88044c950..94eeb46ab 100644 --- a/src/librssguard/gui/toolbars/basetoolbar.cpp +++ b/src/librssguard/gui/toolbars/basetoolbar.cpp @@ -3,8 +3,6 @@ #include "gui/toolbars/basetoolbar.h" #include "definitions/definitions.h" -#include "gui/dialogs/formmain.h" -#include "miscellaneous/settings.h" #include diff --git a/src/librssguard/gui/toolbars/statusbar.cpp b/src/librssguard/gui/toolbars/statusbar.cpp index 899478792..21c171c53 100644 --- a/src/librssguard/gui/toolbars/statusbar.cpp +++ b/src/librssguard/gui/toolbars/statusbar.cpp @@ -7,7 +7,6 @@ #include "gui/reusable/progressbarwithtext.h" #include "gui/tabwidget.h" #include "miscellaneous/iconfactory.h" -#include "miscellaneous/mutex.h" #include #include diff --git a/src/librssguard/gui/toolbars/toolbareditor.cpp b/src/librssguard/gui/toolbars/toolbareditor.cpp index 2bec250c4..f2130bc72 100644 --- a/src/librssguard/gui/toolbars/toolbareditor.cpp +++ b/src/librssguard/gui/toolbars/toolbareditor.cpp @@ -2,14 +2,14 @@ #include "gui/toolbars/toolbareditor.h" -#include "gui/dialogs/formmain.h" #include "gui/toolbars/basetoolbar.h" +#include "miscellaneous/application.h" +#include "miscellaneous/iconfactory.h" #include #include -ToolBarEditor::ToolBarEditor(QWidget* parent) - : QWidget(parent), m_ui(new Ui::ToolBarEditor), m_toolBar(nullptr) { +ToolBarEditor::ToolBarEditor(QWidget* parent) : QWidget(parent), m_ui(new Ui::ToolBarEditor), m_toolBar(nullptr) { m_ui->setupUi(this); // Create connections. @@ -21,8 +21,14 @@ ToolBarEditor::ToolBarEditor(QWidget* parent) connect(m_ui->m_btnMoveActionUp, &QToolButton::clicked, this, &ToolBarEditor::moveActionUp); connect(m_ui->m_btnMoveActionDown, &QToolButton::clicked, this, &ToolBarEditor::moveActionDown); connect(m_ui->m_btnReset, &QToolButton::clicked, this, &ToolBarEditor::resetToolBar); - connect(m_ui->m_listAvailableActions, &QListWidget::itemSelectionChanged, this, &ToolBarEditor::updateActionsAvailability); - connect(m_ui->m_listActivatedActions, &QListWidget::itemSelectionChanged, this, &ToolBarEditor::updateActionsAvailability); + connect(m_ui->m_listAvailableActions, + &QListWidget::itemSelectionChanged, + this, + &ToolBarEditor::updateActionsAvailability); + connect(m_ui->m_listActivatedActions, + &QListWidget::itemSelectionChanged, + this, + &ToolBarEditor::updateActionsAvailability); connect(m_ui->m_listActivatedActions, &QListWidget::itemDoubleClicked, this, &ToolBarEditor::deleteSelectedAction); connect(m_ui->m_listAvailableActions, &QListWidget::itemDoubleClicked, this, &ToolBarEditor::addSelectedAction); @@ -68,9 +74,8 @@ void ToolBarEditor::loadEditor(const QList& activated_actions, const Q m_ui->m_listAvailableActions->clear(); for (const QAction* action : activated_actions) { - QListWidgetItem* action_item = new QListWidgetItem(action->icon(), - action->text().replace('&', QL1S("")), - m_ui->m_listActivatedActions); + QListWidgetItem* action_item = + new QListWidgetItem(action->icon(), action->text().replace('&', QL1S("")), m_ui->m_listActivatedActions); if (action->isSeparator()) { action_item->setData(Qt::ItemDataRole::UserRole, SEPARATOR_ACTION_NAME); @@ -103,9 +108,8 @@ void ToolBarEditor::loadEditor(const QList& activated_actions, const Q for (QAction* action : available_actions) { if (!activated_actions.contains(action)) { - QListWidgetItem* action_item = new QListWidgetItem(action->icon(), - action->text().replace('&', QL1S("")), - m_ui->m_listAvailableActions); + QListWidgetItem* action_item = + new QListWidgetItem(action->icon(), action->text().replace('&', QL1S("")), m_ui->m_listAvailableActions); if (action->isSeparator()) { action_item->setData(Qt::ItemDataRole::UserRole, QSL(SEPARATOR_ACTION_NAME)); @@ -140,12 +144,14 @@ bool ToolBarEditor::eventFilter(QObject* object, QEvent* event) { return true; } else if (key_event->key() == Qt::Key::Key_Down && - (key_event->modifiers() & Qt::KeyboardModifier::ControlModifier) == Qt::KeyboardModifier::ControlModifier) { + (key_event->modifiers() & Qt::KeyboardModifier::ControlModifier) == + Qt::KeyboardModifier::ControlModifier) { moveActionDown(); return true; } else if (key_event->key() == Qt::Key::Key_Up && - (key_event->modifiers() & Qt::KeyboardModifier::ControlModifier) == Qt::KeyboardModifier::ControlModifier) { + (key_event->modifiers() & Qt::KeyboardModifier::ControlModifier) == + Qt::KeyboardModifier::ControlModifier) { moveActionUp(); return true; } @@ -161,7 +167,8 @@ void ToolBarEditor::updateActionsAvailability() { m_ui->m_btnMoveActionUp->setEnabled(m_ui->m_listActivatedActions->selectedItems().size() == 1 && m_ui->m_listActivatedActions->currentRow() > 0); m_ui->m_btnMoveActionDown->setEnabled(m_ui->m_listActivatedActions->selectedItems().size() == 1 && - m_ui->m_listActivatedActions->currentRow() < m_ui->m_listActivatedActions->count() - 1); + m_ui->m_listActivatedActions->currentRow() < + m_ui->m_listActivatedActions->count() - 1); m_ui->m_btnAddSelectedAction->setEnabled(m_ui->m_listAvailableActions->selectedItems().size() > 0); } @@ -222,9 +229,9 @@ void ToolBarEditor::addSelectedAction() { if (items.size() == 1) { QListWidgetItem* selected_item = items.at(0); - m_ui->m_listActivatedActions->insertItem( - m_ui->m_listActivatedActions->currentRow() + 1, - m_ui->m_listAvailableActions->takeItem(m_ui->m_listAvailableActions->row(selected_item))); + m_ui->m_listActivatedActions + ->insertItem(m_ui->m_listActivatedActions->currentRow() + 1, + m_ui->m_listAvailableActions->takeItem(m_ui->m_listAvailableActions->row(selected_item))); m_ui->m_listActivatedActions->setCurrentRow(m_ui->m_listActivatedActions->currentRow() + 1); emit setupChanged(); } @@ -242,9 +249,9 @@ void ToolBarEditor::deleteSelectedAction() { updateActionsAvailability(); } else { - m_ui->m_listAvailableActions->insertItem( - m_ui->m_listAvailableActions->currentRow() + 1, - m_ui->m_listActivatedActions->takeItem(m_ui->m_listActivatedActions->row(selected_item))); + m_ui->m_listAvailableActions + ->insertItem(m_ui->m_listAvailableActions->currentRow() + 1, + m_ui->m_listActivatedActions->takeItem(m_ui->m_listActivatedActions->row(selected_item))); m_ui->m_listAvailableActions->sortItems(Qt::SortOrder::AscendingOrder); m_ui->m_listAvailableActions->setCurrentRow(m_ui->m_listAvailableActions->currentRow() + 1); } diff --git a/src/librssguard/gui/webbrowser.cpp b/src/librssguard/gui/webbrowser.cpp index b01480faf..af478371f 100644 --- a/src/librssguard/gui/webbrowser.cpp +++ b/src/librssguard/gui/webbrowser.cpp @@ -2,7 +2,6 @@ #include "gui/webbrowser.h" -#include "database/databasequeries.h" #include "gui/dialogs/formmain.h" #include "gui/messagebox.h" #include "gui/reusable/discoverfeedsbutton.h" @@ -15,7 +14,6 @@ #include "network-web/networkfactory.h" #include "network-web/readability.h" #include "network-web/webfactory.h" -#include "services/abstract/serviceroot.h" #include #include diff --git a/src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.cpp b/src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.cpp index 2fa266eb2..873ab7c88 100644 --- a/src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.cpp +++ b/src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.cpp @@ -4,7 +4,6 @@ #include "3rd-party/boolinq/boolinq.h" #include "gui/dialogs/formmain.h" -#include "gui/messagebox.h" #include "gui/webbrowser.h" #include "miscellaneous/application.h" #include "miscellaneous/externaltool.h" diff --git a/src/librssguard/gui/webviewers/webengine/webengineviewer.cpp b/src/librssguard/gui/webviewers/webengine/webengineviewer.cpp index a9eed64b7..46fa0d4d2 100644 --- a/src/librssguard/gui/webviewers/webengine/webengineviewer.cpp +++ b/src/librssguard/gui/webviewers/webengine/webengineviewer.cpp @@ -4,14 +4,12 @@ #include "definitions/definitions.h" #include "gui/dialogs/formmain.h" -#include "gui/tabwidget.h" #include "gui/webbrowser.h" #include "miscellaneous/application.h" #include "miscellaneous/externaltool.h" #include "miscellaneous/skinfactory.h" #include "network-web/adblock/adblockicon.h" #include "network-web/adblock/adblockmanager.h" -#include "network-web/networkfactory.h" #include "network-web/webengine/webenginepage.h" #include "network-web/webfactory.h" diff --git a/src/librssguard/miscellaneous/application.cpp b/src/librssguard/miscellaneous/application.cpp index d1d58a89a..7f7f46e3c 100644 --- a/src/librssguard/miscellaneous/application.cpp +++ b/src/librssguard/miscellaneous/application.cpp @@ -3,14 +3,21 @@ #include "miscellaneous/application.h" #include "3rd-party/boolinq/boolinq.h" + +#if defined(SYSTEM_SQLITE3) +#include +#else #include "3rd-party/sqlite/sqlite3.h" +#endif + +#include "3rd-party/sqlite/sqlite3.h" + +#include "core/feedsmodel.h" #include "dynamic-shortcuts/dynamicshortcuts.h" #include "exceptions/applicationexception.h" #include "gui/dialogs/formabout.h" #include "gui/dialogs/formlog.h" #include "gui/dialogs/formmain.h" -#include "gui/feedmessageviewer.h" -#include "gui/feedsview.h" #include "gui/messagebox.h" #include "gui/toolbars/statusbar.h" #include "gui/webviewers/qtextbrowser/textbrowserviewer.h" @@ -23,10 +30,6 @@ #include "network-web/adblock/adblockmanager.h" #include "network-web/webfactory.h" #include "services/abstract/serviceroot.h" -#include "services/owncloud/owncloudserviceentrypoint.h" -#include "services/standard/standardserviceentrypoint.h" -#include "services/standard/standardserviceroot.h" -#include "services/tt-rss/ttrssserviceentrypoint.h" #include diff --git a/src/librssguard/miscellaneous/autosaver.cpp b/src/librssguard/miscellaneous/autosaver.cpp index d091892b1..b512906b0 100644 --- a/src/librssguard/miscellaneous/autosaver.cpp +++ b/src/librssguard/miscellaneous/autosaver.cpp @@ -2,15 +2,15 @@ #include "miscellaneous/autosaver.h" +#include "definitions/definitions.h" + #include #include #include -#include "definitions/definitions.h" - AutoSaver::AutoSaver(QObject* parent, const QString& saving_slot, int max_wait_secs, int periodic_save_secs) - : QObject(parent), m_savingSlot(saving_slot), m_maxWaitMsecs(max_wait_secs * 1000), - m_periodicSaveMsecs(periodic_save_secs * 1000) { + : QObject(parent), m_maxWaitMsecs(max_wait_secs * 1000), m_periodicSaveMsecs(periodic_save_secs * 1000), + m_savingSlot(saving_slot) { Q_ASSERT(parent); connect(&m_timer, &QTimer::timeout, this, &AutoSaver::saveIfNeccessary); diff --git a/src/librssguard/miscellaneous/notificationfactory.cpp b/src/librssguard/miscellaneous/notificationfactory.cpp index 06725cbad..79d3be60f 100644 --- a/src/librssguard/miscellaneous/notificationfactory.cpp +++ b/src/librssguard/miscellaneous/notificationfactory.cpp @@ -4,7 +4,6 @@ #include "3rd-party/boolinq/boolinq.h" #include "definitions/definitions.h" -#include "exceptions/applicationexception.h" #include "miscellaneous/application.h" #include "miscellaneous/settings.h" @@ -58,7 +57,8 @@ void NotificationFactory::save(const QList& new_notifications, Set for (const auto& n : qAsConst(m_notifications)) { settings->setValue(GROUP(Notifications), QString::number(int(n.event())), - QStringList{ - n.balloonEnabled() ? QSL("1") : QSL("0"), n.soundPath(), QString::number(n.volume())}); + QStringList{n.balloonEnabled() ? QSL("1") : QSL("0"), + n.soundPath(), + QString::number(n.volume())}); } } diff --git a/src/librssguard/miscellaneous/settings.cpp b/src/librssguard/miscellaneous/settings.cpp index b382c93c1..90b4a537a 100644 --- a/src/librssguard/miscellaneous/settings.cpp +++ b/src/librssguard/miscellaneous/settings.cpp @@ -4,6 +4,7 @@ #include "miscellaneous/application.h" #include "miscellaneous/iofactory.h" + #include #include #include diff --git a/src/librssguard/miscellaneous/singleapplication.cpp b/src/librssguard/miscellaneous/singleapplication.cpp index 344636165..37b65d846 100644 --- a/src/librssguard/miscellaneous/singleapplication.cpp +++ b/src/librssguard/miscellaneous/singleapplication.cpp @@ -2,8 +2,6 @@ #include "miscellaneous/singleapplication.h" -#include "definitions/definitions.h" - #include #include #include diff --git a/src/librssguard/miscellaneous/skinfactory.cpp b/src/librssguard/miscellaneous/skinfactory.cpp index 3dc61d232..e3e50e1bc 100644 --- a/src/librssguard/miscellaneous/skinfactory.cpp +++ b/src/librssguard/miscellaneous/skinfactory.cpp @@ -2,7 +2,6 @@ #include "miscellaneous/skinfactory.h" -#include "exceptions/ioexception.h" #include "miscellaneous/application.h" #include "network-web/networkfactory.h" #include "services/abstract/rootitem.h" diff --git a/src/librssguard/miscellaneous/systemfactory.cpp b/src/librssguard/miscellaneous/systemfactory.cpp index 431a2c477..0eec0e116 100644 --- a/src/librssguard/miscellaneous/systemfactory.cpp +++ b/src/librssguard/miscellaneous/systemfactory.cpp @@ -8,7 +8,6 @@ #include "gui/dialogs/formupdate.h" #include "miscellaneous/application.h" #include "miscellaneous/systemfactory.h" -#include "network-web/networkfactory.h" #if defined(Q_OS_WIN) #include diff --git a/src/librssguard/network-web/adblock/adblockrequestinfo.cpp b/src/librssguard/network-web/adblock/adblockrequestinfo.cpp index 33c3dd0d9..0ead41c53 100644 --- a/src/librssguard/network-web/adblock/adblockrequestinfo.cpp +++ b/src/librssguard/network-web/adblock/adblockrequestinfo.cpp @@ -8,7 +8,6 @@ AdblockRequestInfo::AdblockRequestInfo(const QWebEngineUrlRequestInfo& webengine_info) { initialize(webengine_info); } - #endif AdblockRequestInfo::AdblockRequestInfo(const QUrl& url) { diff --git a/src/librssguard/network-web/basenetworkaccessmanager.cpp b/src/librssguard/network-web/basenetworkaccessmanager.cpp index 70767c3d6..deb57f05d 100644 --- a/src/librssguard/network-web/basenetworkaccessmanager.cpp +++ b/src/librssguard/network-web/basenetworkaccessmanager.cpp @@ -3,7 +3,6 @@ #include "network-web/basenetworkaccessmanager.h" #include "miscellaneous/application.h" -#include "miscellaneous/textfactory.h" #include "network-web/webfactory.h" #include diff --git a/src/librssguard/network-web/cookiejar.cpp b/src/librssguard/network-web/cookiejar.cpp index 11a58fad0..cac9a03d6 100644 --- a/src/librssguard/network-web/cookiejar.cpp +++ b/src/librssguard/network-web/cookiejar.cpp @@ -2,10 +2,8 @@ #include "network-web/cookiejar.h" -#include "3rd-party/boolinq/boolinq.h" #include "definitions/definitions.h" #include "miscellaneous/application.h" -#include "miscellaneous/iofactory.h" #include "miscellaneous/settings.h" #include "network-web/webfactory.h" diff --git a/src/librssguard/network-web/downloader.cpp b/src/librssguard/network-web/downloader.cpp index 211e75cef..4693595b2 100644 --- a/src/librssguard/network-web/downloader.cpp +++ b/src/librssguard/network-web/downloader.cpp @@ -3,7 +3,6 @@ #include "network-web/downloader.h" #include "miscellaneous/application.h" -#include "miscellaneous/iofactory.h" #include "network-web/cookiejar.h" #include "network-web/networkfactory.h" #include "network-web/silentnetworkaccessmanager.h" diff --git a/src/librssguard/network-web/networkfactory.cpp b/src/librssguard/network-web/networkfactory.cpp index 6fc936a33..f99d644d9 100644 --- a/src/librssguard/network-web/networkfactory.cpp +++ b/src/librssguard/network-web/networkfactory.cpp @@ -3,9 +3,7 @@ #include "network-web/networkfactory.h" #include "definitions/definitions.h" -#include "miscellaneous/settings.h" #include "network-web/downloader.h" -#include "network-web/silentnetworkaccessmanager.h" #include #include diff --git a/src/librssguard/network-web/oauth2service.cpp b/src/librssguard/network-web/oauth2service.cpp index ad072af31..35908ec31 100644 --- a/src/librssguard/network-web/oauth2service.cpp +++ b/src/librssguard/network-web/oauth2service.cpp @@ -25,7 +25,6 @@ #include "network-web/oauth2service.h" #include "definitions/definitions.h" -#include "gui/messagebox.h" #include "miscellaneous/application.h" #include "network-web/networkfactory.h" #include "network-web/oauthhttphandler.h" diff --git a/src/librssguard/network-web/readability.cpp b/src/librssguard/network-web/readability.cpp index 716c85f3f..11c8898b9 100644 --- a/src/librssguard/network-web/readability.cpp +++ b/src/librssguard/network-web/readability.cpp @@ -4,7 +4,6 @@ #include "3rd-party/boolinq/boolinq.h" #include "exceptions/applicationexception.h" -#include "gui/messagebox.h" #include "miscellaneous/application.h" #include @@ -35,10 +34,10 @@ void Readability::onPackageReady(const QList& pkgs, boo m_modulesInstalling = false; qApp->showGuiMessage(Notification::Event::NodePackageUpdated, - { tr("Packages for reader mode are installed"), - tr("You can now use reader mode!"), - QSystemTrayIcon::MessageIcon::Information }, - { true, true, false }); + {tr("Packages for reader mode are installed"), + tr("You can now use reader mode!"), + QSystemTrayIcon::MessageIcon::Information}, + {true, true, false}); // Emit this just to allow readability again for user. emit htmlReadabled({}); @@ -56,10 +55,10 @@ void Readability::onPackageError(const QList& pkgs, con m_modulesInstalled = m_modulesInstalling = false; qApp->showGuiMessage(Notification::Event::NodePackageUpdated, - { tr("Packages for reader mode are NOT installed"), - tr("There is error: %1").arg(error), - QSystemTrayIcon::MessageIcon::Critical }, - { true, true, false }); + {tr("Packages for reader mode are NOT installed"), + tr("There is error: %1").arg(error), + QSystemTrayIcon::MessageIcon::Critical}, + {true, true, false}); // Emit this just to allow readability again for user. emit htmlReadabled({}); @@ -68,25 +67,24 @@ void Readability::onPackageError(const QList& pkgs, con void Readability::makeHtmlReadable(const QString& html, const QString& base_url) { if (!m_modulesInstalled) { try { - NodeJs::PackageStatus stReadability = qApp->nodejs()->packageStatus({ QSL(READABILITY_PACKAGE), - QSL(READABILITY_VERSION) }); - NodeJs::PackageStatus stJsdom = qApp->nodejs()->packageStatus({ QSL(JSDOM_PACKAGE), - QSL(JSDOM_VERSION) }); + NodeJs::PackageStatus stReadability = + qApp->nodejs()->packageStatus({QSL(READABILITY_PACKAGE), QSL(READABILITY_VERSION)}); + NodeJs::PackageStatus stJsdom = qApp->nodejs()->packageStatus({QSL(JSDOM_PACKAGE), QSL(JSDOM_VERSION)}); - if (stReadability != NodeJs::PackageStatus::UpToDate || - stJsdom != NodeJs::PackageStatus::UpToDate) { + if (stReadability != NodeJs::PackageStatus::UpToDate || stJsdom != NodeJs::PackageStatus::UpToDate) { if (!m_modulesInstalling) { // We make sure to update modules. m_modulesInstalling = true; qApp->showGuiMessage(Notification::Event::NodePackageUpdated, - { tr("Node.js libraries not installed"), - tr("%1 will now install some needed libraries, this will take only a few seconds. " - "You will be notified when installation is complete.").arg(QSL(APP_NAME)), - QSystemTrayIcon::MessageIcon::Warning }, - { true, true, false }); - qApp->nodejs()->installPackages({ { QSL(READABILITY_PACKAGE), QSL(READABILITY_VERSION) }, - { QSL(JSDOM_PACKAGE), QSL(JSDOM_VERSION) } }); + {tr("Node.js libraries not installed"), + tr("%1 will now install some needed libraries, this will take only a few seconds. " + "You will be notified when installation is complete.") + .arg(QSL(APP_NAME)), + QSystemTrayIcon::MessageIcon::Warning}, + {true, true, false}); + qApp->nodejs()->installPackages({{QSL(READABILITY_PACKAGE), QSL(READABILITY_VERSION)}, + {QSL(JSDOM_PACKAGE), QSL(JSDOM_VERSION)}}); } return; @@ -97,11 +95,11 @@ void Readability::makeHtmlReadable(const QString& html, const QString& base_url) } catch (const ApplicationException& ex) { qApp->showGuiMessage(Notification::Event::NodePackageUpdated, - { tr("Node.js libraries not installed"), - tr("Node.js is not configured properly. Go to \"Settings\" -> \"Node.js\" and check " - "if your Node.js is properly configured."), - QSystemTrayIcon::MessageIcon::Critical }, - { true, true, false }); + {tr("Node.js libraries not installed"), + tr("Node.js is not configured properly. Go to \"Settings\" -> \"Node.js\" and check " + "if your Node.js is properly configured."), + QSystemTrayIcon::MessageIcon::Critical}, + {true, true, false}); qCriticalNN << LOGSEC_CORE << "Failed to check for Node.js package status:" << QUOTE_W_SPACE_DOT(ex.message()); @@ -110,9 +108,9 @@ void Readability::makeHtmlReadable(const QString& html, const QString& base_url) } } - QString temp_script = QDir::toNativeSeparators(IOFactory::getSystemFolder(QStandardPaths::StandardLocation::TempLocation)) + - QDir::separator() + - QSL("readabilize-article.js"); + QString temp_script = + QDir::toNativeSeparators(IOFactory::getSystemFolder(QStandardPaths::StandardLocation::TempLocation)) + + QDir::separator() + QSL("readabilize-article.js"); if (!IOFactory::copyFile(QSL(":/scripts/readability/readabilize-article.js"), temp_script)) { qWarningNN << LOGSEC_ADBLOCK << "Failed to copy Readability script to TEMP."; @@ -120,11 +118,12 @@ void Readability::makeHtmlReadable(const QString& html, const QString& base_url) QProcess* proc = new QProcess(this); - connect(proc, QOverload::of(&QProcess::finished), this, &Readability::onReadabilityFinished); + connect(proc, + QOverload::of(&QProcess::finished), + this, + &Readability::onReadabilityFinished); - qApp->nodejs()->runScript(proc, - temp_script, - { base_url }); + qApp->nodejs()->runScript(proc, temp_script, {base_url}); proc->write(html.toUtf8()); proc->closeWriteChannel(); @@ -133,8 +132,7 @@ void Readability::makeHtmlReadable(const QString& html, const QString& base_url) void Readability::onReadabilityFinished(int exit_code, QProcess::ExitStatus exit_status) { QProcess* proc = qobject_cast(sender()); - if (exit_status == QProcess::ExitStatus::NormalExit && - exit_code == EXIT_SUCCESS) { + if (exit_status == QProcess::ExitStatus::NormalExit && exit_code == EXIT_SUCCESS) { emit htmlReadabled(QString::fromUtf8(proc->readAllStandardOutput())); } else { diff --git a/src/librssguard/network-web/silentnetworkaccessmanager.cpp b/src/librssguard/network-web/silentnetworkaccessmanager.cpp index c29977b87..00b37dd2c 100644 --- a/src/librssguard/network-web/silentnetworkaccessmanager.cpp +++ b/src/librssguard/network-web/silentnetworkaccessmanager.cpp @@ -2,15 +2,17 @@ #include "network-web/silentnetworkaccessmanager.h" -#include "miscellaneous/application.h" +#include "definitions/definitions.h" #include #include -SilentNetworkAccessManager::SilentNetworkAccessManager(QObject* parent) - : BaseNetworkAccessManager(parent) { - connect(this, &SilentNetworkAccessManager::authenticationRequired, - this, &SilentNetworkAccessManager::onAuthenticationRequired, Qt::DirectConnection); +SilentNetworkAccessManager::SilentNetworkAccessManager(QObject* parent) : BaseNetworkAccessManager(parent) { + connect(this, + &SilentNetworkAccessManager::authenticationRequired, + this, + &SilentNetworkAccessManager::onAuthenticationRequired, + Qt::DirectConnection); } SilentNetworkAccessManager::~SilentNetworkAccessManager() { @@ -23,18 +25,14 @@ void SilentNetworkAccessManager::onAuthenticationRequired(QNetworkReply* reply, authenticator->setUser(reply->property("username").toString()); authenticator->setPassword(reply->property("password").toString()); reply->setProperty("authentication-given", true); - qDebugNN << LOGSEC_NETWORK - << "URL" - << QUOTE_W_SPACE(reply->url().toString()) + qDebugNN << LOGSEC_NETWORK << "URL" << QUOTE_W_SPACE(reply->url().toString()) << "requested authentication and got it."; } else { reply->setProperty("authentication-given", false); // Authentication is required but this item does not contain it. - qWarningNN << LOGSEC_NETWORK - << "Item" - << QUOTE_W_SPACE(reply->url().toString()) + qWarningNN << LOGSEC_NETWORK << "Item" << QUOTE_W_SPACE(reply->url().toString()) << "requested authentication but username/password is not available."; } } diff --git a/src/librssguard/network-web/webengine/webenginepage.cpp b/src/librssguard/network-web/webengine/webenginepage.cpp index dffe8c033..e517679eb 100644 --- a/src/librssguard/network-web/webengine/webenginepage.cpp +++ b/src/librssguard/network-web/webengine/webenginepage.cpp @@ -8,8 +8,6 @@ #include "network-web/adblock/adblockmanager.h" #include "network-web/adblock/adblockrequestinfo.h" #include "network-web/webfactory.h" -#include "services/abstract/rootitem.h" -#include "services/abstract/serviceroot.h" #include #include diff --git a/src/librssguard/network-web/webfactory.cpp b/src/librssguard/network-web/webfactory.cpp index c4eabca61..c22895c06 100644 --- a/src/librssguard/network-web/webfactory.cpp +++ b/src/librssguard/network-web/webfactory.cpp @@ -5,7 +5,6 @@ #include "gui/messagebox.h" #include "miscellaneous/application.h" #include "miscellaneous/iconfactory.h" -#include "network-web/adblock/adblockicon.h" #include "network-web/adblock/adblockmanager.h" #include "network-web/cookiejar.h" #include "network-web/readability.h" diff --git a/src/librssguard/services/abstract/cacheforserviceroot.cpp b/src/librssguard/services/abstract/cacheforserviceroot.cpp index 9487d0d9b..f6680b1d7 100644 --- a/src/librssguard/services/abstract/cacheforserviceroot.cpp +++ b/src/librssguard/services/abstract/cacheforserviceroot.cpp @@ -2,9 +2,7 @@ #include "services/abstract/cacheforserviceroot.h" -#include "3rd-party/boolinq/boolinq.h" #include "miscellaneous/application.h" -#include "miscellaneous/mutex.h" #include "services/abstract/label.h" #include diff --git a/src/librssguard/services/abstract/category.cpp b/src/librssguard/services/abstract/category.cpp index bff9a3f8c..1a606a9e8 100644 --- a/src/librssguard/services/abstract/category.cpp +++ b/src/librssguard/services/abstract/category.cpp @@ -4,8 +4,6 @@ #include "database/databasequeries.h" #include "miscellaneous/application.h" -#include "miscellaneous/iconfactory.h" -#include "miscellaneous/textfactory.h" #include "services/abstract/cacheforserviceroot.h" #include "services/abstract/feed.h" #include "services/abstract/serviceroot.h" diff --git a/src/librssguard/services/abstract/feed.cpp b/src/librssguard/services/abstract/feed.cpp index 08611f449..cdcc99199 100644 --- a/src/librssguard/services/abstract/feed.cpp +++ b/src/librssguard/services/abstract/feed.cpp @@ -7,16 +7,10 @@ #include "definitions/definitions.h" #include "miscellaneous/application.h" #include "miscellaneous/feedreader.h" -#include "miscellaneous/iconfactory.h" -#include "miscellaneous/mutex.h" #include "miscellaneous/textfactory.h" #include "services/abstract/cacheforserviceroot.h" #include "services/abstract/gui/formfeeddetails.h" -#include "services/abstract/importantnode.h" -#include "services/abstract/labelsnode.h" -#include "services/abstract/recyclebin.h" #include "services/abstract/serviceroot.h" -#include "services/abstract/unreadnode.h" Feed::Feed(RootItem* parent) : RootItem(parent), m_source(QString()), m_status(Status::Normal), m_statusString(QString()), diff --git a/src/librssguard/services/abstract/gui/formcategorydetails.cpp b/src/librssguard/services/abstract/gui/formcategorydetails.cpp index b9ac572d8..f94946299 100644 --- a/src/librssguard/services/abstract/gui/formcategorydetails.cpp +++ b/src/librssguard/services/abstract/gui/formcategorydetails.cpp @@ -3,15 +3,11 @@ #include "services/abstract/gui/formcategorydetails.h" #include "3rd-party/boolinq/boolinq.h" -#include "core/feedsmodel.h" #include "database/databasequeries.h" #include "definitions/definitions.h" #include "exceptions/applicationexception.h" -#include "gui/feedsview.h" #include "gui/guiutilities.h" -#include "gui/messagebox.h" #include "gui/reusable/baselineedit.h" -#include "gui/systemtrayicon.h" #include "miscellaneous/iconfactory.h" #include "services/abstract/category.h" #include "services/abstract/rootitem.h" diff --git a/src/librssguard/services/abstract/gui/formfeeddetails.cpp b/src/librssguard/services/abstract/gui/formfeeddetails.cpp index 42952c868..fe691542a 100644 --- a/src/librssguard/services/abstract/gui/formfeeddetails.cpp +++ b/src/librssguard/services/abstract/gui/formfeeddetails.cpp @@ -2,21 +2,13 @@ #include "services/abstract/gui/formfeeddetails.h" -#include "core/feedsmodel.h" #include "database/databasequeries.h" #include "definitions/definitions.h" #include "exceptions/applicationexception.h" #include "gui/guiutilities.h" -#include "gui/messagebox.h" -#include "gui/reusable/baselineedit.h" -#include "gui/systemtrayicon.h" #include "miscellaneous/iconfactory.h" #include "miscellaneous/textfactory.h" -#include "network-web/networkfactory.h" -#include "services/abstract/category.h" #include "services/abstract/rootitem.h" -#include "services/standard/standardfeed.h" -#include "services/standard/standardserviceroot.h" #include #include diff --git a/src/librssguard/services/abstract/label.cpp b/src/librssguard/services/abstract/label.cpp index 4afee9dc1..82000816a 100644 --- a/src/librssguard/services/abstract/label.cpp +++ b/src/librssguard/services/abstract/label.cpp @@ -7,7 +7,6 @@ #include "miscellaneous/application.h" #include "services/abstract/cacheforserviceroot.h" #include "services/abstract/gui/formaddeditlabel.h" -#include "services/abstract/labelsnode.h" #include "services/abstract/serviceroot.h" #include diff --git a/src/librssguard/services/abstract/recyclebin.cpp b/src/librssguard/services/abstract/recyclebin.cpp index c6419036f..6ca0b616d 100644 --- a/src/librssguard/services/abstract/recyclebin.cpp +++ b/src/librssguard/services/abstract/recyclebin.cpp @@ -6,7 +6,6 @@ #include "gui/messagebox.h" #include "miscellaneous/application.h" #include "miscellaneous/iconfactory.h" -#include "miscellaneous/textfactory.h" #include "services/abstract/cacheforserviceroot.h" #include "services/abstract/serviceroot.h" diff --git a/src/librssguard/services/abstract/rootitem.cpp b/src/librssguard/services/abstract/rootitem.cpp index b4c5518fa..0b5dd5086 100644 --- a/src/librssguard/services/abstract/rootitem.cpp +++ b/src/librssguard/services/abstract/rootitem.cpp @@ -8,7 +8,6 @@ #include "services/abstract/category.h" #include "services/abstract/feed.h" #include "services/abstract/label.h" -#include "services/abstract/recyclebin.h" #include "services/abstract/search.h" #include "services/abstract/serviceroot.h" diff --git a/src/librssguard/services/abstract/search.cpp b/src/librssguard/services/abstract/search.cpp index 2199c4853..90876b6aa 100755 --- a/src/librssguard/services/abstract/search.cpp +++ b/src/librssguard/services/abstract/search.cpp @@ -7,7 +7,6 @@ #include "miscellaneous/application.h" #include "services/abstract/cacheforserviceroot.h" #include "services/abstract/gui/formaddeditprobe.h" -#include "services/abstract/labelsnode.h" #include "services/abstract/serviceroot.h" #include diff --git a/src/librssguard/services/abstract/serviceroot.cpp b/src/librssguard/services/abstract/serviceroot.cpp index 04b1829d2..8d21858d0 100644 --- a/src/librssguard/services/abstract/serviceroot.cpp +++ b/src/librssguard/services/abstract/serviceroot.cpp @@ -3,7 +3,6 @@ #include "services/abstract/serviceroot.h" #include "3rd-party/boolinq/boolinq.h" -#include "core/feedsmodel.h" #include "core/messagesmodel.h" #include "database/databasequeries.h" #include "exceptions/applicationexception.h" diff --git a/src/librssguard/services/feedly/feedlyentrypoint.cpp b/src/librssguard/services/feedly/feedlyentrypoint.cpp index fb4b0db1c..cbd479ed7 100644 --- a/src/librssguard/services/feedly/feedlyentrypoint.cpp +++ b/src/librssguard/services/feedly/feedlyentrypoint.cpp @@ -6,7 +6,6 @@ #include "definitions/definitions.h" #include "miscellaneous/application.h" #include "miscellaneous/iconfactory.h" -#include "services/feedly/definitions.h" #include "services/feedly/feedlyserviceroot.h" #include "services/feedly/gui/formeditfeedlyaccount.h" diff --git a/src/librssguard/services/feedly/feedlynetwork.cpp b/src/librssguard/services/feedly/feedlynetwork.cpp index 5febfa88b..f000faa95 100644 --- a/src/librssguard/services/feedly/feedlynetwork.cpp +++ b/src/librssguard/services/feedly/feedlynetwork.cpp @@ -3,7 +3,6 @@ #include "services/feedly/feedlynetwork.h" #include "3rd-party/boolinq/boolinq.h" -#include "database/databasequeries.h" #include "exceptions/networkexception.h" #include "miscellaneous/application.h" #include "network-web/networkfactory.h" diff --git a/src/librssguard/services/feedly/feedlyserviceroot.cpp b/src/librssguard/services/feedly/feedlyserviceroot.cpp index 279e6acb0..c72e59bec 100644 --- a/src/librssguard/services/feedly/feedlyserviceroot.cpp +++ b/src/librssguard/services/feedly/feedlyserviceroot.cpp @@ -8,12 +8,8 @@ #include "exceptions/feedfetchexception.h" #include "exceptions/networkexception.h" #include "miscellaneous/application.h" -#include "miscellaneous/iconfactory.h" -#include "miscellaneous/mutex.h" #include "miscellaneous/textfactory.h" -#include "services/abstract/importantnode.h" #include "services/abstract/labelsnode.h" -#include "services/abstract/recyclebin.h" #include "services/feedly/definitions.h" #include "services/feedly/feedlyentrypoint.h" #include "services/feedly/feedlynetwork.h" diff --git a/src/librssguard/services/feedly/gui/feedlyaccountdetails.cpp b/src/librssguard/services/feedly/gui/feedlyaccountdetails.cpp index b1b191a02..ca9e7fcf4 100644 --- a/src/librssguard/services/feedly/gui/feedlyaccountdetails.cpp +++ b/src/librssguard/services/feedly/gui/feedlyaccountdetails.cpp @@ -4,9 +4,7 @@ #include "definitions/definitions.h" #include "exceptions/networkexception.h" -#include "gui/guiutilities.h" #include "miscellaneous/application.h" -#include "miscellaneous/systemfactory.h" #include "network-web/webfactory.h" #include "services/feedly/definitions.h" #include "services/feedly/feedlynetwork.h" @@ -33,13 +31,15 @@ FeedlyAccountDetails::FeedlyAccountDetails(QWidget* parent) : QWidget(parent), m #if defined(FEEDLY_OFFICIAL_SUPPORT) m_ui.m_lblInfo->setHelpText(tr("Your %1 build has official Feedly support. You do not have to use \"developer access " - "token\". You can therefore leave corresponding field empty.").arg(QSL(APP_NAME)), + "token\". You can therefore leave corresponding field empty.") + .arg(QSL(APP_NAME)), false); #else m_ui.m_lblInfo->setHelpText(tr("Your %1 does not offer official Feedly support, thus you must " "authorize via special authorization code called \"developer access token\". " "These tokens are usually valid only for 1 month and allow only 250 API calls " - "each day.").arg(QSL(APP_NAME)), + "each day.") + .arg(QSL(APP_NAME)), true); #endif @@ -57,8 +57,10 @@ FeedlyAccountDetails::FeedlyAccountDetails(QWidget* parent) : QWidget(parent), m connect(m_ui.m_btnGetToken, &QPushButton::clicked, this, &FeedlyAccountDetails::getDeveloperAccessToken); connect(m_ui.m_txtUsername->lineEdit(), &BaseLineEdit::textChanged, this, &FeedlyAccountDetails::onUsernameChanged); - connect(m_ui.m_txtDeveloperAccessToken->lineEdit(), &BaseLineEdit::textChanged, - this, &FeedlyAccountDetails::onDeveloperAccessTokenChanged); + connect(m_ui.m_txtDeveloperAccessToken->lineEdit(), + &BaseLineEdit::textChanged, + this, + &FeedlyAccountDetails::onDeveloperAccessTokenChanged); setTabOrder(m_ui.m_txtUsername->lineEdit(), m_ui.m_btnGetToken); setTabOrder(m_ui.m_btnGetToken, m_ui.m_txtDeveloperAccessToken->lineEdit()); @@ -115,9 +117,7 @@ void FeedlyAccountDetails::onAuthGranted() { tr("Your access was approved.")); } catch (const ApplicationException& ex) { - qCriticalNN << LOGSEC_FEEDLY - << "Failed to obtain profile with error:" - << QUOTE_W_SPACE_DOT(ex.message()); + qCriticalNN << LOGSEC_FEEDLY << "Failed to obtain profile with error:" << QUOTE_W_SPACE_DOT(ex.message()); } } diff --git a/src/librssguard/services/feedly/gui/formeditfeedlyaccount.cpp b/src/librssguard/services/feedly/gui/formeditfeedlyaccount.cpp index 61474740d..194a33fb1 100644 --- a/src/librssguard/services/feedly/gui/formeditfeedlyaccount.cpp +++ b/src/librssguard/services/feedly/gui/formeditfeedlyaccount.cpp @@ -2,10 +2,7 @@ #include "services/feedly/gui/formeditfeedlyaccount.h" -#include "gui/guiutilities.h" #include "miscellaneous/iconfactory.h" -#include "network-web/networkfactory.h" -#include "services/feedly/definitions.h" #include "services/feedly/feedlynetwork.h" #include "services/feedly/feedlyserviceroot.h" #include "services/feedly/gui/feedlyaccountdetails.h" @@ -34,9 +31,12 @@ void FormEditFeedlyAccount::apply() { m_details->m_ui.m_txtUsername->lineEdit()->text() != account()->network()->username(); account()->network()->setUsername(m_details->m_ui.m_txtUsername->lineEdit()->text()); - account()->network()->setDownloadOnlyUnreadMessages(m_details->m_ui.m_checkDownloadOnlyUnreadMessages->isChecked()); + account() + ->network() + ->setDownloadOnlyUnreadMessages(m_details->m_ui.m_checkDownloadOnlyUnreadMessages->isChecked()); account()->network()->setBatchSize(m_details->m_ui.m_spinLimitMessages->value()); - account()->network()->setDeveloperAccessToken(m_details->m_ui.m_txtDeveloperAccessToken->lineEdit()->text()); + account()->network()->setDeveloperAccessToken(m_details->m_ui.m_txtDeveloperAccessToken->lineEdit() + ->text()); account()->network()->setIntelligentSynchronization(m_details->m_ui.m_cbNewAlgorithm->isChecked()); account()->saveAccountDataToDatabase(); @@ -60,8 +60,10 @@ void FormEditFeedlyAccount::loadAccountData() { #endif m_details->m_ui.m_txtUsername->lineEdit()->setText(account()->network()->username()); - m_details->m_ui.m_txtDeveloperAccessToken->lineEdit()->setText(account()->network()->developerAccessToken()); - m_details->m_ui.m_checkDownloadOnlyUnreadMessages->setChecked(account()->network()->downloadOnlyUnreadMessages()); + m_details->m_ui.m_txtDeveloperAccessToken->lineEdit() + ->setText(account()->network()->developerAccessToken()); + m_details->m_ui.m_checkDownloadOnlyUnreadMessages + ->setChecked(account()->network()->downloadOnlyUnreadMessages()); m_details->m_ui.m_spinLimitMessages->setValue(account()->network()->batchSize()); m_details->m_ui.m_cbNewAlgorithm->setChecked(account()->network()->intelligentSynchronization()); } diff --git a/src/librssguard/services/gmail/gmailentrypoint.cpp b/src/librssguard/services/gmail/gmailentrypoint.cpp index 46cdc5388..8871457cd 100644 --- a/src/librssguard/services/gmail/gmailentrypoint.cpp +++ b/src/librssguard/services/gmail/gmailentrypoint.cpp @@ -6,7 +6,6 @@ #include "definitions/definitions.h" #include "miscellaneous/application.h" #include "miscellaneous/iconfactory.h" -#include "services/gmail/definitions.h" #include "services/gmail/gmailserviceroot.h" #include "services/gmail/gui/formeditgmailaccount.h" diff --git a/src/librssguard/services/gmail/gmailnetworkfactory.cpp b/src/librssguard/services/gmail/gmailnetworkfactory.cpp index b872a76b4..43369333a 100644 --- a/src/librssguard/services/gmail/gmailnetworkfactory.cpp +++ b/src/librssguard/services/gmail/gmailnetworkfactory.cpp @@ -7,15 +7,10 @@ #include "definitions/definitions.h" #include "exceptions/applicationexception.h" #include "exceptions/networkexception.h" -#include "gui/dialogs/formmain.h" -#include "gui/tabwidget.h" #include "miscellaneous/application.h" #include "miscellaneous/textfactory.h" #include "network-web/networkfactory.h" #include "network-web/oauth2service.h" -#include "network-web/silentnetworkaccessmanager.h" -#include "network-web/webfactory.h" -#include "services/abstract/category.h" #include "services/abstract/labelsnode.h" #include "services/gmail/definitions.h" #include "services/gmail/gmailserviceroot.h" diff --git a/src/librssguard/services/gmail/gmailserviceroot.cpp b/src/librssguard/services/gmail/gmailserviceroot.cpp index ed298876f..944fbbcf7 100644 --- a/src/librssguard/services/gmail/gmailserviceroot.cpp +++ b/src/librssguard/services/gmail/gmailserviceroot.cpp @@ -7,9 +7,7 @@ #include "miscellaneous/application.h" #include "miscellaneous/iconfactory.h" #include "network-web/oauth2service.h" -#include "services/abstract/importantnode.h" #include "services/abstract/labelsnode.h" -#include "services/abstract/recyclebin.h" #include "services/gmail/definitions.h" #include "services/gmail/gmailentrypoint.h" #include "services/gmail/gmailnetworkfactory.h" diff --git a/src/librssguard/services/gmail/gui/emailpreviewer.cpp b/src/librssguard/services/gmail/gui/emailpreviewer.cpp index b00ff50ab..c6435e12a 100644 --- a/src/librssguard/services/gmail/gui/emailpreviewer.cpp +++ b/src/librssguard/services/gmail/gui/emailpreviewer.cpp @@ -6,7 +6,6 @@ #include "gui/messagebox.h" #include "miscellaneous/application.h" #include "miscellaneous/iconfactory.h" -#include "network-web/oauth2service.h" #include "services/gmail/definitions.h" #include "services/gmail/gmailnetworkfactory.h" #include "services/gmail/gmailserviceroot.h" diff --git a/src/librssguard/services/gmail/gui/formeditgmailaccount.cpp b/src/librssguard/services/gmail/gui/formeditgmailaccount.cpp index 941784c73..c722cad8c 100644 --- a/src/librssguard/services/gmail/gui/formeditgmailaccount.cpp +++ b/src/librssguard/services/gmail/gui/formeditgmailaccount.cpp @@ -2,12 +2,9 @@ #include "services/gmail/gui/formeditgmailaccount.h" -#include "gui/guiutilities.h" #include "miscellaneous/application.h" #include "miscellaneous/iconfactory.h" #include "network-web/oauth2service.h" -#include "network-web/webfactory.h" -#include "services/gmail/definitions.h" #include "services/gmail/gmailserviceroot.h" #include "services/gmail/gui/gmailaccountdetails.h" @@ -26,7 +23,7 @@ void FormEditGmailAccount::apply() { FormAccountDetails::apply(); bool using_another_acc = - m_details->m_ui.m_txtUsername->lineEdit()->text() !=account()->network()->username(); + m_details->m_ui.m_txtUsername->lineEdit()->text() != account()->network()->username(); // Make sure that the data copied from GUI are used for brand new login. account()->network()->oauth()->logout(false); @@ -37,7 +34,8 @@ void FormEditGmailAccount::apply() { account()->network()->setUsername(m_details->m_ui.m_txtUsername->lineEdit()->text()); account()->network()->setBatchSize(m_details->m_ui.m_spinLimitMessages->value()); - account()->network()->setDownloadOnlyUnreadMessages(m_details->m_ui.m_cbDownloadOnlyUnreadMessages->isChecked()); + account()->network()->setDownloadOnlyUnreadMessages(m_details->m_ui.m_cbDownloadOnlyUnreadMessages + ->isChecked()); account()->saveAccountDataToDatabase(); accept(); @@ -64,5 +62,6 @@ void FormEditGmailAccount::loadAccountData() { m_details->m_ui.m_txtUsername->lineEdit()->setText(account()->network()->username()); m_details->m_ui.m_spinLimitMessages->setValue(account()->network()->batchSize()); - m_details->m_ui.m_cbDownloadOnlyUnreadMessages->setChecked(account()->network()->downloadOnlyUnreadMessages()); + m_details->m_ui.m_cbDownloadOnlyUnreadMessages + ->setChecked(account()->network()->downloadOnlyUnreadMessages()); } diff --git a/src/librssguard/services/gmail/gui/gmailaccountdetails.cpp b/src/librssguard/services/gmail/gui/gmailaccountdetails.cpp index 3c06d2da8..c513abf3b 100644 --- a/src/librssguard/services/gmail/gui/gmailaccountdetails.cpp +++ b/src/librssguard/services/gmail/gui/gmailaccountdetails.cpp @@ -3,15 +3,13 @@ #include "services/gmail/gui/gmailaccountdetails.h" #include "exceptions/applicationexception.h" -#include "gui/guiutilities.h" #include "miscellaneous/application.h" #include "network-web/oauth2service.h" #include "network-web/webfactory.h" #include "services/gmail/definitions.h" #include "services/gmail/gmailnetworkfactory.h" -GmailAccountDetails::GmailAccountDetails(QWidget* parent) - : QWidget(parent), m_oauth(nullptr), m_lastProxy({}) { +GmailAccountDetails::GmailAccountDetails(QWidget* parent) : QWidget(parent), m_oauth(nullptr), m_lastProxy({}) { m_ui.setupUi(this); #if defined(GMAIL_OFFICIAL_SUPPORT) @@ -100,9 +98,7 @@ void GmailAccountDetails::onAuthGranted() { m_ui.m_txtUsername->lineEdit()->setText(resp[QSL("emailAddress")].toString()); } catch (const ApplicationException& ex) { - qCriticalNN << LOGSEC_GMAIL - << "Failed to obtain profile with error:" - << QUOTE_W_SPACE_DOT(ex.message()); + qCriticalNN << LOGSEC_GMAIL << "Failed to obtain profile with error:" << QUOTE_W_SPACE_DOT(ex.message()); } } diff --git a/src/librssguard/services/greader/greaderentrypoint.cpp b/src/librssguard/services/greader/greaderentrypoint.cpp index 4713097be..950f54840 100644 --- a/src/librssguard/services/greader/greaderentrypoint.cpp +++ b/src/librssguard/services/greader/greaderentrypoint.cpp @@ -6,7 +6,6 @@ #include "definitions/definitions.h" #include "miscellaneous/application.h" #include "miscellaneous/iconfactory.h" -#include "services/greader/definitions.h" #include "services/greader/greaderserviceroot.h" #include "services/greader/gui/formeditgreaderaccount.h" diff --git a/src/librssguard/services/greader/greaderserviceroot.cpp b/src/librssguard/services/greader/greaderserviceroot.cpp index b06a66fbb..4265be23b 100644 --- a/src/librssguard/services/greader/greaderserviceroot.cpp +++ b/src/librssguard/services/greader/greaderserviceroot.cpp @@ -4,14 +4,10 @@ #include "database/databasequeries.h" #include "definitions/definitions.h" -#include "exceptions/feedfetchexception.h" #include "miscellaneous/application.h" #include "miscellaneous/iconfactory.h" -#include "miscellaneous/mutex.h" #include "miscellaneous/textfactory.h" #include "network-web/oauth2service.h" -#include "services/abstract/importantnode.h" -#include "services/abstract/recyclebin.h" #include "services/greader/definitions.h" #include "services/greader/greaderentrypoint.h" #include "services/greader/greadernetwork.h" diff --git a/src/librssguard/services/greader/gui/formeditgreaderaccount.cpp b/src/librssguard/services/greader/gui/formeditgreaderaccount.cpp index 0d399c75e..3e5467088 100644 --- a/src/librssguard/services/greader/gui/formeditgreaderaccount.cpp +++ b/src/librssguard/services/greader/gui/formeditgreaderaccount.cpp @@ -2,11 +2,8 @@ #include "services/greader/gui/formeditgreaderaccount.h" -#include "gui/guiutilities.h" #include "miscellaneous/iconfactory.h" -#include "network-web/networkfactory.h" #include "network-web/oauth2service.h" -#include "services/greader/definitions.h" #include "services/greader/greadernetwork.h" #include "services/greader/greaderserviceroot.h" #include "services/greader/gui/greaderaccountdetails.h" @@ -25,10 +22,9 @@ void FormEditGreaderAccount::apply() { FormAccountDetails::apply(); GreaderServiceRoot* existing_root = account(); - bool using_another_acc = - m_details->m_ui.m_txtUsername->lineEdit()->text() != existing_root->network()->username() || - m_details->service() != existing_root->network()->service() || - m_details->m_ui.m_txtUrl->lineEdit()->text() != existing_root->network()->baseUrl(); + bool using_another_acc = m_details->m_ui.m_txtUsername->lineEdit()->text() != existing_root->network()->username() || + m_details->service() != existing_root->network()->service() || + m_details->m_ui.m_txtUrl->lineEdit()->text() != existing_root->network()->baseUrl(); existing_root->network()->setBaseUrl(m_details->m_ui.m_txtUrl->lineEdit()->text()); existing_root->network()->setUsername(m_details->m_ui.m_txtUsername->lineEdit()->text()); @@ -44,8 +40,7 @@ void FormEditGreaderAccount::apply() { if (existing_root->network()->service() == GreaderServiceRoot::Service::Inoreader) { existing_root->network()->oauth()->setClientId(m_details->m_ui.m_txtAppId->lineEdit()->text()); existing_root->network()->oauth()->setClientSecret(m_details->m_ui.m_txtAppKey->lineEdit()->text()); - existing_root->network()->oauth()->setRedirectUrl(m_details->m_ui.m_txtRedirectUrl->lineEdit()->text(), - true); + existing_root->network()->oauth()->setRedirectUrl(m_details->m_ui.m_txtRedirectUrl->lineEdit()->text(), true); } existing_root->saveAccountDataToDatabase(); diff --git a/src/librssguard/services/greader/gui/greaderaccountdetails.cpp b/src/librssguard/services/greader/gui/greaderaccountdetails.cpp index 68562c162..f37175b1d 100644 --- a/src/librssguard/services/greader/gui/greaderaccountdetails.cpp +++ b/src/librssguard/services/greader/gui/greaderaccountdetails.cpp @@ -4,10 +4,8 @@ #include "definitions/definitions.h" #include "exceptions/applicationexception.h" -#include "gui/guiutilities.h" #include "miscellaneous/application.h" #include "miscellaneous/iconfactory.h" -#include "miscellaneous/systemfactory.h" #include "network-web/oauth2service.h" #include "network-web/webfactory.h" #include "services/greader/definitions.h" diff --git a/src/librssguard/services/newsblur/gui/formeditnewsbluraccount.cpp b/src/librssguard/services/newsblur/gui/formeditnewsbluraccount.cpp index d1aca3b6b..6ac1b4fc0 100644 --- a/src/librssguard/services/newsblur/gui/formeditnewsbluraccount.cpp +++ b/src/librssguard/services/newsblur/gui/formeditnewsbluraccount.cpp @@ -2,10 +2,7 @@ #include "services/newsblur/gui/formeditnewsbluraccount.h" -#include "gui/guiutilities.h" #include "miscellaneous/iconfactory.h" -#include "network-web/networkfactory.h" -#include "services/newsblur/definitions.h" #include "services/newsblur/gui/newsbluraccountdetails.h" #include "services/newsblur/newsblurnetwork.h" #include "services/newsblur/newsblurserviceroot.h" @@ -24,9 +21,8 @@ void FormEditNewsBlurAccount::apply() { FormAccountDetails::apply(); NewsBlurServiceRoot* existing_root = account(); - bool using_another_acc = - m_details->m_ui.m_txtUsername->lineEdit()->text() != existing_root->network()->username() || - m_details->m_ui.m_txtUrl->lineEdit()->text() != existing_root->network()->baseUrl(); + bool using_another_acc = m_details->m_ui.m_txtUsername->lineEdit()->text() != existing_root->network()->username() || + m_details->m_ui.m_txtUrl->lineEdit()->text() != existing_root->network()->baseUrl(); existing_root->network()->setBaseUrl(m_details->m_ui.m_txtUrl->lineEdit()->text()); existing_root->network()->setUsername(m_details->m_ui.m_txtUsername->lineEdit()->text()); diff --git a/src/librssguard/services/newsblur/gui/newsbluraccountdetails.cpp b/src/librssguard/services/newsblur/gui/newsbluraccountdetails.cpp index bbd894b1f..1c86a6975 100644 --- a/src/librssguard/services/newsblur/gui/newsbluraccountdetails.cpp +++ b/src/librssguard/services/newsblur/gui/newsbluraccountdetails.cpp @@ -5,11 +5,6 @@ #include "definitions/definitions.h" #include "exceptions/applicationexception.h" #include "exceptions/networkexception.h" -#include "gui/guiutilities.h" -#include "miscellaneous/application.h" -#include "miscellaneous/systemfactory.h" -#include "network-web/webfactory.h" -#include "services/newsblur/definitions.h" #include "services/newsblur/newsblurnetwork.h" #include @@ -60,18 +55,17 @@ void NewsBlurAccountDetails::performTest(const QNetworkProxy& custom_proxy) { LoginResult result = factory.login(custom_proxy); if (result.m_authenticated && !result.m_sessiodId.isEmpty()) { - m_ui.m_lblTestResult->setStatus(WidgetWithStatus::StatusType::Ok, - tr("You are good to go!"), - tr("Yeah.")); + m_ui.m_lblTestResult->setStatus(WidgetWithStatus::StatusType::Ok, tr("You are good to go!"), tr("Yeah.")); } else { throw ApplicationException(result.m_errors.join(QSL(", "))); } } catch (const NetworkException& netEx) { - m_ui.m_lblTestResult->setStatus(WidgetWithStatus::StatusType::Error, - tr("Network error: '%1'.").arg(NetworkFactory::networkErrorText(netEx.networkError())), - tr("Network error, have you entered correct username and password?")); + m_ui.m_lblTestResult + ->setStatus(WidgetWithStatus::StatusType::Error, + tr("Network error: '%1'.").arg(NetworkFactory::networkErrorText(netEx.networkError())), + tr("Network error, have you entered correct username and password?")); } catch (const ApplicationException& ex) { m_ui.m_lblTestResult->setStatus(WidgetWithStatus::StatusType::Error, diff --git a/src/librssguard/services/newsblur/newsblurnetwork.cpp b/src/librssguard/services/newsblur/newsblurnetwork.cpp index f6084ed8e..6daaa6c81 100644 --- a/src/librssguard/services/newsblur/newsblurnetwork.cpp +++ b/src/librssguard/services/newsblur/newsblurnetwork.cpp @@ -3,16 +3,11 @@ #include "services/newsblur/newsblurnetwork.h" #include "3rd-party/boolinq/boolinq.h" -#include "database/databasequeries.h" #include "exceptions/applicationexception.h" -#include "exceptions/feedfetchexception.h" #include "exceptions/networkexception.h" #include "miscellaneous/application.h" #include "network-web/networkfactory.h" -#include "network-web/webfactory.h" #include "services/abstract/category.h" -#include "services/abstract/label.h" -#include "services/abstract/labelsnode.h" #include "services/newsblur/definitions.h" #include diff --git a/src/librssguard/services/newsblur/newsblurserviceroot.cpp b/src/librssguard/services/newsblur/newsblurserviceroot.cpp index a57103999..02398e2e8 100644 --- a/src/librssguard/services/newsblur/newsblurserviceroot.cpp +++ b/src/librssguard/services/newsblur/newsblurserviceroot.cpp @@ -6,19 +6,12 @@ #include "definitions/definitions.h" #include "exceptions/feedfetchexception.h" #include "miscellaneous/application.h" -#include "miscellaneous/iconfactory.h" -#include "miscellaneous/mutex.h" #include "miscellaneous/textfactory.h" -#include "network-web/oauth2service.h" -#include "services/abstract/importantnode.h" -#include "services/abstract/recyclebin.h" -#include "services/newsblur/definitions.h" #include "services/newsblur/gui/formeditnewsbluraccount.h" #include "services/newsblur/newsblurentrypoint.h" #include "services/newsblur/newsblurnetwork.h" -NewsBlurServiceRoot::NewsBlurServiceRoot(RootItem* parent) - : ServiceRoot(parent), m_network(new NewsBlurNetwork(this)) { +NewsBlurServiceRoot::NewsBlurServiceRoot(RootItem* parent) : ServiceRoot(parent), m_network(new NewsBlurNetwork(this)) { m_network->setRoot(this); setIcon(NewsBlurEntryPoint().icon()); } @@ -55,7 +48,8 @@ void NewsBlurServiceRoot::setCustomDatabaseData(const QVariantHash& data) { } QList NewsBlurServiceRoot::obtainNewMessages(Feed* feed, - const QHash& stated_messages, + const QHash& + stated_messages, const QHash& tagged_messages) { Feed::Status error = Feed::Status::Normal; QList msgs; @@ -139,5 +133,6 @@ void NewsBlurServiceRoot::updateTitleIcon() { } RootItem* NewsBlurServiceRoot::obtainNewTreeForSyncIn() const { - return m_network->categoriesFeedsLabelsTree(networkProxy());; + return m_network->categoriesFeedsLabelsTree(networkProxy()); + ; } diff --git a/src/librssguard/services/owncloud/gui/formeditowncloudaccount.cpp b/src/librssguard/services/owncloud/gui/formeditowncloudaccount.cpp index 610a20ef7..9eef6ef9b 100644 --- a/src/librssguard/services/owncloud/gui/formeditowncloudaccount.cpp +++ b/src/librssguard/services/owncloud/gui/formeditowncloudaccount.cpp @@ -2,10 +2,7 @@ #include "services/owncloud/gui/formeditowncloudaccount.h" -#include "gui/guiutilities.h" #include "miscellaneous/iconfactory.h" -#include "network-web/networkfactory.h" -#include "services/owncloud/definitions.h" #include "services/owncloud/gui/owncloudaccountdetails.h" #include "services/owncloud/owncloudnetworkfactory.h" #include "services/owncloud/owncloudserviceroot.h" @@ -30,9 +27,12 @@ void FormEditOwnCloudAccount::apply() { account()->network()->setUrl(m_details->m_ui.m_txtUrl->lineEdit()->text()); account()->network()->setAuthUsername(m_details->m_ui.m_txtUsername->lineEdit()->text()); account()->network()->setAuthPassword(m_details->m_ui.m_txtPassword->lineEdit()->text()); - account()->network()->setForceServerSideUpdate(m_details->m_ui.m_checkServerSideUpdate->isChecked()); + account()->network()->setForceServerSideUpdate(m_details->m_ui.m_checkServerSideUpdate + ->isChecked()); account()->network()->setBatchSize(m_details->m_ui.m_spinLimitMessages->value()); - account()->network()->setDownloadOnlyUnreadMessages(m_details->m_ui.m_checkDownloadOnlyUnreadMessages->isChecked()); + account() + ->network() + ->setDownloadOnlyUnreadMessages(m_details->m_ui.m_checkDownloadOnlyUnreadMessages->isChecked()); account()->saveAccountDataToDatabase(); accept(); diff --git a/src/librssguard/services/owncloud/gui/owncloudaccountdetails.cpp b/src/librssguard/services/owncloud/gui/owncloudaccountdetails.cpp index 7676c34ab..a3d2999e2 100644 --- a/src/librssguard/services/owncloud/gui/owncloudaccountdetails.cpp +++ b/src/librssguard/services/owncloud/gui/owncloudaccountdetails.cpp @@ -3,7 +3,6 @@ #include "services/owncloud/gui/owncloudaccountdetails.h" #include "definitions/definitions.h" -#include "gui/guiutilities.h" #include "miscellaneous/systemfactory.h" #include "services/owncloud/definitions.h" #include "services/owncloud/owncloudnetworkfactory.h" @@ -12,9 +11,10 @@ OwnCloudAccountDetails::OwnCloudAccountDetails(QWidget* parent) : QWidget(parent m_ui.setupUi(this); m_ui.m_lblTestResult->label()->setWordWrap(true); - m_ui.m_lblServerSideUpdateInformation->setHelpText(tr("Leaving this option on causes that updates " - "of feeds will be probably much slower and may time-out often."), - true); + m_ui.m_lblServerSideUpdateInformation + ->setHelpText(tr("Leaving this option on causes that updates " + "of feeds will be probably much slower and may time-out often."), + true); m_ui.m_txtPassword->lineEdit()->setPlaceholderText(tr("Password for your Nextcloud account")); m_ui.m_txtPassword->lineEdit()->setPasswordMode(true); m_ui.m_txtUsername->lineEdit()->setPlaceholderText(tr("Username for your Nextcloud account")); @@ -23,14 +23,17 @@ OwnCloudAccountDetails::OwnCloudAccountDetails(QWidget* parent) : QWidget(parent tr("No test done yet."), tr("Here, results of connection test are shown.")); - connect(m_ui.m_spinLimitMessages, static_cast(&QSpinBox::valueChanged), this, [=](int value) { - if (value <= 0) { - m_ui.m_spinLimitMessages->setSuffix(QSL(" ") + tr("= unlimited")); - } - else { - m_ui.m_spinLimitMessages->setSuffix(QSL(" ") + tr("articles")); - } - }); + connect(m_ui.m_spinLimitMessages, + static_cast(&QSpinBox::valueChanged), + this, + [=](int value) { + if (value <= 0) { + m_ui.m_spinLimitMessages->setSuffix(QSL(" ") + tr("= unlimited")); + } + else { + m_ui.m_spinLimitMessages->setSuffix(QSL(" ") + tr("articles")); + } + }); connect(m_ui.m_txtPassword->lineEdit(), &BaseLineEdit::textChanged, this, &OwnCloudAccountDetails::onPasswordChanged); connect(m_ui.m_txtUsername->lineEdit(), &BaseLineEdit::textChanged, this, &OwnCloudAccountDetails::onUsernameChanged); @@ -59,21 +62,22 @@ void OwnCloudAccountDetails::performTest(const QNetworkProxy& custom_proxy) { OwnCloudStatusResponse result = factory.status(custom_proxy); if (result.networkError() != QNetworkReply::NetworkError::NoError) { - m_ui.m_lblTestResult->setStatus(WidgetWithStatus::StatusType::Error, - tr("Network error: '%1'.").arg(NetworkFactory::networkErrorText(result.networkError())), - tr("Network error, have you entered correct Nextcloud endpoint and password?")); + m_ui.m_lblTestResult + ->setStatus(WidgetWithStatus::StatusType::Error, + tr("Network error: '%1'.").arg(NetworkFactory::networkErrorText(result.networkError())), + tr("Network error, have you entered correct Nextcloud endpoint and password?")); } else if (result.isLoaded()) { if (!SystemFactory::isVersionEqualOrNewer(result.version(), QSL(OWNCLOUD_MIN_VERSION))) { m_ui.m_lblTestResult->setStatus(WidgetWithStatus::StatusType::Error, - tr("Installed version: %1, required at least: %2.").arg(result.version(), - QSL(OWNCLOUD_MIN_VERSION)), + tr("Installed version: %1, required at least: %2.") + .arg(result.version(), QSL(OWNCLOUD_MIN_VERSION)), tr("Selected Nextcloud News server is running unsupported version.")); } else { m_ui.m_lblTestResult->setStatus(WidgetWithStatus::StatusType::Ok, - tr("Installed version: %1, required at least: %2.").arg(result.version(), - QSL(OWNCLOUD_MIN_VERSION)), + tr("Installed version: %1, required at least: %2.") + .arg(result.version(), QSL(OWNCLOUD_MIN_VERSION)), tr("Nextcloud News server is okay.")); } } diff --git a/src/librssguard/services/owncloud/owncloudfeed.cpp b/src/librssguard/services/owncloud/owncloudfeed.cpp index 68ffee310..4268ec829 100644 --- a/src/librssguard/services/owncloud/owncloudfeed.cpp +++ b/src/librssguard/services/owncloud/owncloudfeed.cpp @@ -3,7 +3,6 @@ #include "services/owncloud/owncloudfeed.h" #include "database/databasequeries.h" -#include "miscellaneous/iconfactory.h" #include "services/owncloud/owncloudnetworkfactory.h" #include "services/owncloud/owncloudserviceroot.h" @@ -16,8 +15,7 @@ bool OwnCloudFeed::canBeDeleted() const { } bool OwnCloudFeed::deleteViaGui() { - if (serviceRoot()->network()->deleteFeed(customId(), getParentServiceRoot()->networkProxy()) && - removeItself()) { + if (serviceRoot()->network()->deleteFeed(customId(), getParentServiceRoot()->networkProxy()) && removeItself()) { serviceRoot()->requestItemRemoval(this); return true; } diff --git a/src/librssguard/services/owncloud/owncloudserviceroot.cpp b/src/librssguard/services/owncloud/owncloudserviceroot.cpp index 3352dfdbe..03a429b8b 100644 --- a/src/librssguard/services/owncloud/owncloudserviceroot.cpp +++ b/src/librssguard/services/owncloud/owncloudserviceroot.cpp @@ -7,11 +7,7 @@ #include "exceptions/feedfetchexception.h" #include "exceptions/networkexception.h" #include "miscellaneous/application.h" -#include "miscellaneous/iconfactory.h" -#include "miscellaneous/mutex.h" #include "miscellaneous/textfactory.h" -#include "services/abstract/importantnode.h" -#include "services/abstract/recyclebin.h" #include "services/owncloud/gui/formeditowncloudaccount.h" #include "services/owncloud/owncloudfeed.h" #include "services/owncloud/owncloudnetworkfactory.h" diff --git a/src/librssguard/services/reddit/gui/formeditredditaccount.cpp b/src/librssguard/services/reddit/gui/formeditredditaccount.cpp index f6930ba41..73d20d589 100644 --- a/src/librssguard/services/reddit/gui/formeditredditaccount.cpp +++ b/src/librssguard/services/reddit/gui/formeditredditaccount.cpp @@ -2,14 +2,11 @@ #include "services/reddit/gui/formeditredditaccount.h" -#include "gui/guiutilities.h" #include "miscellaneous/application.h" #include "miscellaneous/iconfactory.h" #include "network-web/oauth2service.h" -#include "network-web/webfactory.h" -#include "services/reddit/definitions.h" -#include "services/reddit/redditserviceroot.h" #include "services/reddit/gui/redditaccountdetails.h" +#include "services/reddit/redditserviceroot.h" FormEditRedditAccount::FormEditRedditAccount(QWidget* parent) : FormAccountDetails(qApp->icons()->miscIcon(QSL("reddit")), parent), m_details(new RedditAccountDetails(this)) { @@ -26,18 +23,19 @@ void FormEditRedditAccount::apply() { FormAccountDetails::apply(); bool using_another_acc = - m_details->m_ui.m_txtUsername->lineEdit()->text() !=account()->network()->username(); + m_details->m_ui.m_txtUsername->lineEdit()->text() != account()->network()->username(); // Make sure that the data copied from GUI are used for brand new login. account()->network()->oauth()->logout(false); account()->network()->oauth()->setClientId(m_details->m_ui.m_txtAppId->lineEdit()->text()); account()->network()->oauth()->setClientSecret(m_details->m_ui.m_txtAppKey->lineEdit()->text()); account()->network()->oauth()->setRedirectUrl(m_details->m_ui.m_txtRedirectUrl->lineEdit()->text(), - true); + true); account()->network()->setUsername(m_details->m_ui.m_txtUsername->lineEdit()->text()); account()->network()->setBatchSize(m_details->m_ui.m_spinLimitMessages->value()); - account()->network()->setDownloadOnlyUnreadMessages(m_details->m_ui.m_cbDownloadOnlyUnreadMessages->isChecked()); + account()->network()->setDownloadOnlyUnreadMessages(m_details->m_ui.m_cbDownloadOnlyUnreadMessages + ->isChecked()); account()->saveAccountDataToDatabase(); accept(); @@ -64,5 +62,6 @@ void FormEditRedditAccount::loadAccountData() { m_details->m_ui.m_txtUsername->lineEdit()->setText(account()->network()->username()); m_details->m_ui.m_spinLimitMessages->setValue(account()->network()->batchSize()); - m_details->m_ui.m_cbDownloadOnlyUnreadMessages->setChecked(account()->network()->downloadOnlyUnreadMessages()); + m_details->m_ui.m_cbDownloadOnlyUnreadMessages + ->setChecked(account()->network()->downloadOnlyUnreadMessages()); } diff --git a/src/librssguard/services/reddit/gui/redditaccountdetails.cpp b/src/librssguard/services/reddit/gui/redditaccountdetails.cpp index 0458d3fea..6c2a727d1 100644 --- a/src/librssguard/services/reddit/gui/redditaccountdetails.cpp +++ b/src/librssguard/services/reddit/gui/redditaccountdetails.cpp @@ -3,15 +3,13 @@ #include "services/reddit/gui/redditaccountdetails.h" #include "exceptions/applicationexception.h" -#include "gui/guiutilities.h" #include "miscellaneous/application.h" #include "network-web/oauth2service.h" #include "network-web/webfactory.h" #include "services/reddit/definitions.h" #include "services/reddit/redditnetworkfactory.h" -RedditAccountDetails::RedditAccountDetails(QWidget* parent) - : QWidget(parent), m_oauth(nullptr), m_lastProxy({}) { +RedditAccountDetails::RedditAccountDetails(QWidget* parent) : QWidget(parent), m_oauth(nullptr), m_lastProxy({}) { m_ui.setupUi(this); m_ui.m_lblInfo->setHelpText(tr("You have to fill in your client ID/secret and also fill in correct redirect URL."), @@ -90,9 +88,7 @@ void RedditAccountDetails::onAuthGranted() { m_ui.m_txtUsername->lineEdit()->setText(resp[QSL("name")].toString()); } catch (const ApplicationException& ex) { - qCriticalNN << LOGSEC_REDDIT - << "Failed to obtain profile with error:" - << QUOTE_W_SPACE_DOT(ex.message()); + qCriticalNN << LOGSEC_REDDIT << "Failed to obtain profile with error:" << QUOTE_W_SPACE_DOT(ex.message()); } } diff --git a/src/librssguard/services/reddit/redditentrypoint.cpp b/src/librssguard/services/reddit/redditentrypoint.cpp index abff8f4e7..45b727068 100644 --- a/src/librssguard/services/reddit/redditentrypoint.cpp +++ b/src/librssguard/services/reddit/redditentrypoint.cpp @@ -6,7 +6,6 @@ #include "definitions/definitions.h" #include "miscellaneous/application.h" #include "miscellaneous/iconfactory.h" -#include "services/reddit/definitions.h" #include "services/reddit/gui/formeditredditaccount.h" #include "services/reddit/redditserviceroot.h" diff --git a/src/librssguard/services/reddit/redditnetworkfactory.cpp b/src/librssguard/services/reddit/redditnetworkfactory.cpp index 4e37b4040..0ad80c1ef 100644 --- a/src/librssguard/services/reddit/redditnetworkfactory.cpp +++ b/src/librssguard/services/reddit/redditnetworkfactory.cpp @@ -6,15 +6,9 @@ #include "definitions/definitions.h" #include "exceptions/applicationexception.h" #include "exceptions/networkexception.h" -#include "gui/dialogs/formmain.h" -#include "gui/tabwidget.h" #include "miscellaneous/application.h" -#include "miscellaneous/textfactory.h" #include "network-web/networkfactory.h" #include "network-web/oauth2service.h" -#include "network-web/silentnetworkaccessmanager.h" -#include "network-web/webfactory.h" -#include "services/abstract/category.h" #include "services/reddit/definitions.h" #include "services/reddit/redditserviceroot.h" #include "services/reddit/redditsubscription.h" diff --git a/src/librssguard/services/reddit/redditserviceroot.cpp b/src/librssguard/services/reddit/redditserviceroot.cpp index 6010f896a..0e11fa555 100644 --- a/src/librssguard/services/reddit/redditserviceroot.cpp +++ b/src/librssguard/services/reddit/redditserviceroot.cpp @@ -3,13 +3,8 @@ #include "services/reddit/redditserviceroot.h" #include "database/databasequeries.h" -#include "exceptions/feedfetchexception.h" #include "miscellaneous/application.h" -#include "miscellaneous/iconfactory.h" #include "network-web/oauth2service.h" -#include "services/abstract/importantnode.h" -#include "services/abstract/recyclebin.h" -#include "services/reddit/definitions.h" #include "services/reddit/gui/formeditredditaccount.h" #include "services/reddit/redditcategory.h" #include "services/reddit/redditentrypoint.h" diff --git a/src/librssguard/services/standard/gui/formeditstandardaccount.cpp b/src/librssguard/services/standard/gui/formeditstandardaccount.cpp index ac3ad6d28..eb76e05a7 100644 --- a/src/librssguard/services/standard/gui/formeditstandardaccount.cpp +++ b/src/librssguard/services/standard/gui/formeditstandardaccount.cpp @@ -2,12 +2,7 @@ #include "services/standard/gui/formeditstandardaccount.h" -#include "database/databasefactory.h" -#include "database/databasequeries.h" -#include "miscellaneous/application.h" -#include "miscellaneous/iconfactory.h" #include "services/standard/standardserviceentrypoint.h" -#include "services/standard/standardserviceroot.h" FormEditStandardAccount::FormEditStandardAccount(QWidget* parent) : FormAccountDetails(StandardServiceEntryPoint().icon(), parent) {} diff --git a/src/librssguard/services/standard/gui/formstandardfeeddetails.cpp b/src/librssguard/services/standard/gui/formstandardfeeddetails.cpp index ac957057c..b9593a5a8 100644 --- a/src/librssguard/services/standard/gui/formstandardfeeddetails.cpp +++ b/src/librssguard/services/standard/gui/formstandardfeeddetails.cpp @@ -4,19 +4,14 @@ #include "database/databasequeries.h" #include "exceptions/applicationexception.h" -#include "gui/messagebox.h" #include "miscellaneous/application.h" -#include "miscellaneous/iconfactory.h" -#include "network-web/cookiejar.h" #include "network-web/networkfactory.h" #include "network-web/webfactory.h" #include "services/abstract/category.h" #include "services/abstract/gui/authenticationdetails.h" #include "services/abstract/serviceroot.h" -#include "services/standard/definitions.h" #include "services/standard/gui/standardfeeddetails.h" #include "services/standard/standardfeed.h" -#include "services/standard/standardserviceroot.h" #include #include diff --git a/src/librssguard/services/standard/gui/formstandardimportexport.cpp b/src/librssguard/services/standard/gui/formstandardimportexport.cpp index 1818c8075..e946861e0 100644 --- a/src/librssguard/services/standard/gui/formstandardimportexport.cpp +++ b/src/librssguard/services/standard/gui/formstandardimportexport.cpp @@ -2,14 +2,10 @@ #include "services/standard/gui/formstandardimportexport.h" -#include "core/feedsmodel.h" #include "exceptions/ioexception.h" -#include "gui/dialogs/formmain.h" -#include "gui/feedmessageviewer.h" -#include "gui/feedsview.h" #include "gui/guiutilities.h" -#include "gui/messagebox.h" #include "miscellaneous/application.h" +#include "miscellaneous/iconfactory.h" #include "services/abstract/category.h" #include "services/standard/standardfeedsimportexportmodel.h" #include "services/standard/standardserviceroot.h" diff --git a/src/librssguard/services/standard/gui/standardfeeddetails.cpp b/src/librssguard/services/standard/gui/standardfeeddetails.cpp index 1ff8c63d7..1253ce1c4 100644 --- a/src/librssguard/services/standard/gui/standardfeeddetails.cpp +++ b/src/librssguard/services/standard/gui/standardfeeddetails.cpp @@ -6,7 +6,6 @@ #include "exceptions/applicationexception.h" #include "exceptions/networkexception.h" #include "exceptions/scriptexception.h" -#include "gui/guiutilities.h" #include "miscellaneous/iconfactory.h" #include "network-web/networkfactory.h" #include "services/abstract/category.h" diff --git a/src/librssguard/services/standard/parsers/atomparser.cpp b/src/librssguard/services/standard/parsers/atomparser.cpp index 7286faca7..13d87e635 100644 --- a/src/librssguard/services/standard/parsers/atomparser.cpp +++ b/src/librssguard/services/standard/parsers/atomparser.cpp @@ -2,12 +2,7 @@ #include "services/standard/parsers/atomparser.h" -#include "miscellaneous/application.h" #include "miscellaneous/textfactory.h" -#include "network-web/webfactory.h" -#include "services/standard/definitions.h" - -#include "exceptions/applicationexception.h" AtomParser::AtomParser(const QString& data) : FeedParser(data) { QString version = m_xml.documentElement().attribute(QSL("version")); diff --git a/src/librssguard/services/standard/parsers/jsonparser.cpp b/src/librssguard/services/standard/parsers/jsonparser.cpp index bd80e296c..ace33f3a0 100644 --- a/src/librssguard/services/standard/parsers/jsonparser.cpp +++ b/src/librssguard/services/standard/parsers/jsonparser.cpp @@ -2,7 +2,6 @@ #include "services/standard/parsers/jsonparser.h" -#include "exceptions/feedfetchexception.h" #include "miscellaneous/textfactory.h" #include @@ -34,9 +33,8 @@ QString JsonParser::jsonMessageUrl(const QJsonObject& msg_element) const { } QString JsonParser::jsonMessageDescription(const QJsonObject& msg_element) const { - return msg_element.contains(QSL("content_html")) - ? msg_element[QSL("content_html")].toString() - : msg_element[QSL("content_text")].toString(); + return msg_element.contains(QSL("content_html")) ? msg_element[QSL("content_html")].toString() + : msg_element[QSL("content_text")].toString(); } QString JsonParser::jsonMessageAuthor(const QJsonObject& msg_element) const { @@ -53,8 +51,8 @@ QString JsonParser::jsonMessageAuthor(const QJsonObject& msg_element) const { QDateTime JsonParser::jsonMessageDateCreated(const QJsonObject& msg_element) const { return TextFactory::parseDateTime(msg_element.contains(QSL("date_modified")) - ? msg_element[QSL("date_modified")].toString() - : msg_element[QSL("date_published")].toString()); + ? msg_element[QSL("date_modified")].toString() + : msg_element[QSL("date_published")].toString()); } QString JsonParser::jsonMessageId(const QJsonObject& msg_element) const { diff --git a/src/librssguard/services/standard/parsers/rdfparser.cpp b/src/librssguard/services/standard/parsers/rdfparser.cpp index 5838338b1..1a478b584 100644 --- a/src/librssguard/services/standard/parsers/rdfparser.cpp +++ b/src/librssguard/services/standard/parsers/rdfparser.cpp @@ -2,20 +2,14 @@ #include "services/standard/parsers/rdfparser.h" -#include "exceptions/applicationexception.h" -#include "miscellaneous/application.h" #include "miscellaneous/textfactory.h" -#include "network-web/webfactory.h" -#include "services/standard/definitions.h" #include RdfParser::RdfParser(const QString& data) - : FeedParser(data), - m_rdfNamespace(QSL("http://www.w3.org/1999/02/22-rdf-syntax-ns#")), - m_rssNamespace(QSL("http://purl.org/rss/1.0/")), - m_rssCoNamespace(QSL("http://purl.org/rss/1.0/modules/content/")), - m_dcElNamespace(QSL("http://purl.org/dc/elements/1.1/")) {} + : FeedParser(data), m_rdfNamespace(QSL("http://www.w3.org/1999/02/22-rdf-syntax-ns#")), + m_rssNamespace(QSL("http://purl.org/rss/1.0/")), m_rssCoNamespace(QSL("http://purl.org/rss/1.0/modules/content/")), + m_dcElNamespace(QSL("http://purl.org/dc/elements/1.1/")) {} QDomNodeList RdfParser::xmlMessageElements() { return m_xml.elementsByTagNameNS(m_rssNamespace, QSL("item")); @@ -48,7 +42,10 @@ QString RdfParser::xmlMessageAuthor(const QDomElement& msg_element) const { } QDateTime RdfParser::xmlMessageDateCreated(const QDomElement& msg_element) const { - return TextFactory::parseDateTime(msg_element.elementsByTagNameNS(m_dcElNamespace, QSL("date")).at(0).toElement().text()); + return TextFactory::parseDateTime(msg_element.elementsByTagNameNS(m_dcElNamespace, QSL("date")) + .at(0) + .toElement() + .text()); } QString RdfParser::xmlMessageId(const QDomElement& msg_element) const { diff --git a/src/librssguard/services/standard/parsers/rssparser.cpp b/src/librssguard/services/standard/parsers/rssparser.cpp index 1db4c5402..ab15d15e0 100644 --- a/src/librssguard/services/standard/parsers/rssparser.cpp +++ b/src/librssguard/services/standard/parsers/rssparser.cpp @@ -2,12 +2,7 @@ #include "services/standard/parsers/rssparser.h" -#include "exceptions/applicationexception.h" -#include "miscellaneous/application.h" -#include "miscellaneous/iofactory.h" #include "miscellaneous/textfactory.h" -#include "network-web/webfactory.h" -#include "services/standard/definitions.h" #include #include diff --git a/src/librssguard/services/standard/standardcategory.cpp b/src/librssguard/services/standard/standardcategory.cpp index ee9987ae0..88326728f 100644 --- a/src/librssguard/services/standard/standardcategory.cpp +++ b/src/librssguard/services/standard/standardcategory.cpp @@ -2,15 +2,9 @@ #include "services/standard/standardcategory.h" -#include "core/feedsmodel.h" #include "database/databasequeries.h" #include "definitions/definitions.h" #include "exceptions/applicationexception.h" -#include "gui/feedmessageviewer.h" -#include "gui/feedsview.h" -#include "miscellaneous/iconfactory.h" -#include "miscellaneous/settings.h" -#include "miscellaneous/textfactory.h" #include "services/abstract/gui/formcategorydetails.h" #include "services/standard/standardfeed.h" #include "services/standard/standardserviceroot.h" @@ -36,13 +30,11 @@ bool StandardCategory::performDragDropChange(RootItem* target_item) { return true; } catch (const ApplicationException& ex) { - qCriticalNN << LOGSEC_DB - << "Cannot overwrite category:" - << QUOTE_W_SPACE_DOT(ex.message()); - qApp->showGuiMessage(Notification::Event::GeneralEvent, { - tr("Cannot save category data"), - tr("Cannot save data for category, detailed information was logged via debug log."), - QSystemTrayIcon::MessageIcon::Critical }); + qCriticalNN << LOGSEC_DB << "Cannot overwrite category:" << QUOTE_W_SPACE_DOT(ex.message()); + qApp->showGuiMessage(Notification::Event::GeneralEvent, + {tr("Cannot save category data"), + tr("Cannot save data for category, detailed information was logged via debug log."), + QSystemTrayIcon::MessageIcon::Critical}); return false; } } diff --git a/src/librssguard/services/standard/standardfeed.cpp b/src/librssguard/services/standard/standardfeed.cpp index 1c03eaae8..f5099a4e5 100644 --- a/src/librssguard/services/standard/standardfeed.cpp +++ b/src/librssguard/services/standard/standardfeed.cpp @@ -2,25 +2,17 @@ #include "services/standard/standardfeed.h" -#include "3rd-party/sc/simplecrypt.h" -#include "core/feedsmodel.h" #include "database/databasequeries.h" #include "definitions/definitions.h" #include "exceptions/applicationexception.h" #include "exceptions/networkexception.h" #include "exceptions/scriptexception.h" -#include "gui/feedmessageviewer.h" -#include "gui/feedsview.h" -#include "miscellaneous/iconfactory.h" #include "miscellaneous/settings.h" #include "miscellaneous/textfactory.h" -#include "services/abstract/recyclebin.h" #include "services/standard/definitions.h" #include "services/standard/gui/formstandardfeeddetails.h" #include "services/standard/parsers/atomparser.h" -#include "services/standard/parsers/jsonparser.h" #include "services/standard/parsers/rdfparser.h" -#include "services/standard/parsers/rssparser.h" #include "services/standard/standardserviceroot.h" #include diff --git a/src/librssguard/services/standard/standardserviceroot.cpp b/src/librssguard/services/standard/standardserviceroot.cpp index 2e0e170c2..79bdb387c 100644 --- a/src/librssguard/services/standard/standardserviceroot.cpp +++ b/src/librssguard/services/standard/standardserviceroot.cpp @@ -2,7 +2,6 @@ #include "services/standard/standardserviceroot.h" -#include "core/feedsmodel.h" #include "database/databasequeries.h" #include "definitions/definitions.h" #include "exceptions/applicationexception.h" @@ -14,11 +13,7 @@ #include "miscellaneous/mutex.h" #include "miscellaneous/settings.h" #include "network-web/networkfactory.h" -#include "network-web/webfactory.h" #include "services/abstract/gui/formcategorydetails.h" -#include "services/abstract/importantnode.h" -#include "services/abstract/labelsnode.h" -#include "services/abstract/recyclebin.h" #include "services/standard/definitions.h" #include "services/standard/gui/formeditstandardaccount.h" #include "services/standard/gui/formstandardfeeddetails.h" diff --git a/src/librssguard/services/tt-rss/gui/formeditttrssaccount.cpp b/src/librssguard/services/tt-rss/gui/formeditttrssaccount.cpp index 6ed3d2b1d..4316ec65d 100644 --- a/src/librssguard/services/tt-rss/gui/formeditttrssaccount.cpp +++ b/src/librssguard/services/tt-rss/gui/formeditttrssaccount.cpp @@ -3,7 +3,6 @@ #include "services/tt-rss/gui/formeditttrssaccount.h" #include "miscellaneous/iconfactory.h" -#include "services/tt-rss/definitions.h" #include "services/tt-rss/gui/ttrssaccountdetails.h" #include "services/tt-rss/ttrssnetworkfactory.h" #include "services/tt-rss/ttrssserviceroot.h" diff --git a/src/librssguard/services/tt-rss/gui/formttrssfeeddetails.cpp b/src/librssguard/services/tt-rss/gui/formttrssfeeddetails.cpp index 9a75ddb8e..54bacc0b7 100644 --- a/src/librssguard/services/tt-rss/gui/formttrssfeeddetails.cpp +++ b/src/librssguard/services/tt-rss/gui/formttrssfeeddetails.cpp @@ -4,11 +4,9 @@ #include "exceptions/applicationexception.h" #include "miscellaneous/application.h" -#include "services/abstract/feed.h" #include "services/abstract/gui/authenticationdetails.h" #include "services/tt-rss/definitions.h" #include "services/tt-rss/gui/ttrssfeeddetails.h" -#include "services/tt-rss/ttrssfeed.h" #include "services/tt-rss/ttrssnetworkfactory.h" #include "services/tt-rss/ttrssserviceroot.h" @@ -39,7 +37,8 @@ void FormTtRssFeedDetails::apply() { root->network()->subscribeToFeed(m_feedDetails->ui.m_txtUrl->lineEdit()->text(), category_id, m_serviceRoot->networkProxy(), - m_authDetails->authenticationType() == NetworkFactory::NetworkAuthentication::Basic, + m_authDetails->authenticationType() == + NetworkFactory::NetworkAuthentication::Basic, m_authDetails->m_txtUsername->lineEdit()->text(), m_authDetails->m_txtPassword->lineEdit()->text()); diff --git a/src/librssguard/services/tt-rss/gui/ttrssaccountdetails.cpp b/src/librssguard/services/tt-rss/gui/ttrssaccountdetails.cpp index 409ab1797..aeb3e4a0d 100644 --- a/src/librssguard/services/tt-rss/gui/ttrssaccountdetails.cpp +++ b/src/librssguard/services/tt-rss/gui/ttrssaccountdetails.cpp @@ -3,7 +3,6 @@ #include "services/tt-rss/gui/ttrssaccountdetails.h" #include "definitions/definitions.h" -#include "gui/guiutilities.h" #include "network-web/networkfactory.h" #include "services/tt-rss/definitions.h" #include "services/tt-rss/ttrssnetworkfactory.h" diff --git a/src/librssguard/services/tt-rss/ttrssfeed.cpp b/src/librssguard/services/tt-rss/ttrssfeed.cpp index 207d2eec8..86b164bd2 100644 --- a/src/librssguard/services/tt-rss/ttrssfeed.cpp +++ b/src/librssguard/services/tt-rss/ttrssfeed.cpp @@ -6,7 +6,6 @@ #include "definitions/definitions.h" #include "miscellaneous/application.h" #include "miscellaneous/iconfactory.h" -#include "miscellaneous/textfactory.h" #include "services/tt-rss/definitions.h" #include "services/tt-rss/ttrssnetworkfactory.h" #include "services/tt-rss/ttrssserviceroot.h" @@ -24,8 +23,8 @@ bool TtRssFeed::canBeDeleted() const { } bool TtRssFeed::deleteViaGui() { - TtRssUnsubscribeFeedResponse response = serviceRoot()->network()->unsubscribeFeed(customNumericId(), - getParentServiceRoot()->networkProxy()); + TtRssUnsubscribeFeedResponse response = + serviceRoot()->network()->unsubscribeFeed(customNumericId(), getParentServiceRoot()->networkProxy()); if (response.code() == QSL(UFF_OK) && removeItself()) { serviceRoot()->requestItemRemoval(this); @@ -33,8 +32,7 @@ bool TtRssFeed::deleteViaGui() { } else { qWarningNN << LOGSEC_TTRSS - << "Unsubscribing from feed failed, received JSON:" - << QUOTE_W_SPACE_DOT(response.toString()); + << "Unsubscribing from feed failed, received JSON:" << QUOTE_W_SPACE_DOT(response.toString()); return false; } } @@ -44,9 +42,8 @@ QList TtRssFeed::contextMenuFeedsList() { if (customNumericId() == TTRSS_PUBLISHED_FEED_ID) { if (m_actionShareToPublished == nullptr) { - m_actionShareToPublished = new QAction(qApp->icons()->fromTheme(QSL("emblem-shared")), - tr("Share to published"), - this); + m_actionShareToPublished = + new QAction(qApp->icons()->fromTheme(QSL("emblem-shared")), tr("Share to published"), this); connect(m_actionShareToPublished, &QAction::triggered, serviceRoot(), &TtRssServiceRoot::shareToPublished); } diff --git a/src/librssguard/services/tt-rss/ttrssserviceroot.cpp b/src/librssguard/services/tt-rss/ttrssserviceroot.cpp index 44ae51f6c..d14943274 100644 --- a/src/librssguard/services/tt-rss/ttrssserviceroot.cpp +++ b/src/librssguard/services/tt-rss/ttrssserviceroot.cpp @@ -7,14 +7,10 @@ #include "exceptions/feedfetchexception.h" #include "exceptions/networkexception.h" #include "miscellaneous/application.h" -#include "miscellaneous/iconfactory.h" #include "miscellaneous/mutex.h" -#include "miscellaneous/settings.h" #include "miscellaneous/textfactory.h" #include "network-web/networkfactory.h" -#include "services/abstract/importantnode.h" #include "services/abstract/labelsnode.h" -#include "services/abstract/recyclebin.h" #include "services/tt-rss/definitions.h" #include "services/tt-rss/gui/formeditttrssaccount.h" #include "services/tt-rss/gui/formttrssfeeddetails.h"