Simplify constructors with C++11

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

diff --git a/source/root.h b/source/root.h
index 52e23cae677ee6f03df4ee48a8f25d35400954d9..9ebe7cf57d823fdf59cf63d25829251f51b0b806 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 = 0;
+       InputMethod *input_method = 0;
+       Input::Mouse *mouse = 0;
+       Input::Touchscreen *touchscreen = 0;
+       bool own_input = false;
+       Label *lbl_tooltip = 0;
+       int pointer_x = 0;
+       int pointer_y = 0;
        Time::TimeStamp tooltip_timeout;
        Time::TimeStamp last_tick;
-       Widget *tooltip_target;
+       Widget *tooltip_target = 0;
        Msp::GL::Camera camera;
-       Msp::GL::Program *shprog;
+       Msp::GL::Program *shprog = 0;
        Msp::GL::Blend blend;
 
 public:
@@ -55,9 +55,6 @@ 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:
        virtual ~Root();
 
        virtual const char *get_class() const { return "root"; }