diff --git a/mythtv/programs/mythbackend/mainserver.cpp b/mythtv/programs/mythbackend/mainserver.cpp
index f38ba4a..bdd33ce 100644
--- a/mythtv/programs/mythbackend/mainserver.cpp
+++ b/mythtv/programs/mythbackend/mainserver.cpp
@@ -4578,19 +4578,19 @@ void MainServer::BackendQueryDiskSpace(QStringList &strlist, bool consolidated,
     FileSystemInfo fsInfo;
     QList<FileSystemInfo> fsInfos;

-    QStringList::const_iterator it = strlist.begin();
-    while (it != strlist.end())
+    QStringList::const_iterator it = strlist.constBegin();
+    while (it != strlist.constEnd())
     {
-        fsInfo.setHostname(*(it++));
-        fsInfo.setPath(*(it++));
-        fsInfo.setLocal((*(it++)).toInt() > 0);
+        fsInfo.setHostname(*(it));
+        fsInfo.setPath(*(it));
+        fsInfo.setLocal((*(it)).toInt() > 0);
         fsInfo.setFSysID(-1);
-        ++it;   // Without this, the strlist gets out of whack
-        fsInfo.setGroupID((*(it++)).toInt());
-        fsInfo.setBlockSize((*(it++)).toInt());
-        fsInfo.setTotalSpace((*(it++)).toLongLong());
-        fsInfo.setUsedSpace((*(it++)).toLongLong());
+        fsInfo.setGroupID((*(it)).toInt());
+        fsInfo.setBlockSize((*(it)).toInt());
+        fsInfo.setTotalSpace((*(it)).toLongLong());
+        fsInfo.setUsedSpace((*(it)).toLongLong());
         fsInfos.push_back(fsInfo);
+       ++it;
     }
     strlist.clear();

@@ -4673,20 +4673,21 @@ void MainServer::GetFilesystemInfos(QList<FileSystemInfo> &fsInfos)

     BackendQueryDiskSpace(strlist, false, true);

-    QStringList::const_iterator it = strlist.begin();
-    while (it != strlist.end())
+    QStringList::const_iterator it = strlist.constBegin();
+
+    while (it != strlist.constEnd())
     {
-        fsInfo.setHostname(*(it++));
-        fsInfo.setPath(*(it++));
-        fsInfo.setLocal((*(it++)).toInt() > 0);
+        fsInfo.setHostname(*(it));
+        fsInfo.setPath(*(it));
+        fsInfo.setLocal((*(it)).toInt() > 0);
         fsInfo.setFSysID(-1);
-        ++it;
-        fsInfo.setGroupID((*(it++)).toInt());
-        fsInfo.setBlockSize((*(it++)).toInt());
-        fsInfo.setTotalSpace((*(it++)).toLongLong());
-        fsInfo.setUsedSpace((*(it++)).toLongLong());
+        fsInfo.setGroupID((*(it)).toInt());
+        fsInfo.setBlockSize((*(it)).toInt());
+        fsInfo.setTotalSpace((*(it)).toLongLong());
+        fsInfo.setUsedSpace((*(it)).toLongLong());
         fsInfo.setWeight(0);
         fsInfos.push_back(fsInfo);
+        ++it;
     }

     LOG(VB_SCHEDULE | VB_FILE, LOG_DEBUG, "Determining unique filesystems");