tweaked clang format

martinrotter · Mar 21, 2024 · a29d4b8 · a29d4b8
1 parent 2173740
commit a29d4b8
Show file tree

Hide file tree

Showing 212 changed files with 621 additions and 626 deletions.
diff --git 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
@@ -2,24 +2,24 @@
 
 #include "src/gui/formdiscoverfeeds.h"
 
-#include <librssguard/3rd-party/boolinq/boolinq.h>
-#include <librssguard/database/databasequeries.h>
-#include <librssguard/gui/guiutilities.h>
-#include <librssguard/miscellaneous/application.h>
-#include <librssguard/miscellaneous/iconfactory.h>
-#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 "src/standardfeed.h"
+
+#include <librssguard/3rd-party/boolinq/boolinq.h>
+#include <librssguard/database/databasequeries.h>
+#include <librssguard/gui/guiutilities.h>
+#include <librssguard/miscellaneous/application.h>
+#include <librssguard/miscellaneous/iconfactory.h>
+#include <librssguard/miscellaneous/settings.h>
+#include <librssguard/services/abstract/category.h>
+#include <librssguard/services/abstract/serviceroot.h>
 
 #include <QtConcurrentMap>
 

diff --git 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 <librssguard/services/abstract/accountcheckmodel.h>
+
 #include <QDialog>
 #include <QFutureWatcher>
 
-#include <librssguard/services/abstract/accountcheckmodel.h>
-
 class ServiceRoot;
 class RootItem;
 class Category;

diff --git 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 <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>

diff --git 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 <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>
 

diff --git 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 <librssguard/3rd-party/boolinq/boolinq.h>
 #include <librssguard/miscellaneous/iconfactory.h>
-#include "src/standardserviceentrypoint.h"
 
 #include <QFileDialog>
 #include <QImageReader>

diff --git 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 <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>

diff --git 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 <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>
 

diff --git 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 <librssguard/core/message.h>
+
 #include <QDomDocument>
 #include <QList>
 
-#include <librssguard/core/message.h>
-
 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
@@ -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()) {

diff --git 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 <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:

diff --git a/src/librssguard-standard/src/parsers/icalparser.cpp b/src/librssguard-standard/src/parsers/icalparser.cpp
@@ -2,14 +2,15 @@
 
 #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>
 #include <librssguard/exceptions/feedrecognizedbutfailedexception.h>
 #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())) {}

diff --git 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 <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>

diff --git 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 <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>

diff --git 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 <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>

diff --git 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 <librssguard/definitions/definitions.h>
 #include <librssguard/exceptions/applicationexception.h>
 #include <librssguard/exceptions/feedrecognizedbutfailedexception.h>

diff --git 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
@@ -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>

diff --git 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 <librssguard/services/abstract/feed.h>
-
 #include <librssguard/network-web/networkfactory.h>
+#include <librssguard/services/abstract/feed.h>
 
 #include <QCoreApplication>
 #include <QDateTime>

diff --git 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 <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>

diff --git 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 <librssguard/database/databasequeries.h>
 #include <librssguard/definitions/definitions.h>
 #include <librssguard/miscellaneous/application.h>

diff --git a/src/librssguard-standard/src/standardserviceroot.cpp b/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>

diff --git 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 <librssguard/services/abstract/serviceroot.h>
-
 #include "src/standardfeed.h"
 
+#include <librssguard/services/abstract/serviceroot.h>
+
 #include <QCoreApplication>
 #include <QPair>
 

diff --git a/src/librssguard/core/articlelistnotificationmodel.h b/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