libmobileshell: Move back to QML plugin

Move from a C++ library + QML plugin to a QML plugin only for simplicity, since the homescreen switching architecture will be done from Plasma, and so use of the shell library only needs to be from QML.

CMakeLists.txt

@@ -84,7 +84,6 @@ add_subdirectory(containments)
 add_subdirectory(components)
 add_subdirectory(quicksettings)
 add_subdirectory(kcms)
-add_subdirectory(libmobileshell)
 
 find_program(PlasmaOpenSettings plasma-open-settings)
 set_package_properties(PlasmaOpenSettings PROPERTIES

README.md

@@ -15,7 +15,7 @@ This repository contains shell components for Plasma Mobile.
 * Development channel: https://matrix.to/#/#plasmamobile:matrix.org
 
 ### Locations
-* [libmobileshell](libmobileshell) - shell component library (not guaranteed to be binary compatible between releases!)
+* [components/mobileshell](mobileshell) - private shell component library (API not guaranteed to be stable!)
 * [containments](containments) - shell panels (homescreen, status bar, task panel)
 * [homescreens](homescreens) - homescreen packages
 * [kcms](kcms) - settings modules

components/CMakeLists.txt

@@ -4,3 +4,4 @@
 
 add_subdirectory(mmplugin)
 add_subdirectory(mobilehomescreencomponents)
+add_subdirectory(mobileshell)

libmobileshell/declarative/CMakeLists.txt → components/mobileshell/CMakeLists.txt

@@ -6,6 +6,11 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
                                  
 set(mobileshellplugin_SRCS
     mobileshellplugin.cpp
+    mobileshellsettings.cpp
+    quicksetting.cpp
+    quicksettingsmodel.cpp
+    savedquicksettings.cpp
+    savedquicksettingsmodel.cpp
     shellutil.cpp
     notifications/notificationthumbnailer.cpp
     notifications/notificationfilemenu.cpp
@@ -23,7 +28,6 @@ add_library(mobileshellplugin SHARED ${mobileshellplugin_SRCS} ${RESOURCES})
 target_link_libraries(mobileshellplugin 
     PUBLIC
         Qt::Core
-        mobileshell
     PRIVATE
         Qt::DBus
         Qt::Qml

libmobileshell/declarative/mobileshellplugin.cpp → components/mobileshell/mobileshellplugin.cpp

@@ -18,8 +18,6 @@
 #include "shellutil.h"
 #include "taskswitcher/displaysmodel.h"
 
-using namespace MobileShell;
-
 QUrl resolvePath(std::string str)
 {
     return QUrl("qrc:/org/kde/plasma/private/mobileshell/qml/" + QString::fromStdString(str));

libmobileshell/mobileshellsettings.cpp → components/mobileshell/mobileshellsettings.cpp

@@ -8,8 +8,6 @@
 
 #include <QDebug>
 
-using namespace MobileShell;
-
 const QString CONFIG_FILE = QStringLiteral("plasmamobilerc");
 const QString GENERAL_CONFIG_GROUP = QStringLiteral("General");
 const QString QUICKSETTINGS_CONFIG_GROUP = QStringLiteral("QuickSettings");

libmobileshell/mobileshellsettings.h → components/mobileshell/mobileshellsettings.h

@@ -11,12 +11,7 @@
 #include <KSharedConfig>
 #include <QObject>
 
-#include "mobileshell_export.h"
-
-namespace MobileShell
-{
-
-class MOBILESHELL_EXPORT MobileShellSettings : public QObject
+class MobileShellSettings : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(bool navigationPanelEnabled READ navigationPanelEnabled WRITE setNavigationPanelEnabled NOTIFY navigationPanelEnabledChanged)
@@ -44,5 +39,3 @@ private:
     KConfigWatcher::Ptr m_configWatcher;
     KSharedConfig::Ptr m_config;
 };
-
-} // namespace MobileShell