diff --git a/qt-openzwave/source/qtozwassociationmodel_p.cpp b/qt-openzwave/source/qtozwassociationmodel_p.cpp index a9578ec..f008e51 100644 --- a/qt-openzwave/source/qtozwassociationmodel_p.cpp +++ b/qt-openzwave/source/qtozwassociationmodel_p.cpp @@ -114,7 +114,7 @@ void QTOZW_Associations_internal::addAssociation(quint8 _nodeID, quint8 _groupID return; } QString target; - target.append(QString::number(_targetNode)).append(":").append(QString::number(_targetInstance)); + target.append(QString::number(_targetNode)).append(".").append(QString::number(_targetInstance)); QStringList targetlist = this->m_associationData[row][associationColumns::Members].toStringList(); if (targetlist.contains(target)) { qCWarning(associationModel) << "addAssociation: Target " << target << "already exists in Group " << _groupIDX << "for node " << _nodeID; @@ -134,7 +134,7 @@ void QTOZW_Associations_internal::delAssociation(quint8 _nodeID, quint8 _groupID return; } QString target; - target.append(QString::number(_targetNode)).append(":").append(QString::number(_targetInstance)); + target.append(QString::number(_targetNode)).append(".").append(QString::number(_targetInstance)); QStringList targetlist = this->m_associationData[row][associationColumns::Members].toStringList(); if (!targetlist.contains(target)) { qCWarning(associationModel) << "delAssociation: Target " << target << "does not exist in Group " << _groupIDX << "for node " << _nodeID; @@ -154,7 +154,7 @@ bool QTOZW_Associations_internal::findAssociation(quint8 _nodeID, quint8 _groupI return false; } QString target; - target.append(QString::number(_targetNode)).append(":").append(QString::number(_targetInstance)); + target.append(QString::number(_targetNode)).append(".").append(QString::number(_targetInstance)); QStringList targetlist = this->m_associationData[row][associationColumns::Members].toStringList(); if (!targetlist.contains(target)) { return false; diff --git a/qt-openzwave/source/qtozwmanager_p.cpp b/qt-openzwave/source/qtozwmanager_p.cpp index c38e856..8f093e2 100644 --- a/qt-openzwave/source/qtozwmanager_p.cpp +++ b/qt-openzwave/source/qtozwmanager_p.cpp @@ -1152,8 +1152,8 @@ void QTOZWManager_Internal::pvt_nodeGroupChanged(quint8 node, quint8 group) QStringList removeitems; for (int i = 0; i < list.size(); ++i) { QString member = list.at(i); - int targetnode = member.split(":")[0].toInt(); - int targetinstance = member.split(":")[1].toInt(); + int targetnode = member.split(".")[0].toInt(); + int targetinstance = member.split(".")[1].toInt(); bool found = false; for (quint32 j = 0; j < count; j++) { if (targetnode == ia[i].m_nodeId && targetinstance == ia[i].m_instance)