some renaming

src/librssguard/CMakeLists.txt

@@ -476,12 +476,12 @@ if(USE_WEBENGINE)
     gui/reusable/locationlineedit.h
     gui/webbrowser.cpp
     gui/webbrowser.h
-    gui/webviewer.cpp
-    gui/webviewer.h
     network-web/googlesuggest.cpp
     network-web/googlesuggest.h
-    network-web/webpage.cpp
+    network-web/webengine/webenginepage.cpp
-    network-web/webpage.h
+    network-web/webengine/webenginepage.h
+    gui/webengine/webengineviewer.cpp
+    gui/webengine/webengineviewer.h
 
     # Add AdBlock sources.
     network-web/adblock/adblockdialog.cpp
@@ -494,8 +494,8 @@ if(USE_WEBENGINE)
     network-web/adblock/adblockrequestinfo.h
     network-web/adblock/adblockurlinterceptor.cpp
     network-web/adblock/adblockurlinterceptor.h
-    network-web/networkurlinterceptor.cpp
+    network-web/webengine/networkurlinterceptor.cpp
-    network-web/networkurlinterceptor.h
+    network-web/webengine/networkurlinterceptor.h
     network-web/urlinterceptor.h
   )
 

src/librssguard/gui/messagepreviewer.cpp

@@ -15,7 +15,7 @@
 
 #if defined(USE_WEBENGINE)
 #include "gui/webbrowser.h"
-#include "gui/webviewer.h"
+#include "gui/webengine/webengineviewer.h"
 #else
 #include "gui/messagebrowser.h"
 #endif

src/librssguard/gui/webbrowser.cpp

@@ -7,7 +7,7 @@
 #include "gui/reusable/discoverfeedsbutton.h"
 #include "gui/reusable/locationlineedit.h"
 #include "gui/reusable/searchtextwidget.h"
-#include "gui/webviewer.h"
+#include "gui/webengine/webengineviewer.h"
 #include "miscellaneous/application.h"
 #include "miscellaneous/iconfactory.h"
 #include "network-web/networkfactory.h"
@@ -27,7 +27,7 @@
 WebBrowser::WebBrowser(QWidget* parent) : TabContent(parent),
   m_layout(new QVBoxLayout(this)),
   m_toolBar(new QToolBar(tr("Navigation panel"), this)),
-  m_webView(new WebViewer(this)),
+  m_webView(new WebEngineViewer(this)),
   m_searchWidget(new SearchTextWidget(this)),
   m_txtLocation(new LocationLineEdit(this)),
   m_btnDiscoverFeeds(new DiscoverFeedsButton(this)),
@@ -72,18 +72,18 @@ void WebBrowser::createConnections() {
 
   connect(m_txtLocation, &LocationLineEdit::submitted,
           this, static_cast<void (WebBrowser::*)(const QString&)>(&WebBrowser::loadUrl));
-  connect(m_webView, &WebViewer::urlChanged, this, &WebBrowser::updateUrl);
+  connect(m_webView, &WebEngineViewer::urlChanged, this, &WebBrowser::updateUrl);
 
   // Change location textbox status according to webpage status.
-  connect(m_webView, &WebViewer::loadStarted, this, &WebBrowser::onLoadingStarted);
+  connect(m_webView, &WebEngineViewer::loadStarted, this, &WebBrowser::onLoadingStarted);
-  connect(m_webView, &WebViewer::loadProgress, this, &WebBrowser::onLoadingProgress);
+  connect(m_webView, &WebEngineViewer::loadProgress, this, &WebBrowser::onLoadingProgress);
-  connect(m_webView, &WebViewer::loadFinished, this, &WebBrowser::onLoadingFinished);
+  connect(m_webView, &WebEngineViewer::loadFinished, this, &WebBrowser::onLoadingFinished);
 
   // Forward title/icon changes.
-  connect(m_webView, &WebViewer::titleChanged, this, &WebBrowser::onTitleChanged);
+  connect(m_webView, &WebEngineViewer::titleChanged, this, &WebBrowser::onTitleChanged);
-  connect(m_webView, &WebViewer::iconChanged, this, &WebBrowser::onIconChanged);
+  connect(m_webView, &WebEngineViewer::iconChanged, this, &WebBrowser::onIconChanged);
 
-  connect(m_webView->page(), &WebPage::windowCloseRequested, this, &WebBrowser::closeRequested);
+  connect(m_webView->page(), &WebEnginePage::windowCloseRequested, this, &WebBrowser::closeRequested);
   connect(qApp->web()->readability(), &Readability::htmlReadabled, this, &WebBrowser::setReadabledHtml);
   connect(qApp->web()->readability(), &Readability::errorOnHtmlReadabiliting, this, &WebBrowser::readabilityFailed);
 }
