From 146581714a86645178ca89a192f003649f7ebe52 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Fri, 11 Dec 2015 16:17:41 -0800
Subject: [PATCH] More warning fixes

---
 interface/src/Application.cpp                                 | 2 +-
 .../src/display-plugins/OpenGLDisplayPlugin.cpp               | 2 +-
 libraries/render-utils/src/AnimDebugDraw.cpp                  | 4 ++--
 tests/gpu-test/src/main.cpp                                   | 4 ++--
 tests/render-utils/src/main.cpp                               | 4 ++--
 tests/shaders/src/main.cpp                                    | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index b420dca1a7..480a9ebb8b 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -45,7 +45,7 @@
 #include <QtNetwork/QNetworkDiskCache>
 
 #include <gl/Config.h>
-#include <QOpenGLContextWrapper.h>
+#include <gl/QOpenGLContextWrapper.h>
 
 #include <AccountManager.h>
 #include <AddressManager.h>
diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
index 58fd53e39d..ffe8fbe3c1 100644
--- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
@@ -16,7 +16,7 @@
 #include <QtOpenGL/QGLWidget>
 #include <QtGui/QImage>
 
-#include <QOpenGLContextWrapper.h>
+#include <gl/QOpenGLContextWrapper.h>
 
 #include <gl/GLWidget.h>
 #include <NumericalConstants.h>
diff --git a/libraries/render-utils/src/AnimDebugDraw.cpp b/libraries/render-utils/src/AnimDebugDraw.cpp
index 04a1962899..060aaa218b 100644
--- a/libraries/render-utils/src/AnimDebugDraw.cpp
+++ b/libraries/render-utils/src/AnimDebugDraw.cpp
@@ -336,9 +336,9 @@ void AnimDebugDraw::update() {
 
         // count marker verts from shared DebugDraw singleton
         auto markerMap = DebugDraw::getInstance().getMarkerMap();
-        numVerts += markerMap.size() * VERTICES_PER_BONE;
+        numVerts += (int)markerMap.size() * VERTICES_PER_BONE;
         auto myAvatarMarkerMap = DebugDraw::getInstance().getMyAvatarMarkerMap();
-        numVerts += myAvatarMarkerMap.size() * VERTICES_PER_BONE;
+        numVerts += (int)myAvatarMarkerMap.size() * VERTICES_PER_BONE;
 
         // allocate verts!
         data._vertexBuffer->resize(sizeof(Vertex) * numVerts);
diff --git a/tests/gpu-test/src/main.cpp b/tests/gpu-test/src/main.cpp
index 0b701887f9..e185266408 100644
--- a/tests/gpu-test/src/main.cpp
+++ b/tests/gpu-test/src/main.cpp
@@ -33,8 +33,8 @@
 #include <gpu/StandardShaderLib.h>
 #include <gpu/GLBackend.h>
 
-#include <QOpenGLContextWrapper.h>
-#include <QOpenGLDebugLoggerWrapper.h>
+#include <gl/QOpenGLContextWrapper.h>
+#include <gl/QOpenGLDebugLoggerWrapper.h>
 
 #include <GLMHelpers.h>
 #include <PathUtils.h>
diff --git a/tests/render-utils/src/main.cpp b/tests/render-utils/src/main.cpp
index c8fa03fec6..6a4154c8c3 100644
--- a/tests/render-utils/src/main.cpp
+++ b/tests/render-utils/src/main.cpp
@@ -14,8 +14,8 @@
 
 #include <gpu/GLBackend.h>
 
-#include <QOpenGLContextWrapper.h>
-#include <QOpenGLDebugLoggerWrapper.h>
+#include <gl/QOpenGLContextWrapper.h>
+#include <gl/QOpenGLDebugLoggerWrapper.h>
 
 #include <QDir>
 #include <QElapsedTimer>
diff --git a/tests/shaders/src/main.cpp b/tests/shaders/src/main.cpp
index 52e43e2faa..dd1170edeb 100644
--- a/tests/shaders/src/main.cpp
+++ b/tests/shaders/src/main.cpp
@@ -20,8 +20,8 @@
 
 #include <gl/GLHelpers.h>
 
-#include <QOpenGLDebugLoggerWrapper.h>
-#include <QOpenGLContextWrapper.h>
+#include <gl/QOpenGLDebugLoggerWrapper.h>
+#include <gl/QOpenGLContextWrapper.h>
 
 #include "../model/Skybox_vert.h"
 #include "../model/Skybox_frag.h"