Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 02:37:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove unused variables

Browse source
This commit is contained in:
Atlante45 2015-10-04 21:12:30 -07:00
parent 39e0d0e1dc
commit 17edd38cb9
2 changed files with 36 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
interface/src/Application.cpp
View file

@ -300,42 +300,42 @@ bool setupEssentials(int& argc, char** argv) {
Setting::init(); Setting::init();
// Set dependencies // Set dependencies
auto addressManager = DependencyManager::set<AddressManager>(); DependencyManager::set<AddressManager>();
auto nodeList = DependencyManager::set<NodeList>(NodeType::Agent, listenPort); DependencyManager::set<NodeList>(NodeType::Agent, listenPort);
auto geometryCache = DependencyManager::set<GeometryCache>(); DependencyManager::set<GeometryCache>();
auto modelCache = DependencyManager::set<ModelCache>(); DependencyManager::set<ModelCache>();
auto scriptCache = DependencyManager::set<ScriptCache>(); DependencyManager::set<ScriptCache>();
auto soundCache = DependencyManager::set<SoundCache>(); DependencyManager::set<SoundCache>();
auto faceshift = DependencyManager::set<Faceshift>(); DependencyManager::set<Faceshift>();
auto ddeFaceTracker = DependencyManager::set<DdeFaceTracker>(); DependencyManager::set<DdeFaceTracker>();
auto eyeTracker = DependencyManager::set<EyeTracker>(); DependencyManager::set<EyeTracker>();
auto audio = DependencyManager::set<AudioClient>(); DependencyManager::set<AudioClient>();
auto audioScope = DependencyManager::set<AudioScope>(); DependencyManager::set<AudioScope>();
auto deferredLightingEffect = DependencyManager::set<DeferredLightingEffect>(); DependencyManager::set<DeferredLightingEffect>();
auto textureCache = DependencyManager::set<TextureCache>(); DependencyManager::set<TextureCache>();
auto framebufferCache = DependencyManager::set<FramebufferCache>(); DependencyManager::set<FramebufferCache>();
auto animationCache = DependencyManager::set<AnimationCache>(); DependencyManager::set<AnimationCache>();
auto modelBlender = DependencyManager::set<ModelBlender>(); DependencyManager::set<ModelBlender>();
auto avatarManager = DependencyManager::set<AvatarManager>(); DependencyManager::set<AvatarManager>();
auto lodManager = DependencyManager::set<LODManager>(); DependencyManager::set<LODManager>();
auto jsConsole = DependencyManager::set<StandAloneJSConsole>(); DependencyManager::set<StandAloneJSConsole>();
auto dialogsManager = DependencyManager::set<DialogsManager>(); DependencyManager::set<DialogsManager>();
auto bandwidthRecorder = DependencyManager::set<BandwidthRecorder>(); DependencyManager::set<BandwidthRecorder>();
auto resourceCacheSharedItems = DependencyManager::set<ResourceCacheSharedItems>(); DependencyManager::set<ResourceCacheSharedItems>();
auto desktopScriptingInterface = DependencyManager::set<DesktopScriptingInterface>(); DependencyManager::set<DesktopScriptingInterface>();
auto entityScriptingInterface = DependencyManager::set<EntityScriptingInterface>(); DependencyManager::set<EntityScriptingInterface>();
auto windowScriptingInterface = DependencyManager::set<WindowScriptingInterface>(); DependencyManager::set<WindowScriptingInterface>();
#if defined(Q_OS_MAC) || defined(Q_OS_WIN) #if defined(Q_OS_MAC) || defined(Q_OS_WIN)
auto speechRecognizer = DependencyManager::set<SpeechRecognizer>(); DependencyManager::set<SpeechRecognizer>();
#endif #endif
auto discoverabilityManager = DependencyManager::set<DiscoverabilityManager>(); DependencyManager::set<DiscoverabilityManager>();
auto sceneScriptingInterface = DependencyManager::set<SceneScriptingInterface>(); DependencyManager::set<SceneScriptingInterface>();
auto offscreenUi = DependencyManager::set<OffscreenUi>(); DependencyManager::set<OffscreenUi>();
auto autoUpdater = DependencyManager::set<AutoUpdater>(); DependencyManager::set<AutoUpdater>();
auto pathUtils = DependencyManager::set<PathUtils>(); DependencyManager::set<PathUtils>();
auto actionFactory = DependencyManager::set<InterfaceActionFactory>(); DependencyManager::set<InterfaceActionFactory>();
auto assetClient = DependencyManager::set<AssetClient>(); DependencyManager::set<AssetClient>();
auto userInputMapper = DependencyManager::set<UserInputMapper>(); DependencyManager::set<UserInputMapper>();
return true; return true;
} }
@ -965,10 +965,6 @@ void Application::initializeGL() {
InfoView::show(INFO_HELP_PATH, true); InfoView::show(INFO_HELP_PATH, true);
} }
QWindow* getProxyWindow() {
return qApp->getWindow()->windowHandle();
}
void Application::initializeUi() { void Application::initializeUi() {
AddressBarDialog::registerType(); AddressBarDialog::registerType();
ErrorDialog::registerType(); ErrorDialog::registerType();
@ -4543,7 +4539,7 @@ qreal Application::getDevicePixelRatio() {
return (_window && _window->windowHandle()) ? _window->windowHandle()->devicePixelRatio() : 1.0; return (_window && _window->windowHandle()) ? _window->windowHandle()->devicePixelRatio() : 1.0;
} }
DisplayPlugin * Application::getActiveDisplayPlugin() { DisplayPlugin* Application::getActiveDisplayPlugin() {
if (nullptr == _displayPlugin) { if (nullptr == _displayPlugin) {
updateDisplayMode(); updateDisplayMode();
Q_ASSERT(_displayPlugin); Q_ASSERT(_displayPlugin);
@ -4551,7 +4547,7 @@ DisplayPlugin * Application::getActiveDisplayPlugin() {
return _displayPlugin.data(); return _displayPlugin.data();
} }
const DisplayPlugin * Application::getActiveDisplayPlugin() const { const DisplayPlugin* Application::getActiveDisplayPlugin() const {
return ((Application*)this)->getActiveDisplayPlugin(); return ((Application*)this)->getActiveDisplayPlugin();
} }
@ -4559,7 +4555,6 @@ bool _activatingDisplayPlugin{ false };
QVector<QPair<QString, QString>> _currentDisplayPluginActions; QVector<QPair<QString, QString>> _currentDisplayPluginActions;
QVector<QPair<QString, QString>> _currentInputPluginActions; QVector<QPair<QString, QString>> _currentInputPluginActions;
static void addDisplayPluginToMenu(DisplayPluginPointer displayPlugin, bool active = false) { static void addDisplayPluginToMenu(DisplayPluginPointer displayPlugin, bool active = false) {
auto menu = Menu::getInstance(); auto menu = Menu::getInstance();
QString name = displayPlugin->getName(); QString name = displayPlugin->getName();

1
interface/src/Application.h
View file

@ -420,7 +420,6 @@ private:
UndoStackScriptingInterface _undoStackScriptingInterface; UndoStackScriptingInterface _undoStackScriptingInterface;
// Frame Rate Measurement // Frame Rate Measurement
int _frameCount; int _frameCount;
float _fps; float _fps;
QElapsedTimer _timerStart; QElapsedTimer _timerStart;