VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-08-14 23:43:43 -04:00
Code Issues Projects Releases Wiki Activity

Update sdrbase and sdrgui to support Qt5 and Qt6

Browse Source
This commit is contained in:
Jon Beniston
2022-11-17 14:41:55 +00:00
parent 3b5b222114
commit 2cb2a8d555
32 changed files with 95 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdrbase/dsp/spectrumsettings.cpp
+4 -20
View File
@@ -144,17 +144,8 @@ QByteArray SpectrumSettings::serialize() const
s.writeBlob(111+i, m_waterfallMarkers[i].serialize());
}
QByteArray dataAnnotation;
QDataStream *stream = new QDataStream(&dataAnnotation, QIODevice::WriteOnly);
(*stream) << m_annoationMarkers;
delete stream;
s.writeBlob(40, dataAnnotation);
QByteArray dataCalibration;
stream = new QDataStream(&dataCalibration, QIODevice::WriteOnly);
(*stream) << m_calibrationPoints;
delete stream;
s.writeBlob(41, dataCalibration);
s.writeList(40, m_annoationMarkers);
s.writeList(41, m_calibrationPoints);
return s.final();
}
@@ -275,15 +266,8 @@ bool SpectrumSettings::deserialize(const QByteArray& data)
m_waterfallMarkers.back().deserialize(bytetmp);
}
d.readBlob(40, &bytetmp);
QDataStream *stream = new QDataStream(bytetmp);
(*stream) >> m_annoationMarkers;
delete stream;
d.readBlob(41, &bytetmp);
stream = new QDataStream(bytetmp);
(*stream) >> m_calibrationPoints;
delete stream;
d.readList(40, &m_annoationMarkers);
d.readList(41, &m_calibrationPoints);
return true;
}