Improve initialization of roleNames()

Martchus · Nov 3, 2018 · 1d75ee2 · 1d75ee2
1 parent d803f83
commit 1d75ee2
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 35 deletions.
diff --git a/model/syncthingdevicemodel.cpp b/model/syncthingdevicemodel.cpp
@@ -24,18 +24,16 @@ SyncthingDeviceModel::SyncthingDeviceModel(SyncthingConnection &connection, QObj
 
 QHash<int, QByteArray> SyncthingDeviceModel::roleNames() const
 {
-    const static auto roles([] {
-        QHash<int, QByteArray> roles;
-        roles[Qt::DisplayRole] = "name";
-        roles[DeviceStatus] = "status";
-        roles[Qt::DecorationRole] = "statusIcon";
-        roles[DevicePaused] = "paused";
-        roles[DeviceStatusString] = "statusString";
-        roles[DeviceStatusColor] = "statusColor";
-        roles[DeviceId] = "devId";
-        roles[DeviceDetail] = "detail";
-        return roles;
-    }());
+    const static QHash<int, QByteArray> roles{
+        { Qt::DisplayRole, "name" },
+        { DeviceStatus, "status" },
+        { Qt::DecorationRole, "statusIcon" },
+        { DevicePaused, "paused" },
+        { DeviceStatusString, "statusString" },
+        { DeviceStatusColor, "statusColor" },
+        { DeviceId, "devId" },
+        { DeviceDetail, "detail" },
+    };
     return roles;
 }
 

diff --git a/model/syncthingdirectorymodel.cpp b/model/syncthingdirectorymodel.cpp
@@ -26,20 +26,18 @@ SyncthingDirectoryModel::SyncthingDirectoryModel(SyncthingConnection &connection
 
 QHash<int, QByteArray> SyncthingDirectoryModel::roleNames() const
 {
-    const static auto roles([] {
-        QHash<int, QByteArray> roles;
-        roles[Qt::DisplayRole] = "name";
-        roles[DirectoryStatus] = "status";
-        roles[Qt::DecorationRole] = "statusIcon";
-        roles[DirectoryStatusString] = "statusString";
-        roles[DirectoryStatusColor] = "statusColor";
-        roles[DirectoryPaused] = "paused";
-        roles[DirectoryId] = "dirId";
-        roles[DirectoryPath] = "path";
-        roles[DirectoryPullErrorCount] = "pullErrorCount";
-        roles[DirectoryDetail] = "detail";
-        return roles;
-    }());
+    const static QHash<int, QByteArray> roles{
+        { Qt::DisplayRole, "name" },
+        { DirectoryStatus, "status" },
+        { Qt::DecorationRole, "statusIcon" },
+        { DirectoryStatusString, "statusString" },
+        { DirectoryStatusColor, "statusColor" },
+        { DirectoryPaused, "paused" },
+        { DirectoryId, "dirId" },
+        { DirectoryPath, "path" },
+        { DirectoryPullErrorCount, "pullErrorCount" },
+        { DirectoryDetail, "detail" },
+    };
     return roles;
 }
 

diff --git a/model/syncthingdownloadmodel.cpp b/model/syncthingdownloadmodel.cpp
@@ -36,15 +36,13 @@ SyncthingDownloadModel::SyncthingDownloadModel(SyncthingConnection &connection,
 
 QHash<int, QByteArray> SyncthingDownloadModel::roleNames() const
 {
-    const static auto roles([] {
-        QHash<int, QByteArray> roles;
-        roles[Qt::DisplayRole] = "name";
-        roles[Qt::DecorationRole] = "fileIcon";
-        roles[ItemPercentage] = "percentage";
-        roles[ItemProgressLabel] = "progressLabel";
-        roles[ItemPath] = "path";
-        return roles;
-    }());
+    const static QHash<int, QByteArray> roles{
+        { Qt::DisplayRole, "name" },
+        { Qt::DecorationRole, "fileIcon" },
+        { ItemPercentage, "percentage" },
+        { ItemProgressLabel, "progressLabel" },
+        { ItemPath, "path" },
+    };
     return roles;
 }