diff --git a/src/librssguard/CMakeLists.txt b/src/librssguard/CMakeLists.txt index d9049f14f..92299754b 100644 --- a/src/librssguard/CMakeLists.txt +++ b/src/librssguard/CMakeLists.txt @@ -165,7 +165,7 @@ set(SOURCES gui/tabcontent.h gui/tabwidget.cpp gui/tabwidget.h - gui/webviewer.h + gui/webviewers/webviewer.h gui/toolbars/basetoolbar.cpp gui/toolbars/basetoolbar.h gui/toolbars/feedstoolbar.cpp @@ -392,7 +392,6 @@ set(SOURCES services/tt-rss/ttrssserviceentrypoint.h services/tt-rss/ttrssserviceroot.cpp services/tt-rss/ttrssserviceroot.h - gui/reusable/discoverfeedsbutton.cpp gui/reusable/discoverfeedsbutton.h gui/reusable/locationlineedit.cpp @@ -556,8 +555,8 @@ if(USE_WEBENGINE) # WebEngine-based web (and message) browser. network-web/webengine/webenginepage.cpp network-web/webengine/webenginepage.h - gui/webengine/webengineviewer.cpp - gui/webengine/webengineviewer.h + gui/webviewers/webengine/webengineviewer.cpp + gui/webviewers/webengine/webengineviewer.h network-web/webengine/networkurlinterceptor.cpp network-web/webengine/networkurlinterceptor.h network-web/webengine/urlinterceptor.h @@ -568,8 +567,8 @@ endif() list(APPEND SOURCES # Lite non-WebEngine message browser. - gui/litehtml/litehtmlviewer.h - gui/litehtml/litehtmlviewer.cpp + gui/webviewers/litehtml/litehtmlviewer.h + gui/webviewers/litehtml/litehtmlviewer.cpp ) # Deal with .ui files. @@ -695,7 +694,7 @@ endif() # QLiteHtml. target_include_directories(rssguard PRIVATE 3rd-party/qlitehtml) -target_compile_definitions(rssguard PRIVATE QLITEHTML_LIBRARY) +target_compile_definitions(rssguard PRIVATE QLITEHTML_STATIC_LIBRARY) # Qt. target_link_libraries(rssguard PUBLIC diff --git a/src/librssguard/gui/webbrowser.cpp b/src/librssguard/gui/webbrowser.cpp index 5f8625552..b53ae43b9 100644 --- a/src/librssguard/gui/webbrowser.cpp +++ b/src/librssguard/gui/webbrowser.cpp @@ -4,13 +4,13 @@ #include "database/databasequeries.h" #include "gui/dialogs/formmain.h" -#include "gui/litehtml/litehtmlviewer.h" // QLiteHtml-based web browsing. #include "gui/messagebox.h" #include "gui/reusable/discoverfeedsbutton.h" #include "gui/reusable/locationlineedit.h" #include "gui/reusable/searchtextwidget.h" #include "gui/tabwidget.h" -#include "gui/webviewer.h" +#include "gui/webviewers/litehtml/litehtmlviewer.h" // QLiteHtml-based web browsing. +#include "gui/webviewers/webviewer.h" #include "miscellaneous/application.h" #include "miscellaneous/iconfactory.h" #include "network-web/networkfactory.h" @@ -19,7 +19,7 @@ #include "services/abstract/serviceroot.h" #if defined(USE_WEBENGINE) -#include "gui/webengine/webengineviewer.h" // WebEngine-based web browsing. +#include "gui/webviewers/webengine/webengineviewer.h" // WebEngine-based web browsing. #endif #include diff --git a/src/librssguard/gui/litehtml/litehtmlviewer.cpp b/src/librssguard/gui/webviewers/litehtml/litehtmlviewer.cpp similarity index 96% rename from src/librssguard/gui/litehtml/litehtmlviewer.cpp rename to src/librssguard/gui/webviewers/litehtml/litehtmlviewer.cpp index 540f3a623..a7fce3848 100755 --- a/src/librssguard/gui/litehtml/litehtmlviewer.cpp +++ b/src/librssguard/gui/webviewers/litehtml/litehtmlviewer.cpp @@ -1,6 +1,6 @@ // For license of this file, see /LICENSE.md. -#include "gui/litehtml/litehtmlviewer.h" +#include "gui/webviewers/litehtml/litehtmlviewer.h" #include "core/message.h" #include "gui/dialogs/formmain.h" diff --git a/src/librssguard/gui/litehtml/litehtmlviewer.h b/src/librssguard/gui/webviewers/litehtml/litehtmlviewer.h similarity index 94% rename from src/librssguard/gui/litehtml/litehtmlviewer.h rename to src/librssguard/gui/webviewers/litehtml/litehtmlviewer.h index d22b52e1a..ae462e931 100755 --- a/src/librssguard/gui/litehtml/litehtmlviewer.h +++ b/src/librssguard/gui/webviewers/litehtml/litehtmlviewer.h @@ -4,7 +4,7 @@ #define LITEHTMLVIEWER_H #include "3rd-party/qlitehtml/qlitehtmlwidget.h" -#include "gui/webviewer.h" +#include "gui/webviewers/webviewer.h" #include "network-web/adblock/adblockmanager.h" diff --git a/src/librssguard/gui/webengine/webengineviewer.cpp b/src/librssguard/gui/webviewers/webengine/webengineviewer.cpp similarity index 99% rename from src/librssguard/gui/webengine/webengineviewer.cpp rename to src/librssguard/gui/webviewers/webengine/webengineviewer.cpp index d4b6fdd77..ae8a161ab 100644 --- a/src/librssguard/gui/webengine/webengineviewer.cpp +++ b/src/librssguard/gui/webviewers/webengine/webengineviewer.cpp @@ -1,6 +1,6 @@ // For license of this file, see /LICENSE.md. -#include "gui/webengine/webengineviewer.h" +#include "gui/webviewers/webengine/webengineviewer.h" #include "definitions/definitions.h" #include "gui/dialogs/formmain.h" diff --git a/src/librssguard/gui/webengine/webengineviewer.h b/src/librssguard/gui/webviewers/webengine/webengineviewer.h similarity index 97% rename from src/librssguard/gui/webengine/webengineviewer.h rename to src/librssguard/gui/webviewers/webengine/webengineviewer.h index f018b691a..0325804bb 100644 --- a/src/librssguard/gui/webengine/webengineviewer.h +++ b/src/librssguard/gui/webviewers/webengine/webengineviewer.h @@ -5,7 +5,7 @@ #include -#include "gui/webviewer.h" +#include "gui/webviewers/webviewer.h" #include "core/message.h" #include "miscellaneous/externaltool.h" diff --git a/src/librssguard/gui/webviewer.h b/src/librssguard/gui/webviewers/webviewer.h similarity index 100% rename from src/librssguard/gui/webviewer.h rename to src/librssguard/gui/webviewers/webviewer.h diff --git a/src/librssguard/network-web/webengine/webenginepage.cpp b/src/librssguard/network-web/webengine/webenginepage.cpp index 10c8e50a7..c3fd252f7 100644 --- a/src/librssguard/network-web/webengine/webenginepage.cpp +++ b/src/librssguard/network-web/webengine/webenginepage.cpp @@ -3,7 +3,7 @@ #include "network-web/webengine/webenginepage.h" #include "definitions/definitions.h" -#include "gui/webengine/webengineviewer.h" +#include "gui/webviewers/webengine/webengineviewer.h" #include "miscellaneous/application.h" #include "network-web/adblock/adblockmanager.h" #include "network-web/adblock/adblockrequestinfo.h"