root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-04-22 05:09:10 +02:00
Code Issues Projects Releases Activity

Remove unused parameters

Browse Source
This commit is contained in:
Martin Tůma 2025-04-21 18:40:15 +02:00
parent b6c7fe9cd1
commit d6a4e237d6
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/map/ENC/iso8211.cpp
View File

@ -22,9 +22,9 @@ struct DR {
char FieldTagSize; char FieldTagSize;
}; };
const QVariant *ISO8211::data(const Field &field, quint32 name, int idx) const const QVariant *ISO8211::data(const Field &field, quint32 name) const
{ {
const QVector<QVariant> &v = field.data().at(idx); const QVector<QVariant> &v = field.data().first();
for (int i = 0; i < field.subFields()->size(); i++) for (int i = 0; i < field.subFields()->size(); i++)
if (field.subFields()->at(i) == name) if (field.subFields()->at(i) == name)
@ -33,11 +33,11 @@ const QVariant *ISO8211::data(const Field &field, quint32 name, int idx) const
return 0; return 0;
} }
bool ISO8211::subfield(const Field &field, quint32 name, int *val, int idx) const bool ISO8211::subfield(const Field &field, quint32 name, int *val) const
{ {
bool ok; bool ok;
const QVariant *v = data(field, name, idx); const QVariant *v = data(field, name);
if (!v) if (!v)
return false; return false;
*val = v->toInt(&ok); *val = v->toInt(&ok);
@ -45,11 +45,11 @@ bool ISO8211::subfield(const Field &field, quint32 name, int *val, int idx) cons
return ok; return ok;
} }
bool ISO8211::subfield(const Field &field, quint32 name, uint *val, int idx) const bool ISO8211::subfield(const Field &field, quint32 name, uint *val) const
{ {
bool ok; bool ok;
const QVariant *v = data(field, name, idx); const QVariant *v = data(field, name);
if (!v) if (!v)
return false; return false;
*val = v->toUInt(&ok); *val = v->toUInt(&ok);
@ -57,10 +57,9 @@ bool ISO8211::subfield(const Field &field, quint32 name, uint *val, int idx) con
return ok; return ok;
} }
bool ISO8211::subfield(const Field &field, quint32 name, QByteArray *val, bool ISO8211::subfield(const Field &field, quint32 name, QByteArray *val) const
int idx) const
{ {
const QVariant *v = data(field, name, idx); const QVariant *v = data(field, name);
if (!v) if (!v)
return false; return false;
*val = v->toByteArray(); *val = v->toByteArray();

9
src/map/ENC/iso8211.h
View File

@ -35,10 +35,9 @@ public:
bool readDDR(); bool readDDR();
bool readRecord(Record &record); bool readRecord(Record &record);
bool subfield(const Field &field, quint32 name, int *val, int idx = 0) const; bool subfield(const Field &field, quint32 name, int *val) const;
bool subfield(const Field &field, quint32 name, uint *val, int idx = 0) const; bool subfield(const Field &field, quint32 name, uint *val) const;
bool subfield(const Field &field, quint32 name, QByteArray *val, bool subfield(const Field &field, quint32 name, QByteArray *val) const;
int idx = 0) const;
const QString &errorString() const {return _errorString;} const QString &errorString() const {return _errorString;}
@ -103,7 +102,7 @@ private:
bool readDDA(const FieldDefinition &def, SubFields &fields); bool readDDA(const FieldDefinition &def, SubFields &fields);
bool readUDA(quint64 pos, const FieldDefinition &def, bool readUDA(quint64 pos, const FieldDefinition &def,
const QVector<SubFieldDefinition> &fields, bool repeat, Data &data); const QVector<SubFieldDefinition> &fields, bool repeat, Data &data);
const QVariant *data(const Field &field, quint32 name, int idx = 0) const; const QVariant *data(const Field &field, quint32 name) const;
QFile _file; QFile _file;
FieldsMap _map; FieldsMap _map;