Use 0 instead of NULL.

* gio/src/*.ccg
* glib/src/*.ccg: Use 0 instead of NULL because this is C++ where
NULL is generally not a good idea. I didn't see any places where it
was a real problem though.

24 files changed, 208 insertions, 199 deletions

diff --git a/ChangeLog b/ChangeLog
index d7431801..fc1865b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2010-01-29  Murray Cumming  <murrayc@murrayc.com>
 
+	Use 0 instead of NULL.
+
+	* gio/src/*.ccg
+	* glib/src/*.ccg: Use 0 instead of NULL because this is C++ where 
+	NULL is generally not a good idea. I didn't see any places where it 
+	was a real problem though.
+
+2010-01-29  Murray Cumming  <murrayc@murrayc.com>
+
 	Use Glib::unwrap() instead of ->gobj(),
 
 	* gio/src/*.ccg: Use Glib::unwrap() instead of ->gobj(), so we don't 
diff --git a/gio/src/appinfo.ccg b/gio/src/appinfo.ccg
index 6b44f7d6..c3cd4be0 100644
--- a/gio/src/appinfo.ccg
+++ b/gio/src/appinfo.ccg
@@ -61,7 +61,7 @@ bool AppInfo::launch_default_for_uri(const std::string& uri, std::auto_ptr<Glib:
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  bool retvalue = g_app_info_launch_default_for_uri(uri.c_str(), NULL, &(gerror));
+  const bool retvalue = g_app_info_launch_default_for_uri(uri.c_str(), 0, &(gerror));
 
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
diff --git a/gio/src/bufferedinputstream.ccg b/gio/src/bufferedinputstream.ccg
index e4c6d3d5..2e573a97 100644
--- a/gio/src/bufferedinputstream.ccg
+++ b/gio/src/bufferedinputstream.ccg
@@ -34,7 +34,7 @@ gssize BufferedInputStream::fill(gssize count, std::auto_ptr<Glib::Error>& error
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  gssize retvalue = g_buffered_input_stream_fill(const_cast<GBufferedInputStream*>(gobj()), count, NULL, &(gerror));
+  const gssize retvalue = g_buffered_input_stream_fill(const_cast<GBufferedInputStream*>(gobj()), count, 0, &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -76,7 +76,7 @@ void BufferedInputStream::fill_async(const SlotAsyncReady& slot,
     g_buffered_input_stream_fill_async(gobj(),
             count,
             io_priority,
-            NULL,
+            0,
             &SignalProxy_async_callback,
             slot_copy);
 }
@@ -88,7 +88,7 @@ int BufferedInputStream::read_byte(std::auto_ptr<Glib::Error>& error)
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  int retvalue = g_buffered_input_stream_read_byte(gobj(), NULL, &(gerror));
+  const int retvalue = g_buffered_input_stream_read_byte(gobj(), 0, &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
diff --git a/gio/src/datainputstream.ccg b/gio/src/datainputstream.ccg
index 925f5a70..97479781 100644
--- a/gio/src/datainputstream.ccg
+++ b/gio/src/datainputstream.ccg
@@ -30,7 +30,7 @@ guchar DataInputStream::read_byte(std::auto_ptr<Glib::Error>& error)
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  guchar retvalue = g_data_input_stream_read_byte(gobj(), NULL, &(gerror));
+  const guchar retvalue = g_data_input_stream_read_byte(gobj(), 0, &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -49,7 +49,7 @@ gint16 DataInputStream::read_int16(std::auto_ptr<Glib::Error>& error)
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  gint16 retvalue = g_data_input_stream_read_int16(gobj(), NULL, &(gerror));
+  const gint16 retvalue = g_data_input_stream_read_int16(gobj(), 0, &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -68,7 +68,7 @@ guint16 DataInputStream::read_uint16(std::auto_ptr<Glib::Error>& error)
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  guint16 retvalue = g_data_input_stream_read_uint16(gobj(), NULL, &(gerror));
+  const guint16 retvalue = g_data_input_stream_read_uint16(gobj(), 0, &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -87,7 +87,7 @@ gint32 DataInputStream::read_int32(std::auto_ptr<Glib::Error>& error)
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  gint32 retvalue = g_data_input_stream_read_int32(gobj(), NULL, &(gerror));
+  const gint32 retvalue = g_data_input_stream_read_int32(gobj(), 0, &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -106,7 +106,7 @@ guint32 DataInputStream::read_uint32(std::auto_ptr<Glib::Error>& error)
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  guint32 retvalue = g_data_input_stream_read_uint32(gobj(), NULL, &(gerror));
+  const guint32 retvalue = g_data_input_stream_read_uint32(gobj(), 0, &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -125,7 +125,7 @@ gint64 DataInputStream::read_int64(std::auto_ptr<Glib::Error>& error)
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  gint64 retvalue = g_data_input_stream_read_int64(gobj(), NULL, &(gerror));
+  const gint64 retvalue = g_data_input_stream_read_int64(gobj(), 0, &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -144,7 +144,7 @@ guint64 DataInputStream::read_uint64(std::auto_ptr<Glib::Error>& error)
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  guint64 retvalue = g_data_input_stream_read_uint64(gobj(), NULL, &(gerror));
+  const guint64 retvalue = g_data_input_stream_read_uint64(gobj(), 0, &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -164,7 +164,7 @@ bool DataInputStream::read_line(std::string& line, const Glib::RefPtr<Cancellabl
 {
   GError* gerror = 0;
   char* c_line = g_data_input_stream_read_line(gobj(),
-                                               NULL, // pass NULL since we can easily determine the length from the returned std::string
+                                               0, // pass NULL since we can easily determine the length from the returned std::string
                                                Glib::unwrap(cancellable),
                                                &gerror);
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
@@ -191,8 +191,8 @@ bool DataInputStream::read_line(std::string& line, std::auto_ptr<Glib::Error>& e
 {
   GError* gerror = 0;
   char* c_line = g_data_input_stream_read_line(gobj(),
-                                               NULL, // pass NULL since we can easily determine the length from the returned std::string
-                                               NULL,
+                                               0, // pass NULL since we can easily determine the length from the returned std::string
+                                               0,
                                                &gerror);
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
@@ -261,7 +261,7 @@ bool DataInputStream::read_until(std::string& data, const std::string& stop_char
   GError* gerror = 0;
   char* c_str = g_data_input_stream_read_until(gobj(),
                                                stop_chars.c_str(),
-                                               NULL, // pass NULL since we can easily determine the length from the returned std::string
+                                               0, // pass NULL since we can easily determine the length from the returned std::string
                                                Glib::unwrap(cancellable),
                                                &gerror);
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
@@ -291,8 +291,8 @@ bool DataInputStream::read_until(std::string& data, const std::string& stop_char
   GError* gerror = 0;
   char* c_str = g_data_input_stream_read_until(gobj(),
                                                stop_chars.c_str(),
-                                               NULL, // pass NULL since we can easily determine the length from the returned std::string
-                                               NULL,
+                                               0, // pass NULL since we can easily determine the length from the returned std::string
+                                               0,
                                                &gerror);
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
diff --git a/gio/src/dataoutputstream.ccg b/gio/src/dataoutputstream.ccg
index 4ca51c7a..10629a09 100644
--- a/gio/src/dataoutputstream.ccg
+++ b/gio/src/dataoutputstream.ccg
@@ -29,7 +29,7 @@ bool DataOutputStream::put_byte(guchar data, std::auto_ptr<Glib::Error>& error)
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  guchar retvalue = g_data_output_stream_put_byte(gobj(), data, NULL, &(gerror));
+  const guchar retvalue = g_data_output_stream_put_byte(gobj(), data, 0, &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -48,7 +48,7 @@ bool DataOutputStream::put_int16(gint16 data, std::auto_ptr<Glib::Error>& error)
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  gint16 retvalue = g_data_output_stream_put_int16(gobj(), data, NULL, &(gerror));
+  const gint16 retvalue = g_data_output_stream_put_int16(gobj(), data, 0, &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -67,7 +67,7 @@ bool DataOutputStream::put_uint16(guint16 data, std::auto_ptr<Glib::Error>& erro
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  guint16 retvalue = g_data_output_stream_put_uint16(gobj(), data, NULL, &(gerror));
+  const guint16 retvalue = g_data_output_stream_put_uint16(gobj(), data, 0, &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -86,7 +86,7 @@ bool DataOutputStream::put_int32(gint32 data, std::auto_ptr<Glib::Error>& error)
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  gint32 retvalue = g_data_output_stream_put_int32(gobj(), data, NULL, &(gerror));
+  const gint32 retvalue = g_data_output_stream_put_int32(gobj(), data, 0, &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -105,7 +105,7 @@ bool DataOutputStream::put_uint32(guint32 data, std::auto_ptr<Glib::Error>& erro
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  guint32 retvalue = g_data_output_stream_put_uint32(gobj(), data, NULL, &(gerror));
+  const guint32 retvalue = g_data_output_stream_put_uint32(gobj(), data, 0, &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -124,7 +124,7 @@ bool DataOutputStream::put_int64(gint64 data, std::auto_ptr<Glib::Error>& error)
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  gint64 retvalue = g_data_output_stream_put_int64(gobj(), data, NULL, &(gerror));
+  const gint64 retvalue = g_data_output_stream_put_int64(gobj(), data, 0, &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -143,7 +143,7 @@ bool DataOutputStream::put_uint64(guint64 data, std::auto_ptr<Glib::Error>& erro
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  guint64 retvalue = g_data_output_stream_put_uint64(gobj(), data, NULL, &(gerror));
+  guint64 retvalue = g_data_output_stream_put_uint64(gobj(), data, 0, &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -162,9 +162,9 @@ bool DataOutputStream::put_string(std::string str, std::auto_ptr<Glib::Error>& e
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  bool retval = g_data_output_stream_put_string(gobj(),
+  const bool retval = g_data_output_stream_put_string(gobj(),
                                                 str.c_str (),
-                                                NULL,
+                                                0,
                                                 &gerror);
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
diff --git a/gio/src/drive.ccg b/gio/src/drive.ccg
index acbf5122..a51d749b 100644
--- a/gio/src/drive.ccg
+++ b/gio/src/drive.ccg
@@ -127,7 +127,7 @@ void Drive::poll_for_media(const SlotAsyncReady& slot)
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_drive_poll_for_media(gobj(),
-                         NULL, // cancellable
+                         0, // cancellable
                          &SignalProxy_async_callback,
                          slot_copy);
 }
@@ -135,9 +135,9 @@ void Drive::poll_for_media(const SlotAsyncReady& slot)
 void Drive::poll_for_media()
 {
   g_drive_poll_for_media(gobj(),
-                         NULL, // cancellable
-                         NULL,
-                         NULL);
+                         0, // cancellable
+                         0,
+                         0);
 }
 
 void
@@ -172,7 +172,7 @@ Drive::stop(const Glib::RefPtr<MountOperation>& mount_operation,
   g_drive_stop(gobj(),
                static_cast<GMountUnmountFlags>(flags),
                Glib::unwrap(mount_operation),
-               NULL,
+               0,
                &SignalProxy_async_callback,
                slot_copy);
 }
@@ -210,7 +210,7 @@ Drive::start(const Glib::RefPtr<MountOperation>& mount_operation,
   g_drive_start(gobj(),
                 static_cast<GDriveStartFlags>(flags),
                 Glib::unwrap(mount_operation),
-                NULL,
+                0,
                 &SignalProxy_async_callback,
                 slot_copy);
 }
diff --git a/gio/src/file.ccg b/gio/src/file.ccg
index 2672bd92..1b6b059d 100644
--- a/gio/src/file.ccg
+++ b/gio/src/file.ccg
@@ -150,7 +150,7 @@ File::read_async(const SlotAsyncReady& slot, int io_priority)
 
   g_file_read_async(gobj(),
                     io_priority,
-                    NULL,
+                    0,
                     &SignalProxy_async_callback,
                     slot_copy);
 }
@@ -197,7 +197,7 @@ File::append_to_async(const SlotAsyncReady& slot, FileCreateFlags flags, int io_
   g_file_append_to_async(gobj(),
                          static_cast<GFileCreateFlags>(flags),
                          io_priority,
-                         NULL, // cancellable
+                         0, // cancellable
                          &SignalProxy_async_callback,
                          slot_copy);
 }
@@ -229,7 +229,7 @@ File::create_file_async(const SlotAsyncReady& slot, FileCreateFlags flags, int i
   g_file_create_async(gobj(),
                       static_cast<GFileCreateFlags>(flags),
                       io_priority,
-                      NULL, // cancellable
+                      0, // cancellable
                       &SignalProxy_async_callback,
                       slot_copy);
 }
@@ -261,7 +261,7 @@ File::create_file_readwrite_async(const SlotAsyncReady& slot, FileCreateFlags fl
   g_file_create_readwrite_async(gobj(),
                       static_cast<GFileCreateFlags>(flags),
                       io_priority,
-                      NULL, // cancellable
+                      0, // cancellable
                       &SignalProxy_async_callback,
                       slot_copy);
 }
@@ -276,7 +276,7 @@ File::replace_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>&
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_file_replace_async(gobj(),
-                       etag.empty() ? NULL : etag.c_str(),
+                       etag.empty() ? 0 : etag.c_str(),
                        make_backup,
                        static_cast<GFileCreateFlags>(flags),
                        io_priority,
@@ -294,11 +294,11 @@ File::replace_async(const SlotAsyncReady& slot, const std::string& etag, bool ma
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_file_replace_async(gobj(),
-                       etag.empty() ? NULL : etag.c_str(),
+                       etag.empty() ? 0 : etag.c_str(),
                        make_backup,
                        static_cast<GFileCreateFlags>(flags),
                        io_priority,
-                       NULL, // cancellable
+                       0, // cancellable
                        &SignalProxy_async_callback,
                        slot_copy);
 }
@@ -313,7 +313,7 @@ File::open_readwrite_async(const SlotAsyncReady& slot, int io_priority)
 
   g_file_open_readwrite_async(gobj(),
                     io_priority,
-                    NULL,
+                    0,
                     &SignalProxy_async_callback,
                     slot_copy);
 }
@@ -342,7 +342,7 @@ File::replace_readwrite_async(const SlotAsyncReady& slot, const Glib::RefPtr<Can
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_file_replace_readwrite_async(gobj(),
-                       etag.empty() ? NULL : etag.c_str(),
+                       etag.empty() ? 0 : etag.c_str(),
                        make_backup,
                        static_cast<GFileCreateFlags>(flags),
                        io_priority,
@@ -360,11 +360,11 @@ File::replace_readwrite_async(const SlotAsyncReady& slot, const std::string& eta
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_file_replace_readwrite_async(gobj(),
-                       etag.empty() ? NULL : etag.c_str(),
+                       etag.empty() ? 0 : etag.c_str(),
                        make_backup,
                        static_cast<GFileCreateFlags>(flags),
                        io_priority,
-                       NULL, // cancellable
+                       0, // cancellable
                        &SignalProxy_async_callback,
                        slot_copy);
 }
@@ -395,7 +395,7 @@ Glib::RefPtr<FileInfo> File::query_info(const std::string& attributes, FileQuery
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  Glib::RefPtr<FileInfo> retvalue = Glib::wrap(g_file_query_info(const_cast<GFile*>(gobj()), attributes.c_str(), ((GFileQueryInfoFlags)(flags)), NULL, &(gerror)));
+  Glib::RefPtr<FileInfo> retvalue = Glib::wrap(g_file_query_info(const_cast<GFile*>(gobj()), attributes.c_str(), ((GFileQueryInfoFlags)(flags)), 0, &(gerror)));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -409,12 +409,12 @@ Glib::RefPtr<FileInfo> File::query_info(const std::string& attributes, FileQuery
 
 bool File::query_exists() const
 {
-  return g_file_query_exists(const_cast<GFile*>(gobj()), NULL);
+  return g_file_query_exists(const_cast<GFile*>(gobj()), 0);
 }
 
 FileType File::query_file_type(FileQueryInfoFlags flags) const
 {
-  return (FileType)g_file_query_file_type(const_cast<GFile*>(gobj()), (GFileQueryInfoFlags)flags, NULL);
+  return (FileType)g_file_query_file_type(const_cast<GFile*>(gobj()), (GFileQueryInfoFlags)flags, 0);
 }
 
 void
@@ -446,7 +446,7 @@ File::query_info_async(const SlotAsyncReady& slot, const std::string& attributes
                           attributes.c_str(),
                           static_cast<GFileQueryInfoFlags>(flags),
                           io_priority,
-                          NULL, // cancellable
+                          0, // cancellable
                           &SignalProxy_async_callback,
                           slot_copy);
 }
@@ -478,7 +478,7 @@ Glib::RefPtr<FileInfo> File::query_filesystem_info(const std::string& attributes
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  Glib::RefPtr<FileInfo> retvalue = Glib::wrap(g_file_query_filesystem_info(gobj(), attributes.c_str(), NULL, &(gerror)));
+  Glib::RefPtr<FileInfo> retvalue = Glib::wrap(g_file_query_filesystem_info(gobj(), attributes.c_str(), 0, &(gerror)));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -517,7 +517,7 @@ File::query_filesystem_info_async(const SlotAsyncReady& slot, const std::string&
   g_file_query_filesystem_info_async(const_cast<GFile*>(gobj()),
                           attributes.c_str(),
                           io_priority,
-                          NULL, // cancellable
+                          0, // cancellable
                           &SignalProxy_async_callback,
                           slot_copy);
 }
@@ -548,7 +548,7 @@ Glib::RefPtr<FileEnumerator> File::enumerate_children(const std::string& attribu
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  Glib::RefPtr<FileEnumerator> retvalue = Glib::wrap(g_file_enumerate_children(gobj(), attributes.c_str(), ((GFileQueryInfoFlags)(flags)), NULL, &(gerror)));
+  Glib::RefPtr<FileEnumerator> retvalue = Glib::wrap(g_file_enumerate_children(gobj(), attributes.c_str(), ((GFileQueryInfoFlags)(flags)), 0, &(gerror)));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -589,7 +589,7 @@ File::enumerate_children_async(const SlotAsyncReady& slot, const std::string& at
                                   attributes.c_str(),
                                   static_cast<GFileQueryInfoFlags>(flags),
                                   io_priority,
-                                  NULL,
+                                  0,
                                   &SignalProxy_async_callback,
                                   slot_copy);
 }
@@ -601,7 +601,7 @@ Glib::RefPtr<File> File::set_display_name(const Glib::ustring& display_name, std
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  Glib::RefPtr<File> retvalue = Glib::wrap(g_file_set_display_name(gobj(), display_name.c_str(), NULL, &(gerror)));
+  Glib::RefPtr<File> retvalue = Glib::wrap(g_file_set_display_name(gobj(), display_name.c_str(), 0, &(gerror)));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -641,7 +641,7 @@ File::set_display_name_async(const Glib::ustring& display_name, const SlotAsyncR
   g_file_set_display_name_async(gobj(),
                                 display_name.c_str(),
                                 io_priority,
-                                NULL,
+                                0,
                                 &SignalProxy_async_callback,
                                 slot_copy);
 }
@@ -700,7 +700,7 @@ File::copy(const Glib::RefPtr<File>& destination, const SlotFileProgress& slot,
   res = g_file_copy(gobj(),
                     Glib::unwrap(destination),
                     static_cast<GFileCopyFlags>(flags),
-                    NULL,
+                    0,
                     &SignalProxy_file_progress_callback,
                     slot_copy,
                     &gerror);
@@ -728,9 +728,9 @@ File::copy(const Glib::RefPtr<File>& destination, FileCopyFlags flags, std::auto
   bool res = g_file_copy(gobj(),
                     Glib::unwrap(destination),
                     static_cast<GFileCopyFlags>(flags),
-                    NULL,
-                    NULL,
-                    NULL,
+                    0,
+                    0,
+                    0,
                     &gerror);
 
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
@@ -786,8 +786,8 @@ File::copy_async(const Glib::RefPtr<File>& destination,
                     static_cast<GFileCopyFlags>(flags),
                     io_priority,
                     Glib::unwrap(cancellable),
-                    NULL,
-                    NULL,
+                    0,
+                    0,
                     &SignalProxy_async_callback,
                     slot_ready_copy);
 }
@@ -809,7 +809,7 @@ File::copy_async(const Glib::RefPtr<File>& destination,
                     Glib::unwrap(destination),
                     static_cast<GFileCopyFlags>(flags),
                     io_priority,
-                    NULL,
+                    0,
                     &SignalProxy_file_progress_callback,
                     slot_progress_copy,
                     &SignalProxy_async_callback,
@@ -831,9 +831,9 @@ File::copy_async(const Glib::RefPtr<File>& destination,
                     Glib::unwrap(destination),
                     static_cast<GFileCopyFlags>(flags),
                     io_priority,
-                    NULL,
-                    NULL,
-                    NULL,
+                    0,
+                    0,
+                    0,
                     &SignalProxy_async_callback,
                     slot_ready_copy);
 }
@@ -892,7 +892,7 @@ File::move(const Glib::RefPtr<File>& destination, const SlotFileProgress& slot,
   res = g_file_move(gobj(),
                     Glib::unwrap(destination),
                     static_cast<GFileCopyFlags>(flags),
-                    NULL,
+                    0,
                     &SignalProxy_file_progress_callback,
                     slot_copy,
                     &gerror);
@@ -922,9 +922,9 @@ File::move(const Glib::RefPtr<File>& destination, FileCopyFlags flags, std::auto
   res = g_file_move(gobj(),
                     Glib::unwrap(destination),
                     static_cast<GFileCopyFlags>(flags),
-                    NULL,
-                    NULL,
-                    NULL,
+                    0,
+                    0,
+                    0,
                     &gerror);
 
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
@@ -967,7 +967,7 @@ File::set_attributes_async(const Glib::RefPtr<FileInfo>& info, const SlotAsyncRe
                               Glib::unwrap(info),
                               static_cast<GFileQueryInfoFlags>(flags),
                               io_priority,
-                              NULL,
+                              0,
                               &SignalProxy_async_callback,
                               slot_copy);
 }
@@ -1010,7 +1010,7 @@ bool File::set_attribute_string(const std::string& attribute, const std::string&
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  bool retvalue = g_file_set_attribute_string(gobj(), attribute.c_str(), value.c_str(), ((GFileQueryInfoFlags)(flags)), NULL, &(gerror));
+  bool retvalue = g_file_set_attribute_string(gobj(), attribute.c_str(), value.c_str(), ((GFileQueryInfoFlags)(flags)), 0, &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -1030,7 +1030,7 @@ bool File::set_attribute_byte_string(const std::string& attribute, const std::st
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  bool retvalue = g_file_set_attribute_byte_string(gobj(), attribute.c_str(), value.c_str(), ((GFileQueryInfoFlags)(flags)), NULL, &(gerror));
+  bool retvalue = g_file_set_attribute_byte_string(gobj(), attribute.c_str(), value.c_str(), ((GFileQueryInfoFlags)(flags)), 0, &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -1050,7 +1050,7 @@ bool File::set_attribute_uint32(const std::string& attribute, guint32 value, Fil
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  bool retvalue = g_file_set_attribute_uint32(gobj(), attribute.c_str(), value, ((GFileQueryInfoFlags)(flags)), NULL, &(gerror));
+  bool retvalue = g_file_set_attribute_uint32(gobj(), attribute.c_str(), value, ((GFileQueryInfoFlags)(flags)), 0, &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -1070,7 +1070,7 @@ bool File::set_attribute_int32(const std::string& attribute, gint32 value, FileQ
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  bool retvalue = g_file_set_attribute_int32(gobj(), attribute.c_str(), value, ((GFileQueryInfoFlags)(flags)), NULL, &(gerror));
+  bool retvalue = g_file_set_attribute_int32(gobj(), attribute.c_str(), value, ((GFileQueryInfoFlags)(flags)), 0, &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -1090,7 +1090,7 @@ bool File::set_attribute_uint64(const std::string& attribute, guint64 value, Fil
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  bool retvalue = g_file_set_attribute_uint64(gobj(), attribute.c_str(), value, ((GFileQueryInfoFlags)(flags)), NULL, &(gerror));
+  bool retvalue = g_file_set_attribute_uint64(gobj(), attribute.c_str(), value, ((GFileQueryInfoFlags)(flags)), 0, &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -1110,7 +1110,7 @@ bool File::set_attribute_int64(const std::string& attribute, gint64 value, FileQ
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  bool retvalue = g_file_set_attribute_int64(gobj(), attribute.c_str(), value, ((GFileQueryInfoFlags)(flags)), NULL, &(gerror));
+  bool retvalue = g_file_set_attribute_int64(gobj(), attribute.c_str(), value, ((GFileQueryInfoFlags)(flags)), 0, &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -1148,7 +1148,7 @@ void File::mount_mountable(const Glib::RefPtr<MountOperation>& mount_operation,
   g_file_mount_mountable(gobj(),
                          static_cast<GMountMountFlags>(flags),
                          Glib::unwrap(mount_operation),
-                         NULL,
+                         0,
                          &SignalProxy_async_callback,
                          slot_copy);
 }
@@ -1162,8 +1162,8 @@ void File::mount_mountable(const SlotAsyncReady& slot, MountMountFlags flags)
 
   g_file_mount_mountable(gobj(),
                          static_cast<GMountMountFlags>(flags),
-                         NULL,
-                         NULL,
+                         0,
+                         0,
                          &SignalProxy_async_callback,
                          slot_copy);
 }
@@ -1172,10 +1172,10 @@ void File::mount_mountable(MountMountFlags flags)
 {
   g_file_mount_mountable(gobj(),
                          static_cast<GMountMountFlags>(flags),
-                         NULL,
-                         NULL,
-                         NULL,
-                         NULL);
+                         0,
+                         0,
+                         0,
+                         0);
 }
 
 void File::unmount_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, MountUnmountFlags flags)
@@ -1204,7 +1204,7 @@ File::unmount_mountable(const SlotAsyncReady& slot, MountUnmountFlags flags)
   g_file_unmount_mountable_with_operation(gobj(),
                            static_cast<GMountUnmountFlags>(flags),
                            0,
-                           NULL,
+                           0,
                            &SignalProxy_async_callback,
                            slot_copy);
 }
@@ -1215,9 +1215,9 @@ File::unmount_mountable(MountUnmountFlags flags)
   g_file_unmount_mountable_with_operation(gobj(),
                            static_cast<GMountUnmountFlags>(flags), 
                            0,
-                           NULL,
-                           NULL,
-                           NULL);
+                           0,
+                           0,
+                           0);
 }
 
 void File::unmount_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, const Glib::RefPtr<MountOperation>& mount_operation, MountUnmountFlags flags)
@@ -1246,7 +1246,7 @@ File::unmount_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<MountOper
   g_file_unmount_mountable_with_operation(gobj(),
                            static_cast<GMountUnmountFlags>(flags),
                            Glib::unwrap(mount_operation),
-                           NULL,
+                           0,
                            &SignalProxy_async_callback,
                            slot_copy);
 }
@@ -1257,9 +1257,9 @@ File::unmount_mountable(const Glib::RefPtr<MountOperation>& mount_operation, Mou
   g_file_unmount_mountable_with_operation(gobj(),
                            static_cast<GMountUnmountFlags>(flags), 
                            Glib::unwrap(mount_operation),
-                           NULL,
-                           NULL,
-                           NULL);
+                           0,
+                           0,
+                           0);
 }
 
 
@@ -1289,7 +1289,7 @@ void File::mount_enclosing_volume(const Glib::RefPtr<MountOperation>& mount_oper
   g_file_mount_enclosing_volume(gobj(),
                          static_cast<GMountMountFlags>(flags),
                          Glib::unwrap(mount_operation),
-                         NULL,
+                         0,
                          &SignalProxy_async_callback,
                          slot_copy);
 }
@@ -1303,8 +1303,8 @@ void File::mount_enclosing_volume(const SlotAsyncReady& slot, MountMountFlags fl
 
   g_file_mount_enclosing_volume(gobj(),
                          static_cast<GMountMountFlags>(flags),
-                         NULL,
-                         NULL,
+                         0,
+                         0,
                          &SignalProxy_async_callback,
                          slot_copy);
 }
@@ -1313,10 +1313,10 @@ void File::mount_enclosing_volume(MountMountFlags flags)
 {
   g_file_mount_enclosing_volume(gobj(),
                          static_cast<GMountMountFlags>(flags),
-                         NULL,
-                         NULL,
-                         NULL,
-                         NULL);
+                         0,
+                         0,
+                         0,
+                         0);
 }
 
 void
@@ -1346,7 +1346,7 @@ File::eject_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<MountOperat
   g_file_eject_mountable_with_operation(gobj(),
                          static_cast<GMountUnmountFlags>(flags),
                          Glib::unwrap(mount_operation),
-                         NULL,
+                         0,
                          &SignalProxy_async_callback,
                          slot_copy);
 }
@@ -1357,9 +1357,9 @@ File::eject_mountable(const Glib::RefPtr<MountOperation>& mount_operation, Mount
   g_file_eject_mountable_with_operation(gobj(),
                          static_cast<GMountUnmountFlags>(flags),
                          Glib::unwrap(mount_operation),
-                         NULL,
-                         NULL,
-                         NULL);
+                         0,
+                         0,
+                         0);
 }
 
 void
@@ -1389,7 +1389,7 @@ File::eject_mountable(const SlotAsyncReady& slot, MountUnmountFlags flags)
   g_file_eject_mountable_with_operation(gobj(),
                          static_cast<GMountUnmountFlags>(flags),
                          0,
-                         NULL,
+                         0,
                          &SignalProxy_async_callback,
                          slot_copy);
 }
@@ -1400,9 +1400,9 @@ File::eject_mountable(MountUnmountFlags flags)
   g_file_eject_mountable_with_operation(gobj(),
                          static_cast<GMountUnmountFlags>(flags),
                          0,
-                         NULL,
-                         NULL,
-                         NULL);
+                         0,
+                         0,
+                         0);
 }
 
 void
@@ -1428,7 +1428,7 @@ File::load_contents_async(const SlotAsyncReady& slot)
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
 
   g_file_load_contents_async(gobj(),
-                             NULL,
+                             0,
                              &SignalProxy_async_callback,
                              slot_copy);
 }
@@ -1466,7 +1466,7 @@ File::load_partial_contents_async(const SlotReadMore& slot_read_more,
   slots->second = slot_async_copy;
 
   g_file_load_partial_contents_async(gobj(),
-                                     NULL,
+                                     0,
                                      &SignalProxy_load_partial_contents_read_more_callback,
                                      &SignalProxy_load_partial_contents_ready_callback,
                                      slots);
@@ -1480,7 +1480,7 @@ void File::replace_contents(const char* contents, gsize length, const std::strin
 {
   GError* gerror = 0;
   gchar* c_etag_new = 0;
-  g_file_replace_contents(gobj(), contents, length, etag.empty() ? NULL : etag.c_str(), static_cast<int>(make_backup), ((GFileCreateFlags)(flags)), &c_etag_new, const_cast<GCancellable*>(Glib::unwrap(cancellable)), &(gerror));
+  g_file_replace_contents(gobj(), contents, length, etag.empty() ? 0 : etag.c_str(), static_cast<int>(make_backup), ((GFileCreateFlags)(flags)), &c_etag_new, const_cast<GCancellable*>(Glib::unwrap(cancellable)), &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -1503,7 +1503,7 @@ void File::replace_contents(const char* contents, gsize length, const std::strin
 {
   GError* gerror = 0;
   gchar* c_etag_new = 0;
-  g_file_replace_contents(gobj(), contents, length, etag.empty() ? NULL : etag.c_str(), static_cast<int>(make_backup), ((GFileCreateFlags)(flags)), &c_etag_new, NULL, &(gerror));
+  g_file_replace_contents(gobj(), contents, length, etag.empty() ? 0 : etag.c_str(), static_cast<int>(make_backup), ((GFileCreateFlags)(flags)), &c_etag_new, 0, &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -1526,7 +1526,7 @@ void File::replace_contents(const std::string& contents, const std::string& etag
 {
   GError* gerror = 0;
   gchar* c_etag_new = 0;
-  g_file_replace_contents(gobj(), contents.c_str(), contents.size(), etag.empty() ? NULL : etag.c_str(), static_cast<int>(make_backup), ((GFileCreateFlags)(flags)), &c_etag_new, const_cast<GCancellable*>(Glib::unwrap(cancellable)), &(gerror));
+  g_file_replace_contents(gobj(), contents.c_str(), contents.size(), etag.empty() ? 0 : etag.c_str(), static_cast<int>(make_backup), ((GFileCreateFlags)(flags)), &c_etag_new, const_cast<GCancellable*>(Glib::unwrap(cancellable)), &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -1549,7 +1549,7 @@ void File::replace_contents(const std::string& contents, const std::string& etag
 {
   GError* gerror = 0;
   gchar* c_etag_new = 0;
-  g_file_replace_contents(gobj(), contents.c_str(), contents.size(), etag.empty() ? NULL : etag.c_str(), static_cast<int>(make_backup), ((GFileCreateFlags)(flags)), &c_etag_new, NULL, &(gerror));
+  g_file_replace_contents(gobj(), contents.c_str(), contents.size(), etag.empty() ? 0 : etag.c_str(), static_cast<int>(make_backup), ((GFileCreateFlags)(flags)), &c_etag_new, 0, &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -1581,7 +1581,7 @@ File::replace_contents_async(const SlotAsyncReady& slot,
   g_file_replace_contents_async(gobj(),
                                 contents,
                                 length,
-                                etag.empty() ? NULL : etag.c_str(),
+                                etag.empty() ? 0 : etag.c_str(),
                                 make_backup,
                                 static_cast<GFileCreateFlags>(flags),
                                 Glib::unwrap(cancellable),
@@ -1605,10 +1605,10 @@ File::replace_contents_async(const SlotAsyncReady& slot,
   g_file_replace_contents_async(gobj(),
                                 contents,
                                 length,
-                                etag.empty() ? NULL : etag.c_str(),
+                                etag.empty() ? 0 : etag.c_str(),
                                 make_backup,
                                 static_cast<GFileCreateFlags>(flags),
-                                NULL,
+                                0,
                                 &SignalProxy_async_callback,
                                 slot_copy);
 }
@@ -1629,7 +1629,7 @@ File::replace_contents_async(const SlotAsyncReady& slot,
   g_file_replace_contents_async(gobj(),
                                 contents.c_str(),
                                 contents.size(),
-                                etag.empty() ? NULL : etag.c_str(),
+                                etag.empty() ? 0 : etag.c_str(),
                                 make_backup,
                                 static_cast<GFileCreateFlags>(flags),
                                 Glib::unwrap(cancellable),
@@ -1652,10 +1652,10 @@ File::replace_contents_async(const SlotAsyncReady& slot,
   g_file_replace_contents_async(gobj(),
                                 contents.c_str(),
                                 contents.size(),
-                                etag.empty() ? NULL : etag.c_str(),
+                                etag.empty() ? 0 : etag.c_str(),
                                 make_backup,
                                 static_cast<GFileCreateFlags>(flags),
-                                NULL,
+                                0,
                                 &SignalProxy_async_callback,
                                 slot_copy);
 }
@@ -1691,7 +1691,7 @@ void File::replace_contents_finish(const Glib::RefPtr<AsyncResult>& result, std:
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  g_file_replace_contents_finish(gobj(), Glib::unwrap(result), NULL, &(gerror));
+  g_file_replace_contents_finish(gobj(), Glib::unwrap(result), 0, &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -1709,7 +1709,7 @@ Glib::RefPtr<FileOutputStream> File::replace(const Glib::RefPtr<Cancellable>& ca
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  Glib::RefPtr<FileOutputStream> retvalue = Glib::wrap(g_file_replace(gobj(), etag.empty() ? NULL : etag.c_str(), static_cast<int>(make_backup), ((GFileCreateFlags)(flags)), const_cast<GCancellable*>(Glib::unwrap(cancellable)), &(gerror)));
+  Glib::RefPtr<FileOutputStream> retvalue = Glib::wrap(g_file_replace(gobj(), etag.empty() ? 0 : etag.c_str(), static_cast<int>(make_backup), ((GFileCreateFlags)(flags)), const_cast<GCancellable*>(Glib::unwrap(cancellable)), &(gerror)));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -1728,7 +1728,7 @@ Glib::RefPtr<FileOutputStream> File::replace(const std::string& etag, bool make_
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  Glib::RefPtr<FileOutputStream> retvalue = Glib::wrap(g_file_replace(gobj(), etag.empty() ? NULL : etag.c_str(), static_cast<int>(make_backup), ((GFileCreateFlags)(flags)), NULL, &(gerror)));
+  Glib::RefPtr<FileOutputStream> retvalue = Glib::wrap(g_file_replace(gobj(), etag.empty() ? 0 : etag.c_str(), static_cast<int>(make_backup), ((GFileCreateFlags)(flags)), 0, &(gerror)));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -1748,7 +1748,7 @@ Glib::RefPtr<FileIOStream> File::replace_readwrite(const Glib::RefPtr<Cancellabl
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  Glib::RefPtr<FileIOStream> retvalue = Glib::wrap(g_file_replace_readwrite(gobj(), etag.empty() ? NULL : etag.c_str(), static_cast<int>(make_backup), ((GFileCreateFlags)(flags)), const_cast<GCancellable*>(Glib::unwrap(cancellable)), &(gerror)));
+  Glib::RefPtr<FileIOStream> retvalue = Glib::wrap(g_file_replace_readwrite(gobj(), etag.empty() ? 0 : etag.c_str(), static_cast<int>(make_backup), ((GFileCreateFlags)(flags)), const_cast<GCancellable*>(Glib::unwrap(cancellable)), &(gerror)));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -1767,7 +1767,7 @@ Glib::RefPtr<FileIOStream> File::replace_readwrite(const std::string& etag, bool
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  Glib::RefPtr<FileIOStream> retvalue = Glib::wrap(g_file_replace_readwrite(gobj(), etag.empty() ? NULL : etag.c_str(), static_cast<int>(make_backup), ((GFileCreateFlags)(flags)), NULL, &(gerror)));
+  Glib::RefPtr<FileIOStream> retvalue = Glib::wrap(g_file_replace_readwrite(gobj(), etag.empty() ? 0 : etag.c_str(), static_cast<int>(make_backup), ((GFileCreateFlags)(flags)), 0, &(gerror)));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -1807,7 +1807,7 @@ Glib::RefPtr<FileMonitor> File::monitor_directory(FileMonitorFlags flags, std::a
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  Glib::RefPtr<FileMonitor> retvalue = Glib::wrap(g_file_monitor_directory(gobj(), ((GFileMonitorFlags)(flags)), NULL, &(gerror)));
+  Glib::RefPtr<FileMonitor> retvalue = Glib::wrap(g_file_monitor_directory(gobj(), ((GFileMonitorFlags)(flags)), 0, &(gerror)));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -1845,7 +1845,7 @@ Glib::RefPtr<FileMonitor> File::monitor_file(FileMonitorFlags flags,  std::auto_
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  Glib::RefPtr<FileMonitor> retvalue = Glib::wrap(g_file_monitor_file(gobj(), ((GFileMonitorFlags)(flags)), NULL, &(gerror)));
+  Glib::RefPtr<FileMonitor> retvalue = Glib::wrap(g_file_monitor_file(gobj(), ((GFileMonitorFlags)(flags)), 0, &(gerror)));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -1884,7 +1884,7 @@ Glib::RefPtr<FileMonitor> File::monitor(FileMonitorFlags flags,  std::auto_ptr<G
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  Glib::RefPtr<FileMonitor> retvalue = Glib::wrap(g_file_monitor(gobj(), ((GFileMonitorFlags)(flags)), NULL, &(gerror)));
+  Glib::RefPtr<FileMonitor> retvalue = Glib::wrap(g_file_monitor(gobj(), ((GFileMonitorFlags)(flags)), 0, &(gerror)));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -1990,7 +1990,7 @@ Glib::RefPtr<FileInputStream> File::read(std::auto_ptr<Glib::Error>& error)
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  Glib::RefPtr<FileInputStream> retvalue = Glib::wrap(g_file_read(gobj(), NULL, &(gerror)));
+  Glib::RefPtr<FileInputStream> retvalue = Glib::wrap(g_file_read(gobj(), 0, &(gerror)));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -2025,7 +2025,7 @@ void File::find_enclosing_mount_async(const SlotAsyncReady& slot, int io_priorit
 
   g_file_find_enclosing_mount_async(gobj(),
                     io_priority,
-                    NULL,
+                    0,
                     &SignalProxy_async_callback,
                     slot_copy);
 }
@@ -2056,7 +2056,7 @@ bool File::set_attributes_from_info(const Glib::RefPtr<FileInfo>& info, FileQuer
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  bool retvalue = g_file_set_attributes_from_info(gobj(), Glib::unwrap(info), ((GFileQueryInfoFlags)(flags)), NULL, &(gerror));
+  bool retvalue = g_file_set_attributes_from_info(gobj(), Glib::unwrap(info), ((GFileQueryInfoFlags)(flags)), 0, &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -2110,7 +2110,7 @@ File::copy_attributes(const Glib::RefPtr<File>& destination, FileCopyFlags flags
   res = g_file_copy_attributes(gobj(),
                     Glib::unwrap(destination),
                     static_cast<GFileCopyFlags>(flags),
-                    NULL,
+                    0,
                     &gerror);
 
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
@@ -2150,7 +2150,7 @@ Glib::RefPtr<FileOutputStream> File::create_file(FileCreateFlags flags, std::aut
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  Glib::RefPtr<FileOutputStream> retvalue = Glib::wrap(g_file_create(gobj(), ((GFileCreateFlags)(flags)), NULL, &(gerror)));
+  Glib::RefPtr<FileOutputStream> retvalue = Glib::wrap(g_file_create(gobj(), ((GFileCreateFlags)(flags)), 0, &(gerror)));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -2188,7 +2188,7 @@ Glib::RefPtr<FileIOStream> File::create_file_readwrite(FileCreateFlags flags, st
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  Glib::RefPtr<FileIOStream> retvalue = Glib::wrap(g_file_create_readwrite(gobj(), ((GFileCreateFlags)(flags)), NULL, &(gerror)));
+  Glib::RefPtr<FileIOStream> retvalue = Glib::wrap(g_file_create_readwrite(gobj(), ((GFileCreateFlags)(flags)), 0, &(gerror)));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -2207,7 +2207,7 @@ bool File::remove(std::auto_ptr<Glib::Error>& error)
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  bool retvalue = g_file_delete(gobj(), NULL, &(gerror));
+  bool retvalue = g_file_delete(gobj(), 0, &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -2226,7 +2226,7 @@ bool File::trash(std::auto_ptr<Glib::Error>& error)
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  bool retvalue = g_file_trash(gobj(), NULL, &(gerror));
+  bool retvalue = g_file_trash(gobj(), 0, &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -2245,7 +2245,7 @@ bool File::make_directory(std::auto_ptr<Glib::Error>& error)
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  bool retvalue = g_file_make_directory(gobj(), NULL, &(gerror));
+  bool retvalue = g_file_make_directory(gobj(), 0, &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -2264,7 +2264,7 @@ bool File::make_directory_with_parents(std::auto_ptr<Glib::Error>& error)
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  const bool retvalue = g_file_make_directory_with_parents(gobj(), NULL, &(gerror));
+  const bool retvalue = g_file_make_directory_with_parents(gobj(), 0, &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -2283,7 +2283,7 @@ bool File::make_symbolic_link(const std::string& symlink_value, std::auto_ptr<Gl
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  bool retvalue = g_file_make_symbolic_link(gobj(), symlink_value.c_str(), NULL, &(gerror));
+  bool retvalue = g_file_make_symbolic_link(gobj(), symlink_value.c_str(), 0, &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -2302,7 +2302,7 @@ Glib::RefPtr<FileAttributeInfoList> File::query_settable_attributes(std::auto_pt
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  Glib::RefPtr<FileAttributeInfoList> retvalue = Glib::wrap(g_file_query_settable_attributes(gobj(), NULL, &(gerror)));
+  Glib::RefPtr<FileAttributeInfoList> retvalue = Glib::wrap(g_file_query_settable_attributes(gobj(), 0, &(gerror)));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -2321,7 +2321,7 @@ Glib::RefPtr<FileAttributeInfoList> File::query_writable_namespaces(std::auto_pt
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  Glib::RefPtr<FileAttributeInfoList> retvalue = Glib::wrap(g_file_query_writable_namespaces(gobj(), NULL, &(gerror)));
+  Glib::RefPtr<FileAttributeInfoList> retvalue = Glib::wrap(g_file_query_writable_namespaces(gobj(), 0, &(gerror)));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -2360,7 +2360,7 @@ Glib::RefPtr<FileOutputStream> File::append_to(FileCreateFlags flags, std::auto_
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  Glib::RefPtr<FileOutputStream> retvalue = Glib::wrap(g_file_append_to(gobj(), ((GFileCreateFlags)(flags)), NULL, &(gerror)));
+  Glib::RefPtr<FileOutputStream> retvalue = Glib::wrap(g_file_append_to(gobj(), ((GFileCreateFlags)(flags)), 0, &(gerror)));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -2379,7 +2379,7 @@ Glib::RefPtr<Mount> File::find_enclosing_mount(std::auto_ptr<Glib::Error>& error
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  Glib::RefPtr<Mount> retvalue = Glib::wrap(g_file_find_enclosing_mount(gobj(), NULL, &(gerror)));
+  Glib::RefPtr<Mount> retvalue = Glib::wrap(g_file_find_enclosing_mount(gobj(), 0, &(gerror)));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -2398,7 +2398,7 @@ Glib::RefPtr<AppInfo> File::query_default_handler(std::auto_ptr<Glib::Error>& er
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  Glib::RefPtr<AppInfo> retvalue = Glib::wrap(g_file_query_default_handler(gobj(), NULL, &(gerror)));
+  Glib::RefPtr<AppInfo> retvalue = Glib::wrap(g_file_query_default_handler(gobj(), 0, &(gerror)));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -2459,7 +2459,7 @@ bool File::load_contents(char*& contents, gsize& length, std::string& etag_out,
 {
   GError* gerror = 0;
   gchar* cetag_out = 0;
-  bool retvalue = g_file_load_contents(gobj(), NULL, &contents, &(length), &cetag_out, &(gerror));
+  bool retvalue = g_file_load_contents(gobj(), 0, &contents, &(length), &cetag_out, &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -2480,7 +2480,7 @@ bool File::load_contents(char*& contents, gsize& length, std::auto_ptr<Glib::Err
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  bool retvalue = g_file_load_contents(gobj(), NULL, &contents, &(length), 0, &(gerror));
+  bool retvalue = g_file_load_contents(gobj(), 0, &contents, &(length), 0, &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
diff --git a/gio/src/fileenumerator.ccg b/gio/src/fileenumerator.ccg
index 4479e4eb..84ad2880 100644
--- a/gio/src/fileenumerator.ccg
+++ b/gio/src/fileenumerator.ccg
@@ -53,7 +53,7 @@ FileEnumerator::next_files_async(const SlotAsyncReady& slot, int num_files, int
   g_file_enumerator_next_files_async(gobj(),
                                      num_files,
                                      io_priority,
-                                     NULL, // cancellable
+                                     0, // cancellable
                                      &SignalProxy_async_callback,
                                      slot_copy);
 }
@@ -86,7 +86,7 @@ FileEnumerator::close_async(int io_priority,
 
   g_file_enumerator_close_async(gobj(),
                                 io_priority,
-                                NULL, // cancellable
+                                0, // cancellable
                                 &SignalProxy_async_callback,
                                 slot_copy);
 }
@@ -98,7 +98,7 @@ Glib::RefPtr<FileInfo> FileEnumerator::next_file(std::auto_ptr<Glib::Error>& err
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  Glib::RefPtr<FileInfo> retvalue = Glib::wrap(g_file_enumerator_next_file(gobj(), NULL, &(gerror)));
+  Glib::RefPtr<FileInfo> retvalue = Glib::wrap(g_file_enumerator_next_file(gobj(), 0, &(gerror)));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -117,7 +117,7 @@ bool FileEnumerator::close(std::auto_ptr<Glib::Error>& error)
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  bool retvalue = g_file_enumerator_close(gobj(), NULL, &(gerror));
+  bool retvalue = g_file_enumerator_close(gobj(), 0, &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
diff --git a/gio/src/fileinputstream.ccg b/gio/src/fileinputstream.ccg
index 5ac95586..6f1d50c1 100644
--- a/gio/src/fileinputstream.ccg
+++ b/gio/src/fileinputstream.ccg
@@ -50,7 +50,7 @@ Glib::RefPtr<FileInfo> FileInputStream::query_info(const std::string& attributes
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  Glib::RefPtr<FileInfo> retvalue = Glib::wrap(g_file_input_stream_query_info(gobj(), g_strdup((attributes).c_str()), NULL, &(gerror)));
+  Glib::RefPtr<FileInfo> retvalue = Glib::wrap(g_file_input_stream_query_info(gobj(), g_strdup((attributes).c_str()), 0, &(gerror)));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -89,7 +89,7 @@ FileInputStream::query_info_async(const SlotAsyncReady& slot, const std::string&
   g_file_input_stream_query_info_async(gobj(),
                                        const_cast<char*>(attributes.c_str()),
                                        io_priority,
-                                       NULL,
+                                       0,
                                        &SignalProxy_async_callback,
                                        slot_copy);
 }
diff --git a/gio/src/fileiostream.ccg b/gio/src/fileiostream.ccg
index c6f28ae7..9447d8a0 100644
--- a/gio/src/fileiostream.ccg
+++ b/gio/src/fileiostream.ccg
@@ -50,7 +50,7 @@ Glib::RefPtr<FileInfo> FileIOStream::query_info(const std::string& attributes, s
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  Glib::RefPtr<FileInfo> retvalue = Glib::wrap(g_file_io_stream_query_info(gobj(), g_strdup((attributes).c_str()), NULL, &(gerror)));
+  Glib::RefPtr<FileInfo> retvalue = Glib::wrap(g_file_io_stream_query_info(gobj(), g_strdup((attributes).c_str()), 0, &(gerror)));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -89,7 +89,7 @@ FileIOStream::query_info_async(const SlotAsyncReady& slot, const std::string& at
   g_file_io_stream_query_info_async(gobj(),
                                     const_cast<char*>(attributes.c_str()),
                                     io_priority,
-                                    NULL,
+                                    0,
                                     &SignalProxy_async_callback,
                                     slot_copy);
 }
diff --git a/gio/src/fileoutputstream.ccg b/gio/src/fileoutputstream.ccg
index 269a1fe4..1bc25cb7 100644
--- a/gio/src/fileoutputstream.ccg
+++ b/gio/src/fileoutputstream.ccg
@@ -54,7 +54,7 @@ Glib::RefPtr<FileInfo> FileOutputStream::query_info(const std::string& attribute
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  Glib::RefPtr<FileInfo> retvalue = Glib::wrap(g_file_output_stream_query_info(gobj(), g_strdup((attributes).c_str()), NULL, &(gerror)));
+  Glib::RefPtr<FileInfo> retvalue = Glib::wrap(g_file_output_stream_query_info(gobj(), g_strdup((attributes).c_str()), 0, &(gerror)));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -95,7 +95,7 @@ FileOutputStream::query_info_async(const SlotAsyncReady& slot, const std::string
   g_file_output_stream_query_info_async(gobj(),
                                         const_cast<char*>(attributes.c_str()),
                                         io_priority,
-                                        NULL,
+                                        0,
                                         &SignalProxy_async_callback,
                                         slot_copy);
 }
diff --git a/gio/src/inputstream.ccg b/gio/src/inputstream.ccg
index 9ee11ac3..27d59bb5 100644
--- a/gio/src/inputstream.ccg
+++ b/gio/src/inputstream.ccg
@@ -31,7 +31,7 @@ gssize InputStream::read(void* buffer, gsize count, std::auto_ptr<Glib::Error>&
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  gssize retvalue = g_input_stream_read(gobj(), buffer, count, NULL, &(gerror));
+  gssize retvalue = g_input_stream_read(gobj(), buffer, count, 0, &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -51,7 +51,7 @@ bool InputStream::read_all(void* buffer, gsize count, gsize& bytes_read, std::au
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  bool retvalue = g_input_stream_read_all(gobj(), buffer, count, &(bytes_read), NULL, &(gerror));
+  bool retvalue = g_input_stream_read_all(gobj(), buffer, count, &(bytes_read), 0, &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -70,7 +70,7 @@ gssize InputStream::skip(gsize count, std::auto_ptr<Glib::Error>& error)
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  gssize retvalue = g_input_stream_skip(gobj(), count, NULL, &(gerror));
+  gssize retvalue = g_input_stream_skip(gobj(), count, 0, &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -89,7 +89,7 @@ bool InputStream::close(std::auto_ptr<Glib::Error>& error)
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  bool retvalue = g_input_stream_close(gobj(), NULL, &(gerror));
+  bool retvalue = g_input_stream_close(gobj(), 0, &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -130,7 +130,7 @@ InputStream::read_async(void* buffer, gsize count, const SlotAsyncReady& slot, i
                             buffer,
                             count,
                             io_priority,
-                            NULL,
+                            0,
                             &SignalProxy_async_callback,
                             slot_copy);
 }
@@ -163,7 +163,7 @@ InputStream::skip_async(gsize count, const SlotAsyncReady& slot, int io_priority
   g_input_stream_skip_async(gobj(),
                             count,
                             io_priority,
-                            NULL,
+                            0,
                             &SignalProxy_async_callback,
                             slot_copy);
 }
@@ -193,7 +193,7 @@ InputStream::close_async(const SlotAsyncReady& slot, int io_priority)
 
   g_input_stream_close_async(gobj(),
                              io_priority,
-                             NULL,
+                             0,
                              &SignalProxy_async_callback,
                              slot_copy);
 }
diff --git a/gio/src/iostream.ccg b/gio/src/iostream.ccg
index 7ade3d68..ef19006c 100644
--- a/gio/src/iostream.ccg
+++ b/gio/src/iostream.ccg
@@ -33,7 +33,7 @@ bool IOStream::close(std::auto_ptr<Glib::Error>& error)
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  bool retvalue = g_io_stream_close(gobj(), NULL, &(gerror));
+  bool retvalue = g_io_stream_close(gobj(), 0, &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -71,7 +71,7 @@ IOStream::close_async(const SlotAsyncReady& slot, int io_priority)
 
   g_io_stream_close_async(gobj(),
                           io_priority,
-                          NULL,
+                          0,
                           &SignalProxy_async_callback,
                           slot_copy);
 }
diff --git a/gio/src/loadableicon.ccg b/gio/src/loadableicon.ccg
index 5080477c..0a506b1e 100644
--- a/gio/src/loadableicon.ccg
+++ b/gio/src/loadableicon.ccg
@@ -69,7 +69,7 @@ LoadableIcon::load(int size, Glib::ustring& type, std::auto_ptr<Glib::Error>& er
       Glib::wrap(g_loadable_icon_load(gobj(),
                  size,
                  &c_type,
-                 NULL,
+                 0,
                  &gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
@@ -112,7 +112,7 @@ LoadableIcon::load_async(int size, const SlotAsyncReady& slot)
 
   g_loadable_icon_load_async(gobj(),
                              size,
-                             NULL,
+                             0,
                              &SignalProxy_async_callback,
                              slot_copy);
 }
diff --git a/gio/src/mount.ccg b/gio/src/mount.ccg
index 1494b07e..4f821a97 100644
--- a/gio/src/mount.ccg
+++ b/gio/src/mount.ccg
@@ -134,7 +134,7 @@ void Mount::remount(const Glib::RefPtr<MountOperation>& operation, const SlotAsy
   g_mount_remount(gobj(),
                   static_cast<GMountMountFlags>(flags),
                   Glib::unwrap(operation),
-                  NULL,
+                  0,
                   &SignalProxy_async_callback,
                   slot_copy);
 }
@@ -144,19 +144,19 @@ void Mount::remount(const Glib::RefPtr<MountOperation>& operation, MountMountFla
   g_mount_remount(gobj(),
                   static_cast<GMountMountFlags>(flags),
                   Glib::unwrap(operation),
-                  NULL,
-                  NULL,
-                  NULL);
+                  0,
+                  0,
+                  0);
 }
 
 void Mount::remount(MountMountFlags flags)
 {
   g_mount_remount(gobj(),
                   static_cast<GMountMountFlags>(flags),
-                  NULL,
-                  NULL,
-                  NULL,
-                  NULL);
+                  0,
+                  0,
+                  0,
+                  0);
 }
 
 void Mount::eject(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, MountUnmountFlags flags)
@@ -263,7 +263,7 @@ void Mount::guess_content_type(const SlotAsyncReady& slot, bool force_rescan)
 
   g_mount_guess_content_type(gobj(),
                   force_rescan,
-                  NULL,
+                  0,
                   &SignalProxy_async_callback,
                   slot_copy);
 }
@@ -272,9 +272,9 @@ void Mount::guess_content_type(bool force_rescan)
 {
   g_mount_guess_content_type(gobj(),
                   force_rescan,
-                  NULL,
-                  NULL,
-                  NULL);
+                  0,
+                  0,
+                  0);
 }
 
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
@@ -300,7 +300,7 @@ void Mount::guess_content_type_sync(bool force_rescan, std::auto_ptr<Glib::Error
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
     GError* gerror = 0;
-    g_mount_guess_content_type_sync(gobj(), force_rescan, NULL, &gerror);
+    g_mount_guess_content_type_sync(gobj(), force_rescan, 0, &gerror);
   if(gerror)
 #ifndef GLIBMM_EXCEPTIONS_ENABLED
       error =
diff --git a/gio/src/networkaddress.ccg b/gio/src/networkaddress.ccg
index 8cdb3c27..b5405191 100644
--- a/gio/src/networkaddress.ccg
+++ b/gio/src/networkaddress.ccg
@@ -27,7 +27,7 @@ namespace Gio
 Glib::RefPtr<NetworkAddress>
 NetworkAddress::parse(const std::string& host_and_port, guint16 default_port)
 {
-    GError *error = NULL;
+    GError *error = 0;
     GNetworkAddress *address = G_NETWORK_ADDRESS
         (g_network_address_parse (host_and_port.c_str (), default_port,
                                                         &error));
diff --git a/gio/src/seekable.ccg b/gio/src/seekable.ccg
index d57f95da..a979ae1d 100644
--- a/gio/src/seekable.ccg
+++ b/gio/src/seekable.ccg
@@ -30,7 +30,7 @@ bool Seekable::seek(goffset offset, Glib::SeekType type, std::auto_ptr<Glib::Err
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  bool retvalue = g_seekable_seek(gobj(), offset, ((GSeekType)(type)), NULL, &(gerror));
+  bool retvalue = g_seekable_seek(gobj(), offset, ((GSeekType)(type)), 0, &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
@@ -50,7 +50,7 @@ bool Seekable::truncate(goffset offset, std::auto_ptr<Glib::Error>& error)
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 {
   GError* gerror = 0;
-  bool retvalue = g_seekable_truncate(gobj(), offset, NULL, &(gerror));
+  bool retvalue = g_seekable_truncate(gobj(), offset, 0, &(gerror));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
diff --git a/gio/src/socketaddressenumerator.ccg b/gio/src/socketaddressenumerator.ccg
index 1ff77481..d3ec4a2f 100644
--- a/gio/src/socketaddressenumerator.ccg
+++ b/gio/src/socketaddressenumerator.ccg
@@ -47,7 +47,7 @@ namespace Gio {
 #endif //GLIBMM_EXCEPTIONS_ENABLED
     {
       GError* gerror = 0;
-      Glib::RefPtr<SocketAddress> retvalue = Glib::wrap(g_socket_address_enumerator_next(gobj(), NULL, &(gerror)));
+      Glib::RefPtr<SocketAddress> retvalue = Glib::wrap(g_socket_address_enumerator_next(gobj(), 0, &(gerror)));
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
       if(gerror)
         ::Glib::Error::throw_exception(gerror);
diff --git a/gio/src/socketlistener.ccg b/gio/src/socketlistener.ccg
index 629d10f0..580bbc28 100644
--- a/gio/src/socketlistener.ccg
+++ b/gio/src/socketlistener.ccg
@@ -54,7 +54,7 @@ bool SocketListener::add_address(const Glib::RefPtr<SocketAddress>& address, Soc
 {
   GError* gerror = 0;
   bool retval;
-  GSocketAddress *retaddr = NULL;
+  GSocketAddress *retaddr = 0;
   retval = g_socket_listener_add_address (gobj(),
                                           Glib::unwrap(address),
                                           static_cast<GSocketType>(type),
@@ -82,7 +82,7 @@ bool SocketListener::add_address(const Glib::RefPtr<SocketAddress>& address, Soc
 {
   GError* gerror = 0;
   bool retval;
-  GSocketAddress *retaddr = NULL;
+  GSocketAddress *retaddr = 0;
   retval = g_socket_listener_add_address (gobj(),
                                           Glib::unwrap(address),
                                           static_cast<GSocketType>(type),
diff --git a/gio/src/volume.ccg b/gio/src/volume.ccg
index 06bbad91..2a7b6bd0 100644
--- a/gio/src/volume.ccg
+++ b/gio/src/volume.ccg
@@ -55,7 +55,7 @@ Volume::mount(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsy
   g_volume_mount(gobj(),
                  static_cast<GMountMountFlags>(flags),
                  Glib::unwrap(mount_operation),
-                 NULL, // cancellable
+                 0, // cancellable
                  &SignalProxy_async_callback,
                  slot_copy);
 }
@@ -66,9 +66,9 @@ Volume::mount(const Glib::RefPtr<MountOperation>& mount_operation, MountMountFla
   g_volume_mount(gobj(),
                  static_cast<GMountMountFlags>(flags),
                  Glib::unwrap(mount_operation),
-                 NULL, // cancellable
-                 NULL,
-                 NULL);
+                 0, // cancellable
+                 0,
+                 0);
 }
 
 void
@@ -76,10 +76,10 @@ Volume::mount(MountMountFlags flags)
 {
   g_volume_mount(gobj(),
                  static_cast<GMountMountFlags>(flags),
-                 NULL,
-                 NULL, // cancellable
-                 NULL,
-                 NULL);
+                 0,
+                 0, // cancellable
+                 0,
+                 0);
 }
 
 
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());
 }