remove leftover tcm in tam
Some checks are pending
ContinuousDelivery / linux-ubuntu (push) Waiting to run
ContinuousDelivery / android (map[ndk_abi:arm64-v8a vcpkg_toolkit:arm64-android-23]) (push) Waiting to run
ContinuousDelivery / android (map[ndk_abi:armeabi-v7a vcpkg_toolkit:arm-neon-android-23]) (push) Waiting to run
ContinuousDelivery / android (map[ndk_abi:x86_64 vcpkg_toolkit:x64-android-23]) (push) Waiting to run
ContinuousDelivery / windows (push) Waiting to run
ContinuousDelivery / windows-asan (push) Waiting to run
ContinuousDelivery / dumpsyms (push) Blocked by required conditions
ContinuousDelivery / release (push) Blocked by required conditions
ContinuousIntegration / linux (push) Waiting to run
ContinuousIntegration / android (map[ndk_abi:arm64-v8a vcpkg_toolkit:arm64-android-23]) (push) Waiting to run
ContinuousIntegration / android (map[ndk_abi:armeabi-v7a vcpkg_toolkit:arm-neon-android-23]) (push) Waiting to run
ContinuousIntegration / android (map[ndk_abi:x86_64 vcpkg_toolkit:x64-android-23]) (push) Waiting to run
ContinuousIntegration / macos (push) Waiting to run
ContinuousIntegration / windows (push) Waiting to run
Some checks are pending
ContinuousDelivery / linux-ubuntu (push) Waiting to run
ContinuousDelivery / android (map[ndk_abi:arm64-v8a vcpkg_toolkit:arm64-android-23]) (push) Waiting to run
ContinuousDelivery / android (map[ndk_abi:armeabi-v7a vcpkg_toolkit:arm-neon-android-23]) (push) Waiting to run
ContinuousDelivery / android (map[ndk_abi:x86_64 vcpkg_toolkit:x64-android-23]) (push) Waiting to run
ContinuousDelivery / windows (push) Waiting to run
ContinuousDelivery / windows-asan (push) Waiting to run
ContinuousDelivery / dumpsyms (push) Blocked by required conditions
ContinuousDelivery / release (push) Blocked by required conditions
ContinuousIntegration / linux (push) Waiting to run
ContinuousIntegration / android (map[ndk_abi:arm64-v8a vcpkg_toolkit:arm64-android-23]) (push) Waiting to run
ContinuousIntegration / android (map[ndk_abi:armeabi-v7a vcpkg_toolkit:arm-neon-android-23]) (push) Waiting to run
ContinuousIntegration / android (map[ndk_abi:x86_64 vcpkg_toolkit:x64-android-23]) (push) Waiting to run
ContinuousIntegration / macos (push) Waiting to run
ContinuousIntegration / windows (push) Waiting to run
This commit is contained in:
parent
2654cd1b19
commit
e6a86869d9
@ -55,7 +55,7 @@ MainScreen::MainScreen(const SimpleConfigModel& conf_, SDL_Renderer* renderer_,
|
|||||||
#endif
|
#endif
|
||||||
theme(theme_),
|
theme(theme_),
|
||||||
mmil(rmm),
|
mmil(rmm),
|
||||||
tam(os, cs, conf, tcm),
|
tam(os, cs, conf),
|
||||||
sdlrtu(renderer_),
|
sdlrtu(renderer_),
|
||||||
tal(cs, os),
|
tal(cs, os),
|
||||||
contact_tc(tal, sdlrtu),
|
contact_tc(tal, sdlrtu),
|
||||||
|
@ -33,9 +33,8 @@ namespace Components {
|
|||||||
ToxAvatarManager::ToxAvatarManager(
|
ToxAvatarManager::ToxAvatarManager(
|
||||||
ObjectStore2& os,
|
ObjectStore2& os,
|
||||||
ContactStore4I& cs,
|
ContactStore4I& cs,
|
||||||
ConfigModelI& conf,
|
ConfigModelI& conf
|
||||||
ToxContactModel2& tcm
|
) : _os(os), _os_sr(_os.newSubRef(this)), _cs(cs), _conf(conf), _sb_tcs(os) {
|
||||||
) : _os(os), _os_sr(_os.newSubRef(this)), _cs(cs), _conf(conf), _tcm(tcm), _sb_tcs(os) {
|
|
||||||
_os_sr
|
_os_sr
|
||||||
.subscribe(ObjectStore_Event::object_construct)
|
.subscribe(ObjectStore_Event::object_construct)
|
||||||
.subscribe(ObjectStore_Event::object_update)
|
.subscribe(ObjectStore_Event::object_update)
|
||||||
|
@ -20,7 +20,6 @@ class ToxAvatarManager : public ObjectStoreEventI {
|
|||||||
ObjectStore2::SubscriptionReference _os_sr;
|
ObjectStore2::SubscriptionReference _os_sr;
|
||||||
ContactStore4I& _cs;
|
ContactStore4I& _cs;
|
||||||
ConfigModelI& _conf;
|
ConfigModelI& _conf;
|
||||||
ToxContactModel2& _tcm;
|
|
||||||
|
|
||||||
Backends::STDFS _sb_tcs;
|
Backends::STDFS _sb_tcs;
|
||||||
|
|
||||||
@ -34,8 +33,7 @@ class ToxAvatarManager : public ObjectStoreEventI {
|
|||||||
ToxAvatarManager(
|
ToxAvatarManager(
|
||||||
ObjectStore2& os,
|
ObjectStore2& os,
|
||||||
ContactStore4I& cs,
|
ContactStore4I& cs,
|
||||||
ConfigModelI& conf,
|
ConfigModelI& conf
|
||||||
ToxContactModel2& tcm
|
|
||||||
);
|
);
|
||||||
|
|
||||||
void iterate(void);
|
void iterate(void);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user