From f0338690c871d6bb38eb3caaec0a124a85ed6e0d Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Wed, 6 Jan 2016 14:54:50 -0800 Subject: [PATCH 1/4] whitespace change --- libraries/entities/src/EntityItem.h | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/entities/src/EntityItem.h b/libraries/entities/src/EntityItem.h index 80021d3d90..79cecfc1e5 100644 --- a/libraries/entities/src/EntityItem.h +++ b/libraries/entities/src/EntityItem.h @@ -56,6 +56,7 @@ namespace render { #define debugTimeOnly(T) qPrintable(QString("%1").arg(T, 16, 10)) #define debugTreeVector(V) V << "[" << V << " in meters ]" + /// EntityItem class this is the base class for all entity types. It handles the basic properties and functionality available /// to all other entity types. In particular: postion, size, rotation, age, lifetime, velocity, gravity. You can not instantiate /// one directly, instead you must only construct one of it's derived classes with additional features. From 335ab3c5012a40e915165c6f8646e4cad30ff671 Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Wed, 6 Jan 2016 15:24:52 -0800 Subject: [PATCH 2/4] 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())); } From 8b9c2cde63489e863fe74b2e0f2f22163016af72 Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Wed, 6 Jan 2016 15:29:05 -0800 Subject: [PATCH 3/4] fix warnings --- libraries/ui/src/QmlWindowClass.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/libraries/ui/src/QmlWindowClass.cpp b/libraries/ui/src/QmlWindowClass.cpp index 956a5a42c7..0dafc84d29 100644 --- a/libraries/ui/src/QmlWindowClass.cpp +++ b/libraries/ui/src/QmlWindowClass.cpp @@ -90,7 +90,6 @@ QScriptValue QmlWindowClass::internalConstructor(const QString& qmlSource, QString url; QString title; int width = 100, height = 100; - bool isToolWindow = false; bool visible = true; if (argumentCount > 1) { From b0b13fc523e022955325490b79d9d6cc798a7970 Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Wed, 6 Jan 2016 15:48:00 -0800 Subject: [PATCH 4/4] fix warning in stack manager --- stack-manager/src/AppDelegate.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stack-manager/src/AppDelegate.cpp b/stack-manager/src/AppDelegate.cpp index 61d6a8ee48..c2d629faee 100644 --- a/stack-manager/src/AppDelegate.cpp +++ b/stack-manager/src/AppDelegate.cpp @@ -77,6 +77,8 @@ void myMessageHandler(QtMsgType type, const QMessageLogContext &context, const Q fprintf(stdout, "Fatal: %s\n", qPrintable(msg)); txt += msg; break; + default: + break; } if (outStream) {