From ce7f72d2cdd67d76a5271f4a2da3cf236df2babe Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Wed, 17 Dec 2014 15:26:47 -0800 Subject: [PATCH] Update macro --- interface/src/GLCanvas.h | 2 +- interface/src/devices/DdeFaceTracker.h | 2 +- interface/src/devices/Faceshift.h | 2 +- interface/src/devices/Visage.h | 2 +- libraries/animation/src/AnimationCache.h | 2 +- libraries/networking/src/NodeList.h | 2 ++ libraries/render-utils/src/AmbientOcclusionEffect.h | 2 +- libraries/render-utils/src/DeferredLightingEffect.h | 2 +- libraries/render-utils/src/GeometryCache.h | 2 +- libraries/render-utils/src/GlowEffect.h | 2 +- libraries/render-utils/src/Model.h | 2 +- libraries/render-utils/src/TextureCache.h | 2 +- 12 files changed, 13 insertions(+), 11 deletions(-) diff --git a/interface/src/GLCanvas.h b/interface/src/GLCanvas.h index 420bf77467..d9966714cc 100644 --- a/interface/src/GLCanvas.h +++ b/interface/src/GLCanvas.h @@ -20,7 +20,7 @@ /// customized canvas that simply forwards requests/events to the singleton application class GLCanvas : public QGLWidget { Q_OBJECT - SINGLETON_DEPENDENCY(GLCanvas) + SINGLETON_DEPENDENCY(GLCanvas, false) public: bool isThrottleRendering() const; diff --git a/interface/src/devices/DdeFaceTracker.h b/interface/src/devices/DdeFaceTracker.h index 23a5d1fcc8..60a317e887 100644 --- a/interface/src/devices/DdeFaceTracker.h +++ b/interface/src/devices/DdeFaceTracker.h @@ -20,7 +20,7 @@ class DdeFaceTracker : public FaceTracker { Q_OBJECT - SINGLETON_DEPENDENCY(DdeFaceTracker) + SINGLETON_DEPENDENCY(DdeFaceTracker, false) public: //initialization diff --git a/interface/src/devices/Faceshift.h b/interface/src/devices/Faceshift.h index b6b942dfee..3587b3dfae 100644 --- a/interface/src/devices/Faceshift.h +++ b/interface/src/devices/Faceshift.h @@ -26,7 +26,7 @@ /// Handles interaction with the Faceshift software, which provides head position/orientation and facial features. class Faceshift : public FaceTracker { Q_OBJECT - SINGLETON_DEPENDENCY(Faceshift) + SINGLETON_DEPENDENCY(Faceshift, false) public: void init(); diff --git a/interface/src/devices/Visage.h b/interface/src/devices/Visage.h index c12ce3aabd..6d8c87eef7 100644 --- a/interface/src/devices/Visage.h +++ b/interface/src/devices/Visage.h @@ -28,7 +28,7 @@ namespace VisageSDK { /// Handles input from the Visage webcam feature tracking software. class Visage : public FaceTracker { Q_OBJECT - SINGLETON_DEPENDENCY(Visage) + SINGLETON_DEPENDENCY(Visage, false) public: void init(); diff --git a/libraries/animation/src/AnimationCache.h b/libraries/animation/src/AnimationCache.h index 4e67014822..5bec0b8902 100644 --- a/libraries/animation/src/AnimationCache.h +++ b/libraries/animation/src/AnimationCache.h @@ -26,7 +26,7 @@ typedef QSharedPointer AnimationPointer; /// Scriptable interface for FBX animation loading. class AnimationCache : public ResourceCache { Q_OBJECT - SINGLETON_DEPENDENCY(AnimationCache) + SINGLETON_DEPENDENCY(AnimationCache, false) public: Q_INVOKABLE AnimationPointer getAnimation(const QString& url) { return getAnimation(QUrl(url)); } diff --git a/libraries/networking/src/NodeList.h b/libraries/networking/src/NodeList.h index 921f33b454..78f2f8e457 100644 --- a/libraries/networking/src/NodeList.h +++ b/libraries/networking/src/NodeList.h @@ -27,6 +27,8 @@ #include #include +#include + #include "DomainHandler.h" #include "LimitedNodeList.h" #include "Node.h" diff --git a/libraries/render-utils/src/AmbientOcclusionEffect.h b/libraries/render-utils/src/AmbientOcclusionEffect.h index 421461860d..12688de1cc 100644 --- a/libraries/render-utils/src/AmbientOcclusionEffect.h +++ b/libraries/render-utils/src/AmbientOcclusionEffect.h @@ -21,7 +21,7 @@ class ProgramObject; /// A screen space ambient occlusion effect. See John Chapman's tutorial at /// http://john-chapman-graphics.blogspot.co.uk/2013/01/ssao-tutorial.html for reference. class AmbientOcclusionEffect { - SINGLETON_DEPENDENCY(AmbientOcclusionEffect) + SINGLETON_DEPENDENCY(AmbientOcclusionEffect, false) public: diff --git a/libraries/render-utils/src/DeferredLightingEffect.h b/libraries/render-utils/src/DeferredLightingEffect.h index 904f9827ea..3450d84713 100644 --- a/libraries/render-utils/src/DeferredLightingEffect.h +++ b/libraries/render-utils/src/DeferredLightingEffect.h @@ -24,7 +24,7 @@ class PostLightingRenderable; /// Handles deferred lighting for the bits that require it (voxels, metavoxels...) class DeferredLightingEffect { - SINGLETON_DEPENDENCY(DeferredLightingEffect) + SINGLETON_DEPENDENCY(DeferredLightingEffect, false) public: diff --git a/libraries/render-utils/src/GeometryCache.h b/libraries/render-utils/src/GeometryCache.h index 97f24f94a3..44b7cda8ec 100644 --- a/libraries/render-utils/src/GeometryCache.h +++ b/libraries/render-utils/src/GeometryCache.h @@ -34,7 +34,7 @@ class NetworkTexture; /// Stores cached geometry. class GeometryCache : public ResourceCache { Q_OBJECT - SINGLETON_DEPENDENCY(GeometryCache) + SINGLETON_DEPENDENCY(GeometryCache, false) public: void renderHemisphere(int slices, int stacks); diff --git a/libraries/render-utils/src/GlowEffect.h b/libraries/render-utils/src/GlowEffect.h index 37f29afb62..4828e1764e 100644 --- a/libraries/render-utils/src/GlowEffect.h +++ b/libraries/render-utils/src/GlowEffect.h @@ -27,7 +27,7 @@ class ProgramObject; /// A generic full screen glow effect. class GlowEffect : public QObject { Q_OBJECT - SINGLETON_DEPENDENCY(GlowEffect) + SINGLETON_DEPENDENCY(GlowEffect, false) public: diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h index 20b828022b..8fedd2e622 100644 --- a/libraries/render-utils/src/Model.h +++ b/libraries/render-utils/src/Model.h @@ -470,7 +470,7 @@ Q_DECLARE_METATYPE(QVector) /// Handle management of pending models that need blending class ModelBlender : public QObject { Q_OBJECT - SINGLETON_DEPENDENCY(ModelBlender) + SINGLETON_DEPENDENCY(ModelBlender, false) public: diff --git a/libraries/render-utils/src/TextureCache.h b/libraries/render-utils/src/TextureCache.h index f3ad493cb4..6957fb0830 100644 --- a/libraries/render-utils/src/TextureCache.h +++ b/libraries/render-utils/src/TextureCache.h @@ -32,7 +32,7 @@ enum TextureType { DEFAULT_TEXTURE, NORMAL_TEXTURE, SPECULAR_TEXTURE, EMISSIVE_T /// Stores cached textures, including render-to-texture targets. class TextureCache : public ResourceCache { Q_OBJECT - SINGLETON_DEPENDENCY(TextureCache) + SINGLETON_DEPENDENCY(TextureCache, false) public: