chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-09 04:30:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use QStorageInfo to simplify getDriveList()

Browse Source
This commit is contained in:
Phil Olynyk 2020-06-09 17:10:25 -04:00
parent ddcd44d99a
commit 80a5642ee3
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
oscar/mainwindow.cpp
View File

@ -31,6 +31,7 @@
#include <QStandardPaths>
#include <QDesktopServices>
#include <QScreen>
#include <QStorageInfo>
#include <cmath>
#include "common_gui.h"
@ -799,7 +800,28 @@ QStringList getDriveList()
{
QStringList drivelist;
#if defined(Q_OS_MAC) || defined(Q_OS_BSD4)
#if QT_VERSION >= QT_VERSION_CHECK(5,4,0)
#if defined(Q_OS_LINUX)
#define VFAT "vfat"
#elif defined(Q_OS_WIN
#define VFAT "FAT32"
#elif defined(Q_OS_MAC)
#define VFAT "FAT32"
#endif
foreach (const QStorageInfo &storage, QStorageInfo::mountedVolumes()) {
if (storage.isValid() && storage.isReady()) {
qDebug() << "Device:" << storage.device();
qDebug() << " Path:" << storage.rootPath();
qDebug() << " Name:" << storage.name(); // ...
qDebug() << " FS Type:" << storage.fileSystemType();
if (storage.fileSystemType() == VFAT) {
qDebug() << "Adding" << storage.name() << "on" << storage.rootPath() << "to drivelist";
drivelist.push_back(storage.rootPath());
}
}
}
#elif defined(Q_OS_MAC) || defined(Q_OS_BSD4)
struct statfs *mounts;
int num_mounts = getmntinfo(&mounts, MNT_WAIT);
if (num_mounts >= 0) {