From 713b29ee41d1b6104650600788072466ed8b0ff1 Mon Sep 17 00:00:00 2001
From: Heather Anderson <heath@odysseus.anderson.name>
Date: Sun, 25 Apr 2021 19:46:41 -0700
Subject: [PATCH] ensure all #include's to QtScript are labeled as such (easier
 to find)

---
 interface/src/avatar/AvatarManager.cpp                      | 2 +-
 interface/src/scripting/AccountServicesScriptingInterface.h | 6 +++---
 interface/src/scripting/WindowScriptingInterface.cpp        | 2 +-
 interface/src/ui/overlays/Overlays.h                        | 2 +-
 libraries/animation/src/AnimVariant.cpp                     | 4 ++--
 libraries/animation/src/AnimVariant.h                       | 2 +-
 libraries/animation/src/AnimationObject.cpp                 | 2 +-
 libraries/animation/src/AnimationObject.h                   | 2 +-
 libraries/animation/src/Rig.cpp                             | 2 +-
 libraries/animation/src/Rig.h                               | 2 +-
 libraries/audio/src/AudioInjectorOptions.cpp                | 2 +-
 libraries/entities-renderer/src/EntityTreeRenderer.cpp      | 2 +-
 libraries/entities/src/EntityEditFilters.h                  | 4 ++--
 libraries/entities/src/EntityItemID.h                       | 2 +-
 .../model-networking/src/model-networking/SimpleMeshProxy.h | 4 ++--
 libraries/networking/src/LocationScriptingInterface.h       | 2 +-
 libraries/networking/src/ResourceCache.h                    | 2 +-
 libraries/script-engine/src/ArrayBufferClass.h              | 2 +-
 libraries/script-engine/src/ArrayBufferViewClass.h          | 2 +-
 libraries/script-engine/src/EventTypes.h                    | 2 +-
 libraries/script-engine/src/KeyEvent.cpp                    | 2 +-
 libraries/script-engine/src/KeyEvent.h                      | 2 +-
 libraries/script-engine/src/ModelScriptingInterface.cpp     | 4 ++--
 libraries/script-engine/src/MouseEvent.cpp                  | 4 ++--
 libraries/script-engine/src/MouseEvent.h                    | 2 +-
 libraries/script-engine/src/SceneScriptingInterface.h       | 2 +-
 libraries/script-engine/src/SpatialEvent.h                  | 2 +-
 libraries/script-engine/src/TouchEvent.cpp                  | 4 ++--
 libraries/script-engine/src/WebSocketClass.h                | 2 +-
 libraries/script-engine/src/WebSocketServerClass.h          | 2 +-
 libraries/script-engine/src/WheelEvent.cpp                  | 4 ++--
 libraries/script-engine/src/XMLHttpRequestClass.h           | 6 +++---
 libraries/shared/src/PointerEvent.cpp                       | 4 ++--
 libraries/shared/src/PointerEvent.h                         | 2 +-
 libraries/shared/src/ScriptValueUtils.h                     | 2 +-
 libraries/shared/src/VariantMapToScriptValue.h              | 4 ++--
 36 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/interface/src/avatar/AvatarManager.cpp b/interface/src/avatar/AvatarManager.cpp
index 943845bda7..e0de4f9af3 100644
--- a/interface/src/avatar/AvatarManager.cpp
+++ b/interface/src/avatar/AvatarManager.cpp
@@ -13,7 +13,7 @@
 
 #include <string>
 
-#include <QScriptEngine>
+#include <QtScript/QScriptEngine>
 
 #include "AvatarLogging.h"
 
diff --git a/interface/src/scripting/AccountServicesScriptingInterface.h b/interface/src/scripting/AccountServicesScriptingInterface.h
index 5c7d85fdf0..a0b3c7db05 100644
--- a/interface/src/scripting/AccountServicesScriptingInterface.h
+++ b/interface/src/scripting/AccountServicesScriptingInterface.h
@@ -13,9 +13,9 @@
 #define hifi_AccountServicesScriptingInterface_h
 
 #include <QObject>
