From 7b08537574fdc820a15d94422fdd0cf69e88721b Mon Sep 17 00:00:00 2001 From: Eric Levin Date: Mon, 1 Jun 2015 09:51:24 -0700 Subject: [PATCH] code standards fixes --- .../src/RenderableLineEntityItem.cpp | 2 +- libraries/entities/src/LineEntityItem.h | 13 +++---------- libraries/shared/src/RegisteredMetaTypes.cpp | 4 ++-- libraries/shared/src/RegisteredMetaTypes.h | 4 ++-- 4 files changed, 8 insertions(+), 15 deletions(-) diff --git a/libraries/entities-renderer/src/RenderableLineEntityItem.cpp b/libraries/entities-renderer/src/RenderableLineEntityItem.cpp index 5c0f7b543c..0351e1f4e0 100644 --- a/libraries/entities-renderer/src/RenderableLineEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableLineEntityItem.cpp @@ -41,7 +41,7 @@ void RenderableLineEntityItem::render(RenderArgs* args) { glm::vec3 axis = glm::axis(rotation); glRotatef(glm::degrees(glm::angle(rotation)), axis.x, axis.y, axis.z); QVector points; - if(_pointsChanged){ + if(_pointsChanged) { geometryCache->updateVertices(_lineVerticesID, getLinePoints(), lineColor); _pointsChanged = false; } diff --git a/libraries/entities/src/LineEntityItem.h b/libraries/entities/src/LineEntityItem.h index d1665ec3f8..d9533e3204 100644 --- a/libraries/entities/src/LineEntityItem.h +++ b/libraries/entities/src/LineEntityItem.h @@ -51,19 +51,12 @@ class LineEntityItem : public EntityItem { _color[BLUE_INDEX] = value.blue; } - void setLineWidth(float lineWidth){ - _lineWidth = lineWidth; - } - float getLineWidth() const{ - - return _lineWidth; - } + void setLineWidth(float lineWidth){ _lineWidth = lineWidth; } + float getLineWidth() const{ return _lineWidth; } void setLinePoints(const QVector& points); - const QVector& getLinePoints() const{ - return _points; - } + const QVector& getLinePoints() const{ return _points; } virtual ShapeType getShapeType() const { return SHAPE_TYPE_LINE; } diff --git a/libraries/shared/src/RegisteredMetaTypes.cpp b/libraries/shared/src/RegisteredMetaTypes.cpp index dda55680cf..4f57eea411 100644 --- a/libraries/shared/src/RegisteredMetaTypes.cpp +++ b/libraries/shared/src/RegisteredMetaTypes.cpp @@ -73,7 +73,7 @@ void vec3FromScriptValue(const QScriptValue &object, glm::vec3 &vec3) { vec3.z = object.property("z").toVariant().toFloat(); } -QScriptValue qVectorVec3ToScriptValue(QScriptEngine* engine, const QVector &vector){ +QScriptValue qVectorVec3ToScriptValue(QScriptEngine* engine, const QVector& vector){ QScriptValue array = engine->newArray(); for(int i = 0; i < vector.size(); i++){ array.setProperty(i, vec3toScriptValue(engine, vector.at(i))); @@ -81,7 +81,7 @@ QScriptValue qVectorVec3ToScriptValue(QScriptEngine* engine, const QVector qVectorVec3FromScriptValue(const QScriptValue &array){ +QVector qVectorVec3FromScriptValue(const QScriptValue& array){ QVector newVector(0); int length = array.property("length").toInteger(); diff --git a/libraries/shared/src/RegisteredMetaTypes.h b/libraries/shared/src/RegisteredMetaTypes.h index bab4dc7d08..48eecba227 100644 --- a/libraries/shared/src/RegisteredMetaTypes.h +++ b/libraries/shared/src/RegisteredMetaTypes.h @@ -56,8 +56,8 @@ void qColorFromScriptValue(const QScriptValue& object, QColor& color); QScriptValue qURLToScriptValue(QScriptEngine* engine, const QUrl& url); void qURLFromScriptValue(const QScriptValue& object, QUrl& url); -QScriptValue qVectorVec3ToScriptValue(QScriptEngine*, const QVector& vector); -QVector qVectorVec3FromScriptValue( const QScriptValue &array); +QScriptValue qVectorVec3ToScriptValue(QScriptEngine* engine, const QVector& vector); +QVector qVectorVec3FromScriptValue( const QScriptValue& array); class PickRay { public: