From bdfae8230dd58e369a75596dcec4242b7007398d Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 3 Oct 2015 01:49:15 +0300 Subject: [PATCH] Check if we seek in a measurement file an empty name. --HG-- branch : develop --- src/libs/vformat/vmeasurements.cpp | 6 ++++++ src/libs/vformat/vmeasurements.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/libs/vformat/vmeasurements.cpp b/src/libs/vformat/vmeasurements.cpp index a071b616c..9fd5e30f5 100644 --- a/src/libs/vformat/vmeasurements.cpp +++ b/src/libs/vformat/vmeasurements.cpp @@ -739,6 +739,12 @@ QDomElement VMeasurements::MakeEmpty(const QString &name, const QString &formula //--------------------------------------------------------------------------------------------------------------------- QDomElement VMeasurements::FindM(const QString &name) const { + if (name.isEmpty()) + { + qWarning() << tr("The measurement name is empty!"); + return QDomElement(); + } + QDomNodeList list = elementsByTagName(TagMeasurement); for (int i=0; i < list.size(); ++i) diff --git a/src/libs/vformat/vmeasurements.h b/src/libs/vformat/vmeasurements.h index b7b9f1568..1acfb0fae 100644 --- a/src/libs/vformat/vmeasurements.h +++ b/src/libs/vformat/vmeasurements.h @@ -36,7 +36,7 @@ enum class SexType : char { Male, Female, Unknown }; class VMeasurements : public VDomDocument { - + Q_DECLARE_TR_FUNCTIONS(VMeasurements) public: VMeasurements(VContainer *data); VMeasurements(Unit unit, VContainer *data);