diff options
Diffstat (limited to 'glib/src')
| -rw-r--r-- | glib/src/date.ccg | 2 | ||||
| -rw-r--r-- | glib/src/keyfile.ccg | 2 | ||||
| -rw-r--r-- | glib/src/optioncontext.ccg | 2 | ||||
| -rw-r--r-- | glib/src/optionentry.ccg | 12 |
4 files changed, 9 insertions, 9 deletions
diff --git a/glib/src/date.ccg b/glib/src/date.ccg index 1be35724..84e2f9a6 100644 --- a/glib/src/date.ccg +++ b/glib/src/date.ccg @@ -102,7 +102,7 @@ void Date::set_time(time_t timet) void Date::set_time_current() { //As suggested in the C documentation: - g_date_set_time_t(&gobject_, time(NULL)); + g_date_set_time_t(&gobject_, time(0)); } void Date::set_time(const GTimeVal& timeval) diff --git a/glib/src/keyfile.ccg b/glib/src/keyfile.ccg index 9c24a617..73f56e5e 100644 --- a/glib/src/keyfile.ccg +++ b/glib/src/keyfile.ccg @@ -191,7 +191,7 @@ double KeyFile::get_double(const Glib::ustring& key, std::auto_ptr<Glib::Error>& #endif //GLIBMM_EXCEPTIONS_ENABLED { GError* gerror = 0; - double retvalue = g_key_file_get_double(const_cast<GKeyFile*>(gobj()), NULL, key.c_str(), &(gerror)); + double retvalue = g_key_file_get_double(const_cast<GKeyFile*>(gobj()), 0, key.c_str(), &(gerror)); if(gerror) #ifdef GLIBMM_EXCEPTIONS_ENABLED diff --git a/glib/src/optioncontext.ccg b/glib/src/optioncontext.ccg index 4bf73798..f6ad3a7e 100644 --- a/glib/src/optioncontext.ccg +++ b/glib/src/optioncontext.ccg @@ -111,7 +111,7 @@ void OptionContext::set_translate_func (const SlotTranslate& slot) Glib::ustring OptionContext::get_help(bool main_help) const { - return Glib::convert_return_gchar_ptr_to_ustring(g_option_context_get_help(const_cast<GOptionContext*>(gobj()), static_cast<int>(main_help), NULL)); + return Glib::convert_return_gchar_ptr_to_ustring(g_option_context_get_help(const_cast<GOptionContext*>(gobj()), static_cast<int>(main_help), 0)); } } // namespace Glib diff --git a/glib/src/optionentry.ccg b/glib/src/optionentry.ccg index 6778f68c..452600e2 100644 --- a/glib/src/optionentry.ccg +++ b/glib/src/optionentry.ccg @@ -78,13 +78,13 @@ void OptionEntry::set_long_name(const Glib::ustring& value) if(gobject_->long_name) { g_free((gchar*)(gobject_->long_name)); - gobject_->long_name = NULL; + gobject_->long_name = 0; } //Note that we do not use NULL for an empty string, //because G_OPTION_REMAINING is actually a "", so it actually has a distinct meaning: //TODO: Wrap G_OPTION_REMAINING in C++ somehow, maybe as an explicit set_long_name(void) or set_is_remaining()? murrayc. - gobj()->long_name = (value).c_str() ? g_strdup((value).c_str()) : NULL; + gobj()->long_name = (value).c_str() ? g_strdup((value).c_str()) : 0; } void OptionEntry::set_description(const Glib::ustring& value) @@ -92,10 +92,10 @@ void OptionEntry::set_description(const Glib::ustring& value) if(gobject_->description) { g_free((gchar*)(gobject_->description)); - gobject_->description = NULL; + gobject_->description = 0; } - gobj()->description = (value).empty() ? NULL : g_strdup((value).c_str()); + gobj()->description = (value).empty() ? 0 : g_strdup((value).c_str()); } void OptionEntry::set_arg_description(const Glib::ustring& value) @@ -103,10 +103,10 @@ void OptionEntry::set_arg_description(const Glib::ustring& value) if(gobject_->arg_description) { g_free((gchar*)(gobject_->arg_description)); - gobject_->arg_description = NULL; + gobject_->arg_description = 0; } - gobj()->arg_description = (value).empty() ? NULL : g_strdup((value).c_str()); + gobj()->arg_description = (value).empty() ? 0 : g_strdup((value).c_str()); } |