Move View to View.cc and remove unused things

Moved all View definitions to View.cc
Removed View::print_done
Removed unused App::screenwidth, App::screenheight.
Rearranged View member data.
Removed unused reference in Controller::collect_input
Update TODOs

6 files changed, 71 insertions, 56 deletions

diff --git a/README.md b/README.md
index 541e895..d2122b6 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,7 @@ cmake --build build
 - Remove dynamic_cast from default ClickHandlerAggregate::handle.
 - Maybe add Action dispatcher to Controller or make App a Singleton
   ActionDispatcher.
+- Add fallback font.
 
 ## Future
 
diff --git a/include/app/App.h b/include/app/App.h
index b80a577..f2a8fdf 100644
--- a/include/app/App.h
+++ b/include/app/App.h
@@ -28,7 +28,6 @@ private:
         Model m;
         View v;
         Controller c;
-        int screenwidth, screenheight;
 };
 
 }  // namespace stars
diff --git a/include/app/View.h b/include/app/View.h
index 921d0c1..6adc921 100644
--- a/include/app/View.h
+++ b/include/app/View.h
@@ -10,66 +10,34 @@
 
 namespace stars {
 class View {
-        int width, height, star_radius;
-        sf::RenderWindow* window;
-        std::vector<sf::Vector2f> starPos;
-        sf::VertexArray edges;
-        sf::CircleShape star;
-        std::vector<Widget*> widgets;
-
 public:
-        View(int w, int h, int sr):
-                        width(w), height(h), star_radius(sr), window(nullptr), star(star_radius),
-                        edges(sf::Lines) {
-                star.setOrigin(star_radius, star_radius);
-        }
-
-        ~View() {
-                if (window) { delete window; }
-        }
-
-        void make_window() {
-                if (!window) {
-                        window =
-                                        new sf::RenderWindow(sf::VideoMode(width, height), "Constellations");
-                }
-        }
-
-        void attachWidget(Widget* w) { widgets.push_back(w); }
-
-        void detachWidget(Widget* w) {
-                widgets.erase(std::remove(widgets.begin(), widgets.end(), w),
-                                                                        widgets.end());
-        }
+        View(int w, int h, int sr);
+        ~View();
 
-        void close_window() { window->close(); }
+        void make_window();
+        void close_window();
+        void display();
 
-        void add_star(const sf::Vector2f& v) { starPos.push_back(v); }
+        void attachWidget(Widget* w);
+        void detachWidget(Widget* w);
 
-        void clear_stars() { starPos.clear(); }
+        void add_star(const sf::Vector2f& v);
+        void clear_stars();
 
-        void add_edge(const sf::Vertex& v, const sf::Vertex& u) {
-                edges.append(v);
-                edges.append(u);
-        }
-
-        void clear_edges() { edges.clear(); }
-
-        void print_done() { std::cout << "Done." << std::endl; }
-
-        void display() {
-                window->clear();
-                window->draw(edges);
-                for (const sf::Vector2f& p : starPos) {
-                        star.setPosition(p);
-                        window->draw(star);
-                }
-                for (const Widget* w : widgets) { window->draw(*w); }
-                window->display();
-        }
+        void add_edge(const sf::Vertex& v, const sf::Vertex& u);
+        void clear_edges();
 
         friend class Controller;
+
+private:
+        int width, height, star_radius;
+        sf::RenderWindow* window;
+        sf::CircleShape star;
+        std::vector<sf::Vector2f> starPos;
+        sf::VertexArray edges;
+        std::vector<Widget*> widgets;
 };  // class View
+
 }  // namespace stars
 
 #endif  // STARS_VIEW_H_
diff --git a/src/app/Controller.cc b/src/app/Controller.cc
index 0962ec0..6ddf994 100644
--- a/src/app/Controller.cc
+++ b/src/app/Controller.cc
@@ -54,7 +54,6 @@ void Controller::show_popup() {
           }
         } else if (mode == Mode::control_popup) {
           if (event.type == sf::Event::MouseButtonReleased) {
-            sf::Event::MouseButtonEvent &mbe = event.mouseButton;
             handle(Click(*(view->window), event));
           }
         }
diff --git a/src/app/Model.cc b/src/app/Model.cc
index ef9c0f9..f1407a3 100644
--- a/src/app/Model.cc
+++ b/src/app/Model.cc
@@ -68,4 +68,5 @@ void Model::generate_edges() {
                 }
         }
 }
-}  // namespace stars
\ No newline at end of file
+
+}  // namespace stars
diff --git a/src/app/View.cc b/src/app/View.cc
index 7266cd3..cffc7f7 100644
--- a/src/app/View.cc
+++ b/src/app/View.cc
@@ -2,4 +2,51 @@
 
 namespace stars {
 
-} // namespace stars
+View::View(int w, int h, int sr):
+                width(w), height(h), star_radius(sr), window(nullptr), star(star_radius),
+                edges(sf::Lines) {
+        star.setOrigin(star_radius, star_radius);
+}
+
+View::~View() {
+        if (window) { delete window; }
+}
+
+void View::make_window() {
+        if (!window) {
+                window =
+                                new sf::RenderWindow(sf::VideoMode(width, height), "Constellations");
+        }
+}
+
+void View::attachWidget(Widget* w) { widgets.push_back(w); }
+
+void View::detachWidget(Widget* w) {
+        widgets.erase(std::remove(widgets.begin(), widgets.end(), w), widgets.end());
+}
+
+void View::close_window() { window->close(); }
+
+void View::add_star(const sf::Vector2f& v) { starPos.push_back(v); }
+
+void View::clear_stars() { starPos.clear(); }
+
+void View::add_edge(const sf::Vertex& v, const sf::Vertex& u) {
+        edges.append(v);
+        edges.append(u);
+}
+
+void View::clear_edges() { edges.clear(); }
+
+void View::display() {
+        window->clear();
+        window->draw(edges);
+        for (const sf::Vector2f& p : starPos) {
+                star.setPosition(p);
+                window->draw(star);
+        }
+        for (const Widget* w : widgets) { window->draw(*w); }
+        window->display();
+}
+
+}  // namespace stars