From 8afa0c35052492546cb899b39094c4d303e20de3 Mon Sep 17 00:00:00 2001
From: Raine Makelainen <raine.makelainen@jolla.com>
Date: Wed, 19 Sep 2018 15:16:53 +0300
Subject: [PATCH] Change objectPath internals to devicePath based

---
 src/partitionmanager.cpp | 9 +++++----
 src/partitionmanager_p.h | 2 +-
 src/partitionmodel.cpp   | 7 +------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/partitionmanager.cpp b/src/partitionmanager.cpp
index 125f47e..f557d5c 100644
--- a/src/partitionmanager.cpp
+++ b/src/partitionmanager.cpp
@@ -327,12 +327,13 @@ void PartitionManagerPrivate::format(const QString &devicePath, const QString &t
     }
 }
 
-QString PartitionManagerPrivate::objectPath(const Partition &partition) const
+QString PartitionManagerPrivate::objectPath(const QString &devicePath) const
 {
-    if (externalMedia.match(partition.deviceName()).hasMatch()) {
-        return m_udisksMonitor->instance()->objectPath(partition.devicePath());
+    QString deviceName = devicePath.section(QChar('/'), 2);
+    if (externalMedia.match(deviceName).hasMatch()) {
+        return m_udisksMonitor->instance()->objectPath(devicePath);
     } else {
-        qCWarning(lcMemoryCardLog) << "Object path existing only for external memory cards:" << partition.devicePath();
+        qCWarning(lcMemoryCardLog) << "Object path existing only for external memory cards:" << devicePath;
         return QString();
     }
 }
diff --git a/src/partitionmanager_p.h b/src/partitionmanager_p.h
index d4acfc1..1553a74 100644
--- a/src/partitionmanager_p.h
+++ b/src/partitionmanager_p.h
@@ -72,7 +72,7 @@ class PartitionManagerPrivate : public QObject, public QSharedData
     void unmount(const Partition &partition);
     void format(const QString &devicePath, const QString &type, const QString &label, const QString &passphrase);
 
-    QString objectPath(const Partition &partition) const;
+    QString objectPath(const QString &devicePath) const;
 
     QStringList supportedFileSystems() const;
 
diff --git a/src/partitionmodel.cpp b/src/partitionmodel.cpp
index d2e5cb0..95d4d6a 100644
--- a/src/partitionmodel.cpp
+++ b/src/partitionmodel.cpp
@@ -168,12 +168,7 @@ void PartitionModel::format(const QString &devicePath, const QString &type, cons
 QString PartitionModel::objectPath(const QString &devicePath) const
 {
     qCInfo(lcMemoryCardLog) << Q_FUNC_INFO << devicePath;
-    if (const Partition *partition = getPartition(devicePath)) {
-        return m_manager->objectPath(*partition);
-    } else {
-        qCWarning(lcMemoryCardLog) << "Unable to get object path for unknown device:" << devicePath;
-        return QString();
-    }
+    return m_manager->objectPath(devicePath);
 }
 
 void PartitionModel::update()