Switched to auto and changed macro

2025-04-24 11:43:16 +02:00 · 2014-12-18 15:42:38 -08:00 · 2014-12-18 15:42:38 -08:00 · 296c0025de
commit 296c0025de
parent f2847cec06
37 changed files with 76 additions and 74 deletions
--- a/assignment-client/src/AssignmentClient.cpp
+++ b/assignment-client/src/AssignmentClient.cpp
@ -93,7 +93,7 @@ AssignmentClient::AssignmentClient(int &argc, char **argv) :
    }

    // create a NodeList as an unassigned client
-    auto nodeList = DependencyManager::set<NodeList, char>(NodeType::Unassigned);
+    auto nodeList = DependencyManager::set<NodeList>(NodeType::Unassigned);
    
    quint16 assignmentServerPort = DEFAULT_DOMAIN_SERVER_PORT;

--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@ -237,8 +237,7 @@ void DomainServer::setupNodeListAndAssignments(const QUuid& sessionUUID) {
    // check for scripts the user wants to persist from their domain-server config
    populateStaticScriptedAssignmentsFromSettings();

-    auto nodeList = DependencyManager::set<LimitedNodeList, unsigned short, unsigned short>(domainServerPort,
-                                                                                            domainServerDTLSPort);
+    auto nodeList = DependencyManager::set<LimitedNodeList>(domainServerPort, domainServerDTLSPort);
    
    // no matter the local port, save it to shared mem so that local assignment clients can ask what it is
    QSharedMemory* sharedPortMem = new QSharedMemory(DOMAIN_SERVER_LOCAL_PORT_SMEM_KEY, this);
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@ -191,9 +191,10 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
        _isVSyncOn(true),
        _aboutToQuit(false)
 {
-    GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = DependencyManager::set<GLCanvas>();
    Model::setAbstractViewStateInterface(this); // The model class will sometimes need to know view state details from us
    
+    
    // read the ApplicationInfo.ini file for Name/Version/Domain information
    QSettings applicationInfo(PathUtils::resourcesPath() + "info/ApplicationInfo.ini", QSettings::IniFormat);

@ -239,7 +240,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
    _nodeThread->setPriority(QThread::TimeCriticalPriority);

    // put the NodeList and datagram processing on the node thread
-    auto nodeList = DependencyManager::set<NodeList, char, unsigned short>(NodeType::Agent, listenPort);
+    auto nodeList = DependencyManager::set<NodeList>(NodeType::Agent, listenPort);
    
    nodeList->moveToThread(_nodeThread);
    _datagramProcessor.moveToThread(_nodeThread);
@ -1045,7 +1046,7 @@ void Application::keyPressEvent(QKeyEvent* event) {
                if (isShifted) {
                    _viewFrustum.setFocalLength(_viewFrustum.getFocalLength() - 0.1f);
                    if (TV3DManager::isConnected()) {
-                        GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+                        auto glCanvas = DependencyManager::get<GLCanvas>();
                        TV3DManager::configureCamera(_myCamera, glCanvas->getDeviceWidth(), glCanvas->getDeviceHeight());
                    }
                } else {
@ -1058,7 +1059,7 @@ void Application::keyPressEvent(QKeyEvent* event) {
                if (isShifted) {
                    _viewFrustum.setFocalLength(_viewFrustum.getFocalLength() + 0.1f);
                    if (TV3DManager::isConnected()) {
-                        GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+                        auto glCanvas = DependencyManager::get<GLCanvas>();
                        TV3DManager::configureCamera(_myCamera, glCanvas->getDeviceWidth(), glCanvas->getDeviceHeight());
                    }

@ -1531,7 +1532,7 @@ void Application::idle() {

 void Application::checkBandwidthMeterClick() {
    // ... to be called upon button release
-    GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = DependencyManager::get<GLCanvas>();
    if (Menu::getInstance()->isOptionChecked(MenuOption::Bandwidth) &&
        Menu::getInstance()->isOptionChecked(MenuOption::Stats) &&
        Menu::getInstance()->isOptionChecked(MenuOption::UserInterface) &&
@ -1567,7 +1568,7 @@ void Application::setFullscreen(bool fullscreen) {
 }

 void Application::setEnable3DTVMode(bool enable3DTVMode) {
-    GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = DependencyManager::get<GLCanvas>();
    resizeGL(glCanvas->getDeviceWidth(), glCanvas->getDeviceHeight());
 }

@ -1593,7 +1594,7 @@ void Application::setEnableVRMode(bool enableVRMode) {
        _myCamera.setHmdRotation(glm::quat());
    }
    
-    GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = DependencyManager::get<GLCanvas>();
    resizeGL(glCanvas->getDeviceWidth(), glCanvas->getDeviceHeight());
 }

@ -1656,7 +1657,7 @@ glm::vec3 Application::getMouseVoxelWorldCoordinates(const VoxelDetail& mouseVox

 bool Application::mouseOnScreen() const {
    if (OculusManager::isConnected()) {
-        GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+        auto glCanvas = DependencyManager::get<GLCanvas>();
        return getMouseX() >= 0 && getMouseX() <= glCanvas->getDeviceWidth() &&
               getMouseY() >= 0 && getMouseY() <= glCanvas->getDeviceHeight();
    }
@ -1698,9 +1699,9 @@ int Application::getMouseDragStartedY() const {
 }

 FaceTracker* Application::getActiveFaceTracker() {
-    Faceshift::SharedPointer faceshift = DependencyManager::get<Faceshift>();
-    Visage::SharedPointer visage = DependencyManager::get<Visage>();
-    DdeFaceTracker::SharedPointer dde = DependencyManager::get<DdeFaceTracker>();
+    auto faceshift = DependencyManager::get<Faceshift>();
+    auto visage = DependencyManager::get<Visage>();
+    auto dde = DependencyManager::get<DdeFaceTracker>();
    
    return (dde->isActive() ? static_cast<FaceTracker*>(dde.data()) :
            (faceshift->isActive() ? static_cast<FaceTracker*>(faceshift.data()) :
@ -2032,7 +2033,7 @@ void Application::init() {

    _metavoxels.init();

-    GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = DependencyManager::get<GLCanvas>();
    _audio.init(glCanvas.data());
    _rearMirrorTools = new RearMirrorTools(glCanvas.data(), _mirrorViewRect, _settings);

@ -2120,7 +2121,7 @@ void Application::updateMouseRay() {
 void Application::updateFaceshift() {
    bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
    PerformanceWarning warn(showWarnings, "Application::updateFaceshift()");
-    Faceshift::SharedPointer faceshift = DependencyManager::get<Faceshift>();
+    auto faceshift = DependencyManager::get<Faceshift>();
    //  Update faceshift
    faceshift->update();

@ -2925,7 +2926,7 @@ void Application::updateShadowMap() {
    
    fbo->release();
    
-    GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = DependencyManager::get<GLCanvas>();
    glViewport(0, 0, glCanvas->getDeviceWidth(), glCanvas->getDeviceHeight());
 }

@ -3277,7 +3278,7 @@ bool Application::getCascadeShadowsEnabled() {
 }

 glm::vec2 Application::getScaledScreenPoint(glm::vec2 projectedPoint) {
-    GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = DependencyManager::get<GLCanvas>();
    float horizontalScale = glCanvas->getDeviceWidth() / 2.0f;
    float verticalScale   = glCanvas->getDeviceHeight() / 2.0f;

--- a/interface/src/Camera.cpp
+++ b/interface/src/Camera.cpp
@ -95,7 +95,7 @@ void Camera::setFarClip(float f) {
 }

 PickRay Camera::computePickRay(float x, float y) {
-    GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = DependencyManager::get<GLCanvas>();
    return computeViewPickRay(x / glCanvas->width(), y / glCanvas->height());
 }

--- 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, false)
+    SINGLETON_DEPENDENCY
    
 public:
    bool isThrottleRendering() const;
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@ -1052,7 +1052,7 @@ void Menu::bumpSettings() {

 void sendFakeEnterEvent() {
    QPoint lastCursorPosition = QCursor::pos();
-    GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = DependencyManager::get<GLCanvas>();

    QPoint windowPosition = glCanvas->mapFromGlobal(lastCursorPosition);
    QEnterEvent enterEvent = QEnterEvent(windowPosition, windowPosition, lastCursorPosition);
--- a/interface/src/MetavoxelSystem.cpp
+++ b/interface/src/MetavoxelSystem.cpp
@ -1178,7 +1178,7 @@ void VoxelBuffer::render(bool cursor) {
        
        if (!_materials.isEmpty()) {
            _networkTextures.resize(_materials.size());
-            TextureCache::SharedPointer textureCache = DependencyManager::get<TextureCache>();
+            auto textureCache = DependencyManager::get<TextureCache>();
            for (int i = 0; i < _materials.size(); i++) {
                const SharedObjectPointer material = _materials.at(i);
                if (material) {
@ -2233,7 +2233,7 @@ void HeightfieldNodeRenderer::render(const HeightfieldNodePointer& node, const g
                
            const QVector<SharedObjectPointer>& materials = node->getMaterial()->getMaterials();
            _networkTextures.resize(materials.size());
-            TextureCache::SharedPointer textureCache = DependencyManager::get<TextureCache>();
+            auto textureCache = DependencyManager::get<TextureCache>();
            for (int i = 0; i < materials.size(); i++) {
                const SharedObjectPointer& material = materials.at(i);
                if (material) {
--- a/interface/src/ModelUploader.cpp
+++ b/interface/src/ModelUploader.cpp
@ -472,7 +472,7 @@ void ModelUploader::processCheck() {
                                     QString("Your model is now available in the browser."),
                                     QMessageBox::Ok);
            DependencyManager::get<GeometryCache>()->refresh(_url);
-            TextureCache::SharedPointer textureCache = DependencyManager::get<TextureCache>();
+            auto textureCache = DependencyManager::get<TextureCache>();
            foreach (const QByteArray& filename, _textureFilenames) {
                textureCache->refresh(_textureBase + filename);
            }
--- a/interface/src/Util.cpp
+++ b/interface/src/Util.cpp
@ -71,7 +71,7 @@ void renderWorldBox() {
    glPushMatrix();
    glTranslatef(MARKER_DISTANCE, 0, 0);
    glColor3fv(red);
-    GeometryCache::SharedPointer geometryCache = DependencyManager::get<GeometryCache>();
+    auto geometryCache = DependencyManager::get<GeometryCache>();
    geometryCache->renderSphere(MARKER_RADIUS, 10, 10);
    glPopMatrix();
    glPushMatrix();
--- a/interface/src/avatar/Head.cpp
+++ b/interface/src/avatar/Head.cpp
@ -78,8 +78,8 @@ void Head::simulate(float deltaTime, bool isMine, bool billboard) {
        // Only use face trackers when not playing back a recording.
        if (!myAvatar->isPlaying()) {
            FaceTracker* faceTracker = Application::getInstance()->getActiveFaceTracker();
-            DdeFaceTracker::SharedPointer dde = DependencyManager::get<DdeFaceTracker>();
-            Faceshift::SharedPointer faceshift = DependencyManager::get<Faceshift>();
+            auto dde = DependencyManager::get<DdeFaceTracker>();
+            auto faceshift = DependencyManager::get<Faceshift>();
            
            if ((_isFaceshiftConnected = (faceshift == faceTracker))) {
                _blendshapeCoefficients = faceTracker->getBlendshapeCoefficients();
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@ -422,7 +422,7 @@ void MyAvatar::render(const glm::vec3& cameraPosition, RenderMode renderMode, bo
 }

 void MyAvatar::renderHeadMouse(int screenWidth, int screenHeight) const {
-    Faceshift::SharedPointer faceshift = DependencyManager::get<Faceshift>();
+    auto faceshift = DependencyManager::get<Faceshift>();
    
    float pixelsPerDegree = screenHeight / Menu::getInstance()->getFieldOfView();
    
--- a/interface/src/avatar/SkeletonModel.cpp
+++ b/interface/src/avatar/SkeletonModel.cpp
@ -554,7 +554,7 @@ void SkeletonModel::renderRagdoll() {
    float radius1 = 0.008f;
    float radius2 = 0.01f;
    glm::vec3 simulationTranslation = _ragdoll->getTranslationInSimulationFrame();
-    GeometryCache::SharedPointer geometryCache = DependencyManager::get<GeometryCache>();
+    auto geometryCache = DependencyManager::get<GeometryCache>();
    for (int i = 0; i < numPoints; ++i) {
        glPushMatrix();
        // NOTE: ragdollPoints are in simulation-frame but we want them to be model-relative
@ -914,7 +914,7 @@ void SkeletonModel::renderBoundingCollisionShapes(float alpha) {
    endPoint = endPoint - _translation;
    glTranslatef(endPoint.x, endPoint.y, endPoint.z);
    glColor4f(0.6f, 0.6f, 0.8f, alpha);
-    GeometryCache::SharedPointer geometryCache = DependencyManager::get<GeometryCache>();
+    auto geometryCache = DependencyManager::get<GeometryCache>();
    geometryCache->renderSphere(_boundingShape.getRadius(), BALL_SUBDIVISIONS, BALL_SUBDIVISIONS);

    // draw a yellow sphere at the capsule startpoint
@ -950,7 +950,7 @@ void SkeletonModel::renderJointCollisionShapes(float alpha) {
            continue;
        } 

-        GeometryCache::SharedPointer geometryCache = DependencyManager::get<GeometryCache>();
+        auto geometryCache = DependencyManager::get<GeometryCache>();

        glPushMatrix();
        // shapes are stored in simulation-frame but we want position to be model-relative
--- 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, false)
+    SINGLETON_DEPENDENCY
    
 public:
    //initialization
--- 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, false)
+    SINGLETON_DEPENDENCY

 public:
    void init();
--- a/interface/src/devices/OculusManager.cpp
+++ b/interface/src/devices/OculusManager.cpp
@ -562,7 +562,7 @@ void OculusManager::display(const glm::quat &bodyOrientation, const glm::vec3 &p
    }

    // restore our normal viewport
-    GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = DependencyManager::get<GLCanvas>();
    glViewport(0, 0, glCanvas->getDeviceWidth(), glCanvas->getDeviceHeight());

    glMatrixMode(GL_PROJECTION);
@ -581,7 +581,7 @@ void OculusManager::display(const glm::quat &bodyOrientation, const glm::vec3 &p
 void OculusManager::renderDistortionMesh(ovrPosef eyeRenderPose[ovrEye_Count]) {

    glLoadIdentity();
-    GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = DependencyManager::get<GLCanvas>();
    gluOrtho2D(0, glCanvas->getDeviceWidth(), 0, glCanvas->getDeviceHeight());

    glDisable(GL_DEPTH_TEST);
--- a/interface/src/devices/PrioVR.cpp
+++ b/interface/src/devices/PrioVR.cpp
@ -215,7 +215,7 @@ void PrioVR::renderCalibrationCountdown() {
    static TextRenderer* textRenderer = TextRenderer::getInstance(MONO_FONT_FAMILY, 18, QFont::Bold,
        false, TextRenderer::OUTLINE_EFFECT, 2);
    QByteArray text = "Assume T-Pose in " + QByteArray::number(secondsRemaining) + "...";
-    GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = DependencyManager::get<GLCanvas>();
    textRenderer->draw((glCanvas->width() - textRenderer->computeWidth(text.constData())) / 2,
                       glCanvas->height() / 2,
                       text);
--- a/interface/src/devices/SixenseManager.cpp
+++ b/interface/src/devices/SixenseManager.cpp
@ -461,7 +461,7 @@ void SixenseManager::updateCalibration(const sixenseControllerData* controllers)
 void SixenseManager::emulateMouse(PalmData* palm, int index) {
    Application* application = Application::getInstance();
    MyAvatar* avatar = application->getAvatar();
-    GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = DependencyManager::get<GLCanvas>();
    QPoint pos;
    
    Qt::MouseButton bumperButton;
--- a/interface/src/devices/TV3DManager.cpp
+++ b/interface/src/devices/TV3DManager.cpp
@ -35,7 +35,7 @@ bool TV3DManager::isConnected() {
 }

 void TV3DManager::connect() {
-    GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = DependencyManager::get<GLCanvas>();
    int width = glCanvas->getDeviceWidth();
    int height = glCanvas->getDeviceHeight();
    Camera& camera = *Application::getInstance()->getCamera();
@ -93,7 +93,7 @@ void TV3DManager::display(Camera& whichCamera) {
    // left eye portal
    int portalX = 0;
    int portalY = 0;
-    GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = DependencyManager::get<GLCanvas>();
    QSize deviceSize = glCanvas->getDeviceSize() *
        Application::getInstance()->getRenderResolutionScale();
    int portalW = deviceSize.width() / 2;
--- 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, false)
+    SINGLETON_DEPENDENCY
    
 public:
    void init();
--- a/interface/src/scripting/ControllerScriptingInterface.cpp
+++ b/interface/src/scripting/ControllerScriptingInterface.cpp
@ -268,7 +268,7 @@ void ControllerScriptingInterface::releaseJoystick(int joystickIndex) {
 }

 glm::vec2 ControllerScriptingInterface::getViewportDimensions() const {
-    GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = DependencyManager::get<GLCanvas>();
    return glm::vec2(glCanvas->width(), glCanvas->height());
 }

--- a/interface/src/ui/ApplicationOverlay.cpp
+++ b/interface/src/ui/ApplicationOverlay.cpp
@ -147,7 +147,7 @@ void ApplicationOverlay::renderOverlay(bool renderToTexture) {
    PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), "ApplicationOverlay::displayOverlay()");
    Application* application = Application::getInstance();
    Overlays& overlays = application->getOverlays();
-    GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = DependencyManager::get<GLCanvas>();
    MyAvatar* myAvatar = application->getAvatar();
    
    _textureFov = glm::radians(Menu::getInstance()->getOculusUIAngularSize());
@ -215,7 +215,7 @@ void ApplicationOverlay::displayOverlayTexture() {
    if (_alpha == 0.0f) {
        return;
    }
-    GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = DependencyManager::get<GLCanvas>();

    glEnable(GL_TEXTURE_2D);
    glActiveTexture(GL_TEXTURE0);
@ -380,7 +380,7 @@ void ApplicationOverlay::displayOverlayTexture3DTV(Camera& whichCamera, float as
    
    glEnd();
    
-    GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = DependencyManager::get<GLCanvas>();
    if (_crosshairTexture == 0) {
        _crosshairTexture = glCanvas->bindTexture(QImage(PathUtils::resourcesPath() + "images/sixense-reticle.png"));
    }
@ -434,7 +434,7 @@ void ApplicationOverlay::computeOculusPickRay(float x, float y, glm::vec3& origi
 //Caculate the click location using one of the sixense controllers. Scale is not applied
 QPoint ApplicationOverlay::getPalmClickLocation(const PalmData *palm) const {
    Application* application = Application::getInstance();
-    GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = DependencyManager::get<GLCanvas>();
    MyAvatar* myAvatar = application->getAvatar();

    glm::vec3 tip = myAvatar->getLaserPointerTipPosition(palm);
@ -513,7 +513,7 @@ bool ApplicationOverlay::calculateRayUICollisionPoint(const glm::vec3& position,
 //Renders optional pointers
 void ApplicationOverlay::renderPointers() {
    Application* application = Application::getInstance();
-    GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = DependencyManager::get<GLCanvas>();

    //lazily load crosshair texture
    if (_crosshairTexture == 0) {
@ -561,7 +561,7 @@ void ApplicationOverlay::renderPointers() {

 void ApplicationOverlay::renderControllerPointers() {
    Application* application = Application::getInstance();
-    GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = DependencyManager::get<GLCanvas>();
    MyAvatar* myAvatar = application->getAvatar();

    //Static variables used for storing controller state
@ -706,7 +706,7 @@ void ApplicationOverlay::renderPointersOculus(const glm::vec3& eyePos) {

 //Renders a small magnification of the currently bound texture at the coordinates
 void ApplicationOverlay::renderMagnifier(glm::vec2 magPos, float sizeMult, bool showBorder) const {
-    GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = DependencyManager::get<GLCanvas>();
    
    const int widgetWidth = glCanvas->width();
    const int widgetHeight = glCanvas->height();
@ -764,7 +764,7 @@ void ApplicationOverlay::renderAudioMeter() {

    Application* application = Application::getInstance();
    
-    GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = DependencyManager::get<GLCanvas>();
    Audio* audio = application->getAudio();

    //  Display a single screen-size quad to create an alpha blended 'collision' flash
@ -895,7 +895,7 @@ void ApplicationOverlay::renderStatsAndLogs() {

    Application* application = Application::getInstance();
    
-    GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = DependencyManager::get<GLCanvas>();
    const OctreePacketProcessor& octreePacketProcessor = application->getOctreePacketProcessor();
    BandwidthMeter* bandwidthMeter = application->getBandwidthMeter();
    NodeBounds& nodeBoundsDisplay = application->getNodeBoundsDisplay();
@ -937,7 +937,7 @@ void ApplicationOverlay::renderDomainConnectionStatusBorder() {
    auto nodeList = DependencyManager::get<NodeList>();

    if (nodeList && !nodeList->getDomainHandler().isConnected()) {
-        GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+        auto glCanvas = DependencyManager::get<GLCanvas>();
        int right = glCanvas->width();
        int bottom = glCanvas->height();

--- a/interface/src/ui/PreferencesDialog.cpp
+++ b/interface/src/ui/PreferencesDialog.cpp
@ -215,7 +215,7 @@ void PreferencesDialog::savePreferences() {
    myAvatar->setClampedTargetScale(ui.avatarScaleSpin->value());
    
    Application::getInstance()->getVoxels()->setMaxVoxels(ui.maxVoxelsSpin->value());
-    GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = DependencyManager::get<GLCanvas>();
    Application::getInstance()->resizeGL(glCanvas->width(), glCanvas->height());

    Menu::getInstance()->setRealWorldFieldOfView(ui.realWorldFieldOfViewSpin->value());
--- a/interface/src/ui/Snapshot.cpp
+++ b/interface/src/ui/Snapshot.cpp
@ -83,7 +83,7 @@ QTemporaryFile* Snapshot::saveTempSnapshot() {
 }

 QFile* Snapshot::savedFileForSnapshot(bool isTemporary) {
-    GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = DependencyManager::get<GLCanvas>();
    QImage shot = glCanvas->grabFrameBuffer();
    
    Avatar* avatar = Application::getInstance()->getAvatar();
--- a/interface/src/ui/Stats.cpp
+++ b/interface/src/ui/Stats.cpp
@ -56,7 +56,7 @@ Stats::Stats():
        _metavoxelReceiveProgress(0),
        _metavoxelReceiveTotal(0)
 {
-    GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = DependencyManager::get<GLCanvas>();
    resetWidth(glCanvas->width(), 0);
 }

@ -67,7 +67,7 @@ void Stats::toggleExpanded() {
 // called on mouse click release
 // check for clicks over stats  in order to expand or contract them
 void Stats::checkClick(int mouseX, int mouseY, int mouseDragStartedX, int mouseDragStartedY, int horizontalOffset) {
-    GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = DependencyManager::get<GLCanvas>();

    if (0 != glm::compMax(glm::abs(glm::ivec2(mouseX - mouseDragStartedX, mouseY - mouseDragStartedY)))) {
        // not worried about dragging on stats
@ -122,7 +122,7 @@ void Stats::checkClick(int mouseX, int mouseY, int mouseDragStartedX, int mouseD
 }

 void Stats::resetWidth(int width, int horizontalOffset) {
-    GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = DependencyManager::get<GLCanvas>();
    int extraSpace = glCanvas->width() - horizontalOffset -2
                   - STATS_GENERAL_MIN_WIDTH
                   - (Menu::getInstance()->isOptionChecked(MenuOption::TestPing) ? STATS_PING_MIN_WIDTH -1 : 0)
@ -198,7 +198,7 @@ void Stats::display(
        int bytesPerSecond, 
        int voxelPacketsToProcess) 
 {
-    GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = DependencyManager::get<GLCanvas>();

    unsigned int backgroundColor = 0x33333399;
    int verticalOffset = 0, lines = 0;
--- a/libraries/animation/src/AnimationCache.h
+++ b/libraries/animation/src/AnimationCache.h
@ -26,7 +26,7 @@ typedef QSharedPointer<Animation> AnimationPointer;
 /// Scriptable interface for FBX animation loading.
 class AnimationCache : public ResourceCache  {
    Q_OBJECT
-    SINGLETON_DEPENDENCY(AnimationCache, false)
+    SINGLETON_DEPENDENCY

 public:
    Q_INVOKABLE AnimationPointer getAnimation(const QString& url) { return getAnimation(QUrl(url)); }
--- a/libraries/networking/src/LimitedNodeList.h
+++ b/libraries/networking/src/LimitedNodeList.h
@ -29,6 +29,8 @@

 #include <tbb/concurrent_unordered_map.h>

+#include <DependencyManager.h>
+
 #include "DomainHandler.h"
 #include "Node.h"
 #include "UUIDHasher.h"
@ -69,7 +71,7 @@ namespace PingType {

 class LimitedNodeList : public QObject {
    Q_OBJECT
-    SINGLETON_DEPENDENCY(LimitedNodeList, true);
+    SINGLETON_DEPENDENCY
    
 public:
    const QUuid& getSessionUUID() const { return _sessionUUID; }
--- a/libraries/networking/src/NodeList.h
+++ b/libraries/networking/src/NodeList.h
@ -42,7 +42,7 @@ class Assignment;

 class NodeList : public LimitedNodeList {
    Q_OBJECT
-    SINGLETON_DEPENDENCY(NodeList, true)
+    SINGLETON_DEPENDENCY
    
 public:
    NodeType_t getOwnerType() const { return _ownerType; }
--- a/libraries/render-utils/src/AmbientOcclusionEffect.h
+++ b/libraries/render-utils/src/AmbientOcclusionEffect.h
@ -20,7 +20,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, false)
+    SINGLETON_DEPENDENCY
    
 public:
    
--- a/libraries/render-utils/src/DeferredLightingEffect.cpp
+++ b/libraries/render-utils/src/DeferredLightingEffect.cpp
@ -128,7 +128,7 @@ void DeferredLightingEffect::addSpotLight(const glm::vec3& position, float radiu

 void DeferredLightingEffect::prepare() {
    // clear the normal and specular buffers
-    TextureCache::SharedPointer textureCache = DependencyManager::get<TextureCache>();
+    auto textureCache = DependencyManager::get<TextureCache>();
    textureCache->setPrimaryDrawBuffers(false, true, false);
    glClear(GL_COLOR_BUFFER_BIT);
    textureCache->setPrimaryDrawBuffers(false, false, true);
@ -150,7 +150,7 @@ void DeferredLightingEffect::render() {
    glDisable(GL_COLOR_MATERIAL);
    glDepthMask(false);

-    TextureCache::SharedPointer textureCache = DependencyManager::get<TextureCache>();
+    auto textureCache = DependencyManager::get<TextureCache>();
    
    QOpenGLFramebufferObject* primaryFBO = textureCache->getPrimaryFramebufferObject();
    primaryFBO->release();
@ -247,7 +247,7 @@ void DeferredLightingEffect::render() {
    const glm::vec3& eyePoint = _viewState->getCurrentViewFrustum()->getPosition();
    float nearRadius = glm::distance(eyePoint, _viewState->getCurrentViewFrustum()->getNearTopLeft());

-    GeometryCache::SharedPointer geometryCache = DependencyManager::get<GeometryCache>();
+    auto geometryCache = DependencyManager::get<GeometryCache>();
    
    if (!_pointLights.isEmpty()) {
        _pointLight.bind();
--- 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, false)
+    SINGLETON_DEPENDENCY
    
 public:
    
--- a/libraries/render-utils/src/GeometryCache.cpp
+++ b/libraries/render-utils/src/GeometryCache.cpp
@ -699,7 +699,7 @@ void NetworkGeometry::clearLoadPriority(const QPointer<QObject>& owner) {

 void NetworkGeometry::setTextureWithNameToURL(const QString& name, const QUrl& url) {
    if (_meshes.size() > 0) {
-        TextureCache::SharedPointer textureCache = DependencyManager::get<TextureCache>();
+        auto textureCache = DependencyManager::get<TextureCache>();
        for (int i = 0; i < _meshes.size(); i++) {
            NetworkMesh& mesh = _meshes[i];
            for (int j = 0; j < mesh.parts.size(); j++) {
@ -914,7 +914,7 @@ void NetworkGeometry::reinsert() {
 void NetworkGeometry::setGeometry(const FBXGeometry& geometry) {
    _geometry = geometry;

-    TextureCache::SharedPointer textureCache = DependencyManager::get<TextureCache>();
+    auto textureCache = DependencyManager::get<TextureCache>();
    
    foreach (const FBXMesh& mesh, _geometry.meshes) {
        NetworkMesh networkMesh;
--- 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, false)
+    SINGLETON_DEPENDENCY

 public:
    void renderHemisphere(int slices, int stacks);
--- a/libraries/render-utils/src/GlowEffect.cpp
+++ b/libraries/render-utils/src/GlowEffect.cpp
@ -138,7 +138,7 @@ static void maybeRelease(QOpenGLFramebufferObject* fbo) {
 QOpenGLFramebufferObject* GlowEffect::render(bool toTexture) {
    PerformanceTimer perfTimer("glowEffect");

-    TextureCache::SharedPointer textureCache = DependencyManager::get<TextureCache>();
+    auto textureCache = DependencyManager::get<TextureCache>();
    QOpenGLFramebufferObject* primaryFBO = textureCache->getPrimaryFramebufferObject();
    primaryFBO->release();
    glBindTexture(GL_TEXTURE_2D, primaryFBO->texture());
--- 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, false)
+    SINGLETON_DEPENDENCY
    
 public:
   
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@ -2336,8 +2336,8 @@ int Model::renderMeshesFromList(QVector<int>& list, gpu::Batch& batch, RenderMod
                                        Locations* locations, SkinLocations* skinLocations) {
    PROFILE_RANGE(__FUNCTION__);

-    TextureCache::SharedPointer textureCache = DependencyManager::get<TextureCache>();
-    GlowEffect::SharedPointer glowEffect = DependencyManager::get<GlowEffect>();
+    auto textureCache = DependencyManager::get<TextureCache>();
+    auto glowEffect = DependencyManager::get<GlowEffect>();
    QString lastMaterialID;
    int meshPartsRendered = 0;
    updateVisibleJointStates();
--- a/libraries/render-utils/src/Model.h
+++ b/libraries/render-utils/src/Model.h
@ -470,7 +470,7 @@ Q_DECLARE_METATYPE(QVector<glm::vec3>)
 /// Handle management of pending models that need blending
 class ModelBlender : public QObject  {
    Q_OBJECT
-    SINGLETON_DEPENDENCY(ModelBlender, false)
+    SINGLETON_DEPENDENCY

 public:

--- 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, false)
+    SINGLETON_DEPENDENCY
    
 public: