From bbe9b5c26f77aa5929b7f139e9e92839841937bc Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Fri, 28 Sep 2018 16:04:40 -0700
Subject: [PATCH] code review, remove some unneeded automoc includes

---
 .../src/graphics-scripting/GraphicsScriptingInterface.cpp      | 2 --
 .../src/graphics-scripting/ScriptableMesh.cpp                  | 3 ---
 .../src/graphics-scripting/ScriptableModel.cpp                 | 2 --
 libraries/ui/src/OffscreenUi.cpp                               | 2 +-
 tests-manual/entities/src/main.cpp                             | 2 --
 tests-manual/gpu-textures/src/main.cpp                         | 2 +-
 tests-manual/gpu/src/main.cpp                                  | 2 +-
 tests-manual/render-perf/src/main.cpp                          | 2 --
 8 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp
index 6fd0017ae2..f2afc1e7d4 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp
@@ -445,5 +445,3 @@ void GraphicsScriptingInterface::registerMetaTypes(QScriptEngine* engine) {
 
     Q_UNUSED(metaTypeIds);
 }
-
-#include "GraphicsScriptingInterface.moc"
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
index 585a719638..72d2adb48f 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableMesh.cpp
@@ -401,6 +401,3 @@ scriptable::ScriptableMesh::~ScriptableMesh() {
 #endif
     strongMesh.reset();
 }
-
-#include "ScriptableMesh.moc"
-
diff --git a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp
index 7aaa182163..51085561c3 100644
--- a/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp
+++ b/libraries/graphics-scripting/src/graphics-scripting/ScriptableModel.cpp
@@ -240,5 +240,3 @@ glm::uint32 scriptable::ScriptableModel::forEachVertexAttribute(QScriptValue cal
     return result;
 }
 #endif
-
-#include "ScriptableModel.moc"
diff --git a/libraries/ui/src/OffscreenUi.cpp b/libraries/ui/src/OffscreenUi.cpp
index 7579de256c..0aad297587 100644
--- a/libraries/ui/src/OffscreenUi.cpp
+++ b/libraries/ui/src/OffscreenUi.cpp
@@ -207,7 +207,7 @@ bool OffscreenUi::isPointOnDesktopWindow(QVariant point) {
 void OffscreenUi::hide(const QString& name) {
     auto rootItem = getRootItem();
     if (rootItem) {
-        QQuickItem* item = getRootItem()->findChild<QQuickItem*>(name);
+        QQuickItem* item = rootItem->findChild<QQuickItem*>(name);
         if (item) {
             QQmlProperty(item, OFFSCREEN_VISIBILITY_PROPERTY).write(false);
         }
diff --git a/tests-manual/entities/src/main.cpp b/tests-manual/entities/src/main.cpp
index 43a5d2e48d..e38298ba2c 100644
--- a/tests-manual/entities/src/main.cpp
+++ b/tests-manual/entities/src/main.cpp
@@ -169,5 +169,3 @@ int main(int argc, char** argv) {
     qDebug() << (duration / 1000.0f);
     return 0;
 }
-
-#include "main.moc"
diff --git a/tests-manual/gpu-textures/src/main.cpp b/tests-manual/gpu-textures/src/main.cpp
index 70846b13b1..d8454c6c22 100644
--- a/tests-manual/gpu-textures/src/main.cpp
+++ b/tests-manual/gpu-textures/src/main.cpp
@@ -85,7 +85,7 @@ class MyTestWindow : public TestWindow {
 
     void updateCamera() {
         float t = _time.elapsed() * 1e-3f;
-        glm::vec3 up{ 0.0f, 1.0f, 0.0f };
+        static const glm::vec3 up{ 0.0f, 1.0f, 0.0f };
 
         float distance = 3.0f;
         glm::vec3 camera_position{ distance * sinf(t), 0.5f, distance * cosf(t) };
diff --git a/tests-manual/gpu/src/main.cpp b/tests-manual/gpu/src/main.cpp
index f36e6a9abd..7cf941daea 100644
--- a/tests-manual/gpu/src/main.cpp
+++ b/tests-manual/gpu/src/main.cpp
@@ -102,7 +102,7 @@ class MyTestWindow : public TestWindow {
 #ifdef INTERACTIVE
         t = _time.elapsed() * 1e-3f;
 #endif
-        glm::vec3 up { 0.0f, 1.0f, 0.0f };
+        static const glm::vec3 up { 0.0f, 1.0f, 0.0f };
 
         float distance = 3.0f;
         glm::vec3 camera_position { distance * sinf(t), 0.5f, distance * cosf(t) };
diff --git a/tests-manual/render-perf/src/main.cpp b/tests-manual/render-perf/src/main.cpp
index c9724ea352..357d40cfb4 100644
--- a/tests-manual/render-perf/src/main.cpp
+++ b/tests-manual/render-perf/src/main.cpp
@@ -1103,5 +1103,3 @@ int main(int argc, char** argv) {
     app.exec();
     return 0;
 }
-
-#include "main.moc"