-#include <QScriptContext>
-#include <QScriptEngine>
-#include <QScriptValue>
+#include <QtScript/QScriptContext>
+#include <QtScript/QScriptEngine>
+#include <QtScript/QScriptValue>
 #include <QString>
 #include <QStringList>
 
diff --git a/interface/src/scripting/WindowScriptingInterface.cpp b/interface/src/scripting/WindowScriptingInterface.cpp
index 6c3b7adb06..cc6259472a 100644
--- a/interface/src/scripting/WindowScriptingInterface.cpp
+++ b/interface/src/scripting/WindowScriptingInterface.cpp
@@ -14,7 +14,7 @@
 #include <QClipboard>
 #include <QtCore/QDir>
 #include <QMessageBox>
-#include <QScriptValue>
+#include <QtScript/QScriptValue>
 #include <QtGui/QDesktopServices>
 #include <shared/QtHelpers.h>
 #include <SettingHandle.h>
diff --git a/interface/src/ui/overlays/Overlays.h b/interface/src/ui/overlays/Overlays.h
index e59880c6d9..675bdb4787 100644
--- a/interface/src/ui/overlays/Overlays.h
+++ b/interface/src/ui/overlays/Overlays.h
@@ -20,7 +20,7 @@
 
 #include <QMouseEvent>
 #include <QReadWriteLock>
-#include <QScriptValue>
+#include <QtScript/QScriptValue>
 
 #include <PointerEvent.h>
 
diff --git a/libraries/animation/src/AnimVariant.cpp b/libraries/animation/src/AnimVariant.cpp
index eb9e595c88..1519aa8109 100644
--- a/libraries/animation/src/AnimVariant.cpp
+++ b/libraries/animation/src/AnimVariant.cpp
@@ -11,8 +11,8 @@
 
 #include "AnimVariant.h" // which has AnimVariant/AnimVariantMap
 
-#include <QScriptEngine>
-#include <QScriptValueIterator>
+#include <QtScript/QScriptEngine>
+#include <QtScript/QScriptValueIterator>
 #include <QThread>
 #include <RegisteredMetaTypes.h>
 
diff --git a/libraries/animation/src/AnimVariant.h b/libraries/animation/src/AnimVariant.h
index a8bdb885e5..d9e75d5844 100644
--- a/libraries/animation/src/AnimVariant.h
+++ b/libraries/animation/src/AnimVariant.h
@@ -17,7 +17,7 @@
 #include <glm/gtx/quaternion.hpp>
 #include <map>
 #include <set>
-#include <QScriptValue>
+#include <QtScript/QScriptValue>
 #include <StreamUtils.h>
 #include <GLMHelpers.h>
 #include "AnimationLogging.h"
diff --git a/libraries/animation/src/AnimationObject.cpp b/libraries/animation/src/AnimationObject.cpp
index bcbf497199..831f310bee 100644
--- a/libraries/animation/src/AnimationObject.cpp
+++ b/libraries/animation/src/AnimationObject.cpp
@@ -11,7 +11,7 @@
 
 #include "AnimationObject.h"
 
-#include <QScriptEngine>
+#include <QtScript/QScriptEngine>
 
 #include "AnimationCache.h"
 
diff --git a/libraries/animation/src/AnimationObject.h b/libraries/animation/src/AnimationObject.h
index 466deb5e96..b6d56f0b6a 100644
--- a/libraries/animation/src/AnimationObject.h
+++ b/libraries/animation/src/AnimationObject.h
@@ -13,7 +13,7 @@
 #define hifi_AnimationObject_h
 
 #include <QObject>
-#include <QScriptable>
+#include <QtScript/QScriptable>
 
 #include <FBXSerializer.h>
 
diff --git a/libraries/animation/src/Rig.cpp b/libraries/animation/src/Rig.cpp
index 32e44a1181..ba1128b2c0 100644
--- a/libraries/animation/src/Rig.cpp
+++ b/libraries/animation/src/Rig.cpp
@@ -13,7 +13,7 @@
 
 #include <glm/gtx/vector_angle.hpp>
 #include <queue>
-#include <QScriptValueIterator>
+#include <QtScript/QScriptValueIterator>
 #include <QWriteLocker>
 #include <QReadLocker>
 
