From 154dacf7912d46340419914a0f7bc405074ec676 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Tue, 31 Mar 2015 14:21:56 -0700 Subject: [PATCH] Fix typo --- assignment-client/src/Agent.cpp | 2 +- interface/src/Application.cpp | 2 +- libraries/networking/src/ResourceCache.cpp | 4 ++-- libraries/networking/src/ResourceCache.h | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp index ed1f293c06..098460ecac 100644 --- a/assignment-client/src/Agent.cpp +++ b/assignment-client/src/Agent.cpp @@ -45,7 +45,7 @@ Agent::Agent(const QByteArray& packet) : DependencyManager::get()->setPacketSender(&_entityEditSender); - DependencyManager::set(); + DependencyManager::set(); DependencyManager::set(); } diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index eb427737e1..fc34eb3971 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -241,7 +241,7 @@ bool setupEssentials(int& argc, char** argv) { auto jsConsole = DependencyManager::set(); auto dialogsManager = DependencyManager::set(); auto bandwidthRecorder = DependencyManager::set(); - auto resouceCacheSharedItems = DependencyManager::set(); + auto resourceCacheSharedItems = DependencyManager::set(); auto entityScriptingInterface = DependencyManager::set(); auto windowScriptingInterface = DependencyManager::set(); #if defined(Q_OS_MAC) || defined(Q_OS_WIN) diff --git a/libraries/networking/src/ResourceCache.cpp b/libraries/networking/src/ResourceCache.cpp index 739e587f5f..83f473d8c5 100644 --- a/libraries/networking/src/ResourceCache.cpp +++ b/libraries/networking/src/ResourceCache.cpp @@ -134,7 +134,7 @@ void ResourceCache::reserveUnusedResource(qint64 resourceSize) { } void ResourceCache::attemptRequest(Resource* resource) { - auto sharedItems = DependencyManager::get(); + auto sharedItems = DependencyManager::get(); if (_requestLimit <= 0) { // wait until a slot becomes available sharedItems->_pendingRequests.append(resource); @@ -147,7 +147,7 @@ void ResourceCache::attemptRequest(Resource* resource) { void ResourceCache::requestCompleted(Resource* resource) { - auto sharedItems = DependencyManager::get(); + auto sharedItems = DependencyManager::get(); sharedItems->_loadingRequests.removeOne(resource); _requestLimit++; diff --git a/libraries/networking/src/ResourceCache.h b/libraries/networking/src/ResourceCache.h index c7aceb2e1a..ebe2c6e684 100644 --- a/libraries/networking/src/ResourceCache.h +++ b/libraries/networking/src/ResourceCache.h @@ -48,14 +48,14 @@ static const qint64 MAX_UNUSED_MAX_SIZE = 10 * BYTES_PER_GIGABYTES; // ResourceCache derived classes. Since we can't count on the ordering of // static members destruction, we need to use this Dependency manager implemented // object instead -class ResouceCacheSharedItems : public Dependency { +class ResourceCacheSharedItems : public Dependency { SINGLETON_DEPENDENCY public: QList > _pendingRequests; QList _loadingRequests; private: - ResouceCacheSharedItems() { } - virtual ~ResouceCacheSharedItems() { } + ResourceCacheSharedItems() { } + virtual ~ResourceCacheSharedItems() { } }; @@ -71,10 +71,10 @@ public: qint64 getUnusedResourceCacheSize() const { return _unusedResourcesMaxSize; } static const QList& getLoadingRequests() - { return DependencyManager::get()->_loadingRequests; } + { return DependencyManager::get()->_loadingRequests; } static int getPendingRequestCount() - { return DependencyManager::get()->_pendingRequests.size(); } + { return DependencyManager::get()->_pendingRequests.size(); } ResourceCache(QObject* parent = NULL); virtual ~ResourceCache();