Use size_t to represent counts and indices

[libs/gltk.git] / source / root.h

diff --git a/source/root.h b/source/root.h
index 52e23cae677ee6f03df4ee48a8f25d35400954d9..c71d50d6f7577d4ec3e710149c70115d50850ae3 100644 (file)
--- a/source/root.h
+++ b/source/root.h
@@ -32,19 +32,19 @@ public:
 
 private:
        Resources &resources;
-       Input::Keyboard *keyboard;
-       InputMethod *input_method;
-       Input::Mouse *mouse;
-       Input::Touchscreen *touchscreen;
-       bool own_input;
-       Label *lbl_tooltip;
-       int pointer_x;
-       int pointer_y;
+       Input::Keyboard *keyboard = nullptr;
+       InputMethod *input_method = nullptr;
+       Input::Mouse *mouse = nullptr;
+       Input::Touchscreen *touchscreen = nullptr;
+       bool own_input = false;
+       Label *lbl_tooltip = nullptr;
+       int pointer_x = 0;
+       int pointer_y = 0;
        Time::TimeStamp tooltip_timeout;
        Time::TimeStamp last_tick;
-       Widget *tooltip_target;
+       Widget *tooltip_target = nullptr;
        Msp::GL::Camera camera;
-       Msp::GL::Program *shprog;
+       Msp::GL::Program *shprog = nullptr;
        Msp::GL::Blend blend;
 
 public:
@@ -54,21 +54,18 @@ public:
 
        /** Creates a Root widget with custom input devices.  If window is not null,
        it is used to set the widget's initial geometry. */
-       Root(Resources &, Graphics::Window *, Input::Keyboard *, Input::Mouse *, Input::Touchscreen * = 0);
-private:
-       void init(Graphics::Window *);
-public:
+       Root(Resources &, Graphics::Window *, Input::Keyboard *, Input::Mouse *, Input::Touchscreen * = nullptr);
        virtual ~Root();
 
-       virtual const char *get_class() const { return "root"; }
+       const char *get_class() const override { return "root"; }
 
        Resources &get_resources() const { return resources; }
        virtual unsigned get_width() const { return geom.w; }
        virtual unsigned get_height() const { return geom.h; }
 
        void tick();
-       virtual void setup_frame(GL::Renderer &);
-       virtual void render(GL::Renderer &, GL::Tag = GL::Tag()) const;
+       void setup_frame(GL::Renderer &) override;
+       void render(GL::Renderer &, GL::Tag = GL::Tag()) const override;
 
 private:
        bool button_press_event(unsigned);
@@ -82,8 +79,8 @@ private:
        void get_touch(unsigned, int &, int &);
        void update_camera();
 
-       virtual void on_size_change();
-       virtual void on_child_added(Widget &);
+       void on_size_change() override;
+       void on_child_added(Widget &) override;
 };
 
 } // namespace GLtk