mythbackend: finish FileSystemInfoList conversion

mythtv/programs/mythbackend/autoexpire.cpp

@@ -125,7 +125,7 @@ void AutoExpire::CalcParams()
 {
     LOG(VB_FILE, LOG_INFO, LOC + "CalcParams()");
 
-    QList<FileSystemInfo> fsInfos;
+    FileSystemInfoList fsInfos;
 
     m_instanceLock.lock();
     if (m_mainServer)
@@ -168,7 +168,7 @@ void AutoExpire::CalcParams()
     }
     m_instanceLock.unlock();
 
-    QList<FileSystemInfo>::iterator fsit;
+    FileSystemInfoList::iterator fsit;
     for (fsit = fsInfos.begin(); fsit != fsInfos.end(); ++fsit)
     {
         if (fsMap.contains(fsit->getFSysID()))
@@ -406,8 +406,8 @@ void AutoExpire::ExpireRecordings(void)
 {
     pginfolist_t expireList;
     pginfolist_t deleteList;
-    QList<FileSystemInfo> fsInfos;
-    QList<FileSystemInfo>::iterator fsit;
+    FileSystemInfoList fsInfos;
+    FileSystemInfoList::iterator fsit;
 
     LOG(VB_FILE, LOG_INFO, LOC + "ExpireRecordings()");
 
@@ -481,7 +481,7 @@ void AutoExpire::ExpireRecordings(void)
                     .arg(fsit->getFSysID()));
             LOG(VB_FILE, LOG_INFO, QString("Directories on filesystem ID %1:")
                     .arg(fsit->getFSysID()));
-            QList<FileSystemInfo>::iterator fsit2;
+            FileSystemInfoList::iterator fsit2;
             for (fsit2 = fsInfos.begin(); fsit2 != fsInfos.end(); ++fsit2)
             {
                 if (fsit2->getFSysID() == fsit->getFSysID())
@@ -512,7 +512,7 @@ void AutoExpire::ExpireRecordings(void)
                     .arg(m_desiredSpace[fsit->getFSysID()] / 1024));
 
             QMap<QString, int> dirList;
-            QList<FileSystemInfo>::iterator fsit2;
+            FileSystemInfoList::iterator fsit2;
 
             LOG(VB_FILE, LOG_INFO,
                 QString("    Directories on filesystem ID %1:")

mythtv/programs/mythbackend/autoexpire.h

@@ -18,7 +18,6 @@
 
 class ProgramInfo;
 class EncoderLink;
-class FileSystemInfo;
 class MainServer;
 
 using pginfolist_t  = std::vector<ProgramInfo*>;

mythtv/programs/mythbackend/mainserver.cpp

@@ -312,7 +312,7 @@ MainServer::MainServer(bool master, int port,
     {
         // Make sure we have a good, fsinfo cache before setting
         // mainServer in the scheduler.
-        QList<FileSystemInfo> m_fsInfos;
+        FileSystemInfoList m_fsInfos;
         GetFilesystemInfos(m_fsInfos, false);
         sched->SetMainServer(this);
     }
@@ -5252,7 +5252,7 @@ void MainServer::BackendQueryDiskSpace(QStringList &strlist, bool consolidated,
     }
 }
 
-void MainServer::GetFilesystemInfos(QList<FileSystemInfo> &fsInfos,
+void MainServer::GetFilesystemInfos(FileSystemInfoList &fsInfos,
                                     bool useCache)
 {
     // Return cached information if requested.
@@ -5294,7 +5294,7 @@ void MainServer::GetFilesystemInfos(QList<FileSystemInfo> &fsInfos,
 
     FileSystemInfo::Consolidate(fsInfos, false, maxWriteFiveSec);
 
-    QList<FileSystemInfo>::iterator it1;
+    FileSystemInfoList::iterator it1;
     if (VERBOSE_LEVEL_CHECK(VB_FILE | VB_SCHEDULE, LOG_INFO))
     {
         LOG(VB_FILE | VB_SCHEDULE, LOG_INFO, LOC +

mythtv/programs/mythbackend/mainserver.h

@@ -15,6 +15,7 @@
 
 // MythTV headers
 #include "libmythbase/exitcodes.h"
+#include "libmythbase/filesysteminfo.h"
 #include "libmythbase/mthreadpool.h"
 #include "libmythbase/mythdeque.h"
 #include "libmythbase/mythdownloadmanager.h"
@@ -36,7 +37,6 @@
 class QUrl;
 class MythServer;
 class QTimer;
-class FileSystemInfo;
 class MetadataFactory;
 class FreeSpaceUpdater;
 
@@ -146,7 +146,7 @@ class MainServer : public QObject, public MythSocketCBs
     size_t GetCurrentMaxBitrate(void);
     void BackendQueryDiskSpace(QStringList &strlist, bool consolidated,
                                bool allHosts);
-    void GetFilesystemInfos(QList<FileSystemInfo> &fsInfos,
+    void GetFilesystemInfos(FileSystemInfoList &fsInfos,
                             bool useCache=true);
 
     int GetExitCode() const { return m_exitCode; }
@@ -351,7 +351,7 @@ class MainServer : public QObject, public MythSocketCBs
     QTimer *m_autoexpireUpdateTimer          {nullptr}; // audited ref #5318
     static QMutex s_truncate_and_close_lock;
 
-    QList<FileSystemInfo> m_fsInfosCache;
+    FileSystemInfoList    m_fsInfosCache;
     QMutex                m_fsInfosCacheLock;
 
     QMutex                     m_downloadURLsLock;

mythtv/programs/mythbackend/scheduler.cpp

@@ -5692,15 +5692,15 @@ int Scheduler::FillRecordingDir(
 
 void Scheduler::FillDirectoryInfoCache(void)
 {
-    QList<FileSystemInfo> fsInfos;
+    FileSystemInfoList fsInfos;
 
     m_fsInfoCache.clear();
 
     if (m_mainServer)
         m_mainServer->GetFilesystemInfos(fsInfos, true);
 
     QMap <int, bool> fsMap;
-    QList<FileSystemInfo>::iterator it1;
+    FileSystemInfoList::iterator it1;
     for (it1 = fsInfos.begin(); it1 != fsInfos.end(); ++it1)
     {
         fsMap[it1->getFSysID()] = true;