Data: Continents as a static StringList

foldynl · Feb 4, 2025 · 6b55f23 · 6b55f23
1 parent a410cb6
commit 6b55f23
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/data/Data.cpp b/data/Data.cpp
@@ -666,6 +666,12 @@ double Data::MHz2UserFriendlyFreq(double freqMHz,
     return freqMHz;
 }
 
+const QStringList &Data::getContinentList()
+{
+    static const QStringList continents{"AF", "AN", "AS", "EU", "NA", "OC", "SA"};
+    return continents;
+}
+
 QPair<QString, QString> Data::legacyMode(const QString &mode)
 {
     FCT_IDENTIFICATION;

diff --git a/data/Data.h b/data/Data.h
@@ -129,6 +129,7 @@ class Data : public QObject
     static double MHz2UserFriendlyFreq(double,
                                        QString &unit,
                                        unsigned char &efectiveDecP);
+    static const QStringList& getContinentList();
 
     static qulonglong countDupe(const QString& callsign,
                                 const QString &band,

diff --git a/ui/LogbookWidget.cpp b/ui/LogbookWidget.cpp
@@ -93,7 +93,7 @@ LogbookWidget::LogbookWidget(QWidget *parent) :
     ui->contactTable->setItemDelegateForColumn(LogbookModel::COLUMN_FREQUENCY, new UnitFormatDelegate("", 6, 0.001, ui->contactTable));
     ui->contactTable->setItemDelegateForColumn(LogbookModel::COLUMN_BAND, new ComboFormatDelegate(new SqlListModel("SELECT name FROM bands ORDER BY start_freq", " "), ui->contactTable));
     ui->contactTable->setItemDelegateForColumn(LogbookModel::COLUMN_MODE, new ComboFormatDelegate(new SqlListModel("SELECT name FROM modes", " "), ui->contactTable));
-    ui->contactTable->setItemDelegateForColumn(LogbookModel::COLUMN_CONTINENT, new ComboFormatDelegate(QStringList()<<" "<< "AF" << "AN" << "AS" << "EU" << "NA" << "OC" << "SA"));
+    ui->contactTable->setItemDelegateForColumn(LogbookModel::COLUMN_CONTINENT, new ComboFormatDelegate(QStringList() << " " << Data::getContinentList()));
     ui->contactTable->setItemDelegateForColumn(LogbookModel::COLUMN_QSL_SENT, new ComboFormatDelegate(Data::instance()->qslSentEnum, ui->contactTable));
     ui->contactTable->setItemDelegateForColumn(LogbookModel::COLUMN_QSL_SENT_VIA, new ComboFormatDelegate(Data::instance()->qslSentViaEnum, ui->contactTable));
     ui->contactTable->setItemDelegateForColumn(LogbookModel::COLUMN_QSL_RCVD, new ComboFormatDelegate(Data::instance()->qslRcvdEnum, ui->contactTable));

diff --git a/ui/NewContactWidget.cpp b/ui/NewContactWidget.cpp
@@ -3732,13 +3732,9 @@ NewContactDynamicWidgets::NewContactDynamicWidgets(bool allocateWidgets,
         contEdit->setMaximumSize(QSize(50, 16777215));
         contEdit->setSizeAdjustPolicy(QComboBox::AdjustToContents);
         contEdit->addItem(QString());
-        contEdit->addItem(QString("AF"));
-        contEdit->addItem(QString("AN"));
-        contEdit->addItem(QString("AS"));
-        contEdit->addItem(QString("EU"));
-        contEdit->addItem(QString("NA"));
-        contEdit->addItem(QString("OC"));
-        contEdit->addItem(QString("SA"));
+
+        for ( const QString &cont : Data::getContinentList() )
+            contEdit->addItem(cont);
 
         ituEdit->setMaximumSize(QSize(40, 16777215));
         ituEdit->setSizePolicy(QSizePolicy::Policy::Preferred, QSizePolicy::Policy::Maximum);