Get rid of RemoteGetFreeSpace(), all it does is convert a QList to a …

…QVector, and the container doesn't matter in any of the places it's used.
MythTV · Aug 15, 2011 · 6879247 · 6879247
1 parent 0b17b4c
commit 6879247
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 16 deletions.
diff --git a/mythtv/libs/libmyth/remoteutil.cpp b/mythtv/libs/libmyth/remoteutil.cpp
@@ -11,7 +11,6 @@
 #include "mythcorecontext.h"
 #include "storagegroup.h"
 #include "mythevent.h"
-#include "filesysteminfo.h"
 
 vector<ProgramInfo *> *RemoteGetRecordedList(int sort)
 {
@@ -36,15 +35,6 @@ vector<ProgramInfo *> *RemoteGetRecordedList(int sort)
     return info;
 }
 
-/** \fn RemoteGetFreeSpace(void)
- *  \brief Returns total and used space in kilobytes for each backend.
- */
-QVector<FileSystemInfo> RemoteGetFreeSpace(void)
-{
-    QList<FileSystemInfo> fsInfos = FileSystemInfo::RemoteGetInfo();
-    return fsInfos.toVector();
-}
-
 bool RemoteGetLoad(float load[3])
 {
     QStringList strlist(QString("QUERY_LOAD"));

diff --git a/mythtv/libs/libmyth/remoteutil.h b/mythtv/libs/libmyth/remoteutil.h
@@ -8,13 +8,11 @@
 using namespace std;
 
 #include "mythexp.h"
-#include "filesysteminfo.h"
 
 class ProgramInfo;
 class MythEvent;
 
 MPUBLIC vector<ProgramInfo *> *RemoteGetRecordedList(int sort);
-MPUBLIC QVector<FileSystemInfo> RemoteGetFreeSpace(void);
 MPUBLIC bool RemoteGetLoad(float load[3]);
 MPUBLIC bool RemoteGetUptime(time_t &uptime);
 MPUBLIC

diff --git a/mythtv/programs/mythbackend/autoexpire.cpp b/mythtv/programs/mythbackend/autoexpire.cpp
@@ -26,6 +26,7 @@ using namespace std;
 #include <QList>
 
 // MythTV headers
+#include "filesysteminfo.h"
 #include "autoexpire.h"
 #include "programinfo.h"
 #include "mythcorecontext.h"

diff --git a/mythtv/programs/mythbackend/scheduler.h b/mythtv/programs/mythbackend/scheduler.h
@@ -15,6 +15,7 @@ using namespace std;
 #include <QSet>
 
 // MythTV headers
+#include "filesysteminfo.h"
 #include "recordinginfo.h"
 #include "remoteutil.h"
 #include "inputgroupmap.h"

diff --git a/mythtv/programs/mythfrontend/playbackboxhelper.cpp b/mythtv/programs/mythfrontend/playbackboxhelper.cpp
@@ -11,13 +11,14 @@ using namespace std;
 #include "metadataimagehelper.h"
 #include "playbackboxhelper.h"
 #include "mythcorecontext.h"
+#include "filesysteminfo.h"
 #include "tvremoteutil.h"
 #include "storagegroup.h"
+#include "mythlogging.h"
 #include "programinfo.h"
 #include "remoteutil.h"
 #include "mythevent.h"
 #include "mythdirs.h"
-#include "mythlogging.h"
 
 #define LOC      QString("PlaybackBoxHelper: ")
 #define LOC_WARN QString("PlaybackBoxHelper Warning: ")
@@ -381,7 +382,7 @@ void PlaybackBoxHelper::UndeleteRecording(
 
 void PlaybackBoxHelper::UpdateFreeSpace(void)
 {
-    QVector<FileSystemInfo> fsInfos = RemoteGetFreeSpace();
+    QList<FileSystemInfo> fsInfos = FileSystemInfo::RemoteGetInfo();
 
     QMutexLocker locker(&m_lock);
     for (int i = 0; i < fsInfos.size(); i++)

diff --git a/mythtv/programs/mythfrontend/statusbox.cpp b/mythtv/programs/mythfrontend/statusbox.cpp
@@ -7,7 +7,7 @@ using namespace std;
 #include <QHostAddress>
 
 #include "mythcorecontext.h"
-
+#include "filesysteminfo.h"
 #include "mythdb.h"
 #include "mythlogging.h"
 #include "mythversion.h"
@@ -1289,7 +1289,7 @@ void StatusBox::doMachineStatus()
     // get free disk space
     QString hostnames;
 
-    QVector<FileSystemInfo> fsInfos = RemoteGetFreeSpace();
+    QList<FileSystemInfo> fsInfos = FileSystemInfo::RemoteGetInfo();
     for (int i = 0; i < fsInfos.size(); ++i)
     {
         // For a single-directory installation just display the totals