[vte/vte-0-44] lib: Use nullptr as sentinel instead of NULL



commit a17b9e3a968e72e327db25e4d64c109cf560fb5e
Author: Anthony G. Basile <blueness gentoo org>
Date:   Mon Feb 29 18:20:27 2016 +0100

    lib: Use nullptr as sentinel instead of NULL
    
    On some non-GCC/GLIBC systems, NULL may not be a suitable 0 pointer constant.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=762863
    (cherry picked from commit a9fa01991ab7fb068af6d2a81691f32b44b91a9c)

 src/pty.cc     |    2 +-
 src/vte.cc     |    6 +++---
 src/vtedraw.cc |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/pty.cc b/src/pty.cc
index 44d28a3..ea88c77 100644
--- a/src/pty.cc
+++ b/src/pty.cc
@@ -300,7 +300,7 @@ __vte_pty_merge_environ (char **envp,
        array = g_ptr_array_sized_new (g_hash_table_size (table) + 1);
         g_hash_table_iter_init(&iter, table);
         while (g_hash_table_iter_next(&iter, (void**) &name, (void**) &value)) {
-                g_ptr_array_add (array, g_strconcat (name, "=", value, NULL));
+                g_ptr_array_add (array, g_strconcat (name, "=", value, nullptr));
         }
         g_assert(g_hash_table_size(table) == array->len);
        g_hash_table_destroy (table);
diff --git a/src/vte.cc b/src/vte.cc
index 6f2f99d..b1e4ba1 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -7234,7 +7234,7 @@ VteTerminalPrivate::widget_button_press(GdkEventButton *event)
 
                                 g_object_get (gtk_widget_get_settings(m_widget),
                                               "gtk-enable-primary-paste",
-                                              &do_paste, NULL);
+                                              &do_paste, nullptr);
                                 if (do_paste)
                                         vte_terminal_paste_primary(m_terminal);
                                handled = do_paste;
@@ -8337,7 +8337,7 @@ VteTerminalPrivate::widget_settings_notify()
                      "gtk-cursor-blink", &blink,
                      "gtk-cursor-blink-time", &blink_time,
                      "gtk-cursor-blink-timeout", &blink_timeout,
-                     NULL);
+                     (void *)NULL);
 
         _vte_debug_print(VTE_DEBUG_MISC,
                          "Cursor blinking settings: blink=%d time=%d timeout=%d\n",
@@ -9985,7 +9985,7 @@ VteTerminalPrivate::update_cursor_blinks()
                 gboolean v;
                 g_object_get(gtk_widget_get_settings(m_widget),
                                                      "gtk-cursor-blink",
-                                                     &v, NULL);
+                                                     &v, nullptr);
                 blink = v != FALSE;
                 break;
         case VTE_CURSOR_BLINK_ON:
diff --git a/src/vtedraw.cc b/src/vtedraw.cc
index ba2755e..a47efae 100644
--- a/src/vtedraw.cc
+++ b/src/vtedraw.cc
@@ -651,7 +651,7 @@ font_info_create_for_screen (GdkScreen                  *screen,
 {
        GtkSettings *settings = gtk_settings_get_for_screen (screen);
        int fontconfig_timestamp;
-       g_object_get (settings, "gtk-fontconfig-timestamp", &fontconfig_timestamp, NULL);
+       g_object_get (settings, "gtk-fontconfig-timestamp", &fontconfig_timestamp, nullptr);
        return font_info_create_for_context (gdk_pango_context_get_for_screen (screen),
                                             desc, language, fontconfig_timestamp);
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]