From 17edd38cb9e3b2ce0dac32fb2059eb6b77506d5c Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Sun, 4 Oct 2015 21:12:30 -0700 Subject: [PATCH] Remove unused variables --- interface/src/Application.cpp | 77 ++++++++++++++++------------------- interface/src/Application.h | 1 - 2 files changed, 36 insertions(+), 42 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 1bef9771eb..6d79510cb3 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -300,42 +300,42 @@ bool setupEssentials(int& argc, char** argv) { Setting::init(); // Set dependencies - auto addressManager = DependencyManager::set(); - auto nodeList = DependencyManager::set(NodeType::Agent, listenPort); - auto geometryCache = DependencyManager::set(); - auto modelCache = DependencyManager::set(); - auto scriptCache = DependencyManager::set(); - auto soundCache = DependencyManager::set(); - auto faceshift = DependencyManager::set(); - auto ddeFaceTracker = DependencyManager::set(); - auto eyeTracker = DependencyManager::set(); - auto audio = DependencyManager::set(); - auto audioScope = DependencyManager::set(); - auto deferredLightingEffect = DependencyManager::set(); - auto textureCache = DependencyManager::set(); - auto framebufferCache = DependencyManager::set(); - auto animationCache = DependencyManager::set(); - auto modelBlender = DependencyManager::set(); - auto avatarManager = DependencyManager::set(); - auto lodManager = DependencyManager::set(); - auto jsConsole = DependencyManager::set(); - auto dialogsManager = DependencyManager::set(); - auto bandwidthRecorder = DependencyManager::set(); - auto resourceCacheSharedItems = DependencyManager::set(); - auto desktopScriptingInterface = DependencyManager::set(); - auto entityScriptingInterface = DependencyManager::set(); - auto windowScriptingInterface = DependencyManager::set(); + DependencyManager::set(); + DependencyManager::set(NodeType::Agent, listenPort); + DependencyManager::set(); + DependencyManager::set(); + DependencyManager::set(); + DependencyManager::set(); + DependencyManager::set(); + DependencyManager::set(); + DependencyManager::set(); + DependencyManager::set(); + DependencyManager::set(); + DependencyManager::set(); + DependencyManager::set(); + DependencyManager::set(); + DependencyManager::set(); + DependencyManager::set(); + DependencyManager::set(); + DependencyManager::set(); + DependencyManager::set(); + DependencyManager::set(); + DependencyManager::set(); + DependencyManager::set(); + DependencyManager::set(); + DependencyManager::set(); + DependencyManager::set(); #if defined(Q_OS_MAC) || defined(Q_OS_WIN) - auto speechRecognizer = DependencyManager::set(); + DependencyManager::set(); #endif - auto discoverabilityManager = DependencyManager::set(); - auto sceneScriptingInterface = DependencyManager::set(); - auto offscreenUi = DependencyManager::set(); - auto autoUpdater = DependencyManager::set(); - auto pathUtils = DependencyManager::set(); - auto actionFactory = DependencyManager::set(); - auto assetClient = DependencyManager::set(); - auto userInputMapper = DependencyManager::set(); + DependencyManager::set(); + DependencyManager::set(); + DependencyManager::set(); + DependencyManager::set(); + DependencyManager::set(); + DependencyManager::set(); + DependencyManager::set(); + DependencyManager::set(); return true; } @@ -965,10 +965,6 @@ void Application::initializeGL() { InfoView::show(INFO_HELP_PATH, true); } -QWindow* getProxyWindow() { - return qApp->getWindow()->windowHandle(); -} - void Application::initializeUi() { AddressBarDialog::registerType(); ErrorDialog::registerType(); @@ -4543,7 +4539,7 @@ qreal Application::getDevicePixelRatio() { return (_window && _window->windowHandle()) ? _window->windowHandle()->devicePixelRatio() : 1.0; } -DisplayPlugin * Application::getActiveDisplayPlugin() { +DisplayPlugin* Application::getActiveDisplayPlugin() { if (nullptr == _displayPlugin) { updateDisplayMode(); Q_ASSERT(_displayPlugin); @@ -4551,7 +4547,7 @@ DisplayPlugin * Application::getActiveDisplayPlugin() { return _displayPlugin.data(); } -const DisplayPlugin * Application::getActiveDisplayPlugin() const { +const DisplayPlugin* Application::getActiveDisplayPlugin() const { return ((Application*)this)->getActiveDisplayPlugin(); } @@ -4559,7 +4555,6 @@ bool _activatingDisplayPlugin{ false }; QVector> _currentDisplayPluginActions; QVector> _currentInputPluginActions; - static void addDisplayPluginToMenu(DisplayPluginPointer displayPlugin, bool active = false) { auto menu = Menu::getInstance(); QString name = displayPlugin->getName(); diff --git a/interface/src/Application.h b/interface/src/Application.h index 8e906c789b..23b173f1ea 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -420,7 +420,6 @@ private: UndoStackScriptingInterface _undoStackScriptingInterface; // Frame Rate Measurement - int _frameCount; float _fps; QElapsedTimer _timerStart;