mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2026-06-11 02:09:03 -04:00
Merge branch 'develop' into feat-fst280
This commit is contained in:
@@ -13,6 +13,7 @@
|
||||
#include <QVector>
|
||||
#include <QStringList>
|
||||
#include <QMimeData>
|
||||
#include <QTextStream>
|
||||
#include <QDataStream>
|
||||
#include <QByteArray>
|
||||
#include <QDebugStateSaver>
|
||||
@@ -349,14 +350,21 @@ namespace
|
||||
QDebug operator << (QDebug debug, FrequencyList_v2::Item const& item)
|
||||
{
|
||||
QDebugStateSaver saver {debug};
|
||||
debug.nospace () << "FrequencyItem("
|
||||
<< item.frequency_ << ", "
|
||||
<< item.region_ << ", "
|
||||
<< item.mode_ << ')';
|
||||
return debug;
|
||||
return debug.nospace () << item.toString ();
|
||||
}
|
||||
#endif
|
||||
|
||||
QString FrequencyList_v2::Item::toString () const
|
||||
{
|
||||
QString string;
|
||||
QTextStream qts {&string};
|
||||
qts << "FrequencyItem("
|
||||
<< Radio::frequency_MHz_string (frequency_) << ", "
|
||||
<< IARURegions::name (region_) << ", "
|
||||
<< Modes::name (mode_) << ')';
|
||||
return string;
|
||||
}
|
||||
|
||||
QDataStream& operator << (QDataStream& os, FrequencyList_v2::Item const& item)
|
||||
{
|
||||
return os << item.frequency_
|
||||
@@ -574,6 +582,7 @@ auto FrequencyList_v2::impl::frequency_list (FrequencyItems frequency_list) -> F
|
||||
return frequency_list;
|
||||
}
|
||||
|
||||
// add a frequency returning the new model index
|
||||
QModelIndex FrequencyList_v2::impl::add (Item f)
|
||||
{
|
||||
// Any Frequency that isn't in the list may be added
|
||||
|
||||
Reference in New Issue
Block a user