1 | diff --git a/mythtv/programs/mythbackend/mainserver.cpp b/mythtv/programs/mythbackend/mainserver.cpp
|
---|
2 | index f38ba4a..bdd33ce 100644
|
---|
3 | --- a/mythtv/programs/mythbackend/mainserver.cpp
|
---|
4 | +++ b/mythtv/programs/mythbackend/mainserver.cpp
|
---|
5 | @@ -4578,19 +4578,19 @@ void MainServer::BackendQueryDiskSpace(QStringList &strlist, bool consolidated,
|
---|
6 | FileSystemInfo fsInfo;
|
---|
7 | QList<FileSystemInfo> fsInfos;
|
---|
8 |
|
---|
9 | - QStringList::const_iterator it = strlist.begin();
|
---|
10 | - while (it != strlist.end())
|
---|
11 | + QStringList::const_iterator it = strlist.constBegin();
|
---|
12 | + while (it != strlist.constEnd())
|
---|
13 | {
|
---|
14 | - fsInfo.setHostname(*(it++));
|
---|
15 | - fsInfo.setPath(*(it++));
|
---|
16 | - fsInfo.setLocal((*(it++)).toInt() > 0);
|
---|
17 | + fsInfo.setHostname(*(it));
|
---|
18 | + fsInfo.setPath(*(it));
|
---|
19 | + fsInfo.setLocal((*(it)).toInt() > 0);
|
---|
20 | fsInfo.setFSysID(-1);
|
---|
21 | - ++it; // Without this, the strlist gets out of whack
|
---|
22 | - fsInfo.setGroupID((*(it++)).toInt());
|
---|
23 | - fsInfo.setBlockSize((*(it++)).toInt());
|
---|
24 | - fsInfo.setTotalSpace((*(it++)).toLongLong());
|
---|
25 | - fsInfo.setUsedSpace((*(it++)).toLongLong());
|
---|
26 | + fsInfo.setGroupID((*(it)).toInt());
|
---|
27 | + fsInfo.setBlockSize((*(it)).toInt());
|
---|
28 | + fsInfo.setTotalSpace((*(it)).toLongLong());
|
---|
29 | + fsInfo.setUsedSpace((*(it)).toLongLong());
|
---|
30 | fsInfos.push_back(fsInfo);
|
---|
31 | + ++it;
|
---|
32 | }
|
---|
33 | strlist.clear();
|
---|
34 |
|
---|
35 | @@ -4673,20 +4673,21 @@ void MainServer::GetFilesystemInfos(QList<FileSystemInfo> &fsInfos)
|
---|
36 |
|
---|
37 | BackendQueryDiskSpace(strlist, false, true);
|
---|
38 |
|
---|
39 | - QStringList::const_iterator it = strlist.begin();
|
---|
40 | - while (it != strlist.end())
|
---|
41 | + QStringList::const_iterator it = strlist.constBegin();
|
---|
42 | +
|
---|
43 | + while (it != strlist.constEnd())
|
---|
44 | {
|
---|
45 | - fsInfo.setHostname(*(it++));
|
---|
46 | - fsInfo.setPath(*(it++));
|
---|
47 | - fsInfo.setLocal((*(it++)).toInt() > 0);
|
---|
48 | + fsInfo.setHostname(*(it));
|
---|
49 | + fsInfo.setPath(*(it));
|
---|
50 | + fsInfo.setLocal((*(it)).toInt() > 0);
|
---|
51 | fsInfo.setFSysID(-1);
|
---|
52 | - ++it;
|
---|
53 | - fsInfo.setGroupID((*(it++)).toInt());
|
---|
54 | - fsInfo.setBlockSize((*(it++)).toInt());
|
---|
55 | - fsInfo.setTotalSpace((*(it++)).toLongLong());
|
---|
56 | - fsInfo.setUsedSpace((*(it++)).toLongLong());
|
---|
57 | + fsInfo.setGroupID((*(it)).toInt());
|
---|
58 | + fsInfo.setBlockSize((*(it)).toInt());
|
---|
59 | + fsInfo.setTotalSpace((*(it)).toLongLong());
|
---|
60 | + fsInfo.setUsedSpace((*(it)).toLongLong());
|
---|
61 | fsInfo.setWeight(0);
|
---|
62 | fsInfos.push_back(fsInfo);
|
---|
63 | + ++it;
|
---|
64 | }
|
---|
65 |
|
---|
66 | LOG(VB_SCHEDULE | VB_FILE, LOG_DEBUG, "Determining unique filesystems");
|
---|