[storage] Expose partition model as its own role. Contributes to JB#3…

…6373
sailfishos · Dec 9, 2016 · 254ef0d · 254ef0d
1 parent 39d7065
commit 254ef0d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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;