Return the Uniform as a const reference to avoid expensive copies

And inline the nameId() and uniform() getters.

Change-Id: I4c30a6fa36a6e5a7e621d3fad91d88adfcfda185
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

2 files changed, 2 insertions, 12 deletions

diff --git a/src/render/materialsystem/parameter.cpp b/src/render/materialsystem/parameter.cpp
index 9c40c199a..6671e4943 100644
--- a/src/render/materialsystem/parameter.cpp
+++ b/src/render/materialsystem/parameter.cpp
@@ -101,16 +101,6 @@ QString Parameter::name() const
     return m_name;
 }
 
-int Parameter::nameId() const Q_DECL_NOTHROW
-{
-    return m_nameId;
-}
-
-UniformValue Parameter::uniformValue() const
-{
-    return m_uniformValue;
-}
-
 } // namespace Render
 } // namespace Qt3DRender
 
diff --git a/src/render/materialsystem/parameter_p.h b/src/render/materialsystem/parameter_p.h
index 6830ef07d..21c88b56e 100644
--- a/src/render/materialsystem/parameter_p.h
+++ b/src/render/materialsystem/parameter_p.h
@@ -74,8 +74,8 @@ public:
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
     QString name() const;
-    int nameId() const Q_DECL_NOTHROW;
-    UniformValue uniformValue() const;
+    int nameId() const Q_DECL_NOTHROW { return m_nameId; }
+    const UniformValue &uniformValue() const { return m_uniformValue; }
 
 private:
     void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;