diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-08 11:32:24 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-08 11:32:24 +0200 |
commit | 2d67519c9d0a67ea5526a481e30ec2cf5b464694 (patch) | |
tree | 034e6be56a535ae922f475afdc2819a43e294e31 /src/knx/knxproj/qknxgroupaddressinfos.cpp | |
parent | 05f708f025018a96d3fa6c49ea0dc94f5131af23 (diff) | |
parent | a0014eeb418c5eb71c1e087d4c3932353b625e99 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I26ffad9bd368c9f16b9c6850cfc739bd35ec1141
Diffstat (limited to 'src/knx/knxproj/qknxgroupaddressinfos.cpp')
-rw-r--r-- | src/knx/knxproj/qknxgroupaddressinfos.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/knx/knxproj/qknxgroupaddressinfos.cpp b/src/knx/knxproj/qknxgroupaddressinfos.cpp index 510fcab..b82c06f 100644 --- a/src/knx/knxproj/qknxgroupaddressinfos.cpp +++ b/src/knx/knxproj/qknxgroupaddressinfos.cpp @@ -142,7 +142,7 @@ bool QKnxGroupAddressInfosPrivate::readProject(const QKnxProject &project) } projects.insert(project.Id, info); } else { - projects.insert(project.Id, {}); // projects can have empty installations + projects.insert(project.Id, { QString(), {} }); // projects can have empty installations } return status == QKnxGroupAddressInfos::Status::NoError; @@ -369,7 +369,7 @@ QVector<QString> QKnxGroupAddressInfos::projectIds() const */ QString QKnxGroupAddressInfos::projectName(const QString &projectId) const { - return d_ptr->projects.value(projectId, {}).name; + return d_ptr->projects.value(projectId, { QString(), {} }).name; } /*! @@ -377,7 +377,7 @@ QString QKnxGroupAddressInfos::projectName(const QString &projectId) const */ QVector<QString> QKnxGroupAddressInfos::installations(const QString &projectId) const { - return d_ptr->projects.value(projectId, {}).installations.keys().toVector(); + return d_ptr->projects.value(projectId, { QString(), {} }).installations.keys().toVector(); } /*! @@ -386,7 +386,7 @@ QVector<QString> QKnxGroupAddressInfos::installations(const QString &projectId) */ qint32 QKnxGroupAddressInfos::infoCount(const QString &projectId, const QString &installation) const { - const auto installations = d_ptr->projects.value(projectId, {}).installations; + const auto installations = d_ptr->projects.value(projectId, { QString(), {} }).installations; if (installations.isEmpty()) return -1; @@ -404,7 +404,7 @@ QVector<QKnxGroupAddressInfo> QKnxGroupAddressInfos::addressInfos(const QString { if (projectId.isEmpty()) return {}; - return d_ptr->projects.value(projectId, {}).installations.value(installation); + return d_ptr->projects.value(projectId, { QString(), {} }).installations.value(installation); } /*! |