Skip to content

Commit

Permalink
Merge branch 'aa5sh_525' into testing_0.40.1
Browse files Browse the repository at this point in the history
  • Loading branch information
foldynl committed Nov 29, 2024
2 parents ce45cfa + 52e9c2c commit 4d59b63
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion models/LogbookModel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,7 @@ bool LogbookModel::setData(const QModelIndex &index, const QVariant &value, int
return main_update_result && depend_update_result;
}

QHash<LogbookModel::ColumnID, const char *> LogbookModel::fieldNameTranslationMap =
QMap<LogbookModel::ColumnID, const char *> LogbookModel::fieldNameTranslationMap =
{
{COLUMN_ID, QT_TR_NOOP("QSO ID")},
{COLUMN_TIME_ON, QT_TR_NOOP("Time on")},
Expand Down
2 changes: 1 addition & 1 deletion models/LogbookModel.h
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ class LogbookModel : public QSqlTableModel
};

private:
static QHash<LogbookModel::ColumnID, const char *> fieldNameTranslationMap;
static QMap<LogbookModel::ColumnID, const char *> fieldNameTranslationMap;

public:
static QString getFieldNameTranslation(const LogbookModel::ColumnID key)
Expand Down

0 comments on commit 4d59b63

Please sign in to comment.