From 9fc1182733b706d8652842780907f50442ce9d0d Mon Sep 17 00:00:00 2001
From: Ruben Dashyan <ruben.dashyan@numworks.com>
Date: Thu, 6 Feb 2020 14:39:23 +0100
Subject: [PATCH] [escher/message_tree] Inline in header file

---
 escher/Makefile                      |  1 -
 escher/include/escher/message_tree.h |  6 +++---
 escher/src/message_tree.cpp          | 13 -------------
 3 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 escher/src/message_tree.cpp

diff --git a/escher/Makefile b/escher/Makefile
index ea6a9267c..6b88cd7be 100644
--- a/escher/Makefile
+++ b/escher/Makefile
@@ -45,7 +45,6 @@ escher_src += $(addprefix escher/src/,\
   message_table_cell_with_message.cpp \
   message_table_cell_with_switch.cpp \
   message_text_view.cpp \
-  message_tree.cpp \
   modal_view_controller.cpp \
   nested_menu_controller.cpp \
   palette.cpp \
diff --git a/escher/include/escher/message_tree.h b/escher/include/escher/message_tree.h
index 7ddd88973..c4dc78a62 100644
--- a/escher/include/escher/message_tree.h
+++ b/escher/include/escher/message_tree.h
@@ -11,9 +11,9 @@ public:
   {
   };
   virtual const MessageTree * children(int index) const = 0;
-  I18n::Message label() const;
-  int numberOfChildren() const;
-  bool isNull() const;
+  I18n::Message label() const { return m_label; }
+  int numberOfChildren() const { return m_numberOfChildren; }
+  bool isNull() const { return (m_label == (I18n::Message)0); }
 protected:
   I18n::Message m_label;
   int m_numberOfChildren;
diff --git a/escher/src/message_tree.cpp b/escher/src/message_tree.cpp
deleted file mode 100644
index 59bd96901..000000000
--- a/escher/src/message_tree.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <escher/message_tree.h>
-
-int MessageTree::numberOfChildren() const {
-  return m_numberOfChildren;
-}
-
-I18n::Message MessageTree::label() const {
-  return m_label;
-}
-
-bool MessageTree::isNull() const {
-  return (m_label == (I18n::Message)0);
-}