Move in webengineviewer directly

CMakeLists.txt

 cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
-set(PIM_VERSION "5.17.46")
+set(PIM_VERSION "5.17.47")
 
 if (POLICY CMP0053)
     cmake_policy(SET CMP0053 NEW)

messageviewer/src/CMakeLists.txt

@@ -149,7 +149,6 @@ set(libmessageviewer_widgets_SRCS
     widgets/invitationsettings.cpp
     widgets/opensavedfilefolderwidget.cpp
     widgets/mailsourceviewtextbrowserwidget.cpp
-    widgets/submittedformwarningwidget.cpp
     widgets/shownextmessagewidget.cpp
     )
 

messageviewer/src/viewer/viewer_p.cpp

@@ -104,9 +104,9 @@
 #include "header/headerstylemenumanager.h"
 #include "htmlwriter/webengineparthtmlwriter.h"
 #include "viewer/webengine/mailwebengineview.h"
-#include "widgets/submittedformwarningwidget.h"
 #include <WebEngineViewer/FindBarWebEngineView>
 #include <WebEngineViewer/LocalDataBaseManager>
+#include <WebEngineViewer/SubmittedFormWarningWidget>
 #include <WebEngineViewer/WebEngineExportPdfPageJob>
 #include <WebEngineViewer/WebHitTestResult>
 #include <widgets/mailsourcewebengineviewer.h>
@@ -928,7 +928,7 @@ void ViewerPrivate::initHtmlWidget()
     connect(mViewer, &MailWebEngineView::popupMenu, this, &ViewerPrivate::slotUrlPopup);
     connect(mViewer, &MailWebEngineView::wheelZoomChanged, this, &ViewerPrivate::slotWheelZoomChanged);
     connect(mViewer, &MailWebEngineView::messageMayBeAScam, this, &ViewerPrivate::slotMessageMayBeAScam);
-    connect(mViewer, &MailWebEngineView::formSubmittedForbidden, mSubmittedFormWarning, &SubmittedFormWarningWidget::showWarning);
+    connect(mViewer, &MailWebEngineView::formSubmittedForbidden, mSubmittedFormWarning, &WebEngineViewer::SubmittedFormWarningWidget::showWarning);
     connect(mViewer, &MailWebEngineView::mailTrackingFound, mMailTrackingWarning, &WebEngineViewer::TrackingWarningWidget::addTracker);
     connect(mScamDetectionWarning, &ScamDetectionWarningWidget::showDetails, mViewer, &MailWebEngineView::slotShowDetails);
     connect(mScamDetectionWarning, &ScamDetectionWarningWidget::moveMessageToTrash, this, &ViewerPrivate::moveMessageToTrash);
@@ -1387,7 +1387,7 @@ void ViewerPrivate::createWidgets()
     connect(mShowNextMessageWidget, &ShowNextMessageWidget::showPreviousMessage, this, &ViewerPrivate::showPreviousMessage);
     connect(mShowNextMessageWidget, &ShowNextMessageWidget::showNextMessage, this, &ViewerPrivate::showNextMessage);
 
-    mSubmittedFormWarning = new SubmittedFormWarningWidget(readerBox);
+    mSubmittedFormWarning = new WebEngineViewer::SubmittedFormWarningWidget(readerBox);
     mSubmittedFormWarning->setObjectName(QStringLiteral("submittedformwarning"));
     readerBoxVBoxLayout->addWidget(mSubmittedFormWarning);
 

messageviewer/src/viewer/viewer_p.h

@@ -75,6 +75,7 @@ class ZoomActionMenu;
 class LocalDataBaseManager;
 class TrackingWarningWidget;
 class DeveloperToolDialog;
