Remove unused code

messageviewer/src/viewer/viewer_p.cpp

@@ -1163,6 +1163,7 @@ void ViewerPrivate::readConfig()
 #ifdef MESSAGEVIEWER_USE_QTWEBENGINE
     mViewer->settings()->setFontSize(QWebEngineSettings::MinimumFontSize, MessageViewer::MessageViewerSettings::self()->minimumFontSize());
     mViewer->settings()->setFontSize(QWebEngineSettings::MinimumLogicalFontSize, MessageViewer::MessageViewerSettings::self()->minimumFontSize());
+    //TODO verify Qt5.7
     //FIXME mViewer->settings()->setAttribute(QWebEngineSettings::PrintElementBackgrounds, MessageViewer::MessageViewerSettings::self()->printBackgroundColorImages());
 #else
     mViewer->settings()->setFontSize(QWebSettings::MinimumFontSize, MessageViewer::MessageViewerSettings::self()->minimumFontSize());
@@ -1568,7 +1569,6 @@ void ViewerPrivate::createActions()
     mZoomActionMenu = new MessageViewer::ZoomActionMenu(this);
 #ifdef MESSAGEVIEWER_USE_QTWEBENGINE
     connect(mZoomActionMenu, &ZoomActionMenu::zoomChanged, mViewer, &MailWebEngineView::slotZoomChanged);
-    connect(mZoomActionMenu, &ZoomActionMenu::zoomTextOnlyChanged, mViewer, &MailWebEngineView::slotZoomTextOnlyChanged);
 #else
     connect(mZoomActionMenu, &ZoomActionMenu::zoomChanged, mViewer, &MailWebView::slotZoomChanged);
     connect(mZoomActionMenu, &ZoomActionMenu::zoomTextOnlyChanged, mViewer, &MailWebView::slotZoomTextOnlyChanged);
@@ -3066,7 +3066,11 @@ void ViewerPrivate::slotBlockImage()
 
 void ViewerPrivate::slotOpenBlockableItems()
 {
+#ifdef MESSAGEVIEWER_USE_QTWEBENGINE
+    qDebug() << "void ViewerPrivate::slotOpenBlockableItems() unimplemented";
+#else
     mViewer->openBlockableItemsDialog();
+#endif
 }
 
 void ViewerPrivate::addHelpTextAction(QAction *act, const QString &text)

messageviewer/src/viewer/webengine/mailwebengineview.cpp

@@ -123,15 +123,10 @@ void MailWebEngineView::selectAll()
 
 void MailWebEngineView::slotZoomChanged(qreal zoom)
 {
+    qDebug()<<" void MailWebEngineView::slotZoomChanged(qreal zoom)*******"<<zoom;
     setZoomFactor(zoom);
 }
 
-void MailWebEngineView::slotZoomTextOnlyChanged(bool b)
-{
-    Q_UNUSED(b);
-    qDebug() << "MailWebEngineView::slotZoomTextOnlyChanged unimplemented";
-}
-
 void MailWebEngineView::scamCheck()
 {
     d->mScamDetection->scanPage(page());
@@ -325,13 +320,10 @@ QUrl MailWebEngineView::linkOrImageUrlAt(const QPoint &global) const
     return {};
 }
 
-void MailWebEngineView::openBlockableItemsDialog()
-{
-    //TODO
-}
-
 void MailWebEngineView::setAllowExternalContent(bool b)
 {
-    d->mExternalReference->setAllowExternalContent(b);
-    reload();
+    if (d->mExternalReference->allowExternalContent() != b) {
+        d->mExternalReference->setAllowExternalContent(b);
+        reload();
+    }
 }

messageviewer/src/viewer/webengine/mailwebengineview.h

@@ -57,13 +57,11 @@ public:
     void scrollToRelativePosition(double pos);
     double relativePosition() const;
     QUrl linkOrImageUrlAt(const QPoint &global) const;
-    void openBlockableItemsDialog();
 
     void setAllowExternalContent(bool b);
 
 public Q_SLOTS:
     void slotZoomChanged(qreal zoom);
-    void slotZoomTextOnlyChanged(bool b);
     void slotShowDetails();
 
 protected: