From ba2d93c2e9ae931e4c3dbc61a0a06b4329cd1625 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 e4b7176a011..b119f21f17b 100755
--- 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 288137e1664..7336d3e5cc9 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 98335e5d3ad..c34d1ac0066 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 a6d4414bec1..6e59cbc00e9 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 eb9e595c88e..1519aa8109e 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 a8bdb885e54..d9e75d5844f 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 bcbf4971995..831f310beec 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 40fd534a71d..9df58a20afb 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 6dc378a32f0..e0589fdba98 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 c58be799cfe..7ae48a90ee9 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 cb7da4de336..99a2886a77c 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 949ad85945b..1504afdebee 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 69fd9209981..d1cef0c5f09 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 c9ffa13941c..5ff58ede362 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 073eb1c00fc..9282557a4fb 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 987c4ccd0d3..f1086ffa600 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 4d5e8964ce2..73af38fd369 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 295b9c3fa42..3255ab30e70 100644
--- a/libraries/script-engine/src/ArrayBufferClass.h
+++ b/libraries/script-engine/src/ArrayBufferClass.h
@@ -12,7 +12,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 67af4a3fc3b..a1f7f8245fa 100644
--- a/libraries/script-engine/src/ArrayBufferViewClass.h
+++ b/libraries/script-engine/src/ArrayBufferViewClass.h
@@ -12,7 +12,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 906006e4f44..146ab338d61 100644
--- a/libraries/script-engine/src/EventTypes.h
+++ b/libraries/script-engine/src/EventTypes.h
@@ -12,7 +12,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 b0e622a7747..1887486054f 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 350b733eafa..4d66192a74f 100644
--- a/libraries/script-engine/src/KeyEvent.h
+++ b/libraries/script-engine/src/KeyEvent.h
@@ -13,7 +13,7 @@
 #define hifi_KeyEvent_h
 
 #include <QKeyEvent>
-#include <QScriptValue>
+#include <QtScript/QScriptValue>
 
 class KeyEvent {
 public:
diff --git a/libraries/script-engine/src/ModelScriptingInterface.cpp b/libraries/script-engine/src/ModelScriptingInterface.cpp
index 1716ea72ffc..2e9a9ca14a9 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 1bace0425fd..f3a5cb80c05 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 d9b00a8e019..04e474366d6 100644
--- a/libraries/script-engine/src/MouseEvent.h
+++ b/libraries/script-engine/src/MouseEvent.h
@@ -13,7 +13,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 ce205bdf3ce..66c3f2ee96c 100644
--- a/libraries/script-engine/src/SceneScriptingInterface.h
+++ b/libraries/script-engine/src/SceneScriptingInterface.h
@@ -12,7 +12,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 e0fcc038240..9063e487969 100644
--- a/libraries/script-engine/src/SpatialEvent.h
+++ b/libraries/script-engine/src/SpatialEvent.h
@@ -15,7 +15,7 @@
 #include <glm/glm.hpp>
 #include <glm/gtc/quaternion.hpp>
 
-#include <qscriptengine.h>
+#include <QtScript/qscriptengine.h>
 
 class SpatialEvent {
 public:
diff --git a/libraries/script-engine/src/TouchEvent.cpp b/libraries/script-engine/src/TouchEvent.cpp
index 58ac9ec8c16..050fe8b0fd2 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 3430068eee3..a3faaadbb59 100644
--- a/libraries/script-engine/src/WebSocketClass.h
+++ b/libraries/script-engine/src/WebSocketClass.h
@@ -13,7 +13,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 fff33d5bfbb..a78e8544a3c 100644
--- a/libraries/script-engine/src/WebSocketServerClass.h
+++ b/libraries/script-engine/src/WebSocketServerClass.h
@@ -13,7 +13,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 a0a897c991a..2bc321691f1 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 3ab7d38dda0..01127e786db 100644
--- a/libraries/script-engine/src/XMLHttpRequestClass.h
+++ b/libraries/script-engine/src/XMLHttpRequestClass.h
@@ -16,9 +16,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 54374a934c0..6882efd5886 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 23f435a67c7..ea774aa67b1 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 2e120a7217a..dc2f41997b4 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 ea65cccb3d4..4b283671b43 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);