From d6a4e237d6af3ad4721d5e8a71d39297f4af190d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Mon, 21 Apr 2025 18:40:15 +0200 Subject: [PATCH] Remove unused parameters --- src/map/ENC/iso8211.cpp | 17 ++++++++--------- src/map/ENC/iso8211.h | 9 ++++----- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/map/ENC/iso8211.cpp b/src/map/ENC/iso8211.cpp index 73e90191..6c4626b5 100644 --- a/src/map/ENC/iso8211.cpp +++ b/src/map/ENC/iso8211.cpp @@ -22,9 +22,9 @@ struct DR { 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 &v = field.data().at(idx); + const QVector &v = field.data().first(); for (int i = 0; i < field.subFields()->size(); i++) if (field.subFields()->at(i) == name) @@ -33,11 +33,11 @@ const QVariant *ISO8211::data(const Field &field, quint32 name, int idx) const 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; - const QVariant *v = data(field, name, idx); + const QVariant *v = data(field, name); if (!v) return false; *val = v->toInt(&ok); @@ -45,11 +45,11 @@ bool ISO8211::subfield(const Field &field, quint32 name, int *val, int idx) cons 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; - const QVariant *v = data(field, name, idx); + const QVariant *v = data(field, name); if (!v) return false; *val = v->toUInt(&ok); @@ -57,10 +57,9 @@ bool ISO8211::subfield(const Field &field, quint32 name, uint *val, int idx) con return ok; } -bool ISO8211::subfield(const Field &field, quint32 name, QByteArray *val, - int idx) const +bool ISO8211::subfield(const Field &field, quint32 name, QByteArray *val) const { - const QVariant *v = data(field, name, idx); + const QVariant *v = data(field, name); if (!v) return false; *val = v->toByteArray(); diff --git a/src/map/ENC/iso8211.h b/src/map/ENC/iso8211.h index 9d8d6b51..fb7519ea 100644 --- a/src/map/ENC/iso8211.h +++ b/src/map/ENC/iso8211.h @@ -35,10 +35,9 @@ public: bool readDDR(); bool readRecord(Record &record); - bool subfield(const Field &field, quint32 name, int *val, int idx = 0) const; - bool subfield(const Field &field, quint32 name, uint *val, int idx = 0) const; - bool subfield(const Field &field, quint32 name, QByteArray *val, - int idx = 0) const; + bool subfield(const Field &field, quint32 name, int *val) const; + bool subfield(const Field &field, quint32 name, uint *val) const; + bool subfield(const Field &field, quint32 name, QByteArray *val) const; const QString &errorString() const {return _errorString;} @@ -103,7 +102,7 @@ private: bool readDDA(const FieldDefinition &def, SubFields &fields); bool readUDA(quint64 pos, const FieldDefinition &def, const QVector &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; FieldsMap _map;