From e6a86869d91a4432bc1203d77cdf826fe30930a2 Mon Sep 17 00:00:00 2001 From: Green Sky Date: Sun, 4 May 2025 23:21:09 +0200 Subject: [PATCH] remove leftover tcm in tam --- src/main_screen.cpp | 2 +- src/tox_avatar_manager.cpp | 5 ++--- src/tox_avatar_manager.hpp | 4 +--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/main_screen.cpp b/src/main_screen.cpp index e07b231..f7de9e5 100644 --- a/src/main_screen.cpp +++ b/src/main_screen.cpp @@ -55,7 +55,7 @@ MainScreen::MainScreen(const SimpleConfigModel& conf_, SDL_Renderer* renderer_, #endif theme(theme_), mmil(rmm), - tam(os, cs, conf, tcm), + tam(os, cs, conf), sdlrtu(renderer_), tal(cs, os), contact_tc(tal, sdlrtu), diff --git a/src/tox_avatar_manager.cpp b/src/tox_avatar_manager.cpp index ff7dd07..a5d18c1 100644 --- a/src/tox_avatar_manager.cpp +++ b/src/tox_avatar_manager.cpp @@ -33,9 +33,8 @@ namespace Components { ToxAvatarManager::ToxAvatarManager( ObjectStore2& os, ContactStore4I& cs, - ConfigModelI& conf, - ToxContactModel2& tcm -) : _os(os), _os_sr(_os.newSubRef(this)), _cs(cs), _conf(conf), _tcm(tcm), _sb_tcs(os) { + ConfigModelI& conf +) : _os(os), _os_sr(_os.newSubRef(this)), _cs(cs), _conf(conf), _sb_tcs(os) { _os_sr .subscribe(ObjectStore_Event::object_construct) .subscribe(ObjectStore_Event::object_update) diff --git a/src/tox_avatar_manager.hpp b/src/tox_avatar_manager.hpp index c78b55f..1e4b2f1 100644 --- a/src/tox_avatar_manager.hpp +++ b/src/tox_avatar_manager.hpp @@ -20,7 +20,6 @@ class ToxAvatarManager : public ObjectStoreEventI { ObjectStore2::SubscriptionReference _os_sr; ContactStore4I& _cs; ConfigModelI& _conf; - ToxContactModel2& _tcm; Backends::STDFS _sb_tcs; @@ -34,8 +33,7 @@ class ToxAvatarManager : public ObjectStoreEventI { ToxAvatarManager( ObjectStore2& os, ContactStore4I& cs, - ConfigModelI& conf, - ToxContactModel2& tcm + ConfigModelI& conf ); void iterate(void);