X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Froot.h;h=c71d50d6f7577d4ec3e710149c70115d50850ae3;hb=103ceeace366c6d80fce323438b31b9bbc167915;hp=9ebe7cf57d823fdf59cf63d25829251f51b0b806;hpb=9f38197854e699a6093a906ab43f4238f3cd2388;p=libs%2Fgltk.git

diff --git a/source/root.h b/source/root.h
index 9ebe7cf..c71d50d 100644
--- a/source/root.h
+++ b/source/root.h
@@ -32,19 +32,19 @@ public:
 
 private:
 	Resources &resources;
-	Input::Keyboard *keyboard = 0;
-	InputMethod *input_method = 0;
-	Input::Mouse *mouse = 0;
-	Input::Touchscreen *touchscreen = 0;
+	Input::Keyboard *keyboard = nullptr;
+	InputMethod *input_method = nullptr;
+	Input::Mouse *mouse = nullptr;
+	Input::Touchscreen *touchscreen = nullptr;
 	bool own_input = false;
-	Label *lbl_tooltip = 0;
+	Label *lbl_tooltip = nullptr;
 	int pointer_x = 0;
 	int pointer_y = 0;
 	Time::TimeStamp tooltip_timeout;
 	Time::TimeStamp last_tick;
-	Widget *tooltip_target = 0;
+	Widget *tooltip_target = nullptr;
 	Msp::GL::Camera camera;
-	Msp::GL::Program *shprog = 0;
+	Msp::GL::Program *shprog = nullptr;
 	Msp::GL::Blend blend;
 
 public:
@@ -54,18 +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);
+	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);
@@ -79,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