From 8f732c330fd69ece5d69c9685950da5d2bd48e52 Mon Sep 17 00:00:00 2001
From: Devin Lin <espidev@gmail.com>
Date: Mon, 3 Jan 2022 00:36:58 -0500
Subject: [PATCH] actiondrawer: Fix widget references

---
 .../qml/actiondrawer/LandscapeContentContainer.qml            | 3 +--
 .../mobileshell/qml/actiondrawer/PortraitContentContainer.qml | 4 ++--
 .../qml/actiondrawer/quicksettings/QuickSettingsDrawer.qml    | 3 +--
 .../qml/actiondrawer/quicksettings/QuickSettingsPanel.qml     | 3 +--
 .../qml/widgets/mediacontrols/MediaControlsWidget.qml         | 2 +-
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/components/mobileshell/qml/actiondrawer/LandscapeContentContainer.qml b/components/mobileshell/qml/actiondrawer/LandscapeContentContainer.qml
index 9cb7542c..72b08876 100644
--- a/components/mobileshell/qml/actiondrawer/LandscapeContentContainer.qml
+++ b/components/mobileshell/qml/actiondrawer/LandscapeContentContainer.qml
@@ -16,7 +16,6 @@ import org.kde.plasma.components 3.0 as PlasmaComponents
 import org.kde.plasma.private.mobileshell 1.0 as MobileShell
 
 import "../components" as Components
-import "../widgets" as Widgets
 import "quicksettings"
 
 /**
@@ -93,7 +92,7 @@ PlasmaCore.ColorScope {
             font.weight: Font.Light
         }
         
-        Widgets.NotificationsWidget {
+        MobileShell.NotificationsWidget {
             id: notificationWidget
             // don't allow notifications widget to get too wide
             Layout.maximumWidth: PlasmaCore.Units.gridUnit * 25
diff --git a/components/mobileshell/qml/actiondrawer/PortraitContentContainer.qml b/components/mobileshell/qml/actiondrawer/PortraitContentContainer.qml
index 7180798e..c22bca87 100644
--- a/components/mobileshell/qml/actiondrawer/PortraitContentContainer.qml
+++ b/components/mobileshell/qml/actiondrawer/PortraitContentContainer.qml
@@ -11,9 +11,9 @@ import QtQuick.Window 2.2
 
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 3.0 as PlasmaComponents
+import org.kde.plasma.private.mobileshell 1.0 as MobileShell
 
 import "../components" as Components
-import "../widgets" as Widgets
 import "quicksettings"
 
 /**
@@ -76,7 +76,7 @@ PlasmaCore.ColorScope {
         }
     }
     
-    Widgets.NotificationsWidget {
+    MobileShell.NotificationsWidget {
         id: notificationWidget
         anchors {
             top: quickSettings.top
diff --git a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsDrawer.qml b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsDrawer.qml
index 629462e5..3957067a 100644
--- a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsDrawer.qml
+++ b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsDrawer.qml
@@ -17,7 +17,6 @@ import org.kde.plasma.private.mobileshell 1.0 as MobileShell
 
 import "../../statusbar" as StatusBar
 import "../../components" as Components
-import "../../widgets" as Widgets
 import "../"
 
 /**
@@ -101,7 +100,7 @@ Components.BaseItem {
                 width: parent.width
             }
             
-            Widgets.MediaControlsWidget {
+            MobileShell.MediaControlsWidget {
                 id: mediaWidget
                 property real fullHeight: height + Layout.topMargin
                 Layout.fillWidth: true
diff --git a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsPanel.qml b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsPanel.qml
index b4ec8125..0ecd850f 100644
--- a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsPanel.qml
+++ b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsPanel.qml
@@ -18,7 +18,6 @@ import org.kde.plasma.private.mobileshell 1.0 as MobileShell
 
 import "../../statusbar" as StatusBar
 import "../../components" as Components
-import "../../widgets" as Widgets
 import "../"
 
 /**
@@ -104,7 +103,7 @@ Components.BaseItem {
             Item { Layout.fillHeight: true }
         }
         
-        Widgets.MediaControlsWidget {
+        MobileShell.MediaControlsWidget {
             id: mediaWidget
             property real fullHeight: visible ? height + PlasmaCore.Units.smallSpacing * 6 : 0
             anchors.left: parent.left
diff --git a/components/mobileshell/qml/widgets/mediacontrols/MediaControlsWidget.qml b/components/mobileshell/qml/widgets/mediacontrols/MediaControlsWidget.qml
index ded27c73..9b734c72 100644
--- a/components/mobileshell/qml/widgets/mediacontrols/MediaControlsWidget.qml
+++ b/components/mobileshell/qml/widgets/mediacontrols/MediaControlsWidget.qml
@@ -15,7 +15,7 @@ import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 3.0 as PlasmaComponents3
 import org.kde.plasma.extras 2.0 as PlasmaExtras
 
-import "../components" as Components
+import "../../components" as Components
 
 Components.BaseItem {
     id: root