VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-08-19 06:02:38 -04:00
Code Issues Projects Releases Wiki Activity

Use intermediate integer to pass enum to QDataStream::operator>>

Browse Source
This commit is contained in:
f4exb 2022-01-23 06:52:51 +01:00
parent 85184e2b45
commit e40032e939
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sdrbase/dsp/spectrumsettings.cpp
View File

@ -121,7 +121,7 @@ QDataStream& operator<<(QDataStream& out, const SpectrumAnnotationMarker& marker
out << marker.m_startFrequency; out << marker.m_startFrequency;
out << marker.m_bandwidth; out << marker.m_bandwidth;
out << marker.m_markerColor; out << marker.m_markerColor;
out << marker.m_show; out << (int) marker.m_show;
out << marker.m_text; out << marker.m_text;
return out; return out;
} }
@ -221,11 +221,13 @@ bool SpectrumSettings::deserialize(const QByteArray& data)
QDataStream& operator>>(QDataStream& in, SpectrumAnnotationMarker& marker) QDataStream& operator>>(QDataStream& in, SpectrumAnnotationMarker& marker)
{ {
int tmp;
in >> marker.m_startFrequency; in >> marker.m_startFrequency;
in >> marker.m_bandwidth; in >> marker.m_bandwidth;
in >> marker.m_markerColor; in >> marker.m_markerColor;
in >> marker.m_show; in >> tmp;
in >> marker.m_text; in >> marker.m_text;
marker.m_show = (SpectrumAnnotationMarker::ShowState) tmp;
return in; return in;
} }