diff options
Diffstat (limited to 'src/knx/knxproj/qknxinstallation.cpp')
-rw-r--r-- | src/knx/knxproj/qknxinstallation.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/knx/knxproj/qknxinstallation.cpp b/src/knx/knxproj/qknxinstallation.cpp index ed1ef11..c351805 100644 --- a/src/knx/knxproj/qknxinstallation.cpp +++ b/src/knx/knxproj/qknxinstallation.cpp @@ -201,16 +201,17 @@ bool QKnxInstallation::parseElement(QXmlStreamReader *reader, bool pedantic) if (!topology.parseElement(reader, pedantic)) return false; Topology.append(topology); - } else if (reader->name() == QStringLiteral("Buildings")) { - if (pedantic && Buildings.size() >= 1) { - reader->raiseError(tr("Pedantic error: Encountered element " - "<Buildings> more than once.")); - return false; - } - QKnxBuildings buildings; - if (!buildings.parseElement(reader, pedantic)) - return false; - Buildings.append(buildings); + } else if (reader->name() == QStringLiteral("Buildings") + || reader->name() == QStringLiteral("Locations")) { + if (pedantic && Buildings.size() >= 1) { + reader->raiseError(tr("Pedantic error: Encountered element " + "<%1> more than once.").arg(reader->name())); + return false; + } + QKnxBuildings buildings; + if (!buildings.parseElement(reader, pedantic)) + return false; + Buildings.append(buildings); } else if (reader->name() == QStringLiteral("GroupAddresses")) { if (pedantic && GroupAddresses.size() >= 1) { reader->raiseError(tr("Pedantic error: Encountered element " |