From 7a75a3cfbec434c6194b169a6bf4b4c01393b794 Mon Sep 17 00:00:00 2001 From: Alexander Voronov Date: Fri, 24 Mar 2023 22:29:32 +0300 Subject: [PATCH] LibreVNA-GUI:compounddriver: Fix obsolete 'toSet'/'toList' See https://doc.qt.io/qt-5/qset-obsolete.html and https://doc.qt.io/qt-5/qlist-obsolete.html --- .../Device/LibreVNA/Compound/compounddriver.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Software/PC_Application/LibreVNA-GUI/Device/LibreVNA/Compound/compounddriver.cpp b/Software/PC_Application/LibreVNA-GUI/Device/LibreVNA/Compound/compounddriver.cpp index 48083d9..244b69b 100644 --- a/Software/PC_Application/LibreVNA-GUI/Device/LibreVNA/Compound/compounddriver.cpp +++ b/Software/PC_Application/LibreVNA-GUI/Device/LibreVNA/Compound/compounddriver.cpp @@ -437,11 +437,13 @@ QStringList CompoundDriver::availableExtRefInSettings() if(!connected) { return QStringList(); } - auto set = devices[0]->availableExtRefInSettings().toSet(); + auto list = devices[0]->availableExtRefInSettings(); + QSet set(list.begin(), list.end()); for(unsigned int i=1;iavailableExtRefInSettings().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() @@ -449,11 +451,13 @@ QStringList CompoundDriver::availableExtRefOutSettings() if(!connected) { return QStringList(); } - auto set = devices[0]->availableExtRefOutSettings().toSet(); + auto list = devices[0]->availableExtRefOutSettings(); + QSet set(list.begin(), list.end()); for(unsigned int i=1;iavailableExtRefOutSettings().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)