diff --git a/src/librssguard-standard/src/gui/formdiscoverfeeds.cpp b/src/librssguard-standard/src/gui/formdiscoverfeeds.cpp index a0effb073..9e342336c 100644 --- a/src/librssguard-standard/src/gui/formdiscoverfeeds.cpp +++ b/src/librssguard-standard/src/gui/formdiscoverfeeds.cpp @@ -2,14 +2,14 @@ #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 +#include +#include +#include +#include +#include +#include +#include #include "src/definitions.h" #include "src/gui/formstandardfeeddetails.h" #include "src/standardfeed.h" diff --git a/src/librssguard-standard/src/gui/formstandardfeeddetails.cpp b/src/librssguard-standard/src/gui/formstandardfeeddetails.cpp index 1fe6d90e7..948c74eb1 100644 --- a/src/librssguard-standard/src/gui/formstandardfeeddetails.cpp +++ b/src/librssguard-standard/src/gui/formstandardfeeddetails.cpp @@ -2,14 +2,14 @@ #include "src/gui/formstandardfeeddetails.h" -#include "librssguard/database/databasequeries.h" -#include "librssguard/exceptions/applicationexception.h" -#include "librssguard/miscellaneous/application.h" -#include "librssguard/network-web/networkfactory.h" -#include "librssguard/network-web/webfactory.h" -#include "librssguard/services/abstract/category.h" -#include "librssguard/services/abstract/gui/authenticationdetails.h" -#include "librssguard/services/abstract/serviceroot.h" +#include +#include +#include +#include +#include +#include +#include +#include #include "src/gui/standardfeeddetails.h" #include "src/standardfeed.h" diff --git a/src/librssguard-standard/src/gui/formstandardfeeddetails.h b/src/librssguard-standard/src/gui/formstandardfeeddetails.h index 459687ab2..d4d38cdf1 100644 --- a/src/librssguard-standard/src/gui/formstandardfeeddetails.h +++ b/src/librssguard-standard/src/gui/formstandardfeeddetails.h @@ -3,7 +3,7 @@ #ifndef FORMSSFEEDDETAILS_H #define FORMSSFEEDDETAILS_H -#include "librssguard/services/abstract/gui/formfeeddetails.h" +#include class StandardFeedDetails; class StandardServiceRoot; diff --git a/src/librssguard-standard/src/gui/formstandardimportexport.cpp b/src/librssguard-standard/src/gui/formstandardimportexport.cpp index 7da14e3a6..92177ebba 100644 --- a/src/librssguard-standard/src/gui/formstandardimportexport.cpp +++ b/src/librssguard-standard/src/gui/formstandardimportexport.cpp @@ -2,11 +2,12 @@ #include "src/gui/formstandardimportexport.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 +#include +#include +#include +#include + #include "src/standardfeedsimportexportmodel.h" #include "src/standardserviceroot.h" diff --git a/src/librssguard-standard/src/gui/standardaccountdetails.cpp b/src/librssguard-standard/src/gui/standardaccountdetails.cpp index 9efa1821c..9aa044e65 100644 --- a/src/librssguard-standard/src/gui/standardaccountdetails.cpp +++ b/src/librssguard-standard/src/gui/standardaccountdetails.cpp @@ -2,8 +2,8 @@ #include "src/gui/standardaccountdetails.h" -#include "librssguard/3rd-party/boolinq/boolinq.h" -#include "librssguard/miscellaneous/iconfactory.h" +#include +#include #include "src/standardserviceentrypoint.h" #include diff --git a/src/librssguard-standard/src/gui/standardfeeddetails.cpp b/src/librssguard-standard/src/gui/standardfeeddetails.cpp index 07d93dc1e..1d071f026 100644 --- a/src/librssguard-standard/src/gui/standardfeeddetails.cpp +++ b/src/librssguard-standard/src/gui/standardfeeddetails.cpp @@ -2,14 +2,14 @@ #include "src/gui/standardfeeddetails.h" -#include "librssguard/3rd-party/boolinq/boolinq.h" -#include "librssguard/exceptions/applicationexception.h" -#include "librssguard/exceptions/networkexception.h" -#include "librssguard/exceptions/scriptexception.h" -#include "librssguard/miscellaneous/iconfactory.h" -#include "librssguard/miscellaneous/textfactory.h" -#include "librssguard/network-web/networkfactory.h" -#include "librssguard/services/abstract/category.h" +#include +#include +#include +#include +#include +#include +#include +#include #include "src/definitions.h" #include diff --git a/src/librssguard-standard/src/parsers/atomparser.cpp b/src/librssguard-standard/src/parsers/atomparser.cpp index e99648872..f7f94c409 100644 --- a/src/librssguard-standard/src/parsers/atomparser.cpp +++ b/src/librssguard-standard/src/parsers/atomparser.cpp @@ -2,11 +2,11 @@ #include "src/parsers/atomparser.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 +#include +#include +#include +#include #include "src/definitions.h" #include "src/standardfeed.h" diff --git a/src/librssguard-standard/src/parsers/atomparser.h b/src/librssguard-standard/src/parsers/atomparser.h index df16eaf23..addf9a431 100644 --- a/src/librssguard-standard/src/parsers/atomparser.h +++ b/src/librssguard-standard/src/parsers/atomparser.h @@ -5,7 +5,7 @@ #include "src/parsers/feedparser.h" -#include "librssguard/core/message.h" +#include #include #include diff --git a/src/librssguard-standard/src/parsers/feedparser.cpp b/src/librssguard-standard/src/parsers/feedparser.cpp index 96bb00ecb..93a83ef97 100644 --- a/src/librssguard-standard/src/parsers/feedparser.cpp +++ b/src/librssguard-standard/src/parsers/feedparser.cpp @@ -4,11 +4,11 @@ #include "src/definitions.h" -#include "librssguard/definitions/definitions.h" -#include "librssguard/exceptions/applicationexception.h" -#include "librssguard/exceptions/feedfetchexception.h" -#include "librssguard/miscellaneous/iofactory.h" -#include "librssguard/network-web/webfactory.h" +#include +#include +#include +#include +#include #include #include diff --git a/src/librssguard-standard/src/parsers/feedparser.h b/src/librssguard-standard/src/parsers/feedparser.h index 68769e160..d01bc14d2 100644 --- a/src/librssguard-standard/src/parsers/feedparser.h +++ b/src/librssguard-standard/src/parsers/feedparser.h @@ -9,8 +9,8 @@ #include #include -#include "librssguard/core/message.h" -#include "librssguard/definitions/typedefs.h" +#include +#include #include "src/standardfeed.h" // Base class for all XML-based feed parsers. diff --git a/src/librssguard-standard/src/parsers/icalparser.cpp b/src/librssguard-standard/src/parsers/icalparser.cpp index cfa7b6616..c3344ef58 100644 --- a/src/librssguard-standard/src/parsers/icalparser.cpp +++ b/src/librssguard-standard/src/parsers/icalparser.cpp @@ -2,13 +2,13 @@ #include "src/parsers/icalparser.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 +#include +#include +#include +#include +#include +#include #include "src/definitions.h" IcalParser::IcalParser(const QString& data) diff --git a/src/librssguard-standard/src/parsers/jsonparser.cpp b/src/librssguard-standard/src/parsers/jsonparser.cpp index 1720db68b..9e2a03535 100644 --- a/src/librssguard-standard/src/parsers/jsonparser.cpp +++ b/src/librssguard-standard/src/parsers/jsonparser.cpp @@ -2,12 +2,12 @@ #include "src/parsers/jsonparser.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 +#include +#include +#include +#include +#include #include "src/definitions.h" #include "src/standardfeed.h" diff --git a/src/librssguard-standard/src/parsers/jsonparser.h b/src/librssguard-standard/src/parsers/jsonparser.h index 0666d46ce..73faf512f 100644 --- a/src/librssguard-standard/src/parsers/jsonparser.h +++ b/src/librssguard-standard/src/parsers/jsonparser.h @@ -5,7 +5,7 @@ #include "src/parsers/feedparser.h" -#include "librssguard/core/message.h" +#include class JsonParser : public FeedParser { public: diff --git a/src/librssguard-standard/src/parsers/rdfparser.cpp b/src/librssguard-standard/src/parsers/rdfparser.cpp index dc0894af7..9139f450a 100644 --- a/src/librssguard-standard/src/parsers/rdfparser.cpp +++ b/src/librssguard-standard/src/parsers/rdfparser.cpp @@ -2,9 +2,9 @@ #include "src/parsers/rdfparser.h" -#include "librssguard/exceptions/applicationexception.h" -#include "librssguard/miscellaneous/settings.h" -#include "librssguard/miscellaneous/textfactory.h" +#include +#include +#include #include "src/definitions.h" #include "src/standardfeed.h" diff --git a/src/librssguard-standard/src/parsers/rdfparser.h b/src/librssguard-standard/src/parsers/rdfparser.h index afa6bbeb7..bd2918a04 100644 --- a/src/librssguard-standard/src/parsers/rdfparser.h +++ b/src/librssguard-standard/src/parsers/rdfparser.h @@ -5,7 +5,7 @@ #include "src/parsers/feedparser.h" -#include "librssguard/core/message.h" +#include #include diff --git a/src/librssguard-standard/src/parsers/rssparser.cpp b/src/librssguard-standard/src/parsers/rssparser.cpp index bbeb7cfa1..16f9897f1 100644 --- a/src/librssguard-standard/src/parsers/rssparser.cpp +++ b/src/librssguard-standard/src/parsers/rssparser.cpp @@ -2,11 +2,11 @@ #include "src/parsers/rssparser.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 +#include +#include +#include +#include #include "src/definitions.h" #include "src/standardfeed.h" diff --git a/src/librssguard-standard/src/parsers/rssparser.h b/src/librssguard-standard/src/parsers/rssparser.h index 2f203929a..e74404599 100644 --- a/src/librssguard-standard/src/parsers/rssparser.h +++ b/src/librssguard-standard/src/parsers/rssparser.h @@ -5,7 +5,7 @@ #include "src/parsers/feedparser.h" -#include "librssguard/core/message.h" +#include #include diff --git a/src/librssguard-standard/src/parsers/sitemapparser.cpp b/src/librssguard-standard/src/parsers/sitemapparser.cpp index ef804dcb3..7e5215d2a 100644 --- a/src/librssguard-standard/src/parsers/sitemapparser.cpp +++ b/src/librssguard-standard/src/parsers/sitemapparser.cpp @@ -3,14 +3,14 @@ #include "src/parsers/sitemapparser.h" #if defined(ENABLE_COMPRESSED_SITEMAP) -#include "librssguard/3rd-party/qcompressor/qcompressor.h" +#include #endif -#include "librssguard/definitions/definitions.h" -#include "librssguard/exceptions/applicationexception.h" -#include "librssguard/exceptions/feedrecognizedbutfailedexception.h" -#include "librssguard/miscellaneous/settings.h" -#include "librssguard/miscellaneous/textfactory.h" +#include +#include +#include +#include +#include #include "src/definitions.h" #include diff --git a/src/librssguard-standard/src/standardcategory.cpp b/src/librssguard-standard/src/standardcategory.cpp index e524355e4..d1f3a83fd 100644 --- a/src/librssguard-standard/src/standardcategory.cpp +++ b/src/librssguard-standard/src/standardcategory.cpp @@ -2,13 +2,14 @@ #include "src/standardcategory.h" -#include "librssguard/database/databasequeries.h" -#include "librssguard/definitions/definitions.h" -#include "librssguard/exceptions/applicationexception.h" -#include "librssguard/services/abstract/gui/formcategorydetails.h" #include "src/standardfeed.h" #include "src/standardserviceroot.h" +#include +#include +#include +#include + #include StandardCategory::StandardCategory(RootItem* parent_item) : Category(parent_item) {} diff --git a/src/librssguard-standard/src/standardcategory.h b/src/librssguard-standard/src/standardcategory.h index e3da73b8e..4abaa0abe 100644 --- a/src/librssguard-standard/src/standardcategory.h +++ b/src/librssguard-standard/src/standardcategory.h @@ -3,7 +3,7 @@ #ifndef FEEDSMODELCATEGORY_H #define FEEDSMODELCATEGORY_H -#include "librssguard/services/abstract/category.h" +#include #include diff --git a/src/librssguard-standard/src/standardfeed.cpp b/src/librssguard-standard/src/standardfeed.cpp index 18e506e38..d1f61481b 100644 --- a/src/librssguard-standard/src/standardfeed.cpp +++ b/src/librssguard-standard/src/standardfeed.cpp @@ -2,20 +2,20 @@ #include "src/standardfeed.h" -#include "librssguard/database/databasequeries.h" -#include "librssguard/definitions/definitions.h" -#include "librssguard/exceptions/applicationexception.h" -#include "librssguard/exceptions/feedrecognizedbutfailedexception.h" -#include "librssguard/exceptions/networkexception.h" -#include "librssguard/exceptions/scriptexception.h" -#include "librssguard/miscellaneous/settings.h" -#include "librssguard/miscellaneous/textfactory.h" +#include +#include +#include +#include +#include +#include +#include +#include #include "src/gui/formstandardfeeddetails.h" #include "src/standardserviceroot.h" #if defined(NO_LITE) -#include "librssguard/gui/webviewers/webengine/webengineviewer.h" -#include "librssguard/network-web/webengine/webenginepage.h" +#include +#include #endif #include "src/parsers/atomparser.h" @@ -26,7 +26,7 @@ #include "src/parsers/sitemapparser.h" #if defined(ENABLE_COMPRESSED_SITEMAP) -#include "librssguard/3rd-party/qcompressor/qcompressor.h" +#include #endif #include diff --git a/src/librssguard-standard/src/standardfeed.h b/src/librssguard-standard/src/standardfeed.h index af1627a5f..43ca1a2c2 100644 --- a/src/librssguard-standard/src/standardfeed.h +++ b/src/librssguard-standard/src/standardfeed.h @@ -3,9 +3,9 @@ #ifndef FEEDSMODELFEED_H #define FEEDSMODELFEED_H -#include "librssguard/services/abstract/feed.h" +#include -#include "librssguard/network-web/networkfactory.h" +#include #include #include diff --git a/src/librssguard-standard/src/standardfeedsimportexportmodel.cpp b/src/librssguard-standard/src/standardfeedsimportexportmodel.cpp index 03512e0dd..eec72dac3 100644 --- a/src/librssguard-standard/src/standardfeedsimportexportmodel.cpp +++ b/src/librssguard-standard/src/standardfeedsimportexportmodel.cpp @@ -2,11 +2,11 @@ #include "src/standardfeedsimportexportmodel.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 +#include +#include +#include +#include #include "src/definitions.h" #include "src/standardcategory.h" #include "src/standardfeed.h" diff --git a/src/librssguard-standard/src/standardfeedsimportexportmodel.h b/src/librssguard-standard/src/standardfeedsimportexportmodel.h index d47de93ad..2f4703fb7 100644 --- a/src/librssguard-standard/src/standardfeedsimportexportmodel.h +++ b/src/librssguard-standard/src/standardfeedsimportexportmodel.h @@ -3,7 +3,7 @@ #ifndef STANDARDFEEDSIMPORTEXPORTMODEL_H #define STANDARDFEEDSIMPORTEXPORTMODEL_H -#include "librssguard/services/abstract/accountcheckmodel.h" +#include #include #include diff --git a/src/librssguard-standard/src/standardserviceentrypoint.cpp b/src/librssguard-standard/src/standardserviceentrypoint.cpp index 9f3a9f51a..883d978b2 100644 --- a/src/librssguard-standard/src/standardserviceentrypoint.cpp +++ b/src/librssguard-standard/src/standardserviceentrypoint.cpp @@ -2,9 +2,9 @@ #include "src/standardserviceentrypoint.h" -#include "librssguard/database/databasequeries.h" -#include "librssguard/definitions/definitions.h" -#include "librssguard/miscellaneous/application.h" +#include +#include +#include #include "src/gui/formeditstandardaccount.h" #include "src/standardserviceroot.h" diff --git a/src/librssguard-standard/src/standardserviceentrypoint.h b/src/librssguard-standard/src/standardserviceentrypoint.h index 1704995ef..9fe67164b 100644 --- a/src/librssguard-standard/src/standardserviceentrypoint.h +++ b/src/librssguard-standard/src/standardserviceentrypoint.h @@ -3,7 +3,7 @@ #ifndef STANDARDSERVICEENTRYPOINT_H #define STANDARDSERVICEENTRYPOINT_H -#include "librssguard/services/abstract/serviceentrypoint.h" +#include class RSSGUARD_DLLSPEC_EXPORT StandardServiceEntryPoint : public QObject, public ServiceEntryPoint { Q_OBJECT diff --git a/src/librssguard-standard/src/standardserviceroot.cpp b/src/librssguard-standard/src/standardserviceroot.cpp index efd8c9af9..1ad1290f3 100644 --- a/src/librssguard-standard/src/standardserviceroot.cpp +++ b/src/librssguard-standard/src/standardserviceroot.cpp @@ -2,18 +2,18 @@ #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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "src/definitions.h" #include "src/gui/formdiscoverfeeds.h" @@ -32,12 +32,12 @@ #include "src/standardserviceentrypoint.h" #if defined(NO_LITE) -#include "librssguard/gui/webviewers/webengine/webengineviewer.h" -#include "librssguard/network-web/webengine/webenginepage.h" +#include +#include #endif #if defined(ENABLE_COMPRESSED_SITEMAP) -#include "librssguard/3rd-party/qcompressor/qcompressor.h" +#include #endif #include diff --git a/src/librssguard-standard/src/standardserviceroot.h b/src/librssguard-standard/src/standardserviceroot.h index 19ed4ddb0..29a8d5045 100644 --- a/src/librssguard-standard/src/standardserviceroot.h +++ b/src/librssguard-standard/src/standardserviceroot.h @@ -3,7 +3,7 @@ #ifndef STANDARDSERVICEROOT_H #define STANDARDSERVICEROOT_H -#include "librssguard/services/abstract/serviceroot.h" +#include #include "src/standardfeed.h"