+class SubmittedFormWarningWidget;
 }
 namespace MessageViewer
 {
@@ -90,7 +91,6 @@ class ScamDetectionWarningWidget;
 class MimePartTreeView;
 class HeaderStyleMenuManager;
 class ViewerPluginToolManager;
-class SubmittedFormWarningWidget;
 class MailSourceWebEngineViewer;
 class ShowNextMessageWidget;
 class RemoteContentMenu;
@@ -692,7 +692,7 @@ public:
 
     MessageViewer::ScamDetectionWarningWidget *mScamDetectionWarning = nullptr;
     MessageViewer::OpenSavedFileFolderWidget *mOpenSavedFileFolderWidget = nullptr;
-    MessageViewer::SubmittedFormWarningWidget *mSubmittedFormWarning = nullptr;
+    WebEngineViewer::SubmittedFormWarningWidget *mSubmittedFormWarning = nullptr;
     WebEngineViewer::TrackingWarningWidget *mMailTrackingWarning = nullptr;
     KPIMTextEdit::TextToSpeechWidget *mTextToSpeechWidget = nullptr;
     Viewer::DisplayFormatMessage mDisplayFormatMessageOverwrite;

webengineviewer/src/CMakeLists.txt

@@ -83,8 +83,12 @@ set(libwebengineviewer_developertool_SRCS
     developertool/developertooldialog.cpp
     )
 
+set(libwebengineviewer_submittedform_SRCS
+    widgets/submittedformwidgets/submittedformwarningwidget.cpp
+    )
 
 set(libwebengineviewer_SRCS
+    ${libwebengineviewer_submittedform_SRCS}
     ${libwebengineviewer_developertool_SRCS}
     ${libwebengineviewer_checkphishingurl_SRCS}
     ${libwebengineviewer_interceptor_SRCS}
@@ -260,6 +264,16 @@ ecm_generate_headers(WebEngineViewer_Cameldevelopertool_HEADERS
     RELATIVE developertool/
     )
 
+ecm_generate_headers(WebEngineViewer_Camelsubmittedformwidget_HEADERS
+    HEADER_NAMES
+    SubmittedFormWarningWidget 
+
+    REQUIRED_HEADERS WebEngineViewer_submittedformwidget_HEADERS
+    PREFIX WebEngineViewer
+    RELATIVE widgets/submittedformwidgets/
+    )
+
+
 ecm_generate_pri_file(BASE_NAME WebEngineViewer
     LIB_NAME KF5WebEngineViewer
     DEPS "webenginewidgets PimCommon" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/WebEngineViewer
@@ -267,6 +281,7 @@ ecm_generate_pri_file(BASE_NAME WebEngineViewer
 
 
 install(FILES
+    ${WebEngineViewer_Camelsubmittedformwidget_HEADERS}
     ${WebEngineViewer_Cameldevelopertool_HEADERS}
     ${WebEngineViewer_Cameltracking_HEADERS}
     ${WebEngineViewer_Camelblockexternalresourcesurlinterceptor_HEADERS}
@@ -285,6 +300,7 @@ install(FILES
     )
 
 install(FILES
+    ${WebEngineViewer_submittedformwidget_HEADERS}
     ${WebEngineViewer_developertool_HEADERS}
     ${WebEngineViewer_tracking_HEADERS}
     ${WebEngineViewer_blockexternalresourcesurlinterceptor_HEADERS}

messageviewer/src/widgets/submittedformwarningwidget.cpp → webengineviewer/src/widgets/submittedformwidgets/submittedformwarningwidget.cpp

@@ -9,7 +9,7 @@
 
 #include <KLocalizedString>
 
-using namespace MessageViewer;
+using namespace WebEngineViewer;
 
 SubmittedFormWarningWidget::SubmittedFormWarningWidget(QWidget *parent)
     : KMessageWidget(parent)

messageviewer/src/widgets/submittedformwarningwidget.h → webengineviewer/src/widgets/submittedformwidgets/submittedformwarningwidget.h

@@ -6,13 +6,13 @@
 */
 
 #pragma once
-
+#include "webengineviewer_export.h"
 #include <KMessageWidget>
 
-namespace MessageViewer
+namespace WebEngineViewer
 {
 class SubmittedFormWarningWidgetPrivate;
-class SubmittedFormWarningWidget : public KMessageWidget
+class WEBENGINEVIEWER_EXPORT SubmittedFormWarningWidget : public KMessageWidget
 {
     Q_OBJECT
 public:
@@ -23,4 +23,3 @@ public Q_SLOTS:
     void showWarning();
 };
 }
-