[glibmm] Gio: More nullptr instead of 0
- From: Kjell Ahlstedt <kjellahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm] Gio: More nullptr instead of 0
- Date: Mon, 23 Nov 2015 15:46:53 +0000 (UTC)
commit 1fef2a7cb16d1cc23b632e0e1255acadf69f7329
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date: Mon Nov 23 16:41:49 2015 +0100
Gio: More nullptr instead of 0
gio/src/drive.hg | 4 +---
gio/src/file.hg | 10 +++++-----
gio/src/mount.hg | 2 +-
gio/src/resource.ccg | 2 +-
gio/src/volume.hg | 4 +---
5 files changed, 9 insertions(+), 13 deletions(-)
---
diff --git a/gio/src/drive.hg b/gio/src/drive.hg
index eaf4835..30ab250 100644
--- a/gio/src/drive.hg
+++ b/gio/src/drive.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
/* Copyright (C) 2007 The gtkmm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -207,7 +205,7 @@ struct TypeTraits< Glib::RefPtr<Gio::Drive> >
static void release_c_type (CType item)
{
- GLIBMM_DEBUG_UNREFERENCE(0, item);
+ GLIBMM_DEBUG_UNREFERENCE(nullptr, item);
g_object_unref(item);
}
};
diff --git a/gio/src/file.hg b/gio/src/file.hg
index 79b49e0..da1ba6a 100644
--- a/gio/src/file.hg
+++ b/gio/src/file.hg
@@ -1874,7 +1874,7 @@ public:
*
* @param slot A callback to call when the request is satisfied.
* @param cancellable A Cancellable object.
- * @param start_operation A MountOperation, or <tt>0</tt> to avoid user interaction.
+ * @param start_operation A MountOperation, or <tt>nullptr</tt> to avoid user interaction.
* @param flags Flags affecting the operation
*
* @newin{2,24}
@@ -1893,7 +1893,7 @@ public:
* was cancelled, a Gio::Error with CANCELLED will be thrown.
*
* @param slot A callback to call when the request is satisfied.
- * @param start_operation A MountOperation, or <tt>0</tt> to avoid user interaction.
+ * @param start_operation A MountOperation, or <tt>nullptr</tt> to avoid user interaction.
* @param flags Flags affecting the operation
*
* @newin{2,24}
@@ -1918,7 +1918,7 @@ public:
*
* @param slot A callback to call when the request is satisfied.
* @param cancellable A Cancellable object.
- * @param start_operation A MountOperation, or <tt>0</tt> to avoid user interaction.
+ * @param start_operation A MountOperation, or <tt>nullptr</tt> to avoid user interaction.
* @param flags Flags affecting the operation
*
* @newin{2,24}
@@ -1938,7 +1938,7 @@ public:
* was cancelled, a Gio::Error with CANCELLED will be thrown.
*
* @param slot A callback to call when the request is satisfied.
- * @param start_operation A MountOperation, or <tt>0</tt> to avoid user interaction.
+ * @param start_operation A MountOperation, or <tt>nullptr</tt> to avoid user interaction.
* @param flags Flags affecting the operation
*
* @newin{2,24}
@@ -2471,7 +2471,7 @@ struct TypeTraits< Glib::RefPtr<Gio::File> >
static void release_c_type (CType item)
{
- GLIBMM_DEBUG_UNREFERENCE(0, item);
+ GLIBMM_DEBUG_UNREFERENCE(nullptr, item);
g_object_unref(item);
}
};
diff --git a/gio/src/mount.hg b/gio/src/mount.hg
index 7ca1731..07ae84e 100644
--- a/gio/src/mount.hg
+++ b/gio/src/mount.hg
@@ -272,7 +272,7 @@ struct TypeTraits< Glib::RefPtr<Gio::Mount> >
static void release_c_type (CType item)
{
- GLIBMM_DEBUG_UNREFERENCE(0, item);
+ GLIBMM_DEBUG_UNREFERENCE(nullptr, item);
g_object_unref(item);
}
};
diff --git a/gio/src/resource.ccg b/gio/src/resource.ccg
index 87d08fa..f840100 100644
--- a/gio/src/resource.ccg
+++ b/gio/src/resource.ccg
@@ -68,7 +68,7 @@ void Resource::get_info_global(const std::string& path, gsize& size,
//static
void Resource::get_file_exists_global(const std::string& path, ResourceLookupFlags lookup_flags)
{
- GError* gerror = 0;
+ GError* gerror = nullptr;
g_resources_get_info(path.c_str(),
(GResourceLookupFlags)lookup_flags, nullptr, nullptr, &gerror);
if (gerror)
diff --git a/gio/src/volume.hg b/gio/src/volume.hg
index c69c3da..6d54bd8 100644
--- a/gio/src/volume.hg
+++ b/gio/src/volume.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
/* Copyright (C) 2007 The gtkmm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -219,7 +217,7 @@ struct TypeTraits< Glib::RefPtr<Gio::Volume> >
static void release_c_type (CType item)
{
- GLIBMM_DEBUG_UNREFERENCE(0, item);
+ GLIBMM_DEBUG_UNREFERENCE(nullptr, item);
g_object_unref(item);
}
};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]