diff --git a/solid-device-automounter/kcm/DeviceAutomounterKCM.cpp b/solid-device-automounter/kcm/DeviceAutomounterKCM.cpp --- a/solid-device-automounter/kcm/DeviceAutomounterKCM.cpp +++ b/solid-device-automounter/kcm/DeviceAutomounterKCM.cpp @@ -90,7 +90,7 @@ void DeviceAutomounterKCM::updateForgetDeviceButton() { - foreach (const QModelIndex &idx, deviceView->selectionModel()->selectedIndexes()) { + for (const QModelIndex &idx : deviceView->selectionModel()->selectedIndexes()) { if (idx.data(DeviceModel::TypeRole) == DeviceModel::Detatched) { forgetDevice->setEnabled(true); return; @@ -172,7 +172,7 @@ } } - foreach (const QString &possibleDevice, AutomounterSettings::knownDevices()) { + for (const QString &possibleDevice : AutomounterSettings::knownDevices()) { if (!validDevices.contains(possibleDevice)) { AutomounterSettings::deviceSettings(possibleDevice).deleteGroup(); } diff --git a/solid-device-automounter/kcm/DeviceModel.cpp b/solid-device-automounter/kcm/DeviceModel.cpp --- a/solid-device-automounter/kcm/DeviceModel.cpp +++ b/solid-device-automounter/kcm/DeviceModel.cpp @@ -26,6 +26,7 @@ #include #include #include +#include #include "AutomounterSettings.h" @@ -114,14 +115,17 @@ const Solid::Device dev(udi); if (dev.isValid()) { - beginInsertRows(index(0, 0), m_attached.size(), m_attached.size()); - m_attached << udi; + const Solid::StorageAccess *access = dev.as(); + if (access == nullptr || !access->isIgnored()) { + beginInsertRows(index(0, 0), m_attached.size(), m_attached.size()); + m_attached << udi; + endInsertRows(); + } } else { beginInsertRows(index(1, 0), m_disconnected.size(), m_disconnected.size()); m_disconnected << udi; + endInsertRows(); } - - endInsertRows(); } void DeviceModel::reload() @@ -132,10 +136,10 @@ m_attached.clear(); m_disconnected.clear(); - foreach (const QString &dev, AutomounterSettings::knownDevices()) { + for (const QString &dev : AutomounterSettings::knownDevices()) { addNewDevice(dev); } - foreach (const QString &udi, m_loginForced.keys()) { + for (const QString &udi : m_loginForced.keys()) { m_loginForced[udi] = AutomounterSettings::deviceAutomountIsForced(udi, AutomounterSettings::Login); m_attachedForced[udi] = AutomounterSettings::deviceAutomountIsForced(udi, AutomounterSettings::Attach); }