diff --git a/libraries/animation/src/Rig.h b/libraries/animation/src/Rig.h
index e3899f3c3d..6da005ed73 100644
--- a/libraries/animation/src/Rig.h
+++ b/libraries/animation/src/Rig.h
@@ -16,7 +16,7 @@
 
 #include <QObject>
 #include <QMutex>
-#include <QScriptValue>
+#include <QtScript/QScriptValue>
 #include <vector>
 #include <JointData.h>
 #include <QReadWriteLock>
diff --git a/libraries/audio/src/AudioInjectorOptions.cpp b/libraries/audio/src/AudioInjectorOptions.cpp
index 39b807fd76..6fd31ba1c3 100644
--- a/libraries/audio/src/AudioInjectorOptions.cpp
+++ b/libraries/audio/src/AudioInjectorOptions.cpp
@@ -11,7 +11,7 @@
 
 #include "AudioInjectorOptions.h"
 
-#include <QScriptValueIterator>
+#include <QtScript/QScriptValueIterator>
 
 #include <RegisteredMetaTypes.h>
 
diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
index 949ad85945..1504afdebe 100644
--- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp
+++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
@@ -15,7 +15,7 @@
 #include <queue>
 
 #include <QEventLoop>
-#include <QScriptSyntaxCheckResult>
+#include <QtScript/QScriptSyntaxCheckResult>
 #include <QThreadPool>
 
 #include <shared/QtHelpers.h>
diff --git a/libraries/entities/src/EntityEditFilters.h b/libraries/entities/src/EntityEditFilters.h
index 69fd920998..d1cef0c5f0 100644
--- a/libraries/entities/src/EntityEditFilters.h
+++ b/libraries/entities/src/EntityEditFilters.h
@@ -13,8 +13,8 @@
 
 #include <QObject>
 #include <QMap>
-#include <QScriptValue>
-#include <QScriptEngine>
+#include <QtScript/QScriptValue>
+#include <QtScript/QScriptEngine>
 #include <glm/glm.hpp>
 
 #include <functional>
diff --git a/libraries/entities/src/EntityItemID.h b/libraries/entities/src/EntityItemID.h
index c9ffa13941..5ff58ede36 100644
--- a/libraries/entities/src/EntityItemID.h
+++ b/libraries/entities/src/EntityItemID.h
@@ -17,7 +17,7 @@
 #include <QDebug>
 #include <QObject>
 #include <QHash>
-#include <QScriptEngine>
+#include <QtScript/QScriptEngine>
 #include <QUuid>
 
 const QUuid UNKNOWN_ENTITY_ID; // null uuid
diff --git a/libraries/model-networking/src/model-networking/SimpleMeshProxy.h b/libraries/model-networking/src/model-networking/SimpleMeshProxy.h
index 073eb1c00f..9282557a4f 100644
--- a/libraries/model-networking/src/model-networking/SimpleMeshProxy.h
+++ b/libraries/model-networking/src/model-networking/SimpleMeshProxy.h
@@ -12,8 +12,8 @@
 #ifndef hifi_SimpleMeshProxy_h
 #define hifi_SimpleMeshProxy_h
 
-#include <QScriptEngine>
-#include <QScriptValueIterator>
+#include <QtScript/QScriptEngine>
+#include <QtScript/QScriptValueIterator>
 #include <QtScript/QScriptValue>
 
 #include <RegisteredMetaTypes.h>
diff --git a/libraries/networking/src/LocationScriptingInterface.h b/libraries/networking/src/LocationScriptingInterface.h
index 987c4ccd0d..f1086ffa60 100644
--- a/libraries/networking/src/LocationScriptingInterface.h
+++ b/libraries/networking/src/LocationScriptingInterface.h
@@ -12,7 +12,7 @@
 #ifndef hifi_LocationScriptingInterface_h
 #define hifi_LocationScriptingInterface_h
 
