diff options
author | Marcin Kolny <marcin.kolny@gmail.com> | 2015-08-08 14:45:12 +0200 |
---|---|---|
committer | Marcin Kolny <marcin.kolny@gmail.com> | 2015-08-08 14:45:59 +0200 |
commit | 0d5f63b18f5766760cf39e82ee11482984e0a938 (patch) | |
tree | e3f74b9b37e7618c92840024077dff43e6d08f0d /glib/glibmm/property.cc | |
parent | dce7a844e48a582e42eb2b60eef5c1f2527540ac (diff) | |
parent | d94115843f38967b5e883f5f7d8057882ae364cb (diff) | |
download | glibmm-0d5f63b18f5766760cf39e82ee11482984e0a938.tar.gz |
Merge branch 'master' into glibmm-gir-gmmprocglibmm-gir-gmmproc
Diffstat (limited to 'glib/glibmm/property.cc')
-rw-r--r-- | glib/glibmm/property.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/glib/glibmm/property.cc b/glib/glibmm/property.cc index 4cf054f9..346c3e1f 100644 --- a/glib/glibmm/property.cc +++ b/glib/glibmm/property.cc @@ -239,7 +239,7 @@ PropertyBase::~PropertyBase() bool PropertyBase::lookup_property(const Glib::ustring& name) { - g_assert(param_spec_ == 0); + g_assert(param_spec_ == nullptr); param_spec_ = g_object_class_find_property(G_OBJECT_GET_CLASS(object_->gobj()), name.c_str()); @@ -249,12 +249,12 @@ bool PropertyBase::lookup_property(const Glib::ustring& name) g_param_spec_ref(param_spec_); } - return (param_spec_ != 0); + return (param_spec_ != nullptr); } void PropertyBase::install_property(GParamSpec* param_spec) { - g_return_if_fail(param_spec != 0); + g_return_if_fail(param_spec != nullptr); // Ensure that there would not be id clashes with possible existing // properties overridden from implemented interfaces if dealing with a custom @@ -280,7 +280,7 @@ void PropertyBase::install_property(GParamSpec* param_spec) const char* PropertyBase::get_name_internal() const { const char *const name = g_param_spec_get_name(param_spec_); - g_return_val_if_fail(name != 0, ""); + g_return_val_if_fail(name != nullptr, ""); return name; } |