diff options
| author | Jannis Voelker <jannis.voelker@basyskom.com> | 2018-09-17 08:14:27 +0200 |
|---|---|---|
| committer | Rainer Keller <Rainer.Keller@qt.io> | 2018-09-17 13:46:28 +0000 |
| commit | d1888ef6c83ea2d6bc582fff3f66364550d84f22 (patch) | |
| tree | 089f8dc8ac2cb8716b441b389f763e28edc80573 /examples | |
| parent | cdf465babd7fbf406498d9963be28084d956e290 (diff) | |
Rename QOpcUa::NodeIds::NS0 to QOpcUa::NodeIds::Namespace0
The abbreviation "ns0" is also removed from the converter
functions in qopcuatype.cpp.
Change-Id: Ic8e9aed4891f9e550f4e00105182744f1eb9b2e3
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/opcua/opcuaviewer/treeitem.cpp | 6 | ||||
| -rw-r--r-- | examples/opcua/waterpump/simulationserver/simulationserver.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/opcua/opcuaviewer/treeitem.cpp b/examples/opcua/opcuaviewer/treeitem.cpp index f1d6854..56b10a7 100644 --- a/examples/opcua/opcuaviewer/treeitem.cpp +++ b/examples/opcua/opcuaviewer/treeitem.cpp @@ -138,11 +138,11 @@ QVariant TreeItem::data(int column) return tr("Loading ..."); const QString typeId = mOpcNode->attribute(QOpcUa::NodeAttribute::DataType).toString(); - auto enumEntry = QOpcUa::ns0IDFromNodeId(typeId); + auto enumEntry = QOpcUa::namespace0IdFromNodeId(typeId); QString name; - if (enumEntry == QOpcUa::NodeIds::NS0::Unknown) + if (enumEntry == QOpcUa::NodeIds::Namespace0::Unknown) return typeId; - return QOpcUa::ns0IDName(enumEntry) + " (" + typeId + ")"; + return QOpcUa::namespace0IdName(enumEntry) + " (" + typeId + ")"; } else if (column == 4) { return mNodeId; } else if (column == 5) { diff --git a/examples/opcua/waterpump/simulationserver/simulationserver.cpp b/examples/opcua/waterpump/simulationserver/simulationserver.cpp index f49229b..520f870 100644 --- a/examples/opcua/waterpump/simulationserver/simulationserver.cpp +++ b/examples/opcua/waterpump/simulationserver/simulationserver.cpp @@ -385,7 +385,7 @@ void DemoServer::launch() qFatal("Unexpected namespace index for Demo namespace"); } - UA_NodeId machineObject = addObject(QOpcUa::ns0ID(QOpcUa::NodeIds::NS0::ObjectsFolder), "ns=2;s=Machine", + UA_NodeId machineObject = addObject(QOpcUa::namespace0Id(QOpcUa::NodeIds::Namespace0::ObjectsFolder), "ns=2;s=Machine", "Machine", "Machine", "The machine simulator", UA_NS0ID_ORGANIZES); UA_NodeId tank1Object = addObject("ns=2;s=Machine", "ns=2;s=Machine.Tank1", "Tank1", "Tank 1"); UA_NodeId tank2Object = addObject("ns=2;s=Machine", "ns=2;s=Machine.Tank2", "Tank2", "Tank 2"); |