Fixes for Linux compile

memories.cpp

@@ -148,34 +148,34 @@ memories::memories(rigCapabilities rigCaps, QWidget *parent) :
 
     ui->table->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
 
-    memory = {"OFF","*1","*2","*3"};
+    memory = QStringList({"OFF","*1","*2","*3"});
 
-    dataModes = {"OFF","DATA1"};
+    dataModes = QStringList({"OFF","DATA1"});
     if (rigCaps.commands.contains(funcDATA2Mod))
         dataModes.append("DATA2");
     if (rigCaps.commands.contains(funcDATA3Mod))
         dataModes.append("DATA3");
 
-    filters = {"FIL1","FIL2","FIL3"};
+    filters = QStringList({"FIL1","FIL2","FIL3"});
 
-    duplexModes = {"OFF","DUP-","DUP+","RPS"};
+    duplexModes = QStringList({"OFF","DUP-","DUP+","RPS"});
 
-    toneModes = {"OFF","Tone","TSQL"};
+    toneModes = QStringList({"OFF","Tone","TSQL"});
     if (rigCaps.commands.contains(funcRepeaterDTCS))
         toneModes.append("DTCS");
 
-    tones = {"67.0","69.3","71.9","74.4","77.0","79.7","82.5","85.4","88.5","91.5","94.8","97.4","100.0","103.5","107.2","110.9","114.8","118.8","123.0","127.3","131.8","136.5",
+    tones = QStringList({"67.0","69.3","71.9","74.4","77.0","79.7","82.5","85.4","88.5","91.5","94.8","97.4","100.0","103.5","107.2","110.9","114.8","118.8","123.0","127.3","131.8","136.5",
                   "141.3","146.2","151.4","156.7","159.8","162.2","165.5","167.9","171.3","173.8","177.3","179.9","183.5","186.2","189.9","192.8","196.6","199.5","203.5","206.5",
-                  "210.7","218.1","225.7","229.1","233.6","241.8","250.3","254.1"};
+                  "210.7","218.1","225.7","229.1","233.6","241.8","250.3","254.1"});
 
     if (rigCaps.commands.contains(funcVFOEqualAB)) {
-        VFO = {"VFOA","VFOB"};
+        VFO = QStringList({"VFOA","VFOB"});
     } else if (rigCaps.commands.contains(funcVFOEqualMS)) {
-        VFO = {"Main","Sub"};
+        VFO = QStringList({"Main","Sub"});
     }
 
-    dsql = {"OFF","DSQL","CSQL"};
-    dtcsp = {"NN","NR","RN","RR"};
+    dsql = QStringList({"OFF","DSQL","CSQL"});
+    dtcsp = QStringList({"NN","NR","RN","RR"});
 
     foreach (auto mode, rigCaps.modes){
         modes.append(mode.name);

rigcommander.cpp

@@ -1910,6 +1910,7 @@ void rigCommander::parseCommand()
              case 'h': // combined duplex and tonemode
                     mem.duplex=duplexMode(data[0] >> 4 & 0x0f);
                     mem.tonemode=data[0] & 0x0f;
+                    break;
              case 'i': // combined datamode and tonemode
                     mem.datamode=(data[0] >> 4 & 0x0f);
                     mem.tonemode=data[0] & 0x0f;
@@ -4606,12 +4607,17 @@ void rigCommander::determineRigCaps()
 
     while (i.hasNext()) {
         QRegularExpressionMatch qmatch = i.next();
+#if (QT_VERSION >= QT_VERSION_CHECK(6,0,0))
         if (qmatch.hasCaptured("spec") && qmatch.hasCaptured("pos") && qmatch.hasCaptured("width")) {
+#endif
+
             rigCaps.memParser.append(memParserFormat(qmatch.captured("spec").at(0).toLatin1(),qmatch.captured("pos").toInt(),qmatch.captured("width").toInt()));
             qInfo() << QString("Captured: %0 pos: %1 len: %2").arg(rigCaps.memParser.at(rigCaps.memParser.size()-1).spec).
                                                                 arg(rigCaps.memParser.at(rigCaps.memParser.size()-1).pos).
                                                                 arg(rigCaps.memParser.at(rigCaps.memParser.size()-1).len);
+#if (QT_VERSION >= QT_VERSION_CHECK(6,0,0))
         }
+#endif
     }
 
 

tablewidget.cpp

@@ -102,6 +102,7 @@ void tableCombobox::setEditorData(QWidget *editor, const QModelIndex &index) con
 }
 
 void tableCombobox::setModelData(QWidget *editor, QAbstractItemModel *model,   const QModelIndex &index) const {
+    Q_UNUSED(editor)
     model->setData( index, combo->currentText() );
 }