Use nullptr instead of 0 for pointers

[libs/gltk.git] / source / container.cpp

diff --git a/source/container.cpp b/source/container.cpp
index ef837a2d26180a20faa9808bec18fc7868cab0d3..4f4d2a370152fe6fda3b05c2e65de7d92d59ef35 100644 (file)
--- a/source/container.cpp
+++ b/source/container.cpp
@@ -35,7 +35,7 @@ void Container::remove(Widget &wdg)
        if(i==children.end())
                throw hierarchy_error("widget not in container");
 
-       wdg.set_parent(0);
+       wdg.set_parent(nullptr);
        delete *i;
        children.erase(i);
        if(wdg.get_animation_interval())
@@ -92,7 +92,7 @@ Widget *Container::get_child_at(int x, int y) const
                if((*--i)->widget->is_visible() && (*i)->widget->get_geometry().is_inside(x, y))
                        return (*i)->widget;
 
-       return 0;
+       return nullptr;
 }
 
 Widget *Container::get_descendant_at(int x, int y) const
@@ -209,7 +209,7 @@ void Container::button_release(int x, int y, unsigned btn)
        {
                if(child==click_focus && btn==click_button)
                {
-                       click_focus = 0;
+                       click_focus = nullptr;
                        if(!pointer_focus)
                                set_pointer_focus(get_child_at(x, y));
                }
@@ -223,7 +223,7 @@ void Container::pointer_motion(int x, int y)
 {
        Widget *child = get_pointer_target(x, y, false);
        if(!pointer_grabbed)
-               set_pointer_focus((child && child->get_geometry().is_inside(x, y)) ? child : 0);
+               set_pointer_focus((child && child->get_geometry().is_inside(x, y)) ? child : nullptr);
 
        if(child)
        {
@@ -246,14 +246,14 @@ Widget *Container::get_pointer_target(int x, int y, bool touch) const
                if(child && child->is_enabled())
                        return child;
                else
-                       return 0;
+                       return nullptr;
        }
 }
 
 void Container::pointer_leave()
 {
        Widget::pointer_leave();
-       set_pointer_focus(0);
+       set_pointer_focus(nullptr);
 }
 
 void Container::touch_press(int x, int y, unsigned finger)
@@ -275,7 +275,7 @@ void Container::touch_release(int x, int y, unsigned finger)
        {
                // TODO track focus for each finger separately
                if(child==touch_focus)
-                       touch_focus = 0;
+                       touch_focus = nullptr;
 
                const Geometry &cgeom = child->get_geometry();
                child->touch_release(x-cgeom.x, y-cgeom.y, finger);
@@ -325,7 +325,7 @@ void Container::focus_in()
 void Container::focus_out()
 {
        saved_input_focus = input_focus;
-       set_input_focus(0);
+       set_input_focus(nullptr);
        Widget::focus_out();
 }
 
@@ -394,11 +394,11 @@ void Container::Child::visibility_changed(bool v)
        if(!v)
        {
                if(widget==container.click_focus)
-                       container.click_focus = 0;
+                       container.click_focus = nullptr;
                if(widget==container.pointer_focus)
-                       container.set_pointer_focus(0);
+                       container.set_pointer_focus(nullptr);
                if(widget==container.input_focus)
-                       container.set_input_focus(0);
+                       container.set_input_focus(nullptr);
        }
 }
 
@@ -424,7 +424,7 @@ void Container::Child::ungrab_pointer()
        if(container.pointer_grabbed && container.pointer_focus==widget)
        {
                // XXX Should set to the widget under pointer
-               container.set_pointer_focus(0);
+               container.set_pointer_focus(nullptr);
                container.signal_ungrab_pointer.emit();
        }
 }