refactor(framework): update module consumers

.github/workflows/build.yml

@@ -28,7 +28,7 @@ jobs:
         with:
           repository: cutefishos/cutefish-framework
           ref: main
-          path: libcutefish
+          path: cutefish-framework
 
       - name: Install the basic dev packages
         run: |

CMakeLists.txt

@@ -23,8 +23,8 @@ find_package(KF6NetworkManagerQt REQUIRED)
 find_package(KF6ModemManagerQt REQUIRED)
 find_package(KF6Config)
 
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../libcutefish/applications
-                 ${CMAKE_CURRENT_BINARY_DIR}/cutefishapplications-build)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../cutefish-framework/applications
+                 ${CMAKE_CURRENT_BINARY_DIR}/cutefish-framework-applications-build)
 
 pkg_search_module(FontConfig REQUIRED fontconfig IMPORTED_TARGET)
 pkg_search_module(ICU REQUIRED icu-i18n)
@@ -75,7 +75,7 @@ set_source_files_properties(${DBUS_SOURCES} PROPERTIES SKIP_AUTOGEN ON)
 
 add_executable(${PROJECT_NAME} ${DBUS_SOURCES} ${SRCS} ${RESOURCES})
 target_link_libraries(${PROJECT_NAME}
-        cutefishapplications
+        Cutefish::Applications
         Qt6::Core
         Qt6::Widgets
         Qt6::Quick

src/qml/Bluetooth/Main.qml

@@ -22,38 +22,38 @@ import QtQuick.Controls 2.4
 import QtQuick.Layouts 1.3
 import Cutefish.Settings 1.0
 import FishUI 1.0 as FishUI
-import Cutefish.Bluez 1.0 as Bluez
+import Cutefish.Bluetooth 1.0 as Bluetooth
 import "../"
 
 ItemPage {
     id: control
     headerTitle: qsTr("Bluetooth")
 
-    property bool bluetoothDisConnected: Bluez.Manager.bluetoothBlocked
+    property bool bluetoothDisConnected: Bluetooth.Manager.bluetoothBlocked
 
     onBluetoothDisConnectedChanged: {
         bluetoothSwitch.checked = !bluetoothDisConnected
     }
 
     function setBluetoothEnabled(enabled) {
-        Bluez.Manager.bluetoothBlocked = !enabled
+        Bluetooth.Manager.bluetoothBlocked = !enabled
 
-        for (var i = 0; i < Bluez.Manager.adapters.length; ++i) {
-            var adapter = Bluez.Manager.adapters[i]
+        for (var i = 0; i < Bluetooth.Manager.adapters.length; ++i) {
+            var adapter = Bluetooth.Manager.adapters[i]
             adapter.powered = enabled
         }
     }
 
-    Bluez.DevicesProxyModel {
+    Bluetooth.DevicesProxyModel {
         id: devicesProxyModel
         sourceModel: devicesModel
     }
 
-    Bluez.DevicesModel {
+    Bluetooth.DevicesModel {
         id: devicesModel
     }
 
-    Bluez.BluetoothManager {
+    Bluetooth.BluetoothManager {
         id: bluetoothMgr
 
         onShowPairDialog: {
@@ -102,7 +102,7 @@ ItemPage {
                         id: bluetoothSwitch
                         Layout.fillHeight: true
                         rightPadding: 0
-                        checked: !Bluez.Manager.bluetoothBlocked
+                        checked: !Bluetooth.Manager.bluetoothBlocked
                         onCheckedChanged: setBluetoothEnabled(checked)
                     }
                 }
@@ -123,7 +123,7 @@ ItemPage {
                         return totalHeight
                     }
 
-                    model: Bluez.Manager.bluetoothOperational ? devicesProxyModel : []
+                    model: Bluetooth.Manager.bluetoothOperational ? devicesProxyModel : []
 
                     section.property: "Section"
                     section.criteria: ViewSection.FullString

src/qml/Hotspot/Main.qml

@@ -23,7 +23,7 @@ import QtQuick.Layouts 1.3
 import Qt5Compat.GraphicalEffects
 
 import FishUI 1.0 as FishUI
-import Cutefish.NetworkManagement 1.0 as NM
+import Cutefish.Network 1.0 as NM
 
 import "../"
 

src/qml/SideBar.qml

@@ -23,7 +23,7 @@ import QtQuick.Layouts 1.3
 import Qt5Compat.GraphicalEffects
 import FishUI 1.0 as FishUI
 import Cutefish.Settings 1.0
-import Cutefish.NetworkManagement 1.0 as NM
+import Cutefish.Network 1.0 as NM
 
 Item {
     implicitWidth: 230

src/qml/WLAN/ConnectDialog.qml

@@ -21,7 +21,7 @@ import QtQuick 2.15
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
 import FishUI 1.0 as FishUI
-import Cutefish.NetworkManagement 1.0 as NM
+import Cutefish.Network 1.0 as NM
 
 FishUI.Window {
     id: control

src/qml/WLAN/Main.qml

@@ -23,7 +23,7 @@ import QtQuick.Layouts 1.3
 import Qt5Compat.GraphicalEffects
 
 import FishUI 1.0 as FishUI
-import Cutefish.NetworkManagement 1.0 as NM
+import Cutefish.Network 1.0 as NM
 
 import "../"
 

src/qml/WLAN/NewNetworkDialog.qml

@@ -23,7 +23,7 @@ import QtQuick.Layouts 1.3
 import Qt5Compat.GraphicalEffects
 
 import FishUI 1.0 as FishUI
-import Cutefish.NetworkManagement 1.0 as NM
+import Cutefish.Network 1.0 as NM
 
 FishUI.Window {
     id: control

src/qml/WLAN/WifiItem.qml

@@ -24,7 +24,7 @@ import Qt5Compat.GraphicalEffects
 import QtQuick.Window 2.3
 
 import FishUI 1.0 as FishUI
-import Cutefish.NetworkManagement 1.0 as NM
+import Cutefish.Network 1.0 as NM
 import "../"
 
 Item {

src/qml/WLAN/WifiView.qml

@@ -23,7 +23,7 @@ import QtQuick.Layouts 1.12
 import "../"
 
 import FishUI 1.0 as FishUI
-import Cutefish.NetworkManagement 1.0 as NM
+import Cutefish.Network 1.0 as NM
 
 ColumnLayout {
     id: _contentLayout

src/qml/WLAN/WirelessDetailsDialog.qml

@@ -22,7 +22,7 @@ import QtQuick.Window 2.3
 import QtQuick.Controls 2.4
 import QtQuick.Layouts 1.3
 import FishUI 1.0 as FishUI
-import Cutefish.NetworkManagement 1.0 as NM
+import Cutefish.Network 1.0 as NM
 
 Dialog {
     id: control

src/qml/Wired/Main.qml

@@ -23,7 +23,7 @@ import QtQuick.Layouts 1.3
 import Qt5Compat.GraphicalEffects
 
 import FishUI 1.0 as FishUI
-import Cutefish.NetworkManagement 1.0 as NM
+import Cutefish.Network 1.0 as NM
 
 import "../"
 

src/qml/Wired/WiredItem.qml

@@ -23,7 +23,7 @@ import QtQuick.Layouts 1.3
 import Qt5Compat.GraphicalEffects
 
 import FishUI 1.0 as FishUI
-import Cutefish.NetworkManagement 1.0 as NM
+import Cutefish.Network 1.0 as NM
 
 Item {
     id: control