From 254ef0d85251e8fafa5b297a29bcefe41f83aeed Mon Sep 17 00:00:00 2001
From: Joona Petrell <joona.petrell@jollamobile.com>
Date: Wed, 7 Dec 2016 14:43:05 +0200
Subject: [PATCH] [storage] Expose partition model as its own role. Contributes
 to JB#36373

---
 src/partitionmodel.cpp | 5 ++++-
 src/partitionmodel.h   | 1 +
 tests/ut_diskusage.cpp | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/partitionmodel.cpp b/src/partitionmodel.cpp
index e1761eb..3c62bb7 100644
--- a/src/partitionmodel.cpp
+++ b/src/partitionmodel.cpp
@@ -131,7 +131,8 @@ QHash<int, QByteArray> PartitionModel::roleNames() const
         { MountPathRole, "mountPath" },
         { BytesAvailableRole, "bytesAvailable" },
         { BytesTotalRole, "bytesTotal" },
-        { BytesFreeRole, "bytesFree" }
+        { BytesFreeRole, "bytesFree" },
+        { PartitionModelRole, "partitionModel" }
     };
 
     return roleNames;
@@ -172,6 +173,8 @@ QVariant PartitionModel::data(const QModelIndex &index, int role) const
             return partition.bytesTotal();
         case BytesFreeRole:
             return partition.bytesFree();
+        case PartitionModelRole:
+            return QVariant::fromValue(static_cast<QObject*>(const_cast<PartitionModel*>((this))));
         default:
             return QVariant();
         }
diff --git a/src/partitionmodel.h b/src/partitionmodel.h
index a2d9b2b..c4748f3 100644
--- a/src/partitionmodel.h
+++ b/src/partitionmodel.h
@@ -57,6 +57,7 @@ class SYSTEMSETTINGS_EXPORT PartitionModel : public QAbstractListModel
         BytesAvailableRole,
         BytesTotalRole,
         BytesFreeRole,
+        PartitionModelRole
     };
 
     enum Status {
diff --git a/tests/ut_diskusage.cpp b/tests/ut_diskusage.cpp
index 15de697..b4f6df6 100644
--- a/tests/ut_diskusage.cpp
+++ b/tests/ut_diskusage.cpp
@@ -52,7 +52,7 @@ static QVariantMap g_mocked_apkd_size;
 
 
 /* Mocked implementations of size calculation functions */
-quint64 DiskUsageWorker::calculateSize(QString directory, QString *expandedPath, bool androidHomeExists)
+quint64 DiskUsageWorker::calculateSize(QString directory, QString *expandedPath, bool)
 {
     if (expandedPath) {
         *expandedPath = directory;