-#include <qscriptengine.h>
+#include <QtScript/qscriptengine.h>
 
 class LocationScriptingInterface : public QObject {
     Q_OBJECT
diff --git a/libraries/networking/src/ResourceCache.h b/libraries/networking/src/ResourceCache.h
index b78665a7a6..8d5c5a6652 100644
--- a/libraries/networking/src/ResourceCache.h
+++ b/libraries/networking/src/ResourceCache.h
@@ -28,7 +28,7 @@
 #include <QtNetwork/QNetworkReply>
 #include <QtNetwork/QNetworkRequest>
 
-#include <QScriptEngine>
+#include <QtScript/QScriptEngine>
 
 #include <DependencyManager.h>
 
diff --git a/libraries/script-engine/src/ArrayBufferClass.h b/libraries/script-engine/src/ArrayBufferClass.h
index 6438272f5b..5eee958d88 100644
--- a/libraries/script-engine/src/ArrayBufferClass.h
+++ b/libraries/script-engine/src/ArrayBufferClass.h
@@ -15,7 +15,7 @@
 #ifndef hifi_ArrayBufferClass_h
 #define hifi_ArrayBufferClass_h
 
-#include <QScriptClass>
+#include <QtScript/QScriptClass>
 #include <QtCore/QObject>
 #include <QtScript/QScriptClass>
 #include <QtScript/QScriptContext>
diff --git a/libraries/script-engine/src/ArrayBufferViewClass.h b/libraries/script-engine/src/ArrayBufferViewClass.h
index 173f607334..2b3e3cb44f 100644
--- a/libraries/script-engine/src/ArrayBufferViewClass.h
+++ b/libraries/script-engine/src/ArrayBufferViewClass.h
@@ -15,7 +15,7 @@
 #ifndef hifi_ArrayBufferViewClass_h
 #define hifi_ArrayBufferViewClass_h
 
-#include <QScriptClass>
+#include <QtScript/QScriptClass>
 #include <QtCore/QObject>
 #include <QtScript/QScriptClass>
 #include <QtScript/QScriptContext>
diff --git a/libraries/script-engine/src/EventTypes.h b/libraries/script-engine/src/EventTypes.h
index 052d736d48..efeb4721a1 100644
--- a/libraries/script-engine/src/EventTypes.h
+++ b/libraries/script-engine/src/EventTypes.h
@@ -15,7 +15,7 @@
 #ifndef hifi_EventTypes_h
 #define hifi_EventTypes_h
 
-#include <QScriptEngine>
+#include <QtScript/QScriptEngine>
 
 void registerEventTypes(QScriptEngine* engine);
 
diff --git a/libraries/script-engine/src/KeyEvent.cpp b/libraries/script-engine/src/KeyEvent.cpp
index b565b1f3aa..a94796f0fc 100644
--- a/libraries/script-engine/src/KeyEvent.cpp
+++ b/libraries/script-engine/src/KeyEvent.cpp
@@ -12,7 +12,7 @@
 #include "KeyEvent.h"
 
 #include <qdebug.h>
-#include <qscriptengine.h>
+#include <QtScript/qscriptengine.h>
 
 #include "ScriptEngineLogging.h"
 
diff --git a/libraries/script-engine/src/KeyEvent.h b/libraries/script-engine/src/KeyEvent.h
index e322aa4a65..42a9019c84 100644
--- a/libraries/script-engine/src/KeyEvent.h
+++ b/libraries/script-engine/src/KeyEvent.h
@@ -16,7 +16,7 @@
 #define hifi_KeyEvent_h
 
 #include <QKeyEvent>
-#include <QScriptValue>
+#include <QtScript/QScriptValue>
 
 /// Represents a keyboard event to the scripting engine. Exposed as <code><a href="https://apidocs.overte.org/global.html#KeyEvent">KeyEvent</a></code>
 class KeyEvent {
diff --git a/libraries/script-engine/src/ModelScriptingInterface.cpp b/libraries/script-engine/src/ModelScriptingInterface.cpp
index 82ad8081b1..01221ee3e5 100644
--- a/libraries/script-engine/src/ModelScriptingInterface.cpp
+++ b/libraries/script-engine/src/ModelScriptingInterface.cpp
@@ -10,8 +10,8 @@
 //
 
 #include "ModelScriptingInterface.h"
-#include <QScriptEngine>
-#include <QScriptValueIterator>
+#include <QtScript/QScriptEngine>
+#include <QtScript/QScriptValueIterator>
 #include <QtScript/QScriptValue>
 #include <model-networking/SimpleMeshProxy.h>
 #include "ScriptEngine.h"
diff --git a/libraries/script-engine/src/MouseEvent.cpp b/libraries/script-engine/src/MouseEvent.cpp
index 6adb39a29b..2a7daa68a7 100644
--- a/libraries/script-engine/src/MouseEvent.cpp
+++ b/libraries/script-engine/src/MouseEvent.cpp
@@ -11,8 +11,8 @@
 
 #include "MouseEvent.h"
 
-#include <qscriptengine.h>
-#include <qscriptvalue.h>
+#include <QtScript/qscriptengine.h>
+#include <QtScript/qscriptvalue.h>
 
 MouseEvent::MouseEvent() :
     x(0.0f),
diff --git a/libraries/script-engine/src/MouseEvent.h b/libraries/script-engine/src/MouseEvent.h
index 05f96812f9..a94cee458b 100644
--- a/libraries/script-engine/src/MouseEvent.h
+++ b/libraries/script-engine/src/MouseEvent.h
@@ -16,7 +16,7 @@
 #define hifi_MouseEvent_h
 
 #include <QMouseEvent>
-#include <QScriptValue>
+#include <QtScript/QScriptValue>
 
 class QScriptEngine;
 
diff --git a/libraries/script-engine/src/SceneScriptingInterface.h b/libraries/script-engine/src/SceneScriptingInterface.h
index 639e413177..bd06ab7d66 100644
--- a/libraries/script-engine/src/SceneScriptingInterface.h
+++ b/libraries/script-engine/src/SceneScriptingInterface.h
@@ -15,7 +15,7 @@
 #ifndef hifi_SceneScriptingInterface_h
 #define hifi_SceneScriptingInterface_h
 
-#include <qscriptengine.h>
+#include <QtScript/qscriptengine.h>
 #include <DependencyManager.h>
 
 /*@jsdoc
diff --git a/libraries/script-engine/src/SpatialEvent.h b/libraries/script-engine/src/SpatialEvent.h
index 1ea31f1ed3..2dc4925942 100644
--- a/libraries/script-engine/src/SpatialEvent.h
+++ b/libraries/script-engine/src/SpatialEvent.h
@@ -18,7 +18,7 @@
 #include <glm/glm.hpp>
 #include <glm/gtc/quaternion.hpp>
 
-#include <qscriptengine.h>
+#include <QtScript/qscriptengine.h>
 
 /// [unused] Represents a spatial event to the scripting engine
 class SpatialEvent {
diff --git a/libraries/script-engine/src/TouchEvent.cpp b/libraries/script-engine/src/TouchEvent.cpp
index 9e9f8bd34a..405a61a92c 100644
--- a/libraries/script-engine/src/TouchEvent.cpp
+++ b/libraries/script-engine/src/TouchEvent.cpp
@@ -11,8 +11,8 @@
 
 #include "TouchEvent.h"
 
-#include <qscriptengine.h>
-#include <qscriptvalue.h>
+#include <QtScript/qscriptengine.h>
+#include <QtScript/qscriptvalue.h>
 
 #include <NumericalConstants.h>
 
diff --git a/libraries/script-engine/src/WebSocketClass.h b/libraries/script-engine/src/WebSocketClass.h
index 70c02a94b4..b55f55c10e 100644
--- a/libraries/script-engine/src/WebSocketClass.h
+++ b/libraries/script-engine/src/WebSocketClass.h
@@ -16,7 +16,7 @@
 #define hifi_WebSocketClass_h
 
 #include <QObject>
-#include <QScriptEngine>
+#include <QtScript/QScriptEngine>
 #include <QWebSocket>
 
 /*@jsdoc
diff --git a/libraries/script-engine/src/WebSocketServerClass.h b/libraries/script-engine/src/WebSocketServerClass.h
index 0fa01f7813..2f6144bc91 100644
--- a/libraries/script-engine/src/WebSocketServerClass.h
+++ b/libraries/script-engine/src/WebSocketServerClass.h
@@ -16,7 +16,7 @@
 #define hifi_WebSocketServerClass_h
 
 #include <QObject>
-#include <QScriptEngine>
+#include <QtScript/QScriptEngine>
 #include <QWebSocketServer>
 #include "WebSocketClass.h"
 
diff --git a/libraries/script-engine/src/WheelEvent.cpp b/libraries/script-engine/src/WheelEvent.cpp
index 4d7a2bc479..dd40c74c13 100644
--- a/libraries/script-engine/src/WheelEvent.cpp
+++ b/libraries/script-engine/src/WheelEvent.cpp
@@ -11,8 +11,8 @@
 
 #include "WheelEvent.h"
 
-#include <QScriptEngine>
-#include <QScriptValue>
+#include <QtScript/QScriptEngine>
+#include <QtScript/QScriptValue>
 
 WheelEvent::WheelEvent() :
     x(0.0f),
diff --git a/libraries/script-engine/src/XMLHttpRequestClass.h b/libraries/script-engine/src/XMLHttpRequestClass.h
index 06568710c5..6006dd4014 100644
--- a/libraries/script-engine/src/XMLHttpRequestClass.h
+++ b/libraries/script-engine/src/XMLHttpRequestClass.h
@@ -19,9 +19,9 @@
 #include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QObject>
-#include <QScriptContext>
-#include <QScriptEngine>
-#include <QScriptValue>
+#include <QtScript/QScriptContext>
+#include <QtScript/QScriptEngine>
+#include <QtScript/QScriptValue>
 #include <QTimer>
 
 /*
diff --git a/libraries/shared/src/PointerEvent.cpp b/libraries/shared/src/PointerEvent.cpp
index be237442c0..701e3bde68 100644
--- a/libraries/shared/src/PointerEvent.cpp
+++ b/libraries/shared/src/PointerEvent.cpp
@@ -11,8 +11,8 @@
 
 #include "PointerEvent.h"
 
-#include <qscriptengine.h>
-#include <qscriptvalue.h>
+#include <QtScript/qscriptengine.h>
+#include <QtScript/qscriptvalue.h>
 
 #include "RegisteredMetaTypes.h"
 
diff --git a/libraries/shared/src/PointerEvent.h b/libraries/shared/src/PointerEvent.h
index 23f435a67c..ea774aa67b 100644
--- a/libraries/shared/src/PointerEvent.h
+++ b/libraries/shared/src/PointerEvent.h
@@ -16,7 +16,7 @@
 
 #include <stdint.h>
 #include <glm/glm.hpp>
-#include <QScriptValue>
+#include <QtScript/QScriptValue>
 
 class PointerEvent {
 public:
diff --git a/libraries/shared/src/ScriptValueUtils.h b/libraries/shared/src/ScriptValueUtils.h
index 2e120a7217..dc2f41997b 100644
--- a/libraries/shared/src/ScriptValueUtils.h
+++ b/libraries/shared/src/ScriptValueUtils.h
@@ -14,7 +14,7 @@
 #ifndef hifi_ScriptValueUtils_h
 #define hifi_ScriptValueUtils_h
 
-#include <QScriptValue>
+#include <QtScript/QScriptValue>
 
 bool isListOfStrings(const QScriptValue& value);
 
diff --git a/libraries/shared/src/VariantMapToScriptValue.h b/libraries/shared/src/VariantMapToScriptValue.h
index ea65cccb3d..4b283671b4 100644
--- a/libraries/shared/src/VariantMapToScriptValue.h
+++ b/libraries/shared/src/VariantMapToScriptValue.h
@@ -10,8 +10,8 @@
 //
 
 #include <QVariant>
-#include <QScriptValue>
-#include <QScriptEngine>
+#include <QtScript/QScriptValue>
+#include <QtScript/QScriptEngine>
 
 QScriptValue variantToScriptValue(QVariant& qValue, QScriptEngine& scriptEngine);
 QScriptValue variantMapToScriptValue(QVariantMap& variantMap, QScriptEngine& scriptEngine);