Move PackageUrlInterceptor and PackageAccessManager into PlasmaQuick

src/plasmaquick/CMakeLists.txt

@@ -5,6 +5,9 @@ set(plasmaquick_LIB_SRC
     configmodel.cpp
     configview.cpp
     private/configcategory_p.cpp
+    packageaccessmanager.cpp
+    packageaccessmanagerfactory.cpp
+    packageurlinterceptor.cpp
     #private/containmentconfigview_p.cpp
     #private/currentcontainmentactionsmodel_p.cpp
 )
@@ -12,13 +15,14 @@ set(plasmaquick_LIB_SRC
 add_library(PlasmaQuick SHARED ${plasmaquick_LIB_SRC})
 
 target_link_libraries(PlasmaQuick
-    ${Qt5Quick_LIBRARIES}
+    Qt5::Quick
-    ${Qt5Qml_LIBRARIES}
+    Qt5::Qml
-    ${KWindowSystem_LIBRARIES}
+    KF5::KWindowSystem
+    KF5::KIOWidgets
     KF5::KI18n
     KF5::KService
     KF5::KCoreAddons
-    ${XmlGui_LIBRARIES}
+    KF5::XmlGui
     plasma
     KF5::KDeclarative
 )
@@ -37,6 +41,8 @@ set(plasmaquick_LIB_INCLUDES
     plasmaquickview.h
     configview.h
     configmodel.h
+    packageaccessmanagerfactory.h # temporary, remove once folded into urlinterceptor
+    packageurlinterceptor.h
 )
 
 install(FILES ${plasmaquick_LIB_INCLUDES}

src/plasmaquick/packageaccessmanagerfactory.h

@@ -22,12 +22,13 @@
 
 #include <QQmlNetworkAccessManagerFactory>
 
+#include <plasmaquick/plasmaquick_export.h>
 
 #include <Plasma/Package>
 
 class AppletAuthorization;
 
-class PackageAccessManagerFactory : public QQmlNetworkAccessManagerFactory
+class PLASMAQUICK_EXPORT PackageAccessManagerFactory : public QQmlNetworkAccessManagerFactory
 {
 public:
     PackageAccessManagerFactory(const Plasma::Package &package);

src/plasmaquick/packageurlinterceptor.h

@@ -20,14 +20,16 @@
 #ifndef PACKAGEURLINTERCEPTOR_H
 #define PACKAGEURLINTERCEPTOR_H
 
-#include "qqmlabstracturlinterceptor_p.h"
+#include <QQmlAbstractUrlInterceptor>
+
+#include <plasmaquick/plasmaquick_export.h>
 
 #include <Plasma/Package>
 
 class QQmlEngine;
 
 //depends from https://codereview.qt-project.org/#change,65626
-class PackageUrlInterceptor: public QQmlAbstractUrlInterceptor
+class PLASMAQUICK_EXPORT PackageUrlInterceptor: public QQmlAbstractUrlInterceptor
 {
 public:
     PackageUrlInterceptor(QQmlEngine *engine, const Plasma::Package &p);

src/scriptengines/qml/CMakeLists.txt

@@ -13,9 +13,9 @@ include_directories(${PHONON_INCLUDES})
 
 #DECLARATIVE APPLET
 set(declarative_appletscript_SRCS
-    declarative/packageaccessmanager.cpp
+#     declarative/packageaccessmanager.cpp
-    declarative/packageaccessmanagerfactory.cpp
+#     declarative/packageaccessmanagerfactory.cpp
-    declarative/packageurlinterceptor.cpp
+#     declarative/packageurlinterceptor.cpp
     plasmoid/appletinterface.cpp
     plasmoid/containmentinterface.cpp
     plasmoid/declarativeappletscript.cpp
@@ -36,6 +36,7 @@ target_link_libraries(plasma_appletscript_declarative
     ${KCore_LIBRARIES}
     KF5::KI18n
     plasma
+    PlasmaQuick
     KF5::KDeclarative
 )
 

src/scriptengines/qml/plasmoid/appletinterface.cpp

@@ -47,8 +47,8 @@
 #include "containmentinterface.h"
 #include <kdeclarative/configpropertymap.h>
 #include <kdeclarative/qmlobject.h>
-#include "declarative/packageaccessmanagerfactory.h"
+#include <packageaccessmanagerfactory.h>
-#include "declarative/packageurlinterceptor.h"
+#include <packageurlinterceptor.h>
 
 Q_DECLARE_METATYPE(AppletInterface*)
 

src/scriptengines/qml/plasmoid/declarativeappletscript.cpp

@@ -46,7 +46,7 @@
 #include "plasmoid/containmentinterface.h"
 
 #include <kdeclarative/qmlobject.h>
-#include "declarative/packageaccessmanagerfactory.h"
+#include <packageaccessmanagerfactory.h>
 #include <kdeclarative/configpropertymap.h>