From 94b73d782597ba456780afe673df61827a3a528e Mon Sep 17 00:00:00 2001 From: Jared Boone Date: Wed, 13 Jan 2016 16:44:01 -0800 Subject: [PATCH] AISView constructors out of header. --- firmware/application/ais_app.cpp | 12 ++++++++++++ firmware/application/ais_app.hpp | 15 +++------------ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/firmware/application/ais_app.cpp b/firmware/application/ais_app.cpp index b8d84565..21778def 100644 --- a/firmware/application/ais_app.cpp +++ b/firmware/application/ais_app.cpp @@ -129,6 +129,18 @@ bool AISModel::on_packet(const ais::Packet& packet) { namespace ui { +AISView::AISView() { + flags.focusable = true; + + packet_signal_token = model.packet_signal += [this](const ais::Packet& packet) { + this->on_packet(packet); + }; +} + +AISView::~AISView() { + model.packet_signal -= packet_signal_token; +} + void AISView::truncate_entries() { while(recent.size() > 64) { recent.pop_back(); diff --git a/firmware/application/ais_app.hpp b/firmware/application/ais_app.hpp index 65bd9e26..f532eeaa 100644 --- a/firmware/application/ais_app.hpp +++ b/firmware/application/ais_app.hpp @@ -84,18 +84,9 @@ namespace ui { class AISView : public View { public: - AISView() { - flags.focusable = true; - - packet_signal_token = model.packet_signal += [this](const ais::Packet& packet) { - this->on_packet(packet); - }; - } - - ~AISView() { - model.packet_signal -= packet_signal_token; - } - + AISView(); + ~AISView(); + void paint(Painter& painter) override; void on_focus() override;