mirror of
https://github.com/cmclark00/retro-imager.git
synced 2025-05-18 07:55:21 +01:00
Merge pull request #450 from marcelpetrick/mpe/clazy
code-quality: fixed all range-loop warnings which were reported from clazy
This commit is contained in:
commit
280469c50f
5 changed files with 11 additions and 11 deletions
|
@ -97,7 +97,7 @@ MOUNTUTILS_RESULT unmount_disk(const char *device_path) {
|
||||||
size_t unmounts = 0;
|
size_t unmounts = 0;
|
||||||
MOUNTUTILS_RESULT result_code = MOUNTUTILS_SUCCESS;
|
MOUNTUTILS_RESULT result_code = MOUNTUTILS_SUCCESS;
|
||||||
|
|
||||||
for (std::string mount_dir : mount_dirs) {
|
for (const std::string& mount_dir : mount_dirs) {
|
||||||
MountUtilsLog("Unmounting " + mount_dir + "...");
|
MountUtilsLog("Unmounting " + mount_dir + "...");
|
||||||
|
|
||||||
mount_path = mount_dir.c_str();
|
mount_path = mount_dir.c_str();
|
||||||
|
|
|
@ -231,7 +231,7 @@ void DownloadExtractThread::extractMultiFileRun()
|
||||||
{
|
{
|
||||||
QThread::sleep(1);
|
QThread::sleep(1);
|
||||||
auto l = Drivelist::ListStorageDevices();
|
auto l = Drivelist::ListStorageDevices();
|
||||||
for (auto i : l)
|
for (const auto& i : l)
|
||||||
{
|
{
|
||||||
if (QByteArray::fromStdString(i.device).toLower() == devlower && i.mountpoints.size() == 1)
|
if (QByteArray::fromStdString(i.device).toLower() == devlower && i.mountpoints.size() == 1)
|
||||||
{
|
{
|
||||||
|
@ -363,7 +363,7 @@ void DownloadExtractThread::extractMultiFileRun()
|
||||||
_cachefile.remove();
|
_cachefile.remove();
|
||||||
|
|
||||||
qDebug() << "Deleting extracted files";
|
qDebug() << "Deleting extracted files";
|
||||||
for (auto filename : filesExtracted)
|
for (const auto& filename : filesExtracted)
|
||||||
{
|
{
|
||||||
QFileInfo fi(filename);
|
QFileInfo fi(filename);
|
||||||
QString path = fi.path();
|
QString path = fi.path();
|
||||||
|
|
|
@ -871,7 +871,7 @@ bool DownloadThread::_customizeImage()
|
||||||
{
|
{
|
||||||
QThread::sleep(1);
|
QThread::sleep(1);
|
||||||
auto l = Drivelist::ListStorageDevices();
|
auto l = Drivelist::ListStorageDevices();
|
||||||
for (auto i : l)
|
for (const auto& i : l)
|
||||||
{
|
{
|
||||||
if (QByteArray::fromStdString(i.device).toLower() == devlower && i.mountpoints.size())
|
if (QByteArray::fromStdString(i.device).toLower() == devlower && i.mountpoints.size())
|
||||||
{
|
{
|
||||||
|
@ -951,10 +951,10 @@ bool DownloadThread::_customizeImage()
|
||||||
//
|
//
|
||||||
qDebug() << "drive info. searching for:" << devlower;
|
qDebug() << "drive info. searching for:" << devlower;
|
||||||
auto l = Drivelist::ListStorageDevices();
|
auto l = Drivelist::ListStorageDevices();
|
||||||
for (auto i : l)
|
for (const auto& i : l)
|
||||||
{
|
{
|
||||||
qDebug() << "drive" << QByteArray::fromStdString(i.device).toLower();
|
qDebug() << "drive" << QByteArray::fromStdString(i.device).toLower();
|
||||||
for (auto mp : i.mountpoints) {
|
for (const auto& mp : i.mountpoints) {
|
||||||
qDebug() << "mountpoint:" << QByteArray::fromStdString(mp);
|
qDebug() << "mountpoint:" << QByteArray::fromStdString(mp);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -973,7 +973,7 @@ bool DownloadThread::_customizeImage()
|
||||||
{
|
{
|
||||||
/* Search all mountpoints, as on some systems FAT partition
|
/* Search all mountpoints, as on some systems FAT partition
|
||||||
may not be first volume */
|
may not be first volume */
|
||||||
for (auto mp : mountpoints)
|
for (const auto& mp : mountpoints)
|
||||||
{
|
{
|
||||||
folder = QString::fromStdString(mp);
|
folder = QString::fromStdString(mp);
|
||||||
if (folder.right(1) == '\\')
|
if (folder.right(1) == '\\')
|
||||||
|
@ -1012,7 +1012,7 @@ bool DownloadThread::_customizeImage()
|
||||||
f.close();
|
f.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
for (QByteArray item : configItems)
|
for (const QByteArray& item : configItems)
|
||||||
{
|
{
|
||||||
if (config.contains("#"+item)) {
|
if (config.contains("#"+item)) {
|
||||||
/* Uncomment existing line */
|
/* Uncomment existing line */
|
||||||
|
|
|
@ -132,7 +132,7 @@ namespace Drivelist
|
||||||
if (d.isSystem && subsystems.contains("nvme"))
|
if (d.isSystem && subsystems.contains("nvme"))
|
||||||
{
|
{
|
||||||
bool isMounted = false;
|
bool isMounted = false;
|
||||||
for (std::string mp : d.mountpoints)
|
for (const std::string& mp : d.mountpoints)
|
||||||
{
|
{
|
||||||
if (!QByteArray::fromStdString(mp).startsWith("/media/")) {
|
if (!QByteArray::fromStdString(mp).startsWith("/media/")) {
|
||||||
isMounted = true;
|
isMounted = true;
|
||||||
|
|
|
@ -71,7 +71,7 @@ void UDisks2Api::_unmountDrive(const QString &driveDbusPath)
|
||||||
if (!manager.isValid() || !list.isValid())
|
if (!manager.isValid() || !list.isValid())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
for (auto devpath : list.value())
|
for (const auto& devpath : list.value())
|
||||||
{
|
{
|
||||||
QString devpathStr = devpath.path();
|
QString devpathStr = devpath.path();
|
||||||
|
|
||||||
|
@ -263,7 +263,7 @@ QByteArrayList UDisks2Api::mountPoints(const QDBusInterface &filesystem)
|
||||||
QVariantList args = {"org.freedesktop.UDisks2.Filesystem", "MountPoints"};
|
QVariantList args = {"org.freedesktop.UDisks2.Filesystem", "MountPoints"};
|
||||||
msg.setArguments(args);
|
msg.setArguments(args);
|
||||||
QDBusMessage reply = QDBusConnection::systemBus().call(msg);
|
QDBusMessage reply = QDBusConnection::systemBus().call(msg);
|
||||||
for (auto arg : reply.arguments())
|
for (const auto& arg : reply.arguments())
|
||||||
{
|
{
|
||||||
arg.value<QDBusVariant>().variant().value<QDBusArgument>() >> mps;
|
arg.value<QDBusVariant>().variant().value<QDBusArgument>() >> mps;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue