tweaked clang format

.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)?$'

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 <librssguard/3rd-party/boolinq/boolinq.h>
 #include <librssguard/database/databasequeries.h>
 #include <librssguard/gui/guiutilities.h>
@@ -10,16 +20,6 @@
 #include <librssguard/miscellaneous/settings.h>
 #include <librssguard/services/abstract/category.h>
 #include <librssguard/services/abstract/serviceroot.h>
-#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 <QtConcurrentMap>
 

src/librssguard-standard/src/gui/formdiscoverfeeds.h

@@ -7,11 +7,11 @@
 
 #include "ui_formdiscoverfeeds.h"
 
+#include <librssguard/services/abstract/accountcheckmodel.h>
+
 #include <QDialog>
 #include <QFutureWatcher>
 
-#include <librssguard/services/abstract/accountcheckmodel.h>
-
 class ServiceRoot;
 class RootItem;
 class Category;

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 <librssguard/database/databasequeries.h>
 #include <librssguard/exceptions/applicationexception.h>
 #include <librssguard/miscellaneous/application.h>
@@ -10,8 +13,6 @@
 #include <librssguard/services/abstract/category.h>
 #include <librssguard/services/abstract/gui/authenticationdetails.h>
 #include <librssguard/services/abstract/serviceroot.h>
-#include "src/gui/standardfeeddetails.h"
-#include "src/standardfeed.h"
 
 #include <QComboBox>
 #include <QDialogButtonBox>

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 <librssguard/exceptions/ioexception.h>
 #include <librssguard/gui/guiutilities.h>
 #include <librssguard/miscellaneous/application.h>
 #include <librssguard/miscellaneous/iconfactory.h>
 #include <librssguard/services/abstract/category.h>
 
-#include "src/standardfeedsimportexportmodel.h"
-#include "src/standardserviceroot.h"
-
 #include <QFileDialog>
 #include <QTextStream>
 

src/librssguard-standard/src/gui/standardaccountdetails.cpp

@@ -2,9 +2,10 @@
 
 #include "src/gui/standardaccountdetails.h"
 
+#include "src/standardserviceentrypoint.h"
+
 #include <librssguard/3rd-party/boolinq/boolinq.h>
 #include <librssguard/miscellaneous/iconfactory.h>
-#include "src/standardserviceentrypoint.h"
 
 #include <QFileDialog>
 #include <QImageReader>

src/librssguard-standard/src/gui/standardfeeddetails.cpp

@@ -2,6 +2,8 @@
 
 #include "src/gui/standardfeeddetails.h"
 
+#include "src/definitions.h"
+
 #include <librssguard/3rd-party/boolinq/boolinq.h>
 #include <librssguard/exceptions/applicationexception.h>
 #include <librssguard/exceptions/networkexception.h>
@@ -10,7 +12,6 @@
 #include <librssguard/miscellaneous/textfactory.h>
 #include <librssguard/network-web/networkfactory.h>
 #include <librssguard/services/abstract/category.h>
-#include "src/definitions.h"
 
 #include <QFileDialog>
 #include <QImageReader>

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 <librssguard/definitions/definitions.h>
 #include <librssguard/exceptions/applicationexception.h>
 #include <librssguard/miscellaneous/application.h>
 #include <librssguard/miscellaneous/settings.h>
 #include <librssguard/miscellaneous/textfactory.h>
-#include "src/definitions.h"
-#include "src/standardfeed.h"
 
 #include <QTextCodec>
 

src/librssguard-standard/src/parsers/atomparser.h

@@ -5,11 +5,11 @@
 
 #include "src/parsers/feedparser.h"
 
+#include <librssguard/core/message.h>
+
 #include <QDomDocument>
 #include <QList>
 
