diff --git a/.clang-format b/.clang-format index 8b3f68c09..c6e05266d 100755 --- a/.clang-format +++ b/.clang-format @@ -92,11 +92,11 @@ IncludeCategories: SortPriority: 0 CaseSensitive: false - Regex: '^<[A-Z]' - Priority: 3 + Priority: 4 SortPriority: 0 CaseSensitive: true - Regex: '^<[a-z0-9]' - Priority: 4 + Priority: 3 SortPriority: 0 CaseSensitive: true IncludeIsMainRegex: '(Test)?$' diff --git a/src/librssguard-standard/src/gui/formdiscoverfeeds.cpp b/src/librssguard-standard/src/gui/formdiscoverfeeds.cpp index 9e342336c..458c54545 100644 --- a/src/librssguard-standard/src/gui/formdiscoverfeeds.cpp +++ b/src/librssguard-standard/src/gui/formdiscoverfeeds.cpp @@ -2,6 +2,16 @@ #include "src/gui/formdiscoverfeeds.h" +#include "src/definitions.h" +#include "src/gui/formstandardfeeddetails.h" +#include "src/parsers/atomparser.h" +#include "src/parsers/icalparser.h" +#include "src/parsers/jsonparser.h" +#include "src/parsers/rdfparser.h" +#include "src/parsers/rssparser.h" +#include "src/parsers/sitemapparser.h" +#include "src/standardfeed.h" + #include #include #include @@ -10,16 +20,6 @@ #include #include #include -#include "src/definitions.h" -#include "src/gui/formstandardfeeddetails.h" -#include "src/standardfeed.h" - -#include "src/parsers/atomparser.h" -#include "src/parsers/icalparser.h" -#include "src/parsers/jsonparser.h" -#include "src/parsers/rdfparser.h" -#include "src/parsers/rssparser.h" -#include "src/parsers/sitemapparser.h" #include diff --git a/src/librssguard-standard/src/gui/formdiscoverfeeds.h b/src/librssguard-standard/src/gui/formdiscoverfeeds.h index dbf8015bd..e0d7be19f 100644 --- a/src/librssguard-standard/src/gui/formdiscoverfeeds.h +++ b/src/librssguard-standard/src/gui/formdiscoverfeeds.h @@ -7,11 +7,11 @@ #include "ui_formdiscoverfeeds.h" +#include + #include #include -#include - class ServiceRoot; class RootItem; class Category; diff --git a/src/librssguard-standard/src/gui/formstandardfeeddetails.cpp b/src/librssguard-standard/src/gui/formstandardfeeddetails.cpp index 948c74eb1..afa525418 100644 --- a/src/librssguard-standard/src/gui/formstandardfeeddetails.cpp +++ b/src/librssguard-standard/src/gui/formstandardfeeddetails.cpp @@ -2,6 +2,9 @@ #include "src/gui/formstandardfeeddetails.h" +#include "src/gui/standardfeeddetails.h" +#include "src/standardfeed.h" + #include #include #include @@ -10,8 +13,6 @@ #include #include #include -#include "src/gui/standardfeeddetails.h" -#include "src/standardfeed.h" #include #include diff --git a/src/librssguard-standard/src/gui/formstandardimportexport.cpp b/src/librssguard-standard/src/gui/formstandardimportexport.cpp index 92177ebba..e0e95691c 100644 --- a/src/librssguard-standard/src/gui/formstandardimportexport.cpp +++ b/src/librssguard-standard/src/gui/formstandardimportexport.cpp @@ -2,15 +2,15 @@ #include "src/gui/formstandardimportexport.h" +#include "src/standardfeedsimportexportmodel.h" +#include "src/standardserviceroot.h" + #include #include #include #include #include -#include "src/standardfeedsimportexportmodel.h" -#include "src/standardserviceroot.h" - #include #include diff --git a/src/librssguard-standard/src/gui/standardaccountdetails.cpp b/src/librssguard-standard/src/gui/standardaccountdetails.cpp index 9aa044e65..953b5fe85 100644 --- a/src/librssguard-standard/src/gui/standardaccountdetails.cpp +++ b/src/librssguard-standard/src/gui/standardaccountdetails.cpp @@ -2,9 +2,10 @@ #include "src/gui/standardaccountdetails.h" +#include "src/standardserviceentrypoint.h" + #include #include -#include "src/standardserviceentrypoint.h" #include #include diff --git a/src/librssguard-standard/src/gui/standardfeeddetails.cpp b/src/librssguard-standard/src/gui/standardfeeddetails.cpp index 1d071f026..9a4de6f40 100644 --- a/src/librssguard-standard/src/gui/standardfeeddetails.cpp +++ b/src/librssguard-standard/src/gui/standardfeeddetails.cpp @@ -2,6 +2,8 @@ #include "src/gui/standardfeeddetails.h" +#include "src/definitions.h" + #include #include #include @@ -10,7 +12,6 @@ #include #include #include -#include "src/definitions.h" #include #include diff --git a/src/librssguard-standard/src/parsers/atomparser.cpp b/src/librssguard-standard/src/parsers/atomparser.cpp index f7f94c409..9e5428f82 100644 --- a/src/librssguard-standard/src/parsers/atomparser.cpp +++ b/src/librssguard-standard/src/parsers/atomparser.cpp @@ -2,13 +2,14 @@ #include "src/parsers/atomparser.h" +#include "src/definitions.h" +#include "src/standardfeed.h" + #include #include #include #include #include -#include "src/definitions.h" -#include "src/standardfeed.h" #include diff --git a/src/librssguard-standard/src/parsers/atomparser.h b/src/librssguard-standard/src/parsers/atomparser.h index 39a1a4cb8..addf9a431 100644 --- a/src/librssguard-standard/src/parsers/atomparser.h +++ b/src/librssguard-standard/src/parsers/atomparser.h @@ -5,11 +5,11 @@ #include "src/parsers/feedparser.h" +#include + #include #include -#include - class AtomParser : public FeedParser { public: explicit AtomParser(const QString& data); diff --git a/src/librssguard-standard/src/parsers/feedparser.cpp b/src/librssguard-standard/src/parsers/feedparser.cpp index 93a83ef97..1a646edcc 100644 --- a/src/librssguard-standard/src/parsers/feedparser.cpp +++ b/src/librssguard-standard/src/parsers/feedparser.cpp @@ -9,13 +9,12 @@ #include #include #include +#include #include #include #include -#include - FeedParser::FeedParser(QString data, DataType is_xml) : m_dataType(is_xml), m_data(std::move(data)), m_mrssNamespace(QSL("http://search.yahoo.com/mrss/")) { if (m_data.isEmpty()) { diff --git a/src/librssguard-standard/src/parsers/feedparser.h b/src/librssguard-standard/src/parsers/feedparser.h index 640fd12a1..b23d5cb54 100644 --- a/src/librssguard-standard/src/parsers/feedparser.h +++ b/src/librssguard-standard/src/parsers/feedparser.h @@ -5,15 +5,15 @@ #include "src/standardfeed.h" +#include +#include + #include #include #include #include #include -#include -#include - // Base class for all XML-based feed parsers. class FeedParser { public: diff --git a/src/librssguard-standard/src/parsers/icalparser.cpp b/src/librssguard-standard/src/parsers/icalparser.cpp index c3344ef58..3f3c3d8f0 100644 --- a/src/librssguard-standard/src/parsers/icalparser.cpp +++ b/src/librssguard-standard/src/parsers/icalparser.cpp @@ -2,6 +2,8 @@ #include "src/parsers/icalparser.h" +#include "src/definitions.h" + #include #include #include @@ -9,7 +11,6 @@ #include #include #include -#include "src/definitions.h" IcalParser::IcalParser(const QString& data) : FeedParser(data, DataType::Other), m_iCalendar(Icalendar(m_data.toUtf8())) {} diff --git a/src/librssguard-standard/src/parsers/jsonparser.cpp b/src/librssguard-standard/src/parsers/jsonparser.cpp index 9e2a03535..af49b56bb 100644 --- a/src/librssguard-standard/src/parsers/jsonparser.cpp +++ b/src/librssguard-standard/src/parsers/jsonparser.cpp @@ -2,14 +2,15 @@ #include "src/parsers/jsonparser.h" +#include "src/definitions.h" +#include "src/standardfeed.h" + #include #include #include #include #include #include -#include "src/definitions.h" -#include "src/standardfeed.h" #include #include diff --git a/src/librssguard-standard/src/parsers/rdfparser.cpp b/src/librssguard-standard/src/parsers/rdfparser.cpp index 9139f450a..f3e0bb857 100644 --- a/src/librssguard-standard/src/parsers/rdfparser.cpp +++ b/src/librssguard-standard/src/parsers/rdfparser.cpp @@ -2,11 +2,12 @@ #include "src/parsers/rdfparser.h" +#include "src/definitions.h" +#include "src/standardfeed.h" + #include #include #include -#include "src/definitions.h" -#include "src/standardfeed.h" #include #include diff --git a/src/librssguard-standard/src/parsers/rssparser.cpp b/src/librssguard-standard/src/parsers/rssparser.cpp index 16f9897f1..1b90f1002 100644 --- a/src/librssguard-standard/src/parsers/rssparser.cpp +++ b/src/librssguard-standard/src/parsers/rssparser.cpp @@ -2,13 +2,14 @@ #include "src/parsers/rssparser.h" +#include "src/definitions.h" +#include "src/standardfeed.h" + #include #include #include #include #include -#include "src/definitions.h" -#include "src/standardfeed.h" #include #include diff --git a/src/librssguard-standard/src/parsers/sitemapparser.cpp b/src/librssguard-standard/src/parsers/sitemapparser.cpp index 31344570f..6d35ed7b5 100644 --- a/src/librssguard-standard/src/parsers/sitemapparser.cpp +++ b/src/librssguard-standard/src/parsers/sitemapparser.cpp @@ -7,6 +7,7 @@ #endif #include "src/definitions.h" + #include #include #include diff --git a/src/librssguard-standard/src/parsers/sitemapparser.h b/src/librssguard-standard/src/parsers/sitemapparser.h index 99a53aa17..d6bebd4f2 100644 --- a/src/librssguard-standard/src/parsers/sitemapparser.h +++ b/src/librssguard-standard/src/parsers/sitemapparser.h @@ -4,7 +4,6 @@ #define SITEMAPPARSER_H #include "src/parsers/feedparser.h" - #include "src/standardfeed.h" class SitemapParser : public FeedParser { diff --git a/src/librssguard-standard/src/standardfeed.cpp b/src/librssguard-standard/src/standardfeed.cpp index f51d7f016..5b74f0675 100644 --- a/src/librssguard-standard/src/standardfeed.cpp +++ b/src/librssguard-standard/src/standardfeed.cpp @@ -4,6 +4,7 @@ #include "src/gui/formstandardfeeddetails.h" #include "src/standardserviceroot.h" + #include #include #include diff --git a/src/librssguard-standard/src/standardfeed.h b/src/librssguard-standard/src/standardfeed.h index 43ca1a2c2..0bb8038e3 100644 --- a/src/librssguard-standard/src/standardfeed.h +++ b/src/librssguard-standard/src/standardfeed.h @@ -3,9 +3,8 @@ #ifndef FEEDSMODELFEED_H #define FEEDSMODELFEED_H -#include - #include +#include #include #include diff --git a/src/librssguard-standard/src/standardfeedsimportexportmodel.cpp b/src/librssguard-standard/src/standardfeedsimportexportmodel.cpp index eec72dac3..867a05b2f 100644 --- a/src/librssguard-standard/src/standardfeedsimportexportmodel.cpp +++ b/src/librssguard-standard/src/standardfeedsimportexportmodel.cpp @@ -2,15 +2,16 @@ #include "src/standardfeedsimportexportmodel.h" +#include "src/definitions.h" +#include "src/standardcategory.h" +#include "src/standardfeed.h" +#include "src/standardserviceroot.h" + #include #include #include #include #include -#include "src/definitions.h" -#include "src/standardcategory.h" -#include "src/standardfeed.h" -#include "src/standardserviceroot.h" #include #include diff --git a/src/librssguard-standard/src/standardserviceentrypoint.cpp b/src/librssguard-standard/src/standardserviceentrypoint.cpp index d35c23078..957c796f4 100644 --- a/src/librssguard-standard/src/standardserviceentrypoint.cpp +++ b/src/librssguard-standard/src/standardserviceentrypoint.cpp @@ -4,6 +4,7 @@ #include "src/gui/formeditstandardaccount.h" #include "src/standardserviceroot.h" + #include #include #include diff --git a/src/librssguard-standard/src/standardserviceroot.cpp b/src/librssguard-standard/src/standardserviceroot.cpp index 80df7fa6c..4a941f51f 100644 --- a/src/librssguard-standard/src/standardserviceroot.cpp +++ b/src/librssguard-standard/src/standardserviceroot.cpp @@ -2,19 +2,6 @@ #include "src/standardserviceroot.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include "src/definitions.h" #include "src/gui/formdiscoverfeeds.h" #include "src/gui/formeditstandardaccount.h" @@ -31,6 +18,19 @@ #include "src/standardfeedsimportexportmodel.h" #include "src/standardserviceentrypoint.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #if defined(NO_LITE) #include #include diff --git a/src/librssguard-standard/src/standardserviceroot.h b/src/librssguard-standard/src/standardserviceroot.h index 29a8d5045..5133d4e0c 100644 --- a/src/librssguard-standard/src/standardserviceroot.h +++ b/src/librssguard-standard/src/standardserviceroot.h @@ -3,10 +3,10 @@ #ifndef STANDARDSERVICEROOT_H #define STANDARDSERVICEROOT_H -#include - #include "src/standardfeed.h" +#include + #include #include diff --git a/src/librssguard/core/articlelistnotificationmodel.h b/src/librssguard/core/articlelistnotificationmodel.h index e98c57a00..5199224e2 100644 --- a/src/librssguard/core/articlelistnotificationmodel.h +++ b/src/librssguard/core/articlelistnotificationmodel.h @@ -3,10 +3,10 @@ #ifndef ARTICLELISTNOTIFICATIONMODEL_H #define ARTICLELISTNOTIFICATIONMODEL_H -#include - #include "core/message.h" +#include + class ArticleListNotificationModel : public QAbstractListModel { Q_OBJECT diff --git a/src/librssguard/core/feeddownloader.h b/src/librssguard/core/feeddownloader.h index fd814419b..bbe64695f 100644 --- a/src/librssguard/core/feeddownloader.h +++ b/src/librssguard/core/feeddownloader.h @@ -3,8 +3,6 @@ #ifndef FEEDDOWNLOADER_H #define FEEDDOWNLOADER_H -#include - #include "core/message.h" #include "exceptions/applicationexception.h" #include "services/abstract/cacheforserviceroot.h" @@ -12,6 +10,7 @@ #include #include +#include #include class MessageFilter; diff --git a/src/librssguard/core/feedsmodel.h b/src/librssguard/core/feedsmodel.h index afea3688a..ce71524dd 100644 --- a/src/librssguard/core/feedsmodel.h +++ b/src/librssguard/core/feedsmodel.h @@ -3,10 +3,10 @@ #ifndef FEEDSMODEL_H #define FEEDSMODEL_H -#include - #include "services/abstract/rootitem.h" +#include + class Category; class Feed; class ServiceRoot; diff --git a/src/librssguard/core/feedsproxymodel.h b/src/librssguard/core/feedsproxymodel.h index e8b0ed876..f38c92bd7 100644 --- a/src/librssguard/core/feedsproxymodel.h +++ b/src/librssguard/core/feedsproxymodel.h @@ -3,10 +3,10 @@ #ifndef FEEDSPROXYMODEL_H #define FEEDSPROXYMODEL_H -#include - #include "services/abstract/rootitem.h" +#include + class FeedsModel; class FeedsView; diff --git a/src/librssguard/core/messagefilter.h b/src/librssguard/core/messagefilter.h index 670de5993..90cfc5535 100644 --- a/src/librssguard/core/messagefilter.h +++ b/src/librssguard/core/messagefilter.h @@ -3,12 +3,11 @@ #ifndef MESSAGEFILTER_H #define MESSAGEFILTER_H -#include - #include "core/message.h" #include "core/messageobject.h" #include +#include // Class which represents one message filter. class RSSGUARD_DLLSPEC MessageFilter : public QObject { diff --git a/src/librssguard/core/messageobject.h b/src/librssguard/core/messageobject.h index 0fc5efe6e..f97cb999e 100644 --- a/src/librssguard/core/messageobject.h +++ b/src/librssguard/core/messageobject.h @@ -3,10 +3,10 @@ #ifndef MESSAGEOBJECT_H #define MESSAGEOBJECT_H -#include - #include "services/abstract/label.h" +#include + class MessageObject : public QObject { Q_OBJECT diff --git a/src/librssguard/core/messagesforfiltersmodel.h b/src/librssguard/core/messagesforfiltersmodel.h index 9945bad55..de56e2c5c 100644 --- a/src/librssguard/core/messagesforfiltersmodel.h +++ b/src/librssguard/core/messagesforfiltersmodel.h @@ -3,16 +3,15 @@ #ifndef MESSAGESFORFILTERSMODEL_H #define MESSAGESFORFILTERSMODEL_H -#include - #include "core/messageobject.h" +#include #include class MessageFilter; class MessagesForFiltersModel : public QAbstractTableModel { - Q_OBJECT + Q_OBJECT public: explicit MessagesForFiltersModel(QObject* parent = nullptr); diff --git a/src/librssguard/core/messagesmodel.cpp b/src/librssguard/core/messagesmodel.cpp index b387e461b..3d4f9221c 100644 --- a/src/librssguard/core/messagesmodel.cpp +++ b/src/librssguard/core/messagesmodel.cpp @@ -17,13 +17,13 @@ #include "services/abstract/recyclebin.h" #include "services/abstract/serviceroot.h" +#include + #include #include #include #include -#include - MessagesModel::MessagesModel(QObject* parent) : QSqlQueryModel(parent), m_view(nullptr), m_cache(new MessagesModelCache(this)), m_messageHighlighter(MessageHighlighter::NoHighlighting), m_customDateFormat(QString()), diff --git a/src/librssguard/core/messagesmodel.h b/src/librssguard/core/messagesmodel.h index e42d783a6..6964d1efc 100644 --- a/src/librssguard/core/messagesmodel.h +++ b/src/librssguard/core/messagesmodel.h @@ -3,15 +3,14 @@ #ifndef MESSAGESMODEL_H #define MESSAGESMODEL_H -#include "core/messagesmodelsqllayer.h" -#include - #include "core/message.h" +#include "core/messagesmodelsqllayer.h" #include "definitions/definitions.h" #include "services/abstract/rootitem.h" #include #include +#include class MessagesView; class MessagesModelCache; diff --git a/src/librssguard/core/messagesmodelcache.h b/src/librssguard/core/messagesmodelcache.h index d955ff457..e7ed68f30 100644 --- a/src/librssguard/core/messagesmodelcache.h +++ b/src/librssguard/core/messagesmodelcache.h @@ -3,15 +3,14 @@ #ifndef MESSAGESMODELCACHE_H #define MESSAGESMODELCACHE_H -#include - #include "core/message.h" #include +#include #include class MessagesModelCache : public QObject { - Q_OBJECT + Q_OBJECT public: explicit MessagesModelCache(QObject* parent = nullptr); diff --git a/src/librssguard/core/messagesmodelsqllayer.h b/src/librssguard/core/messagesmodelsqllayer.h index 1758975bb..249f2ba13 100644 --- a/src/librssguard/core/messagesmodelsqllayer.h +++ b/src/librssguard/core/messagesmodelsqllayer.h @@ -3,11 +3,10 @@ #ifndef MESSAGESMODELSQLLAYER_H #define MESSAGESMODELSQLLAYER_H -#include - #include #include #include +#include struct SortColumnsAndOrders { QList m_columns; diff --git a/src/librssguard/database/databasecleaner.h b/src/librssguard/database/databasecleaner.h index 790c52fc7..a147a9f86 100644 --- a/src/librssguard/database/databasecleaner.h +++ b/src/librssguard/database/databasecleaner.h @@ -4,20 +4,19 @@ #define DATABASECLEANER_H #include - #include struct CleanerOrders { - bool m_removeReadMessages; - bool m_shrinkDatabase; - bool m_removeOldMessages; - bool m_removeRecycleBin; - bool m_removeStarredMessages; - int m_barrierForRemovingOldMessagesInDays; + bool m_removeReadMessages; + bool m_shrinkDatabase; + bool m_removeOldMessages; + bool m_removeRecycleBin; + bool m_removeStarredMessages; + int m_barrierForRemovingOldMessagesInDays; }; class DatabaseCleaner : public QObject { - Q_OBJECT + Q_OBJECT public: explicit DatabaseCleaner(QObject* parent = nullptr); diff --git a/src/librssguard/database/databasedriver.h b/src/librssguard/database/databasedriver.h index 7c3f70556..2c7abcf9f 100644 --- a/src/librssguard/database/databasedriver.h +++ b/src/librssguard/database/databasedriver.h @@ -4,7 +4,6 @@ #define DATABASEDRIVER_H #include - #include #include diff --git a/src/librssguard/database/databasefactory.h b/src/librssguard/database/databasefactory.h index 521aeaadc..d2c546671 100644 --- a/src/librssguard/database/databasefactory.h +++ b/src/librssguard/database/databasefactory.h @@ -3,10 +3,9 @@ #ifndef DATABASEFACTORY_H #define DATABASEFACTORY_H -#include - #include "database/databasedriver.h" +#include #include class RSSGUARD_DLLSPEC DatabaseFactory : public QObject { diff --git a/src/librssguard/database/databasequeries.h b/src/librssguard/database/databasequeries.h index 93b15a0de..df143b7ce 100644 --- a/src/librssguard/database/databasequeries.h +++ b/src/librssguard/database/databasequeries.h @@ -3,8 +3,6 @@ #ifndef DATABASEQUERIES_H #define DATABASEQUERIES_H -#include "services/abstract/rootitem.h" - #include "core/messagefilter.h" #include "definitions/typedefs.h" #include "miscellaneous/application.h" @@ -12,6 +10,7 @@ #include "miscellaneous/textfactory.h" #include "services/abstract/category.h" #include "services/abstract/label.h" +#include "services/abstract/rootitem.h" #include "services/abstract/search.h" #include "services/abstract/serviceroot.h" diff --git a/src/librssguard/database/mariadbdriver.h b/src/librssguard/database/mariadbdriver.h index 635bc7439..799839a77 100644 --- a/src/librssguard/database/mariadbdriver.h +++ b/src/librssguard/database/mariadbdriver.h @@ -6,7 +6,7 @@ #include "database/databasedriver.h" class MariaDbDriver : public DatabaseDriver { - Q_OBJECT + Q_OBJECT public: enum class MariaDbError { @@ -21,8 +21,11 @@ class MariaDbDriver : public DatabaseDriver { explicit MariaDbDriver(QObject* parent = nullptr); - MariaDbError testConnection(const QString& hostname, int port, const QString& w_database, - const QString& username, const QString& password); + MariaDbError testConnection(const QString& hostname, + int port, + const QString& w_database, + const QString& username, + const QString& password); virtual QString location() const; virtual QString humanDriverType() const; @@ -36,7 +39,8 @@ class MariaDbDriver : public DatabaseDriver { virtual bool finishRestoration(); virtual qint64 databaseDataSize(); virtual QSqlDatabase connection(const QString& connection_name, - DatabaseDriver::DesiredStorageType desired_type = DatabaseDriver::DesiredStorageType::FromSettings); + DatabaseDriver::DesiredStorageType desired_type = + DatabaseDriver::DesiredStorageType::FromSettings); virtual QString autoIncrementPrimaryKey() const; virtual QString blob() const; diff --git a/src/librssguard/definitions/typedefs.h b/src/librssguard/definitions/typedefs.h index 89c5de546..48bc12e09 100644 --- a/src/librssguard/definitions/typedefs.h +++ b/src/librssguard/definitions/typedefs.h @@ -3,12 +3,12 @@ #ifndef TYPEDEFS_H #define TYPEDEFS_H -#include -#include - #include "core/message.h" #include "services/abstract/rootitem.h" +#include +#include + // First item here represents ID (int, primary key) of the item. typedef QList> Assignment; typedef QPair AssignmentItem; diff --git a/src/librssguard/dynamic-shortcuts/dynamicshortcuts.h b/src/librssguard/dynamic-shortcuts/dynamicshortcuts.h index 7c76c007d..5643a82e1 100644 --- a/src/librssguard/dynamic-shortcuts/dynamicshortcuts.h +++ b/src/librssguard/dynamic-shortcuts/dynamicshortcuts.h @@ -9,7 +9,6 @@ class QAction; class DynamicShortcuts { public: - // Checks the application settings and then initializes shortcut of // each action from actions from the settings. static void load(const QList& actions); @@ -19,7 +18,6 @@ class DynamicShortcuts { static void save(const QList& actions); private: - // Constructor. explicit DynamicShortcuts() = default; }; diff --git a/src/librssguard/dynamic-shortcuts/dynamicshortcutswidget.cpp b/src/librssguard/dynamic-shortcuts/dynamicshortcutswidget.cpp index afc3edad1..0a942bf8c 100644 --- a/src/librssguard/dynamic-shortcuts/dynamicshortcutswidget.cpp +++ b/src/librssguard/dynamic-shortcuts/dynamicshortcutswidget.cpp @@ -49,7 +49,8 @@ void DynamicShortcutsWidget::updateShortcuts() { void DynamicShortcutsWidget::populate(QList actions) { m_actionBindings.clear(); std::sort(actions.begin(), actions.end(), [](QAction* lhs, QAction* rhs) { - return QString::localeAwareCompare(lhs->text().replace(QL1S("&"), QString()), rhs->text().replace(QL1S("&"), QString())) < 0; + return QString::localeAwareCompare(lhs->text().replace(QL1S("&"), QString()), + rhs->text().replace(QL1S("&"), QString())) < 0; }); int row_id = 0; @@ -82,7 +83,7 @@ void DynamicShortcutsWidget::populate(QList actions) { action_label->setToolTip(action->toolTip()); action_label->setWordWrap(true); - //action_label->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred); + // action_label->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred); auto* action_icon = new QLabel(this); diff --git a/src/librssguard/dynamic-shortcuts/dynamicshortcutswidget.h b/src/librssguard/dynamic-shortcuts/dynamicshortcutswidget.h index 6ed2efd8f..d1ade2e86 100644 --- a/src/librssguard/dynamic-shortcuts/dynamicshortcutswidget.h +++ b/src/librssguard/dynamic-shortcuts/dynamicshortcutswidget.h @@ -11,7 +11,7 @@ class ShortcutCatcher; typedef QPair ActionBinding; class DynamicShortcutsWidget : public QWidget { - Q_OBJECT + Q_OBJECT public: explicit DynamicShortcutsWidget(QWidget* parent = nullptr); diff --git a/src/librssguard/dynamic-shortcuts/shortcutcatcher.h b/src/librssguard/dynamic-shortcuts/shortcutcatcher.h index b9a9c3e13..4c7222927 100644 --- a/src/librssguard/dynamic-shortcuts/shortcutcatcher.h +++ b/src/librssguard/dynamic-shortcuts/shortcutcatcher.h @@ -10,7 +10,7 @@ class QHBoxLayout; class QKeySequenceEdit; class ShortcutCatcher : public QWidget { - Q_OBJECT + Q_OBJECT public: explicit ShortcutCatcher(QWidget* parent = nullptr); diff --git a/src/librssguard/exceptions/networkexception.cpp b/src/librssguard/exceptions/networkexception.cpp index 2679c6e9c..6b103ea17 100644 --- a/src/librssguard/exceptions/networkexception.cpp +++ b/src/librssguard/exceptions/networkexception.cpp @@ -5,9 +5,8 @@ #include "network-web/networkfactory.h" NetworkException::NetworkException(QNetworkReply::NetworkError error, const QString& message) - : ApplicationException(message.simplified().isEmpty() - ? NetworkFactory::networkErrorText(error) - : message), m_networkError(error) {} + : ApplicationException(message.simplified().isEmpty() ? NetworkFactory::networkErrorText(error) : message), + m_networkError(error) {} QNetworkReply::NetworkError NetworkException::networkError() const { return m_networkError; diff --git a/src/librssguard/exceptions/processexception.cpp b/src/librssguard/exceptions/processexception.cpp index 7a85bad37..d646f42d2 100644 --- a/src/librssguard/exceptions/processexception.cpp +++ b/src/librssguard/exceptions/processexception.cpp @@ -2,8 +2,10 @@ #include "exceptions/processexception.h" -ProcessException::ProcessException(int exit_code, QProcess::ExitStatus exit_status, - QProcess::ProcessError error, const QString& message) +ProcessException::ProcessException(int exit_code, + QProcess::ExitStatus exit_status, + QProcess::ProcessError error, + const QString& message) : ApplicationException(message), m_error(error), m_exitStatus(exit_status), m_exitCode(exit_code) {} QProcess::ExitStatus ProcessException::exitStatus() const { diff --git a/src/librssguard/gui/dialogs/formabout.h b/src/librssguard/gui/dialogs/formabout.h index 0faf4b700..4d289ca6f 100644 --- a/src/librssguard/gui/dialogs/formabout.h +++ b/src/librssguard/gui/dialogs/formabout.h @@ -3,10 +3,10 @@ #ifndef FORMABOUT_H #define FORMABOUT_H -#include - #include "ui_formabout.h" +#include + class RSSGUARD_DLLSPEC FormAbout : public QDialog { Q_OBJECT diff --git a/src/librssguard/gui/dialogs/formaddaccount.h b/src/librssguard/gui/dialogs/formaddaccount.h index 6b9b8c8bb..fe6249dad 100644 --- a/src/librssguard/gui/dialogs/formaddaccount.h +++ b/src/librssguard/gui/dialogs/formaddaccount.h @@ -3,18 +3,20 @@ #ifndef FORMADDACCOUNT_H #define FORMADDACCOUNT_H -#include - #include "ui_formaddaccount.h" +#include + class ServiceEntryPoint; class FeedsModel; class FormAddAccount : public QDialog { - Q_OBJECT + Q_OBJECT public: - explicit FormAddAccount(const QList& entry_points, FeedsModel* model, QWidget* parent = nullptr); + explicit FormAddAccount(const QList& entry_points, + FeedsModel* model, + QWidget* parent = nullptr); virtual ~FormAddAccount(); private slots: diff --git a/src/librssguard/gui/dialogs/formbackupdatabasesettings.h b/src/librssguard/gui/dialogs/formbackupdatabasesettings.h index 26e24f76d..d447cc9d3 100644 --- a/src/librssguard/gui/dialogs/formbackupdatabasesettings.h +++ b/src/librssguard/gui/dialogs/formbackupdatabasesettings.h @@ -3,12 +3,12 @@ #ifndef FORMBACKUPDATABASECONFIG_H #define FORMBACKUPDATABASECONFIG_H -#include - #include "ui_formbackupdatabasesettings.h" +#include + class FormBackupDatabaseSettings : public QDialog { - Q_OBJECT + Q_OBJECT public: explicit FormBackupDatabaseSettings(QWidget* parent = nullptr); diff --git a/src/librssguard/gui/dialogs/formdatabasecleanup.h b/src/librssguard/gui/dialogs/formdatabasecleanup.h index b4c288b01..77df35343 100644 --- a/src/librssguard/gui/dialogs/formdatabasecleanup.h +++ b/src/librssguard/gui/dialogs/formdatabasecleanup.h @@ -3,14 +3,14 @@ #ifndef FORMDATABASECLEANUP_H #define FORMDATABASECLEANUP_H -#include +#include "database/databasecleaner.h" #include "ui_formdatabasecleanup.h" -#include "database/databasecleaner.h" +#include class FormDatabaseCleanup : public QDialog { - Q_OBJECT + Q_OBJECT public: explicit FormDatabaseCleanup(QWidget* parent = nullptr); diff --git a/src/librssguard/gui/dialogs/formlog.h b/src/librssguard/gui/dialogs/formlog.h index 7d49d384b..bba7f0ca7 100644 --- a/src/librssguard/gui/dialogs/formlog.h +++ b/src/librssguard/gui/dialogs/formlog.h @@ -3,10 +3,10 @@ #ifndef FORMLOG_H #define FORMLOG_H -#include - #include "ui_formlog.h" +#include + class FormLog : public QDialog { Q_OBJECT diff --git a/src/librssguard/gui/dialogs/formmain.h b/src/librssguard/gui/dialogs/formmain.h index 0dda5663e..f051457db 100644 --- a/src/librssguard/gui/dialogs/formmain.h +++ b/src/librssguard/gui/dialogs/formmain.h @@ -3,10 +3,10 @@ #ifndef FORMMAIN_H #define FORMMAIN_H -#include - #include "ui_formmain.h" +#include + class StatusBar; class QWidgetAction; diff --git a/src/librssguard/gui/dialogs/formmessagefiltersmanager.h b/src/librssguard/gui/dialogs/formmessagefiltersmanager.h index 978cf5b41..42b134a1c 100644 --- a/src/librssguard/gui/dialogs/formmessagefiltersmanager.h +++ b/src/librssguard/gui/dialogs/formmessagefiltersmanager.h @@ -3,12 +3,12 @@ #ifndef FORMMESSAGEFILTERSMANAGER_H #define FORMMESSAGEFILTERSMANAGER_H -#include - #include "services/abstract/serviceroot.h" #include "ui_formmessagefiltersmanager.h" +#include + class AccountCheckSortedModel; class MessageFilter; class FeedReader; diff --git a/src/librssguard/gui/dialogs/formrestoredatabasesettings.h b/src/librssguard/gui/dialogs/formrestoredatabasesettings.h index e8f689b3a..e50ee5a8e 100644 --- a/src/librssguard/gui/dialogs/formrestoredatabasesettings.h +++ b/src/librssguard/gui/dialogs/formrestoredatabasesettings.h @@ -3,15 +3,14 @@ #ifndef FORMRESTOREDATABASESETTINGS_H #define FORMRESTOREDATABASESETTINGS_H -#include - #include "ui_formrestoredatabasesettings.h" +#include + class FormRestoreDatabaseSettings : public QDialog { - Q_OBJECT + Q_OBJECT public: - // Constructors and destructors. explicit FormRestoreDatabaseSettings(QWidget& parent); virtual ~FormRestoreDatabaseSettings(); diff --git a/src/librssguard/gui/dialogs/formsettings.cpp b/src/librssguard/gui/dialogs/formsettings.cpp index af4863c6d..61efc2be1 100644 --- a/src/librssguard/gui/dialogs/formsettings.cpp +++ b/src/librssguard/gui/dialogs/formsettings.cpp @@ -3,12 +3,8 @@ #include "gui/dialogs/formsettings.h" #include "definitions/definitions.h" -#include "gui/messagebox.h" -#include "miscellaneous/application.h" -#include "miscellaneous/iconfactory.h" -#include "miscellaneous/settings.h" - #include "gui/guiutilities.h" +#include "gui/messagebox.h" #include "gui/settings/settingsbrowsermail.h" #include "gui/settings/settingsdatabase.h" #include "gui/settings/settingsdownloads.h" @@ -20,6 +16,9 @@ #include "gui/settings/settingsnodejs.h" #include "gui/settings/settingsnotifications.h" #include "gui/settings/settingsshortcuts.h" +#include "miscellaneous/application.h" +#include "miscellaneous/iconfactory.h" +#include "miscellaneous/settings.h" #include #include diff --git a/src/librssguard/gui/dialogs/formsettings.h b/src/librssguard/gui/dialogs/formsettings.h index 1e1bd856f..c34a4b52a 100644 --- a/src/librssguard/gui/dialogs/formsettings.h +++ b/src/librssguard/gui/dialogs/formsettings.h @@ -3,10 +3,10 @@ #ifndef FORMSETTINGS_H #define FORMSETTINGS_H -#include - #include "ui_formsettings.h" +#include + class Settings; class SettingsPanel; diff --git a/src/librssguard/gui/dialogs/formupdate.h b/src/librssguard/gui/dialogs/formupdate.h index aacf6511f..0f85bd776 100644 --- a/src/librssguard/gui/dialogs/formupdate.h +++ b/src/librssguard/gui/dialogs/formupdate.h @@ -3,13 +3,12 @@ #ifndef FORMUPDATE_H #define FORMUPDATE_H -#include - -#include "ui_formupdate.h" - #include "miscellaneous/systemfactory.h" #include "network-web/downloader.h" +#include "ui_formupdate.h" + +#include #include #include diff --git a/src/librssguard/gui/feedmessageviewer.h b/src/librssguard/gui/feedmessageviewer.h index 4a386820a..e521cf869 100644 --- a/src/librssguard/gui/feedmessageviewer.h +++ b/src/librssguard/gui/feedmessageviewer.h @@ -3,10 +3,9 @@ #ifndef FEEDMESSAGEVIEWER_H #define FEEDMESSAGEVIEWER_H -#include "gui/tabcontent.h" - #include "core/messagesmodel.h" #include "core/messagesproxymodel.h" +#include "gui/tabcontent.h" class WebBrowser; class MessagePreviewer; diff --git a/src/librssguard/gui/feedsview.cpp b/src/librssguard/gui/feedsview.cpp index 7eafef60b..4aa5dbb39 100644 --- a/src/librssguard/gui/feedsview.cpp +++ b/src/librssguard/gui/feedsview.cpp @@ -18,6 +18,8 @@ #include "services/abstract/rootitem.h" #include "services/abstract/serviceroot.h" +#include + #include #include #include @@ -26,8 +28,6 @@ #include #include -#include - FeedsView::FeedsView(QWidget* parent) : BaseTreeView(parent), m_contextMenuService(nullptr), m_contextMenuBin(nullptr), m_contextMenuCategories(nullptr), m_contextMenuFeeds(nullptr), m_contextMenuImportant(nullptr), m_contextMenuEmptySpace(nullptr), diff --git a/src/librssguard/gui/feedsview.h b/src/librssguard/gui/feedsview.h index 9decb671c..9e4b8bc22 100644 --- a/src/librssguard/gui/feedsview.h +++ b/src/librssguard/gui/feedsview.h @@ -3,9 +3,8 @@ #ifndef FEEDSVIEW_H #define FEEDSVIEW_H -#include "gui/reusable/basetreeview.h" - #include "core/feedsmodel.h" +#include "gui/reusable/basetreeview.h" #include "gui/toolbars/feedstoolbar.h" #include diff --git a/src/librssguard/gui/guiutilities.cpp b/src/librssguard/gui/guiutilities.cpp index a666bd1ae..de765f437 100644 --- a/src/librssguard/gui/guiutilities.cpp +++ b/src/librssguard/gui/guiutilities.cpp @@ -3,7 +3,6 @@ #include "gui/guiutilities.h" #include "definitions/definitions.h" - #include "miscellaneous/application.h" #include "miscellaneous/settings.h" diff --git a/src/librssguard/gui/itemdetails.h b/src/librssguard/gui/itemdetails.h index 4cfeaa1ca..09b71512c 100644 --- a/src/librssguard/gui/itemdetails.h +++ b/src/librssguard/gui/itemdetails.h @@ -3,10 +3,10 @@ #ifndef ITEMDETAILS_H #define ITEMDETAILS_H -#include - #include "ui_itemdetails.h" +#include + class RootItem; class ItemDetails : public QWidget { diff --git a/src/librssguard/gui/mediaplayer/libmpv/libmpvwidget.h b/src/librssguard/gui/mediaplayer/libmpv/libmpvwidget.h index abd34a44d..0a0679ea4 100644 --- a/src/librssguard/gui/mediaplayer/libmpv/libmpvwidget.h +++ b/src/librssguard/gui/mediaplayer/libmpv/libmpvwidget.h @@ -4,10 +4,10 @@ #define LIBMPVWIDGET_H #if defined(MEDIAPLAYER_LIBMPV_OPENGL) -#include - #include +#include + #define BASE_WIDGET QOpenGLWidget #else #include diff --git a/src/librssguard/gui/mediaplayer/libmpv/qthelper.h b/src/librssguard/gui/mediaplayer/libmpv/qthelper.h index 5f093c33e..822e5d9b8 100644 --- a/src/librssguard/gui/mediaplayer/libmpv/qthelper.h +++ b/src/librssguard/gui/mediaplayer/libmpv/qthelper.h @@ -3,9 +3,8 @@ #ifndef LIBMPV_QTHELPER_H_ #define LIBMPV_QTHELPER_H_ -#include - #include +#include #include #include diff --git a/src/librssguard/gui/mediaplayer/mediaplayer.h b/src/librssguard/gui/mediaplayer/mediaplayer.h index a0b73bd9c..66b50d386 100644 --- a/src/librssguard/gui/mediaplayer/mediaplayer.h +++ b/src/librssguard/gui/mediaplayer/mediaplayer.h @@ -3,9 +3,8 @@ #ifndef MEDIAPLAYER_H #define MEDIAPLAYER_H -#include "gui/tabcontent.h" - #include "gui/mediaplayer/playerbackend.h" +#include "gui/tabcontent.h" #include "ui_mediaplayer.h" diff --git a/src/librssguard/gui/mediaplayer/playerbackend.h b/src/librssguard/gui/mediaplayer/playerbackend.h index 334e7305a..8cf6d4fd4 100644 --- a/src/librssguard/gui/mediaplayer/playerbackend.h +++ b/src/librssguard/gui/mediaplayer/playerbackend.h @@ -3,9 +3,8 @@ #ifndef PLAYERBACKEND_H #define PLAYERBACKEND_H -#include - #include +#include class QVBoxLayout; class Application; diff --git a/src/librssguard/gui/mediaplayer/qtmultimedia/qtmultimediabackend.h b/src/librssguard/gui/mediaplayer/qtmultimedia/qtmultimediabackend.h index f9168a196..808b74a22 100644 --- a/src/librssguard/gui/mediaplayer/qtmultimedia/qtmultimediabackend.h +++ b/src/librssguard/gui/mediaplayer/qtmultimedia/qtmultimediabackend.h @@ -5,9 +5,8 @@ #include "gui/mediaplayer/playerbackend.h" -#include - #include +#include #if QT_VERSION_MAJOR == 6 #define PLAYBACK_STATE PlaybackState diff --git a/src/librssguard/gui/messagebox.h b/src/librssguard/gui/messagebox.h index 0d3461f56..861a5a2a1 100644 --- a/src/librssguard/gui/messagebox.h +++ b/src/librssguard/gui/messagebox.h @@ -3,11 +3,11 @@ #ifndef MESSAGEBOX_H #define MESSAGEBOX_H +#include + #include #include -#include - class RSSGUARD_DLLSPEC MsgBox : public QMessageBox { Q_OBJECT diff --git a/src/librssguard/gui/messagebrowser.cpp b/src/librssguard/gui/messagebrowser.cpp index 3cc89303e..198235a2e 100644 --- a/src/librssguard/gui/messagebrowser.cpp +++ b/src/librssguard/gui/messagebrowser.cpp @@ -18,7 +18,7 @@ MessageBrowser::MessageBrowser(bool should_resize_to_fit, QWidget* parent) : QWidget(parent), m_txtBrowser(new MessageTextBrowser(this)), m_searchWidget(new SearchTextWidget(this)), - m_layout(new QVBoxLayout(this)) { + m_layout(new QVBoxLayout(this)) { m_layout->setContentsMargins(3, 3, 3, 3); m_layout->addWidget(m_txtBrowser, 1); m_layout->addWidget(m_searchWidget); @@ -41,9 +41,7 @@ MessageBrowser::MessageBrowser(bool should_resize_to_fit, QWidget* parent) }); connect(m_txtBrowser, &QTextBrowser::anchorClicked, this, &MessageBrowser::onAnchorClicked); - connect(m_txtBrowser, - QOverload::of(&QTextBrowser::highlighted), - [=](const QUrl& url) { + connect(m_txtBrowser, QOverload::of(&QTextBrowser::highlighted), [=](const QUrl& url) { Q_UNUSED(url) QToolTip::showText(QCursor::pos(), tr("Click this link to download it or open it with external browser."), this); }); @@ -86,7 +84,7 @@ QString MessageBrowser::prepareHtmlForMessage(const Message& message) { QRegularExpression imgTagRegex("\\]*src\\s*=\\s*[\"\']([^\"\']*)[\"\'][^\\>]*\\>", QRegularExpression::PatternOption::CaseInsensitiveOption | - QRegularExpression::PatternOption::InvertedGreedinessOption); + QRegularExpression::PatternOption::InvertedGreedinessOption); QRegularExpressionMatchIterator i = imgTagRegex.globalMatch(message.m_contents); QString pictures_html; @@ -120,10 +118,9 @@ QString MessageBrowser::prepareHtmlForMessage(const Message& message) { "a { color: %2; }" "" "%1" - "").arg(html, - qApp->skins()->currentSkin() - .colorForModel(SkinEnums::PaletteColors::FgInteresting) - .value().name()); + "") + .arg(html, + qApp->skins()->currentSkin().colorForModel(SkinEnums::PaletteColors::FgInteresting).value().name()); } bool MessageBrowser::eventFilter(QObject* watched, QEvent* event) { @@ -149,15 +146,14 @@ bool MessageBrowser::eventFilter(QObject* watched, QEvent* event) { } void MessageBrowser::onAnchorClicked(const QUrl& url) { - if (url.toString().startsWith(INTERNAL_URL_PASSATTACHMENT) && - m_root != nullptr && + if (url.toString().startsWith(INTERNAL_URL_PASSATTACHMENT) && m_root != nullptr && m_root->getParentServiceRoot()->downloadAttachmentOnMyOwn(url)) { return; } if (!url.isEmpty()) { - bool open_externally_now = qApp->settings()->value(GROUP(Browser), - SETTING(Browser::OpenLinksInExternalBrowserRightAway)).toBool(); + bool open_externally_now = + qApp->settings()->value(GROUP(Browser), SETTING(Browser::OpenLinksInExternalBrowserRightAway)).toBool(); if (open_externally_now) { qApp->web()->openUrlInExternalBrowser(url.toString()); @@ -198,7 +194,10 @@ void MessageBrowser::onAnchorClicked(const QUrl& url) { } } else { - MsgBox::show(qApp->mainFormWidget(), QMessageBox::Warning, tr("Incorrect link"), tr("Selected hyperlink is invalid.")); + MsgBox::show(qApp->mainFormWidget(), + QMessageBox::Warning, + tr("Incorrect link"), + tr("Selected hyperlink is invalid.")); } } diff --git a/src/librssguard/gui/messagebrowser.h b/src/librssguard/gui/messagebrowser.h index 4422159ce..bbecc9dcb 100644 --- a/src/librssguard/gui/messagebrowser.h +++ b/src/librssguard/gui/messagebrowser.h @@ -3,13 +3,11 @@ #ifndef MESSAGEBROWSER_H #define MESSAGEBROWSER_H -#include - #include "core/message.h" - #include "services/abstract/rootitem.h" #include +#include class RootItem; class QVBoxLayout; @@ -17,7 +15,7 @@ class MessageTextBrowser; class SearchTextWidget; class MessageBrowser : public QWidget { - Q_OBJECT + Q_OBJECT public: explicit MessageBrowser(bool should_resize_to_fit, QWidget* parent = nullptr); diff --git a/src/librssguard/gui/messagepreviewer.h b/src/librssguard/gui/messagepreviewer.h index f4fab4894..4a89ccbd9 100644 --- a/src/librssguard/gui/messagepreviewer.h +++ b/src/librssguard/gui/messagepreviewer.h @@ -3,9 +3,8 @@ #ifndef MESSAGEPREVIEWER_H #define MESSAGEPREVIEWER_H -#include "gui/tabcontent.h" - #include "core/message.h" +#include "gui/tabcontent.h" #include "services/abstract/label.h" #include "services/abstract/rootitem.h" diff --git a/src/librssguard/gui/messagesview.h b/src/librssguard/gui/messagesview.h index a15205785..85546ab03 100644 --- a/src/librssguard/gui/messagesview.h +++ b/src/librssguard/gui/messagesview.h @@ -3,10 +3,9 @@ #ifndef MESSAGESVIEW_H #define MESSAGESVIEW_H -#include "gui/reusable/basetreeview.h" - #include "core/messagesmodel.h" #include "core/messagesproxymodel.h" +#include "gui/reusable/basetreeview.h" #include "gui/reusable/searchlineedit.h" #include "services/abstract/rootitem.h" diff --git a/src/librssguard/gui/messagetextbrowser.cpp b/src/librssguard/gui/messagetextbrowser.cpp index 1d883eb6b..0aab891c6 100644 --- a/src/librssguard/gui/messagetextbrowser.cpp +++ b/src/librssguard/gui/messagetextbrowser.cpp @@ -26,8 +26,9 @@ QVariant MessageTextBrowser::loadResource(int type, const QUrl& name) { case QTextDocument::ResourceType::ImageResource: { if (qApp->settings()->value(GROUP(Messages), SETTING(Messages::DisplayImagePlaceholders)).toBool()) { if (m_imagePlaceholder.isNull()) { - m_imagePlaceholder = qApp->icons()->miscPixmap(QSL("image-placeholder")).scaledToWidth(20, - Qt::TransformationMode::FastTransformation); + m_imagePlaceholder = qApp->icons() + ->miscPixmap(QSL("image-placeholder")) + .scaledToWidth(20, Qt::TransformationMode::FastTransformation); } return m_imagePlaceholder; diff --git a/src/librssguard/gui/messagetextbrowser.h b/src/librssguard/gui/messagetextbrowser.h index 9c4bcb574..1121bcb78 100644 --- a/src/librssguard/gui/messagetextbrowser.h +++ b/src/librssguard/gui/messagetextbrowser.h @@ -3,12 +3,12 @@ #ifndef MESSAGETEXTBROWSER_H #define MESSAGETEXTBROWSER_H -#include - #include "core/message.h" +#include + class MessageTextBrowser : public QTextBrowser { - Q_OBJECT + Q_OBJECT public: explicit MessageTextBrowser(QWidget* parent = nullptr); @@ -20,7 +20,7 @@ class MessageTextBrowser : public QTextBrowser { protected: virtual void contextMenuEvent(QContextMenuEvent* event); virtual void wheelEvent(QWheelEvent* event); - virtual void resizeEvent (QResizeEvent* event); + virtual void resizeEvent(QResizeEvent* event); private: QPixmap m_imagePlaceholder; diff --git a/src/librssguard/gui/notifications/articlelistnotification.h b/src/librssguard/gui/notifications/articlelistnotification.h index c7a2e6b2d..8e26db32b 100644 --- a/src/librssguard/gui/notifications/articlelistnotification.h +++ b/src/librssguard/gui/notifications/articlelistnotification.h @@ -3,9 +3,8 @@ #ifndef ARTICLELISTNOTIFICATION_H #define ARTICLELISTNOTIFICATION_H -#include "gui/notifications/basetoastnotification.h" - #include "core/message.h" +#include "gui/notifications/basetoastnotification.h" #include "ui_articlelistnotification.h" diff --git a/src/librssguard/gui/notifications/basetoastnotification.cpp b/src/librssguard/gui/notifications/basetoastnotification.cpp index f3653c652..f8620dd24 100644 --- a/src/librssguard/gui/notifications/basetoastnotification.cpp +++ b/src/librssguard/gui/notifications/basetoastnotification.cpp @@ -5,13 +5,13 @@ #include "miscellaneous/iconfactory.h" #include "miscellaneous/settings.h" +#include + #include #include #include #include -#include - using namespace std::chrono_literals; BaseToastNotification::BaseToastNotification(QWidget* parent) : QDialog(parent), m_timerId(-1) { diff --git a/src/librssguard/gui/notifications/basetoastnotification.h b/src/librssguard/gui/notifications/basetoastnotification.h index 141558b53..44910422e 100644 --- a/src/librssguard/gui/notifications/basetoastnotification.h +++ b/src/librssguard/gui/notifications/basetoastnotification.h @@ -4,7 +4,6 @@ #define BASETOASTNOTIFICATION_H #include - #include class QAbstractButton; diff --git a/src/librssguard/gui/notifications/notificationseditor.cpp b/src/librssguard/gui/notifications/notificationseditor.cpp index f786de410..5b9795b54 100644 --- a/src/librssguard/gui/notifications/notificationseditor.cpp +++ b/src/librssguard/gui/notifications/notificationseditor.cpp @@ -19,20 +19,27 @@ void NotificationsEditor::loadNotifications(const QList& notificat for (auto ev : all_events) { if (notif.any([ev](auto n) { - return n.event() == ev; - })) { + return n.event() == ev; + })) { auto* notif_editor = new SingleNotificationEditor(notif.first([ev](auto n) { return n.event() == ev; - }), this); + }), + this); - connect(notif_editor, &SingleNotificationEditor::notificationChanged, this, &NotificationsEditor::someNotificationChanged); + connect(notif_editor, + &SingleNotificationEditor::notificationChanged, + this, + &NotificationsEditor::someNotificationChanged); m_layout->addWidget(notif_editor); } else { auto* notif_editor = new SingleNotificationEditor(Notification(ev), this); - connect(notif_editor, &SingleNotificationEditor::notificationChanged, this, &NotificationsEditor::someNotificationChanged); + connect(notif_editor, + &SingleNotificationEditor::notificationChanged, + this, + &NotificationsEditor::someNotificationChanged); m_layout->addWidget(notif_editor); } @@ -42,9 +49,11 @@ void NotificationsEditor::loadNotifications(const QList& notificat } QList NotificationsEditor::allNotifications() const { - auto lst = boolinq::from(findChildren()).select([](const SingleNotificationEditor* ed) { - return ed->notification(); - }).toStdList(); + auto lst = boolinq::from(findChildren()) + .select([](const SingleNotificationEditor* ed) { + return ed->notification(); + }) + .toStdList(); return FROM_STD_LIST(QList, lst); } diff --git a/src/librssguard/gui/notifications/notificationseditor.h b/src/librssguard/gui/notifications/notificationseditor.h index 138f9f317..1dff0619a 100644 --- a/src/librssguard/gui/notifications/notificationseditor.h +++ b/src/librssguard/gui/notifications/notificationseditor.h @@ -3,16 +3,16 @@ #ifndef NOTIFICATIONSEDITOR_H #define NOTIFICATIONSEDITOR_H -#include +#include "miscellaneous/notification.h" #include "ui_notificationseditor.h" -#include "miscellaneous/notification.h" +#include class QVBoxLayout; class NotificationsEditor : public QWidget { - Q_OBJECT + Q_OBJECT public: explicit NotificationsEditor(QWidget* parent = nullptr); diff --git a/src/librssguard/gui/notifications/singlenotificationeditor.h b/src/librssguard/gui/notifications/singlenotificationeditor.h index 399498574..d26272362 100644 --- a/src/librssguard/gui/notifications/singlenotificationeditor.h +++ b/src/librssguard/gui/notifications/singlenotificationeditor.h @@ -3,14 +3,14 @@ #ifndef SINGLENOTIFICATIONEDITOR_H #define SINGLENOTIFICATIONEDITOR_H -#include +#include "miscellaneous/notification.h" #include "ui_singlenotificationeditor.h" -#include "miscellaneous/notification.h" +#include class SingleNotificationEditor : public QGroupBox { - Q_OBJECT + Q_OBJECT public: explicit SingleNotificationEditor(const Notification& notification, QWidget* parent = nullptr); diff --git a/src/librssguard/gui/notifications/toastnotification.h b/src/librssguard/gui/notifications/toastnotification.h index 463671914..d1470b31d 100644 --- a/src/librssguard/gui/notifications/toastnotification.h +++ b/src/librssguard/gui/notifications/toastnotification.h @@ -4,7 +4,6 @@ #define TOASTNOTIFICATION_H #include "gui/notifications/basetoastnotification.h" - #include "miscellaneous/application.h" #include "ui_toastnotification.h" diff --git a/src/librssguard/gui/notifications/toastnotificationsmanager.h b/src/librssguard/gui/notifications/toastnotificationsmanager.h index 6634290eb..fdc1c5743 100644 --- a/src/librssguard/gui/notifications/toastnotificationsmanager.h +++ b/src/librssguard/gui/notifications/toastnotificationsmanager.h @@ -3,10 +3,10 @@ #ifndef TOASTNOTIFICATIONSMANAGER_H #define TOASTNOTIFICATIONSMANAGER_H -#include - #include "miscellaneous/application.h" +#include + class BaseToastNotification; class ToastNotification; class ArticleListNotification; diff --git a/src/librssguard/gui/reusable/articleamountcontrol.h b/src/librssguard/gui/reusable/articleamountcontrol.h index c9185a63b..d01be758a 100644 --- a/src/librssguard/gui/reusable/articleamountcontrol.h +++ b/src/librssguard/gui/reusable/articleamountcontrol.h @@ -3,11 +3,11 @@ #ifndef ARTICLEAMOUNTCONTROL_H #define ARTICLEAMOUNTCONTROL_H -#include +#include "services/abstract/feed.h" #include "ui_articleamountcontrol.h" -#include "services/abstract/feed.h" +#include class ArticleAmountControl : public QWidget { Q_OBJECT diff --git a/src/librssguard/gui/reusable/baselineedit.h b/src/librssguard/gui/reusable/baselineedit.h index ae4e69acf..9bb50e47c 100644 --- a/src/librssguard/gui/reusable/baselineedit.h +++ b/src/librssguard/gui/reusable/baselineedit.h @@ -6,7 +6,7 @@ #include class BaseLineEdit : public QLineEdit { - Q_OBJECT + Q_OBJECT public: explicit BaseLineEdit(QWidget* parent = nullptr); diff --git a/src/librssguard/gui/reusable/comboboxwithstatus.cpp b/src/librssguard/gui/reusable/comboboxwithstatus.cpp index 293f24489..0a43983c2 100644 --- a/src/librssguard/gui/reusable/comboboxwithstatus.cpp +++ b/src/librssguard/gui/reusable/comboboxwithstatus.cpp @@ -6,8 +6,7 @@ #include -ComboBoxWithStatus::ComboBoxWithStatus(QWidget* parent) - : WidgetWithStatus(parent) { +ComboBoxWithStatus::ComboBoxWithStatus(QWidget* parent) : WidgetWithStatus(parent) { m_wdgInput = new QComboBox(this); // Set correct size for the tool button. diff --git a/src/librssguard/gui/reusable/comboboxwithstatus.h b/src/librssguard/gui/reusable/comboboxwithstatus.h index 5b6050b6d..9801d6f88 100644 --- a/src/librssguard/gui/reusable/comboboxwithstatus.h +++ b/src/librssguard/gui/reusable/comboboxwithstatus.h @@ -8,10 +8,9 @@ #include class ComboBoxWithStatus : public WidgetWithStatus { - Q_OBJECT + Q_OBJECT public: - // Constructors and destructors. explicit ComboBoxWithStatus(QWidget* parent = nullptr); virtual ~ComboBoxWithStatus() = default; @@ -19,7 +18,6 @@ class ComboBoxWithStatus : public WidgetWithStatus { inline QComboBox* comboBox() const { return static_cast(m_wdgInput); } - }; #endif // COMBOBOXWITHSTATUS_H diff --git a/src/librssguard/gui/reusable/edittableview.h b/src/librssguard/gui/reusable/edittableview.h index bf106c6b4..83a078f89 100644 --- a/src/librssguard/gui/reusable/edittableview.h +++ b/src/librssguard/gui/reusable/edittableview.h @@ -6,7 +6,7 @@ #include class EditTableView : public QTableView { - Q_OBJECT + Q_OBJECT public: explicit EditTableView(QWidget* parent = nullptr); diff --git a/src/librssguard/gui/reusable/jssyntaxhighlighter.h b/src/librssguard/gui/reusable/jssyntaxhighlighter.h index 00a5918d1..08cb01c63 100644 --- a/src/librssguard/gui/reusable/jssyntaxhighlighter.h +++ b/src/librssguard/gui/reusable/jssyntaxhighlighter.h @@ -3,9 +3,8 @@ #ifndef JSSYNTAXHIGHLIGHTER_H #define JSSYNTAXHIGHLIGHTER_H -#include - #include +#include class JsSyntaxHighlighter : public QSyntaxHighlighter { Q_OBJECT diff --git a/src/librssguard/gui/reusable/labelsmenu.h b/src/librssguard/gui/reusable/labelsmenu.h index 3f338d645..21a753ae6 100644 --- a/src/librssguard/gui/reusable/labelsmenu.h +++ b/src/librssguard/gui/reusable/labelsmenu.h @@ -4,11 +4,10 @@ #define LABELSMENU_H #include "gui/reusable/nonclosablemenu.h" - #include "services/abstract/label.h" class LabelsMenu : public NonClosableMenu { - Q_OBJECT + Q_OBJECT public: explicit LabelsMenu(const QList& messages, const QList& labels, QWidget* parent = nullptr); @@ -31,7 +30,7 @@ class LabelsMenu : public NonClosableMenu { }; class LabelAction : public QAction { - Q_OBJECT + Q_OBJECT public: explicit LabelAction(Label* label, QWidget* parent_widget, QObject* parent); diff --git a/src/librssguard/gui/reusable/labelwithstatus.cpp b/src/librssguard/gui/reusable/labelwithstatus.cpp index 50c2558cd..cc267e8a9 100644 --- a/src/librssguard/gui/reusable/labelwithstatus.cpp +++ b/src/librssguard/gui/reusable/labelwithstatus.cpp @@ -6,8 +6,7 @@ #include -LabelWithStatus::LabelWithStatus(QWidget* parent) - : WidgetWithStatus(parent) { +LabelWithStatus::LabelWithStatus(QWidget* parent) : WidgetWithStatus(parent) { m_wdgInput = new QLabel(this); // Set correct size for the tool button. diff --git a/src/librssguard/gui/reusable/lineeditwithstatus.cpp b/src/librssguard/gui/reusable/lineeditwithstatus.cpp index b53068808..b7bb2b2b3 100644 --- a/src/librssguard/gui/reusable/lineeditwithstatus.cpp +++ b/src/librssguard/gui/reusable/lineeditwithstatus.cpp @@ -7,8 +7,7 @@ #include -LineEditWithStatus::LineEditWithStatus(QWidget* parent) - : WidgetWithStatus(parent) { +LineEditWithStatus::LineEditWithStatus(QWidget* parent) : WidgetWithStatus(parent) { m_wdgInput = new BaseLineEdit(this); setFocusProxy(m_wdgInput); @@ -22,8 +21,7 @@ LineEditWithStatus::LineEditWithStatus(QWidget* parent) m_layout->addWidget(m_btnStatus); } -TextEditWithStatus::TextEditWithStatus(QWidget* parent) - : WidgetWithStatus(parent) { +TextEditWithStatus::TextEditWithStatus(QWidget* parent) : WidgetWithStatus(parent) { m_wdgInput = new QPlainTextEdit(this); setFocusProxy(m_wdgInput); diff --git a/src/librssguard/gui/reusable/lineeditwithstatus.h b/src/librssguard/gui/reusable/lineeditwithstatus.h index b5db33094..fe3df2b01 100644 --- a/src/librssguard/gui/reusable/lineeditwithstatus.h +++ b/src/librssguard/gui/reusable/lineeditwithstatus.h @@ -3,9 +3,8 @@ #ifndef LINEEDITWITHSTATUS_H #define LINEEDITWITHSTATUS_H -#include "gui/reusable/widgetwithstatus.h" - #include "gui/reusable/baselineedit.h" +#include "gui/reusable/widgetwithstatus.h" #include diff --git a/src/librssguard/gui/reusable/locationlineedit.h b/src/librssguard/gui/reusable/locationlineedit.h index cddbe03d8..cd7785f88 100644 --- a/src/librssguard/gui/reusable/locationlineedit.h +++ b/src/librssguard/gui/reusable/locationlineedit.h @@ -9,7 +9,7 @@ class WebBrowser; class GoogleSuggest; class LocationLineEdit : public BaseLineEdit { - Q_OBJECT + Q_OBJECT public: explicit LocationLineEdit(QWidget* parent = nullptr); diff --git a/src/librssguard/gui/reusable/messagecountspinbox.h b/src/librssguard/gui/reusable/messagecountspinbox.h index bb7acbd30..98a438749 100644 --- a/src/librssguard/gui/reusable/messagecountspinbox.h +++ b/src/librssguard/gui/reusable/messagecountspinbox.h @@ -6,7 +6,7 @@ #include class MessageCountSpinBox : public QSpinBox { - Q_OBJECT + Q_OBJECT public: explicit MessageCountSpinBox(QWidget* parent = nullptr); diff --git a/src/librssguard/gui/reusable/networkproxydetails.cpp b/src/librssguard/gui/reusable/networkproxydetails.cpp index 9eb786ee5..e1953fda5 100644 --- a/src/librssguard/gui/reusable/networkproxydetails.cpp +++ b/src/librssguard/gui/reusable/networkproxydetails.cpp @@ -2,10 +2,10 @@ #include "gui/reusable/networkproxydetails.h" -#include "ui_networkproxydetails.h" - #include "definitions/definitions.h" +#include "ui_networkproxydetails.h" + #include NetworkProxyDetails::NetworkProxyDetails(QWidget* parent) : QWidget(parent), m_ui(new Ui::NetworkProxyDetails()) { diff --git a/src/librssguard/gui/reusable/networkproxydetails.h b/src/librssguard/gui/reusable/networkproxydetails.h index f5e017066..b57e57b39 100644 --- a/src/librssguard/gui/reusable/networkproxydetails.h +++ b/src/librssguard/gui/reusable/networkproxydetails.h @@ -3,9 +3,8 @@ #ifndef NETWORKPROXYDETAILS_H #define NETWORKPROXYDETAILS_H -#include - #include +#include namespace Ui { class NetworkProxyDetails; diff --git a/src/librssguard/gui/reusable/plaintoolbutton.h b/src/librssguard/gui/reusable/plaintoolbutton.h index 1819b244a..818efcee1 100644 --- a/src/librssguard/gui/reusable/plaintoolbutton.h +++ b/src/librssguard/gui/reusable/plaintoolbutton.h @@ -6,7 +6,7 @@ #include class PlainToolButton : public QToolButton { - Q_OBJECT + Q_OBJECT public: explicit PlainToolButton(QWidget* parent = nullptr); diff --git a/src/librssguard/gui/reusable/searchlineedit.h b/src/librssguard/gui/reusable/searchlineedit.h index 4be8a3e62..96b82b733 100644 --- a/src/librssguard/gui/reusable/searchlineedit.h +++ b/src/librssguard/gui/reusable/searchlineedit.h @@ -19,7 +19,11 @@ class SearchLineEdit : public BaseLineEdit { int m_data; }; - enum class SearchMode { FixedString = 1, Wildcard = 2, RegularExpression = 4 }; + enum class SearchMode { + FixedString = 1, + Wildcard = 2, + RegularExpression = 4 + }; explicit SearchLineEdit(const QList& choices, QWidget* parent = nullptr); diff --git a/src/librssguard/gui/reusable/searchtextwidget.h b/src/librssguard/gui/reusable/searchtextwidget.h index b5a8d0c3a..43b5fb9fc 100644 --- a/src/librssguard/gui/reusable/searchtextwidget.h +++ b/src/librssguard/gui/reusable/searchtextwidget.h @@ -3,16 +3,16 @@ #ifndef SEARCHTEXTWIDGET_H #define SEARCHTEXTWIDGET_H -#include - #include "ui_searchtextwidget.h" +#include + namespace Ui { class SearchTextWidget; } class SearchTextWidget : public QWidget { - Q_OBJECT + Q_OBJECT public: explicit SearchTextWidget(QWidget* parent = nullptr); diff --git a/src/librssguard/gui/reusable/squeezelabel.h b/src/librssguard/gui/reusable/squeezelabel.h index 66ee252f2..fcec0b979 100644 --- a/src/librssguard/gui/reusable/squeezelabel.h +++ b/src/librssguard/gui/reusable/squeezelabel.h @@ -6,7 +6,7 @@ #include class SqueezeLabel : public QLabel { - Q_OBJECT + Q_OBJECT public: explicit SqueezeLabel(QWidget* parent = nullptr); diff --git a/src/librssguard/gui/reusable/styleditemdelegatewithoutfocus.h b/src/librssguard/gui/reusable/styleditemdelegatewithoutfocus.h index 45d08ac70..7e5d19d1f 100644 --- a/src/librssguard/gui/reusable/styleditemdelegatewithoutfocus.h +++ b/src/librssguard/gui/reusable/styleditemdelegatewithoutfocus.h @@ -12,7 +12,7 @@ #endif class StyledItemDelegateWithoutFocus : public QStyledItemDelegate { - Q_OBJECT + Q_OBJECT public: explicit StyledItemDelegateWithoutFocus(int height_row, int padding_row, QObject* parent = nullptr); diff --git a/src/librssguard/gui/reusable/widgetwithstatus.cpp b/src/librssguard/gui/reusable/widgetwithstatus.cpp index 31c115b63..731ed89d3 100644 --- a/src/librssguard/gui/reusable/widgetwithstatus.cpp +++ b/src/librssguard/gui/reusable/widgetwithstatus.cpp @@ -7,8 +7,7 @@ #include -WidgetWithStatus::WidgetWithStatus(QWidget* parent) - : QWidget(parent), m_wdgInput(nullptr) { +WidgetWithStatus::WidgetWithStatus(QWidget* parent) : QWidget(parent), m_wdgInput(nullptr) { m_layout = new QHBoxLayout(this); m_btnStatus = new PlainToolButton(this); m_btnStatus->setFocusPolicy(Qt::FocusPolicy::NoFocus); diff --git a/src/librssguard/gui/richtexteditor/mtextedit.cpp b/src/librssguard/gui/richtexteditor/mtextedit.cpp index 4906d889d..c99b70816 100644 --- a/src/librssguard/gui/richtexteditor/mtextedit.cpp +++ b/src/librssguard/gui/richtexteditor/mtextedit.cpp @@ -6,14 +6,14 @@ #include "definitions/definitions.h" +#include + #include #include #include #include #include -#include - MTextEdit::MTextEdit(QWidget* parent) : QTextEdit(parent) {} bool MTextEdit::canInsertFromMimeData(const QMimeData* source) const { diff --git a/src/librssguard/gui/settings/settingsbrowsermail.h b/src/librssguard/gui/settings/settingsbrowsermail.h index af8fef47c..c1c5fb84c 100644 --- a/src/librssguard/gui/settings/settingsbrowsermail.h +++ b/src/librssguard/gui/settings/settingsbrowsermail.h @@ -4,7 +4,6 @@ #define SETTINGSBROWSERMAIL_H #include "gui/settings/settingspanel.h" - #include "miscellaneous/externaltool.h" #include "ui_settingsbrowsermail.h" diff --git a/src/librssguard/gui/systemtrayicon.h b/src/librssguard/gui/systemtrayicon.h index 2ae76545a..f30377116 100644 --- a/src/librssguard/gui/systemtrayicon.h +++ b/src/librssguard/gui/systemtrayicon.h @@ -3,14 +3,13 @@ #ifndef SYSTEMTRAYICON_H #define SYSTEMTRAYICON_H -#include - #include "definitions/definitions.h" +#include + #include #include - -#include +#include class FormMain; class QEvent; diff --git a/src/librssguard/gui/tabbar.h b/src/librssguard/gui/tabbar.h index ec29c4b51..8aecfa18c 100644 --- a/src/librssguard/gui/tabbar.h +++ b/src/librssguard/gui/tabbar.h @@ -9,7 +9,7 @@ #include class TabBar : public QTabBar { - Q_OBJECT + Q_OBJECT public: enum class TabType { @@ -33,7 +33,6 @@ class TabBar : public QTabBar { void closeTabViaButton(); private: - // Reimplementations. void mouseDoubleClickEvent(QMouseEvent* event); void mousePressEvent(QMouseEvent* event); @@ -49,9 +48,9 @@ inline TabBar::TabType TabBar::tabType(int index) const { return static_cast(tabData(index).toInt()); } -TabBar::TabType operator| (TabBar::TabType a, TabBar::TabType b); -TabBar::TabType operator& (TabBar::TabType a, TabBar::TabType b); -TabBar::TabType& operator|= (TabBar::TabType& a, TabBar::TabType b); -TabBar::TabType& operator&= (TabBar::TabType& a, TabBar::TabType b); +TabBar::TabType operator|(TabBar::TabType a, TabBar::TabType b); +TabBar::TabType operator&(TabBar::TabType a, TabBar::TabType b); +TabBar::TabType& operator|=(TabBar::TabType& a, TabBar::TabType b); +TabBar::TabType& operator&=(TabBar::TabType& a, TabBar::TabType b); #endif // TABBAR_H diff --git a/src/librssguard/gui/tabcontent.h b/src/librssguard/gui/tabcontent.h index 124696019..7c52658d4 100644 --- a/src/librssguard/gui/tabcontent.h +++ b/src/librssguard/gui/tabcontent.h @@ -9,7 +9,7 @@ class WebBrowser; // Base class for all widgets which are placed inside tabs of TabWidget class TabContent : public QWidget { - Q_OBJECT + Q_OBJECT public: explicit TabContent(QWidget* parent = nullptr); diff --git a/src/librssguard/gui/tabwidget.h b/src/librssguard/gui/tabwidget.h index 715190fcf..b25eb4728 100644 --- a/src/librssguard/gui/tabwidget.h +++ b/src/librssguard/gui/tabwidget.h @@ -3,12 +3,11 @@ #ifndef TABWIDGET_H #define TABWIDGET_H -#include - #include "core/message.h" #include "gui/tabbar.h" #include "gui/tabcontent.h" +#include #include class QMenu; diff --git a/src/librssguard/gui/toolbars/basetoolbar.h b/src/librssguard/gui/toolbars/basetoolbar.h index d0e4aee19..d7bd7d28e 100644 --- a/src/librssguard/gui/toolbars/basetoolbar.h +++ b/src/librssguard/gui/toolbars/basetoolbar.h @@ -7,7 +7,6 @@ class BaseBar { public: - // Returns all actions which can be added to the toolbar. virtual QList availableActions() const = 0; @@ -39,7 +38,7 @@ class BaseBar { }; class BaseToolBar : public QToolBar, public BaseBar { - Q_OBJECT + Q_OBJECT public: explicit BaseToolBar(const QString& title, QWidget* parent = nullptr); diff --git a/src/librssguard/gui/toolbars/feedstoolbar.h b/src/librssguard/gui/toolbars/feedstoolbar.h index 127e41c9a..772f8d606 100644 --- a/src/librssguard/gui/toolbars/feedstoolbar.h +++ b/src/librssguard/gui/toolbars/feedstoolbar.h @@ -3,9 +3,8 @@ #ifndef FEEDSTOOLBAR_H #define FEEDSTOOLBAR_H -#include "gui/toolbars/basetoolbar.h" - #include "gui/reusable/searchlineedit.h" +#include "gui/toolbars/basetoolbar.h" class QWidgetAction; @@ -13,7 +12,10 @@ class FeedsToolBar : public BaseToolBar { Q_OBJECT public: - enum class SearchFields { SearchTitleOnly = 1, SearchAll = 2 }; + enum class SearchFields { + SearchTitleOnly = 1, + SearchAll = 2 + }; explicit FeedsToolBar(const QString& title, QWidget* parent = nullptr); diff --git a/src/librssguard/gui/toolbars/messagestoolbar.cpp b/src/librssguard/gui/toolbars/messagestoolbar.cpp index 3d986b86b..0abc9337c 100644 --- a/src/librssguard/gui/toolbars/messagestoolbar.cpp +++ b/src/librssguard/gui/toolbars/messagestoolbar.cpp @@ -8,12 +8,13 @@ #include "miscellaneous/iconfactory.h" #include "miscellaneous/settings.h" +#include + #include #include #include #include #include -#include using namespace std::chrono_literals; diff --git a/src/librssguard/gui/toolbars/messagestoolbar.h b/src/librssguard/gui/toolbars/messagestoolbar.h index f3b0e2280..f567d9e36 100644 --- a/src/librssguard/gui/toolbars/messagestoolbar.h +++ b/src/librssguard/gui/toolbars/messagestoolbar.h @@ -3,11 +3,10 @@ #ifndef NEWSTOOLBAR_H #define NEWSTOOLBAR_H -#include "gui/toolbars/basetoolbar.h" - #include "core/messagesmodel.h" #include "core/messagesproxymodel.h" #include "gui/reusable/searchlineedit.h" +#include "gui/toolbars/basetoolbar.h" class QWidgetAction; class QToolButton; @@ -18,7 +17,10 @@ class MessagesToolBar : public BaseToolBar { Q_OBJECT public: - enum class SearchFields { SearchTitleOnly = 1, SearchAll = 2 }; + enum class SearchFields { + SearchTitleOnly = 1, + SearchAll = 2 + }; explicit MessagesToolBar(const QString& title, QWidget* parent = nullptr); diff --git a/src/librssguard/gui/toolbars/statusbar.h b/src/librssguard/gui/toolbars/statusbar.h index 3db6a521f..cc00fa157 100644 --- a/src/librssguard/gui/toolbars/statusbar.h +++ b/src/librssguard/gui/toolbars/statusbar.h @@ -3,16 +3,16 @@ #ifndef STATUSBAR_H #define STATUSBAR_H -#include - #include "gui/toolbars/basetoolbar.h" +#include + class ProgressBarWithText; class QLabel; class PlainToolButton; class StatusBar : public QStatusBar, public BaseBar { - Q_OBJECT + Q_OBJECT public: explicit StatusBar(QWidget* parent = nullptr); diff --git a/src/librssguard/gui/toolbars/toolbareditor.h b/src/librssguard/gui/toolbars/toolbareditor.h index 4c22df0a8..2e63c20de 100644 --- a/src/librssguard/gui/toolbars/toolbareditor.h +++ b/src/librssguard/gui/toolbars/toolbareditor.h @@ -3,10 +3,10 @@ #ifndef TOOLBAREDITOR_H #define TOOLBAREDITOR_H -#include - #include "ui_toolbareditor.h" +#include + namespace Ui { class ToolBarEditor; } @@ -14,7 +14,7 @@ namespace Ui { class BaseBar; class ToolBarEditor : public QWidget { - Q_OBJECT + Q_OBJECT public: explicit ToolBarEditor(QWidget* parent = nullptr); diff --git a/src/librssguard/gui/webbrowser.h b/src/librssguard/gui/webbrowser.h index 9bd64e8bb..8f3bf2b0f 100644 --- a/src/librssguard/gui/webbrowser.h +++ b/src/librssguard/gui/webbrowser.h @@ -3,9 +3,8 @@ #ifndef WEBBROWSER_H #define WEBBROWSER_H -#include "gui/tabcontent.h" - #include "core/message.h" +#include "gui/tabcontent.h" #include "services/abstract/rootitem.h" #include diff --git a/src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.h b/src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.h index a40926ed0..f74d30449 100644 --- a/src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.h +++ b/src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.h @@ -4,14 +4,12 @@ #define TEXTBROWSERVIEWER_H #include "gui/webviewers/webviewer.h" - -#include - #include "network-web/adblock/adblockmanager.h" #include #include #include +#include #include class QContextMenuEvent; diff --git a/src/librssguard/gui/webviewers/webengine/webengineviewer.h b/src/librssguard/gui/webviewers/webengine/webengineviewer.h index 7ecb935d4..233a7a2a7 100644 --- a/src/librssguard/gui/webviewers/webengine/webengineviewer.h +++ b/src/librssguard/gui/webviewers/webengine/webengineviewer.h @@ -3,14 +3,13 @@ #ifndef WEBENGINEVIEWER_H #define WEBENGINEVIEWER_H -#include - -#include "gui/webviewers/webviewer.h" - #include "core/message.h" +#include "gui/webviewers/webviewer.h" #include "miscellaneous/externaltool.h" #include "network-web/webengine/webenginepage.h" +#include + class RootItem; class WebBrowser; diff --git a/src/librssguard/gui/webviewers/webviewer.h b/src/librssguard/gui/webviewers/webviewer.h index 553b400bd..d8f0e84c8 100644 --- a/src/librssguard/gui/webviewers/webviewer.h +++ b/src/librssguard/gui/webviewers/webviewer.h @@ -4,7 +4,6 @@ #define WEBVIEWER_H #include "core/message.h" - #include "definitions/definitions.h" #include diff --git a/src/librssguard/miscellaneous/autosaver.h b/src/librssguard/miscellaneous/autosaver.h index 4345b888e..fb69f85cc 100644 --- a/src/librssguard/miscellaneous/autosaver.h +++ b/src/librssguard/miscellaneous/autosaver.h @@ -3,15 +3,14 @@ #ifndef AUTOSAVER_H #define AUTOSAVER_H -#include - #include "definitions/definitions.h" #include +#include #include -#define AUTOSAVE_IN (1000 * 3) // In seconds. -#define MAX_WAIT (1000 * 15) // In seconds. +#define AUTOSAVE_IN (1000 * 3) // In seconds. +#define MAX_WAIT (1000 * 15) // In seconds. class AutoSaver : public QObject { Q_OBJECT diff --git a/src/librssguard/miscellaneous/externaltool.cpp b/src/librssguard/miscellaneous/externaltool.cpp index 6602806d6..e04f4cc36 100644 --- a/src/librssguard/miscellaneous/externaltool.cpp +++ b/src/librssguard/miscellaneous/externaltool.cpp @@ -7,9 +7,10 @@ #include "miscellaneous/application.h" #include "miscellaneous/settings.h" +#include + #include #include -#include void ExternalTool::sanitizeParameters() { m_executable = QDir::toNativeSeparators(m_executable); diff --git a/src/librssguard/miscellaneous/feedreader.h b/src/librssguard/miscellaneous/feedreader.h index ab1a38bcb..d1ed0bdb2 100644 --- a/src/librssguard/miscellaneous/feedreader.h +++ b/src/librssguard/miscellaneous/feedreader.h @@ -3,13 +3,13 @@ #ifndef FEEDREADER_H #define FEEDREADER_H -#include - #include "core/feeddownloader.h" #include "core/messagefilter.h" #include "services/abstract/cacheforserviceroot.h" #include "services/abstract/feed.h" +#include + class FeedsModel; class MessagesModel; class MessagesProxyModel; diff --git a/src/librssguard/miscellaneous/iconfactory.h b/src/librssguard/miscellaneous/iconfactory.h index 324c4860c..d119b9f88 100644 --- a/src/librssguard/miscellaneous/iconfactory.h +++ b/src/librssguard/miscellaneous/iconfactory.h @@ -3,14 +3,13 @@ #ifndef ICONFACTORY_H #define ICONFACTORY_H -#include - #include "definitions/definitions.h" #include "miscellaneous/application.h" #include #include #include +#include #include class RSSGUARD_DLLSPEC IconFactory : public QObject { diff --git a/src/librssguard/miscellaneous/iofactory.h b/src/librssguard/miscellaneous/iofactory.h index 3edf897b2..a5d83486b 100644 --- a/src/librssguard/miscellaneous/iofactory.h +++ b/src/librssguard/miscellaneous/iofactory.h @@ -3,10 +3,9 @@ #ifndef IOFACTORY_H #define IOFACTORY_H -#include - #include "definitions/definitions.h" +#include #include #include diff --git a/src/librssguard/miscellaneous/localization.h b/src/librssguard/miscellaneous/localization.h index 785bd1e4e..5be818307 100644 --- a/src/librssguard/miscellaneous/localization.h +++ b/src/librssguard/miscellaneous/localization.h @@ -3,9 +3,8 @@ #ifndef LOCALIZATION_H #define LOCALIZATION_H -#include - #include +#include #include struct Language { diff --git a/src/librssguard/miscellaneous/mutex.cpp b/src/librssguard/miscellaneous/mutex.cpp index 76dd857e4..211f8e81a 100644 --- a/src/librssguard/miscellaneous/mutex.cpp +++ b/src/librssguard/miscellaneous/mutex.cpp @@ -54,6 +54,6 @@ bool Mutex::isLocked() const { return m_isLocked; } -Mutex::operator QMutex* () const { +Mutex::operator QMutex*() const { return m_mutex.data(); } diff --git a/src/librssguard/miscellaneous/nodejs.cpp b/src/librssguard/miscellaneous/nodejs.cpp index c6291d54c..4c1a209b0 100644 --- a/src/librssguard/miscellaneous/nodejs.cpp +++ b/src/librssguard/miscellaneous/nodejs.cpp @@ -17,7 +17,8 @@ NodeJs::NodeJs(Settings* settings, QObject* parent) : QObject(parent), m_settings(settings) {} void NodeJs::runScript(QProcess* proc, const QString& script, const QStringList& arguments) const { - QStringList arg = { script }; arg.append(arguments); + QStringList arg = {script}; + arg.append(arguments); QProcessEnvironment env; QString node_modules = processedPackageFolder() + QDir::separator() + QSL("node_modules"); @@ -76,7 +77,7 @@ QString NodeJs::nodeJsVersion(const QString& nodejs_exe) const { throw ApplicationException(tr("file not found")); } - return IOFactory::startProcessGetOutput(nodejs_exe, { QSL("--version") }).simplified(); + return IOFactory::startProcessGetOutput(nodejs_exe, {QSL("--version")}).simplified(); } QString NodeJs::npmVersion(const QString& npm_exe) const { @@ -84,13 +85,16 @@ QString NodeJs::npmVersion(const QString& npm_exe) const { throw ApplicationException(tr("file not found")); } - return IOFactory::startProcessGetOutput(npm_exe, { QSL("--version") }).simplified(); + return IOFactory::startProcessGetOutput(npm_exe, {QSL("--version")}).simplified(); } NodeJs::PackageStatus NodeJs::packageStatus(const PackageMetadata& pkg) const { QString npm_ls = IOFactory::startProcessGetOutput(npmExecutable(), - { QSL("ls"), QSL("--unicode"), QSL("--json"), QSL("--prefix"), - processedPackageFolder() }, + {QSL("ls"), + QSL("--unicode"), + QSL("--json"), + QSL("--prefix"), + processedPackageFolder()}, {}, processedPackageFolder()); QJsonDocument json = QJsonDocument::fromJson(npm_ls.toUtf8()); @@ -162,23 +166,25 @@ void NodeJs::installPackages(const QList& pkgs) { QProcess* proc = new QProcess(); - connect(proc, QOverload::of(&QProcess::finished), - this, [pkgs, this](int exit_code, - QProcess::ExitStatus status) { - QProcess* sndr = qobject_cast(sender()); + connect(proc, + QOverload::of(&QProcess::finished), + this, + [pkgs, this](int exit_code, QProcess::ExitStatus status) { + QProcess* sndr = qobject_cast(sender()); - if (exit_code != EXIT_SUCCESS || status == QProcess::ExitStatus::CrashExit) { - qCriticalNN << LOGSEC_NODEJS << "Error when installing packages" << QUOTE_W_SPACE_DOT(packagesToString(pkgs)) - << " Exit code:" << QUOTE_W_SPACE_DOT(exit_code) - << " Message:" << QUOTE_W_SPACE_DOT(sndr->readAllStandardError()); + if (exit_code != EXIT_SUCCESS || status == QProcess::ExitStatus::CrashExit) { + qCriticalNN << LOGSEC_NODEJS << "Error when installing packages" + << QUOTE_W_SPACE_DOT(packagesToString(pkgs)) + << " Exit code:" << QUOTE_W_SPACE_DOT(exit_code) + << " Message:" << QUOTE_W_SPACE_DOT(sndr->readAllStandardError()); - emit packageError(pkgs, sndr->errorString()); - } - else { - qDebugNN << LOGSEC_NODEJS << "Installed/updated packages" << QUOTE_W_SPACE(packagesToString(pkgs)); - emit packageInstalledUpdated(pkgs, false); - } - }); + emit packageError(pkgs, sndr->errorString()); + } + else { + qDebugNN << LOGSEC_NODEJS << "Installed/updated packages" << QUOTE_W_SPACE(packagesToString(pkgs)); + emit packageInstalledUpdated(pkgs, false); + } + }); connect(proc, &QProcess::errorOccurred, this, [pkgs, this](QProcess::ProcessError error) { QProcess* sndr = qobject_cast(sender()); @@ -193,8 +199,8 @@ void NodeJs::installPackages(const QList& pkgs) { to_install.prepend(QSL("--production")); to_install.prepend(QSL("install")); - //to_install.append(QSL("--prefix")); - //to_install.append(processedPackageFolder()); + // to_install.append(QSL("--prefix")); + // to_install.append(processedPackageFolder()); IOFactory::startProcess(proc, npmExecutable(), to_install, {}, processedPackageFolder()); } diff --git a/src/librssguard/miscellaneous/notification.cpp b/src/librssguard/miscellaneous/notification.cpp index 052652d00..96c4f5340 100644 --- a/src/librssguard/miscellaneous/notification.cpp +++ b/src/librssguard/miscellaneous/notification.cpp @@ -53,9 +53,8 @@ void Notification::playSound(Application* app) const { } else { play - ->setSource(QUrl:: - fromLocalFile(QDir::toNativeSeparators(app - ->replaceUserDataFolderPlaceholder(m_soundPath)))); + ->setSource(QUrl::fromLocalFile(QDir::toNativeSeparators(app + ->replaceUserDataFolderPlaceholder(m_soundPath)))); } play->setVolume(fractionalVolume()); @@ -83,9 +82,8 @@ void Notification::playSound(Application* app) const { } else { play - ->setSource(QUrl:: - fromLocalFile(QDir::toNativeSeparators(app - ->replaceUserDataFolderPlaceholder(m_soundPath)))); + ->setSource(QUrl::fromLocalFile(QDir::toNativeSeparators(app + ->replaceUserDataFolderPlaceholder(m_soundPath)))); } play->audioOutput()->setVolume(fractionalVolume()); diff --git a/src/librssguard/miscellaneous/notification.h b/src/librssguard/miscellaneous/notification.h index b9c1a9db6..37739afc6 100644 --- a/src/librssguard/miscellaneous/notification.h +++ b/src/librssguard/miscellaneous/notification.h @@ -3,10 +3,10 @@ #ifndef NOTIFICATION_H #define NOTIFICATION_H -#include - #include "definitions/definitions.h" +#include + class Application; class Notification { diff --git a/src/librssguard/miscellaneous/notificationfactory.h b/src/librssguard/miscellaneous/notificationfactory.h index eb8ea8edb..19d81a30f 100644 --- a/src/librssguard/miscellaneous/notificationfactory.h +++ b/src/librssguard/miscellaneous/notificationfactory.h @@ -3,10 +3,10 @@ #ifndef NOTIFICATIONFACTORY_H #define NOTIFICATIONFACTORY_H -#include - #include "miscellaneous/notification.h" +#include + class Settings; class NotificationFactory : public QObject { diff --git a/src/librssguard/miscellaneous/regexfactory.cpp b/src/librssguard/miscellaneous/regexfactory.cpp index 43cd0ec26..77d24ec26 100644 --- a/src/librssguard/miscellaneous/regexfactory.cpp +++ b/src/librssguard/miscellaneous/regexfactory.cpp @@ -3,7 +3,8 @@ /**************************************************************************** ** ** Copyright (C) 2016 Giuseppe D'Angelo . -** Copyright (C) 2016 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo +** Copyright (C) 2016 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo +* ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** diff --git a/src/librssguard/miscellaneous/regexfactory.h b/src/librssguard/miscellaneous/regexfactory.h index 469a80625..74130d254 100644 --- a/src/librssguard/miscellaneous/regexfactory.h +++ b/src/librssguard/miscellaneous/regexfactory.h @@ -3,7 +3,8 @@ /**************************************************************************** ** ** Copyright (C) 2016 Giuseppe D'Angelo . -** Copyright (C) 2016 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo +** Copyright (C) 2016 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo +* ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** @@ -51,7 +52,6 @@ class RegexFactory { public: - static QString anchoredPattern(const QString& expression); static QString wildcardToRegularExpression(const QString& pattern); diff --git a/src/librssguard/miscellaneous/settings.h b/src/librssguard/miscellaneous/settings.h index 32a24bf56..e88d8d5ca 100644 --- a/src/librssguard/miscellaneous/settings.h +++ b/src/librssguard/miscellaneous/settings.h @@ -3,10 +3,7 @@ #ifndef SETTINGS_H #define SETTINGS_H -#include - #include "definitions/definitions.h" - #include "gui/notifications/toastnotificationsmanager.h" #include "miscellaneous/settingsproperties.h" #include "miscellaneous/textfactory.h" @@ -16,6 +13,7 @@ #include #include #include +#include #include #include diff --git a/src/librssguard/miscellaneous/settingsproperties.h b/src/librssguard/miscellaneous/settingsproperties.h index 842092c08..b028d57e3 100644 --- a/src/librssguard/miscellaneous/settingsproperties.h +++ b/src/librssguard/miscellaneous/settingsproperties.h @@ -7,16 +7,16 @@ // Describes characteristics of settings. struct SettingsProperties { - enum class SettingsType { - Portable, - NonPortable, - Custom - }; + enum class SettingsType { + Portable, + NonPortable, + Custom + }; - SettingsType m_type; - QString m_baseDirectory; - QString m_settingsSuffix; - QString m_absoluteSettingsFileName; + SettingsType m_type; + QString m_baseDirectory; + QString m_settingsSuffix; + QString m_absoluteSettingsFileName; }; #endif // SETTINGSPROPERTIES_H diff --git a/src/librssguard/miscellaneous/singleapplication.h b/src/librssguard/miscellaneous/singleapplication.h index 50724a1b4..7ed90e511 100644 --- a/src/librssguard/miscellaneous/singleapplication.h +++ b/src/librssguard/miscellaneous/singleapplication.h @@ -8,7 +8,7 @@ class QLocalServer; class SingleApplication : public QApplication { - Q_OBJECT + Q_OBJECT public: explicit SingleApplication(const QString& id, int& argc, char** argv); diff --git a/src/librssguard/miscellaneous/skinfactory.h b/src/librssguard/miscellaneous/skinfactory.h index 7a800e890..91217d1e1 100644 --- a/src/librssguard/miscellaneous/skinfactory.h +++ b/src/librssguard/miscellaneous/skinfactory.h @@ -3,16 +3,14 @@ #ifndef SKINFACTORY_H #define SKINFACTORY_H -#include - #include "core/message.h" - #include "gui/webviewers/webviewer.h" #include #include #include #include +#include #include #include #include diff --git a/src/librssguard/miscellaneous/systemfactory.h b/src/librssguard/miscellaneous/systemfactory.h index f6c4cee01..814eb4050 100644 --- a/src/librssguard/miscellaneous/systemfactory.h +++ b/src/librssguard/miscellaneous/systemfactory.h @@ -3,13 +3,12 @@ #ifndef SYSTEMFACTORY_H #define SYSTEMFACTORY_H -#include - #include "network-web/downloader.h" #include #include #include +#include #include #include diff --git a/src/librssguard/miscellaneous/templates.h b/src/librssguard/miscellaneous/templates.h index 406adb53a..1221d4936 100644 --- a/src/librssguard/miscellaneous/templates.h +++ b/src/librssguard/miscellaneous/templates.h @@ -5,8 +5,10 @@ #include -template static QVariant toVariant(const QList& list) { - QVariantList variant_list; variant_list.reserve(list.size()); +template +static QVariant toVariant(const QList& list) { + QVariantList variant_list; + variant_list.reserve(list.size()); for (const auto& v : list) { variant_list.append(v); @@ -15,10 +17,11 @@ template static QVariant toVariant(const QList& list) { return variant_list; } -template static QList toList(const QVariant& qv) { - QList data_list; +template +static QList toList(const QVariant& qv) { + QList data_list; - foreach(QVariant v, qv.value()) { + foreach (QVariant v, qv.value()) { data_list << v.value(); } diff --git a/src/librssguard/network-web/adblock/adblockdialog.cpp b/src/librssguard/network-web/adblock/adblockdialog.cpp index ff7f1df86..937d926a2 100644 --- a/src/librssguard/network-web/adblock/adblockdialog.cpp +++ b/src/librssguard/network-web/adblock/adblockdialog.cpp @@ -2,8 +2,6 @@ #include "network-web/adblock/adblockdialog.h" -#include "network-web/adblock/adblockmanager.h" - #include "definitions/definitions.h" #include "exceptions/applicationexception.h" #include "gui/guiutilities.h" @@ -11,6 +9,7 @@ #include "miscellaneous/application.h" #include "miscellaneous/iconfactory.h" #include "miscellaneous/settings.h" +#include "network-web/adblock/adblockmanager.h" #include "network-web/webfactory.h" #include diff --git a/src/librssguard/network-web/adblock/adblockdialog.h b/src/librssguard/network-web/adblock/adblockdialog.h index 78667b1b6..1f8748c84 100644 --- a/src/librssguard/network-web/adblock/adblockdialog.h +++ b/src/librssguard/network-web/adblock/adblockdialog.h @@ -3,14 +3,14 @@ #ifndef ADBLOCKDIALOG_H #define ADBLOCKDIALOG_H -#include - #include "ui_adblockdialog.h" +#include + class AdBlockManager; class AdBlockDialog : public QDialog { - Q_OBJECT + Q_OBJECT public: explicit AdBlockDialog(QWidget* parent = nullptr); @@ -21,7 +21,7 @@ class AdBlockDialog : public QDialog { private slots: void saveOnClose(); void enableAdBlock(bool enable); - void onAdBlockEnabledChanged(bool enabled, const QString &message); + void onAdBlockEnabledChanged(bool enabled, const QString& message); void onAdBlockProcessTerminated(); private: diff --git a/src/librssguard/network-web/adblock/adblockicon.cpp b/src/librssguard/network-web/adblock/adblockicon.cpp index e247163f3..16b44ad7d 100644 --- a/src/librssguard/network-web/adblock/adblockicon.cpp +++ b/src/librssguard/network-web/adblock/adblockicon.cpp @@ -53,7 +53,6 @@ void AdBlockIcon::showMenu(QPoint pos) { } void AdBlockIcon::setIcon(bool adblock_enabled) { - QAction::setIcon(adblock_enabled - ? qApp->icons()->miscIcon(QSL(ADBLOCK_ICON_ACTIVE)) - : qApp->icons()->miscIcon(QSL(ADBLOCK_ICON_DISABLED))); + QAction::setIcon(adblock_enabled ? qApp->icons()->miscIcon(QSL(ADBLOCK_ICON_ACTIVE)) + : qApp->icons()->miscIcon(QSL(ADBLOCK_ICON_DISABLED))); } diff --git a/src/librssguard/network-web/adblock/adblockicon.h b/src/librssguard/network-web/adblock/adblockicon.h index 47fb09083..d0638a404 100644 --- a/src/librssguard/network-web/adblock/adblockicon.h +++ b/src/librssguard/network-web/adblock/adblockicon.h @@ -9,7 +9,7 @@ class QMenu; class AdBlockManager; class AdBlockIcon : public QAction { - Q_OBJECT + Q_OBJECT public: explicit AdBlockIcon(AdBlockManager* parent = nullptr); diff --git a/src/librssguard/network-web/adblock/adblockmanager.h b/src/librssguard/network-web/adblock/adblockmanager.h index 0969d02e0..e47bc3686 100644 --- a/src/librssguard/network-web/adblock/adblockmanager.h +++ b/src/librssguard/network-web/adblock/adblockmanager.h @@ -3,11 +3,10 @@ #ifndef ADBLOCKMANAGER_H #define ADBLOCKMANAGER_H -#include - #include "miscellaneous/nodejs.h" #include +#include #include #define CLIQZ_ADBLOCKED_PACKAGE "@cliqz/adblocker" diff --git a/src/librssguard/network-web/adblock/adblockurlinterceptor.cpp b/src/librssguard/network-web/adblock/adblockurlinterceptor.cpp index 6cf2b7dcc..6ca92760c 100644 --- a/src/librssguard/network-web/adblock/adblockurlinterceptor.cpp +++ b/src/librssguard/network-web/adblock/adblockurlinterceptor.cpp @@ -6,8 +6,7 @@ #include "network-web/adblock/adblockmanager.h" #include "network-web/adblock/adblockrequestinfo.h" -AdBlockUrlInterceptor::AdBlockUrlInterceptor(AdBlockManager* manager) - : UrlInterceptor(manager), m_manager(manager) {} +AdBlockUrlInterceptor::AdBlockUrlInterceptor(AdBlockManager* manager) : UrlInterceptor(manager), m_manager(manager) {} void AdBlockUrlInterceptor::interceptRequest(QWebEngineUrlRequestInfo& info) { if (m_manager->block(AdblockRequestInfo(info)).m_blocked) { diff --git a/src/librssguard/network-web/adblock/adblockurlinterceptor.h b/src/librssguard/network-web/adblock/adblockurlinterceptor.h index c94d9fd12..6be42e3ed 100644 --- a/src/librssguard/network-web/adblock/adblockurlinterceptor.h +++ b/src/librssguard/network-web/adblock/adblockurlinterceptor.h @@ -8,7 +8,7 @@ class AdBlockManager; class AdBlockUrlInterceptor : public UrlInterceptor { - Q_OBJECT + Q_OBJECT public: explicit AdBlockUrlInterceptor(AdBlockManager* manager); diff --git a/src/librssguard/network-web/cookiejar.h b/src/librssguard/network-web/cookiejar.h index 6bf0aa252..8ad081b96 100644 --- a/src/librssguard/network-web/cookiejar.h +++ b/src/librssguard/network-web/cookiejar.h @@ -3,10 +3,9 @@ #ifndef COOKIEJAR_H #define COOKIEJAR_H -#include - #include "miscellaneous/autosaver.h" +#include #include #if defined(NO_LITE) diff --git a/src/librssguard/network-web/downloader.h b/src/librssguard/network-web/downloader.h index 66c01c778..f1ae86a7b 100644 --- a/src/librssguard/network-web/downloader.h +++ b/src/librssguard/network-web/downloader.h @@ -3,14 +3,13 @@ #ifndef DOWNLOADER_H #define DOWNLOADER_H -#include - #include "definitions/definitions.h" #include "network-web/httpresponse.h" #include #include #include +#include #include class SilentNetworkAccessManager; diff --git a/src/librssguard/network-web/downloadmanager.cpp b/src/librssguard/network-web/downloadmanager.cpp index 000f0bc9b..3034a9e94 100644 --- a/src/librssguard/network-web/downloadmanager.cpp +++ b/src/librssguard/network-web/downloadmanager.cpp @@ -2,9 +2,6 @@ #include "network-web/downloadmanager.h" -#include "ui_downloaditem.h" -#include "ui_downloadmanager.h" - #include "gui/dialogs/formmain.h" #include "gui/messagebox.h" #include "gui/tabwidget.h" @@ -13,6 +10,9 @@ #include "miscellaneous/settings.h" #include "network-web/silentnetworkaccessmanager.h" +#include "ui_downloaditem.h" +#include "ui_downloadmanager.h" + #include #include diff --git a/src/librssguard/network-web/googlesuggest.h b/src/librssguard/network-web/googlesuggest.h index e3da59f60..f2f149da5 100644 --- a/src/librssguard/network-web/googlesuggest.h +++ b/src/librssguard/network-web/googlesuggest.h @@ -31,12 +31,11 @@ #ifndef GOOGLESUGGEST_H #define GOOGLESUGGEST_H -#include +#include "network-web/downloader.h" #include #include - -#include "network-web/downloader.h" +#include class LocationLineEdit; class QTimer; diff --git a/src/librssguard/network-web/httpserver.h b/src/librssguard/network-web/httpserver.h index af7bc00f3..337c57da3 100644 --- a/src/librssguard/network-web/httpserver.h +++ b/src/librssguard/network-web/httpserver.h @@ -3,9 +3,8 @@ #ifndef HTTPSERVER_H #define HTTPSERVER_H -#include - #include +#include #include #include #include diff --git a/src/librssguard/network-web/networkfactory.h b/src/librssguard/network-web/networkfactory.h index edf9627cc..238471d6a 100644 --- a/src/librssguard/network-web/networkfactory.h +++ b/src/librssguard/network-web/networkfactory.h @@ -3,9 +3,8 @@ #ifndef NETWORKFACTORY_H #define NETWORKFACTORY_H -#include "network-web/httpresponse.h" - #include "definitions/typedefs.h" +#include "network-web/httpresponse.h" #include "services/abstract/feed.h" #include diff --git a/src/librssguard/network-web/oauth2service.cpp b/src/librssguard/network-web/oauth2service.cpp index 35908ec31..bc91ceb9e 100644 --- a/src/librssguard/network-web/oauth2service.cpp +++ b/src/librssguard/network-web/oauth2service.cpp @@ -30,6 +30,9 @@ #include "network-web/oauthhttphandler.h" #include "network-web/webfactory.h" +#include +#include + #include #include #include @@ -38,9 +41,6 @@ #include #include -#include -#include - OAuth2Service::OAuth2Service(const QString& auth_url, const QString& token_url, const QString& client_id, diff --git a/src/librssguard/network-web/oauth2service.h b/src/librssguard/network-web/oauth2service.h index 5a75ef796..70e2fff8b 100644 --- a/src/librssguard/network-web/oauth2service.h +++ b/src/librssguard/network-web/oauth2service.h @@ -25,22 +25,24 @@ #ifndef OAUTH2SERVICE_H #define OAUTH2SERVICE_H -#include - #include "network-web/oauthhttphandler.h" #include "network-web/silentnetworkaccessmanager.h" #include +#include #include class OAuth2Service : public QObject { - Q_OBJECT + Q_OBJECT public: - explicit OAuth2Service(const QString& auth_url, const QString& token_url, - const QString& client_id, const QString& client_secret, - const QString& scope, QObject* parent = nullptr); + explicit OAuth2Service(const QString& auth_url, + const QString& token_url, + const QString& client_id, + const QString& client_secret, + const QString& scope, + QObject* parent = nullptr); virtual ~OAuth2Service(); // Returns bearer HTTP header value. diff --git a/src/librssguard/network-web/readability.h b/src/librssguard/network-web/readability.h index 75834932c..a32f27145 100644 --- a/src/librssguard/network-web/readability.h +++ b/src/librssguard/network-web/readability.h @@ -3,10 +3,9 @@ #ifndef READABILITY_H #define READABILITY_H -#include - #include "miscellaneous/nodejs.h" +#include #include class Readability : public QObject { diff --git a/src/librssguard/network-web/silentnetworkaccessmanager.h b/src/librssguard/network-web/silentnetworkaccessmanager.h index 8823e8e1b..1091c049e 100644 --- a/src/librssguard/network-web/silentnetworkaccessmanager.h +++ b/src/librssguard/network-web/silentnetworkaccessmanager.h @@ -10,7 +10,7 @@ // Network manager used for more communication for feeds. // This network manager does not provide any GUI interaction options. class SilentNetworkAccessManager : public BaseNetworkAccessManager { - Q_OBJECT + Q_OBJECT public: explicit SilentNetworkAccessManager(QObject* parent = nullptr); diff --git a/src/librssguard/network-web/webengine/networkurlinterceptor.h b/src/librssguard/network-web/webengine/networkurlinterceptor.h index fed553e1f..8982e1093 100644 --- a/src/librssguard/network-web/webengine/networkurlinterceptor.h +++ b/src/librssguard/network-web/webengine/networkurlinterceptor.h @@ -25,7 +25,7 @@ class UrlInterceptor; class NetworkUrlInterceptor : public QWebEngineUrlRequestInterceptor { - Q_OBJECT + Q_OBJECT public: explicit NetworkUrlInterceptor(QObject* parent = nullptr); diff --git a/src/librssguard/network-web/webengine/urlinterceptor.h b/src/librssguard/network-web/webengine/urlinterceptor.h index a8a509bc1..bfdae626e 100644 --- a/src/librssguard/network-web/webengine/urlinterceptor.h +++ b/src/librssguard/network-web/webengine/urlinterceptor.h @@ -7,10 +7,10 @@ #include class UrlInterceptor : public QObject { - Q_OBJECT + Q_OBJECT public: - explicit UrlInterceptor(QObject* parent = nullptr) : QObject(parent) { } + explicit UrlInterceptor(QObject* parent = nullptr) : QObject(parent) {} virtual void interceptRequest(QWebEngineUrlRequestInfo& info) = 0; }; diff --git a/src/librssguard/network-web/webfactory.h b/src/librssguard/network-web/webfactory.h index 0fe4c86a4..acc55a15d 100644 --- a/src/librssguard/network-web/webfactory.h +++ b/src/librssguard/network-web/webfactory.h @@ -3,11 +3,10 @@ #ifndef WEBFACTORY_H #define WEBFACTORY_H -#include - #include "core/message.h" #include +#include #if defined(NO_LITE) class QWebEngineProfile; diff --git a/src/librssguard/services/abstract/accountcheckmodel.h b/src/librssguard/services/abstract/accountcheckmodel.h index 460b6fb39..d9416fa5b 100644 --- a/src/librssguard/services/abstract/accountcheckmodel.h +++ b/src/librssguard/services/abstract/accountcheckmodel.h @@ -3,11 +3,11 @@ #ifndef ACCOUNTCHECKMODEL_H #define ACCOUNTCHECKMODEL_H +#include "services/abstract/rootitem.h" + #include #include -#include "services/abstract/rootitem.h" - // This is common model which displays only categories/feeds // and allows user to place checkmarks. class RSSGUARD_DLLSPEC AccountCheckModel : public QAbstractItemModel { diff --git a/src/librssguard/services/abstract/feed.h b/src/librssguard/services/abstract/feed.h index 41c7da4bf..787e4ece9 100644 --- a/src/librssguard/services/abstract/feed.h +++ b/src/librssguard/services/abstract/feed.h @@ -3,10 +3,9 @@ #ifndef FEED_H #define FEED_H -#include "services/abstract/rootitem.h" - #include "core/message.h" #include "core/messagefilter.h" +#include "services/abstract/rootitem.h" #include #include diff --git a/src/librssguard/services/abstract/gui/authenticationdetails.cpp b/src/librssguard/services/abstract/gui/authenticationdetails.cpp index 78ef2db50..052bc6838 100644 --- a/src/librssguard/services/abstract/gui/authenticationdetails.cpp +++ b/src/librssguard/services/abstract/gui/authenticationdetails.cpp @@ -2,10 +2,10 @@ #include "services/abstract/gui/authenticationdetails.h" -#include "ui_authenticationdetails.h" - #include "definitions/definitions.h" +#include "ui_authenticationdetails.h" + AuthenticationDetails::AuthenticationDetails(bool only_basic, QWidget* parent) : QWidget(parent), m_ui(new Ui::AuthenticationDetails()) { m_ui->setupUi(this); diff --git a/src/librssguard/services/abstract/gui/authenticationdetails.h b/src/librssguard/services/abstract/gui/authenticationdetails.h index 1b7ef012c..bbaf7a6d9 100644 --- a/src/librssguard/services/abstract/gui/authenticationdetails.h +++ b/src/librssguard/services/abstract/gui/authenticationdetails.h @@ -3,11 +3,11 @@ #ifndef AUTHENTICATIONDETAILS_H #define AUTHENTICATIONDETAILS_H -#include - #include "network-web/networkfactory.h" #include "services/abstract/feed.h" +#include + namespace Ui { class AuthenticationDetails; } diff --git a/src/librssguard/services/abstract/gui/custommessagepreviewer.h b/src/librssguard/services/abstract/gui/custommessagepreviewer.h index e7b515d17..6883634c9 100644 --- a/src/librssguard/services/abstract/gui/custommessagepreviewer.h +++ b/src/librssguard/services/abstract/gui/custommessagepreviewer.h @@ -3,10 +3,10 @@ #ifndef CUSTOMMESSAGEPREVIEWER_H #define CUSTOMMESSAGEPREVIEWER_H -#include - #include "core/message.h" +#include + class RootItem; class RSSGUARD_DLLSPEC CustomMessagePreviewer : public QWidget { diff --git a/src/librssguard/services/abstract/gui/formaccountdetails.cpp b/src/librssguard/services/abstract/gui/formaccountdetails.cpp index 8e30b18a6..489d83c86 100644 --- a/src/librssguard/services/abstract/gui/formaccountdetails.cpp +++ b/src/librssguard/services/abstract/gui/formaccountdetails.cpp @@ -2,9 +2,6 @@ #include "services/abstract/gui/formaccountdetails.h" -#include "ui_accountdetails.h" -#include "ui_formaccountdetails.h" - #include "gui/guiutilities.h" #include "miscellaneous/application.h" #include "miscellaneous/iconfactory.h" @@ -14,6 +11,9 @@ #include "services/abstract/serviceroot.h" #include "services/abstract/unreadnode.h" +#include "ui_accountdetails.h" +#include "ui_formaccountdetails.h" + FormAccountDetails::FormAccountDetails(const QIcon& icon, QWidget* parent) : QDialog(parent), m_proxyDetails(new NetworkProxyDetails(this)), m_accountDetails(new AccountDetails(this)), m_account(nullptr), m_creatingNew(false), m_ui(new Ui::FormAccountDetails()) { diff --git a/src/librssguard/services/abstract/gui/formaccountdetails.h b/src/librssguard/services/abstract/gui/formaccountdetails.h index ac492a078..6893bafc5 100644 --- a/src/librssguard/services/abstract/gui/formaccountdetails.h +++ b/src/librssguard/services/abstract/gui/formaccountdetails.h @@ -3,14 +3,14 @@ #ifndef FORMACCOUNTDETAILS_H #define FORMACCOUNTDETAILS_H -#include - #include "database/databasefactory.h" #include "database/databasequeries.h" #include "gui/reusable/networkproxydetails.h" #include "miscellaneous/application.h" #include "services/abstract/gui/accountdetails.h" +#include + namespace Ui { class FormAccountDetails; } diff --git a/src/librssguard/services/abstract/gui/formaddeditlabel.h b/src/librssguard/services/abstract/gui/formaddeditlabel.h index d3ade31cb..aa8c93fec 100644 --- a/src/librssguard/services/abstract/gui/formaddeditlabel.h +++ b/src/librssguard/services/abstract/gui/formaddeditlabel.h @@ -3,10 +3,10 @@ #ifndef FORMADDEDITLABEL_H #define FORMADDEDITLABEL_H -#include - #include "ui_formaddeditlabel.h" +#include + namespace Ui { class FormAddEditLabel; } diff --git a/src/librssguard/services/abstract/gui/formaddeditprobe.h b/src/librssguard/services/abstract/gui/formaddeditprobe.h index aa111326d..a6fc68dd4 100644 --- a/src/librssguard/services/abstract/gui/formaddeditprobe.h +++ b/src/librssguard/services/abstract/gui/formaddeditprobe.h @@ -3,10 +3,10 @@ #ifndef FORMADDEDITPROBE_H #define FORMADDEDITPROBE_H -#include - #include "ui_formaddeditprobe.h" +#include + namespace Ui { class FormAddEditProbe; } diff --git a/src/librssguard/services/abstract/gui/formcategorydetails.cpp b/src/librssguard/services/abstract/gui/formcategorydetails.cpp index 9c42d1f79..3fe9eeb31 100644 --- a/src/librssguard/services/abstract/gui/formcategorydetails.cpp +++ b/src/librssguard/services/abstract/gui/formcategorydetails.cpp @@ -2,8 +2,6 @@ #include "services/abstract/gui/formcategorydetails.h" -#include "ui_formcategorydetails.h" - #include "3rd-party/boolinq/boolinq.h" #include "database/databasequeries.h" #include "definitions/definitions.h" @@ -15,6 +13,8 @@ #include "services/abstract/gui/multifeededitcheckbox.h" #include "services/abstract/rootitem.h" +#include "ui_formcategorydetails.h" + #include #include #include diff --git a/src/librssguard/services/abstract/gui/formcategorydetails.h b/src/librssguard/services/abstract/gui/formcategorydetails.h index 8251161f3..b52043557 100644 --- a/src/librssguard/services/abstract/gui/formcategorydetails.h +++ b/src/librssguard/services/abstract/gui/formcategorydetails.h @@ -3,11 +3,11 @@ #ifndef FORMCATEGORYDETAILS_H #define FORMCATEGORYDETAILS_H -#include - #include "3rd-party/boolinq/boolinq.h" #include "definitions/definitions.h" +#include + namespace Ui { class FormCategoryDetails; } diff --git a/src/librssguard/services/abstract/gui/formfeeddetails.cpp b/src/librssguard/services/abstract/gui/formfeeddetails.cpp index 426468225..b1a0f15d7 100644 --- a/src/librssguard/services/abstract/gui/formfeeddetails.cpp +++ b/src/librssguard/services/abstract/gui/formfeeddetails.cpp @@ -2,8 +2,6 @@ #include "services/abstract/gui/formfeeddetails.h" -#include "ui_formfeeddetails.h" - #include "database/databasequeries.h" #include "definitions/definitions.h" #include "exceptions/applicationexception.h" @@ -13,6 +11,8 @@ #include "services/abstract/gui/multifeededitcheckbox.h" #include "services/abstract/rootitem.h" +#include "ui_formfeeddetails.h" + #include #include #include diff --git a/src/librssguard/services/abstract/gui/formfeeddetails.h b/src/librssguard/services/abstract/gui/formfeeddetails.h index 915c24d55..c9e3e41c7 100644 --- a/src/librssguard/services/abstract/gui/formfeeddetails.h +++ b/src/librssguard/services/abstract/gui/formfeeddetails.h @@ -3,11 +3,11 @@ #ifndef FORMFEEDDETAILS_H #define FORMFEEDDETAILS_H -#include - #include "3rd-party/boolinq/boolinq.h" #include "definitions/definitions.h" +#include + namespace Ui { class FormFeedDetails; } diff --git a/src/librssguard/services/abstract/labelsnode.cpp b/src/librssguard/services/abstract/labelsnode.cpp index 62989657c..13d486aba 100644 --- a/src/librssguard/services/abstract/labelsnode.cpp +++ b/src/librssguard/services/abstract/labelsnode.cpp @@ -2,6 +2,7 @@ #include "services/abstract/labelsnode.h" +#include "3rd-party/boolinq/boolinq.h" #include "database/databasefactory.h" #include "database/databasequeries.h" #include "definitions/globals.h" @@ -11,8 +12,6 @@ #include "services/abstract/gui/formaddeditlabel.h" #include "services/abstract/serviceroot.h" -#include "3rd-party/boolinq/boolinq.h" - LabelsNode::LabelsNode(RootItem* parent_item) : RootItem(parent_item), m_actLabelNew(nullptr) { setKind(RootItem::Kind::Labels); setId(ID_LABELS); diff --git a/src/librssguard/services/abstract/labelsnode.h b/src/librssguard/services/abstract/labelsnode.h index ae2e6b9f1..51de1bfa0 100644 --- a/src/librssguard/services/abstract/labelsnode.h +++ b/src/librssguard/services/abstract/labelsnode.h @@ -3,9 +3,8 @@ #ifndef LABELSNODE_H #define LABELSNODE_H -#include "services/abstract/rootitem.h" - #include "services/abstract/label.h" +#include "services/abstract/rootitem.h" class RSSGUARD_DLLSPEC LabelsNode : public RootItem { Q_OBJECT diff --git a/src/librssguard/services/abstract/searchsnode.cpp b/src/librssguard/services/abstract/searchsnode.cpp index 3733d2837..02b3cba31 100644 --- a/src/librssguard/services/abstract/searchsnode.cpp +++ b/src/librssguard/services/abstract/searchsnode.cpp @@ -2,6 +2,7 @@ #include "services/abstract/searchsnode.h" +#include "3rd-party/boolinq/boolinq.h" #include "database/databasefactory.h" #include "database/databasequeries.h" #include "exceptions/applicationexception.h" @@ -10,8 +11,6 @@ #include "services/abstract/gui/formaddeditprobe.h" #include "services/abstract/serviceroot.h" -#include "3rd-party/boolinq/boolinq.h" - SearchsNode::SearchsNode(RootItem* parent_item) : RootItem(parent_item), m_actProbeNew(nullptr) { setKind(RootItem::Kind::Probes); setId(ID_PROBES); diff --git a/src/librssguard/services/abstract/searchsnode.h b/src/librssguard/services/abstract/searchsnode.h index e3cff9378..b6b5e209e 100644 --- a/src/librssguard/services/abstract/searchsnode.h +++ b/src/librssguard/services/abstract/searchsnode.h @@ -4,7 +4,6 @@ #define SEARCHSNODE_H #include "services/abstract/rootitem.h" - #include "services/abstract/search.h" class RSSGUARD_DLLSPEC SearchsNode : public RootItem { diff --git a/src/librssguard/services/abstract/serviceroot.h b/src/librssguard/services/abstract/serviceroot.h index dd34ebfe7..22c4dd4b3 100644 --- a/src/librssguard/services/abstract/serviceroot.h +++ b/src/librssguard/services/abstract/serviceroot.h @@ -3,10 +3,9 @@ #ifndef SERVICEROOT_H #define SERVICEROOT_H -#include "services/abstract/rootitem.h" - #include "core/message.h" #include "definitions/typedefs.h" +#include "services/abstract/rootitem.h" #include #include diff --git a/src/librssguard/services/feedly/definitions.h b/src/librssguard/services/feedly/definitions.h index 4025451fd..ea6c7ae7f 100644 --- a/src/librssguard/services/feedly/definitions.h +++ b/src/librssguard/services/feedly/definitions.h @@ -1,35 +1,35 @@ #ifndef FEEDLY_DEFINITIONS_H #define FEEDLY_DEFINITIONS_H -#define FEEDLY_DEFAULT_BATCH_SIZE 100 -#define FEEDLY_MAX_BATCH_SIZE 500 -#define FEEDLY_MAX_TOTAL_SIZE 5000 -#define FEEDLY_UNTAG_BATCH_SIZE 100 +#define FEEDLY_DEFAULT_BATCH_SIZE 100 +#define FEEDLY_MAX_BATCH_SIZE 500 +#define FEEDLY_MAX_TOTAL_SIZE 5000 +#define FEEDLY_UNTAG_BATCH_SIZE 100 -#define FEEDLY_GENERATE_DAT "https://feedly.com/v3/auth/dev" +#define FEEDLY_GENERATE_DAT "https://feedly.com/v3/auth/dev" -#define FEEDLY_API_REDIRECT_URI_PORT 14466 -#define FEEDLY_API_SCOPE "https://cloud.feedly.com/subscriptions" +#define FEEDLY_API_REDIRECT_URI_PORT 14466 +#define FEEDLY_API_SCOPE "https://cloud.feedly.com/subscriptions" -//#define FEEDLY_API_URL_BASE "https://sandbox7.feedly.com/v3/" -#define FEEDLY_API_URL_BASE "https://cloud.feedly.com/v3/" +// #define FEEDLY_API_URL_BASE "https://sandbox7.feedly.com/v3/" +#define FEEDLY_API_URL_BASE "https://cloud.feedly.com/v3/" -#define FEEDLY_API_SYSTEM_TAG_READ "global.read" -#define FEEDLY_API_SYSTEM_TAG_SAVED "global.saved" +#define FEEDLY_API_SYSTEM_TAG_READ "global.read" +#define FEEDLY_API_SYSTEM_TAG_SAVED "global.saved" -#define FEEDLY_MARKERS_READ "markAsRead" -#define FEEDLY_MARKERS_UNREAD "keepUnread" -#define FEEDLY_MARKERS_IMPORTANT "markAsSaved" -#define FEEDLY_MARKERS_UNIMPORTANT "markAsUnsaved" +#define FEEDLY_MARKERS_READ "markAsRead" +#define FEEDLY_MARKERS_UNREAD "keepUnread" +#define FEEDLY_MARKERS_IMPORTANT "markAsSaved" +#define FEEDLY_MARKERS_UNIMPORTANT "markAsUnsaved" -#define FEEDLY_API_URL_AUTH "auth/auth" -#define FEEDLY_API_URL_TOKEN "auth/token" -#define FEEDLY_API_URL_PROFILE "profile" -#define FEEDLY_API_URL_COLLETIONS "collections" -#define FEEDLY_API_URL_TAGS "tags" -#define FEEDLY_API_URL_STREAM_CONTENTS "streams/contents?streamId=%1" -#define FEEDLY_API_URL_STREAM_IDS "streams/%1/ids" -#define FEEDLY_API_URL_MARKERS "markers" -#define FEEDLY_API_URL_ENTRIES "entries/.mget" +#define FEEDLY_API_URL_AUTH "auth/auth" +#define FEEDLY_API_URL_TOKEN "auth/token" +#define FEEDLY_API_URL_PROFILE "profile" +#define FEEDLY_API_URL_COLLETIONS "collections" +#define FEEDLY_API_URL_TAGS "tags" +#define FEEDLY_API_URL_STREAM_CONTENTS "streams/contents?streamId=%1" +#define FEEDLY_API_URL_STREAM_IDS "streams/%1/ids" +#define FEEDLY_API_URL_MARKERS "markers" +#define FEEDLY_API_URL_ENTRIES "entries/.mget" #endif // FEEDLY_DEFINITIONS_H diff --git a/src/librssguard/services/feedly/feedlynetwork.h b/src/librssguard/services/feedly/feedlynetwork.h index 4e6503bcf..edc1fb614 100644 --- a/src/librssguard/services/feedly/feedlynetwork.h +++ b/src/librssguard/services/feedly/feedlynetwork.h @@ -3,12 +3,12 @@ #ifndef FEEDLYNETWORK_H #define FEEDLYNETWORK_H -#include - #include "network-web/networkfactory.h" #include "services/abstract/feed.h" #include "services/abstract/serviceroot.h" +#include + #if defined(FEEDLY_OFFICIAL_SUPPORT) class OAuth2Service; #endif @@ -16,7 +16,7 @@ class OAuth2Service; class FeedlyServiceRoot; class FeedlyNetwork : public QObject { - Q_OBJECT + Q_OBJECT public: explicit FeedlyNetwork(QObject* parent = nullptr); @@ -78,8 +78,13 @@ class FeedlyNetwork : public QObject { QString fullUrl(Service service) const; QString bearer() const; QStringList decodeStreamIds(const QByteArray& stream_ids, QString& continuation) const; - QList decodeStreamContents(const QByteArray& stream_contents, bool nested_items, QString& continuation) const; - RootItem* decodeCollections(const QByteArray& json, bool obtain_icons, const QNetworkProxy& proxy, int timeout = 0) const; + QList decodeStreamContents(const QByteArray& stream_contents, + bool nested_items, + QString& continuation) const; + RootItem* decodeCollections(const QByteArray& json, + bool obtain_icons, + const QNetworkProxy& proxy, + int timeout = 0) const; QPair bearerHeader(const QString& bearer) const; private: diff --git a/src/librssguard/services/feedly/gui/feedlyaccountdetails.h b/src/librssguard/services/feedly/gui/feedlyaccountdetails.h index 5d3d366f2..7ffafe610 100644 --- a/src/librssguard/services/feedly/gui/feedlyaccountdetails.h +++ b/src/librssguard/services/feedly/gui/feedlyaccountdetails.h @@ -3,22 +3,21 @@ #ifndef FEEDLYACCOUNTDETAILS_H #define FEEDLYACCOUNTDETAILS_H -#include +#include "services/feedly/feedlyserviceroot.h" #include "ui_feedlyaccountdetails.h" -#include "services/feedly/feedlyserviceroot.h" - #include +#include #if defined(FEEDLY_OFFICIAL_SUPPORT) class OAuth2Service; #endif class FeedlyAccountDetails : public QWidget { - Q_OBJECT + Q_OBJECT - friend class FormEditFeedlyAccount; + friend class FormEditFeedlyAccount; public: explicit FeedlyAccountDetails(QWidget* parent = nullptr); diff --git a/src/librssguard/services/feedly/gui/formeditfeedlyaccount.h b/src/librssguard/services/feedly/gui/formeditfeedlyaccount.h index dec8c4742..f9a0e892f 100644 --- a/src/librssguard/services/feedly/gui/formeditfeedlyaccount.h +++ b/src/librssguard/services/feedly/gui/formeditfeedlyaccount.h @@ -9,7 +9,7 @@ class FeedlyAccountDetails; class FeedlyServiceRoot; class FormEditFeedlyAccount : public FormAccountDetails { - Q_OBJECT + Q_OBJECT public: explicit FormEditFeedlyAccount(QWidget* parent = nullptr); diff --git a/src/librssguard/services/gmail/definitions.h b/src/librssguard/services/gmail/definitions.h index 7c9c87eb1..2b3bb4e9a 100644 --- a/src/librssguard/services/gmail/definitions.h +++ b/src/librssguard/services/gmail/definitions.h @@ -4,38 +4,43 @@ #define GMAIL_DEFINITIONS_H #define GMAIL_OAUTH_REDIRECT_URI_PORT 14499 -#define GMAIL_OAUTH_AUTH_URL "https://accounts.google.com/o/oauth2/auth" -#define GMAIL_OAUTH_TOKEN_URL "https://accounts.google.com/o/oauth2/token" -#define GMAIL_OAUTH_SCOPE "https://mail.google.com/" +#define GMAIL_OAUTH_AUTH_URL "https://accounts.google.com/o/oauth2/auth" +#define GMAIL_OAUTH_TOKEN_URL "https://accounts.google.com/o/oauth2/token" +#define GMAIL_OAUTH_SCOPE "https://mail.google.com/" #define GMAIL_REG_API_URL "https://console.developers.google.com/apis/credentials" -#define GMAIL_API_SEND_MESSAGE "https://www.googleapis.com/upload/gmail/v1/users/me/messages/send?uploadType=media" +#define GMAIL_API_SEND_MESSAGE "https://www.googleapis.com/upload/gmail/v1/users/me/messages/send?uploadType=media" #define GMAIL_API_BATCH_UPD_LABELS "https://www.googleapis.com/gmail/v1/users/me/messages/batchModify" -#define GMAIL_API_GET_PROFILE "https://gmail.googleapis.com/gmail/v1/users/me/profile" -#define GMAIL_API_GET_ATTACHMENT "https://www.googleapis.com/gmail/v1/users/me/messages/%1/attachments/%2" -#define GMAIL_API_LABELS_LIST "https://www.googleapis.com/gmail/v1/users/me/labels" -#define GMAIL_API_MSGS_LIST "https://www.googleapis.com/gmail/v1/users/me/messages" -#define GMAIL_API_BATCH "https://www.googleapis.com/batch/gmail/v1" +#define GMAIL_API_GET_PROFILE "https://gmail.googleapis.com/gmail/v1/users/me/profile" +#define GMAIL_API_GET_ATTACHMENT "https://www.googleapis.com/gmail/v1/users/me/messages/%1/attachments/%2" +#define GMAIL_API_LABELS_LIST "https://www.googleapis.com/gmail/v1/users/me/labels" +#define GMAIL_API_MSGS_LIST "https://www.googleapis.com/gmail/v1/users/me/messages" +#define GMAIL_API_BATCH "https://www.googleapis.com/batch/gmail/v1" #define GMAIL_ATTACHMENT_SEP "####" #define GMAIL_DEFAULT_BATCH_SIZE 100 -#define GMAIL_MAX_BATCH_SIZE 999 +#define GMAIL_MAX_BATCH_SIZE 999 #define GMAIL_LABEL_TYPE_USER "user" -#define GMAIL_SYSTEM_LABEL_UNREAD "UNREAD" -#define GMAIL_SYSTEM_LABEL_INBOX "INBOX" -#define GMAIL_SYSTEM_LABEL_SENT "SENT" -#define GMAIL_SYSTEM_LABEL_DRAFT "DRAFT" -#define GMAIL_SYSTEM_LABEL_SPAM "SPAM" +#define GMAIL_SYSTEM_LABEL_UNREAD "UNREAD" +#define GMAIL_SYSTEM_LABEL_INBOX "INBOX" +#define GMAIL_SYSTEM_LABEL_SENT "SENT" +#define GMAIL_SYSTEM_LABEL_DRAFT "DRAFT" +#define GMAIL_SYSTEM_LABEL_SPAM "SPAM" #define GMAIL_SYSTEM_LABEL_STARRED "STARRED" -#define GMAIL_SYSTEM_LABEL_TRASH "TRASH" +#define GMAIL_SYSTEM_LABEL_TRASH "TRASH" #define GMAIL_CONTENT_TYPE_HTTP "application/http" #define GMAIL_CONTENT_TYPE_JSON "application/json" -enum class RecipientType { To, Cc, Bcc, ReplyTo }; +enum class RecipientType { + To, + Cc, + Bcc, + ReplyTo +}; #endif // GMAIL_DEFINITIONS_H diff --git a/src/librssguard/services/gmail/gmailnetworkfactory.h b/src/librssguard/services/gmail/gmailnetworkfactory.h index 58bd8370c..9d2c247dc 100644 --- a/src/librssguard/services/gmail/gmailnetworkfactory.h +++ b/src/librssguard/services/gmail/gmailnetworkfactory.h @@ -3,16 +3,14 @@ #ifndef GMAILNETWORKFACTORY_H #define GMAILNETWORKFACTORY_H -#include - -#include "core/message.h" - #include "3rd-party/mimesis/mimesis.hpp" +#include "core/message.h" #include "services/abstract/feed.h" #include "services/abstract/rootitem.h" #include "services/abstract/serviceroot.h" #include +#include class RootItem; class GmailServiceRoot; @@ -51,9 +49,9 @@ class GmailNetworkFactory : public QObject { Feed::Status& error, const QNetworkProxy& custom_proxy); QNetworkReply::NetworkError batchModify(const QString& label, - const QStringList& custom_ids, - bool assign, - const QNetworkProxy& custom_proxy); + const QStringList& custom_ids, + bool assign, + const QNetworkProxy& custom_proxy); QStringList list(const QString& stream_id, const QStringList& label_ids, int max_results, diff --git a/src/librssguard/services/gmail/gmailserviceroot.h b/src/librssguard/services/gmail/gmailserviceroot.h index dd49bc730..e7eb60115 100644 --- a/src/librssguard/services/gmail/gmailserviceroot.h +++ b/src/librssguard/services/gmail/gmailserviceroot.h @@ -5,7 +5,6 @@ #include "services/abstract/cacheforserviceroot.h" #include "services/abstract/serviceroot.h" - #include "services/gmail/gui/emailpreviewer.h" class GmailNetworkFactory; diff --git a/src/librssguard/services/gmail/gui/emailpreviewer.h b/src/librssguard/services/gmail/gui/emailpreviewer.h index ba6332522..8751fb75b 100644 --- a/src/librssguard/services/gmail/gui/emailpreviewer.h +++ b/src/librssguard/services/gmail/gui/emailpreviewer.h @@ -3,9 +3,8 @@ #ifndef EMAILPREVIEWER_H #define EMAILPREVIEWER_H -#include "services/abstract/gui/custommessagepreviewer.h" - #include "gui/webbrowser.h" +#include "services/abstract/gui/custommessagepreviewer.h" #include "ui_emailpreviewer.h" diff --git a/src/librssguard/services/gmail/gui/emailrecipientcontrol.h b/src/librssguard/services/gmail/gui/emailrecipientcontrol.h index ef64383c1..720e2b3ff 100644 --- a/src/librssguard/services/gmail/gui/emailrecipientcontrol.h +++ b/src/librssguard/services/gmail/gui/emailrecipientcontrol.h @@ -3,16 +3,16 @@ #ifndef EMAILRECIPIENTCONTROL_H #define EMAILRECIPIENTCONTROL_H -#include - #include "services/gmail/definitions.h" +#include + class QComboBox; class QLineEdit; class PlainToolButton; class EmailRecipientControl : public QWidget { - Q_OBJECT + Q_OBJECT public: explicit EmailRecipientControl(const QString& recipient, QWidget* parent = nullptr); diff --git a/src/librssguard/services/gmail/gui/formaddeditemail.h b/src/librssguard/services/gmail/gui/formaddeditemail.h index 1eed7e412..5ccac8e13 100644 --- a/src/librssguard/services/gmail/gui/formaddeditemail.h +++ b/src/librssguard/services/gmail/gui/formaddeditemail.h @@ -3,10 +3,10 @@ #ifndef FORMADDEDITEMAIL_H #define FORMADDEDITEMAIL_H -#include - #include "ui_formaddeditemail.h" +#include + namespace Ui { class FormAddEditEmail; } @@ -16,7 +16,7 @@ class Message; class EmailRecipientControl; class FormAddEditEmail : public QDialog { - Q_OBJECT + Q_OBJECT public: explicit FormAddEditEmail(GmailServiceRoot* root, QWidget* parent = nullptr); diff --git a/src/librssguard/services/gmail/gui/formeditgmailaccount.h b/src/librssguard/services/gmail/gui/formeditgmailaccount.h index a2ab2fd93..f3d768d9a 100644 --- a/src/librssguard/services/gmail/gui/formeditgmailaccount.h +++ b/src/librssguard/services/gmail/gui/formeditgmailaccount.h @@ -4,14 +4,13 @@ #define FORMEDITINOREADERACCOUNT_H #include "services/abstract/gui/formaccountdetails.h" - #include "services/gmail/gmailnetworkfactory.h" class GmailServiceRoot; class GmailAccountDetails; class FormEditGmailAccount : public FormAccountDetails { - Q_OBJECT + Q_OBJECT public: explicit FormEditGmailAccount(QWidget* parent = nullptr); diff --git a/src/librssguard/services/gmail/gui/gmailaccountdetails.h b/src/librssguard/services/gmail/gui/gmailaccountdetails.h index 1df44046e..5aae58f54 100644 --- a/src/librssguard/services/gmail/gui/gmailaccountdetails.h +++ b/src/librssguard/services/gmail/gui/gmailaccountdetails.h @@ -3,18 +3,17 @@ #ifndef GMAILACCOUNTDETAILS_H #define GMAILACCOUNTDETAILS_H -#include - #include "ui_gmailaccountdetails.h" #include +#include class OAuth2Service; class GmailAccountDetails : public QWidget { - Q_OBJECT + Q_OBJECT - friend class FormEditGmailAccount; + friend class FormEditGmailAccount; public: explicit GmailAccountDetails(QWidget* parent = nullptr); diff --git a/src/librssguard/services/greader/greadernetwork.h b/src/librssguard/services/greader/greadernetwork.h index ec357ec2a..3a1e2931d 100644 --- a/src/librssguard/services/greader/greadernetwork.h +++ b/src/librssguard/services/greader/greadernetwork.h @@ -3,12 +3,12 @@ #ifndef GREADERNETWORK_H #define GREADERNETWORK_H -#include - #include "network-web/networkfactory.h" #include "services/abstract/feed.h" #include "services/greader/greaderserviceroot.h" +#include + class OAuth2Service; class GreaderNetwork : public QObject { diff --git a/src/librssguard/services/greader/gui/formeditgreaderaccount.h b/src/librssguard/services/greader/gui/formeditgreaderaccount.h index 7bee096bd..3187980c4 100644 --- a/src/librssguard/services/greader/gui/formeditgreaderaccount.h +++ b/src/librssguard/services/greader/gui/formeditgreaderaccount.h @@ -9,7 +9,7 @@ class GreaderAccountDetails; class GreaderServiceRoot; class FormEditGreaderAccount : public FormAccountDetails { - Q_OBJECT + Q_OBJECT public: explicit FormEditGreaderAccount(QWidget* parent = nullptr); diff --git a/src/librssguard/services/greader/gui/greaderaccountdetails.h b/src/librssguard/services/greader/gui/greaderaccountdetails.h index ca67eb2aa..6f9378f5c 100644 --- a/src/librssguard/services/greader/gui/greaderaccountdetails.h +++ b/src/librssguard/services/greader/gui/greaderaccountdetails.h @@ -3,20 +3,19 @@ #ifndef GREADERACCOUNTDETAILS_H #define GREADERACCOUNTDETAILS_H -#include +#include "services/greader/greaderserviceroot.h" #include "ui_greaderaccountdetails.h" -#include "services/greader/greaderserviceroot.h" - #include +#include class OAuth2Service; class GreaderAccountDetails : public QWidget { - Q_OBJECT + Q_OBJECT - friend class FormEditGreaderAccount; + friend class FormEditGreaderAccount; public: explicit GreaderAccountDetails(QWidget* parent = nullptr); diff --git a/src/librssguard/services/greader/gui/greaderfeeddetails.h b/src/librssguard/services/greader/gui/greaderfeeddetails.h index d651e273d..1a68942bc 100644 --- a/src/librssguard/services/greader/gui/greaderfeeddetails.h +++ b/src/librssguard/services/greader/gui/greaderfeeddetails.h @@ -3,10 +3,10 @@ #ifndef GREADERFEEDDETAILS_H #define GREADERFEEDDETAILS_H -#include - #include "ui_greaderfeeddetails.h" +#include + class Category; class RootItem; diff --git a/src/librssguard/services/owncloud/definitions.h b/src/librssguard/services/owncloud/definitions.h index 675433fdb..1b740bf39 100644 --- a/src/librssguard/services/owncloud/definitions.h +++ b/src/librssguard/services/owncloud/definitions.h @@ -3,11 +3,11 @@ #ifndef OWNCLOUD_DEFINITIONS_H #define OWNCLOUD_DEFINITIONS_H -#define OWNCLOUD_CONTENT_TYPE_JSON "application/json; charset=utf-8" -#define OWNCLOUD_API_VERSION "1.2" -#define OWNCLOUD_API_PATH "index.php/apps/news/api/v1-2/" -#define OWNCLOUD_MIN_VERSION "6.0.5" -#define OWNCLOUD_UNLIMITED_BATCH_SIZE -1 -#define OWNCLOUD_DEFAULT_BATCH_SIZE 100 +#define OWNCLOUD_CONTENT_TYPE_JSON "application/json; charset=utf-8" +#define OWNCLOUD_API_VERSION "1.2" +#define OWNCLOUD_API_PATH "index.php/apps/news/api/v1-2/" +#define OWNCLOUD_MIN_VERSION "6.0.5" +#define OWNCLOUD_UNLIMITED_BATCH_SIZE -1 +#define OWNCLOUD_DEFAULT_BATCH_SIZE 100 #endif // OWNCLOUD_DEFINITIONS_H diff --git a/src/librssguard/services/owncloud/gui/formeditowncloudaccount.h b/src/librssguard/services/owncloud/gui/formeditowncloudaccount.h index 013aee425..63ab52a05 100644 --- a/src/librssguard/services/owncloud/gui/formeditowncloudaccount.h +++ b/src/librssguard/services/owncloud/gui/formeditowncloudaccount.h @@ -9,7 +9,7 @@ class OwnCloudAccountDetails; class OwnCloudServiceRoot; class FormEditOwnCloudAccount : public FormAccountDetails { - Q_OBJECT + Q_OBJECT public: explicit FormEditOwnCloudAccount(QWidget* parent = nullptr); diff --git a/src/librssguard/services/owncloud/gui/owncloudaccountdetails.h b/src/librssguard/services/owncloud/gui/owncloudaccountdetails.h index 8b2293d7b..c5eb568fa 100644 --- a/src/librssguard/services/owncloud/gui/owncloudaccountdetails.h +++ b/src/librssguard/services/owncloud/gui/owncloudaccountdetails.h @@ -3,16 +3,15 @@ #ifndef OWNCLOUDACCOUNTDETAILS_H #define OWNCLOUDACCOUNTDETAILS_H -#include - #include "ui_owncloudaccountdetails.h" #include +#include class OwnCloudAccountDetails : public QWidget { - Q_OBJECT + Q_OBJECT - friend class FormEditOwnCloudAccount; + friend class FormEditOwnCloudAccount; public: explicit OwnCloudAccountDetails(QWidget* parent = nullptr); diff --git a/src/librssguard/services/owncloud/owncloudfeed.h b/src/librssguard/services/owncloud/owncloudfeed.h index a3288bee4..08b3e5a11 100644 --- a/src/librssguard/services/owncloud/owncloudfeed.h +++ b/src/librssguard/services/owncloud/owncloudfeed.h @@ -8,7 +8,7 @@ class OwnCloudServiceRoot; class OwnCloudFeed : public Feed { - Q_OBJECT + Q_OBJECT public: explicit OwnCloudFeed(RootItem* parent = nullptr); diff --git a/src/librssguard/services/owncloud/owncloudnetworkfactory.cpp b/src/librssguard/services/owncloud/owncloudnetworkfactory.cpp index dd6a2bb92..cf5f3e9d4 100644 --- a/src/librssguard/services/owncloud/owncloudnetworkfactory.cpp +++ b/src/librssguard/services/owncloud/owncloudnetworkfactory.cpp @@ -11,11 +11,12 @@ #include "services/owncloud/definitions.h" #include "services/owncloud/owncloudfeed.h" +#include + #include #include #include #include -#include OwnCloudNetworkFactory::OwnCloudNetworkFactory() : m_url(QString()), m_fixedUrl(QString()), m_downloadOnlyUnreadMessages(false), m_forceServerSideUpdate(false), @@ -79,7 +80,9 @@ OwnCloudStatusResponse OwnCloudNetworkFactory::status(const QNetworkProxy& custo QList> headers; headers << QPair(HTTP_HEADERS_CONTENT_TYPE, OWNCLOUD_CONTENT_TYPE_JSON); - headers << NetworkFactory::generateBasicAuthHeader(NetworkFactory::NetworkAuthentication::Basic, m_authUsername, m_authPassword); + headers << NetworkFactory::generateBasicAuthHeader(NetworkFactory::NetworkAuthentication::Basic, + m_authUsername, + m_authPassword); NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_urlStatus, @@ -111,7 +114,9 @@ OwnCloudGetFeedsCategoriesResponse OwnCloudNetworkFactory::feedsCategories(const QList> headers; headers << QPair(HTTP_HEADERS_CONTENT_TYPE, OWNCLOUD_CONTENT_TYPE_JSON); - headers << NetworkFactory::generateBasicAuthHeader(NetworkFactory::NetworkAuthentication::Basic, m_authUsername, m_authPassword); + headers << NetworkFactory::generateBasicAuthHeader(NetworkFactory::NetworkAuthentication::Basic, + m_authUsername, + m_authPassword); NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_urlFolders, @@ -166,7 +171,9 @@ bool OwnCloudNetworkFactory::deleteFeed(const QString& feed_id, const QNetworkPr QList> headers; headers << QPair(HTTP_HEADERS_CONTENT_TYPE, OWNCLOUD_CONTENT_TYPE_JSON); - headers << NetworkFactory::generateBasicAuthHeader(NetworkFactory::NetworkAuthentication::Basic, m_authUsername, m_authPassword); + headers << NetworkFactory::generateBasicAuthHeader(NetworkFactory::NetworkAuthentication::Basic, + m_authUsername, + m_authPassword); NetworkResult network_reply = NetworkFactory::performNetworkOperation(final_url, @@ -210,7 +217,9 @@ bool OwnCloudNetworkFactory::createFeed(const QString& url, int parent_id, const QList> headers; headers << QPair(HTTP_HEADERS_CONTENT_TYPE, OWNCLOUD_CONTENT_TYPE_JSON); - headers << NetworkFactory::generateBasicAuthHeader(NetworkFactory::NetworkAuthentication::Basic, m_authUsername, m_authPassword); + headers << NetworkFactory::generateBasicAuthHeader(NetworkFactory::NetworkAuthentication::Basic, + m_authUsername, + m_authPassword); NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_urlFeeds, @@ -248,7 +257,9 @@ bool OwnCloudNetworkFactory::renameFeed(const QString& new_name, QList> headers; headers << QPair(HTTP_HEADERS_CONTENT_TYPE, OWNCLOUD_CONTENT_TYPE_JSON); - headers << NetworkFactory::generateBasicAuthHeader(NetworkFactory::NetworkAuthentication::Basic, m_authUsername, m_authPassword); + headers << NetworkFactory::generateBasicAuthHeader(NetworkFactory::NetworkAuthentication::Basic, + m_authUsername, + m_authPassword); NetworkResult network_reply = NetworkFactory::performNetworkOperation(final_url, @@ -287,7 +298,9 @@ OwnCloudGetMessagesResponse OwnCloudNetworkFactory::getMessages(int feed_id, con QList> headers; headers << QPair(HTTP_HEADERS_CONTENT_TYPE, OWNCLOUD_CONTENT_TYPE_JSON); - headers << NetworkFactory::generateBasicAuthHeader(NetworkFactory::NetworkAuthentication::Basic, m_authUsername, m_authPassword); + headers << NetworkFactory::generateBasicAuthHeader(NetworkFactory::NetworkAuthentication::Basic, + m_authUsername, + m_authPassword); NetworkResult network_reply = NetworkFactory::performNetworkOperation(final_url, @@ -318,7 +331,9 @@ QNetworkReply::NetworkError OwnCloudNetworkFactory::triggerFeedUpdate(int feed_i QList> headers; headers << QPair(HTTP_HEADERS_CONTENT_TYPE, OWNCLOUD_CONTENT_TYPE_JSON); - headers << NetworkFactory::generateBasicAuthHeader(NetworkFactory::NetworkAuthentication::Basic, m_authUsername, m_authPassword); + headers << NetworkFactory::generateBasicAuthHeader(NetworkFactory::NetworkAuthentication::Basic, + m_authUsername, + m_authPassword); NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_urlFeedsUpdate.arg(authUsername(), QString::number(feed_id)), @@ -365,7 +380,9 @@ NetworkResult OwnCloudNetworkFactory::markMessagesRead(RootItem::ReadStatus stat QList> headers; headers << QPair(HTTP_HEADERS_CONTENT_TYPE, OWNCLOUD_CONTENT_TYPE_JSON); - headers << NetworkFactory::generateBasicAuthHeader(NetworkFactory::NetworkAuthentication::Basic, m_authUsername, m_authPassword); + headers << NetworkFactory::generateBasicAuthHeader(NetworkFactory::NetworkAuthentication::Basic, + m_authUsername, + m_authPassword); QByteArray output; @@ -411,7 +428,9 @@ NetworkResult OwnCloudNetworkFactory::markMessagesStarred(RootItem::Importance i QList> headers; headers << QPair(HTTP_HEADERS_CONTENT_TYPE, OWNCLOUD_CONTENT_TYPE_JSON); - headers << NetworkFactory::generateBasicAuthHeader(NetworkFactory::NetworkAuthentication::Basic, m_authUsername, m_authPassword); + headers << NetworkFactory::generateBasicAuthHeader(NetworkFactory::NetworkAuthentication::Basic, + m_authUsername, + m_authPassword); QByteArray output; diff --git a/src/librssguard/services/owncloud/owncloudnetworkfactory.h b/src/librssguard/services/owncloud/owncloudnetworkfactory.h index dad24fe4c..d9049d31c 100644 --- a/src/librssguard/services/owncloud/owncloudnetworkfactory.h +++ b/src/librssguard/services/owncloud/owncloudnetworkfactory.h @@ -48,7 +48,9 @@ class RootItem; class OwnCloudGetFeedsCategoriesResponse : public OwnCloudResponse { public: - explicit OwnCloudGetFeedsCategoriesResponse(QNetworkReply::NetworkError response, QString raw_categories = QString(), QString raw_feeds = QString()); + explicit OwnCloudGetFeedsCategoriesResponse(QNetworkReply::NetworkError response, + QString raw_categories = QString(), + QString raw_feeds = QString()); virtual ~OwnCloudGetFeedsCategoriesResponse(); // Returns tree of feeds/categories. diff --git a/src/librssguard/services/owncloud/owncloudserviceentrypoint.cpp b/src/librssguard/services/owncloud/owncloudserviceentrypoint.cpp index 0eb7d2c2e..d98129c7d 100644 --- a/src/librssguard/services/owncloud/owncloudserviceentrypoint.cpp +++ b/src/librssguard/services/owncloud/owncloudserviceentrypoint.cpp @@ -32,7 +32,8 @@ QString OwnCloudServiceEntryPoint::code() const { QString OwnCloudServiceEntryPoint::description() const { return QObject::tr("The News app is an RSS/Atom feed aggregator. " - "It is part of Nextcloud suite. This plugin implements %1 API.").arg(QSL(OWNCLOUD_API_VERSION)); + "It is part of Nextcloud suite. This plugin implements %1 API.") + .arg(QSL(OWNCLOUD_API_VERSION)); } QString OwnCloudServiceEntryPoint::author() const { diff --git a/src/librssguard/services/reddit/definitions.h b/src/librssguard/services/reddit/definitions.h index b34493edc..aa433a402 100644 --- a/src/librssguard/services/reddit/definitions.h +++ b/src/librssguard/services/reddit/definitions.h @@ -4,18 +4,18 @@ #define REDDIT_DEFINITIONS_H #define REDDIT_OAUTH_REDIRECT_URI_PORT 14499 -#define REDDIT_OAUTH_AUTH_URL "https://www.reddit.com/api/v1/authorize" -#define REDDIT_OAUTH_TOKEN_URL "https://www.reddit.com/api/v1/access_token" -#define REDDIT_OAUTH_SCOPE "identity mysubreddits read" +#define REDDIT_OAUTH_AUTH_URL "https://www.reddit.com/api/v1/authorize" +#define REDDIT_OAUTH_TOKEN_URL "https://www.reddit.com/api/v1/access_token" +#define REDDIT_OAUTH_SCOPE "identity mysubreddits read" #define REDDIT_REG_API_URL "https://www.reddit.com/prefs/apps" #define REDDIT_API_GET_PROFILE "https://oauth.reddit.com/api/v1/me" -#define REDDIT_API_SUBREDDITS "https://oauth.reddit.com/subreddits/mine/subscriber?limit=%1" -#define REDDIT_API_HOT "https://oauth.reddit.com%1hot?limit=%2&count=%3&g=%4" +#define REDDIT_API_SUBREDDITS "https://oauth.reddit.com/subreddits/mine/subscriber?limit=%1" +#define REDDIT_API_HOT "https://oauth.reddit.com%1hot?limit=%2&count=%3&g=%4" #define REDDIT_DEFAULT_BATCH_SIZE 100 -#define REDDIT_MAX_BATCH_SIZE 999 +#define REDDIT_MAX_BATCH_SIZE 999 #define REDDIT_CONTENT_TYPE_HTTP "application/http" #define REDDIT_CONTENT_TYPE_JSON "application/json" diff --git a/src/librssguard/services/reddit/gui/formeditredditaccount.h b/src/librssguard/services/reddit/gui/formeditredditaccount.h index 7811bd19a..0a7890b93 100644 --- a/src/librssguard/services/reddit/gui/formeditredditaccount.h +++ b/src/librssguard/services/reddit/gui/formeditredditaccount.h @@ -4,14 +4,13 @@ #define FORMEDITREDDITACCOUNT_H #include "services/abstract/gui/formaccountdetails.h" - #include "services/reddit/redditnetworkfactory.h" class RedditServiceRoot; class RedditAccountDetails; class FormEditRedditAccount : public FormAccountDetails { - Q_OBJECT + Q_OBJECT public: explicit FormEditRedditAccount(QWidget* parent = nullptr); diff --git a/src/librssguard/services/reddit/gui/redditaccountdetails.h b/src/librssguard/services/reddit/gui/redditaccountdetails.h index b383a7eb7..13e5a3877 100644 --- a/src/librssguard/services/reddit/gui/redditaccountdetails.h +++ b/src/librssguard/services/reddit/gui/redditaccountdetails.h @@ -3,18 +3,17 @@ #ifndef REDDITACCOUNTDETAILS_H #define REDDITACCOUNTDETAILS_H -#include - #include "ui_redditaccountdetails.h" #include +#include class OAuth2Service; class RedditAccountDetails : public QWidget { - Q_OBJECT + Q_OBJECT - friend class FormEditRedditAccount; + friend class FormEditRedditAccount; public: explicit RedditAccountDetails(QWidget* parent = nullptr); diff --git a/src/librssguard/services/reddit/redditcategory.cpp b/src/librssguard/services/reddit/redditcategory.cpp index 901fb57da..0a5c51c64 100644 --- a/src/librssguard/services/reddit/redditcategory.cpp +++ b/src/librssguard/services/reddit/redditcategory.cpp @@ -2,8 +2,7 @@ #include "services/reddit/redditcategory.h" -RedditCategory::RedditCategory(Type type, RootItem* parent_item) - : Category(parent_item), m_type(type) { +RedditCategory::RedditCategory(Type type, RootItem* parent_item) : Category(parent_item), m_type(type) { updateTitle(); } diff --git a/src/librssguard/services/reddit/redditcategory.h b/src/librssguard/services/reddit/redditcategory.h index 99d6bd64e..7e584eac9 100644 --- a/src/librssguard/services/reddit/redditcategory.h +++ b/src/librssguard/services/reddit/redditcategory.h @@ -6,7 +6,7 @@ #include "services/abstract/category.h" class RedditCategory : public Category { - Q_OBJECT + Q_OBJECT public: enum class Type { diff --git a/src/librssguard/services/reddit/redditnetworkfactory.h b/src/librssguard/services/reddit/redditnetworkfactory.h index b4105fc3a..2c94882a3 100644 --- a/src/librssguard/services/reddit/redditnetworkfactory.h +++ b/src/librssguard/services/reddit/redditnetworkfactory.h @@ -3,15 +3,13 @@ #ifndef REDDITNETWORKFACTORY_H #define REDDITNETWORKFACTORY_H -#include - -#include "core/message.h" - #include "3rd-party/mimesis/mimesis.hpp" +#include "core/message.h" #include "services/abstract/feed.h" #include "services/abstract/rootitem.h" #include +#include class RootItem; class RedditServiceRoot; diff --git a/src/librssguard/services/tt-rss/definitions.h b/src/librssguard/services/tt-rss/definitions.h index 0c765cc5d..b76994be2 100644 --- a/src/librssguard/services/tt-rss/definitions.h +++ b/src/librssguard/services/tt-rss/definitions.h @@ -4,46 +4,46 @@ #define TTRSS_DEFINITIONS_H #define TTRSS_MINIMAL_API_LEVEL 9 -#define TTRSS_CONTENT_TYPE_JSON "application/json; charset=utf-8" +#define TTRSS_CONTENT_TYPE_JSON "application/json; charset=utf-8" /// /// Errors. /// -#define TTRSS_NOT_LOGGED_IN "NOT_LOGGED_IN" // Error when user needs to login before making an operation. -#define TTRSS_UNKNOWN_METHOD "UNKNOWN_METHOD" // Given "op" is not recognized. -#define TTRSS_INCORRECT_USAGE "INCORRECT_USAGE" // Given "op" was used with bad parameters. +#define TTRSS_NOT_LOGGED_IN "NOT_LOGGED_IN" // Error when user needs to login before making an operation. +#define TTRSS_UNKNOWN_METHOD "UNKNOWN_METHOD" // Given "op" is not recognized. +#define TTRSS_INCORRECT_USAGE "INCORRECT_USAGE" // Given "op" was used with bad parameters. // Limitations -#define TTRSS_DEFAULT_MESSAGES 100 -#define TTRSS_MAX_MESSAGES 200 +#define TTRSS_DEFAULT_MESSAGES 100 +#define TTRSS_MAX_MESSAGES 200 // General return status codes. -#define TTRSS_API_STATUS_OK 0 -#define TTRSS_API_STATUS_ERR 1 -#define TTRSS_CONTENT_NOT_LOADED -1 +#define TTRSS_API_STATUS_OK 0 +#define TTRSS_API_STATUS_ERR 1 +#define TTRSS_CONTENT_NOT_LOADED -1 // Login. -#define TTRSS_API_DISABLED "API_DISABLED" // API is not enabled. -#define TTRSS_LOGIN_ERROR "LOGIN_ERROR" // Incorrect password/username. +#define TTRSS_API_DISABLED "API_DISABLED" // API is not enabled. +#define TTRSS_LOGIN_ERROR "LOGIN_ERROR" // Incorrect password/username. // Get feed tree. #define TTRSS_GFT_TYPE_CATEGORY "category" // "Published" feed/label. -#define TTRSS_PUBLISHED_LABEL_ID -2 -#define TTRSS_PUBLISHED_FEED_ID 0 +#define TTRSS_PUBLISHED_LABEL_ID -2 +#define TTRSS_PUBLISHED_FEED_ID 0 // Subscribe to feed. -#define STF_UNKNOWN -1 -#define STF_EXISTS 0 -#define STF_INVALID_URL 2 -#define STF_UNREACHABLE_URL 5 -#define STF_URL_NO_FEED 3 -#define STF_URL_MANY_FEEDS 4 -#define STF_INSERTED 1 +#define STF_UNKNOWN -1 +#define STF_EXISTS 0 +#define STF_INVALID_URL 2 +#define STF_UNREACHABLE_URL 5 +#define STF_URL_NO_FEED 3 +#define STF_URL_MANY_FEEDS 4 +#define STF_INSERTED 1 // Unsubscribe from feed. -#define UFF_FEED_NOT_FOUND "FEED_NOT_FOUND" -#define UFF_OK "OK" +#define UFF_FEED_NOT_FOUND "FEED_NOT_FOUND" +#define UFF_OK "OK" #endif // TTRSS_DEFINITIONS_H diff --git a/src/librssguard/services/tt-rss/gui/formeditttrssaccount.h b/src/librssguard/services/tt-rss/gui/formeditttrssaccount.h index 9563d1756..2357b2a17 100644 --- a/src/librssguard/services/tt-rss/gui/formeditttrssaccount.h +++ b/src/librssguard/services/tt-rss/gui/formeditttrssaccount.h @@ -10,7 +10,7 @@ class TtRssServiceRoot; class TtRssAccountDetails; class FormEditTtRssAccount : public FormAccountDetails { - Q_OBJECT + Q_OBJECT public: explicit FormEditTtRssAccount(QWidget* parent = nullptr); diff --git a/src/librssguard/services/tt-rss/gui/formttrssnote.h b/src/librssguard/services/tt-rss/gui/formttrssnote.h index 8ebe6fe70..fa8d478a0 100644 --- a/src/librssguard/services/tt-rss/gui/formttrssnote.h +++ b/src/librssguard/services/tt-rss/gui/formttrssnote.h @@ -3,14 +3,14 @@ #ifndef FORMTTRSSNOTE_H #define FORMTTRSSNOTE_H -#include - #include "ui_formttrssnote.h" +#include + class TtRssServiceRoot; class FormTtRssNote : public QDialog { - Q_OBJECT + Q_OBJECT public: explicit FormTtRssNote(TtRssServiceRoot* root); diff --git a/src/librssguard/services/tt-rss/gui/ttrssaccountdetails.h b/src/librssguard/services/tt-rss/gui/ttrssaccountdetails.h index 6fb4fe3b1..279db27dd 100644 --- a/src/librssguard/services/tt-rss/gui/ttrssaccountdetails.h +++ b/src/librssguard/services/tt-rss/gui/ttrssaccountdetails.h @@ -3,18 +3,17 @@ #ifndef TTRSSACCOUNTDETAILS_H #define TTRSSACCOUNTDETAILS_H -#include - #include "ui_ttrssaccountdetails.h" #include +#include class TtRssServiceRoot; class TtRssAccountDetails : public QWidget { - Q_OBJECT + Q_OBJECT - friend class FormEditTtRssAccount; + friend class FormEditTtRssAccount; public: explicit TtRssAccountDetails(QWidget* parent = nullptr); diff --git a/src/librssguard/services/tt-rss/gui/ttrssfeeddetails.h b/src/librssguard/services/tt-rss/gui/ttrssfeeddetails.h index b06c2ffbc..d6eadb785 100644 --- a/src/librssguard/services/tt-rss/gui/ttrssfeeddetails.h +++ b/src/librssguard/services/tt-rss/gui/ttrssfeeddetails.h @@ -3,17 +3,17 @@ #ifndef TTRSSFEEDDETAILS_H #define TTRSSFEEDDETAILS_H -#include - #include "ui_ttrssfeeddetails.h" +#include + class Category; class RootItem; class TtRssFeedDetails : public QWidget { - Q_OBJECT + Q_OBJECT - friend class FormTtRssFeedDetails; + friend class FormTtRssFeedDetails; public: explicit TtRssFeedDetails(QWidget* parent = nullptr); diff --git a/src/librssguard/services/tt-rss/ttrssfeed.h b/src/librssguard/services/tt-rss/ttrssfeed.h index 577a7fac6..81b4ee3be 100644 --- a/src/librssguard/services/tt-rss/ttrssfeed.h +++ b/src/librssguard/services/tt-rss/ttrssfeed.h @@ -8,7 +8,7 @@ class TtRssServiceRoot; class TtRssFeed : public Feed { - Q_OBJECT + Q_OBJECT public: explicit TtRssFeed(RootItem* parent = nullptr); diff --git a/src/librssguard/services/tt-rss/ttrssnetworkfactory.h b/src/librssguard/services/tt-rss/ttrssnetworkfactory.h index 8f1c4ae62..a548d9a3f 100644 --- a/src/librssguard/services/tt-rss/ttrssnetworkfactory.h +++ b/src/librssguard/services/tt-rss/ttrssnetworkfactory.h @@ -4,7 +4,6 @@ #define TTRSSNETWORKFACTORY_H #include "core/message.h" - #include "services/tt-rss/ttrssnotetopublish.h" #include @@ -119,9 +118,17 @@ class TtRssUnsubscribeFeedResponse : public TtRssResponse { }; namespace UpdateArticle { - enum class Mode { SetToFalse = 0, SetToTrue = 1, Togggle = 2 }; + enum class Mode { + SetToFalse = 0, + SetToTrue = 1, + Togggle = 2 + }; - enum class OperatingField { Starred = 0, Published = 1, Unread = 2 }; + enum class OperatingField { + Starred = 0, + Published = 1, + Unread = 2 + }; } // namespace UpdateArticle diff --git a/src/librssguard/services/tt-rss/ttrssserviceentrypoint.cpp b/src/librssguard/services/tt-rss/ttrssserviceentrypoint.cpp index 55dce953c..5a29b2d6d 100644 --- a/src/librssguard/services/tt-rss/ttrssserviceentrypoint.cpp +++ b/src/librssguard/services/tt-rss/ttrssserviceentrypoint.cpp @@ -17,7 +17,8 @@ QString TtRssServiceEntryPoint::description() const { return QObject::tr("This service offers integration with Tiny Tiny RSS.\n\n" "Tiny Tiny RSS is an open source web-based news feed (RSS/Atom) reader and aggregator, " "designed to allow you to read news from any location, while feeling as close to a real " - "desktop application as possible.\n\nAt least API level %1 is required.").arg(TTRSS_MINIMAL_API_LEVEL); + "desktop application as possible.\n\nAt least API level %1 is required.") + .arg(TTRSS_MINIMAL_API_LEVEL); } QString TtRssServiceEntryPoint::author() const {