[escher] Delete childless view and implement it as default view

Change-Id: I545c8270fc8235ee578b2237361df50c919d0b61

apps/graph/even_odd_cell.cpp

@@ -7,7 +7,7 @@ constexpr KDColor EvenOddCell::k_oddLineBackgroundColor;
 constexpr KDColor EvenOddCell::k_selectedLineBackgroundColor;
 
 EvenOddCell::EvenOddCell() :
-  ChildlessView(),
+  View(),
   m_highlighted(false),
   m_even(false)
 {

apps/graph/even_odd_cell.h

@@ -5,7 +5,7 @@
 
 namespace Graph {
 
-class EvenOddCell : public ChildlessView {
+class EvenOddCell : public View {
 public:
   EvenOddCell();
   void setEven(bool even);

apps/graph/graph/cursor_view.h

@@ -4,9 +4,9 @@
 #include <escher.h>
 
 namespace Graph {
-class CursorView : public ChildlessView {
+class CursorView : public View {
 public:
-  using ChildlessView::ChildlessView;
+  using View::View;
   void drawRect(KDContext * ctx, KDRect rect) const override;
 };
 

apps/picview/pic_view.cpp

@@ -2,7 +2,7 @@
 #include <assert.h>
 
 PicView::PicView() :
-  ChildlessView() {
+  View() {
 }
 
 #include "image.c"

apps/picview/pic_view.h

@@ -3,7 +3,7 @@
 
 #include <escher.h>
 
-class PicView : public ChildlessView {
+class PicView : public View {
 public:
   PicView();
   void drawRect(KDContext * ctx, KDRect rect) const override;

escher/Makefile

@@ -2,7 +2,6 @@ SFLAGS += -Iescher/include
 
 objs += $(addprefix escher/src/,\
   app.o\
-  childless_view.o\
   buffer_text_view.o\
   button.o\
   container.o\

escher/include/escher/childless_view.h

@@ -1,14 +0,0 @@
-#ifndef ESCHER_CHILDLESS_VIEW_H
-#define ESCHER_CHILDLESS_VIEW_H
-
-#include <escher/view.h>
-
-class ChildlessView : public View {
-  using View::View;
-private:
-  int numberOfSubviews() const override;
-  View * subviewAtIndex(int index) override;
-  void layoutSubviews() override;
-};
-
-#endif

escher/include/escher/header_view_controller.h

@@ -2,7 +2,7 @@
 #define HEADER_VIEW_CONTROLLER_H
 
 #include <escher/view_controller.h>
-#include <escher/childless_view.h>
+#include <escher/view.h>
 #include <escher/invocation.h>
 #include <escher/button.h>
 #include <escher/app.h>

escher/include/escher/image_view.h

@@ -1,10 +1,10 @@
 #ifndef ESCHER_IMAGE_VIEW_H
 #define ESCHER_IMAGE_VIEW_H
 
-#include <escher/childless_view.h>
+#include <escher/view.h>
 #include <escher/image.h>
 
-class ImageView : public ChildlessView {
+class ImageView : public View {
 public:
   ImageView();
   void setImage(const Image * image);

escher/include/escher/scroll_view_indicator.h

@@ -1,9 +1,9 @@
 #ifndef ESCHER_SCROLL_VIEW_INDICATOR_H
 #define ESCHER_SCROLL_VIEW_INDICATOR_H
 
-#include <escher/childless_view.h>
+#include <escher/view.h>
 
-class ScrollViewIndicator : public ChildlessView {
+class ScrollViewIndicator : public View {
 public:
   enum class Direction {
     Horizontal,

escher/include/escher/solid_color_view.h

@@ -1,9 +1,9 @@
 #ifndef ESCHER_SOLID_COLOR_VIEW_H
 #define ESCHER_SOLID_COLOR_VIEW_H
 
-#include <escher/childless_view.h>
+#include <escher/view.h>
 
-class SolidColorView : public ChildlessView {
+class SolidColorView : public View {
 public:
   SolidColorView(KDColor color);
   void drawRect(KDContext * ctx, KDRect rect) const override;

escher/include/escher/stack_view.h

@@ -1,9 +1,9 @@
 #ifndef ESCHER_STACK_VIEW_H
 #define ESCHER_STACK_VIEW_H
 
-#include <escher/childless_view.h>
+#include <escher/view.h>
 
-class StackView : public ChildlessView {
+class StackView : public View {
 public:
   StackView();
   void drawRect(KDContext * ctx, KDRect rect) const override;

escher/include/escher/switch_view.h

@@ -1,9 +1,9 @@
 #ifndef ESCHER_SWITCH_VIEW_H
 #define ESCHER_SWITCH_VIEW_H
 
-#include <escher/childless_view.h>
+#include <escher/view.h>
 
-class SwitchView : public ChildlessView {
+class SwitchView : public View {
 public:
   SwitchView();
   bool state();

escher/include/escher/tab_view_cell.h

@@ -4,7 +4,7 @@
 #include <escher/view.h>
 #include <escher/text_view.h>
 
-class TabViewCell : public ChildlessView {
+class TabViewCell : public View {
 public:
   TabViewCell();
   void drawRect(KDContext * ctx, KDRect rect) const override;

escher/include/escher/text_field.h

@@ -1,11 +1,11 @@
 #ifndef ESCHER_TEXT_FIELD_H
 #define ESCHER_TEXT_FIELD_H
 
-#include <escher/childless_view.h>
+#include <escher/view.h>
 #include <escher/responder.h>
 #include <string.h>
 
-class TextField : public ChildlessView, public Responder {
+class TextField : public View, public Responder {
 public:
   TextField(Responder * parentResponder, char * textBuffer, size_t textBufferSize);
   // View

escher/include/escher/text_view.h

@@ -1,10 +1,10 @@
 #ifndef ESCHER_TEXT_VIEW_H
 #define ESCHER_TEXT_VIEW_H
 
-#include <escher/childless_view.h>
+#include <escher/view.h>
 #include <kandinsky/color.h>
 
-class TextView : public ChildlessView {
+class TextView : public View {
 public:
   TextView();//;: TextView(nullptr, 0.0f, 0.0f);
   // alignment = 0 -> align left or top

escher/include/escher/view.h

@@ -59,9 +59,9 @@ protected:
 #endif
   KDRect m_frame;
 private:
-  virtual int numberOfSubviews() const = 0;
-  virtual View * subviewAtIndex(int index) = 0;
-  virtual void layoutSubviews() = 0;
+  virtual int numberOfSubviews() const;
+  virtual View * subviewAtIndex(int index);
+  virtual void layoutSubviews();
   virtual const Window * window() const;
   KDRect redraw(KDRect rect, KDRect forceRedrawRect = KDRectZero);
   KDPoint absoluteOrigin() const;

escher/src/childless_view.cpp

@@ -1,16 +0,0 @@
-#include <escher/childless_view.h>
-extern "C" {
-#include <assert.h>
-}
-
-int ChildlessView::numberOfSubviews() const {
-  return 0;
-}
-
-View * ChildlessView::subviewAtIndex(int index) {
-  assert(false);
-  return nullptr;
-}
-
-void ChildlessView::layoutSubviews() {
-}

escher/src/image_view.cpp

@@ -4,7 +4,7 @@ extern "C" {
 }
 
 ImageView::ImageView() :
-  ChildlessView(),
+  View(),
   m_image(nullptr)
 {
 }

escher/src/scroll_view_indicator.cpp

@@ -7,7 +7,7 @@ constexpr KDColor k_backgroundColor = KDColorBlack;
 constexpr KDColor k_indicatorColor = KDColorRed;
 
 ScrollViewIndicator::ScrollViewIndicator(ScrollViewIndicator::Direction direction) :
-  ChildlessView(),
+  View(),
   m_direction(direction),
   m_start(0),
   m_end(0)

escher/src/solid_color_view.cpp

@@ -1,7 +1,7 @@
 #include <escher/solid_color_view.h>
 
 SolidColorView::SolidColorView(KDColor color) :
-  ChildlessView(),
+  View(),
   m_color(color)
 {
 }

escher/src/stack_view.cpp

@@ -4,7 +4,7 @@ extern "C" {
 }
 
 StackView::StackView() :
-  ChildlessView(),
+  View(),
   m_name(nullptr)
 {
 }

escher/src/switch_view.cpp

@@ -9,7 +9,7 @@ constexpr KDCoordinate SwitchView::k_separatorThickness;
 
 
 SwitchView::SwitchView() :
-ChildlessView(),
+View(),
 m_state(true)
 {
 }

escher/src/tab_view_cell.cpp

@@ -8,7 +8,7 @@ constexpr KDColor TabViewCell::k_selectedTabColor;
 constexpr KDColor TabViewCell::k_separatorTabColor;
 
 TabViewCell::TabViewCell() :
-  ChildlessView(),
+  View(),
   m_active(false),
   m_selected(false),
   m_name(nullptr)

escher/src/text_field.cpp

@@ -1,7 +1,7 @@
 #include <escher/text_field.h>
 
 TextField::TextField(Responder * parentResponder, char * textBuffer, size_t textBufferSize) :
-  ChildlessView(),
+  View(),
   Responder(parentResponder),
   m_textBuffer(textBuffer),
   m_textBufferSize(textBufferSize),

escher/src/text_view.cpp

@@ -6,7 +6,7 @@ TextView::TextView() : TextView(0.0f, 0.0f, KDColorBlack, KDColorWhite)
 
 TextView::TextView(float horizontalAlignment, float verticalAlignment,
     KDColor textColor, KDColor backgroundColor) :
-  ChildlessView(),
+  View(),
   m_horizontalAlignment(horizontalAlignment),
   m_verticalAlignment(verticalAlignment),
   m_textColor(textColor),

escher/src/view.cpp

@@ -167,6 +167,19 @@ KDSize View::minimalSizeForOptimalDisplay() {
   return KDSizeZero;
 }
 
+int View::numberOfSubviews() const {
+  return 0;
+}
+
+View * View::subviewAtIndex(int index) {
+  assert(false);
+  return nullptr;
+}
+
+void View::layoutSubviews() {
+}
+
+
 #if ESCHER_VIEW_LOGGING
 const char * View::className() const {
   return "View";