Trade: use instance() instead of instanceId() for consistency.

Nowhere else is `Id` suffix.

src/Trade/ObjectData2D.cpp

@@ -26,9 +26,9 @@
 
 namespace Magnum { namespace Trade {
 
-ObjectData2D::ObjectData2D(std::vector<UnsignedInt> children, const Matrix3& transformation, ObjectData2D::InstanceType instanceType, UnsignedInt instanceId): _children(std::move(children)), _transformation(transformation), _instanceType(instanceType), _instanceId(instanceId) {}
+ObjectData2D::ObjectData2D(std::vector<UnsignedInt> children, const Matrix3& transformation, ObjectData2D::InstanceType instanceType, UnsignedInt instance): _children(std::move(children)), _transformation(transformation), _instanceType(instanceType), _instance(instance) {}
 
-ObjectData2D::ObjectData2D(std::vector<UnsignedInt> children, const Matrix3& transformation): _children(children), _transformation(transformation), _instanceType(InstanceType::Empty), _instanceId(-1) {}
+ObjectData2D::ObjectData2D(std::vector<UnsignedInt> children, const Matrix3& transformation): _children(children), _transformation(transformation), _instanceType(InstanceType::Empty), _instance(-1) {}
 
 ObjectData2D::ObjectData2D(ObjectData2D&&) = default;
 

src/Trade/ObjectData2D.h

@@ -56,9 +56,9 @@ class MAGNUM_EXPORT ObjectData2D {
          * @param children          Child objects
          * @param transformation    Transformation (relative to parent)
          * @param instanceType      Instance type
-         * @param instanceId        Instance ID
+         * @param instance          Instance ID
          */
-        explicit ObjectData2D(std::vector<UnsignedInt> children, const Matrix3& transformation, InstanceType instanceType, UnsignedInt instanceId);
+        explicit ObjectData2D(std::vector<UnsignedInt> children, const Matrix3& transformation, InstanceType instanceType, UnsignedInt instance);
 
         /**
          * @brief Constructor for empty instance
@@ -102,13 +102,13 @@ class MAGNUM_EXPORT ObjectData2D {
          * @return ID of given camera / light / mesh etc., specified by
          *      instanceType()
          */
-        Int instanceId() const { return _instanceId; }
+        Int instance() const { return _instance; }
 
     private:
         std::vector<UnsignedInt> _children;
         Matrix3 _transformation;
         InstanceType _instanceType;
-        Int _instanceId;
+        Int _instance;
 };
 
 /** @debugoperator{Magnum::Trade::ObjectData2D} */

src/Trade/ObjectData3D.cpp

@@ -26,9 +26,9 @@
 
 namespace Magnum { namespace Trade {
 
-ObjectData3D::ObjectData3D(std::vector<UnsignedInt> children, const Matrix4& transformation, ObjectData3D::InstanceType instanceType, UnsignedInt instanceId): _children(std::move(children)), _transformation(transformation), _instanceType(instanceType), _instanceId(instanceId) {}
+ObjectData3D::ObjectData3D(std::vector<UnsignedInt> children, const Matrix4& transformation, ObjectData3D::InstanceType instanceType, UnsignedInt instance): _children(std::move(children)), _transformation(transformation), _instanceType(instanceType), _instance(instance) {}
 
-ObjectData3D::ObjectData3D(std::vector<UnsignedInt> children, const Matrix4& transformation): _children(std::move(children)), _transformation(transformation), _instanceType(InstanceType::Empty), _instanceId(-1) {}
+ObjectData3D::ObjectData3D(std::vector<UnsignedInt> children, const Matrix4& transformation): _children(std::move(children)), _transformation(transformation), _instanceType(InstanceType::Empty), _instance(-1) {}
 
 ObjectData3D::ObjectData3D(ObjectData3D&&) = default;
 

src/Trade/ObjectData3D.h

@@ -57,9 +57,9 @@ class MAGNUM_EXPORT ObjectData3D {
          * @param children          Child objects
          * @param transformation    Transformation (relative to parent)
          * @param instanceType      Instance type
-         * @param instanceId        Instance ID
+         * @param instance          Instance ID
          */
-        explicit ObjectData3D(std::vector<UnsignedInt> children, const Matrix4& transformation, InstanceType instanceType, UnsignedInt instanceId);
+        explicit ObjectData3D(std::vector<UnsignedInt> children, const Matrix4& transformation, InstanceType instanceType, UnsignedInt instance);
 
         /**
          * @brief Constructor for empty instance
@@ -103,13 +103,13 @@ class MAGNUM_EXPORT ObjectData3D {
          * @return ID of given camera / light / mesh etc., specified by
          *      instanceType()
          */
-        Int instanceId() const { return _instanceId; }
+        Int instance() const { return _instance; }
 
     private:
         std::vector<UnsignedInt> _children;
         Matrix4 _transformation;
         InstanceType _instanceType;
-        Int _instanceId;
+        Int _instance;
 };
 
 /** @debugoperator{Magnum::Trade::ObjectData3D} */