fix run

MerginMaps · Mar 1, 2024 · 3536c9b · 3536c9b · inputapp-bot · Mar 1, 2024
1 parent fc2c332
commit 3536c9b
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 14 deletions.
diff --git a/app/qml/components/MMMenuDrawer.qml b/app/qml/components/MMMenuDrawer.qml
@@ -10,6 +10,7 @@
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Controls.Basic
+
 import "."
 
 Drawer {
@@ -50,7 +51,7 @@ Drawer {
       rightPadding:__style.pageMargins
       bottomPadding: __style.pageMargins
 
-      MMHeader {
+      MMPageHeader {
         id: header
         backVisible: false
         width: parent.width

diff --git a/app/qml/form/MMForm.qml b/app/qml/form/MMForm.qml
@@ -14,7 +14,7 @@ import QtQuick.Layouts
 import QtQuick.Dialogs
 
 import mm 1.0 as MM
-import qgs 0.1 as QGS
+import qgs 1.0 as QGS
 
 import "../components"
 import "./components"

diff --git a/app/qml/gps/MMAddPositionProviderDrawer.qml b/app/qml/gps/MMAddPositionProviderDrawer.qml
@@ -11,6 +11,8 @@ import QtCore
 import QtQuick
 import QtQuick.Controls
 
+import mm 1.0 as MM
+
 import "../components"
 
 Drawer {
@@ -134,7 +136,7 @@ Drawer {
 
       spacing: __style.margin12
 
-      model: BluetoothDiscoveryModel {
+      model: MM.BluetoothDiscoveryModel {
         id: btModel
         discovering: false
 

diff --git a/app/qml/gps/MMStakeoutPanel.qml b/app/qml/gps/MMStakeoutPanel.qml
@@ -13,13 +13,13 @@ import QtQuick.Controls
 import Qt5Compat.GraphicalEffects
 import QtQuick.Shapes
 
+import mm 1.0 as MM
+
 import "../components"
 import "../map"
 import "."
 import ".."
 
-import mm 1.0 as MM
-
 Drawer {
   id: root
 
@@ -278,11 +278,11 @@ Drawer {
             Item {
               id: positionIndicatorItem
 
-              PositionDirection {
+              MM.PositionDirection {
                 id: positionDirection
 
                 positionKit: __positionKit
-                compass: Compass { id: ccompass }
+                compass: MM.Compass { id: ccompass }
               }
 
               MM.MapPosition {

diff --git a/app/qml/map/MapWrapper.qml b/app/qml/map/MapWrapper.qml
@@ -35,7 +35,7 @@ Item {
   property bool isTrackingPosition: trackingManager?.isTrackingPosition ?? false
   property bool isStreaming: recordingToolsLoader.active ? recordingToolsLoader.item.recordingMapTool.recordingType = RecordingMapTool.StreamMode : false
 
-  property PositionTrackingManager trackingManager: tracking.item?.manager ?? null
+  property MM.PositionTrackingManager trackingManager: tracking.item?.manager ?? null
 
   signal featureIdentified( var pair )
   signal featuresIdentified( var pairs )

diff --git a/app/qml/onboarding/MMAcceptInvitation.qml b/app/qml/onboarding/MMAcceptInvitation.qml
@@ -10,13 +10,15 @@ import QtQuick
 import QtQuick.Layouts
 import QtQuick.Controls
 
+import mm 1.0 as MM
+
 import "../components"
 import "../inputs"
 
 Page {
   id: root
 
-  required property MerginInvitation invitation
+  required property MM.MerginInvitation invitation
 
   property bool haveBack: false
   property bool showCreate: true

diff --git a/app/qml/onboarding/MMAcceptInvitationController.qml b/app/qml/onboarding/MMAcceptInvitationController.qml
@@ -9,6 +9,8 @@
 import QtQuick
 import QtQuick.Controls
 
+import mm 1.0 as MM
+
 /**
  * Show accept invitation page directly without onboarding
  * e.g. on app start
@@ -19,7 +21,7 @@ Item {
   required property bool enabled
   required property var stackView
 
-  property MerginInvitation invitation
+  property MM.MerginInvitation invitation
 
   Connections {
     id: openInvitationsListener

diff --git a/app/qml/onboarding/MMOnboardingController.qml b/app/qml/onboarding/MMOnboardingController.qml
@@ -9,14 +9,16 @@
 import QtQuick
 import QtQuick.Controls
 
+import mm 1.0 as MM
+
 Item {
   id: controller
 
   required property bool enabled
   required property var stackView
 
   property bool inProgress: false
-  property MerginInvitation invitation
+  property MM.MerginInvitation invitation
 
   QtObject {
     //! Data to send to postRegister endpoint

diff --git a/app/qml/project/MMProjectWizardPage.qml b/app/qml/project/MMProjectWizardPage.qml
@@ -13,6 +13,7 @@ import QtQuick.Layouts
 import Qt5Compat.GraphicalEffects
 import QtQuick.Dialogs
 
+import mm 1.0 as MM
 import notificationType 1.0
 
 import "."

diff --git a/app/qml/settings/MMSettingsController.qml b/app/qml/settings/MMSettingsController.qml
@@ -11,6 +11,8 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 
+import mm 1.0 as MM
+
 import "../components"
 import "../misc"
 import "../gps"
@@ -85,7 +87,7 @@ Item {
       id: changelogPanel
       onClose: stackview.pop(null)
       Component.onCompleted: forceActiveFocus()
-      model: ChangelogModel {
+      model: MM.ChangelogModel {
         onErrorMsgChanged: function(msg) {
           changelogPanel.errorDialog.text = msg
           changelogPanel.errorDialog.open()

diff --git a/app/qml/settings/MMSettingsPanel.qml b/app/qml/settings/MMSettingsPanel.qml
@@ -11,6 +11,8 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 
+import mm 1.0 as MM
+
 import "."
 import "../components"
 import "../misc"
@@ -143,11 +145,11 @@ Page {
         selected: [__appSettings.intervalType]
         model: ListModel {
           ListElement {
-            value: StreamingIntervalType.Time
+            value: MM.StreamingIntervalType.Time
             text: qsTr("Time elapsed")
           }
           ListElement {
-            value: StreamingIntervalType.Distance
+            value: MM.StreamingIntervalType.Distance
             text: qsTr("Distance traveled")
           }
         }