Logbook: Improved Flag display code

Author: ik1vqy

data/Data.cpp

@@ -1036,13 +1036,6 @@ WWFFEntity Data::lookupWWFF(const QString &reference)
     return WWFFRet;
 }
 
-QString Data::dxccFlag(int dxcc) {
-    FCT_IDENTIFICATION;
-
-    qCDebug(function_parameters) << dxcc;
-    return flags.value(dxcc);
-}
-
 const char Data::translitTab[] = {
 1, ' ', 1, '!', 2, 'C', '/', 2, 'P', 'S', 2, '$', '?', 2, 'Y', '=',
 1, '|', 2, 'S', 'S', 1, '\"', 3, '(', 'c', ')', 1, 'a', 2, '<', '<',

data/Data.h

@@ -97,7 +97,7 @@ class Data : public QObject
     SOTAEntity lookupSOTA(const QString &SOTACode);
     POTAEntity lookupPOTA(const QString &POTACode);
     WWFFEntity lookupWWFF(const QString &reference);
-    QString dxccFlag(int dxcc);
+    const QString dxccFlag(int dxcc) const {return flags.value(dxcc);} ;
     QPair<QString, QString> legacyMode(const QString &mode);
     QStringList satModeList() { return satModes.values();}
     QStringList satModesIDList() { return satModes.keys(); }
@@ -127,7 +127,7 @@ public slots:
     void loadPOTA();
     void loadTZ();
 
-    QMap<int, QString> flags;
+    QHash<int, QString> flags;
     QMap<QString, QString> contests;
     QMap<QString, QString> propagationModes;
     QMap<QString, QPair<QString, QString>> legacyModes;

models/LogbookModel.cpp

@@ -188,16 +188,10 @@ QVariant LogbookModel::data(const QModelIndex &index, int role) const
         return QVariant();
 
     if (role == Qt::DecorationRole && index.column() == COLUMN_CALL) {
-        QModelIndex dxcc_index = this->index(index.row(), COLUMN_DXCC);
-        int dxcc = QSqlTableModel::data(dxcc_index, Qt::DisplayRole).toInt();
-        QString flag = Data::instance()->dxccFlag(dxcc);
+        const QString &flag = Data::instance()->dxccFlag(QSqlTableModel::data(this->index(index.row(), COLUMN_DXCC), Qt::DisplayRole).toInt());
 
-        if (!flag.isEmpty()) {
-            return QIcon(QString(":/flags/16/%1.png").arg(flag));
-        }
-        else {
-            return QIcon(":/flags/16/unknown.png");
-        }
+        return ( !flag.isEmpty() ) ? QIcon(QString(":/flags/16/%1.png").arg(flag))
+                                   : QIcon(":/flags/16/unknown.png");
     }
 
     if (role == Qt::DecorationRole && (index.column() == COLUMN_QSL_RCVD || index.column() == COLUMN_QSL_SENT ||