From b9b3cfea551b5c7e12e6bb9904cffe2873b328c7 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 24 Jul 2014 01:18:10 -0500 Subject: when a Snap object is destructed, delete any active Popups that it owns. This cleaner shutdown doesn't have any effect in production, but is needed to shut down the bus cleanly in the tests. --- include/datetime/snap.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'include/datetime') diff --git a/include/datetime/snap.h b/include/datetime/snap.h index 9b45b3f..1c90496 100644 --- a/include/datetime/snap.h +++ b/include/datetime/snap.h @@ -24,8 +24,9 @@ #include #include -#include #include +#include +#include namespace unity { namespace indicator { @@ -49,6 +50,10 @@ public: private: const std::shared_ptr m_clock; const std::shared_ptr m_settings; + + class Popup; + friend class Popup; + std::set m_pending; }; } // namespace datetime -- cgit v1.2.3