[glibmm] Mention nullptr instead of NULL in documentation and some comments.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm] Mention nullptr instead of NULL in documentation and some comments.
- Date: Fri, 20 Nov 2015 09:37:36 +0000 (UTC)
commit f054030cf0847d086437e0563c41dcaa54431bce
Author: Murray Cumming <murrayc murrayc com>
Date: Thu Nov 19 13:53:00 2015 +0100
Mention nullptr instead of NULL in documentation and some comments.
gio/src/asyncinitable.hg | 2 +-
gio/src/datainputstream.hg | 2 +-
gio/src/dbusownname.hg | 2 +-
gio/src/emblemedicon.hg | 2 +-
gio/src/file.hg | 2 +-
gio/src/initable.hg | 2 +-
gio/src/loadableicon.hg | 2 +-
gio/src/settings.hg | 4 +-
glib/src/spawn.hg | 62 ++++++++++++++++++++++----------------------
9 files changed, 40 insertions(+), 40 deletions(-)
---
diff --git a/gio/src/asyncinitable.hg b/gio/src/asyncinitable.hg
index 190fc5e..6d7d90f 100644
--- a/gio/src/asyncinitable.hg
+++ b/gio/src/asyncinitable.hg
@@ -45,7 +45,7 @@ class Cancellable;
* method directly; instead it will be used automatically in various ways. For
* C applications you generally just call g_async_initable_new_async()
* directly, or indirectly via a foo_thing_new_async() wrapper. This will call
- * g_async_initable_init_async() under the cover, calling back with NULL and a
+ * g_async_initable_init_async() under the cover, calling back with nullptr and a
* set GError on failure.
*/
class AsyncInitable : public Glib::Interface
diff --git a/gio/src/datainputstream.hg b/gio/src/datainputstream.hg
index 6898fbf..0b5a8bc 100644
--- a/gio/src/datainputstream.hg
+++ b/gio/src/datainputstream.hg
@@ -64,7 +64,7 @@ public:
_WRAP_METHOD(guint64 read_uint64(const Glib::RefPtr<Cancellable>& cancellable{?}),
g_data_input_stream_read_uint64, errthrow)
- //Note that we return a bool because we can't use std::string to distinguish between an empty string and a
NULL.
+ //Note that we return a bool because we can't use std::string to distinguish between an empty string and a
nullptr.
/** Reads a line from the data input stream.
*
diff --git a/gio/src/dbusownname.hg b/gio/src/dbusownname.hg
index d34be5d..6613b70 100644
--- a/gio/src/dbusownname.hg
+++ b/gio/src/dbusownname.hg
@@ -62,7 +62,7 @@ typedef sigc::slot<void, const Glib::RefPtr<Gio::DBus::Connection>&, Glib::ustri
* name_lost_slot slots will be invoked after calling this function - there
* are three possible cases:
*
- * - @a name_lost_slot with a NULL connection (if a connection to the bus
+ * - @a name_lost_slot with a nullptr connection (if a connection to the bus
* can't be made).
* - @a bus_acquired_slot then @a name_lost_slot (if the name can't be
* obtained)
diff --git a/gio/src/emblemedicon.hg b/gio/src/emblemedicon.hg
index 66e79c6..6b22147 100644
--- a/gio/src/emblemedicon.hg
+++ b/gio/src/emblemedicon.hg
@@ -46,7 +46,7 @@ class EmblemedIcon
_IMPLEMENTS_INTERFACE(Icon)
protected:
- //We have this constructor because g_emblemed_icon_new() may take a NULL emblem parameter.
+ //We have this constructor because g_emblemed_icon_new() may take a nullptr emblem parameter.
/** Creates a new emblemed icon for @a icon with no emblem.
* @param icon An Icon.
*
diff --git a/gio/src/file.hg b/gio/src/file.hg
index 27b991c..79b49e0 100644
--- a/gio/src/file.hg
+++ b/gio/src/file.hg
@@ -2099,7 +2099,7 @@ public:
*/
typedef sigc::slot<bool, const char*, goffset> SlotReadMore;
- //Note that slot_read_more can be NULL but that would not be a useful method overload, because the
documentation says that it would
+ //Note that slot_read_more can be nullptr but that would not be a useful method overload, because the
documentation says that it would
//then be equivalent to load_contents_async.
/** Reads the partial contents of a file.
diff --git a/gio/src/initable.hg b/gio/src/initable.hg
index 535c647..f47f678 100644
--- a/gio/src/initable.hg
+++ b/gio/src/initable.hg
@@ -42,7 +42,7 @@ namespace Gio
* method directly, instead it will be used automatically in various ways. For C
* applications you generally just call g_initable_new() directly, or indirectly
* via a foo_thing_new() wrapper. This will call g_initable_init() under the
- * cover, returning NULL and setting a GError on failure.
+ * cover, returning nullptr and setting a GError on failure.
*
* For bindings in languages where the native constructor supports exceptions
* the binding could check for objects implemention GInitable during normal
diff --git a/gio/src/loadableicon.hg b/gio/src/loadableicon.hg
index 54b1fff..134d93e 100644
--- a/gio/src/loadableicon.hg
+++ b/gio/src/loadableicon.hg
@@ -54,7 +54,7 @@ public:
/** Non-cancellable version of load()
*/
Glib::RefPtr<InputStream> load(int size, Glib::ustring& type);
- //TODO: 'type' can be NULL as well, but I don't really want to add 2 more
+ //TODO: 'type' can be nullptr as well, but I don't really want to add 2 more
//overloads -- one cancellable, and one not...
/**
diff --git a/gio/src/settings.hg b/gio/src/settings.hg
index 7d48e72..aafa243 100644
--- a/gio/src/settings.hg
+++ b/gio/src/settings.hg
@@ -70,8 +70,8 @@ public:
void get_value(const Glib::ustring& key, Glib::VariantBase& value) const;
_IGNORE(g_settings_get_value)
- //TODO: We've added a bool return to handle the NULL return value case,
- //but maybe other get_value() methods can return NULLs too.
+ //TODO: We've added a bool return to handle the nullptr return value case,
+ //but maybe other get_value() methods can return nullptrs too.
/** Checks the "user value" of a @a key, if there is one.
*
diff --git a/glib/src/spawn.hg b/glib/src/spawn.hg
index c10e44b..830ad9e 100644
--- a/glib/src/spawn.hg
+++ b/glib/src/spawn.hg
@@ -111,13 +111,13 @@ typedef sigc::slot<void> SlotSpawnChildSetup;
* will be looked for in the user's PATH.
* SPAWN_STDOUT_TO_DEV_NULL means that the child's standard output will
* be discarded, instead of going to the same location as the parent's
- * standard output. If you use this flag, @a standard_output must be NULL.
+ * standard output. If you use this flag, @a standard_output must be nullptr.
* SPAWN_STDERR_TO_DEV_NULL means that the child's standard error
* will be discarded, instead of going to the same location as the parent's
- * standard error. If you use this flag, @a standard_error must be NULL.
+ * standard error. If you use this flag, @a standard_error must be nullptr.
* SPAWN_CHILD_INHERITS_STDIN means that the child will inherit the parent's
* standard input (by default, the child's standard input is attached to
- * /dev/null). If you use this flag, @a standard_input must be NULL.
+ * /dev/null). If you use this flag, @a standard_input must be nullptr.
* G_SPAWN_FILE_AND_ARGV_ZERO means that the first element of @a argv is
* the file to execute, while the remaining elements are the
* actual argument vector to pass to the file. Normally
@@ -138,7 +138,7 @@ typedef sigc::slot<void> SlotSpawnChildSetup;
* process. You should carefully consider what you do in @a child_setup
* if you intend your software to be portable to Windows.
*
- * If non-NULL, @a child_pid will on Unix be filled with the child's
+ * If non-nullptr, @a child_pid will on Unix be filled with the child's
* process ID. You can use the process ID to send signals to the
* child, or to use child_watch_add() (or waitpid()) if you specified the
* SPAWN_DO_NOT_REAP_CHILD flag. On Windows, @a child_pid will be
@@ -149,25 +149,25 @@ typedef sigc::slot<void> SlotSpawnChildSetup;
* exit code with GetExitCodeProcess(). You should close the handle
* with CloseHandle() or spawn_close_pid() when you no longer need it.
*
- * If non-NULL, the @a standard_input, @a standard_output, @a standard_error
+ * If non-nullptr, the @a standard_input, @a standard_output, @a standard_error
* locations will be filled with file descriptors for writing to the child's
* standard input or reading from its standard output or standard error.
* The caller of pawn_async_with_pipes() must close these file descriptors
- * when they are no longer in use. If these parameters are NULL, the corresponding
+ * when they are no longer in use. If these parameters are nullptr, the corresponding
* pipe won't be created.
*
- * If @a standard_input is NULL, the child's standard input is attached to
+ * If @a standard_input is nullptr, the child's standard input is attached to
* /dev/null unless SPAWN_CHILD_INHERITS_STDIN is set.
*
- * If @a standard_error is NULL, the child's standard error goes to the same
+ * If @a standard_error is nullptr, the child's standard error goes to the same
* location as the parent's standard error unless SPAWN_STDERR_TO_DEV_NULL
* is set.
*
- * If @a standard_output is NULL, the child's standard output goes to the same
+ * If @a standard_output is nullptr, the child's standard output goes to the same
* location as the parent's standard output unless SPAWN_STDOUT_TO_DEV_NULL
* is set.
*
- * If @a child_pid is not NULL and an error does not occur then the returned
+ * If @a child_pid is not nullptr and an error does not occur then the returned
* pid must be closed using spawn_close_pid().
*
* @note
@@ -181,10 +181,10 @@ typedef sigc::slot<void> SlotSpawnChildSetup;
* @param envp Child's environment.
* @param flags Flags from SpawnFlags
* @param child_setup Slot to run in the child just before exec(), or an empty slot.
- * @param child_pid Return location for child process ID, or NULL.
- * @param standard_input Return location for file descriptor to write to child's stdin, or NULL.
- * @param standard_output Return location for file descriptor to read child's stdout, or NULL.
- * @param standard_error Return location for file descriptor to read child's stderr, or NULL.
+ * @param child_pid Return location for child process ID, or nullptr.
+ * @param standard_input Return location for file descriptor to write to child's stdin, or nullptr.
+ * @param standard_output Return location for file descriptor to read child's stdout, or nullptr.
+ * @param standard_error Return location for file descriptor to read child's stderr, or nullptr.
*
* @throws SpawnError Errors are reported even if they occur in the child (for example if the
* executable in argv[0] is not found). Typically
@@ -208,10 +208,10 @@ void spawn_async_with_pipes(const std::string& working_directory,
* @param argv Child's argument vector.
* @param flags Flags from SpawnFlags
* @param child_setup Slot to run in the child just before exec(), or an empty slot.
- * @param child_pid Return location for child process ID, or NULL.
- * @param standard_input Return location for file descriptor to write to child's stdin, or NULL.
- * @param standard_output Return location for file descriptor to read child's stdout, or NULL.
- * @param standard_error Return location for file descriptor to read child's stderr, or NULL.
+ * @param child_pid Return location for child process ID, or nullptr.
+ * @param standard_input Return location for file descriptor to write to child's stdin, or nullptr.
+ * @param standard_output Return location for file descriptor to read child's stdout, or nullptr.
+ * @param standard_error Return location for file descriptor to read child's stderr, or nullptr.
*
* @throws SpawnError Errors are reported even if they occur in the child (for example if the
* executable in argv[0] is not found). Typically
@@ -242,7 +242,7 @@ void spawn_async_with_pipes(const std::string& working_directory,
* @param envp Child's environment.
* @param flags Flags from SpawnFlags.
* @param child_setup Slot to run in the child just before exec(), or an empty slot.
- * @param child_pid Return location for child process ID, or NULL
+ * @param child_pid Return location for child process ID, or nullptr
*
* @throws SpawnError Errors are reported even if they occur in the child (for example if the
* executable in argv[0] is not found). Typically
@@ -262,7 +262,7 @@ void spawn_async(const std::string& working_directory,
* @param argv Child's argument vector.
* @param flags Flags from SpawnFlags.
* @param child_setup Slot to run in the child just before exec(), or an empty slot.
- * @param child_pid Return location for child process ID, or NULL
+ * @param child_pid Return location for child process ID, or nullptr
*
* @throws SpawnError Errors are reported even if they occur in the child (for example if the
* executable in argv[0] is not found). Typically
@@ -277,13 +277,13 @@ void spawn_async(const std::string& working_directory,
/** Executes a child synchronously (waits for the child to exit before returning).
* All output from the child is stored in @a standard_output and @a standard_error,
- * if those parameters are non-NULL. Note that you must set the
+ * if those parameters are non-nullptr. Note that you must set the
* SPAWN_STDOUT_TO_DEV_NULL and SPAWN_STDERR_TO_DEV_NULL flags when
- * passing NULL for @a standard_output and @a standard_error.
- * If @a exit_status is non-NULL, the exit status of the child is stored
+ * passing nullptr for @a standard_output and @a standard_error.
+ * If @a exit_status is non-nullptr, the exit status of the child is stored
* there as it would be returned by waitpid(); standard UNIX macros such
* as WIFEXITED() and WEXITSTATUS() must be used to evaluate the exit status.
- * Note that this function calls waitpid() even if @a exit_status is NULL, and
+ * Note that this function calls waitpid() even if @a exit_status is nullptr, and
* does not accept the SPAWN_DO_NOT_REAP_CHILD flag.
* If an error occurs, no data is returned in @a standard_output,
* @a standard_error, or @a exit_status.
@@ -297,9 +297,9 @@ void spawn_async(const std::string& working_directory,
* @param envp Child's environment.
* @param flags Flags from SpawnFlags
* @param child_setup Slot to run in the child just before exec(), or an empty slot.
- * @param standard_output Return location for file descriptor to read child's stdout, or NULL.
- * @param standard_error Return location for file descriptor to read child's stderr, or NULL.
- * @param exit_status Return location for child exit status, as returned by waitpid(), or NULL
+ * @param standard_output Return location for file descriptor to read child's stdout, or nullptr.
+ * @param standard_error Return location for file descriptor to read child's stderr, or nullptr.
+ * @param exit_status Return location for child exit status, as returned by waitpid(), or nullptr
*
* @throws SpawnError Errors are reported even if they occur in the child (for example if the
* executable in argv[0] is not found). Typically
@@ -322,9 +322,9 @@ void spawn_sync(const std::string& working_directory,
* @param argv Child's argument vector.
* @param flags Flags from SpawnFlags
* @param child_setup Slot to run in the child just before exec(), or an empty slot.
- * @param standard_output Return location for file descriptor to read child's stdout, or NULL.
- * @param standard_error Return location for file descriptor to read child's stderr, or NULL.
- * @param exit_status Return location for child exit status, as returned by waitpid(), or NULL
+ * @param standard_output Return location for file descriptor to read child's stdout, or nullptr.
+ * @param standard_error Return location for file descriptor to read child's stderr, or nullptr.
+ * @param exit_status Return location for child exit status, as returned by waitpid(), or nullptr
*
* @throws SpawnError Errors are reported even if they occur in the child (for example if the
* executable in argv[0] is not found). Typically
@@ -367,7 +367,7 @@ void spawn_command_line_async(const std::string& command_line);
* implications, so consider using spawn_sync() directly if
* appropriate.
*
- * If @a exit_status is non-NULL, the exit status of the child is stored there as
+ * If @a exit_status is non-nullptr, the exit status of the child is stored there as
* it would be returned by waitpid(); standard UNIX macros such as WIFEXITED()
* and WEXITSTATUS() must be used to evaluate the exit status.
*
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]