X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fstring.cpp;h=1cba8e4a7c2341103be17cfe7b2d214ad2aecaf7;hp=b8ecf738630bdea67568e9781357211145215db8;hb=efdec55aec1a137460fa362a381ed1904182bfed;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329 diff --git a/pv/prop/string.cpp b/pv/prop/string.cpp index b8ecf738..1cba8e4a 100644 --- a/pv/prop/string.cpp +++ b/pv/prop/string.cpp @@ -14,8 +14,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * along with this program; if not, see . */ #include @@ -36,7 +35,7 @@ String::String(QString name, Getter getter, Setter setter) : Property(name, getter, setter), - line_edit_(NULL) + line_edit_(nullptr) { } @@ -46,11 +45,11 @@ QWidget* String::get_widget(QWidget *parent, bool auto_commit) return line_edit_; if (!getter_) - return NULL; + return nullptr; Glib::VariantBase variant = getter_(); if (!variant.gobj()) - return NULL; + return nullptr; string value = Glib::VariantBase::cast_dynamic>( variant).get();