Update plugins to compile with Qt5 and Qt6

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);
 }

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();

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);
 }

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();

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);
 }

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();

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);

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);

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<QObject*>("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);

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);

plugins/channelrx/demodadsb/adsbosmtemplateserver.h

@@ -21,6 +21,7 @@
 #include <QTcpServer>
 #include <QTcpSocket>
 #include <QDebug>
+#include <QRegularExpression>
 
 // 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");

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);

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);

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);

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);

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);

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);

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;

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);

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();

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);

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);
 

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);

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();

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);

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();

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<T> out;
 };
 
+*/
+
 // [file_writer] writes raw data from a [pipebuf] to a file descriptor.
 
 template <typename T>

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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;
                     }

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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();

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);

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);

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);

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();

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++)

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

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);

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);

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);

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();

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);

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);

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);

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();

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);

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();

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);

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();

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);

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();

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);

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();

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);

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();

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);

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();

plugins/channeltx/mod802.15.4/ieee_802_15_4_modsource.cpp

@@ -20,6 +20,7 @@
 #include <QDebug>
 #include <QUdpSocket>
 #include <QNetworkDatagram>
+#include <QVariant>
 
 #include "dsp/basebandsamplesink.h"
 #include "dsp/scopevis.h"

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);

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();

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);

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();

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);

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();

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);

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();

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);

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();

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);

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();

plugins/channeltx/modm17/m17modgui.cpp

@@ -20,7 +20,7 @@
 #include <QFileDialog>
 #include <QTime>
 #include <QDebug>
-#include <QRegExp>
+#include <QRegularExpression>
 
 #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);

plugins/channeltx/modm17/m17modgui.h

@@ -18,7 +18,7 @@
 #ifndef PLUGINS_CHANNELTX_MODM17_M17MODGUI_H_
 #define PLUGINS_CHANNELTX_MODM17_M17MODGUI_H_
 
-#include <QRegExpValidator>
+#include <QRegularExpressionValidator>
 
 #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();

plugins/channeltx/modnfm/nfmmodgui.cpp

@@ -20,7 +20,7 @@
 #include <QFileDialog>
 #include <QTime>
 #include <QDebug>
-#include <QRegExp>
+#include <QRegularExpression>
 
 #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);

plugins/channeltx/modnfm/nfmmodgui.h

@@ -18,7 +18,7 @@
 #ifndef PLUGINS_CHANNELTX_MODNFM_NFMMODGUI_H_
 #define PLUGINS_CHANNELTX_MODNFM_NFMMODGUI_H_
 
-#include <QRegExpValidator>
+#include <QRegularExpressionValidator>
 
 #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();

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);

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();

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);

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();

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);