Commit a582011d authored by David Faure's avatar David Faure

Hopefully fix compilation on Windows after commit c9a13557

I suggest to keep an eye for red circles on
https://build.kde.org/job/Frameworks/view/Everything%20-%20kf5-qt5/

CCMAIL: montel@kde.org
parent c9a13557
...@@ -214,9 +214,8 @@ void WinDeviceManager::slotDeviceAdded(const QSet<QString> &udi) ...@@ -214,9 +214,8 @@ void WinDeviceManager::slotDeviceAdded(const QSet<QString> &udi)
QSet<QString> tmp = udi - m_devices;//don't report devices that are already known(cd drive) QSet<QString> tmp = udi - m_devices;//don't report devices that are already known(cd drive)
m_devices += tmp; m_devices += tmp;
m_devicesList = m_devices.toList(); m_devicesList = m_devices.toList();
qSort(m_devicesList); std::sort(m_devicesList.begin(), m_devicesList.end());
foreach (const QString &s, tmp) { foreach (const QString &s, tmp) {
emit deviceAdded(s); emit deviceAdded(s);
} }
} }
...@@ -225,7 +224,7 @@ void WinDeviceManager::slotDeviceRemoved(const QSet<QString> &udi) ...@@ -225,7 +224,7 @@ void WinDeviceManager::slotDeviceRemoved(const QSet<QString> &udi)
{ {
m_devices -= udi; m_devices -= udi;
m_devicesList = m_devices.toList(); m_devicesList = m_devices.toList();
qSort(m_devicesList); std::sort(m_devicesList.begin(), m_devicesList.end());
foreach (const QString &s, udi) { foreach (const QString &s, udi) {
emit deviceRemoved(s); emit deviceRemoved(s);
} }
...@@ -239,7 +238,7 @@ void WinDeviceManager::updateDeviceList() ...@@ -239,7 +238,7 @@ void WinDeviceManager::updateDeviceList()
m_devices = devices; m_devices = devices;
m_devicesList = m_devices.toList(); m_devicesList = m_devices.toList();
qSort(m_devicesList); std::sort(m_devicesList.begin(), m_devicesList.end());
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment