From 210042a6bf2abec5f7a9c90255e0da826844a93a Mon Sep 17 00:00:00 2001 From: Devin Lin Date: Mon, 21 Mar 2022 10:00:03 -0400 Subject: [PATCH] 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 | 1 - README.md | 2 +- components/CMakeLists.txt | 1 + .../mobileshell}/CMakeLists.txt | 6 +- .../mobileshell}/mobileshellplugin.cpp | 2 - .../mobileshell}/mobileshellplugin.h | 0 .../mobileshell}/mobileshellsettings.cpp | 2 - .../mobileshell}/mobileshellsettings.h | 9 +-- .../notifications/notificationfilemenu.cpp | 0 .../notifications/notificationfilemenu.h | 0 .../notifications/notificationthumbnailer.cpp | 0 .../notifications/notificationthumbnailer.h | 0 .../mobileshell}/qml/HomeScreenControls.qml | 0 .../mobileshell}/qml/Shell.qml | 0 .../mobileshell}/qml/TaskPanelControls.qml | 0 .../mobileshell}/qml/TopPanelControls.qml | 0 .../qml/actiondrawer/ActionDrawer.qml | 0 .../actiondrawer/ActionDrawerOpenSurface.qml | 0 .../LandscapeContentContainer.qml | 0 .../actiondrawer/PortraitContentContainer.qml | 0 .../quicksettings/BrightnessItem.qml | 0 .../qml/actiondrawer/quicksettings/Handle.qml | 0 .../quicksettings/QuickSettings.qml | 0 .../quicksettings/QuickSettingsDelegate.qml | 0 .../quicksettings/QuickSettingsDrawer.qml | 0 .../QuickSettingsFullDelegate.qml | 0 .../QuickSettingsMinimizedDelegate.qml | 0 .../quicksettings/QuickSettingsPanel.qml | 0 .../mobileshell}/qml/components/BaseItem.qml | 0 .../mobileshell}/qml/components/Direction.qml | 0 .../qml/components/StartupFeedback.qml | 0 .../qml/components/VelocityCalculator.qml | 0 .../mobileshell}/qml/components/util.js | 0 .../qml/dataproviders/BatteryProvider.qml | 0 .../qml/dataproviders/BluetoothProvider.qml | 0 .../dataproviders/SignalStrengthProvider.qml | 0 .../qml/dataproviders/VolumeProvider.qml | 0 .../qml/dataproviders/WifiProvider.qml | 0 .../navigationpanel/NavigationGestureArea.qml | 0 .../qml/navigationpanel/NavigationPanel.qml | 0 .../navigationpanel/NavigationPanelAction.qml | 0 .../navigationpanel/NavigationPanelButton.qml | 0 .../qml/osd/volume/AudioApplet.qml | 0 .../qml/osd/volume/DeviceListItem.qml | 0 .../qml/osd/volume/ListItemBase.qml | 0 .../mobileshell}/qml/osd/volume/PopupCard.qml | 0 .../qml/osd/volume/StreamListItem.qml | 0 .../mobileshell}/qml/osd/volume/VolumeOSD.qml | 0 .../mobileshell}/qml/osd/volume/icon.js | 0 .../mobileshell}/qml/statusbar/ClockText.qml | 0 .../mobileshell}/qml/statusbar/StatusBar.qml | 0 .../mobileshell}/qml/statusbar/TaskWidget.qml | 0 .../statusbar/indicators/BatteryIndicator.qml | 0 .../indicators/BluetoothIndicator.qml | 0 .../indicators/SignalStrengthIndicator.qml | 0 .../statusbar/indicators/VolumeIndicator.qml | 0 .../statusbar/indicators/WifiIndicator.qml | 0 .../qml/taskswitcher/FlickContainer.qml | 0 .../mobileshell}/qml/taskswitcher/Task.qml | 0 .../qml/taskswitcher/TaskIcon.qml | 0 .../qml/taskswitcher/TaskList.qml | 0 .../qml/taskswitcher/TaskSwitcher.qml | 0 .../qml/taskswitcher/TaskSwitcherState.qml | 0 .../qml/taskswitcher/Thumbnail.qml | 0 .../qml/widgets/krunner/KRunnerWidget.qml | 0 .../mediacontrols/BlurredBackground.qml | 0 .../mediacontrols/MediaControlsSource.qml | 0 .../mediacontrols/MediaControlsWidget.qml | 0 .../notifications/BaseNotificationItem.qml | 0 .../notifications/NotificationBodyLabel.qml | 0 .../notifications/NotificationCard.qml | 0 .../NotificationFooterActions.qml | 0 .../notifications/NotificationGroupHeader.qml | 0 .../notifications/NotificationItem.qml | 0 .../notifications/NotificationReplyField.qml | 0 .../notifications/NotificationTimeText.qml | 0 .../notifications/NotificationsModelType.qml | 0 .../notifications/NotificationsWidget.qml | 0 .../widgets/notifications/ThumbnailStrip.qml | 0 .../qml/widgets/notifications/util.js | 0 .../mobileshell}/qmldir | 0 .../mobileshell}/quicksetting.cpp | 2 - .../mobileshell}/quicksetting.h | 9 +-- .../mobileshell}/quicksettingsmodel.cpp | 2 - .../mobileshell}/quicksettingsmodel.h | 10 +-- .../mobileshell}/resources.qrc | 0 .../mobileshell}/savedquicksettings.cpp | 2 - .../mobileshell}/savedquicksettings.h | 8 +-- .../mobileshell}/savedquicksettingsmodel.cpp | 2 - .../mobileshell}/savedquicksettingsmodel.h | 8 +-- .../mobileshell}/shellutil.cpp | 2 - .../mobileshell}/shellutil.h | 9 +-- .../taskswitcher/displaysmodel.cpp | 2 - .../mobileshell}/taskswitcher/displaysmodel.h | 9 +-- libmobileshell/CMakeLists.txt | 62 ------------------- libmobileshell/autotests/CMakeLists.txt | 13 ---- 96 files changed, 15 insertions(+), 148 deletions(-) rename {libmobileshell/declarative => components/mobileshell}/CMakeLists.txt (91%) rename {libmobileshell/declarative => components/mobileshell}/mobileshellplugin.cpp (99%) rename {libmobileshell/declarative => components/mobileshell}/mobileshellplugin.h (100%) rename {libmobileshell => components/mobileshell}/mobileshellsettings.cpp (99%) rename {libmobileshell => components/mobileshell}/mobileshellsettings.h (87%) rename {libmobileshell/declarative => components/mobileshell}/notifications/notificationfilemenu.cpp (100%) rename {libmobileshell/declarative => components/mobileshell}/notifications/notificationfilemenu.h (100%) rename {libmobileshell/declarative => components/mobileshell}/notifications/notificationthumbnailer.cpp (100%) rename {libmobileshell/declarative => components/mobileshell}/notifications/notificationthumbnailer.h (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/HomeScreenControls.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/Shell.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/TaskPanelControls.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/TopPanelControls.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/actiondrawer/ActionDrawer.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/actiondrawer/ActionDrawerOpenSurface.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/actiondrawer/LandscapeContentContainer.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/actiondrawer/PortraitContentContainer.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/actiondrawer/quicksettings/BrightnessItem.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/actiondrawer/quicksettings/Handle.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/actiondrawer/quicksettings/QuickSettings.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/actiondrawer/quicksettings/QuickSettingsDelegate.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/actiondrawer/quicksettings/QuickSettingsDrawer.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/actiondrawer/quicksettings/QuickSettingsFullDelegate.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/actiondrawer/quicksettings/QuickSettingsMinimizedDelegate.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/actiondrawer/quicksettings/QuickSettingsPanel.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/components/BaseItem.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/components/Direction.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/components/StartupFeedback.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/components/VelocityCalculator.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/components/util.js (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/dataproviders/BatteryProvider.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/dataproviders/BluetoothProvider.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/dataproviders/SignalStrengthProvider.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/dataproviders/VolumeProvider.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/dataproviders/WifiProvider.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/navigationpanel/NavigationGestureArea.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/navigationpanel/NavigationPanel.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/navigationpanel/NavigationPanelAction.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/navigationpanel/NavigationPanelButton.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/osd/volume/AudioApplet.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/osd/volume/DeviceListItem.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/osd/volume/ListItemBase.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/osd/volume/PopupCard.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/osd/volume/StreamListItem.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/osd/volume/VolumeOSD.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/osd/volume/icon.js (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/statusbar/ClockText.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/statusbar/StatusBar.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/statusbar/TaskWidget.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/statusbar/indicators/BatteryIndicator.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/statusbar/indicators/BluetoothIndicator.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/statusbar/indicators/SignalStrengthIndicator.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/statusbar/indicators/VolumeIndicator.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/statusbar/indicators/WifiIndicator.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/taskswitcher/FlickContainer.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/taskswitcher/Task.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/taskswitcher/TaskIcon.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/taskswitcher/TaskList.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/taskswitcher/TaskSwitcher.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/taskswitcher/TaskSwitcherState.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/taskswitcher/Thumbnail.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/widgets/krunner/KRunnerWidget.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/widgets/mediacontrols/BlurredBackground.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/widgets/mediacontrols/MediaControlsSource.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/widgets/mediacontrols/MediaControlsWidget.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/widgets/notifications/BaseNotificationItem.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/widgets/notifications/NotificationBodyLabel.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/widgets/notifications/NotificationCard.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/widgets/notifications/NotificationFooterActions.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/widgets/notifications/NotificationGroupHeader.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/widgets/notifications/NotificationItem.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/widgets/notifications/NotificationReplyField.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/widgets/notifications/NotificationTimeText.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/widgets/notifications/NotificationsModelType.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/widgets/notifications/NotificationsWidget.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/widgets/notifications/ThumbnailStrip.qml (100%) rename {libmobileshell/declarative => components/mobileshell}/qml/widgets/notifications/util.js (100%) rename {libmobileshell/declarative => components/mobileshell}/qmldir (100%) rename {libmobileshell => components/mobileshell}/quicksetting.cpp (97%) rename {libmobileshell => components/mobileshell}/quicksetting.h (93%) rename {libmobileshell => components/mobileshell}/quicksettingsmodel.cpp (98%) rename {libmobileshell => components/mobileshell}/quicksettingsmodel.h (83%) rename {libmobileshell/declarative => components/mobileshell}/resources.qrc (100%) rename {libmobileshell => components/mobileshell}/savedquicksettings.cpp (99%) rename {libmobileshell => components/mobileshell}/savedquicksettings.h (89%) rename {libmobileshell => components/mobileshell}/savedquicksettingsmodel.cpp (98%) rename {libmobileshell => components/mobileshell}/savedquicksettingsmodel.h (88%) rename {libmobileshell/declarative => components/mobileshell}/shellutil.cpp (98%) rename {libmobileshell/declarative => components/mobileshell}/shellutil.h (85%) rename {libmobileshell/declarative => components/mobileshell}/taskswitcher/displaysmodel.cpp (98%) rename {libmobileshell/declarative => components/mobileshell}/taskswitcher/displaysmodel.h (88%) delete mode 100644 libmobileshell/CMakeLists.txt delete mode 100644 libmobileshell/autotests/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 89abd553..4b3083bf 100644 --- a/CMakeLists.txt +++ b/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 diff --git a/README.md b/README.md index 104b9c79..752ab664 100644 --- a/README.md +++ b/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 diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt index 24b140ed..1668a18c 100644 --- a/components/CMakeLists.txt +++ b/components/CMakeLists.txt @@ -4,3 +4,4 @@ add_subdirectory(mmplugin) add_subdirectory(mobilehomescreencomponents) +add_subdirectory(mobileshell) diff --git a/libmobileshell/declarative/CMakeLists.txt b/components/mobileshell/CMakeLists.txt similarity index 91% rename from libmobileshell/declarative/CMakeLists.txt rename to components/mobileshell/CMakeLists.txt index 376c255f..0a441493 100644 --- a/libmobileshell/declarative/CMakeLists.txt +++ b/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 diff --git a/libmobileshell/declarative/mobileshellplugin.cpp b/components/mobileshell/mobileshellplugin.cpp similarity index 99% rename from libmobileshell/declarative/mobileshellplugin.cpp rename to components/mobileshell/mobileshellplugin.cpp index 58ee69ea..c6df7d0e 100644 --- a/libmobileshell/declarative/mobileshellplugin.cpp +++ b/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)); diff --git a/libmobileshell/declarative/mobileshellplugin.h b/components/mobileshell/mobileshellplugin.h similarity index 100% rename from libmobileshell/declarative/mobileshellplugin.h rename to components/mobileshell/mobileshellplugin.h diff --git a/libmobileshell/mobileshellsettings.cpp b/components/mobileshell/mobileshellsettings.cpp similarity index 99% rename from libmobileshell/mobileshellsettings.cpp rename to components/mobileshell/mobileshellsettings.cpp index ef6a7ddd..a13f0a7f 100644 --- a/libmobileshell/mobileshellsettings.cpp +++ b/components/mobileshell/mobileshellsettings.cpp @@ -8,8 +8,6 @@ #include -using namespace MobileShell; - const QString CONFIG_FILE = QStringLiteral("plasmamobilerc"); const QString GENERAL_CONFIG_GROUP = QStringLiteral("General"); const QString QUICKSETTINGS_CONFIG_GROUP = QStringLiteral("QuickSettings"); diff --git a/libmobileshell/mobileshellsettings.h b/components/mobileshell/mobileshellsettings.h similarity index 87% rename from libmobileshell/mobileshellsettings.h rename to components/mobileshell/mobileshellsettings.h index a0f44706..cfb124cd 100644 --- a/libmobileshell/mobileshellsettings.h +++ b/components/mobileshell/mobileshellsettings.h @@ -11,12 +11,7 @@ #include #include -#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 diff --git a/libmobileshell/declarative/notifications/notificationfilemenu.cpp b/components/mobileshell/notifications/notificationfilemenu.cpp similarity index 100% rename from libmobileshell/declarative/notifications/notificationfilemenu.cpp rename to components/mobileshell/notifications/notificationfilemenu.cpp diff --git a/libmobileshell/declarative/notifications/notificationfilemenu.h b/components/mobileshell/notifications/notificationfilemenu.h similarity index 100% rename from libmobileshell/declarative/notifications/notificationfilemenu.h rename to components/mobileshell/notifications/notificationfilemenu.h diff --git a/libmobileshell/declarative/notifications/notificationthumbnailer.cpp b/components/mobileshell/notifications/notificationthumbnailer.cpp similarity index 100% rename from libmobileshell/declarative/notifications/notificationthumbnailer.cpp rename to components/mobileshell/notifications/notificationthumbnailer.cpp diff --git a/libmobileshell/declarative/notifications/notificationthumbnailer.h b/components/mobileshell/notifications/notificationthumbnailer.h similarity index 100% rename from libmobileshell/declarative/notifications/notificationthumbnailer.h rename to components/mobileshell/notifications/notificationthumbnailer.h diff --git a/libmobileshell/declarative/qml/HomeScreenControls.qml b/components/mobileshell/qml/HomeScreenControls.qml similarity index 100% rename from libmobileshell/declarative/qml/HomeScreenControls.qml rename to components/mobileshell/qml/HomeScreenControls.qml diff --git a/libmobileshell/declarative/qml/Shell.qml b/components/mobileshell/qml/Shell.qml similarity index 100% rename from libmobileshell/declarative/qml/Shell.qml rename to components/mobileshell/qml/Shell.qml diff --git a/libmobileshell/declarative/qml/TaskPanelControls.qml b/components/mobileshell/qml/TaskPanelControls.qml similarity index 100% rename from libmobileshell/declarative/qml/TaskPanelControls.qml rename to components/mobileshell/qml/TaskPanelControls.qml diff --git a/libmobileshell/declarative/qml/TopPanelControls.qml b/components/mobileshell/qml/TopPanelControls.qml similarity index 100% rename from libmobileshell/declarative/qml/TopPanelControls.qml rename to components/mobileshell/qml/TopPanelControls.qml diff --git a/libmobileshell/declarative/qml/actiondrawer/ActionDrawer.qml b/components/mobileshell/qml/actiondrawer/ActionDrawer.qml similarity index 100% rename from libmobileshell/declarative/qml/actiondrawer/ActionDrawer.qml rename to components/mobileshell/qml/actiondrawer/ActionDrawer.qml diff --git a/libmobileshell/declarative/qml/actiondrawer/ActionDrawerOpenSurface.qml b/components/mobileshell/qml/actiondrawer/ActionDrawerOpenSurface.qml similarity index 100% rename from libmobileshell/declarative/qml/actiondrawer/ActionDrawerOpenSurface.qml rename to components/mobileshell/qml/actiondrawer/ActionDrawerOpenSurface.qml diff --git a/libmobileshell/declarative/qml/actiondrawer/LandscapeContentContainer.qml b/components/mobileshell/qml/actiondrawer/LandscapeContentContainer.qml similarity index 100% rename from libmobileshell/declarative/qml/actiondrawer/LandscapeContentContainer.qml rename to components/mobileshell/qml/actiondrawer/LandscapeContentContainer.qml diff --git a/libmobileshell/declarative/qml/actiondrawer/PortraitContentContainer.qml b/components/mobileshell/qml/actiondrawer/PortraitContentContainer.qml similarity index 100% rename from libmobileshell/declarative/qml/actiondrawer/PortraitContentContainer.qml rename to components/mobileshell/qml/actiondrawer/PortraitContentContainer.qml diff --git a/libmobileshell/declarative/qml/actiondrawer/quicksettings/BrightnessItem.qml b/components/mobileshell/qml/actiondrawer/quicksettings/BrightnessItem.qml similarity index 100% rename from libmobileshell/declarative/qml/actiondrawer/quicksettings/BrightnessItem.qml rename to components/mobileshell/qml/actiondrawer/quicksettings/BrightnessItem.qml diff --git a/libmobileshell/declarative/qml/actiondrawer/quicksettings/Handle.qml b/components/mobileshell/qml/actiondrawer/quicksettings/Handle.qml similarity index 100% rename from libmobileshell/declarative/qml/actiondrawer/quicksettings/Handle.qml rename to components/mobileshell/qml/actiondrawer/quicksettings/Handle.qml diff --git a/libmobileshell/declarative/qml/actiondrawer/quicksettings/QuickSettings.qml b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettings.qml similarity index 100% rename from libmobileshell/declarative/qml/actiondrawer/quicksettings/QuickSettings.qml rename to components/mobileshell/qml/actiondrawer/quicksettings/QuickSettings.qml diff --git a/libmobileshell/declarative/qml/actiondrawer/quicksettings/QuickSettingsDelegate.qml b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsDelegate.qml similarity index 100% rename from libmobileshell/declarative/qml/actiondrawer/quicksettings/QuickSettingsDelegate.qml rename to components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsDelegate.qml diff --git a/libmobileshell/declarative/qml/actiondrawer/quicksettings/QuickSettingsDrawer.qml b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsDrawer.qml similarity index 100% rename from libmobileshell/declarative/qml/actiondrawer/quicksettings/QuickSettingsDrawer.qml rename to components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsDrawer.qml diff --git a/libmobileshell/declarative/qml/actiondrawer/quicksettings/QuickSettingsFullDelegate.qml b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsFullDelegate.qml similarity index 100% rename from libmobileshell/declarative/qml/actiondrawer/quicksettings/QuickSettingsFullDelegate.qml rename to components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsFullDelegate.qml diff --git a/libmobileshell/declarative/qml/actiondrawer/quicksettings/QuickSettingsMinimizedDelegate.qml b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsMinimizedDelegate.qml similarity index 100% rename from libmobileshell/declarative/qml/actiondrawer/quicksettings/QuickSettingsMinimizedDelegate.qml rename to components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsMinimizedDelegate.qml diff --git a/libmobileshell/declarative/qml/actiondrawer/quicksettings/QuickSettingsPanel.qml b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsPanel.qml similarity index 100% rename from libmobileshell/declarative/qml/actiondrawer/quicksettings/QuickSettingsPanel.qml rename to components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsPanel.qml diff --git a/libmobileshell/declarative/qml/components/BaseItem.qml b/components/mobileshell/qml/components/BaseItem.qml similarity index 100% rename from libmobileshell/declarative/qml/components/BaseItem.qml rename to components/mobileshell/qml/components/BaseItem.qml diff --git a/libmobileshell/declarative/qml/components/Direction.qml b/components/mobileshell/qml/components/Direction.qml similarity index 100% rename from libmobileshell/declarative/qml/components/Direction.qml rename to components/mobileshell/qml/components/Direction.qml diff --git a/libmobileshell/declarative/qml/components/StartupFeedback.qml b/components/mobileshell/qml/components/StartupFeedback.qml similarity index 100% rename from libmobileshell/declarative/qml/components/StartupFeedback.qml rename to components/mobileshell/qml/components/StartupFeedback.qml diff --git a/libmobileshell/declarative/qml/components/VelocityCalculator.qml b/components/mobileshell/qml/components/VelocityCalculator.qml similarity index 100% rename from libmobileshell/declarative/qml/components/VelocityCalculator.qml rename to components/mobileshell/qml/components/VelocityCalculator.qml diff --git a/libmobileshell/declarative/qml/components/util.js b/components/mobileshell/qml/components/util.js similarity index 100% rename from libmobileshell/declarative/qml/components/util.js rename to components/mobileshell/qml/components/util.js diff --git a/libmobileshell/declarative/qml/dataproviders/BatteryProvider.qml b/components/mobileshell/qml/dataproviders/BatteryProvider.qml similarity index 100% rename from libmobileshell/declarative/qml/dataproviders/BatteryProvider.qml rename to components/mobileshell/qml/dataproviders/BatteryProvider.qml diff --git a/libmobileshell/declarative/qml/dataproviders/BluetoothProvider.qml b/components/mobileshell/qml/dataproviders/BluetoothProvider.qml similarity index 100% rename from libmobileshell/declarative/qml/dataproviders/BluetoothProvider.qml rename to components/mobileshell/qml/dataproviders/BluetoothProvider.qml diff --git a/libmobileshell/declarative/qml/dataproviders/SignalStrengthProvider.qml b/components/mobileshell/qml/dataproviders/SignalStrengthProvider.qml similarity index 100% rename from libmobileshell/declarative/qml/dataproviders/SignalStrengthProvider.qml rename to components/mobileshell/qml/dataproviders/SignalStrengthProvider.qml diff --git a/libmobileshell/declarative/qml/dataproviders/VolumeProvider.qml b/components/mobileshell/qml/dataproviders/VolumeProvider.qml similarity index 100% rename from libmobileshell/declarative/qml/dataproviders/VolumeProvider.qml rename to components/mobileshell/qml/dataproviders/VolumeProvider.qml diff --git a/libmobileshell/declarative/qml/dataproviders/WifiProvider.qml b/components/mobileshell/qml/dataproviders/WifiProvider.qml similarity index 100% rename from libmobileshell/declarative/qml/dataproviders/WifiProvider.qml rename to components/mobileshell/qml/dataproviders/WifiProvider.qml diff --git a/libmobileshell/declarative/qml/navigationpanel/NavigationGestureArea.qml b/components/mobileshell/qml/navigationpanel/NavigationGestureArea.qml similarity index 100% rename from libmobileshell/declarative/qml/navigationpanel/NavigationGestureArea.qml rename to components/mobileshell/qml/navigationpanel/NavigationGestureArea.qml diff --git a/libmobileshell/declarative/qml/navigationpanel/NavigationPanel.qml b/components/mobileshell/qml/navigationpanel/NavigationPanel.qml similarity index 100% rename from libmobileshell/declarative/qml/navigationpanel/NavigationPanel.qml rename to components/mobileshell/qml/navigationpanel/NavigationPanel.qml diff --git a/libmobileshell/declarative/qml/navigationpanel/NavigationPanelAction.qml b/components/mobileshell/qml/navigationpanel/NavigationPanelAction.qml similarity index 100% rename from libmobileshell/declarative/qml/navigationpanel/NavigationPanelAction.qml rename to components/mobileshell/qml/navigationpanel/NavigationPanelAction.qml diff --git a/libmobileshell/declarative/qml/navigationpanel/NavigationPanelButton.qml b/components/mobileshell/qml/navigationpanel/NavigationPanelButton.qml similarity index 100% rename from libmobileshell/declarative/qml/navigationpanel/NavigationPanelButton.qml rename to components/mobileshell/qml/navigationpanel/NavigationPanelButton.qml diff --git a/libmobileshell/declarative/qml/osd/volume/AudioApplet.qml b/components/mobileshell/qml/osd/volume/AudioApplet.qml similarity index 100% rename from libmobileshell/declarative/qml/osd/volume/AudioApplet.qml rename to components/mobileshell/qml/osd/volume/AudioApplet.qml diff --git a/libmobileshell/declarative/qml/osd/volume/DeviceListItem.qml b/components/mobileshell/qml/osd/volume/DeviceListItem.qml similarity index 100% rename from libmobileshell/declarative/qml/osd/volume/DeviceListItem.qml rename to components/mobileshell/qml/osd/volume/DeviceListItem.qml diff --git a/libmobileshell/declarative/qml/osd/volume/ListItemBase.qml b/components/mobileshell/qml/osd/volume/ListItemBase.qml similarity index 100% rename from libmobileshell/declarative/qml/osd/volume/ListItemBase.qml rename to components/mobileshell/qml/osd/volume/ListItemBase.qml diff --git a/libmobileshell/declarative/qml/osd/volume/PopupCard.qml b/components/mobileshell/qml/osd/volume/PopupCard.qml similarity index 100% rename from libmobileshell/declarative/qml/osd/volume/PopupCard.qml rename to components/mobileshell/qml/osd/volume/PopupCard.qml diff --git a/libmobileshell/declarative/qml/osd/volume/StreamListItem.qml b/components/mobileshell/qml/osd/volume/StreamListItem.qml similarity index 100% rename from libmobileshell/declarative/qml/osd/volume/StreamListItem.qml rename to components/mobileshell/qml/osd/volume/StreamListItem.qml diff --git a/libmobileshell/declarative/qml/osd/volume/VolumeOSD.qml b/components/mobileshell/qml/osd/volume/VolumeOSD.qml similarity index 100% rename from libmobileshell/declarative/qml/osd/volume/VolumeOSD.qml rename to components/mobileshell/qml/osd/volume/VolumeOSD.qml diff --git a/libmobileshell/declarative/qml/osd/volume/icon.js b/components/mobileshell/qml/osd/volume/icon.js similarity index 100% rename from libmobileshell/declarative/qml/osd/volume/icon.js rename to components/mobileshell/qml/osd/volume/icon.js diff --git a/libmobileshell/declarative/qml/statusbar/ClockText.qml b/components/mobileshell/qml/statusbar/ClockText.qml similarity index 100% rename from libmobileshell/declarative/qml/statusbar/ClockText.qml rename to components/mobileshell/qml/statusbar/ClockText.qml diff --git a/libmobileshell/declarative/qml/statusbar/StatusBar.qml b/components/mobileshell/qml/statusbar/StatusBar.qml similarity index 100% rename from libmobileshell/declarative/qml/statusbar/StatusBar.qml rename to components/mobileshell/qml/statusbar/StatusBar.qml diff --git a/libmobileshell/declarative/qml/statusbar/TaskWidget.qml b/components/mobileshell/qml/statusbar/TaskWidget.qml similarity index 100% rename from libmobileshell/declarative/qml/statusbar/TaskWidget.qml rename to components/mobileshell/qml/statusbar/TaskWidget.qml diff --git a/libmobileshell/declarative/qml/statusbar/indicators/BatteryIndicator.qml b/components/mobileshell/qml/statusbar/indicators/BatteryIndicator.qml similarity index 100% rename from libmobileshell/declarative/qml/statusbar/indicators/BatteryIndicator.qml rename to components/mobileshell/qml/statusbar/indicators/BatteryIndicator.qml diff --git a/libmobileshell/declarative/qml/statusbar/indicators/BluetoothIndicator.qml b/components/mobileshell/qml/statusbar/indicators/BluetoothIndicator.qml similarity index 100% rename from libmobileshell/declarative/qml/statusbar/indicators/BluetoothIndicator.qml rename to components/mobileshell/qml/statusbar/indicators/BluetoothIndicator.qml diff --git a/libmobileshell/declarative/qml/statusbar/indicators/SignalStrengthIndicator.qml b/components/mobileshell/qml/statusbar/indicators/SignalStrengthIndicator.qml similarity index 100% rename from libmobileshell/declarative/qml/statusbar/indicators/SignalStrengthIndicator.qml rename to components/mobileshell/qml/statusbar/indicators/SignalStrengthIndicator.qml diff --git a/libmobileshell/declarative/qml/statusbar/indicators/VolumeIndicator.qml b/components/mobileshell/qml/statusbar/indicators/VolumeIndicator.qml similarity index 100% rename from libmobileshell/declarative/qml/statusbar/indicators/VolumeIndicator.qml rename to components/mobileshell/qml/statusbar/indicators/VolumeIndicator.qml diff --git a/libmobileshell/declarative/qml/statusbar/indicators/WifiIndicator.qml b/components/mobileshell/qml/statusbar/indicators/WifiIndicator.qml similarity index 100% rename from libmobileshell/declarative/qml/statusbar/indicators/WifiIndicator.qml rename to components/mobileshell/qml/statusbar/indicators/WifiIndicator.qml diff --git a/libmobileshell/declarative/qml/taskswitcher/FlickContainer.qml b/components/mobileshell/qml/taskswitcher/FlickContainer.qml similarity index 100% rename from libmobileshell/declarative/qml/taskswitcher/FlickContainer.qml rename to components/mobileshell/qml/taskswitcher/FlickContainer.qml diff --git a/libmobileshell/declarative/qml/taskswitcher/Task.qml b/components/mobileshell/qml/taskswitcher/Task.qml similarity index 100% rename from libmobileshell/declarative/qml/taskswitcher/Task.qml rename to components/mobileshell/qml/taskswitcher/Task.qml diff --git a/libmobileshell/declarative/qml/taskswitcher/TaskIcon.qml b/components/mobileshell/qml/taskswitcher/TaskIcon.qml similarity index 100% rename from libmobileshell/declarative/qml/taskswitcher/TaskIcon.qml rename to components/mobileshell/qml/taskswitcher/TaskIcon.qml diff --git a/libmobileshell/declarative/qml/taskswitcher/TaskList.qml b/components/mobileshell/qml/taskswitcher/TaskList.qml similarity index 100% rename from libmobileshell/declarative/qml/taskswitcher/TaskList.qml rename to components/mobileshell/qml/taskswitcher/TaskList.qml diff --git a/libmobileshell/declarative/qml/taskswitcher/TaskSwitcher.qml b/components/mobileshell/qml/taskswitcher/TaskSwitcher.qml similarity index 100% rename from libmobileshell/declarative/qml/taskswitcher/TaskSwitcher.qml rename to components/mobileshell/qml/taskswitcher/TaskSwitcher.qml diff --git a/libmobileshell/declarative/qml/taskswitcher/TaskSwitcherState.qml b/components/mobileshell/qml/taskswitcher/TaskSwitcherState.qml similarity index 100% rename from libmobileshell/declarative/qml/taskswitcher/TaskSwitcherState.qml rename to components/mobileshell/qml/taskswitcher/TaskSwitcherState.qml diff --git a/libmobileshell/declarative/qml/taskswitcher/Thumbnail.qml b/components/mobileshell/qml/taskswitcher/Thumbnail.qml similarity index 100% rename from libmobileshell/declarative/qml/taskswitcher/Thumbnail.qml rename to components/mobileshell/qml/taskswitcher/Thumbnail.qml diff --git a/libmobileshell/declarative/qml/widgets/krunner/KRunnerWidget.qml b/components/mobileshell/qml/widgets/krunner/KRunnerWidget.qml similarity index 100% rename from libmobileshell/declarative/qml/widgets/krunner/KRunnerWidget.qml rename to components/mobileshell/qml/widgets/krunner/KRunnerWidget.qml diff --git a/libmobileshell/declarative/qml/widgets/mediacontrols/BlurredBackground.qml b/components/mobileshell/qml/widgets/mediacontrols/BlurredBackground.qml similarity index 100% rename from libmobileshell/declarative/qml/widgets/mediacontrols/BlurredBackground.qml rename to components/mobileshell/qml/widgets/mediacontrols/BlurredBackground.qml diff --git a/libmobileshell/declarative/qml/widgets/mediacontrols/MediaControlsSource.qml b/components/mobileshell/qml/widgets/mediacontrols/MediaControlsSource.qml similarity index 100% rename from libmobileshell/declarative/qml/widgets/mediacontrols/MediaControlsSource.qml rename to components/mobileshell/qml/widgets/mediacontrols/MediaControlsSource.qml diff --git a/libmobileshell/declarative/qml/widgets/mediacontrols/MediaControlsWidget.qml b/components/mobileshell/qml/widgets/mediacontrols/MediaControlsWidget.qml similarity index 100% rename from libmobileshell/declarative/qml/widgets/mediacontrols/MediaControlsWidget.qml rename to components/mobileshell/qml/widgets/mediacontrols/MediaControlsWidget.qml diff --git a/libmobileshell/declarative/qml/widgets/notifications/BaseNotificationItem.qml b/components/mobileshell/qml/widgets/notifications/BaseNotificationItem.qml similarity index 100% rename from libmobileshell/declarative/qml/widgets/notifications/BaseNotificationItem.qml rename to components/mobileshell/qml/widgets/notifications/BaseNotificationItem.qml diff --git a/libmobileshell/declarative/qml/widgets/notifications/NotificationBodyLabel.qml b/components/mobileshell/qml/widgets/notifications/NotificationBodyLabel.qml similarity index 100% rename from libmobileshell/declarative/qml/widgets/notifications/NotificationBodyLabel.qml rename to components/mobileshell/qml/widgets/notifications/NotificationBodyLabel.qml diff --git a/libmobileshell/declarative/qml/widgets/notifications/NotificationCard.qml b/components/mobileshell/qml/widgets/notifications/NotificationCard.qml similarity index 100% rename from libmobileshell/declarative/qml/widgets/notifications/NotificationCard.qml rename to components/mobileshell/qml/widgets/notifications/NotificationCard.qml diff --git a/libmobileshell/declarative/qml/widgets/notifications/NotificationFooterActions.qml b/components/mobileshell/qml/widgets/notifications/NotificationFooterActions.qml similarity index 100% rename from libmobileshell/declarative/qml/widgets/notifications/NotificationFooterActions.qml rename to components/mobileshell/qml/widgets/notifications/NotificationFooterActions.qml diff --git a/libmobileshell/declarative/qml/widgets/notifications/NotificationGroupHeader.qml b/components/mobileshell/qml/widgets/notifications/NotificationGroupHeader.qml similarity index 100% rename from libmobileshell/declarative/qml/widgets/notifications/NotificationGroupHeader.qml rename to components/mobileshell/qml/widgets/notifications/NotificationGroupHeader.qml diff --git a/libmobileshell/declarative/qml/widgets/notifications/NotificationItem.qml b/components/mobileshell/qml/widgets/notifications/NotificationItem.qml similarity index 100% rename from libmobileshell/declarative/qml/widgets/notifications/NotificationItem.qml rename to components/mobileshell/qml/widgets/notifications/NotificationItem.qml diff --git a/libmobileshell/declarative/qml/widgets/notifications/NotificationReplyField.qml b/components/mobileshell/qml/widgets/notifications/NotificationReplyField.qml similarity index 100% rename from libmobileshell/declarative/qml/widgets/notifications/NotificationReplyField.qml rename to components/mobileshell/qml/widgets/notifications/NotificationReplyField.qml diff --git a/libmobileshell/declarative/qml/widgets/notifications/NotificationTimeText.qml b/components/mobileshell/qml/widgets/notifications/NotificationTimeText.qml similarity index 100% rename from libmobileshell/declarative/qml/widgets/notifications/NotificationTimeText.qml rename to components/mobileshell/qml/widgets/notifications/NotificationTimeText.qml diff --git a/libmobileshell/declarative/qml/widgets/notifications/NotificationsModelType.qml b/components/mobileshell/qml/widgets/notifications/NotificationsModelType.qml similarity index 100% rename from libmobileshell/declarative/qml/widgets/notifications/NotificationsModelType.qml rename to components/mobileshell/qml/widgets/notifications/NotificationsModelType.qml diff --git a/libmobileshell/declarative/qml/widgets/notifications/NotificationsWidget.qml b/components/mobileshell/qml/widgets/notifications/NotificationsWidget.qml similarity index 100% rename from libmobileshell/declarative/qml/widgets/notifications/NotificationsWidget.qml rename to components/mobileshell/qml/widgets/notifications/NotificationsWidget.qml diff --git a/libmobileshell/declarative/qml/widgets/notifications/ThumbnailStrip.qml b/components/mobileshell/qml/widgets/notifications/ThumbnailStrip.qml similarity index 100% rename from libmobileshell/declarative/qml/widgets/notifications/ThumbnailStrip.qml rename to components/mobileshell/qml/widgets/notifications/ThumbnailStrip.qml diff --git a/libmobileshell/declarative/qml/widgets/notifications/util.js b/components/mobileshell/qml/widgets/notifications/util.js similarity index 100% rename from libmobileshell/declarative/qml/widgets/notifications/util.js rename to components/mobileshell/qml/widgets/notifications/util.js diff --git a/libmobileshell/declarative/qmldir b/components/mobileshell/qmldir similarity index 100% rename from libmobileshell/declarative/qmldir rename to components/mobileshell/qmldir diff --git a/libmobileshell/quicksetting.cpp b/components/mobileshell/quicksetting.cpp similarity index 97% rename from libmobileshell/quicksetting.cpp rename to components/mobileshell/quicksetting.cpp index de5cd341..4a8f125f 100644 --- a/libmobileshell/quicksetting.cpp +++ b/components/mobileshell/quicksetting.cpp @@ -6,8 +6,6 @@ #include "quicksetting.h" -using namespace MobileShell; - QuickSetting::QuickSetting(QObject *parent) : QObject(parent) { diff --git a/libmobileshell/quicksetting.h b/components/mobileshell/quicksetting.h similarity index 93% rename from libmobileshell/quicksetting.h rename to components/mobileshell/quicksetting.h index d7645f67..c29e9e4b 100644 --- a/libmobileshell/quicksetting.h +++ b/components/mobileshell/quicksetting.h @@ -10,12 +10,7 @@ #include #include -#include "mobileshell_export.h" - -namespace MobileShell -{ - -class MOBILESHELL_EXPORT QuickSetting : public QObject +class QuickSetting : public QObject { Q_OBJECT Q_PROPERTY(QString text READ text WRITE setText REQUIRED NOTIFY textChanged) @@ -72,5 +67,3 @@ private: QString m_settingsCommand; QList m_children; }; - -} // namespace MobileShell diff --git a/libmobileshell/quicksettingsmodel.cpp b/components/mobileshell/quicksettingsmodel.cpp similarity index 98% rename from libmobileshell/quicksettingsmodel.cpp rename to components/mobileshell/quicksettingsmodel.cpp index 889ca393..262a7183 100644 --- a/libmobileshell/quicksettingsmodel.cpp +++ b/components/mobileshell/quicksettingsmodel.cpp @@ -13,8 +13,6 @@ #include #include -using namespace MobileShell; - QuickSettingsModel::QuickSettingsModel(QObject *parent) : QAbstractListModel{parent} , m_savedQuickSettings{new SavedQuickSettings{this}} diff --git a/libmobileshell/quicksettingsmodel.h b/components/mobileshell/quicksettingsmodel.h similarity index 83% rename from libmobileshell/quicksettingsmodel.h rename to components/mobileshell/quicksettingsmodel.h index c1223805..b6924546 100644 --- a/libmobileshell/quicksettingsmodel.h +++ b/components/mobileshell/quicksettingsmodel.h @@ -15,12 +15,7 @@ #include #include -#include "mobileshell_export.h" - -namespace MobileShell -{ - -class MOBILESHELL_EXPORT QuickSettingsModel : public QAbstractListModel, public QQmlParserStatus +class QuickSettingsModel : public QAbstractListModel, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) @@ -35,6 +30,7 @@ public: void classBegin() override; void componentComplete() override; + private: void loadQuickSettings(); @@ -42,5 +38,3 @@ private: QList m_quickSettings; SavedQuickSettings *m_savedQuickSettings; }; - -} // namespace MobileShell diff --git a/libmobileshell/declarative/resources.qrc b/components/mobileshell/resources.qrc similarity index 100% rename from libmobileshell/declarative/resources.qrc rename to components/mobileshell/resources.qrc diff --git a/libmobileshell/savedquicksettings.cpp b/components/mobileshell/savedquicksettings.cpp similarity index 99% rename from libmobileshell/savedquicksettings.cpp rename to components/mobileshell/savedquicksettings.cpp index d09dff7a..ad021eb3 100644 --- a/libmobileshell/savedquicksettings.cpp +++ b/components/mobileshell/savedquicksettings.cpp @@ -7,8 +7,6 @@ #include -using namespace MobileShell; - SavedQuickSettings::SavedQuickSettings(QObject *parent) : QObject{parent} , m_settings{new MobileShellSettings{this}} diff --git a/libmobileshell/savedquicksettings.h b/components/mobileshell/savedquicksettings.h similarity index 89% rename from libmobileshell/savedquicksettings.h rename to components/mobileshell/savedquicksettings.h index 80afc1e9..2590f594 100644 --- a/libmobileshell/savedquicksettings.h +++ b/components/mobileshell/savedquicksettings.h @@ -15,17 +15,13 @@ #include #include -#include "mobileshell_export.h" - -namespace MobileShell -{ /** * @short A model that reads quick settings configurations * from the config and presents models to display them. * * @author Devin Lin **/ -class MOBILESHELL_EXPORT SavedQuickSettings : public QObject +class SavedQuickSettings : public QObject { Q_OBJECT Q_PROPERTY(SavedQuickSettingsModel *enabledModel READ enabledQuickSettingsModel CONSTANT) @@ -51,5 +47,3 @@ private: QTimer *m_updateTimer; }; - -} // namespace MobileShell diff --git a/libmobileshell/savedquicksettingsmodel.cpp b/components/mobileshell/savedquicksettingsmodel.cpp similarity index 98% rename from libmobileshell/savedquicksettingsmodel.cpp rename to components/mobileshell/savedquicksettingsmodel.cpp index 807b89ae..acd1645c 100644 --- a/libmobileshell/savedquicksettingsmodel.cpp +++ b/components/mobileshell/savedquicksettingsmodel.cpp @@ -3,8 +3,6 @@ #include "savedquicksettingsmodel.h" -using namespace MobileShell; - SavedQuickSettingsModel::SavedQuickSettingsModel(QObject *parent) : QAbstractListModel{parent} { diff --git a/libmobileshell/savedquicksettingsmodel.h b/components/mobileshell/savedquicksettingsmodel.h similarity index 88% rename from libmobileshell/savedquicksettingsmodel.h rename to components/mobileshell/savedquicksettingsmodel.h index f8a433ec..775e0b5d 100644 --- a/libmobileshell/savedquicksettingsmodel.h +++ b/components/mobileshell/savedquicksettingsmodel.h @@ -12,16 +12,12 @@ #include #include -#include "mobileshell_export.h" - -namespace MobileShell -{ /** * @short A list model for serving quick settings metadata. * * @author Devin Lin **/ -class MOBILESHELL_EXPORT SavedQuickSettingsModel : public QAbstractListModel +class SavedQuickSettingsModel : public QAbstractListModel { Q_OBJECT @@ -53,5 +49,3 @@ Q_SIGNALS: private: QList m_data; }; - -} // namespace MobileShell diff --git a/libmobileshell/declarative/shellutil.cpp b/components/mobileshell/shellutil.cpp similarity index 98% rename from libmobileshell/declarative/shellutil.cpp rename to components/mobileshell/shellutil.cpp index 745c66c7..aa41f75c 100644 --- a/libmobileshell/declarative/shellutil.cpp +++ b/components/mobileshell/shellutil.cpp @@ -29,8 +29,6 @@ #define FORMAT24H "HH:mm:ss" -using namespace MobileShell; - ShellUtil::ShellUtil(QObject *parent) : QObject{parent} { diff --git a/libmobileshell/declarative/shellutil.h b/components/mobileshell/shellutil.h similarity index 85% rename from libmobileshell/declarative/shellutil.h rename to components/mobileshell/shellutil.h index bb22d37a..6b1d3093 100644 --- a/libmobileshell/declarative/shellutil.h +++ b/components/mobileshell/shellutil.h @@ -12,12 +12,7 @@ #include #include -#include "mobileshell_export.h" - -namespace MobileShell -{ - -class MOBILESHELL_EXPORT ShellUtil : public QObject +class ShellUtil : public QObject { Q_OBJECT Q_PROPERTY(bool isSystem24HourFormat READ isSystem24HourFormat NOTIFY isSystem24HourFormatChanged); @@ -40,5 +35,3 @@ private: KConfigWatcher::Ptr m_localeConfigWatcher; KSharedConfig::Ptr m_localeConfig; }; - -} // namespace MobileShell diff --git a/libmobileshell/declarative/taskswitcher/displaysmodel.cpp b/components/mobileshell/taskswitcher/displaysmodel.cpp similarity index 98% rename from libmobileshell/declarative/taskswitcher/displaysmodel.cpp rename to components/mobileshell/taskswitcher/displaysmodel.cpp index d7ec489f..223f089a 100644 --- a/libmobileshell/declarative/taskswitcher/displaysmodel.cpp +++ b/components/mobileshell/taskswitcher/displaysmodel.cpp @@ -9,8 +9,6 @@ #include -using namespace MobileShell; - DisplaysModel::DisplaysModel(QObject *parent) : QAbstractListModel(parent) { diff --git a/libmobileshell/declarative/taskswitcher/displaysmodel.h b/components/mobileshell/taskswitcher/displaysmodel.h similarity index 88% rename from libmobileshell/declarative/taskswitcher/displaysmodel.h rename to components/mobileshell/taskswitcher/displaysmodel.h index 56de3924..ea8f1bad 100644 --- a/libmobileshell/declarative/taskswitcher/displaysmodel.h +++ b/components/mobileshell/taskswitcher/displaysmodel.h @@ -17,12 +17,7 @@ #include #include -#include "mobileshell_export.h" - -namespace MobileShell -{ - -class MOBILESHELL_EXPORT DisplaysModel : public QAbstractListModel +class DisplaysModel : public QAbstractListModel { public: enum Roles { @@ -47,5 +42,3 @@ private: QVector m_outputs; }; - -} // namespace MobileShell diff --git a/libmobileshell/CMakeLists.txt b/libmobileshell/CMakeLists.txt deleted file mode 100644 index 81b7c97d..00000000 --- a/libmobileshell/CMakeLists.txt +++ /dev/null @@ -1,62 +0,0 @@ -# SPDX-FileCopyrightText: 2022 Devin Lin -# SPDX-License-Identifier: GPL-2.0-or-later - -add_subdirectory(declarative) - -if (BUILD_TESTING) - add_subdirectory(autotests) -endif() - -set(mobileshell_LIB_SRCS - mobileshellsettings.cpp - - quicksetting.cpp - quicksettingsmodel.cpp - savedquicksettingsmodel.cpp - savedquicksettings.cpp -) - -add_library(mobileshell ${mobileshell_LIB_SRCS}) -add_library(PM::LibMobileShell ALIAS mobileshell) - -generate_export_header(mobileshell) - -target_include_directories(mobileshell PUBLIC "$" "$") -target_link_libraries(mobileshell - PUBLIC - Qt::Core - PRIVATE - Qt::DBus - Qt::Qml - Qt::Gui - Qt::Quick - KF5::ConfigWidgets # for KStandardAction - KF5::KIOGui - KF5::Plasma - KF5::I18n - KF5::Notifications - KF5::PlasmaQuick - KF5::KIOGui - KF5::KIOWidgets # for PreviewJob - KF5::WaylandClient - KF5::Service -) - -set_target_properties(mobileshell PROPERTIES - VERSION ${PROJECT_VERSION} - SOVERSION 1 - EXPORT_NAME LibMobileShell) - -install(TARGETS mobileshell EXPORT mobileshellLibraryTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} ) - -install(FILES - mobileshellsettings.h - - quicksetting.h - quicksettingsmodel.h - savedquicksettingsmodel.h - savedquicksettings.h - - ${CMAKE_CURRENT_BINARY_DIR}/mobileshell_export.h - DESTINATION ${KDE_INSTALL_INCLUDEDIR}/mobileshell COMPONENT Devel -) diff --git a/libmobileshell/autotests/CMakeLists.txt b/libmobileshell/autotests/CMakeLists.txt deleted file mode 100644 index 536f3217..00000000 --- a/libmobileshell/autotests/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -# SPDX-FileCopyrightText: 2022 Devin Lin -# SPDX-License-Identifier: GPL-2.0-or-later - -include(ECMAddTests) - -find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test) - -include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../src") -include_directories("${CMAKE_CURRENT_BINARY_DIR}/../src") - -#ecm_add_tests( - #LINK_LIBRARIES KF5::KWeatherCore Qt${QT_MAJOR_VERSION}::Test -#)