diff options
| author | Andrei Karas <akaras@inbox.ru> | 2019-10-16 01:03:02 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2019-10-16 01:03:02 +0300 |
| commit | e15da561988948de26c80105dc9762943009b9e7 (patch) | |
| tree | 717dbdffe08daf6a1832ce79043697d3f7e62a23 /src/resources | |
| parent | 71cfaf012217cf3bbbc39207a12131b748535fcc (diff) | |
| download | manaplus-e15da561988948de26c80105dc9762943009b9e7.tar.gz manaplus-e15da561988948de26c80105dc9762943009b9e7.tar.bz2 manaplus-e15da561988948de26c80105dc9762943009b9e7.tar.xz manaplus-e15da561988948de26c80105dc9762943009b9e7.zip | |
Fix code style, ignore some warning in clang-tidy
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/image/image.cpp | 2 | ||||
| -rw-r--r-- | src/resources/memorycounter.cpp | 2 | ||||
| -rw-r--r-- | src/resources/resourcemanager/resourcemanager.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/resources/image/image.cpp b/src/resources/image/image.cpp index 967fc17b8..171e035de 100644 --- a/src/resources/image/image.cpp +++ b/src/resources/image/image.cpp @@ -513,7 +513,7 @@ int Image::calcMemoryLocal() const if (mSDLSurface != nullptr) { sz += CAST_S32(mAlphaCache.size()) * - memoryManager.getSurfaceSize(mSDLSurface); + MemoryManager::getSurfaceSize(mSDLSurface); } return sz; } diff --git a/src/resources/memorycounter.cpp b/src/resources/memorycounter.cpp index 826dcf3e2..13b742c8c 100644 --- a/src/resources/memorycounter.cpp +++ b/src/resources/memorycounter.cpp @@ -37,7 +37,7 @@ int MemoryCounter::calcMemory(const int level) const { const int sumLocal = calcMemoryLocal(); const int sumChilds = calcMemoryChilds(level); - memoryManager.printMemory(getCounterName(), + MemoryManager::printMemory(getCounterName(), level, sumLocal, sumChilds); diff --git a/src/resources/resourcemanager/resourcemanager.cpp b/src/resources/resourcemanager/resourcemanager.cpp index 0764fe94f..74d079541 100644 --- a/src/resources/resourcemanager/resourcemanager.cpp +++ b/src/resources/resourcemanager/resourcemanager.cpp @@ -652,7 +652,7 @@ int calcMemoryLocal() int sz = 24; FOR_EACH (std::set<SDL_Surface*>::iterator, it, deletedSurfaces) { - sz += memoryManager.getSurfaceSize(*it); + sz += MemoryManager::getSurfaceSize(*it); } return sz; } @@ -681,7 +681,7 @@ int calcMemory(const int level) { const int sumLocal = calcMemoryLocal(); const int sumChilds = calcMemoryChilds(0); - memoryManager.printMemory("resource manager", + MemoryManager::printMemory("resource manager", level, sumLocal, sumChilds); |