remove leftover tcm in tam
Some checks failed
ContinuousDelivery / linux-ubuntu (push) Has been cancelled
ContinuousDelivery / android (map[ndk_abi:arm64-v8a vcpkg_toolkit:arm64-android-23]) (push) Has been cancelled
ContinuousDelivery / android (map[ndk_abi:armeabi-v7a vcpkg_toolkit:arm-neon-android-23]) (push) Has been cancelled
ContinuousDelivery / android (map[ndk_abi:x86_64 vcpkg_toolkit:x64-android-23]) (push) Has been cancelled
ContinuousDelivery / windows (push) Has been cancelled
ContinuousDelivery / windows-asan (push) Has been cancelled
ContinuousDelivery / dumpsyms (push) Has been cancelled
ContinuousDelivery / release (push) Has been cancelled
ContinuousIntegration / linux (push) Has been cancelled
ContinuousIntegration / android (map[ndk_abi:arm64-v8a vcpkg_toolkit:arm64-android-23]) (push) Has been cancelled
ContinuousIntegration / android (map[ndk_abi:armeabi-v7a vcpkg_toolkit:arm-neon-android-23]) (push) Has been cancelled
ContinuousIntegration / android (map[ndk_abi:x86_64 vcpkg_toolkit:x64-android-23]) (push) Has been cancelled
ContinuousIntegration / macos (push) Has been cancelled
ContinuousIntegration / windows (push) Has been cancelled
Some checks failed
ContinuousDelivery / linux-ubuntu (push) Has been cancelled
ContinuousDelivery / android (map[ndk_abi:arm64-v8a vcpkg_toolkit:arm64-android-23]) (push) Has been cancelled
ContinuousDelivery / android (map[ndk_abi:armeabi-v7a vcpkg_toolkit:arm-neon-android-23]) (push) Has been cancelled
ContinuousDelivery / android (map[ndk_abi:x86_64 vcpkg_toolkit:x64-android-23]) (push) Has been cancelled
ContinuousDelivery / windows (push) Has been cancelled
ContinuousDelivery / windows-asan (push) Has been cancelled
ContinuousDelivery / dumpsyms (push) Has been cancelled
ContinuousDelivery / release (push) Has been cancelled
ContinuousIntegration / linux (push) Has been cancelled
ContinuousIntegration / android (map[ndk_abi:arm64-v8a vcpkg_toolkit:arm64-android-23]) (push) Has been cancelled
ContinuousIntegration / android (map[ndk_abi:armeabi-v7a vcpkg_toolkit:arm-neon-android-23]) (push) Has been cancelled
ContinuousIntegration / android (map[ndk_abi:x86_64 vcpkg_toolkit:x64-android-23]) (push) Has been cancelled
ContinuousIntegration / macos (push) Has been cancelled
ContinuousIntegration / windows (push) Has been cancelled
This commit is contained in:
@ -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),
|
||||
|
@ -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)
|
||||
|
@ -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);
|
||||
|
Reference in New Issue
Block a user