caiyu/LibreVNA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LibreVNA-GUI:compounddriver: Fix obsolete 'toSet'/'toList'

Browse Source 
See https://doc.qt.io/qt-5/qset-obsolete.html
and https://doc.qt.io/qt-5/qlist-obsolete.html
This commit is contained in:
Alexander Voronov 2023-03-24 22:29:32 +03:00
parent e12cc850db
commit 7a75a3cfbe
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Software/PC_Application/LibreVNA-GUI/Device/LibreVNA/Compound/compounddriver.cpp
View File

@ -437,11 +437,13 @@ QStringList CompoundDriver::availableExtRefInSettings()
if(!connected) { if(!connected) {
return QStringList(); return QStringList();
} }
auto set = devices[0]->availableExtRefInSettings().toSet(); auto list = devices[0]->availableExtRefInSettings();
QSet<QString> set(list.begin(), list.end());
for(unsigned int i=1;i<devices.size();i++) { for(unsigned int i=1;i<devices.size();i++) {
set = set.intersect(devices[i]->availableExtRefInSettings().toSet()); list = devices[i]->availableExtRefInSettings();
set = set.intersect({list.begin(), list.end()});
} }
return QStringList(set.toList()); return QStringList(set.begin(), set.end());
} }
QStringList CompoundDriver::availableExtRefOutSettings() QStringList CompoundDriver::availableExtRefOutSettings()
@ -449,11 +451,13 @@ QStringList CompoundDriver::availableExtRefOutSettings()
if(!connected) { if(!connected) {
return QStringList(); return QStringList();
} }
auto set = devices[0]->availableExtRefOutSettings().toSet(); auto list = devices[0]->availableExtRefOutSettings();
QSet<QString> set(list.begin(), list.end());
for(unsigned int i=1;i<devices.size();i++) { for(unsigned int i=1;i<devices.size();i++) {
set = set.intersect(devices[i]->availableExtRefOutSettings().toSet()); list = devices[i]->availableExtRefOutSettings();
set = set.intersect({list.begin(), list.end()});
} }
return QStringList(set.toList()); return QStringList(set.begin(), set.end());
} }
bool CompoundDriver::setExtRef(QString option_in, QString option_out) bool CompoundDriver::setExtRef(QString option_in, QString option_out)