mirror of
https://github.com/f4exb/sdrangel.git
synced 2026-08-14 15:33:34 -04:00
Update plugins to compile with Qt5 and Qt6
This commit is contained in:
@@ -18,6 +18,7 @@
|
||||
|
||||
#include <QColor>
|
||||
#include <QDataStream>
|
||||
#include <QIODevice>
|
||||
|
||||
#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<SatelliteTrackerSettings::SatelliteDeviceSettings *> *list)
|
||||
{
|
||||
out << *list;
|
||||
return out;
|
||||
}
|
||||
|
||||
QDataStream& operator>>(QDataStream& in, QList<SatelliteTrackerSettings::SatelliteDeviceSettings *>*& list)
|
||||
{
|
||||
list = new QList<SatelliteTrackerSettings::SatelliteDeviceSettings *>();
|
||||
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<SatelliteTrackerSettings::SatelliteDeviceSettings *> *list)
|
||||
{
|
||||
out << *list;
|
||||
return out;
|
||||
}
|
||||
|
||||
QDataStream& operator>>(QDataStream& in, QList<SatelliteTrackerSettings::SatelliteDeviceSettings *>*& list)
|
||||
{
|
||||
list = new QList<SatelliteTrackerSettings::SatelliteDeviceSettings *>();
|
||||
in >> *list;
|
||||
return in;
|
||||
}
|
||||
|
||||
QByteArray SatelliteTrackerSettings::serializeDeviceSettings(QHash<QString, QList<SatelliteDeviceSettings *> *> deviceSettings) const
|
||||
{
|
||||
QByteArray data;
|
||||
|
||||
Reference in New Issue
Block a user