w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2026-06-12 10:48:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

retain old type name for FrequencyList_v2, use new type name for new class

Browse Source
This commit is contained in:
Brian Moran
2022-10-11 18:30:01 -07:00
parent a39a48d76a
commit c185f8578f
16 changed files with 170 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
widgets/mainwindow.cpp
+3 -3
View File
@@ -783,7 +783,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
// Hook up working frequencies.
ui->bandComboBox->setModel (m_config.frequencies ());
ui->bandComboBox->setModelColumn (FrequencyList_v2::frequency_mhz_column);
ui->bandComboBox->setModelColumn (FrequencyList_v2_101::frequency_mhz_column);
// Enable live band combo box entry validation and action.
auto band_validator = new LiveFrequencyValidator {ui->bandComboBox
@@ -7414,7 +7414,7 @@ void MainWindow::on_actionOpen_log_directory_triggered ()
void MainWindow::on_bandComboBox_currentIndexChanged (int index)
{
auto const& frequencies = m_config.frequencies ();
auto const& source_index = frequencies->mapToSource (frequencies->index (index, FrequencyList_v2::frequency_column));
auto const& source_index = frequencies->mapToSource (frequencies->index (index, FrequencyList_v2_101::frequency_column));
Frequency frequency {m_freqNominal};
if (source_index.isValid ())
{
@@ -7442,7 +7442,7 @@ void MainWindow::on_bandComboBox_editTextChanged (QString const& text)
void MainWindow::on_bandComboBox_activated (int index)
{
auto const& frequencies = m_config.frequencies ();
auto const& source_index = frequencies->mapToSource (frequencies->index (index, FrequencyList_v2::frequency_column));
auto const& source_index = frequencies->mapToSource (frequencies->index (index, FrequencyList_v2_101::frequency_column));
Frequency frequency {m_freqNominal};
if (source_index.isValid ())
{