@@ -324,13 +324,3 @@ void WebBrowser::onLoadingFinished(bool success) {
   m_loadingProgress->hide();
   m_loadingProgress->setValue(0);
 }
-
-Message* WebBrowser::findMessage(int id) {
-  for (int i = 0; i < m_messages.size(); i++) {
-    if (m_messages.at(i).m_id == id) {
-      return &m_messages[i];
-    }
-  }
-
-  return nullptr;
-}

src/librssguard/gui/webbrowser.h

@@ -6,7 +6,7 @@
 #include "gui/tabcontent.h"
 
 #include "core/message.h"
-#include "network-web/webpage.h"
+#include "network-web/webengine/webenginepage.h"
 #include "services/abstract/rootitem.h"
 
 #include <QPointer>
@@ -19,7 +19,7 @@ class QProgressBar;
 class QMenu;
 class QLabel;
 class TabWidget;
-class WebViewer;
+class WebEngineViewer;
 class LocationLineEdit;
 class DiscoverFeedsButton;
 class SearchTextWidget;
@@ -33,7 +33,7 @@ class WebBrowser : public TabContent {
 
     virtual WebBrowser* webBrowser() const;
 
-    WebViewer* viewer() const;
+    WebEngineViewer* viewer() const;
 
     double verticalScrollBarPosition() const;
     void setVerticalScrollBarPosition(double pos);
@@ -55,7 +55,6 @@ class WebBrowser : public TabContent {
     virtual bool eventFilter(QObject* watched, QEvent* event);
 
   private slots:
-    void readabilePage();
     void openCurrentSiteInSystemBrowser();
     void updateUrl(const QUrl& url);
     void onLoadingStarted();
@@ -63,6 +62,8 @@ class WebBrowser : public TabContent {
     void onLoadingFinished(bool success);
     void onTitleChanged(const QString& new_title);
     void onIconChanged(const QIcon& icon);
+
+    void readabilePage();
     void setReadabledHtml(const QString& better_html);
     void readabilityFailed(const QString& error);
 
@@ -75,12 +76,10 @@ class WebBrowser : public TabContent {
     void initializeLayout();
     void createConnections();
 
-    Message* findMessage(int id);
-
   private:
     QVBoxLayout* m_layout;
     QToolBar* m_toolBar;
-    WebViewer* m_webView;
+    WebEngineViewer* m_webView;
     SearchTextWidget* m_searchWidget;
     LocationLineEdit* m_txtLocation;
     DiscoverFeedsButton* m_btnDiscoverFeeds;
@@ -99,7 +98,7 @@ inline WebBrowser* WebBrowser::webBrowser() const {
   return const_cast<WebBrowser*>(this);
 }
 
-inline WebViewer* WebBrowser::viewer() const {
+inline WebEngineViewer* WebBrowser::viewer() const {
   return m_webView;
 }
 

src/librssguard/gui/webengine/webengineviewer.cpp

@@ -1,6 +1,6 @@
 // For license of this file, see <project-root-folder>/LICENSE.md.
 
-#include "gui/webviewer.h"
+#include "gui/webengine/webengineviewer.h"
 
 #include "definitions/definitions.h"
 #include "gui/dialogs/formmain.h"
@@ -12,8 +12,8 @@
 #include "network-web/adblock/adblockicon.h"
 #include "network-web/adblock/adblockmanager.h"
 #include "network-web/networkfactory.h"
+#include "network-web/webengine/webenginepage.h"
 #include "network-web/webfactory.h"
-#include "network-web/webpage.h"
 
 #include <QFileIconProvider>
 #include <QTimer>
@@ -28,24 +28,24 @@
 
 #include <QWheelEvent>
 
-WebViewer::WebViewer(QWidget* parent) : QWebEngineView(parent), m_root(nullptr) {
+WebEngineViewer::WebEngineViewer(QWidget* parent) : QWebEngineView(parent), m_root(nullptr) {
-  WebPage* page = new WebPage(this);
+  WebEnginePage* page = new WebEnginePage(this);
 
   setPage(page);
   resetWebPageZoom();
 
-  connect(page, &WebPage::linkHovered, this, &WebViewer::onLinkHovered);
+  connect(page, &WebEnginePage::linkHovered, this, &WebEngineViewer::onLinkHovered);
 }
 
-bool WebViewer::canIncreaseZoom() {
+bool WebEngineViewer::canIncreaseZoom() {
   return zoomFactor() <= double(MAX_ZOOM_FACTOR) - double(ZOOM_FACTOR_STEP);
 }
 
-bool WebViewer::canDecreaseZoom() {
+bool WebEngineViewer::canDecreaseZoom() {
   return zoomFactor() >= double(MIN_ZOOM_FACTOR) + double(ZOOM_FACTOR_STEP);
 }
 
-bool WebViewer::event(QEvent* event) {
+bool WebEngineViewer::event(QEvent* event) {
   if (event->type() == QEvent::Type::ChildAdded) {
     QChildEvent* child_ev = static_cast<QChildEvent*>(event);
     QWidget* w = qobject_cast<QWidget*>(child_ev->child());
@@ -58,15 +58,15 @@ bool WebViewer::event(QEvent* event) {
   return QWebEngineView::event(event);
 }
 
-WebPage* WebViewer::page() const {
+WebEnginePage* WebEngineViewer::page() const {
-  return qobject_cast<WebPage*>(QWebEngineView::page());
+  return qobject_cast<WebEnginePage*>(QWebEngineView::page());
 }
 
-void WebViewer::displayMessage() {
+void WebEngineViewer::displayMessage() {
   setHtml(m_messageContents, m_messageBaseUrl /*, QUrl::fromUserInput(INTERNAL_URL_MESSAGE)*/);
 }
 
-bool WebViewer::increaseWebPageZoom() {
+bool WebEngineViewer::increaseWebPageZoom() {
   if (canIncreaseZoom()) {
     setZoomFactor(zoomFactor() + double(ZOOM_FACTOR_STEP));
     qApp->settings()->setValue(GROUP(Messages), Messages::Zoom, zoomFactor());
@@ -77,7 +77,7 @@ bool WebViewer::increaseWebPageZoom() {
   }
 }
 
-bool WebViewer::decreaseWebPageZoom() {
+bool WebEngineViewer::decreaseWebPageZoom() {
   if (canDecreaseZoom()) {
     setZoomFactor(zoomFactor() - double(ZOOM_FACTOR_STEP));
     qApp->settings()->setValue(GROUP(Messages), Messages::Zoom, zoomFactor());
@@ -88,7 +88,7 @@ bool WebViewer::decreaseWebPageZoom() {
   }
 }
 
-bool WebViewer::resetWebPageZoom(bool to_factory_default) {
+bool WebEngineViewer::resetWebPageZoom(bool to_factory_default) {
   const qreal new_factor = to_factory_default ? 1.0 : qApp->settings()->value(GROUP(Messages),
                                                                               SETTING(Messages::Zoom)).toReal();
 
@@ -105,7 +105,7 @@ bool WebViewer::resetWebPageZoom(bool to_factory_default) {
   }
 }
 
-void WebViewer::loadMessages(const QList<Message>& messages, RootItem* root) {
+void WebEngineViewer::loadMessages(const QList<Message>& messages, RootItem* root) {
   Skin skin = qApp->skins()->currentSkin();
   QString messages_layout;
   QString single_message_layout = skin.m_layoutMarkup;
@@ -187,7 +187,7 @@ void WebViewer::loadMessages(const QList<Message>& messages, RootItem* root) {
   page()->runJavaScript(QSL("window.scrollTo(0, 0);"));
 }
 
-void WebViewer::clear() {
+void WebEngineViewer::clear() {
   bool previously_enabled = isEnabled();
 
   setEnabled(false);
@@ -195,7 +195,7 @@ void WebViewer::clear() {
   setEnabled(previously_enabled);
 }
 
-void WebViewer::contextMenuEvent(QContextMenuEvent* event) {
+void WebEngineViewer::contextMenuEvent(QContextMenuEvent* event) {
   event->accept();
 
 #if QT_VERSION_MAJOR == 6
@@ -262,7 +262,7 @@ void WebViewer::contextMenuEvent(QContextMenuEvent* event) {
   menu->popup(p);
 }
 
-QWebEngineView* WebViewer::createWindow(QWebEnginePage::WebWindowType type) {
+QWebEngineView* WebEngineViewer::createWindow(QWebEnginePage::WebWindowType type) {
   Q_UNUSED(type)
   int index = qApp->mainForm()->tabWidget()->addBrowser(false, false);
 
@@ -274,11 +274,11 @@ QWebEngineView* WebViewer::createWindow(QWebEnginePage::WebWindowType type) {
   }
 }
 
-void WebViewer::wheelEvent(QWheelEvent* event) {
+void WebEngineViewer::wheelEvent(QWheelEvent* event) {
   QWebEngineView::wheelEvent(event);
 }
 
-bool WebViewer::eventFilter(QObject* object, QEvent* event) {
+bool WebEngineViewer::eventFilter(QObject* object, QEvent* event) {
   Q_UNUSED(object)
 
   if (event->type() == QEvent::Type::Wheel) {
@@ -317,7 +317,7 @@ bool WebViewer::eventFilter(QObject* object, QEvent* event) {
   return false;
 }
 
-void WebViewer::onLinkHovered(const QString& url) {
+void WebEngineViewer::onLinkHovered(const QString& url) {
   qDebugNN << LOGSEC_GUI << "Hovered link:" << QUOTE_W_SPACE_DOT(url);
 
   qApp->showGuiMessage(Notification::Event::GeneralEvent,
@@ -328,10 +328,10 @@ void WebViewer::onLinkHovered(const QString& url) {
   //QToolTip::showText(QCursor::pos(), url, {}, {}, 6000);
 }
 
-void WebViewer::openUrlWithExternalTool(ExternalTool tool, const QString& target_url) {
+void WebEngineViewer::openUrlWithExternalTool(ExternalTool tool, const QString& target_url) {
   tool.run(target_url);
 }
 
-RootItem* WebViewer::root() const {
+RootItem* WebEngineViewer::root() const {
   return m_root;
 }

src/librssguard/gui/webengine/webengineviewer.h

@@ -1,27 +1,27 @@
 // For license of this file, see <project-root-folder>/LICENSE.md.
 
-#ifndef WEBVIEWER_H
+#ifndef WEBENGINEVIEWER_H
-#define WEBVIEWER_H
+#define WEBENGINEVIEWER_H
 
 #include <QWebEngineView>
 
 #include "core/message.h"
 #include "miscellaneous/externaltool.h"
-#include "network-web/webpage.h"
+#include "network-web/webengine/webenginepage.h"
 
 class RootItem;
 
-class WebViewer : public QWebEngineView {
+class WebEngineViewer : public QWebEngineView {
   Q_OBJECT
 
   public:
-    explicit WebViewer(QWidget* parent = nullptr);
+    explicit WebEngineViewer(QWidget* parent = nullptr);
 
     bool canIncreaseZoom();
     bool canDecreaseZoom();
 
     QString messageContents();
-    WebPage* page() const;
+    WebEnginePage* page() const;
     RootItem* root() const;
 
   public slots:
@@ -50,8 +50,8 @@ class WebViewer : public QWebEngineView {
     QString m_messageContents;
 };
 
-inline QString WebViewer::messageContents() {
+inline QString WebEngineViewer::messageContents() {
   return m_messageContents;
 }
 
-#endif // WEBVIEWER_H
+#endif // WEBENGINEVIEWER_H

src/librssguard/miscellaneous/application.cpp

@@ -41,7 +41,7 @@
 #if defined(USE_WEBENGINE)
 #include "network-web/adblock/adblockicon.h"
 #include "network-web/adblock/adblockmanager.h"
-#include "network-web/networkurlinterceptor.h"
+#include "network-web/webengine/networkurlinterceptor.h"
 
 #if QT_VERSION_MAJOR == 6
 #include <QWebEngineDownloadRequest>

src/librssguard/network-web/adblock/adblockicon.cpp

@@ -2,12 +2,9 @@
 
 #include "network-web/adblock/adblockicon.h"
 
-#include "gui/dialogs/formmain.h"
-#include "gui/webbrowser.h"
-#include "gui/webviewer.h"
 #include "miscellaneous/application.h"
+#include "miscellaneous/iconfactory.h"
 #include "network-web/adblock/adblockmanager.h"
-#include "network-web/webpage.h"
 
 #include <QMenu>
 

src/librssguard/network-web/adblock/adblockmanager.cpp

@@ -12,7 +12,7 @@
 #include "network-web/adblock/adblockrequestinfo.h"
 #include "network-web/adblock/adblockurlinterceptor.h"
 #include "network-web/networkfactory.h"
-#include "network-web/networkurlinterceptor.h"
+#include "network-web/webengine/networkurlinterceptor.h"
 #include "network-web/webfactory.h"
 
 #include <QDateTime>
@@ -23,7 +23,6 @@
 #include <QThread>
 #include <QTimer>
 #include <QUrlQuery>
-#include <QWebEngineProfile>
 
 AdBlockManager::AdBlockManager(QObject* parent)
   : QObject(parent), m_loaded(false), m_enabled(false), m_installing(false), m_interceptor(new AdBlockUrlInterceptor(this)),

src/librssguard/network-web/webengine/networkurlinterceptor.cpp

@@ -17,7 +17,7 @@
 // You should have received a copy of the GNU General Public License
 // along with RSS Guard. If not, see <http://www.gnu.org/licenses/>.
 
-#include "network-web/networkurlinterceptor.h"
+#include "network-web/webengine/networkurlinterceptor.h"
 
 #include "miscellaneous/application.h"
 #include "miscellaneous/settings.h"

src/librssguard/network-web/webengine/webenginepage.cpp

@@ -1,9 +1,9 @@
 // For license of this file, see <project-root-folder>/LICENSE.md.
 
-#include "network-web/webpage.h"
+#include "network-web/webengine/webenginepage.h"
 
 #include "definitions/definitions.h"
-#include "gui/webviewer.h"
+#include "gui/webengine/webengineviewer.h"
 #include "miscellaneous/application.h"
 #include "network-web/adblock/adblockmanager.h"
 #include "network-web/adblock/adblockrequestinfo.h"
@@ -17,21 +17,21 @@
 #include <QUrlQuery>
 #include <QWebEngineScript>
 
-WebPage::WebPage(QObject* parent) : QWebEnginePage(parent) {
+WebEnginePage::WebEnginePage(QObject* parent) : QWebEnginePage(parent) {
   setBackgroundColor(Qt::GlobalColor::transparent);
 
-  connect(this, &QWebEnginePage::loadFinished, this, &WebPage::hideUnwantedElements);
+  connect(this, &QWebEnginePage::loadFinished, this, &WebEnginePage::hideUnwantedElements);
 }
 
-WebViewer* WebPage::view() const {
+WebEngineViewer* WebEnginePage::view() const {
 #if QT_VERSION_MAJOR == 6
-  return qobject_cast<WebViewer*>(QWebEngineView::forPage(this));
+  return qobject_cast<WebEngineViewer*>(QWebEngineView::forPage(this));
 #else
-  return qobject_cast<WebViewer*>(QWebEnginePage::view());
+  return qobject_cast<WebEngineViewer*>(QWebEnginePage::view());
 #endif
 }
 
-void WebPage::hideUnwantedElements() {
+void WebEnginePage::hideUnwantedElements() {
   if (!qApp->web()->adBlock()->isEnabled()) {
     return;
   }
@@ -46,7 +46,7 @@ void WebPage::hideUnwantedElements() {
   }
 }
 
-bool WebPage::acceptNavigationRequest(const QUrl& url, NavigationType type, bool is_main_frame) {
+bool WebEnginePage::acceptNavigationRequest(const QUrl& url, NavigationType type, bool is_main_frame) {
   const RootItem* root = view()->root();
 
   if (is_main_frame) {
@@ -76,8 +76,8 @@ bool WebPage::acceptNavigationRequest(const QUrl& url, NavigationType type, bool
   //}
 }
 
-void WebPage::javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level, const QString& message,
+void WebEnginePage::javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level, const QString& message,
-                                       int line_number, const QString& source_id) {
+                                             int line_number, const QString& source_id) {
   Q_UNUSED(level)
 
   qWarningNN << LOGSEC_JS << message << QSL(" (source: %1:%2)").arg(source_id, QString::number(line_number));

src/librssguard/network-web/webengine/webenginepage.h

@@ -1,19 +1,19 @@
 // For license of this file, see <project-root-folder>/LICENSE.md.
 
-#ifndef WEBPAGE_H
+#ifndef WEBENGINEPAGE_H
-#define WEBPAGE_H
+#define WEBENGINEPAGE_H
 
 #include <QWebEnginePage>
 
-class WebViewer;
+class WebEngineViewer;
 
-class WebPage : public QWebEnginePage {
+class WebEnginePage : public QWebEnginePage {
   Q_OBJECT
 
   public:
-    explicit WebPage(QObject* parent = nullptr);
+    explicit WebEnginePage(QObject* parent = nullptr);
 
-    WebViewer* view() const;
+    WebEngineViewer* view() const;
 
   private slots:
     void hideUnwantedElements();
@@ -24,4 +24,4 @@ class WebPage : public QWebEnginePage {
                                           int line_number, const QString& source_id);
 };
 
-#endif // WEBPAGE_H
+#endif // WEBENGINEPAGE_H

src/librssguard/network-web/webfactory.cpp

@@ -15,8 +15,8 @@
 #if defined(USE_WEBENGINE)
 #include "network-web/adblock/adblockicon.h"
 #include "network-web/adblock/adblockmanager.h"
-#include "network-web/networkurlinterceptor.h"
 #include "network-web/urlinterceptor.h"
+#include "network-web/webengine/networkurlinterceptor.h"
 
 #if QT_VERSION_MAJOR == 6
 #include <QWebEngineDownloadRequest>