-#include <librssguard/core/message.h>
-
 class AtomParser : public FeedParser {
   public:
     explicit AtomParser(const QString& data);

src/librssguard-standard/src/parsers/feedparser.cpp

@@ -9,13 +9,12 @@
 #include <librssguard/exceptions/feedfetchexception.h>
 #include <librssguard/miscellaneous/iofactory.h>
 #include <librssguard/network-web/webfactory.h>
+#include <utility>
 
 #include <QDebug>
 #include <QFile>
 #include <QRegularExpression>
 
-#include <utility>
-
 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()) {

src/librssguard-standard/src/parsers/feedparser.h

@@ -5,15 +5,15 @@
 
 #include "src/standardfeed.h"
 
+#include <librssguard/core/message.h>
+#include <librssguard/definitions/typedefs.h>
+
 #include <QDomDocument>
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QString>
 
-#include <librssguard/core/message.h>
-#include <librssguard/definitions/typedefs.h>
-
 // Base class for all XML-based feed parsers.
 class FeedParser {
   public:

src/librssguard-standard/src/parsers/icalparser.cpp

@@ -2,6 +2,8 @@
 
 #include "src/parsers/icalparser.h"
 
+#include "src/definitions.h"
+
 #include <librssguard/3rd-party/boolinq/boolinq.h>
 #include <librssguard/definitions/definitions.h>
 #include <librssguard/exceptions/applicationexception.h>
@@ -9,7 +11,6 @@
 #include <librssguard/miscellaneous/application.h>
 #include <librssguard/miscellaneous/settings.h>
 #include <librssguard/miscellaneous/textfactory.h>
-#include "src/definitions.h"
 
 IcalParser::IcalParser(const QString& data)
   : FeedParser(data, DataType::Other), m_iCalendar(Icalendar(m_data.toUtf8())) {}

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 <librssguard/definitions/definitions.h>
 #include <librssguard/definitions/typedefs.h>
 #include <librssguard/exceptions/applicationexception.h>
 #include <librssguard/exceptions/feedrecognizedbutfailedexception.h>
 #include <librssguard/miscellaneous/settings.h>
 #include <librssguard/miscellaneous/textfactory.h>
-#include "src/definitions.h"
-#include "src/standardfeed.h"
 
 #include <QJsonArray>
 #include <QJsonDocument>

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 <librssguard/exceptions/applicationexception.h>
 #include <librssguard/miscellaneous/settings.h>
 #include <librssguard/miscellaneous/textfactory.h>
-#include "src/definitions.h"
-#include "src/standardfeed.h"
 
 #include <QDomDocument>
 #include <QTextCodec>

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 <librssguard/exceptions/applicationexception.h>
 #include <librssguard/miscellaneous/application.h>
 #include <librssguard/miscellaneous/settings.h>
 #include <librssguard/miscellaneous/textfactory.h>
 #include <librssguard/network-web/networkfactory.h>
-#include "src/definitions.h"
-#include "src/standardfeed.h"
 
 #include <QDomDocument>
 #include <QTextCodec>

src/librssguard-standard/src/parsers/sitemapparser.cpp

@@ -7,6 +7,7 @@
 #endif
 
 #include "src/definitions.h"
+
 #include <librssguard/definitions/definitions.h>
 #include <librssguard/exceptions/applicationexception.h>
 #include <librssguard/exceptions/feedrecognizedbutfailedexception.h>

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 {

src/librssguard-standard/src/standardfeed.cpp

@@ -4,6 +4,7 @@
 
 #include "src/gui/formstandardfeeddetails.h"
 #include "src/standardserviceroot.h"
+
 #include <librssguard/database/databasequeries.h>
 #include <librssguard/definitions/definitions.h>
 #include <librssguard/exceptions/applicationexception.h>

src/librssguard-standard/src/standardfeed.h

@@ -3,9 +3,8 @@
 #ifndef FEEDSMODELFEED_H
 #define FEEDSMODELFEED_H
 
-#include <librssguard/services/abstract/feed.h>
-
 #include <librssguard/network-web/networkfactory.h>
+#include <librssguard/services/abstract/feed.h>
 
 #include <QCoreApplication>
 #include <QDateTime>

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 <librssguard/3rd-party/boolinq/boolinq.h>
 #include <librssguard/definitions/definitions.h>
 #include <librssguard/exceptions/applicationexception.h>
 #include <librssguard/miscellaneous/application.h>
 #include <librssguard/miscellaneous/iconfactory.h>
-#include "src/definitions.h"
-#include "src/standardcategory.h"
-#include "src/standardfeed.h"
-#include "src/standardserviceroot.h"
 
 #include <QDomAttr>
 #include <QDomDocument>

src/librssguard-standard/src/standardserviceentrypoint.cpp

@@ -4,6 +4,7 @@
 
 #include "src/gui/formeditstandardaccount.h"
 #include "src/standardserviceroot.h"
+
 #include <librssguard/database/databasequeries.h>
 #include <librssguard/definitions/definitions.h>
 #include <librssguard/miscellaneous/application.h>

src/librssguard-standard/src/standardserviceroot.cpp

@@ -2,19 +2,6 @@
 
 #include "src/standardserviceroot.h"
 
-#include <librssguard/database/databasequeries.h>
-#include <librssguard/definitions/definitions.h>
-#include <librssguard/exceptions/applicationexception.h>
-#include <librssguard/exceptions/feedfetchexception.h>
-#include <librssguard/exceptions/scriptexception.h>
-#include <librssguard/gui/messagebox.h>
-#include <librssguard/miscellaneous/application.h>
-#include <librssguard/miscellaneous/iconfactory.h>
-#include <librssguard/miscellaneous/mutex.h>
-#include <librssguard/miscellaneous/settings.h>
-#include <librssguard/network-web/networkfactory.h>
-#include <librssguard/services/abstract/gui/formcategorydetails.h>
-
 #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 <librssguard/database/databasequeries.h>
+#include <librssguard/definitions/definitions.h>
+#include <librssguard/exceptions/applicationexception.h>
+#include <librssguard/exceptions/feedfetchexception.h>
+#include <librssguard/exceptions/scriptexception.h>
+#include <librssguard/gui/messagebox.h>
+#include <librssguard/miscellaneous/application.h>
+#include <librssguard/miscellaneous/iconfactory.h>
+#include <librssguard/miscellaneous/mutex.h>
+#include <librssguard/miscellaneous/settings.h>
+#include <librssguard/network-web/networkfactory.h>
+#include <librssguard/services/abstract/gui/formcategorydetails.h>
+
 #if defined(NO_LITE)
 #include <librssguard/gui/webviewers/webengine/webengineviewer.h>
 #include <librssguard/network-web/webengine/webenginepage.h>

src/librssguard-standard/src/standardserviceroot.h

@@ -3,10 +3,10 @@
 #ifndef STANDARDSERVICEROOT_H
 #define STANDARDSERVICEROOT_H
 
-#include <librssguard/services/abstract/serviceroot.h>
-
 #include "src/standardfeed.h"
 
+#include <librssguard/services/abstract/serviceroot.h>
+
 #include <QCoreApplication>
 #include <QPair>
 

src/librssguard/core/articlelistnotificationmodel.h

@@ -3,10 +3,10 @@
 #ifndef ARTICLELISTNOTIFICATIONMODEL_H
 #define ARTICLELISTNOTIFICATIONMODEL_H
 
-#include <QAbstractListModel>
-
 #include "core/message.h"
 
+#include <QAbstractListModel>
+
 class ArticleListNotificationModel : public QAbstractListModel {
     Q_OBJECT
 

src/librssguard/core/feeddownloader.h

@@ -3,8 +3,6 @@
 #ifndef FEEDDOWNLOADER_H
 #define FEEDDOWNLOADER_H
 
-#include <QObject>
-
 #include "core/message.h"
 #include "exceptions/applicationexception.h"
 #include "services/abstract/cacheforserviceroot.h"
@@ -12,6 +10,7 @@
 
 #include <QFutureWatcher>
 #include <QHash>
+#include <QObject>
 #include <QPair>
 
 class MessageFilter;

src/librssguard/core/feedsmodel.h

@@ -3,10 +3,10 @@
 #ifndef FEEDSMODEL_H
 #define FEEDSMODEL_H
 
-#include <QAbstractItemModel>
-
 #include "services/abstract/rootitem.h"
 
+#include <QAbstractItemModel>
+
 class Category;
 class Feed;
 class ServiceRoot;

src/librssguard/core/feedsproxymodel.h

@@ -3,10 +3,10 @@
 #ifndef FEEDSPROXYMODEL_H
 #define FEEDSPROXYMODEL_H
 
-#include <QSortFilterProxyModel>
-
 #include "services/abstract/rootitem.h"
 
+#include <QSortFilterProxyModel>
+
 class FeedsModel;
 class FeedsView;
 

src/librssguard/core/messagefilter.h

@@ -3,12 +3,11 @@
 #ifndef MESSAGEFILTER_H
 #define MESSAGEFILTER_H
 
-#include <QObject>
-
 #include "core/message.h"
 #include "core/messageobject.h"
 
 #include <QJSEngine>
+#include <QObject>
 
 // Class which represents one message filter.
 class RSSGUARD_DLLSPEC MessageFilter : public QObject {

src/librssguard/core/messageobject.h

@@ -3,10 +3,10 @@
 #ifndef MESSAGEOBJECT_H
 #define MESSAGEOBJECT_H
 
-#include <QObject>
-
 #include "services/abstract/label.h"
 
+#include <QObject>
+
 class MessageObject : public QObject {
     Q_OBJECT
 

src/librssguard/core/messagesforfiltersmodel.h

@@ -3,16 +3,15 @@
 #ifndef MESSAGESFORFILTERSMODEL_H
 #define MESSAGESFORFILTERSMODEL_H
 
-#include <QAbstractTableModel>
-
 #include "core/messageobject.h"
 
+#include <QAbstractTableModel>
 #include <QJSEngine>
 
 class MessageFilter;
 
 class MessagesForFiltersModel : public QAbstractTableModel {
-  Q_OBJECT
+    Q_OBJECT
 
   public:
     explicit MessagesForFiltersModel(QObject* parent = nullptr);

src/librssguard/core/messagesmodel.cpp

@@ -17,13 +17,13 @@
 #include "services/abstract/recyclebin.h"
 #include "services/abstract/serviceroot.h"
 
+#include <cmath>
+
 #include <QPainter>
 #include <QPainterPath>
 #include <QSqlError>
 #include <QSqlField>
 
-#include <cmath>
-
 MessagesModel::MessagesModel(QObject* parent)
   : QSqlQueryModel(parent), m_view(nullptr), m_cache(new MessagesModelCache(this)),
     m_messageHighlighter(MessageHighlighter::NoHighlighting), m_customDateFormat(QString()),

src/librssguard/core/messagesmodel.h

@@ -3,15 +3,14 @@
 #ifndef MESSAGESMODEL_H
 #define MESSAGESMODEL_H
 
-#include "core/messagesmodelsqllayer.h"
-#include <QSqlQueryModel>
-
 #include "core/message.h"
+#include "core/messagesmodelsqllayer.h"
 #include "definitions/definitions.h"
 #include "services/abstract/rootitem.h"
 
 #include <QFont>
 #include <QIcon>
+#include <QSqlQueryModel>
 
 class MessagesView;
 class MessagesModelCache;

src/librssguard/core/messagesmodelcache.h

@@ -3,15 +3,14 @@
 #ifndef MESSAGESMODELCACHE_H
 #define MESSAGESMODELCACHE_H
 
-#include <QObject>
-
 #include "core/message.h"
 
 #include <QModelIndex>
+#include <QObject>
 #include <QVariant>
 
 class MessagesModelCache : public QObject {
-  Q_OBJECT
+    Q_OBJECT
 
   public:
     explicit MessagesModelCache(QObject* parent = nullptr);

src/librssguard/core/messagesmodelsqllayer.h

@@ -3,11 +3,10 @@
 #ifndef MESSAGESMODELSQLLAYER_H
 #define MESSAGESMODELSQLLAYER_H
 
-#include <QSqlDatabase>
-
 #include <QList>
 #include <QMap>
 #include <QPair>
+#include <QSqlDatabase>
 
 struct SortColumnsAndOrders {
     QList<int> m_columns;

src/librssguard/database/databasecleaner.h

@@ -4,20 +4,19 @@
 #define DATABASECLEANER_H
 
 #include <QObject>
-
 #include <QSqlDatabase>
 
 struct CleanerOrders {
-  bool m_removeReadMessages;
+    bool m_removeReadMessages;
-  bool m_shrinkDatabase;
+    bool m_shrinkDatabase;
-  bool m_removeOldMessages;
+    bool m_removeOldMessages;
-  bool m_removeRecycleBin;
+    bool m_removeRecycleBin;
-  bool m_removeStarredMessages;
+    bool m_removeStarredMessages;
-  int m_barrierForRemovingOldMessagesInDays;
+    int m_barrierForRemovingOldMessagesInDays;
 };
 
 class DatabaseCleaner : public QObject {
-  Q_OBJECT
+    Q_OBJECT
 
   public:
     explicit DatabaseCleaner(QObject* parent = nullptr);

src/librssguard/database/databasedriver.h

@@ -4,7 +4,6 @@
 #define DATABASEDRIVER_H
 
 #include <QObject>
-
 #include <QSqlDatabase>
 #include <QSqlQuery>
 

src/librssguard/database/databasefactory.h

@@ -3,10 +3,9 @@
 #ifndef DATABASEFACTORY_H
 #define DATABASEFACTORY_H
 
-#include <QObject>
-
 #include "database/databasedriver.h"
 
+#include <QObject>
 #include <QSqlDatabase>
 
 class RSSGUARD_DLLSPEC DatabaseFactory : public QObject {

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"
 

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,
+    MariaDbError testConnection(const QString& hostname,
-                                const QString& username, const QString& password);
+                                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;
 

src/librssguard/definitions/typedefs.h

@@ -3,12 +3,12 @@
 #ifndef TYPEDEFS_H
 #define TYPEDEFS_H
 
-#include <QList>
-#include <QPair>
-
 #include "core/message.h"
 #include "services/abstract/rootitem.h"
 
+#include <QList>
+#include <QPair>
+
 // First item here represents ID (int, primary key) of the item.
 typedef QList<QPair<int, RootItem*>> Assignment;
 typedef QPair<int, RootItem*> AssignmentItem;

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<QAction*>& actions);
@@ -19,7 +18,6 @@ class DynamicShortcuts {
     static void save(const QList<QAction*>& actions);
 
   private:
-
     // Constructor.
     explicit DynamicShortcuts() = default;
 };

src/librssguard/dynamic-shortcuts/dynamicshortcutswidget.cpp

@@ -49,7 +49,8 @@ void DynamicShortcutsWidget::updateShortcuts() {
 void DynamicShortcutsWidget::populate(QList<QAction*> 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<QAction*> 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);
 

src/librssguard/dynamic-shortcuts/dynamicshortcutswidget.h

@@ -11,7 +11,7 @@ class ShortcutCatcher;
 typedef QPair<QAction*, ShortcutCatcher*> ActionBinding;
 
 class DynamicShortcutsWidget : public QWidget {
-  Q_OBJECT
+    Q_OBJECT
 
   public:
     explicit DynamicShortcutsWidget(QWidget* parent = nullptr);

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);

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()
+  : ApplicationException(message.simplified().isEmpty() ? NetworkFactory::networkErrorText(error) : message),
-                         ? NetworkFactory::networkErrorText(error)
+    m_networkError(error) {}
-                         : message), m_networkError(error) {}
 
 QNetworkReply::NetworkError NetworkException::networkError() const {
   return m_networkError;

src/librssguard/exceptions/processexception.cpp

@@ -2,8 +2,10 @@
 
 #include "exceptions/processexception.h"
 
-ProcessException::ProcessException(int exit_code, QProcess::ExitStatus exit_status,
+ProcessException::ProcessException(int exit_code,
-                                   QProcess::ProcessError error, const QString& message)
+                                   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 {

src/librssguard/gui/dialogs/formabout.h

@@ -3,10 +3,10 @@
 #ifndef FORMABOUT_H
 #define FORMABOUT_H
 
-#include <QDialog>
-
 #include "ui_formabout.h"
 
+#include <QDialog>
+
 class RSSGUARD_DLLSPEC FormAbout : public QDialog {
     Q_OBJECT
 

src/librssguard/gui/dialogs/formaddaccount.h

@@ -3,18 +3,20 @@
 #ifndef FORMADDACCOUNT_H
 #define FORMADDACCOUNT_H
 
-#include <QDialog>
-
 #include "ui_formaddaccount.h"
 
+#include <QDialog>
+
 class ServiceEntryPoint;
 class FeedsModel;
 
 class FormAddAccount : public QDialog {
-  Q_OBJECT
+    Q_OBJECT
 
   public:
-    explicit FormAddAccount(const QList<ServiceEntryPoint*>& entry_points, FeedsModel* model, QWidget* parent = nullptr);
+    explicit FormAddAccount(const QList<ServiceEntryPoint*>& entry_points,
+                            FeedsModel* model,
+                            QWidget* parent = nullptr);
     virtual ~FormAddAccount();
 
   private slots:

src/librssguard/gui/dialogs/formbackupdatabasesettings.h

@@ -3,12 +3,12 @@
 #ifndef FORMBACKUPDATABASECONFIG_H
 #define FORMBACKUPDATABASECONFIG_H
 
-#include <QDialog>
-
 #include "ui_formbackupdatabasesettings.h"
 
+#include <QDialog>
+
 class FormBackupDatabaseSettings : public QDialog {
-  Q_OBJECT
+    Q_OBJECT
 
   public:
     explicit FormBackupDatabaseSettings(QWidget* parent = nullptr);

src/librssguard/gui/dialogs/formdatabasecleanup.h

@@ -3,14 +3,14 @@
 #ifndef FORMDATABASECLEANUP_H
 #define FORMDATABASECLEANUP_H
 
-#include <QDialog>
+#include "database/databasecleaner.h"
 
 #include "ui_formdatabasecleanup.h"
 
-#include "database/databasecleaner.h"
+#include <QDialog>
 
 class FormDatabaseCleanup : public QDialog {
-  Q_OBJECT
+    Q_OBJECT
 
   public:
     explicit FormDatabaseCleanup(QWidget* parent = nullptr);

src/librssguard/gui/dialogs/formlog.h

@@ -3,10 +3,10 @@
 #ifndef FORMLOG_H
 #define FORMLOG_H
 
-#include <QDialog>
-
 #include "ui_formlog.h"
 
+#include <QDialog>
+
 class FormLog : public QDialog {
     Q_OBJECT
 

src/librssguard/gui/dialogs/formmain.h

@@ -3,10 +3,10 @@
 #ifndef FORMMAIN_H
 #define FORMMAIN_H
 
-#include <QMainWindow>
-
 #include "ui_formmain.h"
 
+#include <QMainWindow>
+
 class StatusBar;
 class QWidgetAction;
 

src/librssguard/gui/dialogs/formmessagefiltersmanager.h

@@ -3,12 +3,12 @@
 #ifndef FORMMESSAGEFILTERSMANAGER_H
 #define FORMMESSAGEFILTERSMANAGER_H
 
-#include <QDialog>
-
 #include "services/abstract/serviceroot.h"
 
 #include "ui_formmessagefiltersmanager.h"
 
+#include <QDialog>
+
 class AccountCheckSortedModel;
 class MessageFilter;
 class FeedReader;

src/librssguard/gui/dialogs/formrestoredatabasesettings.h

@@ -3,15 +3,14 @@
 #ifndef FORMRESTOREDATABASESETTINGS_H
 #define FORMRESTOREDATABASESETTINGS_H
 
-#include <QDialog>
-
 #include "ui_formrestoredatabasesettings.h"
 
+#include <QDialog>
+
 class FormRestoreDatabaseSettings : public QDialog {
-  Q_OBJECT
+    Q_OBJECT
 
   public:
-
     // Constructors and destructors.
     explicit FormRestoreDatabaseSettings(QWidget& parent);
     virtual ~FormRestoreDatabaseSettings();

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 <QPainter>
 #include <QScrollArea>

src/librssguard/gui/dialogs/formsettings.h

@@ -3,10 +3,10 @@
 #ifndef FORMSETTINGS_H
 #define FORMSETTINGS_H
 
-#include <QDialog>
-
 #include "ui_formsettings.h"
 
+#include <QDialog>
+
 class Settings;
 class SettingsPanel;
 

src/librssguard/gui/dialogs/formupdate.h

@@ -3,13 +3,12 @@
 #ifndef FORMUPDATE_H
 #define FORMUPDATE_H
 
-#include <QDialog>
-
-#include "ui_formupdate.h"
-
 #include "miscellaneous/systemfactory.h"
 #include "network-web/downloader.h"
 
+#include "ui_formupdate.h"
+
+#include <QDialog>
 #include <QNetworkReply>
 #include <QPushButton>
 

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;

src/librssguard/gui/feedsview.cpp

@@ -18,6 +18,8 @@
 #include "services/abstract/rootitem.h"
 #include "services/abstract/serviceroot.h"
 
+#include <algorithm>
+
 #include <QClipboard>
 #include <QContextMenuEvent>
 #include <QHeaderView>
@@ -26,8 +28,6 @@
 #include <QPointer>
 #include <QTimer>
 
-#include <algorithm>
-
 FeedsView::FeedsView(QWidget* parent)
   : BaseTreeView(parent), m_contextMenuService(nullptr), m_contextMenuBin(nullptr), m_contextMenuCategories(nullptr),
     m_contextMenuFeeds(nullptr), m_contextMenuImportant(nullptr), m_contextMenuEmptySpace(nullptr),

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 <QStyledItemDelegate>

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"
 

src/librssguard/gui/itemdetails.h

@@ -3,10 +3,10 @@
 #ifndef ITEMDETAILS_H
 #define ITEMDETAILS_H
 
-#include <QWidget>
-
 #include "ui_itemdetails.h"
 
+#include <QWidget>
+
 class RootItem;
 
 class ItemDetails : public QWidget {

src/librssguard/gui/mediaplayer/libmpv/libmpvwidget.h

@@ -4,10 +4,10 @@
 #define LIBMPVWIDGET_H
 
 #if defined(MEDIAPLAYER_LIBMPV_OPENGL)
-#include <QOpenGLWidget>
-
 #include <mpv/render_gl.h>
 
+#include <QOpenGLWidget>
+
 #define BASE_WIDGET QOpenGLWidget
 #else
 #include <QWidget>

src/librssguard/gui/mediaplayer/libmpv/qthelper.h

@@ -3,9 +3,8 @@
 #ifndef LIBMPV_QTHELPER_H_
 #define LIBMPV_QTHELPER_H_
 
-#include <mpv/client.h>
-
 #include <cstring>
+#include <mpv/client.h>
 
 #include <QHash>
 #include <QList>

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"
 

src/librssguard/gui/mediaplayer/playerbackend.h

@@ -3,9 +3,8 @@
 #ifndef PLAYERBACKEND_H
 #define PLAYERBACKEND_H
 
-#include <QWidget>
-
 #include <QUrl>
+#include <QWidget>
 
 class QVBoxLayout;
 class Application;

src/librssguard/gui/mediaplayer/qtmultimedia/qtmultimediabackend.h

@@ -5,9 +5,8 @@
 
 #include "gui/mediaplayer/playerbackend.h"
 
-#include <QObject>
-
 #include <QMediaPlayer>
+#include <QObject>
 
 #if QT_VERSION_MAJOR == 6
 #define PLAYBACK_STATE        PlaybackState

src/librssguard/gui/messagebox.h

@@ -3,11 +3,11 @@
 #ifndef MESSAGEBOX_H
 #define MESSAGEBOX_H
 
+#include <functional>
+
 #include <QDialogButtonBox>
 #include <QMessageBox>
 
-#include <functional>
-
 class RSSGUARD_DLLSPEC MsgBox : public QMessageBox {
     Q_OBJECT
 

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,
+  connect(m_txtBrowser, QOverload<const QUrl&>::of(&QTextBrowser::highlighted), [=](const QUrl& url) {
-          QOverload<const QUrl&>::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("\\<img[^\\>]*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; }"
              "</style></head>"
              "<body>%1</body>"
-             "</html>").arg(html,
+             "</html>")
-                            qApp->skins()->currentSkin()
+    .arg(html,
-                            .colorForModel(SkinEnums::PaletteColors::FgInteresting)
+         qApp->skins()->currentSkin().colorForModel(SkinEnums::PaletteColors::FgInteresting).value<QColor>().name());
-                            .value<QColor>().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) &&
+  if (url.toString().startsWith(INTERNAL_URL_PASSATTACHMENT) && m_root != nullptr &&
-      m_root != nullptr &&
       m_root->getParentServiceRoot()->downloadAttachmentOnMyOwn(url)) {
     return;
   }
 
   if (!url.isEmpty()) {
-    bool open_externally_now = qApp->settings()->value(GROUP(Browser),
+    bool open_externally_now =
-                                                       SETTING(Browser::OpenLinksInExternalBrowserRightAway)).toBool();
+      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."));
   }
 }
 

src/librssguard/gui/messagebrowser.h

@@ -3,13 +3,11 @@
 #ifndef MESSAGEBROWSER_H
 #define MESSAGEBROWSER_H
 
-#include <QWidget>
-
 #include "core/message.h"
-
 #include "services/abstract/rootitem.h"
 
 #include <QPointer>
+#include <QWidget>
 
 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);

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"
 

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"
 

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,
+          m_imagePlaceholder = qApp->icons()
-                                                                                                 Qt::TransformationMode::FastTransformation);
+                                 ->miscPixmap(QSL("image-placeholder"))
+                                 .scaledToWidth(20, Qt::TransformationMode::FastTransformation);
         }
 
         return m_imagePlaceholder;

src/librssguard/gui/messagetextbrowser.h

@@ -3,12 +3,12 @@
 #ifndef MESSAGETEXTBROWSER_H
 #define MESSAGETEXTBROWSER_H
 
-#include <QTextBrowser>
-
 #include "core/message.h"
 
+#include <QTextBrowser>
+
 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;

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"
 

src/librssguard/gui/notifications/basetoastnotification.cpp

@@ -5,13 +5,13 @@
 #include "miscellaneous/iconfactory.h"
 #include "miscellaneous/settings.h"
 
+#include <chrono>
+
 #include <QAbstractButton>
 #include <QCloseEvent>
 #include <QLabel>
 #include <QTimerEvent>
 
-#include <chrono>
-
 using namespace std::chrono_literals;
 
 BaseToastNotification::BaseToastNotification(QWidget* parent) : QDialog(parent), m_timerId(-1) {

src/librssguard/gui/notifications/basetoastnotification.h

@@ -4,7 +4,6 @@
 #define BASETOASTNOTIFICATION_H
 
 #include <QDialog>
-
 #include <QTimer>
 
 class QAbstractButton;

src/librssguard/gui/notifications/notificationseditor.cpp

@@ -19,20 +19,27 @@ void NotificationsEditor::loadNotifications(const QList<Notification>& 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<Notification>& notificat
 }
 
 QList<Notification> NotificationsEditor::allNotifications() const {
-  auto lst = boolinq::from(findChildren<SingleNotificationEditor*>()).select([](const SingleNotificationEditor* ed) {
+  auto lst = boolinq::from(findChildren<SingleNotificationEditor*>())
-    return ed->notification();
+               .select([](const SingleNotificationEditor* ed) {
-  }).toStdList();
+                 return ed->notification();
+               })
+               .toStdList();
 
   return FROM_STD_LIST(QList<Notification>, lst);
 }

src/librssguard/gui/notifications/notificationseditor.h

@@ -3,16 +3,16 @@
 #ifndef NOTIFICATIONSEDITOR_H
 #define NOTIFICATIONSEDITOR_H
 
-#include <QWidget>
+#include "miscellaneous/notification.h"
 
 #include "ui_notificationseditor.h"
 
-#include "miscellaneous/notification.h"
+#include <QWidget>
 
 class QVBoxLayout;
 
 class NotificationsEditor : public QWidget {
-  Q_OBJECT
+    Q_OBJECT
 
   public:
     explicit NotificationsEditor(QWidget* parent = nullptr);

src/librssguard/gui/notifications/singlenotificationeditor.h

@@ -3,14 +3,14 @@
 #ifndef SINGLENOTIFICATIONEDITOR_H
 #define SINGLENOTIFICATIONEDITOR_H
 
-#include <QGroupBox>
+#include "miscellaneous/notification.h"
 
 #include "ui_singlenotificationeditor.h"
 
-#include "miscellaneous/notification.h"
+#include <QGroupBox>
 
 class SingleNotificationEditor : public QGroupBox {
-  Q_OBJECT
+    Q_OBJECT
 
   public:
     explicit SingleNotificationEditor(const Notification& notification, QWidget* parent = nullptr);

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"

src/librssguard/gui/notifications/toastnotificationsmanager.h

@@ -3,10 +3,10 @@
 #ifndef TOASTNOTIFICATIONSMANAGER_H
 #define TOASTNOTIFICATIONSMANAGER_H
 
-#include <QObject>
-
 #include "miscellaneous/application.h"
 
+#include <QObject>
+
 class BaseToastNotification;
 class ToastNotification;
 class ArticleListNotification;

src/librssguard/gui/reusable/articleamountcontrol.h

@@ -3,11 +3,11 @@
 #ifndef ARTICLEAMOUNTCONTROL_H
 #define ARTICLEAMOUNTCONTROL_H
 
-#include <QWidget>
+#include "services/abstract/feed.h"
 
 #include "ui_articleamountcontrol.h"
 
-#include "services/abstract/feed.h"
+#include <QWidget>
 
 class ArticleAmountControl : public QWidget {
     Q_OBJECT

src/librssguard/gui/reusable/baselineedit.h

@@ -6,7 +6,7 @@
 #include <QLineEdit>
 
 class BaseLineEdit : public QLineEdit {
-  Q_OBJECT
+    Q_OBJECT
 
   public:
     explicit BaseLineEdit(QWidget* parent = nullptr);

src/librssguard/gui/reusable/comboboxwithstatus.cpp

@@ -6,8 +6,7 @@
 
 #include <QHBoxLayout>
 
-ComboBoxWithStatus::ComboBoxWithStatus(QWidget* parent)
+ComboBoxWithStatus::ComboBoxWithStatus(QWidget* parent) : WidgetWithStatus(parent) {
-  : WidgetWithStatus(parent) {
   m_wdgInput = new QComboBox(this);
 
   // Set correct size for the tool button.

src/librssguard/gui/reusable/comboboxwithstatus.h

@@ -8,10 +8,9 @@
 #include <QComboBox>
 
 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<QComboBox*>(m_wdgInput);
     }
-
 };
 
 #endif // COMBOBOXWITHSTATUS_H

src/librssguard/gui/reusable/edittableview.h

@@ -6,7 +6,7 @@
 #include <QTableView>
 
 class EditTableView : public QTableView {
-  Q_OBJECT
+    Q_OBJECT
 
   public:
     explicit EditTableView(QWidget* parent = nullptr);

src/librssguard/gui/reusable/jssyntaxhighlighter.h

@@ -3,9 +3,8 @@
 #ifndef JSSYNTAXHIGHLIGHTER_H
 #define JSSYNTAXHIGHLIGHTER_H
 
-#include <QSyntaxHighlighter>
-
 #include <QRegularExpression>
+#include <QSyntaxHighlighter>
 
 class JsSyntaxHighlighter : public QSyntaxHighlighter {
     Q_OBJECT

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<Message>& messages, const QList<Label*>& 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);

src/librssguard/gui/reusable/labelwithstatus.cpp

@@ -6,8 +6,7 @@
 
 #include <QHBoxLayout>
 
-LabelWithStatus::LabelWithStatus(QWidget* parent)
+LabelWithStatus::LabelWithStatus(QWidget* parent) : WidgetWithStatus(parent) {
-  : WidgetWithStatus(parent) {
   m_wdgInput = new QLabel(this);
 
   // Set correct size for the tool button.

src/librssguard/gui/reusable/lineeditwithstatus.cpp

@@ -7,8 +7,7 @@
 
 #include <QHBoxLayout>
 
-LineEditWithStatus::LineEditWithStatus(QWidget* parent)
+LineEditWithStatus::LineEditWithStatus(QWidget* parent) : WidgetWithStatus(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)
+TextEditWithStatus::TextEditWithStatus(QWidget* parent) : WidgetWithStatus(parent) {
-  : WidgetWithStatus(parent) {
   m_wdgInput = new QPlainTextEdit(this);
   setFocusProxy(m_wdgInput);
 

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 <QPlainTextEdit>
 

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);

src/librssguard/gui/reusable/messagecountspinbox.h

@@ -6,7 +6,7 @@
 #include <QSpinBox>
 
 class MessageCountSpinBox : public QSpinBox {
-  Q_OBJECT
+    Q_OBJECT
 
   public:
     explicit MessageCountSpinBox(QWidget* parent = nullptr);

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 <QNetworkProxy>
 
 NetworkProxyDetails::NetworkProxyDetails(QWidget* parent) : QWidget(parent), m_ui(new Ui::NetworkProxyDetails()) {

src/librssguard/gui/reusable/networkproxydetails.h

@@ -3,9 +3,8 @@
 #ifndef NETWORKPROXYDETAILS_H
 #define NETWORKPROXYDETAILS_H
 
-#include <QWidget>
-
 #include <QNetworkProxy>
+#include <QWidget>
 
 namespace Ui {
   class NetworkProxyDetails;

src/librssguard/gui/reusable/plaintoolbutton.h

@@ -6,7 +6,7 @@
 #include <QToolButton>
 
 class PlainToolButton : public QToolButton {
-  Q_OBJECT
+    Q_OBJECT
 
   public:
     explicit PlainToolButton(QWidget* parent = nullptr);

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<CustomSearchChoice>& choices, QWidget* parent = nullptr);
 

src/librssguard/gui/reusable/searchtextwidget.h

@@ -3,16 +3,16 @@
 #ifndef SEARCHTEXTWIDGET_H
 #define SEARCHTEXTWIDGET_H
 
-#include <QWidget>
-
 #include "ui_searchtextwidget.h"
 
+#include <QWidget>
+
 namespace Ui {
   class SearchTextWidget;
 }
 
 class SearchTextWidget : public QWidget {
-  Q_OBJECT
+    Q_OBJECT
 
   public:
     explicit SearchTextWidget(QWidget* parent = nullptr);

src/librssguard/gui/reusable/squeezelabel.h

@@ -6,7 +6,7 @@
 #include <QLabel>
 
 class SqueezeLabel : public QLabel {
-  Q_OBJECT
+    Q_OBJECT
 
   public:
     explicit SqueezeLabel(QWidget* parent = nullptr);