Fix various compile warnings including QT6 deprecation

cachingqueue.cpp

@@ -75,8 +75,7 @@ void cachingQueue::run()
             //it--; //upperBound returns the item immediately following the last key.
             //if (it != queue.end() && it.key() == prio)
             auto it = queue.find(prio);
-            if (it != queue.end())
+            if (it != queue.end())            {
-            {
                 while (it != queue.end() && it.key() == prio)
                 {
                     it++;

meter.cpp

@@ -32,15 +32,15 @@ meter::meter(QWidget *parent) : QWidget(parent)
 
     meterType = meterS;
 
-    currentColor.setNamedColor("#148CD2");
+    currentColor = colorFromString("#148CD2");
     currentColor = currentColor.darker();
 
-    peakColor.setNamedColor("#3CA0DB");
+    peakColor = colorFromString("#3CA0DB");
     peakColor = peakColor.lighter();
 
-    averageColor.setNamedColor("#3FB7CD");
+    averageColor = colorFromString("#3FB7CD");
 
-    lowTextColor.setNamedColor("#eff0f1");
+    lowTextColor = colorFromString("#eff0f1");
     lowLineColor = lowTextColor;
 
     avgLevels.resize(averageBalisticLength, 0);

rigctld.cpp

@@ -445,7 +445,7 @@ void rigCtlClient::socketReadyRead()
                     break;
                 } else if (commands_list[i].sstr == '3')
                 {
-                    response.append("Model: WFVIEW");
+                    response.append(QString("Model: WFVIEW(%0)").arg(rigCaps->modelName));
                     ret = RIG_OK;
                     break;
                 } else if (commands_list[i].sstr == 0xf0)
@@ -1148,7 +1148,7 @@ int rigCtlClient::dumpState(QStringList &response, bool extended)
     // Supported RX bands (startf,endf,modes,low_power,high_power,vfo,ant)
     quint32 lowFreq = 0;
     quint32 highFreq = 0;
-    for (bandType band : rigCaps->bands)
+    for (const bandType &band : std::as_const(rigCaps->bands))
     {
         if (lowFreq == 0 || band.lowFreq < lowFreq)
             lowFreq = band.lowFreq;
@@ -1161,7 +1161,7 @@ int rigCtlClient::dumpState(QStringList &response, bool extended)
 
     if (rigCaps->hasTransmit) {
         // Supported TX bands (startf,endf,modes,low_power,high_power,vfo,ant)
-        for (bandType band : rigCaps->bands)
+        for (const bandType &band : std::as_const(rigCaps->bands))
         {
             response.append(QString("%1.000000 %2.000000 0x%3 %4 %5 0x%6 0x%7").arg(band.lowFreq).arg(band.highFreq)
                                 .arg(modes, 0, 16).arg(2000).arg(100000).arg(0x16000000, 0, 16).arg(getAntennas(), 0, 16));

settingswidget.cpp

@@ -1091,7 +1091,6 @@ void settingswidget::setAudioDevicesUI()
     ui->serverTXAudioOutputCombo->setCurrentIndex(-1);
     ui->serverTXAudioOutputCombo->setStyleSheet(QString("QComboBox QAbstractItemView {min-width: %1px;}").arg(audioDev->getNumCharsOut() + 30));
     ui->serverTXAudioOutputCombo->blockSignals(false);
-    int serverOutputIndex = -1;
 
     ui->serverRXAudioInputCombo->blockSignals(true);
     ui->serverRXAudioInputCombo->clear();
@@ -1099,7 +1098,6 @@ void settingswidget::setAudioDevicesUI()
     ui->serverRXAudioInputCombo->setCurrentIndex(-1);
     ui->serverRXAudioInputCombo->setStyleSheet(QString("QComboBox QAbstractItemView {min-width: %1px;}").arg(audioDev->getNumCharsIn()+30));
     ui->serverRXAudioInputCombo->blockSignals(false);
-    int serverInputIndex = -1;
 
     prefs->rxSetup.type = prefs->audioSystem;
     prefs->txSetup.type = prefs->audioSystem;
@@ -1110,9 +1108,7 @@ void settingswidget::setAudioDevicesUI()
         serverConfig->rigs.first()->txAudioSetup.type = prefs->audioSystem;
 
         ui->serverRXAudioInputCombo->setCurrentIndex(audioDev->findInput("Server", serverConfig->rigs.first()->rxAudioSetup.name));
-        //serverOutputIndex = audioDev->findOutput("Server", serverConfig->rigs.first()->txAudioSetup.name);
         ui->serverTXAudioOutputCombo->setCurrentIndex(audioDev->findOutput("Server", serverConfig->rigs.first()->txAudioSetup.name));
-        //serverInputIndex = audioDev->findOutput("Server", serverConfig->rigs.first()->txAudioSetup.name);
     }
 
     qDebug(logSystem()) << "Audio devices done.";
@@ -1214,7 +1210,6 @@ void settingswidget::populateServerUsers()
     // Copy data from serverConfig.users into the server UI table
     // We will assume the data are safe to use.
     bool blank = false;
-    int row=0;
     qDebug(logGui()) << "Adding server users. Size: " << serverConfig->users.size();
 
     QList<SERVERUSER>::iterator user = serverConfig->users.begin();
@@ -1224,7 +1219,6 @@ void settingswidget::populateServerUsers()
         serverAddUserLine(ui->serverUsersTable->rowCount()-1, user->username, user->password, user->userType);
         if((user->username == "") && !blank)
             blank = true;
-        row++;
         user++;
     }
 }
@@ -2170,7 +2164,11 @@ void settingswidget::setColorButtonOperations(QColor *colorStore,
     }
     getSetColor(d, e);
     QColor t = d->getColor();
+#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
+    colorStore->fromString(t.name(QColor::HexArgb));
+#else
     colorStore->setNamedColor(t.name(QColor::HexArgb));
+#endif
     //useCurrentColorPreset();
 }
 
@@ -2187,7 +2185,11 @@ void settingswidget::setColorLineEditOperations(QColor *colorStore,
 
     QString colorStrValidated = setColorFromString(e->text(), d);
     e->setText(colorStrValidated);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
+    colorStore->fromString(colorStrValidated);
+#else
     colorStore->setNamedColor(colorStrValidated);
+#endif
     //useCurrentColorPreset();
 }
 

spectrumscope.cpp

@@ -5,6 +5,8 @@
 spectrumScope::spectrumScope(bool scope, uchar receiver, uchar vfo, QWidget *parent)
     : QGroupBox{parent}, receiver(receiver), numVFO(vfo)
 {
+    // Not sure if this should actually be used?
+    Q_UNUSED(scope)
 
     QMutexLocker locker(&mutex);
 

usbcontroller.cpp

@@ -2046,7 +2046,7 @@ void usbController::restoreController(USBDEVICE* dev, QString file)
     dev->orientation = (quint8)settings->value("Orientation", 2).toInt();
     dev->speed = (quint8)settings->value("Speed", 2).toInt();
     dev->timeout = (quint8)settings->value("Timeout", 30).toInt();
-    dev->color.setNamedColor(settings->value("Color", QColor(Qt::white).name(QColor::HexArgb)).toString());
+    dev->color = colorFromString(settings->value("Color", QColor(Qt::white).name(QColor::HexArgb)).toString());
     dev->lcd = (funcs)settings->value("LCD",0).toInt();
 
     qInfo(logUsbControl()) << "Restore of" << dev->product << "path" << dev->path << "from" << file;
@@ -2095,9 +2095,9 @@ void usbController::restoreController(USBDEVICE* dev, QString file)
                             settings->value("Top", 0).toInt(),
                             settings->value("Width", 0).toInt(),
                             settings->value("Height", 0).toInt());
-            but.textColour.setNamedColor(settings->value("Colour", QColor(Qt::white).name(QColor::HexArgb)).toString());
+            but.textColour = colorFromString(settings->value("Colour", QColor(Qt::white).name(QColor::HexArgb)).toString());
-            but.backgroundOn.setNamedColor(settings->value("BackgroundOn", QColor(Qt::lightGray).name(QColor::HexArgb)).toString());
+            but.backgroundOn = colorFromString(settings->value("BackgroundOn", QColor(Qt::lightGray).name(QColor::HexArgb)).toString());
-            but.backgroundOff.setNamedColor(settings->value("BackgroundOff", QColor(Qt::blue).name(QColor::HexArgb)).toString());
+            but.backgroundOff = colorFromString(settings->value("BackgroundOff", QColor(Qt::blue).name(QColor::HexArgb)).toString());
             but.toggle = settings->value("Toggle", false).toBool();
 #if (QT_VERSION > QT_VERSION_CHECK(6,0,0))
             if (settings->value("Icon","") != "") {

wfmain.cpp

@@ -261,7 +261,7 @@ wfmain::wfmain(const QString settingsFile, const QString logFile, bool debugMode
             qInfo(logSystem()) << "User elected exit program.";
             prefs.settingsChanged = false;
             prefs.confirmExit = false;
-            QTimer::singleShot(10, [&](){
+            QTimer::singleShot(10, this, [&](){
                 on_exitBtn_clicked();
             });
         });
@@ -273,7 +273,7 @@ wfmain::wfmain(const QString settingsFile, const QString logFile, bool debugMode
             prefs.settingsChanged = true;
             prefs.hasRunSetup = true;
         });
-        connect(fts, &FirstTimeSetup::skipSetup, [=]() {
+        connect(fts, &FirstTimeSetup::skipSetup, this, [=]() {
             qInfo(logSystem()) << "User elected to skip the setup. Marking setup complete.";
             prefs.settingsChanged = true;
             prefs.hasRunSetup = true;
@@ -327,7 +327,7 @@ wfmain::wfmain(const QString settingsFile, const QString logFile, bool debugMode
           QToolTip::showText(QCursor::pos(), QString("%1").arg(value*100/255), nullptr);
         });
 
-    connect(ui->meter2Widget, &meter::configureMeterSignal,
+    connect(ui->meter2Widget, &meter::configureMeterSignal, this,
             [=](const meter_t &meterTypeRequested) {
         // Change the preferences and update settings widget to reflect new meter selection:
         prefs.meter2Type = meterTypeRequested;
@@ -338,7 +338,7 @@ wfmain::wfmain(const QString settingsFile, const QString logFile, bool debugMode
         ui->meter3Widget->blockMeterType(meterTypeRequested);
     });
 
-    connect(ui->meter3Widget, &meter::configureMeterSignal,
+    connect(ui->meter3Widget, &meter::configureMeterSignal, this,
             [=](const meter_t &meterTypeRequested) {
         // Change the preferences and update settings widget to reflect new meter selection:
         prefs.meter3Type = meterTypeRequested;
@@ -1472,8 +1472,10 @@ void wfmain::buttonControl(const COMMAND* cmd)
             receiver=1;
         } else if (receivers.size()){
             f.Hz = roundFrequencyWithStep(receivers[0]->getFrequency().Hz, cmd->value, tsWfScrollHz);
+        } else {
+            f.Hz = 0;
         }
-        f.MHzDouble = f.Hz / (double)1E6;
+        f.MHzDouble = f.Hz / double(1E6);
         f.VFO=(selVFO_t)cmd->suffix;
         queue->add(priorityImmediate,queueItem((funcs)cmd->command,QVariant::fromValue<freqt>(f),receiver));
         break;
@@ -1672,34 +1674,34 @@ void wfmain::loadSettings()
                     p->presetName->clear();
                     p->presetName->append(tempName);
             }
-            p->gridColor.setNamedColor(settings->value("gridColor", p->gridColor.name(QColor::HexArgb)).toString());
+            p->gridColor = colorFromString(settings->value("gridColor", p->gridColor.name(QColor::HexArgb)).toString());
-            p->axisColor.setNamedColor(settings->value("axisColor", p->axisColor.name(QColor::HexArgb)).toString());
+            p->axisColor = colorFromString(settings->value("axisColor", p->axisColor.name(QColor::HexArgb)).toString());
-            p->textColor.setNamedColor(settings->value("textColor", p->textColor.name(QColor::HexArgb)).toString());
+            p->textColor = colorFromString(settings->value("textColor", p->textColor.name(QColor::HexArgb)).toString());
-            p->spectrumLine.setNamedColor(settings->value("spectrumLine", p->spectrumLine.name(QColor::HexArgb)).toString());
+            p->spectrumLine = colorFromString(settings->value("spectrumLine", p->spectrumLine.name(QColor::HexArgb)).toString());
-            p->spectrumFill.setNamedColor(settings->value("spectrumFill", p->spectrumFill.name(QColor::HexArgb)).toString());
+            p->spectrumFill = colorFromString(settings->value("spectrumFill", p->spectrumFill.name(QColor::HexArgb)).toString());
             p->useSpectrumFillGradient = settings->value("useSpectrumFillGradient", p->useSpectrumFillGradient).toBool();
-            p->spectrumFillTop.setNamedColor(settings->value("spectrumFillTop", p->spectrumFillTop.name(QColor::HexArgb)).toString());
+            p->spectrumFillTop = colorFromString(settings->value("spectrumFillTop", p->spectrumFillTop.name(QColor::HexArgb)).toString());
-            p->spectrumFillBot.setNamedColor(settings->value("spectrumFillBot", p->spectrumFillBot.name(QColor::HexArgb)).toString());
+            p->spectrumFillBot = colorFromString(settings->value("spectrumFillBot", p->spectrumFillBot.name(QColor::HexArgb)).toString());
-            p->underlayLine.setNamedColor(settings->value("underlayLine", p->underlayLine.name(QColor::HexArgb)).toString());
+            p->underlayLine = colorFromString(settings->value("underlayLine", p->underlayLine.name(QColor::HexArgb)).toString());
-            p->underlayFill.setNamedColor(settings->value("underlayFill", p->underlayFill.name(QColor::HexArgb)).toString());
+            p->underlayFill = colorFromString(settings->value("underlayFill", p->underlayFill.name(QColor::HexArgb)).toString());
             p->useUnderlayFillGradient = settings->value("useUnderlayFillGradient", p->useUnderlayFillGradient).toBool();
-            p->underlayFillTop.setNamedColor(settings->value("underlayFillTop", p->underlayFillTop.name(QColor::HexArgb)).toString());
+            p->underlayFillTop = colorFromString(settings->value("underlayFillTop", p->underlayFillTop.name(QColor::HexArgb)).toString());
-            p->underlayFillBot.setNamedColor(settings->value("underlayFillBot", p->underlayFillBot.name(QColor::HexArgb)).toString());
+            p->underlayFillBot = colorFromString(settings->value("underlayFillBot", p->underlayFillBot.name(QColor::HexArgb)).toString());
-            p->plotBackground.setNamedColor(settings->value("plotBackground", p->plotBackground.name(QColor::HexArgb)).toString());
+            p->plotBackground = colorFromString(settings->value("plotBackground", p->plotBackground.name(QColor::HexArgb)).toString());
-            p->tuningLine.setNamedColor(settings->value("tuningLine", p->tuningLine.name(QColor::HexArgb)).toString());
+            p->tuningLine = colorFromString(settings->value("tuningLine", p->tuningLine.name(QColor::HexArgb)).toString());
-            p->passband.setNamedColor(settings->value("passband", p->passband.name(QColor::HexArgb)).toString());
+            p->passband = colorFromString(settings->value("passband", p->passband.name(QColor::HexArgb)).toString());
-            p->pbt.setNamedColor(settings->value("pbt", p->pbt.name(QColor::HexArgb)).toString());
+            p->pbt = colorFromString(settings->value("pbt", p->pbt.name(QColor::HexArgb)).toString());
-            p->wfBackground.setNamedColor(settings->value("wfBackground", p->wfBackground.name(QColor::HexArgb)).toString());
+            p->wfBackground = colorFromString(settings->value("wfBackground", p->wfBackground.name(QColor::HexArgb)).toString());
-            p->wfGrid.setNamedColor(settings->value("wfGrid", p->wfGrid.name(QColor::HexArgb)).toString());
+            p->wfGrid = colorFromString(settings->value("wfGrid", p->wfGrid.name(QColor::HexArgb)).toString());
-            p->wfAxis.setNamedColor(settings->value("wfAxis", p->wfAxis.name(QColor::HexArgb)).toString());
+            p->wfAxis = colorFromString(settings->value("wfAxis", p->wfAxis.name(QColor::HexArgb)).toString());
-            p->wfText.setNamedColor(settings->value("wfText", p->wfText.name(QColor::HexArgb)).toString());
+            p->wfText = colorFromString(settings->value("wfText", p->wfText.name(QColor::HexArgb)).toString());
-            p->meterLevel.setNamedColor(settings->value("meterLevel", p->meterLevel.name(QColor::HexArgb)).toString());
+            p->meterLevel = colorFromString(settings->value("meterLevel", p->meterLevel.name(QColor::HexArgb)).toString());
-            p->meterAverage.setNamedColor(settings->value("meterAverage", p->meterAverage.name(QColor::HexArgb)).toString());
+            p->meterAverage = colorFromString(settings->value("meterAverage", p->meterAverage.name(QColor::HexArgb)).toString());
-            p->meterPeakLevel.setNamedColor(settings->value("meterPeakLevel", p->meterPeakLevel.name(QColor::HexArgb)).toString());
+            p->meterPeakLevel = colorFromString(settings->value("meterPeakLevel", p->meterPeakLevel.name(QColor::HexArgb)).toString());
-            p->meterPeakScale.setNamedColor(settings->value("meterPeakScale", p->meterPeakScale.name(QColor::HexArgb)).toString());
+            p->meterPeakScale = colorFromString(settings->value("meterPeakScale", p->meterPeakScale.name(QColor::HexArgb)).toString());
-            p->meterLowerLine.setNamedColor(settings->value("meterLowerLine", p->meterLowerLine.name(QColor::HexArgb)).toString());
+            p->meterLowerLine = colorFromString(settings->value("meterLowerLine", p->meterLowerLine.name(QColor::HexArgb)).toString());
-            p->meterLowText.setNamedColor(settings->value("meterLowText", p->meterLowText.name(QColor::HexArgb)).toString());
+            p->meterLowText = colorFromString(settings->value("meterLowText", p->meterLowText.name(QColor::HexArgb)).toString());
-            p->clusterSpots.setNamedColor(settings->value("clusterSpots", p->clusterSpots.name(QColor::HexArgb)).toString());
+            p->clusterSpots = colorFromString(settings->value("clusterSpots", p->clusterSpots.name(QColor::HexArgb)).toString());
         }
     }
     settings->endArray();
@@ -2007,7 +2009,7 @@ void wfmain::loadSettings()
             tempPrefs.orientation = (quint8)settings->value("Orientation", 2).toInt();
             tempPrefs.speed = (quint8)settings->value("Speed", 2).toInt();
             tempPrefs.timeout = (quint8)settings->value("Timeout", 30).toInt();
-            tempPrefs.color.setNamedColor(settings->value("Color", QColor(Qt::white).name(QColor::HexArgb)).toString());
+            tempPrefs.color = colorFromString(settings->value("Color", QColor(Qt::white).name(QColor::HexArgb)).toString());
             tempPrefs.lcd = (funcs)settings->value("LCD",0).toInt();
 
             if (!tempPrefs.path.isEmpty()) {
@@ -2043,9 +2045,9 @@ void wfmain::loadSettings()
                 settings->value("Top", 0).toInt(),
                 settings->value("Width", 0).toInt(),
                 settings->value("Height", 0).toInt());
-            butt.textColour.setNamedColor(settings->value("Colour", QColor(Qt::white).name(QColor::HexArgb)).toString());
+            butt.textColour = colorFromString(settings->value("Colour", QColor(Qt::white).name(QColor::HexArgb)).toString());
-            butt.backgroundOn.setNamedColor(settings->value("BackgroundOn", QColor(Qt::lightGray).name(QColor::HexArgb)).toString());
+            butt.backgroundOn = colorFromString(settings->value("BackgroundOn", QColor(Qt::lightGray).name(QColor::HexArgb)).toString());
-            butt.backgroundOff.setNamedColor(settings->value("BackgroundOff", QColor(Qt::blue).name(QColor::HexArgb)).toString());
+            butt.backgroundOff = colorFromString(settings->value("BackgroundOff", QColor(Qt::blue).name(QColor::HexArgb)).toString());
             butt.toggle = settings->value("Toggle", false).toBool();
             // PET add Linux as it stops Qt6 building FIXME
 #if (QT_VERSION > QT_VERSION_CHECK(6,0,0) && !defined(Q_OS_LINUX) && !defined(Q_OS_MACOS))
@@ -4665,7 +4667,7 @@ void wfmain::on_rigPowerOffBtn_clicked()
     msgbox.setDefaultButton(QMessageBox::Yes);
     msgbox.setCheckBox(cb);
 
-    QObject::connect(cb, &QCheckBox::stateChanged, [this](int state) {
+    QObject::connect(cb, &QCheckBox::stateChanged, this, [this](int state) {
         if (static_cast<Qt::CheckState>(state) == Qt::CheckState::Checked) {
             prefs.confirmPowerOff = false;
         }

wfviewtypes.h

@@ -5,8 +5,9 @@
 #include <QObject>
 #include <QString>
 #include <QtGlobal>
+#include <QColor>
 #include <stdint.h>
-#include <memory>
+//#include <memory>
 
 
 enum valueType { typeNone=0, typeFloat, typeFloatDiv, typeFloatDiv5, typeUChar, typeUShort,
@@ -179,42 +180,6 @@ struct timekind {
     bool isMinus;
 };
 
-/*
-enum cmds {
-cmdNone, cmdGetRigID, cmdGetRigCIV, cmdGetFreq, cmdGetFreqB, cmdSetFreq, cmdGetMode, cmdSetMode,
-cmdGetDataMode, cmdSetModeFilter, cmdSetDataModeOn, cmdSetDataModeOff, cmdGetRitEnabled, cmdGetRitValue,
-cmdSpecOn, cmdSpecOff, cmdDispEnable, cmdDispDisable, cmdGetRxGain, cmdSetRxRfGain, cmdGetAfGain, cmdSetAfGain,
-cmdGetSql, cmdSetSql, cmdGetIFShift, cmdSetIFShift, cmdGetNRLevel, cmdSetNRLevel, cmdGetPBTInner, cmdSetPBTInner,
-cmdGetPBTOuter, cmdSetPBTOuter, cmdGetPassband, cmdSetPassband, cmdGetNBLevel, cmdSetNBLevel,
-cmdGetCompLevel, cmdSetCompLevel, cmdGetTuningStep, cmdSetTuningStep,
-cmdGetMonitorGain, cmdSetMonitorGain, cmdGetVoxGain, cmdSetVoxGain, cmdGetAntiVoxGain, cmdSetAntiVoxGain,
-cmdGetCwPitch, cmdGetPskTone, cmdGetRttyMark, cmdSetCwPitch, cmdSetPskTone, cmdSetRttyMark,
-cmdGetVox,cmdSetVox, cmdGetMonitor,cmdSetMonitor, cmdGetComp, cmdSetComp, cmdGetNB, cmdSetNB, cmdGetNR, cmdSetNR,
-cmdSetATU, cmdStartATU, cmdGetATUStatus,
-cmdGetspectrumMode_t, cmdGetSpectrumSpan, cmdScopeCenterMode, cmdScopeFixedMode,
-cmdGetPTT, cmdSetPTT,cmdPTTToggle,
-cmdGetTxPower, cmdSetTxPower, cmdGetMicGain, cmdSetMicGain, cmdGetModLevel, cmdSetModLevel,
-cmdGetSpectrumRefLevel, cmdGetDuplexMode, cmdGetModInput, cmdGetModDataInput,
-cmdGetCurrentModLevel, cmdStartRegularPolling, cmdStopRegularPolling, cmdQueNormalSpeed,
-cmdGetVdMeter, cmdGetIdMeter, cmdGetSMeter, cmdGetCenterMeter, cmdGetPowerMeter,
-cmdGetSWRMeter, cmdGetALCMeter, cmdGetCompMeter, cmdGetTxRxMeter,
-cmdGetTone, cmdGetTSQL, cmdGetToneEnabled, cmdGetTSQLEnabled, cmdGetDTCS,
-cmdSetToneEnabled, cmdSetTSQLEnabled, cmdGetRptAccessMode, cmdSetTone, cmdSetTSQL,
-cmdSetRptAccessMode, cmdSetRptDuplexOffset, cmdGetRptDuplexOffset,
-cmdSelVFO, cmdVFOSwap, cmdVFOEqualAB, cmdVFOEqualMS, cmdSetQuickSplit,
-cmdGetPreamp, cmdGetAttenuator, cmdGetAntenna,
-cmdGetBandStackReg, cmdGetKeySpeed, cmdSetKeySpeed, cmdGetBreakMode, cmdSetBreakMode, cmdSendCW, cmdStopCW, cmdGetDashRatio, cmdSetDashRatio,
-cmdSetTime, cmdSetDate, cmdSetUTCOffset,
-cmdGetTransceive, cmdSetTransceive,cmdGetPower,cmdSetPower,
-cmdGetMemory, cmdGetSatMemory, cmdSetMemory, cmdClearMemory,cmdRecallMemory, cmdSetVFOMode, cmdSetMemoryMode, cmdSetSatelliteMode,
-// Below Only used for USB Controller at the moment.
-cmdSetBandUp, cmdSetBandDown, cmdSetModeUp, cmdSetModeDown, cmdSetStepUp, cmdSetStepDown,
-cmdSetSpanUp, cmdSetSpanDown, cmdIFFilterUp, cmdIFFilterDown, cmdPageDown, cmdPageUp,
-cmdLCDWaterfall, cmdLCDSpectrum, cmdLCDNothing, cmdSeparator
-};
-
-*/
-
 
 // funcs and funcString MUST match exactly (and NUMFUNCS must be updated)
 #define NUMFUNCS 248
@@ -448,6 +413,18 @@ struct periodicType {
     char receiver;
 };
 
+// Some global "helper" functions can go here for now, maybe look at a better location at some point?
+inline QColor colorFromString(const QString& color)
+{
+#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
+    return QColor::fromString(color);
+#else
+    QColor c;
+    c.setNamedColor(color);
+    return c;
+#endif
+}
+
 inline QString getMeterDebug(meter_t m) {
     QString rtn = QString("Meter name: ");
     switch(m) {
@@ -505,7 +482,6 @@ Q_DECLARE_METATYPE(duplexMode_t)
 Q_DECLARE_METATYPE(rptAccessTxRx_t)
 Q_DECLARE_METATYPE(rptrAccessData)
 Q_DECLARE_METATYPE(usbFeatureType)
-//Q_DECLARE_METATYPE(cmds)
 Q_DECLARE_METATYPE(funcs)
 Q_DECLARE_METATYPE(memoryType)
 Q_DECLARE_METATYPE(antennaInfo)