Use nullptr in place of 0 or NULL

[libs/gui.git] / source / input / control.cpp

diff --git a/source/input/control.cpp b/source/input/control.cpp
index 17436a8ecbe761c45c025030ecb3dad6afbb21f2..4f093573baeaf2418a2faf25ca881934b94aecae 100644 (file)
--- a/source/input/control.cpp
+++ b/source/input/control.cpp
@@ -15,7 +15,7 @@ ControlSource::ControlSource(Device &d, ControlSrcType t, unsigned i):
        index(i)
 { }
 
-std::string ControlSource::str() const
+string ControlSource::str() const
 {
        if(type==BUTTON)
                return dev->get_button_name(index);
@@ -54,7 +54,7 @@ void Control::capture(Device &d)
 void Control::cancel_capture()
 {
        notify_callbacks();
-       capture_dev = 0;
+       capture_dev = nullptr;
        connect_signals();
 }
 
@@ -112,7 +112,7 @@ void Control::button_press(unsigned i)
                src.index = i;
 
                notify_callbacks();
-               capture_dev = 0;
+               capture_dev = nullptr;
                connect_signals();
                signal_capture_complete.emit();
        }
@@ -143,7 +143,7 @@ void Control::axis_motion(unsigned i, float v, float r)
                        src.index = i;
 
                        notify_callbacks();
-                       capture_dev = 0;
+                       capture_dev = nullptr;
                        connect_signals();
                        signal_capture_complete.emit();
                }