[nemo-systemsettings] Expose deviceName from the PartitiionModel. Con…

…tributes to JB#39820
sailfishos · Feb 6, 2018 · 7e5b5d3 · 7e5b5d3
1 parent 0c30346
commit 7e5b5d3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/src/partition.cpp b/src/partition.cpp
@@ -189,6 +189,11 @@ QString Partition::devicePath() const
     return d ? d->devicePath : QString();
 }
 
+QString Partition::deviceName() const
+{
+    return d ? d->deviceName : QString();
+}
+
 QString Partition::mountPath() const
 {
     return d ? d->mountPath : QString();

diff --git a/src/partition.h b/src/partition.h
@@ -82,6 +82,7 @@ class SYSTEMSETTINGS_EXPORT Partition
     StorageType storageType() const;
 
     QString devicePath() const;
+    QString deviceName() const;
     QString mountPath() const;
 
     QString filesystemType() const;

diff --git a/src/partitionmodel.cpp b/src/partitionmodel.cpp
@@ -128,6 +128,7 @@ QHash<int, QByteArray> PartitionModel::roleNames() const
         { StorageTypeRole, "storageType" },
         { FilesystemTypeRole, "filesystemType" },
         { DevicePathRole, "devicePath" },
+        { DeviceNameRole, "deviceName" },
         { MountPathRole, "mountPath" },
         { BytesAvailableRole, "bytesAvailable" },
         { BytesTotalRole, "bytesTotal" },
@@ -165,6 +166,8 @@ QVariant PartitionModel::data(const QModelIndex &index, int role) const
             return partition.filesystemType();
         case DevicePathRole:
             return partition.devicePath();
+        case DeviceNameRole:
+            return partition.deviceName();
         case MountPathRole:
             return partition.mountPath();
         case BytesAvailableRole:
@@ -185,7 +188,8 @@ void PartitionModel::partitionChanged(const Partition &partition)
 {
     for (int i = 0; i < m_partitions.count(); ++i) {
         if (m_partitions.at(i) == partition) {
-            emit dataChanged(createIndex(i, 0), createIndex(i, 0));
+            QModelIndex index = createIndex(i, 0);
+            emit dataChanged(index, index);
             return;
         }
     }

diff --git a/src/partitionmodel.h b/src/partitionmodel.h
@@ -53,6 +53,7 @@ class SYSTEMSETTINGS_EXPORT PartitionModel : public QAbstractListModel
         StorageTypeRole,
         FilesystemTypeRole,
         DevicePathRole,
+        DeviceNameRole,
         MountPathRole,
         BytesAvailableRole,
         BytesTotalRole,