From 54cc49283cb831214c9f620b896f32d91d77c933 Mon Sep 17 00:00:00 2001 From: Anthony Thibault Date: Sun, 13 Mar 2016 18:19:42 -0700 Subject: [PATCH] libraries/avatars: cppcheck warning fixes --- libraries/avatars/src/AvatarData.cpp | 4 ++-- libraries/avatars/src/HeadData.cpp | 2 ++ libraries/avatars/src/HeadData.h | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp index 067ab0603b..adb942417d 100644 --- a/libraries/avatars/src/AvatarData.cpp +++ b/libraries/avatars/src/AvatarData.cpp @@ -1115,7 +1115,7 @@ void AvatarData::detachOne(const QString& modelURL, const QString& jointName) { return; } QVector attachmentData = getAttachmentData(); - for (QVector::iterator it = attachmentData.begin(); it != attachmentData.end(); it++) { + for (QVector::iterator it = attachmentData.begin(); it != attachmentData.end(); ++it) { if (it->modelURL == modelURL && (jointName.isEmpty() || it->jointName == jointName)) { attachmentData.erase(it); setAttachmentData(attachmentData); @@ -1134,7 +1134,7 @@ void AvatarData::detachAll(const QString& modelURL, const QString& jointName) { if (it->modelURL == modelURL && (jointName.isEmpty() || it->jointName == jointName)) { it = attachmentData.erase(it); } else { - it++; + ++it; } } setAttachmentData(attachmentData); diff --git a/libraries/avatars/src/HeadData.cpp b/libraries/avatars/src/HeadData.cpp index 1d664aa3ff..b98112d6e0 100644 --- a/libraries/avatars/src/HeadData.cpp +++ b/libraries/avatars/src/HeadData.cpp @@ -42,6 +42,8 @@ HeadData::HeadData(AvatarData* owningAvatar) : _rightEyeBlink(0.0f), _averageLoudness(0.0f), _browAudioLift(0.0f), + _audioAverageLoudness(0.0f), + _pupilDilation(0.0f), _owningAvatar(owningAvatar) { diff --git a/libraries/avatars/src/HeadData.h b/libraries/avatars/src/HeadData.h index dac266f4a2..fef77c6f8f 100644 --- a/libraries/avatars/src/HeadData.h +++ b/libraries/avatars/src/HeadData.h @@ -32,7 +32,7 @@ class QJsonObject; class HeadData { public: - HeadData(AvatarData* owningAvatar); + explicit HeadData(AvatarData* owningAvatar); virtual ~HeadData() { }; // degrees