From 3b5b2221148d7c45bbe25759c6734409dea82837 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Thu, 17 Nov 2022 14:36:12 +0000 Subject: [PATCH] Update plugins to compile with Qt5 and Qt6 --- .../beamsteeringcwmodgui.cpp | 2 +- .../beamsteeringcwmod/beamsteeringcwmodgui.h | 2 +- plugins/channelmimo/doa2/doa2gui.cpp | 2 +- plugins/channelmimo/doa2/doa2gui.h | 2 +- .../interferometer/interferometergui.cpp | 2 +- .../interferometer/interferometergui.h | 2 +- .../channelrx/chanalyzer/chanalyzergui.cpp | 2 +- plugins/channelrx/chanalyzer/chanalyzergui.h | 2 +- plugins/channelrx/demodadsb/adsbdemodgui.cpp | 9 +++++-- plugins/channelrx/demodadsb/adsbdemodgui.h | 2 +- .../demodadsb/adsbosmtemplateserver.h | 3 ++- plugins/channelrx/demodais/aisdemodgui.cpp | 2 +- plugins/channelrx/demodais/aisdemodgui.h | 2 +- plugins/channelrx/demodam/amdemodgui.cpp | 2 +- plugins/channelrx/demodam/amdemodgui.h | 2 +- plugins/channelrx/demodapt/aptdemodgui.cpp | 2 +- plugins/channelrx/demodapt/aptdemodgui.h | 2 +- .../demodapt/aptdemodimageworker.cpp | 2 +- plugins/channelrx/demodatv/atvdemodgui.cpp | 2 +- plugins/channelrx/demodatv/atvdemodgui.h | 2 +- plugins/channelrx/demodbfm/bfmdemodgui.cpp | 2 +- plugins/channelrx/demodbfm/bfmdemodgui.h | 2 +- plugins/channelrx/demoddab/dabdemodgui.cpp | 2 +- plugins/channelrx/demoddab/dabdemodgui.h | 2 +- plugins/channelrx/demoddatv/datvdemodgui.cpp | 2 +- plugins/channelrx/demoddatv/datvdemodgui.h | 2 +- plugins/channelrx/demoddatv/leansdr/generic.h | 4 +++ plugins/channelrx/demoddsd/dsddemodgui.cpp | 2 +- plugins/channelrx/demoddsd/dsddemodgui.h | 2 +- .../channelrx/demodfreedv/freedvdemodgui.cpp | 2 +- .../channelrx/demodfreedv/freedvdemodgui.h | 2 +- plugins/channelrx/demodm17/m17demodgui.cpp | 2 +- plugins/channelrx/demodm17/m17demodgui.h | 2 +- plugins/channelrx/demodnfm/nfmdemodgui.cpp | 2 +- plugins/channelrx/demodnfm/nfmdemodgui.h | 2 +- .../channelrx/demodpacket/packetdemodgui.cpp | 2 +- .../channelrx/demodpacket/packetdemodgui.h | 2 +- .../channelrx/demodpager/pagerdemodgui.cpp | 2 +- plugins/channelrx/demodpager/pagerdemodgui.h | 2 +- .../channelrx/demodpager/pagerdemodsink.cpp | 4 +-- .../demodradiosonde/radiosondedemodgui.cpp | 2 +- .../demodradiosonde/radiosondedemodgui.h | 2 +- plugins/channelrx/demodssb/ssbdemodgui.cpp | 2 +- plugins/channelrx/demodssb/ssbdemodgui.h | 2 +- plugins/channelrx/demodvor/vordemodgui.cpp | 2 +- plugins/channelrx/demodvor/vordemodgui.h | 2 +- .../channelrx/demodvormc/vordemodmcgui.cpp | 2 +- plugins/channelrx/demodvormc/vordemodmcgui.h | 2 +- plugins/channelrx/demodwfm/wfmdemodgui.cpp | 2 +- plugins/channelrx/demodwfm/wfmdemodgui.h | 2 +- plugins/channelrx/filesink/filesinkgui.cpp | 2 +- plugins/channelrx/filesink/filesinkgui.h | 2 +- .../channelrx/freqtracker/freqtrackergui.cpp | 2 +- .../channelrx/freqtracker/freqtrackergui.h | 2 +- plugins/channelrx/localsink/localsinkgui.cpp | 2 +- plugins/channelrx/localsink/localsinkgui.h | 2 +- plugins/channelrx/noisefigure/noisefigure.cpp | 2 +- .../noisefigure/noisefigureenrdialog.h | 2 ++ .../channelrx/noisefigure/noisefiguregui.cpp | 2 +- .../channelrx/noisefigure/noisefiguregui.h | 4 ++- .../radioastronomy/radioastronomygui.cpp | 2 +- .../radioastronomy/radioastronomygui.h | 4 ++- .../channelrx/radioclock/radioclockgui.cpp | 2 +- plugins/channelrx/radioclock/radioclockgui.h | 2 +- .../channelrx/remotesink/remotesinkgui.cpp | 2 +- plugins/channelrx/remotesink/remotesinkgui.h | 2 +- .../remotetcpsink/remotetcpsinkgui.cpp | 2 +- .../remotetcpsink/remotetcpsinkgui.h | 2 +- .../sigmffilesink/sigmffilesinkgui.cpp | 2 +- .../sigmffilesink/sigmffilesinkgui.h | 2 +- plugins/channelrx/udpsink/udpsinkgui.cpp | 2 +- plugins/channelrx/udpsink/udpsinkgui.h | 2 +- .../channeltx/filesource/filesourcegui.cpp | 2 +- plugins/channeltx/filesource/filesourcegui.h | 2 +- .../channeltx/localsource/localsourcegui.cpp | 2 +- .../channeltx/localsource/localsourcegui.h | 2 +- .../mod802.15.4/ieee_802_15_4_modgui.cpp | 2 +- .../mod802.15.4/ieee_802_15_4_modgui.h | 2 +- .../mod802.15.4/ieee_802_15_4_modsource.cpp | 1 + plugins/channeltx/modais/aismodgui.cpp | 2 +- plugins/channeltx/modais/aismodgui.h | 2 +- plugins/channeltx/modam/ammodgui.cpp | 2 +- plugins/channeltx/modam/ammodgui.h | 2 +- plugins/channeltx/modatv/atvmodgui.cpp | 2 +- plugins/channeltx/modatv/atvmodgui.h | 2 +- .../modchirpchat/chirpchatmodgui.cpp | 2 +- .../channeltx/modchirpchat/chirpchatmodgui.h | 2 +- plugins/channeltx/moddatv/datvmodgui.cpp | 2 +- plugins/channeltx/moddatv/datvmodgui.h | 2 +- plugins/channeltx/modfreedv/freedvmodgui.cpp | 2 +- plugins/channeltx/modfreedv/freedvmodgui.h | 2 +- plugins/channeltx/modm17/m17modgui.cpp | 6 ++--- plugins/channeltx/modm17/m17modgui.h | 6 ++--- plugins/channeltx/modnfm/nfmmodgui.cpp | 6 ++--- plugins/channeltx/modnfm/nfmmodgui.h | 6 ++--- plugins/channeltx/modpacket/packetmodgui.cpp | 2 +- plugins/channeltx/modpacket/packetmodgui.h | 2 +- plugins/channeltx/modssb/ssbmodgui.cpp | 2 +- plugins/channeltx/modssb/ssbmodgui.h | 2 +- plugins/channeltx/modwfm/wfmmodgui.cpp | 2 +- plugins/channeltx/modwfm/wfmmodgui.h | 2 +- .../remotesource/remotesourcegui.cpp | 2 +- .../channeltx/remotesource/remotesourcegui.h | 2 +- .../remotesource/remotesourceworker.cpp | 1 + plugins/channeltx/udpsource/udpsourcegui.cpp | 2 +- plugins/channeltx/udpsource/udpsourcegui.h | 2 +- plugins/feature/aprs/aprsgui.h | 2 ++ plugins/feature/aprs/aprsworker.cpp | 2 +- .../feature/pertester/pertestersettings.cpp | 1 + plugins/feature/radiosonde/radiosondegui.h | 2 ++ .../feature/remotecontrol/remotecontrolgui.h | 2 ++ .../satellitedevicesettingsgui.cpp | 12 ++++----- .../satellitetracker/satellitetrackergui.h | 2 ++ .../satellitetrackersettings.cpp | 27 ++++++++++--------- .../satellitetracker/satellitetrackersgp4.h | 2 ++ plugins/feature/satellitetracker/satnogs.h | 1 + .../feature/startracker/startrackergui.cpp | 2 +- plugins/feature/startracker/startrackergui.h | 2 ++ .../audiooutput/audiooutputsettings.h | 8 ++---- .../samplesource/audioinput/audioinput.cpp | 2 +- .../samplesource/audioinput/audioinputgui.cpp | 6 ++--- .../audioinput/audioinputsettings.h | 8 ++---- 122 files changed, 174 insertions(+), 149 deletions(-) diff --git a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodgui.cpp b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodgui.cpp index fe4f37f47..e2c409655 100644 --- a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodgui.cpp +++ b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodgui.cpp @@ -194,7 +194,7 @@ void BeamSteeringCWModGUI::leaveEvent(QEvent*) m_channelMarker.setHighlighted(false); } -void BeamSteeringCWModGUI::enterEvent(QEvent*) +void BeamSteeringCWModGUI::enterEvent(EnterEventType*) { m_channelMarker.setHighlighted(true); } diff --git a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodgui.h b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodgui.h index ae9eb358a..6c9b93ff8 100644 --- a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodgui.h +++ b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodgui.h @@ -89,7 +89,7 @@ private: void updateAbsoluteCenterFrequency(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); void applyInterpolation(); void applyPosition(); diff --git a/plugins/channelmimo/doa2/doa2gui.cpp b/plugins/channelmimo/doa2/doa2gui.cpp index b341f4155..2067aa29f 100644 --- a/plugins/channelmimo/doa2/doa2gui.cpp +++ b/plugins/channelmimo/doa2/doa2gui.cpp @@ -260,7 +260,7 @@ void DOA2GUI::leaveEvent(QEvent*) m_channelMarker.setHighlighted(false); } -void DOA2GUI::enterEvent(QEvent*) +void DOA2GUI::enterEvent(EnterEventType*) { m_channelMarker.setHighlighted(true); } diff --git a/plugins/channelmimo/doa2/doa2gui.h b/plugins/channelmimo/doa2/doa2gui.h index db099aaa4..ca2100f88 100644 --- a/plugins/channelmimo/doa2/doa2gui.h +++ b/plugins/channelmimo/doa2/doa2gui.h @@ -94,7 +94,7 @@ private: void updateDOA(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); private slots: void handleSourceMessages(); diff --git a/plugins/channelmimo/interferometer/interferometergui.cpp b/plugins/channelmimo/interferometer/interferometergui.cpp index 6f2b85468..6f135d448 100644 --- a/plugins/channelmimo/interferometer/interferometergui.cpp +++ b/plugins/channelmimo/interferometer/interferometergui.cpp @@ -229,7 +229,7 @@ void InterferometerGUI::leaveEvent(QEvent*) m_channelMarker.setHighlighted(false); } -void InterferometerGUI::enterEvent(QEvent*) +void InterferometerGUI::enterEvent(EnterEventType*) { m_channelMarker.setHighlighted(true); } diff --git a/plugins/channelmimo/interferometer/interferometergui.h b/plugins/channelmimo/interferometer/interferometergui.h index 02bcf6cab..22c193d1e 100644 --- a/plugins/channelmimo/interferometer/interferometergui.h +++ b/plugins/channelmimo/interferometer/interferometergui.h @@ -91,7 +91,7 @@ private: void updateAbsoluteCenterFrequency(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); private slots: void handleSourceMessages(); diff --git a/plugins/channelrx/chanalyzer/chanalyzergui.cpp b/plugins/channelrx/chanalyzer/chanalyzergui.cpp index b85da7f58..2169fe1b6 100644 --- a/plugins/channelrx/chanalyzer/chanalyzergui.cpp +++ b/plugins/channelrx/chanalyzer/chanalyzergui.cpp @@ -703,7 +703,7 @@ void ChannelAnalyzerGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void ChannelAnalyzerGUI::enterEvent(QEvent* event) +void ChannelAnalyzerGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channelrx/chanalyzer/chanalyzergui.h b/plugins/channelrx/chanalyzer/chanalyzergui.h index 1744544b6..34e1223f7 100644 --- a/plugins/channelrx/chanalyzer/chanalyzergui.h +++ b/plugins/channelrx/chanalyzer/chanalyzergui.h @@ -100,7 +100,7 @@ private: void updateAbsoluteCenterFrequency(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); private slots: void on_deltaFrequency_changed(qint64 value); diff --git a/plugins/channelrx/demodadsb/adsbdemodgui.cpp b/plugins/channelrx/demodadsb/adsbdemodgui.cpp index 605bedcfb..385878a98 100644 --- a/plugins/channelrx/demodadsb/adsbdemodgui.cpp +++ b/plugins/channelrx/demodadsb/adsbdemodgui.cpp @@ -1947,7 +1947,7 @@ void ADSBDemodGUI::decodeCommB(const QByteArray data, const QDateTime dateTime, } airlineRegistration[2] = '\0'; QString airlineRegistrationString = QString(airlineRegistration).trimmed(); - bool airlineRegistrationInvalid = QString(airlineRegistrationStatus).contains('#') || !QChar::isLetter(c[0]) || !QChar::isLetter(c[1]); + bool airlineRegistrationInvalid = QString(airlineRegistrationString).contains('#') || !QChar::isLetter(c[0]) || !QChar::isLetter(c[1]); bool airlineRegistrationInconsistent = !airlineRegistrationStatus && (c[0] || c[1]); bool bds_2_1 = !aircraftRegistrationInvalid && !aircraftRegistrationInconsistent && !airlineRegistrationInvalid && !airlineRegistrationInconsistent; @@ -4599,6 +4599,11 @@ void ADSBDemodGUI::applyMapSettings() Real stationAltitude = MainCore::instance()->getSettings().getAltitude(); QQuickItem *item = ui->map->rootObject(); + if (!item) + { + qCritical("ADSBDemodGUI::applyMapSettings: Map not found. Are all required Qt plugins installed?"); + return; + } QObject *object = item->findChild("map"); QGeoCoordinate coords; @@ -5067,7 +5072,7 @@ void ADSBDemodGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void ADSBDemodGUI::enterEvent(QEvent* event) +void ADSBDemodGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channelrx/demodadsb/adsbdemodgui.h b/plugins/channelrx/demodadsb/adsbdemodgui.h index 8bf57accf..6c79cf271 100644 --- a/plugins/channelrx/demodadsb/adsbdemodgui.h +++ b/plugins/channelrx/demodadsb/adsbdemodgui.h @@ -1016,7 +1016,7 @@ private: void applyImportSettings(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); private slots: void on_deltaFrequency_changed(qint64 value); diff --git a/plugins/channelrx/demodadsb/adsbosmtemplateserver.h b/plugins/channelrx/demodadsb/adsbosmtemplateserver.h index 4f744e578..e1ffb9fb0 100644 --- a/plugins/channelrx/demodadsb/adsbosmtemplateserver.h +++ b/plugins/channelrx/demodadsb/adsbosmtemplateserver.h @@ -21,6 +21,7 @@ #include #include #include +#include // Redirect OSM maps so we can support Street, Satellite and an Aviation map (CartoDB position) class ADSBOSMTemplateServer : public QTcpServer @@ -56,7 +57,7 @@ private slots: if (socket->canReadLine()) { QString line = socket->readLine(); - QStringList tokens = QString(line).split(QRegExp("[ \r\n][ \r\n]*")); + QStringList tokens = QString(line).split(QRegularExpression("[ \r\n][ \r\n]*")); if (tokens[0] == "GET") { bool hires = tokens[1].contains("hires"); diff --git a/plugins/channelrx/demodais/aisdemodgui.cpp b/plugins/channelrx/demodais/aisdemodgui.cpp index 2a3e708e8..b365a9bb7 100644 --- a/plugins/channelrx/demodais/aisdemodgui.cpp +++ b/plugins/channelrx/demodais/aisdemodgui.cpp @@ -632,7 +632,7 @@ void AISDemodGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void AISDemodGUI::enterEvent(QEvent* event) +void AISDemodGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channelrx/demodais/aisdemodgui.h b/plugins/channelrx/demodais/aisdemodgui.h index 7209daaf1..e644ede36 100644 --- a/plugins/channelrx/demodais/aisdemodgui.h +++ b/plugins/channelrx/demodais/aisdemodgui.h @@ -104,7 +104,7 @@ private: void updateAbsoluteCenterFrequency(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); void resizeTable(); QAction *createCheckableItem(QString& text, int idx, bool checked, const char *slot); diff --git a/plugins/channelrx/demodam/amdemodgui.cpp b/plugins/channelrx/demodam/amdemodgui.cpp index 360fad1b8..fcc729bbc 100644 --- a/plugins/channelrx/demodam/amdemodgui.cpp +++ b/plugins/channelrx/demodam/amdemodgui.cpp @@ -404,7 +404,7 @@ void AMDemodGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void AMDemodGUI::enterEvent(QEvent* event) +void AMDemodGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channelrx/demodam/amdemodgui.h b/plugins/channelrx/demodam/amdemodgui.h index cedcf4b0c..5f442266d 100644 --- a/plugins/channelrx/demodam/amdemodgui.h +++ b/plugins/channelrx/demodam/amdemodgui.h @@ -79,7 +79,7 @@ private: void updateAbsoluteCenterFrequency(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); private slots: void on_deltaFrequency_changed(qint64 value); diff --git a/plugins/channelrx/demodapt/aptdemodgui.cpp b/plugins/channelrx/demodapt/aptdemodgui.cpp index 25cd5af69..277d3851e 100644 --- a/plugins/channelrx/demodapt/aptdemodgui.cpp +++ b/plugins/channelrx/demodapt/aptdemodgui.cpp @@ -827,7 +827,7 @@ void APTDemodGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void APTDemodGUI::enterEvent(QEvent* event) +void APTDemodGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channelrx/demodapt/aptdemodgui.h b/plugins/channelrx/demodapt/aptdemodgui.h index 71fc5b2cf..e48acecc9 100644 --- a/plugins/channelrx/demodapt/aptdemodgui.h +++ b/plugins/channelrx/demodapt/aptdemodgui.h @@ -133,7 +133,7 @@ private: void resetDecoder(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); private slots: void on_deltaFrequency_changed(qint64 value); diff --git a/plugins/channelrx/demodapt/aptdemodimageworker.cpp b/plugins/channelrx/demodapt/aptdemodimageworker.cpp index 185bad321..d33c11127 100644 --- a/plugins/channelrx/demodapt/aptdemodimageworker.cpp +++ b/plugins/channelrx/demodapt/aptdemodimageworker.cpp @@ -486,7 +486,7 @@ QRgb APTDemodImageWorker::findNearest(const QImage &image, double latitude, doub yMin = std::max(yMin, yStartPostCrop); yMax = std::min(yMax, yEndPostCrop); xMin = std::max(xMin, 0); - xMax = std::min(xMax, m_pixelCoords[0].size()); + xMax = std::min(xMax, (int)m_pixelCoords[0].size()); } const int ySize = yEndPostCrop-1; diff --git a/plugins/channelrx/demodatv/atvdemodgui.cpp b/plugins/channelrx/demodatv/atvdemodgui.cpp index 1c91dd850..11f363966 100644 --- a/plugins/channelrx/demodatv/atvdemodgui.cpp +++ b/plugins/channelrx/demodatv/atvdemodgui.cpp @@ -415,7 +415,7 @@ void ATVDemodGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void ATVDemodGUI::enterEvent(QEvent* event) +void ATVDemodGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channelrx/demodatv/atvdemodgui.h b/plugins/channelrx/demodatv/atvdemodgui.h index 663d565a9..50a7ffd1b 100644 --- a/plugins/channelrx/demodatv/atvdemodgui.h +++ b/plugins/channelrx/demodatv/atvdemodgui.h @@ -103,7 +103,7 @@ private: void updateAbsoluteCenterFrequency(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); private slots: void handleSourceMessages(); diff --git a/plugins/channelrx/demodbfm/bfmdemodgui.cpp b/plugins/channelrx/demodbfm/bfmdemodgui.cpp index 01995ff02..daacf41dc 100644 --- a/plugins/channelrx/demodbfm/bfmdemodgui.cpp +++ b/plugins/channelrx/demodbfm/bfmdemodgui.cpp @@ -509,7 +509,7 @@ void BFMDemodGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void BFMDemodGUI::enterEvent(QEvent* event) +void BFMDemodGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channelrx/demodbfm/bfmdemodgui.h b/plugins/channelrx/demodbfm/bfmdemodgui.h index 7b3f441a3..ed4a5b42e 100644 --- a/plugins/channelrx/demodbfm/bfmdemodgui.h +++ b/plugins/channelrx/demodbfm/bfmdemodgui.h @@ -97,7 +97,7 @@ private: void updateAbsoluteCenterFrequency(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); void changeFrequency(qint64 f); diff --git a/plugins/channelrx/demoddab/dabdemodgui.cpp b/plugins/channelrx/demoddab/dabdemodgui.cpp index af7515879..4aa91d933 100644 --- a/plugins/channelrx/demoddab/dabdemodgui.cpp +++ b/plugins/channelrx/demoddab/dabdemodgui.cpp @@ -595,7 +595,7 @@ void DABDemodGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void DABDemodGUI::enterEvent(QEvent* event) +void DABDemodGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channelrx/demoddab/dabdemodgui.h b/plugins/channelrx/demoddab/dabdemodgui.h index b5b4e9681..246e760d8 100644 --- a/plugins/channelrx/demoddab/dabdemodgui.h +++ b/plugins/channelrx/demoddab/dabdemodgui.h @@ -99,7 +99,7 @@ private: void updateAbsoluteCenterFrequency(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); void resetService(); void clearProgram(); void resizeTable(); diff --git a/plugins/channelrx/demoddatv/datvdemodgui.cpp b/plugins/channelrx/demoddatv/datvdemodgui.cpp index 0c524ba76..aeb54c4a3 100644 --- a/plugins/channelrx/demoddatv/datvdemodgui.cpp +++ b/plugins/channelrx/demoddatv/datvdemodgui.cpp @@ -498,7 +498,7 @@ void DATVDemodGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void DATVDemodGUI::enterEvent(QEvent* event) +void DATVDemodGUI::enterEvent(EnterEventType* event) { blockApplySettings(true); m_channelMarker.setHighlighted(true); diff --git a/plugins/channelrx/demoddatv/datvdemodgui.h b/plugins/channelrx/demoddatv/datvdemodgui.h index 495ef9abf..c5c6a89c5 100644 --- a/plugins/channelrx/demoddatv/datvdemodgui.h +++ b/plugins/channelrx/demoddatv/datvdemodgui.h @@ -148,7 +148,7 @@ private: void displayRRCParameters(bool blnVisible); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); bool handleMessage(const Message& objMessage); void makeUIConnections(); void updateAbsoluteCenterFrequency(); diff --git a/plugins/channelrx/demoddatv/leansdr/generic.h b/plugins/channelrx/demoddatv/leansdr/generic.h index e7af15fc0..cd85aff50 100644 --- a/plugins/channelrx/demoddatv/leansdr/generic.h +++ b/plugins/channelrx/demoddatv/leansdr/generic.h @@ -37,6 +37,8 @@ namespace leansdr // Simple blocks ////////////////////////////////////////////////////////////////////// +/* // Commented out, as not needed, as does compile on Windows + // [file_reader] reads raw data from a file descriptor into a [pipebuf]. // If the file descriptor is seekable, data can be looped. @@ -151,6 +153,8 @@ struct file_reader : runnable pipewriter out; }; +*/ + // [file_writer] writes raw data from a [pipebuf] to a file descriptor. template diff --git a/plugins/channelrx/demoddsd/dsddemodgui.cpp b/plugins/channelrx/demoddsd/dsddemodgui.cpp index 345985277..5316023e8 100644 --- a/plugins/channelrx/demoddsd/dsddemodgui.cpp +++ b/plugins/channelrx/demoddsd/dsddemodgui.cpp @@ -571,7 +571,7 @@ void DSDDemodGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void DSDDemodGUI::enterEvent(QEvent* event) +void DSDDemodGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channelrx/demoddsd/dsddemodgui.h b/plugins/channelrx/demoddsd/dsddemodgui.h index 9d1968804..614381d1c 100644 --- a/plugins/channelrx/demoddsd/dsddemodgui.h +++ b/plugins/channelrx/demoddsd/dsddemodgui.h @@ -122,7 +122,7 @@ private: void updateAbsoluteCenterFrequency(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); private slots: void on_deltaFrequency_changed(qint64 value); diff --git a/plugins/channelrx/demodfreedv/freedvdemodgui.cpp b/plugins/channelrx/demodfreedv/freedvdemodgui.cpp index 22e344022..55d2faae7 100644 --- a/plugins/channelrx/demodfreedv/freedvdemodgui.cpp +++ b/plugins/channelrx/demodfreedv/freedvdemodgui.cpp @@ -422,7 +422,7 @@ void FreeDVDemodGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void FreeDVDemodGUI::enterEvent(QEvent* event) +void FreeDVDemodGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channelrx/demodfreedv/freedvdemodgui.h b/plugins/channelrx/demodfreedv/freedvdemodgui.h index 8d9be693d..5088194bd 100644 --- a/plugins/channelrx/demodfreedv/freedvdemodgui.h +++ b/plugins/channelrx/demodfreedv/freedvdemodgui.h @@ -104,7 +104,7 @@ private: void updateAbsoluteCenterFrequency(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); private slots: void on_deltaFrequency_changed(qint64 value); diff --git a/plugins/channelrx/demodm17/m17demodgui.cpp b/plugins/channelrx/demodm17/m17demodgui.cpp index 636acfd29..50aae0dd2 100644 --- a/plugins/channelrx/demodm17/m17demodgui.cpp +++ b/plugins/channelrx/demodm17/m17demodgui.cpp @@ -612,7 +612,7 @@ void M17DemodGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void M17DemodGUI::enterEvent(QEvent* event) +void M17DemodGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channelrx/demodm17/m17demodgui.h b/plugins/channelrx/demodm17/m17demodgui.h index 110922cca..35b3b7975 100644 --- a/plugins/channelrx/demodm17/m17demodgui.h +++ b/plugins/channelrx/demodm17/m17demodgui.h @@ -137,7 +137,7 @@ private: static float distance(float lat1, float lon1, float lat2, float lon2); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); private slots: void on_deltaFrequency_changed(qint64 value); diff --git a/plugins/channelrx/demodnfm/nfmdemodgui.cpp b/plugins/channelrx/demodnfm/nfmdemodgui.cpp index bdfe0c2bf..69f176ea8 100644 --- a/plugins/channelrx/demodnfm/nfmdemodgui.cpp +++ b/plugins/channelrx/demodnfm/nfmdemodgui.cpp @@ -539,7 +539,7 @@ void NFMDemodGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void NFMDemodGUI::enterEvent(QEvent* event) +void NFMDemodGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channelrx/demodnfm/nfmdemodgui.h b/plugins/channelrx/demodnfm/nfmdemodgui.h index e320900d6..68dc7be73 100644 --- a/plugins/channelrx/demodnfm/nfmdemodgui.h +++ b/plugins/channelrx/demodnfm/nfmdemodgui.h @@ -79,7 +79,7 @@ private: void updateAbsoluteCenterFrequency(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); private slots: void on_deltaFrequency_changed(qint64 value); diff --git a/plugins/channelrx/demodpacket/packetdemodgui.cpp b/plugins/channelrx/demodpacket/packetdemodgui.cpp index 4061a612a..5faa2384e 100644 --- a/plugins/channelrx/demodpacket/packetdemodgui.cpp +++ b/plugins/channelrx/demodpacket/packetdemodgui.cpp @@ -576,7 +576,7 @@ void PacketDemodGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void PacketDemodGUI::enterEvent(QEvent* event) +void PacketDemodGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channelrx/demodpacket/packetdemodgui.h b/plugins/channelrx/demodpacket/packetdemodgui.h index 613692a8b..8369b6638 100644 --- a/plugins/channelrx/demodpacket/packetdemodgui.h +++ b/plugins/channelrx/demodpacket/packetdemodgui.h @@ -103,7 +103,7 @@ private: void updateAbsoluteCenterFrequency(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); void resizeTable(); QAction *createCheckableItem(QString& text, int idx, bool checked); diff --git a/plugins/channelrx/demodpager/pagerdemodgui.cpp b/plugins/channelrx/demodpager/pagerdemodgui.cpp index 9175c445d..0e56bd151 100644 --- a/plugins/channelrx/demodpager/pagerdemodgui.cpp +++ b/plugins/channelrx/demodpager/pagerdemodgui.cpp @@ -665,7 +665,7 @@ void PagerDemodGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void PagerDemodGUI::enterEvent(QEvent* event) +void PagerDemodGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channelrx/demodpager/pagerdemodgui.h b/plugins/channelrx/demodpager/pagerdemodgui.h index f42f136be..d0b9bf619 100644 --- a/plugins/channelrx/demodpager/pagerdemodgui.h +++ b/plugins/channelrx/demodpager/pagerdemodgui.h @@ -100,7 +100,7 @@ private: void updateAbsoluteCenterFrequency(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); void resizeTable(); QAction *createCheckableItem(QString& text, int idx, bool checked, const char *slot); diff --git a/plugins/channelrx/demodpager/pagerdemodsink.cpp b/plugins/channelrx/demodpager/pagerdemodsink.cpp index af023831c..04261c007 100644 --- a/plugins/channelrx/demodpager/pagerdemodsink.cpp +++ b/plugins/channelrx/demodpager/pagerdemodsink.cpp @@ -274,12 +274,12 @@ void PagerDemodSink::decodeBatch() if (getMessageQueueToChannel()) { // Convert from 7-bit to UTF-8 using user specified encoding - for (int i = 0; i < m_alphaMessage; i++) + for (int i = 0; i < m_alphaMessage.size(); i++) { QChar c = m_alphaMessage[i]; int idx = m_settings.m_sevenbit.indexOf(c.toLatin1()); if (idx >= 0) { - c = m_settings.m_unicode[idx]; + c = QChar(m_settings.m_unicode[idx]); } m_alphaMessage[i] = c; } diff --git a/plugins/channelrx/demodradiosonde/radiosondedemodgui.cpp b/plugins/channelrx/demodradiosonde/radiosondedemodgui.cpp index 3713a4228..3ad505ba6 100644 --- a/plugins/channelrx/demodradiosonde/radiosondedemodgui.cpp +++ b/plugins/channelrx/demodradiosonde/radiosondedemodgui.cpp @@ -769,7 +769,7 @@ void RadiosondeDemodGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void RadiosondeDemodGUI::enterEvent(QEvent* event) +void RadiosondeDemodGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channelrx/demodradiosonde/radiosondedemodgui.h b/plugins/channelrx/demodradiosonde/radiosondedemodgui.h index ca3879c8b..0e987abbd 100644 --- a/plugins/channelrx/demodradiosonde/radiosondedemodgui.h +++ b/plugins/channelrx/demodradiosonde/radiosondedemodgui.h @@ -102,7 +102,7 @@ private: void updateAbsoluteCenterFrequency(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); void resizeTable(); QAction *createCheckableItem(QString& text, int idx, bool checked, const char *slot); diff --git a/plugins/channelrx/demodssb/ssbdemodgui.cpp b/plugins/channelrx/demodssb/ssbdemodgui.cpp index d5c7f80ea..02cfe584a 100644 --- a/plugins/channelrx/demodssb/ssbdemodgui.cpp +++ b/plugins/channelrx/demodssb/ssbdemodgui.cpp @@ -667,7 +667,7 @@ void SSBDemodGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void SSBDemodGUI::enterEvent(QEvent* event) +void SSBDemodGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channelrx/demodssb/ssbdemodgui.h b/plugins/channelrx/demodssb/ssbdemodgui.h index 7a1519a97..623b49805 100644 --- a/plugins/channelrx/demodssb/ssbdemodgui.h +++ b/plugins/channelrx/demodssb/ssbdemodgui.h @@ -89,7 +89,7 @@ private: void updateAbsoluteCenterFrequency(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); private slots: void on_deltaFrequency_changed(qint64 value); diff --git a/plugins/channelrx/demodvor/vordemodgui.cpp b/plugins/channelrx/demodvor/vordemodgui.cpp index 24354e896..cacb5c12b 100644 --- a/plugins/channelrx/demodvor/vordemodgui.cpp +++ b/plugins/channelrx/demodvor/vordemodgui.cpp @@ -395,7 +395,7 @@ void VORDemodGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void VORDemodGUI::enterEvent(QEvent* event) +void VORDemodGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channelrx/demodvor/vordemodgui.h b/plugins/channelrx/demodvor/vordemodgui.h index 7ebdc943b..cc0bba9b8 100644 --- a/plugins/channelrx/demodvor/vordemodgui.h +++ b/plugins/channelrx/demodvor/vordemodgui.h @@ -91,7 +91,7 @@ private: void updateAbsoluteCenterFrequency(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); private slots: void on_deltaFrequency_changed(qint64 value); diff --git a/plugins/channelrx/demodvormc/vordemodmcgui.cpp b/plugins/channelrx/demodvormc/vordemodmcgui.cpp index b5c9537da..871ffa896 100644 --- a/plugins/channelrx/demodvormc/vordemodmcgui.cpp +++ b/plugins/channelrx/demodvormc/vordemodmcgui.cpp @@ -1353,7 +1353,7 @@ void VORDemodMCGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void VORDemodMCGUI::enterEvent(QEvent* event) +void VORDemodMCGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channelrx/demodvormc/vordemodmcgui.h b/plugins/channelrx/demodvormc/vordemodmcgui.h index 4a08a14a1..419ad4546 100644 --- a/plugins/channelrx/demodvormc/vordemodmcgui.h +++ b/plugins/channelrx/demodvormc/vordemodmcgui.h @@ -269,7 +269,7 @@ private: void updateAbsoluteCenterFrequency(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); void resizeTable(); QAction *createCheckableItem(QString& text, int idx, bool checked); diff --git a/plugins/channelrx/demodwfm/wfmdemodgui.cpp b/plugins/channelrx/demodwfm/wfmdemodgui.cpp index 9863112df..28b7f0583 100644 --- a/plugins/channelrx/demodwfm/wfmdemodgui.cpp +++ b/plugins/channelrx/demodwfm/wfmdemodgui.cpp @@ -323,7 +323,7 @@ void WFMDemodGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void WFMDemodGUI::enterEvent(QEvent* event) +void WFMDemodGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channelrx/demodwfm/wfmdemodgui.h b/plugins/channelrx/demodwfm/wfmdemodgui.h index e456cd5fc..8fa18e55c 100644 --- a/plugins/channelrx/demodwfm/wfmdemodgui.h +++ b/plugins/channelrx/demodwfm/wfmdemodgui.h @@ -73,7 +73,7 @@ private: void updateAbsoluteCenterFrequency(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); private slots: void on_deltaFrequency_changed(qint64 value); diff --git a/plugins/channelrx/filesink/filesinkgui.cpp b/plugins/channelrx/filesink/filesinkgui.cpp index 9ae6005d8..5bb96aaca 100644 --- a/plugins/channelrx/filesink/filesinkgui.cpp +++ b/plugins/channelrx/filesink/filesinkgui.cpp @@ -314,7 +314,7 @@ void FileSinkGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void FileSinkGUI::enterEvent(QEvent* event) +void FileSinkGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channelrx/filesink/filesinkgui.h b/plugins/channelrx/filesink/filesinkgui.h index f38d0cbda..7a53698a1 100644 --- a/plugins/channelrx/filesink/filesinkgui.h +++ b/plugins/channelrx/filesink/filesinkgui.h @@ -103,7 +103,7 @@ private: void updateAbsoluteCenterFrequency(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); private slots: void handleSourceMessages(); diff --git a/plugins/channelrx/freqtracker/freqtrackergui.cpp b/plugins/channelrx/freqtracker/freqtrackergui.cpp index 1cfb33a7a..d76cc758d 100644 --- a/plugins/channelrx/freqtracker/freqtrackergui.cpp +++ b/plugins/channelrx/freqtracker/freqtrackergui.cpp @@ -471,7 +471,7 @@ void FreqTrackerGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void FreqTrackerGUI::enterEvent(QEvent* event) +void FreqTrackerGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channelrx/freqtracker/freqtrackergui.h b/plugins/channelrx/freqtracker/freqtrackergui.h index 5f590ac81..7610eac20 100644 --- a/plugins/channelrx/freqtracker/freqtrackergui.h +++ b/plugins/channelrx/freqtracker/freqtrackergui.h @@ -96,7 +96,7 @@ private: void updateAbsoluteCenterFrequency(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); private slots: void on_deltaFrequency_changed(qint64 value); diff --git a/plugins/channelrx/localsink/localsinkgui.cpp b/plugins/channelrx/localsink/localsinkgui.cpp index 01df6b2f3..f73bcce3d 100644 --- a/plugins/channelrx/localsink/localsinkgui.cpp +++ b/plugins/channelrx/localsink/localsinkgui.cpp @@ -231,7 +231,7 @@ void LocalSinkGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void LocalSinkGUI::enterEvent(QEvent* event) +void LocalSinkGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channelrx/localsink/localsinkgui.h b/plugins/channelrx/localsink/localsinkgui.h index 6d678d563..1904c4dca 100644 --- a/plugins/channelrx/localsink/localsinkgui.h +++ b/plugins/channelrx/localsink/localsinkgui.h @@ -91,7 +91,7 @@ private: void updateAbsoluteCenterFrequency(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); void applyDecimation(); void applyPosition(); diff --git a/plugins/channelrx/noisefigure/noisefigure.cpp b/plugins/channelrx/noisefigure/noisefigure.cpp index 34b5f4682..f4ef3c25e 100644 --- a/plugins/channelrx/noisefigure/noisefigure.cpp +++ b/plugins/channelrx/noisefigure/noisefigure.cpp @@ -264,7 +264,7 @@ void NoiseFigure::nextState() if (m_settings.m_sweepSpec == NoiseFigureSettings::LIST) { // Create list of sweep values from string - QRegExp separator("[( |,|\t|)]"); + QRegularExpression separator("[( |,|\t|)]"); QStringList valueStrings = m_settings.m_sweepList.trimmed().split(separator); m_values.clear(); for (int i = 0; i < valueStrings.size(); i++) diff --git a/plugins/channelrx/noisefigure/noisefigureenrdialog.h b/plugins/channelrx/noisefigure/noisefigureenrdialog.h index 7a2fae08b..0fa082de7 100644 --- a/plugins/channelrx/noisefigure/noisefigureenrdialog.h +++ b/plugins/channelrx/noisefigure/noisefigureenrdialog.h @@ -23,7 +23,9 @@ #include "ui_noisefigureenrdialog.h" #include "noisefiguresettings.h" +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) using namespace QtCharts; +#endif class NoiseFigureENRDialog : public QDialog { Q_OBJECT diff --git a/plugins/channelrx/noisefigure/noisefiguregui.cpp b/plugins/channelrx/noisefigure/noisefiguregui.cpp index 41e96b60c..96274d3fb 100644 --- a/plugins/channelrx/noisefigure/noisefiguregui.cpp +++ b/plugins/channelrx/noisefigure/noisefiguregui.cpp @@ -765,7 +765,7 @@ void NoiseFigureGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void NoiseFigureGUI::enterEvent(QEvent* event) +void NoiseFigureGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channelrx/noisefigure/noisefiguregui.h b/plugins/channelrx/noisefigure/noisefiguregui.h index 100350faa..0bb96162b 100644 --- a/plugins/channelrx/noisefigure/noisefiguregui.h +++ b/plugins/channelrx/noisefigure/noisefiguregui.h @@ -42,7 +42,9 @@ namespace Ui { class NoiseFigureGUI; } +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) using namespace QtCharts; +#endif class NoiseFigureGUI : public ChannelGUI { Q_OBJECT @@ -107,7 +109,7 @@ private: void updateAbsoluteCenterFrequency(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); void resizeTable(); QAction *createCheckableItem(QString& text, int idx, bool checked, const char *slot); diff --git a/plugins/channelrx/radioastronomy/radioastronomygui.cpp b/plugins/channelrx/radioastronomy/radioastronomygui.cpp index c3b4e3e38..708821929 100644 --- a/plugins/channelrx/radioastronomy/radioastronomygui.cpp +++ b/plugins/channelrx/radioastronomy/radioastronomygui.cpp @@ -2552,7 +2552,7 @@ void RadioAstronomyGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void RadioAstronomyGUI::enterEvent(QEvent* event) +void RadioAstronomyGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channelrx/radioastronomy/radioastronomygui.h b/plugins/channelrx/radioastronomy/radioastronomygui.h index 434fd87b9..c94603d19 100644 --- a/plugins/channelrx/radioastronomy/radioastronomygui.h +++ b/plugins/channelrx/radioastronomy/radioastronomygui.h @@ -49,7 +49,9 @@ namespace Ui { } class RadioAstronomyGUI; +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) using namespace QtCharts; +#endif class RadioAstronomyGUI : public ChannelGUI { Q_OBJECT @@ -450,7 +452,7 @@ private: int powerYUnitsToIndex(RadioAstronomySettings::PowerYUnits units); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); void resizePowerTable(); void resizePowerMarkerTable(); diff --git a/plugins/channelrx/radioclock/radioclockgui.cpp b/plugins/channelrx/radioclock/radioclockgui.cpp index de236c357..3c5304022 100644 --- a/plugins/channelrx/radioclock/radioclockgui.cpp +++ b/plugins/channelrx/radioclock/radioclockgui.cpp @@ -388,7 +388,7 @@ void RadioClockGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void RadioClockGUI::enterEvent(QEvent* event) +void RadioClockGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channelrx/radioclock/radioclockgui.h b/plugins/channelrx/radioclock/radioclockgui.h index 2d855e054..76de92de5 100644 --- a/plugins/channelrx/radioclock/radioclockgui.h +++ b/plugins/channelrx/radioclock/radioclockgui.h @@ -97,7 +97,7 @@ private: void displayDateTime(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); private slots: void on_deltaFrequency_changed(qint64 value); diff --git a/plugins/channelrx/remotesink/remotesinkgui.cpp b/plugins/channelrx/remotesink/remotesinkgui.cpp index bef8b2086..c506cf976 100644 --- a/plugins/channelrx/remotesink/remotesinkgui.cpp +++ b/plugins/channelrx/remotesink/remotesinkgui.cpp @@ -200,7 +200,7 @@ void RemoteSinkGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void RemoteSinkGUI::enterEvent(QEvent* event) +void RemoteSinkGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channelrx/remotesink/remotesinkgui.h b/plugins/channelrx/remotesink/remotesinkgui.h index 441ae61ec..238a3377d 100644 --- a/plugins/channelrx/remotesink/remotesinkgui.h +++ b/plugins/channelrx/remotesink/remotesinkgui.h @@ -89,7 +89,7 @@ private: void updateAbsoluteCenterFrequency(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); void applyDecimation(); void applyPosition(); diff --git a/plugins/channelrx/remotetcpsink/remotetcpsinkgui.cpp b/plugins/channelrx/remotetcpsink/remotetcpsinkgui.cpp index cf0725775..a752105af 100644 --- a/plugins/channelrx/remotetcpsink/remotetcpsinkgui.cpp +++ b/plugins/channelrx/remotetcpsink/remotetcpsinkgui.cpp @@ -260,7 +260,7 @@ void RemoteTCPSinkGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void RemoteTCPSinkGUI::enterEvent(QEvent* event) +void RemoteTCPSinkGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channelrx/remotetcpsink/remotetcpsinkgui.h b/plugins/channelrx/remotetcpsink/remotetcpsinkgui.h index 850ca5bd0..b777a851f 100644 --- a/plugins/channelrx/remotetcpsink/remotetcpsinkgui.h +++ b/plugins/channelrx/remotetcpsink/remotetcpsinkgui.h @@ -97,7 +97,7 @@ private: void updateAbsoluteCenterFrequency(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); void applyDecimation(); void applyPosition(); diff --git a/plugins/channelrx/sigmffilesink/sigmffilesinkgui.cpp b/plugins/channelrx/sigmffilesink/sigmffilesinkgui.cpp index 390864ec4..727105d4b 100644 --- a/plugins/channelrx/sigmffilesink/sigmffilesinkgui.cpp +++ b/plugins/channelrx/sigmffilesink/sigmffilesinkgui.cpp @@ -306,7 +306,7 @@ void SigMFFileSinkGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void SigMFFileSinkGUI::enterEvent(QEvent* event) +void SigMFFileSinkGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channelrx/sigmffilesink/sigmffilesinkgui.h b/plugins/channelrx/sigmffilesink/sigmffilesinkgui.h index eb18bc049..c3712d04c 100644 --- a/plugins/channelrx/sigmffilesink/sigmffilesinkgui.h +++ b/plugins/channelrx/sigmffilesink/sigmffilesinkgui.h @@ -103,7 +103,7 @@ private: void updateAbsoluteCenterFrequency(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); private slots: void handleSourceMessages(); diff --git a/plugins/channelrx/udpsink/udpsinkgui.cpp b/plugins/channelrx/udpsink/udpsinkgui.cpp index f5f22272b..5bdb1b2e1 100644 --- a/plugins/channelrx/udpsink/udpsinkgui.cpp +++ b/plugins/channelrx/udpsink/udpsinkgui.cpp @@ -657,7 +657,7 @@ void UDPSinkGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void UDPSinkGUI::enterEvent(QEvent* event) +void UDPSinkGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channelrx/udpsink/udpsinkgui.h b/plugins/channelrx/udpsink/udpsinkgui.h index d08e5dd4a..9ab86b0b6 100644 --- a/plugins/channelrx/udpsink/udpsinkgui.h +++ b/plugins/channelrx/udpsink/udpsinkgui.h @@ -101,7 +101,7 @@ private: void updateAbsoluteCenterFrequency(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); private slots: void handleSourceMessages(); diff --git a/plugins/channeltx/filesource/filesourcegui.cpp b/plugins/channeltx/filesource/filesourcegui.cpp index cd7370d3e..1b6123a8e 100644 --- a/plugins/channeltx/filesource/filesourcegui.cpp +++ b/plugins/channeltx/filesource/filesourcegui.cpp @@ -339,7 +339,7 @@ void FileSourceGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void FileSourceGUI::enterEvent(QEvent* event) +void FileSourceGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channeltx/filesource/filesourcegui.h b/plugins/channeltx/filesource/filesourcegui.h index 92c86ec7f..a72e57457 100644 --- a/plugins/channeltx/filesource/filesourcegui.h +++ b/plugins/channeltx/filesource/filesourcegui.h @@ -100,7 +100,7 @@ private: void updateAbsoluteCenterFrequency(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); void applyInterpolation(); void applyPosition(); diff --git a/plugins/channeltx/localsource/localsourcegui.cpp b/plugins/channeltx/localsource/localsourcegui.cpp index 2bb031387..247fb3685 100644 --- a/plugins/channeltx/localsource/localsourcegui.cpp +++ b/plugins/channeltx/localsource/localsourcegui.cpp @@ -206,7 +206,7 @@ void LocalSourceGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void LocalSourceGUI::enterEvent(QEvent* event) +void LocalSourceGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channeltx/localsource/localsourcegui.h b/plugins/channeltx/localsource/localsourcegui.h index c7a58498e..4d23fe05c 100644 --- a/plugins/channeltx/localsource/localsourcegui.h +++ b/plugins/channeltx/localsource/localsourcegui.h @@ -90,7 +90,7 @@ private: void updateAbsoluteCenterFrequency(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); void applyInterpolation(); void applyPosition(); diff --git a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modgui.cpp b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modgui.cpp index bd5f3e6da..7ed6abc60 100644 --- a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modgui.cpp +++ b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modgui.cpp @@ -612,7 +612,7 @@ void IEEE_802_15_4_ModGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void IEEE_802_15_4_ModGUI::enterEvent(QEvent* event) +void IEEE_802_15_4_ModGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modgui.h b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modgui.h index 48ccf3d8c..e18876165 100644 --- a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modgui.h +++ b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modgui.h @@ -103,7 +103,7 @@ private: void updateAbsoluteCenterFrequency(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); private slots: void handleSourceMessages(); diff --git a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modsource.cpp b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modsource.cpp index 6f6b4b672..90ec3c0fe 100644 --- a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modsource.cpp +++ b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modsource.cpp @@ -20,6 +20,7 @@ #include #include #include +#include #include "dsp/basebandsamplesink.h" #include "dsp/scopevis.h" diff --git a/plugins/channeltx/modais/aismodgui.cpp b/plugins/channeltx/modais/aismodgui.cpp index 3dc479673..371b8e5db 100644 --- a/plugins/channeltx/modais/aismodgui.cpp +++ b/plugins/channeltx/modais/aismodgui.cpp @@ -582,7 +582,7 @@ void AISModGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void AISModGUI::enterEvent(QEvent* event) +void AISModGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channeltx/modais/aismodgui.h b/plugins/channeltx/modais/aismodgui.h index 7deb50c85..fd5d68307 100644 --- a/plugins/channeltx/modais/aismodgui.h +++ b/plugins/channeltx/modais/aismodgui.h @@ -94,7 +94,7 @@ private: void updateAbsoluteCenterFrequency(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); private slots: void handleSourceMessages(); diff --git a/plugins/channeltx/modam/ammodgui.cpp b/plugins/channeltx/modam/ammodgui.cpp index a38379b54..7b387a71e 100644 --- a/plugins/channeltx/modam/ammodgui.cpp +++ b/plugins/channeltx/modam/ammodgui.cpp @@ -488,7 +488,7 @@ void AMModGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void AMModGUI::enterEvent(QEvent* event) +void AMModGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channeltx/modam/ammodgui.h b/plugins/channeltx/modam/ammodgui.h index 07985e85c..f30e74167 100644 --- a/plugins/channeltx/modam/ammodgui.h +++ b/plugins/channeltx/modam/ammodgui.h @@ -100,7 +100,7 @@ private: void updateAbsoluteCenterFrequency(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); private slots: void handleSourceMessages(); diff --git a/plugins/channeltx/modatv/atvmodgui.cpp b/plugins/channeltx/modatv/atvmodgui.cpp index f2e327909..a5113c1d5 100644 --- a/plugins/channeltx/modatv/atvmodgui.cpp +++ b/plugins/channeltx/modatv/atvmodgui.cpp @@ -826,7 +826,7 @@ void ATVModGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void ATVModGUI::enterEvent(QEvent* event) +void ATVModGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channeltx/modatv/atvmodgui.h b/plugins/channeltx/modatv/atvmodgui.h index cfbf04961..dcd68af47 100644 --- a/plugins/channeltx/modatv/atvmodgui.h +++ b/plugins/channeltx/modatv/atvmodgui.h @@ -106,7 +106,7 @@ private: void updateAbsoluteCenterFrequency(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); private slots: void handleSourceMessages(); diff --git a/plugins/channeltx/modchirpchat/chirpchatmodgui.cpp b/plugins/channeltx/modchirpchat/chirpchatmodgui.cpp index 4c32cdf5a..3d70d6235 100644 --- a/plugins/channeltx/modchirpchat/chirpchatmodgui.cpp +++ b/plugins/channeltx/modchirpchat/chirpchatmodgui.cpp @@ -599,7 +599,7 @@ void ChirpChatModGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void ChirpChatModGUI::enterEvent(QEvent* event) +void ChirpChatModGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channeltx/modchirpchat/chirpchatmodgui.h b/plugins/channeltx/modchirpchat/chirpchatmodgui.h index 98d3affb7..5390c3967 100644 --- a/plugins/channeltx/modchirpchat/chirpchatmodgui.h +++ b/plugins/channeltx/modchirpchat/chirpchatmodgui.h @@ -92,7 +92,7 @@ private: void updateAbsoluteCenterFrequency(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); private slots: void handleSourceMessages(); diff --git a/plugins/channeltx/moddatv/datvmodgui.cpp b/plugins/channeltx/moddatv/datvmodgui.cpp index d38f124d3..8a84c88de 100644 --- a/plugins/channeltx/moddatv/datvmodgui.cpp +++ b/plugins/channeltx/moddatv/datvmodgui.cpp @@ -612,7 +612,7 @@ void DATVModGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void DATVModGUI::enterEvent(QEvent* event) +void DATVModGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channeltx/moddatv/datvmodgui.h b/plugins/channeltx/moddatv/datvmodgui.h index 561f44f44..5bf02cb39 100644 --- a/plugins/channeltx/moddatv/datvmodgui.h +++ b/plugins/channeltx/moddatv/datvmodgui.h @@ -104,7 +104,7 @@ private: void updateFEC(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); private slots: void handleSourceMessages(); diff --git a/plugins/channeltx/modfreedv/freedvmodgui.cpp b/plugins/channeltx/modfreedv/freedvmodgui.cpp index f42917c7c..d1fcca227 100644 --- a/plugins/channeltx/modfreedv/freedvmodgui.cpp +++ b/plugins/channeltx/modfreedv/freedvmodgui.cpp @@ -530,7 +530,7 @@ void FreeDVModGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void FreeDVModGUI::enterEvent(QEvent* event) +void FreeDVModGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channeltx/modfreedv/freedvmodgui.h b/plugins/channeltx/modfreedv/freedvmodgui.h index 6bd48fc5d..a439968bd 100644 --- a/plugins/channeltx/modfreedv/freedvmodgui.h +++ b/plugins/channeltx/modfreedv/freedvmodgui.h @@ -105,7 +105,7 @@ private: void updateAbsoluteCenterFrequency(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); private slots: void handleSourceMessages(); diff --git a/plugins/channeltx/modm17/m17modgui.cpp b/plugins/channeltx/modm17/m17modgui.cpp index f8ccd2a4c..fa04175f3 100644 --- a/plugins/channeltx/modm17/m17modgui.cpp +++ b/plugins/channeltx/modm17/m17modgui.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include "device/deviceuiset.h" #include "plugin/pluginapi.h" @@ -471,7 +471,7 @@ M17ModGUI::M17ModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSam m_feedbackAudioSampleRate(-1), m_tickCount(0), m_enableNavTime(false), - m_dcsCodeValidator(QRegExp("[0-7]{1,3}")) + m_dcsCodeValidator(QRegularExpression("[0-7]{1,3}")) { setAttribute(Qt::WA_DeleteOnClose, true); m_helpURL = "plugins/channeltx/modm17/readme.md"; @@ -702,7 +702,7 @@ void M17ModGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void M17ModGUI::enterEvent(QEvent* event) +void M17ModGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channeltx/modm17/m17modgui.h b/plugins/channeltx/modm17/m17modgui.h index 59e7b89cc..4ed4b277a 100644 --- a/plugins/channeltx/modm17/m17modgui.h +++ b/plugins/channeltx/modm17/m17modgui.h @@ -18,7 +18,7 @@ #ifndef PLUGINS_CHANNELTX_MODM17_M17MODGUI_H_ #define PLUGINS_CHANNELTX_MODM17_M17MODGUI_H_ -#include +#include #include "channel/channelgui.h" #include "dsp/channelmarker.h" @@ -88,7 +88,7 @@ private: std::size_t m_tickCount; bool m_enableNavTime; MessageQueue m_inputMessageQueue; - QRegExpValidator m_dcsCodeValidator; + QRegularExpressionValidator m_dcsCodeValidator; explicit M17ModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx, QWidget* parent = nullptr); virtual ~M17ModGUI(); @@ -106,7 +106,7 @@ private: int packetTypeToIndex(M17ModSettings::PacketType type); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); private slots: void handleSourceMessages(); diff --git a/plugins/channeltx/modnfm/nfmmodgui.cpp b/plugins/channeltx/modnfm/nfmmodgui.cpp index fe1dca53f..6d526aebd 100644 --- a/plugins/channeltx/modnfm/nfmmodgui.cpp +++ b/plugins/channeltx/modnfm/nfmmodgui.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include "device/deviceuiset.h" #include "plugin/pluginapi.h" @@ -440,7 +440,7 @@ NFMModGUI::NFMModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSam m_feedbackAudioSampleRate(-1), m_tickCount(0), m_enableNavTime(false), - m_dcsCodeValidator(QRegExp("[0-7]{1,3}")) + m_dcsCodeValidator(QRegularExpression("[0-7]{1,3}")) { setAttribute(Qt::WA_DeleteOnClose, true); m_helpURL = "plugins/channeltx/modnfm/readme.md"; @@ -608,7 +608,7 @@ void NFMModGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void NFMModGUI::enterEvent(QEvent* event) +void NFMModGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channeltx/modnfm/nfmmodgui.h b/plugins/channeltx/modnfm/nfmmodgui.h index 7aa5d926e..29a9771b8 100644 --- a/plugins/channeltx/modnfm/nfmmodgui.h +++ b/plugins/channeltx/modnfm/nfmmodgui.h @@ -18,7 +18,7 @@ #ifndef PLUGINS_CHANNELTX_MODNFM_NFMMODGUI_H_ #define PLUGINS_CHANNELTX_MODNFM_NFMMODGUI_H_ -#include +#include #include "channel/channelgui.h" #include "dsp/channelmarker.h" @@ -87,7 +87,7 @@ private: bool m_enableNavTime; NFMModSettings::NFMModInputAF m_modAFInput; MessageQueue m_inputMessageQueue; - QRegExpValidator m_dcsCodeValidator; + QRegularExpressionValidator m_dcsCodeValidator; explicit NFMModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx, QWidget* parent = 0); virtual ~NFMModGUI(); @@ -102,7 +102,7 @@ private: void updateAbsoluteCenterFrequency(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); private slots: void handleSourceMessages(); diff --git a/plugins/channeltx/modpacket/packetmodgui.cpp b/plugins/channeltx/modpacket/packetmodgui.cpp index c97fd032e..bf13a8b7a 100644 --- a/plugins/channeltx/modpacket/packetmodgui.cpp +++ b/plugins/channeltx/modpacket/packetmodgui.cpp @@ -602,7 +602,7 @@ void PacketModGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void PacketModGUI::enterEvent(QEvent* event) +void PacketModGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channeltx/modpacket/packetmodgui.h b/plugins/channeltx/modpacket/packetmodgui.h index 1ff5837f7..060a14135 100644 --- a/plugins/channeltx/modpacket/packetmodgui.h +++ b/plugins/channeltx/modpacket/packetmodgui.h @@ -92,7 +92,7 @@ private: void updateAbsoluteCenterFrequency(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); private slots: void handleSourceMessages(); diff --git a/plugins/channeltx/modssb/ssbmodgui.cpp b/plugins/channeltx/modssb/ssbmodgui.cpp index da76f8108..2be75db9c 100644 --- a/plugins/channeltx/modssb/ssbmodgui.cpp +++ b/plugins/channeltx/modssb/ssbmodgui.cpp @@ -744,7 +744,7 @@ void SSBModGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void SSBModGUI::enterEvent(QEvent* event) +void SSBModGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channeltx/modssb/ssbmodgui.h b/plugins/channeltx/modssb/ssbmodgui.h index dd793e1bc..cde19b90b 100644 --- a/plugins/channeltx/modssb/ssbmodgui.h +++ b/plugins/channeltx/modssb/ssbmodgui.h @@ -108,7 +108,7 @@ private: void updateAbsoluteCenterFrequency(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); private slots: void handleSourceMessages(); diff --git a/plugins/channeltx/modwfm/wfmmodgui.cpp b/plugins/channeltx/modwfm/wfmmodgui.cpp index 48cfc8b36..f007b14a8 100644 --- a/plugins/channeltx/modwfm/wfmmodgui.cpp +++ b/plugins/channeltx/modwfm/wfmmodgui.cpp @@ -503,7 +503,7 @@ void WFMModGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void WFMModGUI::enterEvent(QEvent* event) +void WFMModGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channeltx/modwfm/wfmmodgui.h b/plugins/channeltx/modwfm/wfmmodgui.h index 19e72eae9..f6cd5b507 100644 --- a/plugins/channeltx/modwfm/wfmmodgui.h +++ b/plugins/channeltx/modwfm/wfmmodgui.h @@ -98,7 +98,7 @@ private: void updateAbsoluteCenterFrequency(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); static int requiredBW(int rfBW) { diff --git a/plugins/channeltx/remotesource/remotesourcegui.cpp b/plugins/channeltx/remotesource/remotesourcegui.cpp index a5cb5a9c2..334e2a201 100644 --- a/plugins/channeltx/remotesource/remotesourcegui.cpp +++ b/plugins/channeltx/remotesource/remotesourcegui.cpp @@ -279,7 +279,7 @@ void RemoteSourceGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void RemoteSourceGUI::enterEvent(QEvent* event) +void RemoteSourceGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channeltx/remotesource/remotesourcegui.h b/plugins/channeltx/remotesource/remotesourcegui.h index 0035875b1..a7d643110 100644 --- a/plugins/channeltx/remotesource/remotesourcegui.h +++ b/plugins/channeltx/remotesource/remotesourcegui.h @@ -101,7 +101,7 @@ private: void updateAbsoluteCenterFrequency(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); void displayEventCounts(); void displayEventStatus(int recoverableCount, int unrecoverableCount); diff --git a/plugins/channeltx/remotesource/remotesourceworker.cpp b/plugins/channeltx/remotesource/remotesourceworker.cpp index 8d2f9dffe..9e61ed332 100644 --- a/plugins/channeltx/remotesource/remotesourceworker.cpp +++ b/plugins/channeltx/remotesource/remotesourceworker.cpp @@ -20,6 +20,7 @@ #include #include +#include #include "cm256cc/cm256.h" #include "remotesourceworker.h" diff --git a/plugins/channeltx/udpsource/udpsourcegui.cpp b/plugins/channeltx/udpsource/udpsourcegui.cpp index ccf220989..7e06158f8 100644 --- a/plugins/channeltx/udpsource/udpsourcegui.cpp +++ b/plugins/channeltx/udpsource/udpsourcegui.cpp @@ -538,7 +538,7 @@ void UDPSourceGUI::leaveEvent(QEvent* event) ChannelGUI::leaveEvent(event); } -void UDPSourceGUI::enterEvent(QEvent* event) +void UDPSourceGUI::enterEvent(EnterEventType* event) { m_channelMarker.setHighlighted(true); ChannelGUI::enterEvent(event); diff --git a/plugins/channeltx/udpsource/udpsourcegui.h b/plugins/channeltx/udpsource/udpsourcegui.h index 68afee72d..af7abf7be 100644 --- a/plugins/channeltx/udpsource/udpsourcegui.h +++ b/plugins/channeltx/udpsource/udpsourcegui.h @@ -97,7 +97,7 @@ private: void updateAbsoluteCenterFrequency(); void leaveEvent(QEvent*); - void enterEvent(QEvent*); + void enterEvent(EnterEventType*); private slots: void handleSourceMessages(); diff --git a/plugins/feature/aprs/aprsgui.h b/plugins/feature/aprs/aprsgui.h index fdb730a91..5422034db 100644 --- a/plugins/feature/aprs/aprsgui.h +++ b/plugins/feature/aprs/aprsgui.h @@ -41,7 +41,9 @@ namespace Ui { class APRSGUI; } +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) using namespace QtCharts; +#endif class APRSGUI; diff --git a/plugins/feature/aprs/aprsworker.cpp b/plugins/feature/aprs/aprsworker.cpp index d28c38d55..e8b211c24 100644 --- a/plugins/feature/aprs/aprsworker.cpp +++ b/plugins/feature/aprs/aprsworker.cpp @@ -192,7 +192,7 @@ void APRSWorker::errorOccurred(QAbstractSocket::SocketError socketError) { qDebug() << "APRSWorker::errorOccurred: " << socketError; if (m_msgQueueToFeature) - m_msgQueueToFeature->push(APRS::MsgReportWorker::create(m_socket.errorString() + " " + socketError)); + m_msgQueueToFeature->push(APRS::MsgReportWorker::create(m_socket.errorString())); } void APRSWorker::recv() diff --git a/plugins/feature/pertester/pertestersettings.cpp b/plugins/feature/pertester/pertestersettings.cpp index 0121b1d8d..7820d9224 100644 --- a/plugins/feature/pertester/pertestersettings.cpp +++ b/plugins/feature/pertester/pertestersettings.cpp @@ -18,6 +18,7 @@ #include #include +#include #include "util/simpleserializer.h" #include "settings/serializable.h" diff --git a/plugins/feature/radiosonde/radiosondegui.h b/plugins/feature/radiosonde/radiosondegui.h index 355a9b76d..b922ec680 100644 --- a/plugins/feature/radiosonde/radiosondegui.h +++ b/plugins/feature/radiosonde/radiosondegui.h @@ -40,7 +40,9 @@ namespace Ui { class RadiosondeGUI; } +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) using namespace QtCharts; +#endif class RadiosondeGUI : public FeatureGUI { Q_OBJECT diff --git a/plugins/feature/remotecontrol/remotecontrolgui.h b/plugins/feature/remotecontrol/remotecontrolgui.h index 1c12d0b5d..8c71fcd95 100644 --- a/plugins/feature/remotecontrol/remotecontrolgui.h +++ b/plugins/feature/remotecontrol/remotecontrolgui.h @@ -43,7 +43,9 @@ namespace Ui { class RemoteControlGUI; } +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) using namespace QtCharts; +#endif class RemoteControlGUI : public FeatureGUI { Q_OBJECT diff --git a/plugins/feature/satellitetracker/satellitedevicesettingsgui.cpp b/plugins/feature/satellitetracker/satellitedevicesettingsgui.cpp index 0eac51e7f..9d06a72bf 100644 --- a/plugins/feature/satellitetracker/satellitedevicesettingsgui.cpp +++ b/plugins/feature/satellitetracker/satellitedevicesettingsgui.cpp @@ -191,9 +191,9 @@ void SatelliteDeviceSettingsGUI::addPresets(const QString& deviceSetType) for (int i = 0; i < count; i++) { const Preset *preset = mainSettings.getPreset(i); - if (((preset->isSourcePreset() && (m_currentPresetType == "R"))) - || ((preset->isSinkPreset() && (m_currentPresetType == "T"))) - || ((preset->isMIMOPreset() && (m_currentPresetType == "M")))) + if (((preset->isSourcePreset() && (m_currentPresetType == 'R'))) + || ((preset->isSinkPreset() && (m_currentPresetType == 'T'))) + || ((preset->isMIMOPreset() && (m_currentPresetType == 'M')))) { m_presetWidget->addItem(QString("%1: %2 - %3") .arg(preset->getGroup()) @@ -212,9 +212,9 @@ const Preset* SatelliteDeviceSettingsGUI::getSelectedPreset() for (int i = 0; i < count; i++) { const Preset *preset = mainSettings.getPreset(i); - if ( ((preset->isSourcePreset() && (m_currentPresetType == "R"))) - || ((preset->isSinkPreset() && (m_currentPresetType == "T"))) - || ((preset->isMIMOPreset() && (m_currentPresetType == "M")))) + if ( ((preset->isSourcePreset() && (m_currentPresetType == 'R'))) + || ((preset->isSinkPreset() && (m_currentPresetType == 'T'))) + || ((preset->isMIMOPreset() && (m_currentPresetType == 'M')))) { if (listIdx == presetIdx) { return preset; diff --git a/plugins/feature/satellitetracker/satellitetrackergui.h b/plugins/feature/satellitetracker/satellitetrackergui.h index 477c8fe09..166161969 100644 --- a/plugins/feature/satellitetracker/satellitetrackergui.h +++ b/plugins/feature/satellitetracker/satellitetrackergui.h @@ -40,7 +40,9 @@ namespace Ui { class SatelliteTrackerGUI; } +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) using namespace QtCharts; +#endif class SatelliteTrackerGUI : public FeatureGUI { Q_OBJECT diff --git a/plugins/feature/satellitetracker/satellitetrackersettings.cpp b/plugins/feature/satellitetracker/satellitetrackersettings.cpp index 195781958..8b8e167ba 100644 --- a/plugins/feature/satellitetracker/satellitetrackersettings.cpp +++ b/plugins/feature/satellitetracker/satellitetrackersettings.cpp @@ -18,6 +18,7 @@ #include #include +#include #include "util/simpleserializer.h" #include "settings/serializable.h" @@ -270,19 +271,6 @@ void SatelliteTrackerSettings::deserializeStringList(const QByteArray& data, QLi delete stream; } -QDataStream& operator<<(QDataStream& out, const QList *list) -{ - out << *list; - return out; -} - -QDataStream& operator>>(QDataStream& in, QList*& list) -{ - list = new QList(); - in >> *list; - return in; -} - QDataStream& operator<<(QDataStream& out, const SatelliteTrackerSettings::SatelliteDeviceSettings* settings) { out << settings->m_deviceSetIndex; @@ -316,6 +304,19 @@ QDataStream& operator>>(QDataStream& in, SatelliteTrackerSettings::SatelliteDevi return in; } +QDataStream& operator<<(QDataStream& out, const QList *list) +{ + out << *list; + return out; +} + +QDataStream& operator>>(QDataStream& in, QList*& list) +{ + list = new QList(); + in >> *list; + return in; +} + QByteArray SatelliteTrackerSettings::serializeDeviceSettings(QHash *> deviceSettings) const { QByteArray data; diff --git a/plugins/feature/satellitetracker/satellitetrackersgp4.h b/plugins/feature/satellitetracker/satellitetrackersgp4.h index 3612d86c0..ffc9bff83 100644 --- a/plugins/feature/satellitetracker/satellitetrackersgp4.h +++ b/plugins/feature/satellitetracker/satellitetrackersgp4.h @@ -23,7 +23,9 @@ #include #include +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) using namespace QtCharts; +#endif struct SatellitePass { QDateTime m_aos; diff --git a/plugins/feature/satellitetracker/satnogs.h b/plugins/feature/satellitetracker/satnogs.h index 7d1cfc525..e5da8a817 100644 --- a/plugins/feature/satellitetracker/satnogs.h +++ b/plugins/feature/satellitetracker/satnogs.h @@ -23,6 +23,7 @@ #include #include #include +#include struct SatNogsTransmitter { diff --git a/plugins/feature/startracker/startrackergui.cpp b/plugins/feature/startracker/startrackergui.cpp index 4f53cf787..7dfad661f 100644 --- a/plugins/feature/startracker/startrackergui.cpp +++ b/plugins/feature/startracker/startrackergui.cpp @@ -168,7 +168,7 @@ bool StarTrackerGUI::handleMessage(const Message& message) bool found = false; for (int i = 0; i < m_lineOfSightMarkers.size(); i++) { - if (m_lineOfSightMarkers[i]->m_name == swgSettings->getName()) + if (m_lineOfSightMarkers[i]->m_name == *swgSettings->getName()) { if (swgSettings->getD() == 0.0) { diff --git a/plugins/feature/startracker/startrackergui.h b/plugins/feature/startracker/startrackergui.h index c0acf6015..979994537 100644 --- a/plugins/feature/startracker/startrackergui.h +++ b/plugins/feature/startracker/startrackergui.h @@ -45,7 +45,9 @@ namespace Ui { class StarTrackerGUI; } +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) using namespace QtCharts; +#endif class StarTrackerGUI : public FeatureGUI { Q_OBJECT diff --git a/plugins/samplesink/audiooutput/audiooutputsettings.h b/plugins/samplesink/audiooutput/audiooutputsettings.h index 7b83b5ef2..5f12559f5 100644 --- a/plugins/samplesink/audiooutput/audiooutputsettings.h +++ b/plugins/samplesink/audiooutput/audiooutputsettings.h @@ -19,7 +19,7 @@ #define _AUDIOOUTPUT_AUDIOOUTPUTSETTINGS_H_ #include -#include +#include "audio/audiodeviceinfo.h" struct AudioOutputSettings { @@ -43,17 +43,13 @@ struct AudioOutputSettings { QString getDebugString(const QStringList& settingsKeys, bool force=false) const; // Append realm to device names, because there may be multiple devices with the same name on Windows - static QString getFullDeviceName(const QAudioDeviceInfo &deviceInfo) + static QString getFullDeviceName(const AudioDeviceInfo &deviceInfo) { -#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) - return deviceInfo.deviceName(); -#else QString realm = deviceInfo.realm(); if (realm != "" && realm != "default" && realm != "alsa") return deviceInfo.deviceName() + " " + realm; else return deviceInfo.deviceName(); -#endif } }; diff --git a/plugins/samplesource/audioinput/audioinput.cpp b/plugins/samplesource/audioinput/audioinput.cpp index 3a79f4183..bebd89454 100644 --- a/plugins/samplesource/audioinput/audioinput.cpp +++ b/plugins/samplesource/audioinput/audioinput.cpp @@ -95,7 +95,7 @@ bool AudioInput::openDevice() bool AudioInput::openAudioDevice(QString deviceName, qint32 sampleRate) { AudioDeviceManager *audioDeviceManager = DSPEngine::instance()->getAudioDeviceManager(); - const QList& audioList = audioDeviceManager->getInputDevices(); + const QList& audioList = audioDeviceManager->getInputDevices(); for (const auto &itAudio : audioList) { diff --git a/plugins/samplesource/audioinput/audioinputgui.cpp b/plugins/samplesource/audioinput/audioinputgui.cpp index 0d662846f..97787d728 100644 --- a/plugins/samplesource/audioinput/audioinputgui.cpp +++ b/plugins/samplesource/audioinput/audioinputgui.cpp @@ -183,7 +183,7 @@ void AudioInputGui::refreshDeviceList() { ui->device->blockSignals(true); AudioDeviceManager *audioDeviceManager = DSPEngine::instance()->getAudioDeviceManager(); - const QList& audioList = audioDeviceManager->getInputDevices(); + const QList& audioList = audioDeviceManager->getInputDevices(); ui->device->clear(); for (const auto &itAudio : audioList) @@ -197,8 +197,8 @@ void AudioInputGui::refreshSampleRates(QString deviceName) { ui->sampleRate->blockSignals(true); ui->sampleRate->clear(); - const auto deviceInfos = QAudioDeviceInfo::availableDevices(QAudio::AudioInput); - for (const QAudioDeviceInfo &deviceInfo : deviceInfos) + const auto deviceInfos = AudioDeviceInfo::availableInputDevices(); + for (const AudioDeviceInfo &deviceInfo : deviceInfos) { if (deviceName == AudioInputSettings::getFullDeviceName(deviceInfo)) { diff --git a/plugins/samplesource/audioinput/audioinputsettings.h b/plugins/samplesource/audioinput/audioinputsettings.h index 2c90e96f9..aecf4484a 100644 --- a/plugins/samplesource/audioinput/audioinputsettings.h +++ b/plugins/samplesource/audioinput/audioinputsettings.h @@ -20,7 +20,7 @@ #define _AUDIOINPUT_AUDIOINPUTSETTINGS_H_ #include -#include +#include "audio/audiodeviceinfo.h" struct AudioInputSettings { @@ -46,17 +46,13 @@ struct AudioInputSettings { bool deserialize(const QByteArray& data); // Append realm to device names, because there may be multiple devices with the same name on Windows - static QString getFullDeviceName(const QAudioDeviceInfo &deviceInfo) + static QString getFullDeviceName(const AudioDeviceInfo &deviceInfo) { -#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) - return deviceInfo.deviceName(); -#else QString realm = deviceInfo.realm(); if (realm != "" && realm != "default" && realm != "alsa") return deviceInfo.deviceName() + " " + realm; else return deviceInfo.deviceName(); -#endif } void applySettings(const QStringList& settingsKeys, const AudioInputSettings& settings); QString getDebugString(const QStringList& settingsKeys, bool force=false) const;