diff options
Diffstat (limited to 'ganv')
| -rw-r--r-- | ganv/Circle.hpp | 2 | ||||
| -rw-r--r-- | ganv/Edge.hpp | 2 | ||||
| -rw-r--r-- | ganv/Module.hpp | 4 | ||||
| -rw-r--r-- | ganv/Node.hpp | 4 | ||||
| -rw-r--r-- | ganv/wrap.hpp | 16 |
5 files changed, 14 insertions, 14 deletions
diff --git a/ganv/Circle.hpp b/ganv/Circle.hpp index ab47669..8534c0a 100644 --- a/ganv/Circle.hpp +++ b/ganv/Circle.hpp @@ -63,7 +63,7 @@ public: "border-color", BORDER_COLOUR, "label", name.c_str(), "draggable", TRUE, - NULL))) + nullptr))) {} RW_PROPERTY(double, radius) diff --git a/ganv/Edge.hpp b/ganv/Edge.hpp index eb723e5..a53c960 100644 --- a/ganv/Edge.hpp +++ b/ganv/Edge.hpp @@ -50,7 +50,7 @@ public: "color", color, "curved", static_cast<gboolean>(curved), "arrowhead", static_cast<gboolean>(show_arrowhead), - NULL))) + nullptr))) {} Edge(GanvEdge* gobj) diff --git a/ganv/Module.hpp b/ganv/Module.hpp index 64efa12..f076a70 100644 --- a/ganv/Module.hpp +++ b/ganv/Module.hpp @@ -58,7 +58,7 @@ public: "border-width", 2.0, "label", name.c_str(), "draggable", TRUE, - NULL))) + nullptr))) {} template<typename P, typename C> @@ -105,7 +105,7 @@ public: const_iterator back() const { return iterator(const_cast<GanvModule*>(gobj()), num_ports() - 1); } void embed(Gtk::Widget* widget) { - ganv_module_embed(gobj(), widget ? widget->gobj() : NULL); + ganv_module_embed(gobj(), widget ? widget->gobj() : nullptr); } Port* get_port(guint index) { diff --git a/ganv/Node.hpp b/ganv/Node.hpp index f83ac8f..979c426 100644 --- a/ganv/Node.hpp +++ b/ganv/Node.hpp @@ -88,7 +88,7 @@ private: template<typename T> static void on_notify(GObject* gobj, GParamSpec* pspec, gpointer signal) { T value; - g_object_get(gobj, g_param_spec_get_name(pspec), &value, NULL); + g_object_get(gobj, g_param_spec_get_name(pspec), &value, nullptr); ((sigc::signal<bool, T>*)signal)->emit(value); } */ @@ -96,7 +96,7 @@ private: GParamSpec* pspec, gpointer signal) { gboolean value; - g_object_get(gobj, g_param_spec_get_name(pspec), &value, NULL); + g_object_get(gobj, g_param_spec_get_name(pspec), &value, nullptr); static_cast<sigc::signal<bool, gboolean>*>(signal)->emit(value); } }; diff --git a/ganv/wrap.hpp b/ganv/wrap.hpp index 6e331df..f1659a7 100644 --- a/ganv/wrap.hpp +++ b/ganv/wrap.hpp @@ -33,27 +33,27 @@ private: \ #define RW_PROPERTY(type, name) \ virtual type get_##name() const { \ type value; \ - g_object_get(G_OBJECT(_gobj), #name, &value, NULL); \ + g_object_get(G_OBJECT(_gobj), #name, &value, nullptr); \ return value; \ } \ virtual void set_##name(type value) { \ - g_object_set(G_OBJECT(_gobj), #name, value, NULL); \ + g_object_set(G_OBJECT(_gobj), #name, value, nullptr); \ } \ SIGNAL1(name, type) \ public: #define RW_OBJECT_PROPERTY(type, name) \ type get_##name() const { \ - if (!_gobj) return NULL; \ + if (!_gobj) return nullptr; \ Ganv##type ptr; \ - g_object_get(G_OBJECT(_gobj), #name, &ptr, NULL); \ + g_object_get(G_OBJECT(_gobj), #name, &ptr, nullptr); \ return Glib::wrap(ptr); \ } \ void set_##name(type value) { \ if (!_gobj) return; \ ganv_item_set(GANV_ITEM(_gobj), \ #name, value->gobj(), \ - NULL); \ + nullptr); \ } #define METHOD0(prefix, name) \ @@ -86,7 +86,7 @@ private: \ if (gobj()) { \ return Glib::wrap(prefix##_##name(gobj())); \ } else { \ - return NULL; \ + return nullptr; \ } \ } @@ -117,7 +117,7 @@ private: \ if (gobj) { \ return static_cast<Ganv::Name*>(ganv_item_get_wrapper(GANV_ITEM(gobj))); \ } else { \ - return NULL; \ + return nullptr; \ } \ } \ /** Return a Ganv::CPPType wrapper for a CType. */ \ @@ -127,7 +127,7 @@ private: \ if (gobj) { \ return static_cast<const Ganv::Name*>(ganv_item_get_wrapper(GANV_ITEM(gobj))); \ } else { \ - return NULL; \ + return nullptr; \ } \ } \ } |