From 335ab3c5012a40e915165c6f8646e4cad30ff671 Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Wed, 6 Jan 2016 15:24:52 -0800 Subject: [PATCH] fix warnings --- interface/src/Application.cpp | 2 ++ interface/src/avatar/Avatar.cpp | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index e8673e7eac..9d3f35661d 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -737,6 +737,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) : case Action::UI_NAV_SELECT: key = Qt::Key_Return; break; + default: + break; } if (navAxis) { diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp index 2f7ae62e2e..f532798c2d 100644 --- a/interface/src/avatar/Avatar.cpp +++ b/interface/src/avatar/Avatar.cpp @@ -585,7 +585,7 @@ bool Avatar::shouldRenderHead(const RenderArgs* renderArgs) const { // virtual void Avatar::simulateAttachments(float deltaTime) { - for (int i = 0; i < _attachmentModels.size(); i++) { + for (int i = 0; i < (int)_attachmentModels.size(); i++) { const AttachmentData& attachment = _attachmentData.at(i); auto& model = _attachmentModels.at(i); int jointIndex = getJointIndex(attachment.jointName); @@ -949,14 +949,14 @@ void Avatar::setAttachmentData(const QVector& attachmentData) { AvatarData::setAttachmentData(attachmentData); // if number of attachments has been reduced, remove excess models. - while (_attachmentModels.size() > attachmentData.size()) { + while ((int)_attachmentModels.size() > attachmentData.size()) { auto attachmentModel = _attachmentModels.back(); _attachmentModels.pop_back(); _attachmentsToRemove.push_back(attachmentModel); } for (int i = 0; i < attachmentData.size(); i++) { - if (i == _attachmentModels.size()) { + if (i == (int)_attachmentModels.size()) { // if number of attachments has been increased, we need to allocate a new model _attachmentModels.push_back(allocateAttachmentModel(attachmentData[i].isSoft, _skeletonModel.getRig())); }