From 27a14233093d89163c5b0fc26865b71475620902 Mon Sep 17 00:00:00 2001 From: Jared Boone Date: Fri, 22 Apr 2016 11:18:35 -0700 Subject: [PATCH] De-constexpr a few UI constructors. Because it was silly. --- firmware/application/ui_audio.hpp | 2 +- firmware/application/ui_channel.hpp | 2 +- firmware/application/ui_debug.hpp | 2 +- firmware/application/ui_rssi.hpp | 2 +- firmware/common/ui_widget.hpp | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/firmware/application/ui_audio.hpp b/firmware/application/ui_audio.hpp index cecacc7a..00d7f908 100644 --- a/firmware/application/ui_audio.hpp +++ b/firmware/application/ui_audio.hpp @@ -34,7 +34,7 @@ namespace ui { class Audio : public Widget { public: - constexpr Audio( + Audio( const Rect parent_rect ) : Widget { parent_rect }, rms_db_ { -120 }, diff --git a/firmware/application/ui_channel.hpp b/firmware/application/ui_channel.hpp index 97ac61c8..3b7f4969 100644 --- a/firmware/application/ui_channel.hpp +++ b/firmware/application/ui_channel.hpp @@ -34,7 +34,7 @@ namespace ui { class Channel : public Widget { public: - constexpr Channel( + Channel( const Rect parent_rect ) : Widget { parent_rect }, max_db_ { -120 } diff --git a/firmware/application/ui_debug.hpp b/firmware/application/ui_debug.hpp index 779461cc..e6297c14 100644 --- a/firmware/application/ui_debug.hpp +++ b/firmware/application/ui_debug.hpp @@ -84,7 +84,7 @@ private: class TemperatureWidget : public Widget { public: - explicit constexpr TemperatureWidget( + explicit TemperatureWidget( Rect parent_rect ) : Widget { parent_rect } { diff --git a/firmware/application/ui_rssi.hpp b/firmware/application/ui_rssi.hpp index b8f8259e..5c457039 100644 --- a/firmware/application/ui_rssi.hpp +++ b/firmware/application/ui_rssi.hpp @@ -34,7 +34,7 @@ namespace ui { class RSSI : public Widget { public: - constexpr RSSI( + RSSI( const Rect parent_rect ) : Widget { parent_rect }, min_ { 0 }, diff --git a/firmware/common/ui_widget.hpp b/firmware/common/ui_widget.hpp index 4a3e080c..1b99d282 100644 --- a/firmware/common/ui_widget.hpp +++ b/firmware/common/ui_widget.hpp @@ -51,12 +51,12 @@ private: class Widget { public: - constexpr Widget( + Widget( ) : parent_rect { } { } - constexpr Widget( + Widget( Rect parent_rect ) : parent_rect { parent_rect } {