fixed compile errors caused by inconsistencies between merged branches

This commit is contained in:
Mathew Sutcliffe
2013-08-29 00:02:47 +01:00
parent 20c33bf77c
commit a011bb18e6
6 changed files with 7 additions and 10 deletions

View File

@@ -300,10 +300,7 @@ namespace BlackCore
{
try
{
CFrequency freqCopy = freq;
freqCopy.switchUnit(CFrequencyUnit::MHz());
m_net->ReplyToInfoQuery(Cvatlib_Network::infoQuery_Freq, toFSD(callsign), toFSD(freqCopy.unitValueToQStringRounded(6)));
m_net->ReplyToInfoQuery(Cvatlib_Network::infoQuery_Freq, toFSD(callsign), toFSD(QString::number(freq.value(CFrequencyUnit::MHz()), 'f', 3)));
}
catch (...) { exceptionDispatcher(Q_FUNC_INFO); }
}