ensure all #include's to QtScript are labeled as such (easier to find)

vircadia · Apr 26, 2021 · ba2d93c · ba2d93c
1 parent c7e79a5
commit ba2d93c
Show file tree

Hide file tree

Showing 36 changed files with 49 additions and 49 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);