summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Persch <chpe@src.gnome.org>2021-05-21 23:19:46 +0200
committerChristian Persch <chpe@src.gnome.org>2021-05-21 23:19:46 +0200
commit3eb9350d2efcdc513d07d4e1e61b6e277bc52354 (patch)
tree67d8200cdb5481e34ef4fca90a3e31ec5e54cdbb
parent431a0e2a7b146157386da3066aa99ce0793a6db8 (diff)
downloadgnome-terminal-3eb9350d2efcdc513d07d4e1e61b6e277bc52354.tar.gz
all: s/NULL/nullptr/g
Diffstat
-rw-r--r--src/eggshell.cc8
-rw-r--r--src/profile-editor.cc80
-rw-r--r--src/server.cc24
-rw-r--r--src/terminal-accels.cc162
-rw-r--r--src/terminal-app.cc128
-rw-r--r--src/terminal-client-utils.cc16
-rw-r--r--src/terminal-gdbus.cc74
-rw-r--r--src/terminal-icon-button.cc2
-rw-r--r--src/terminal-info-bar.cc4
-rw-r--r--src/terminal-libgsystem.hh34
-rw-r--r--src/terminal-mdi-container.cc20
-rw-r--r--src/terminal-menu-button.cc2
-rw-r--r--src/terminal-nautilus.cc94
-rw-r--r--src/terminal-notebook.cc20
-rw-r--r--src/terminal-options.cc234
-rw-r--r--src/terminal-options.hh2
-rw-r--r--src/terminal-prefs.cc138
-rw-r--r--src/terminal-profiles-list.cc54
-rw-r--r--src/terminal-regex.cc144
-rw-r--r--src/terminal-regex.hh4
-rw-r--r--src/terminal-screen-container.cc28
-rw-r--r--src/terminal-screen.cc230
-rw-r--r--src/terminal-search-popover.cc38
-rw-r--r--src/terminal-search-provider.cc60
-rw-r--r--src/terminal-settings-list.cc144
-rw-r--r--src/terminal-tab-label.cc20
-rw-r--r--src/terminal-util.cc284
-rw-r--r--src/terminal-window.cc380
-rw-r--r--src/terminal.cc96
29 files changed, 1262 insertions, 1262 deletions
diff --git a/src/eggshell.cc b/src/eggshell.cc
index 4ac33c1d..b0926ebf 100644
--- a/src/eggshell.cc
+++ b/src/eggshell.cc
@@ -71,7 +71,7 @@ egg_shell (const char *shell)
if (geteuid () == getuid () &&
getegid () == getgid ()) {
/* only in non-setuid */
- if (shell != NULL) {
+ if (shell != nullptr) {
if (access (shell, X_OK) == 0) {
return g_strdup (shell);
}
@@ -94,7 +94,7 @@ egg_shell (const char *shell)
g_assert_not_reached ();
/* Placate compiler. */
- return NULL;
+ return nullptr;
#else
/* g_find_program_in_path() always looks also in the Windows
* and System32 directories, so it should always find either cmd.exe
@@ -102,10 +102,10 @@ egg_shell (const char *shell)
*/
char *retval = g_find_program_in_path ("cmd.exe");
- if (retval == NULL)
+ if (retval == nullptr)
retval = g_find_program_in_path ("command.com");
- g_assert (retval != NULL);
+ g_assert (retval != nullptr);
return retval;
#endif
diff --git a/src/profile-editor.cc b/src/profile-editor.cc
index 1c73bde3..a99fb892 100644
--- a/src/profile-editor.cc
+++ b/src/profile-editor.cc
@@ -532,9 +532,9 @@ palette_color_notify_cb (GtkColorButton *button,
gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (button), &color);
i = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (button), "palette-entry-index"));
- g_signal_handlers_block_by_func (profile, (void*)profile_palette_notify_colorpickers_cb, NULL);
+ g_signal_handlers_block_by_func (profile, (void*)profile_palette_notify_colorpickers_cb, nullptr);
modify_palette_entry (profile, i, &color);
- g_signal_handlers_unblock_by_func (profile, (void*)profile_palette_notify_colorpickers_cb, NULL);
+ g_signal_handlers_unblock_by_func (profile, (void*)profile_palette_notify_colorpickers_cb, nullptr);
}
static void
@@ -569,14 +569,14 @@ static void
custom_command_entry_changed_cb (GtkEntry *entry)
{
const char *command;
- gs_free_error GError *error = NULL;
+ gs_free_error GError *error = nullptr;
command = gtk_entry_get_text (entry);
if (command[0] == '\0' ||
- g_shell_parse_argv (command, NULL, NULL, &error))
+ g_shell_parse_argv (command, nullptr, nullptr, &error))
{
- gtk_entry_set_icon_from_icon_name (entry, GTK_ENTRY_ICON_SECONDARY, NULL);
+ gtk_entry_set_icon_from_icon_name (entry, GTK_ENTRY_ICON_SECONDARY, nullptr);
}
else
{
@@ -630,7 +630,7 @@ tree_model_id_to_iter_recurse (GtkTreeModel *model,
tree_model_id_to_iter_recurse (model, id_column, active_id, &child_iter, result_iter))
return TRUE;
- gs_free char *id = NULL;
+ gs_free char *id = nullptr;
gtk_tree_model_get (model, iter, id_column, &id, -1);
if (g_strcmp0 (id, active_id) == 0) {
*result_iter = *iter;
@@ -662,12 +662,12 @@ profile_encoding_combo_changed_cb (GtkComboBox *combo,
if (!gtk_combo_box_get_active_iter(combo, &iter))
return;
- gs_free char *encoding = NULL;
+ gs_free char *encoding = nullptr;
gtk_tree_model_get(gtk_combo_box_get_model(combo),
&iter,
ENCODINGS_COL_ID, &encoding,
-1);
- if (encoding == NULL)
+ if (encoding == nullptr)
return;
g_signal_handlers_block_by_func (profile, (void*)profile_notify_encoding_combo_cb, combo);
@@ -680,7 +680,7 @@ profile_notify_encoding_combo_cb (GSettings *profile,
const char *key,
GtkComboBox *combo)
{
- gs_free char *encoding = NULL;
+ gs_free char *encoding = nullptr;
g_settings_get(profile, key, "s", &encoding);
g_signal_handlers_block_by_func (combo, (void*)profile_encoding_combo_changed_cb, profile);
@@ -723,7 +723,7 @@ init_color_scheme_menu (GtkWidget *widget)
renderer = gtk_cell_renderer_text_new ();
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (widget), renderer, TRUE);
- gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (widget), renderer, "text", 0, NULL);
+ gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (widget), renderer, "text", 0, nullptr);
}
typedef enum {
@@ -824,9 +824,9 @@ append_encodings_for_group (GtkTreeStore *store,
if (submenu) {
gtk_tree_store_insert_with_values (store,
&parent_iter,
- NULL,
+ nullptr,
-1,
- ENCODINGS_COL_ID, NULL,
+ ENCODINGS_COL_ID, nullptr,
ENCODINGS_COL_TEXT, _(encodings_group_names[group].name),
-1);
}
@@ -841,7 +841,7 @@ append_encodings_for_group (GtkTreeStore *store,
GtkTreeIter iter;
gtk_tree_store_insert_with_values (store,
&iter,
- submenu ? &parent_iter : NULL,
+ submenu ? &parent_iter : nullptr,
-1,
ENCODINGS_COL_ID, encodings[i].charset,
ENCODINGS_COL_TEXT, name,
@@ -891,11 +891,11 @@ rgba_to_s (const GValue *value,
gpointer user_data)
{
GdkRGBA *color;
- gs_free char *s = NULL;
+ gs_free char *s = nullptr;
color = reinterpret_cast<GdkRGBA*>(g_value_get_boxed (value));
- if (color == NULL)
- return NULL;
+ if (color == nullptr)
+ return nullptr;
s = gdk_rgba_to_string (color);
return g_variant_new_string (s);
@@ -908,7 +908,7 @@ string_to_enum (GValue *value,
{
GType (* get_type) (void) = (GType (*)(void))user_data;
GEnumClass *klass;
- GEnumValue *eval = NULL;
+ GEnumValue *eval = nullptr;
const char *s;
guint i;
@@ -928,7 +928,7 @@ string_to_enum (GValue *value,
g_type_class_unref (klass);
- return eval != NULL;
+ return eval != nullptr;
}
static GVariant *
@@ -938,10 +938,10 @@ enum_to_string (const GValue *value,
{
GType (* get_type) (void) = (GType (*)(void))user_data;
GEnumClass *klass;
- GEnumValue *eval = NULL;
+ GEnumValue *eval = nullptr;
int val;
guint i;
- GVariant *variant = NULL;
+ GVariant *variant = nullptr;
val = g_value_get_int (value);
@@ -1075,10 +1075,10 @@ profile_prefs_load (const char *uuid, GSettings *profile)
profile);
}
- profile_palette_notify_colorpickers_cb (profile, TERMINAL_PROFILE_PALETTE_KEY, NULL);
+ profile_palette_notify_colorpickers_cb (profile, TERMINAL_PROFILE_PALETTE_KEY, nullptr);
profile_prefs_signal_connect (profile, "changed::" TERMINAL_PROFILE_PALETTE_KEY,
G_CALLBACK (profile_palette_notify_colorpickers_cb),
- NULL);
+ nullptr);
w = (GtkWidget *) gtk_builder_get_object (builder, "palette-combobox");
profile_prefs_signal_connect (w, "notify::active",
@@ -1096,7 +1096,7 @@ profile_prefs_load (const char *uuid, GSettings *profile)
G_CALLBACK (color_scheme_combo_changed_cb),
profile);
- profile_colors_notify_scheme_combo_cb (profile, NULL, GTK_COMBO_BOX (w));
+ profile_colors_notify_scheme_combo_cb (profile, nullptr, GTK_COMBO_BOX (w));
profile_prefs_signal_connect (profile, "changed::" TERMINAL_PROFILE_FOREGROUND_COLOR_KEY,
G_CALLBACK (profile_colors_notify_scheme_combo_cb),
w);
@@ -1107,7 +1107,7 @@ profile_prefs_load (const char *uuid, GSettings *profile)
w = GTK_WIDGET (gtk_builder_get_object (builder, "custom-command-entry"));
custom_command_entry_changed_cb (GTK_ENTRY (w));
profile_prefs_signal_connect (w, "changed",
- G_CALLBACK (custom_command_entry_changed_cb), NULL);
+ G_CALLBACK (custom_command_entry_changed_cb), nullptr);
profile_prefs_signal_connect (gtk_builder_get_object (builder, "reset-compat-defaults-button"),
"clicked",
@@ -1123,7 +1123,7 @@ profile_prefs_load (const char *uuid, GSettings *profile)
G_SETTINGS_BIND_SET),
(GSettingsBindGetMapping) s_to_rgba,
(GSettingsBindSetMapping) rgba_to_s,
- NULL, NULL);
+ nullptr, nullptr);
profile_prefs_settings_bind_with_mapping (profile,
TERMINAL_PROFILE_BACKSPACE_BINDING_KEY,
@@ -1134,7 +1134,7 @@ profile_prefs_load (const char *uuid, GSettings *profile)
G_SETTINGS_BIND_SET),
(GSettingsBindGetMapping) string_to_enum,
(GSettingsBindSetMapping) enum_to_string,
- vte_erase_binding_get_type, NULL);
+ vte_erase_binding_get_type, nullptr);
profile_prefs_settings_bind (profile,
TERMINAL_PROFILE_BOLD_IS_BRIGHT_KEY,
gtk_builder_get_object (builder, "bold-is-bright-checkbutton"),
@@ -1164,7 +1164,7 @@ profile_prefs_load (const char *uuid, GSettings *profile)
G_SETTINGS_BIND_NO_SENSITIVITY),
(GSettingsBindGetMapping) s_to_rgba,
(GSettingsBindSetMapping) rgba_to_s,
- NULL, NULL);
+ nullptr, nullptr);
w = GTK_WIDGET (gtk_builder_get_object (builder, "cell-height-scale-spinbutton"));
profile_prefs_settings_bind (profile, TERMINAL_PROFILE_CELL_HEIGHT_SCALE_KEY,
@@ -1201,7 +1201,7 @@ profile_prefs_load (const char *uuid, GSettings *profile)
G_SETTINGS_BIND_NO_SENSITIVITY),
(GSettingsBindGetMapping) s_to_rgba,
(GSettingsBindSetMapping) rgba_to_s,
- NULL, NULL);
+ nullptr, nullptr);
w = GTK_WIDGET (gtk_builder_get_object (builder, "cursor-background-colorpicker"));
profile_prefs_settings_bind (profile, TERMINAL_PROFILE_CURSOR_COLORS_SET_KEY,
@@ -1217,7 +1217,7 @@ profile_prefs_load (const char *uuid, GSettings *profile)
G_SETTINGS_BIND_NO_SENSITIVITY),
(GSettingsBindGetMapping) s_to_rgba,
(GSettingsBindSetMapping) rgba_to_s,
- NULL, NULL);
+ nullptr, nullptr);
profile_prefs_settings_bind (profile, TERMINAL_PROFILE_HIGHLIGHT_COLORS_SET_KEY,
gtk_builder_get_object (builder,
@@ -1240,7 +1240,7 @@ profile_prefs_load (const char *uuid, GSettings *profile)
G_SETTINGS_BIND_NO_SENSITIVITY),
(GSettingsBindGetMapping) s_to_rgba,
(GSettingsBindSetMapping) rgba_to_s,
- NULL, NULL);
+ nullptr, nullptr);
w = GTK_WIDGET (gtk_builder_get_object (builder, "highlight-background-colorpicker"));
profile_prefs_settings_bind (profile, TERMINAL_PROFILE_HIGHLIGHT_COLORS_SET_KEY,
@@ -1256,7 +1256,7 @@ profile_prefs_load (const char *uuid, GSettings *profile)
G_SETTINGS_BIND_NO_SENSITIVITY),
(GSettingsBindGetMapping) s_to_rgba,
(GSettingsBindSetMapping) rgba_to_s,
- NULL, NULL);
+ nullptr, nullptr);
profile_prefs_settings_bind_with_mapping (profile, TERMINAL_PROFILE_CURSOR_SHAPE_KEY,
gtk_builder_get_object (builder,
@@ -1266,7 +1266,7 @@ profile_prefs_load (const char *uuid, GSettings *profile)
G_SETTINGS_BIND_SET),
(GSettingsBindGetMapping) string_to_enum,
(GSettingsBindSetMapping) enum_to_string,
- vte_cursor_shape_get_type, NULL);
+ vte_cursor_shape_get_type, nullptr);
profile_prefs_settings_bind_with_mapping (profile, TERMINAL_PROFILE_CURSOR_BLINK_MODE_KEY,
gtk_builder_get_object (builder,
"cursor-blink-mode-combobox"),
@@ -1275,7 +1275,7 @@ profile_prefs_load (const char *uuid, GSettings *profile)
G_SETTINGS_BIND_SET),
(GSettingsBindGetMapping) string_to_enum,
(GSettingsBindSetMapping) enum_to_string,
- vte_cursor_blink_mode_get_type, NULL);
+ vte_cursor_blink_mode_get_type, nullptr);
profile_prefs_settings_bind_with_mapping (profile, TERMINAL_PROFILE_TEXT_BLINK_MODE_KEY,
gtk_builder_get_object (builder,
"text-blink-mode-combobox"),
@@ -1284,7 +1284,7 @@ profile_prefs_load (const char *uuid, GSettings *profile)
G_SETTINGS_BIND_SET),
(GSettingsBindGetMapping) string_to_enum,
(GSettingsBindSetMapping) enum_to_string,
- vte_text_blink_mode_get_type, NULL);
+ vte_text_blink_mode_get_type, nullptr);
profile_prefs_settings_bind (profile, TERMINAL_PROFILE_CUSTOM_COMMAND_KEY,
gtk_builder_get_object (builder,
@@ -1315,7 +1315,7 @@ profile_prefs_load (const char *uuid, GSettings *profile)
G_SETTINGS_BIND_SET),
(GSettingsBindGetMapping) string_to_enum,
(GSettingsBindSetMapping) enum_to_string,
- vte_erase_binding_get_type, NULL);
+ vte_erase_binding_get_type, nullptr);
profile_prefs_settings_bind_with_mapping (profile, TERMINAL_PROFILE_EXIT_ACTION_KEY,
gtk_builder_get_object (builder,
"exit-action-combobox"),
@@ -1324,9 +1324,9 @@ profile_prefs_load (const char *uuid, GSettings *profile)
G_SETTINGS_BIND_SET),
(GSettingsBindGetMapping) string_to_enum,
(GSettingsBindSetMapping) enum_to_string,
- terminal_exit_action_get_type, NULL);
+ terminal_exit_action_get_type, nullptr);
w = (GtkWidget*) gtk_builder_get_object (builder, "font-selector");
- gtk_font_chooser_set_filter_func (GTK_FONT_CHOOSER (w), monospace_filter, NULL, NULL);
+ gtk_font_chooser_set_filter_func (GTK_FONT_CHOOSER (w), monospace_filter, nullptr, nullptr);
#if GTK_CHECK_VERSION (3, 24, 0)
gtk_font_chooser_set_level (GTK_FONT_CHOOSER (w),
GtkFontChooserLevel(GTK_FONT_CHOOSER_LEVEL_FAMILY |
@@ -1348,7 +1348,7 @@ profile_prefs_load (const char *uuid, GSettings *profile)
G_SETTINGS_BIND_SET),
(GSettingsBindGetMapping) s_to_rgba,
(GSettingsBindSetMapping) rgba_to_s,
- NULL, NULL);
+ nullptr, nullptr);
profile_prefs_settings_bind (profile, TERMINAL_PROFILE_LOGIN_SHELL_KEY,
gtk_builder_get_object (builder,
@@ -1387,7 +1387,7 @@ profile_prefs_load (const char *uuid, GSettings *profile)
G_SETTINGS_BIND_SET),
(GSettingsBindGetMapping) scrollbar_policy_to_bool,
(GSettingsBindSetMapping) bool_to_scrollbar_policy,
- NULL, NULL);
+ nullptr, nullptr);
profile_prefs_settings_bind (profile, TERMINAL_PROFILE_SCROLL_ON_KEYSTROKE_KEY,
gtk_builder_get_object (builder,
"scroll-on-keystroke-checkbutton"),
@@ -1415,7 +1415,7 @@ profile_prefs_load (const char *uuid, GSettings *profile)
G_SETTINGS_BIND_SET),
(GSettingsBindGetMapping) string_to_enum,
(GSettingsBindSetMapping) enum_to_string,
- terminal_preserve_working_directory_get_type, NULL);
+ terminal_preserve_working_directory_get_type, nullptr);
profile_prefs_settings_bind (profile, TERMINAL_PROFILE_USE_CUSTOM_COMMAND_KEY,
gtk_builder_get_object (builder,
diff --git a/src/server.cc b/src/server.cc
index eb6191a8..358d62ae 100644
--- a/src/server.cc
+++ b/src/server.cc
@@ -42,7 +42,7 @@
#include "terminal-defines.hh"
#include "terminal-libgsystem.hh"
-static char *app_id = NULL;
+static char *app_id = nullptr;
#define INACTIVITY_TIMEOUT (100 /* ms */)
@@ -67,7 +67,7 @@ option_app_id_cb (const gchar *option_name,
static const GOptionEntry options[] = {
{ "app-id", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_CALLBACK, (void*)option_app_id_cb, "Application ID", "ID" },
- { NULL }
+ { nullptr }
};
/* We use up to 8 FDs per terminal, so let's bump the limit way up.
@@ -91,7 +91,7 @@ increase_rlimit_nofile (void)
if (getrlimit (RLIMIT_NOFILE, &sv_rlimit_nofile) < 0)
return FALSE;
- if (pthread_atfork (NULL, NULL, atfork_child_restore_rlimit_nofile) != 0)
+ if (pthread_atfork (nullptr, nullptr, atfork_child_restore_rlimit_nofile) != 0)
return FALSE;
l.rlim_cur = l.rlim_max = sv_rlimit_nofile.rlim_max;
@@ -114,7 +114,7 @@ init_server (int argc,
return _EXIT_FAILURE_WRONG_ID;
}
- if (setlocale (LC_ALL, "") == NULL) {
+ if (setlocale (LC_ALL, "") == nullptr) {
g_printerr ("Locale not supported.\n");
return _EXIT_FAILURE_UNSUPPORTED_LOCALE;
}
@@ -130,7 +130,7 @@ init_server (int argc,
g_unsetenv ("DBUS_STARTER_BUS_TYPE");
/* Not interested in silly debug spew polluting the journal, bug #749195 */
- if (g_getenv ("G_ENABLE_DIAGNOSTIC") == NULL)
+ if (g_getenv ("G_ENABLE_DIAGNOSTIC") == nullptr)
g_setenv ("G_ENABLE_DIAGNOSTIC", "0", TRUE);
_terminal_debug_init ();
@@ -140,7 +140,7 @@ init_server (int argc,
* On failure back to /.
*/
const char *home_dir = g_get_home_dir ();
- if (home_dir == NULL || chdir (home_dir) < 0)
+ if (home_dir == nullptr || chdir (home_dir) < 0)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-result"
chdir ("/");
@@ -149,9 +149,9 @@ init_server (int argc,
g_set_prgname ("gnome-terminal-server");
g_set_application_name (_("Terminal"));
- GError *error = NULL;
- if (!gtk_init_with_args (&argc, &argv, NULL, options, NULL, &error)) {
- if (error != NULL) {
+ GError *error = nullptr;
+ if (!gtk_init_with_args (&argc, &argv, nullptr, options, nullptr, &error)) {
+ if (error != nullptr) {
g_printerr ("Failed to parse arguments: %s\n", error->message);
g_error_free (error);
}
@@ -165,7 +165,7 @@ init_server (int argc,
/* Now we can create the app */
GApplication *app = terminal_app_new (app_id);
g_free (app_id);
- app_id = NULL;
+ app_id = nullptr;
/* We stay around a bit after the last window closed */
g_application_set_inactivity_timeout (app, INACTIVITY_TIMEOUT);
@@ -178,7 +178,7 @@ int
main (int argc,
char *argv[])
{
- gs_unref_object GApplication *app = NULL;
+ gs_unref_object GApplication *app = nullptr;
int r = init_server (argc, argv, &app);
if (r != 0)
return r;
@@ -187,5 +187,5 @@ main (int argc,
* thus ensuring that all pending signal emissions (e.g. child-exited)
* are delivered.
*/
- return g_application_run (app, 0, NULL);
+ return g_application_run (app, 0, nullptr);
}
diff --git a/src/terminal-accels.cc b/src/terminal-accels.cc
index ef86b081..66298100 100644
--- a/src/terminal-accels.cc
+++ b/src/terminal-accels.cc
@@ -116,7 +116,7 @@ typedef struct
} KeyEntryList;
#define ENTRY_FULL(name, key, action, type, parameter, shadow_name) \
- { name, key, "win." action, (const GVariantType *) type, parameter, NULL, shadow_name }
+ { name, key, "win." action, (const GVariantType *) type, parameter, nullptr, shadow_name }
#define ENTRY(name, key, action, type, parameter) \
ENTRY_FULL (name, key, action, type, parameter, "win.shadow")
#define ENTRY_MDI(name, key, action, type, parameter) \
@@ -126,13 +126,13 @@ static KeyEntry file_entries[] = {
ENTRY (N_("New Tab"), KEY_NEW_TAB, "new-terminal", "(ss)", "('tab','current')" ),
ENTRY (N_("New Window"), KEY_NEW_WINDOW, "new-terminal", "(ss)", "('window','current')"),
#ifdef ENABLE_SAVE
- ENTRY (N_("Save Contents"), KEY_SAVE_CONTENTS, "save-contents", NULL, NULL ),
+ ENTRY (N_("Save Contents"), KEY_SAVE_CONTENTS, "save-contents", nullptr, nullptr ),
#endif
#ifdef ENABLE_EXPORT
- ENTRY (N_("Export"), KEY_EXPORT, "export", NULL, NULL ),
+ ENTRY (N_("Export"), KEY_EXPORT, "export", nullptr, nullptr ),
#endif
#ifdef ENABLE_PRINT
- ENTRY (N_("Print"), KEY_PRINT, "print", NULL, NULL ),
+ ENTRY (N_("Print"), KEY_PRINT, "print", nullptr, nullptr ),
#endif
ENTRY (N_("Close Tab"), KEY_CLOSE_TAB, "close", "s", "'tab'" ),
ENTRY (N_("Close Window"), KEY_CLOSE_WINDOW, "close", "s", "'window'" ),
@@ -141,82 +141,82 @@ static KeyEntry file_entries[] = {
static KeyEntry edit_entries[] = {
ENTRY (N_("Copy"), KEY_COPY, "copy", "s", "'text'" ),
ENTRY (N_("Copy as HTML"), KEY_COPY_HTML, "copy", "s", "'html'" ),
- ENTRY (N_("Paste"), KEY_PASTE, "paste-text", NULL, NULL ),
- ENTRY (N_("Select All"), KEY_SELECT_ALL, "select-all", NULL, NULL ),
- ENTRY (N_("Preferences"), KEY_PREFERENCES, "edit-preferences", NULL, NULL ),
+ ENTRY (N_("Paste"), KEY_PASTE, "paste-text", nullptr, nullptr ),
+ ENTRY (N_("Select All"), KEY_SELECT_ALL, "select-all", nullptr, nullptr ),
+ ENTRY (N_("Preferences"), KEY_PREFERENCES, "edit-preferences", nullptr, nullptr ),
};
static KeyEntry search_entries[] = {
- ENTRY (N_("Find"), KEY_FIND, "find", NULL, NULL),
- ENTRY (N_("Find Next"), KEY_FIND_NEXT, "find-forward", NULL, NULL),
- ENTRY (N_("Find Previous"), KEY_FIND_PREV, "find-backward", NULL, NULL),
- ENTRY (N_("Clear Highlight"), KEY_FIND_CLEAR, "find-clear", NULL, NULL)
+ ENTRY (N_("Find"), KEY_FIND, "find", nullptr, nullptr),
+ ENTRY (N_("Find Next"), KEY_FIND_NEXT, "find-forward", nullptr, nullptr),
+ ENTRY (N_("Find Previous"), KEY_FIND_PREV, "find-backward", nullptr, nullptr),
+ ENTRY (N_("Clear Highlight"), KEY_FIND_CLEAR, "find-clear", nullptr, nullptr)
};
static KeyEntry view_entries[] = {
- ENTRY (N_("Hide and Show Menubar"), KEY_TOGGLE_MENUBAR, "menubar-visible", NULL, NULL),
- ENTRY (N_("Full Screen"), KEY_FULL_SCREEN, "fullscreen", NULL, NULL),
- ENTRY (N_("Zoom In"), KEY_ZOOM_IN, "zoom-in", NULL, NULL),
- ENTRY (N_("Zoom Out"), KEY_ZOOM_OUT, "zoom-out", NULL, NULL),
- ENTRY (N_("Normal Size"), KEY_ZOOM_NORMAL, "zoom-normal", NULL, NULL)
+ ENTRY (N_("Hide and Show Menubar"), KEY_TOGGLE_MENUBAR, "menubar-visible", nullptr, nullptr),
+ ENTRY (N_("Full Screen"), KEY_FULL_SCREEN, "fullscreen", nullptr, nullptr),
+ ENTRY (N_("Zoom In"), KEY_ZOOM_IN, "zoom-in", nullptr, nullptr),
+ ENTRY (N_("Zoom Out"), KEY_ZOOM_OUT, "zoom-out", nullptr, nullptr),
+ ENTRY (N_("Normal Size"), KEY_ZOOM_NORMAL, "zoom-normal", nullptr, nullptr)
};
static KeyEntry terminal_entries[] = {
- ENTRY (N_("Read-Only"), KEY_READ_ONLY, "read-only", NULL, NULL ),
+ ENTRY (N_("Read-Only"), KEY_READ_ONLY, "read-only", nullptr, nullptr ),
ENTRY (N_("Reset"), KEY_RESET, "reset", "b", "false"),
ENTRY (N_("Reset and Clear"), KEY_RESET_AND_CLEAR, "reset", "b", "true" ),
};
static KeyEntry tabs_entries[] = {
- ENTRY_MDI (N_("Switch to Previous Tab"), KEY_PREV_TAB, "tab-switch-left", NULL, NULL),
- ENTRY_MDI (N_("Switch to Next Tab"), KEY_NEXT_TAB, "tab-switch-right", NULL, NULL),
- ENTRY_MDI (N_("Move Tab to the Left"), KEY_MOVE_TAB_LEFT, "tab-move-left", NULL, NULL),
- ENTRY_MDI (N_("Move Tab to the Right"), KEY_MOVE_TAB_RIGHT, "tab-move-right", NULL, NULL),
- ENTRY_MDI (N_("Detach Tab"), KEY_DETACH_TAB, "tab-detach", NULL, NULL),
- ENTRY_MDI (NULL, KEY_SWITCH_TAB_PREFIX "1", "active-tab", "i", "0"),
- ENTRY_MDI (NULL, KEY_SWITCH_TAB_PREFIX "2", "active-tab", "i", "1"),
- ENTRY_MDI (NULL, KEY_SWITCH_TAB_PREFIX "3", "active-tab", "i", "2"),
- ENTRY_MDI (NULL, KEY_SWITCH_TAB_PREFIX "4", "active-tab", "i", "3"),
- ENTRY_MDI (NULL, KEY_SWITCH_TAB_PREFIX "5", "active-tab", "i", "4"),
- ENTRY_MDI (NULL, KEY_SWITCH_TAB_PREFIX "6", "active-tab", "i", "5"),
- ENTRY_MDI (NULL, KEY_SWITCH_TAB_PREFIX "7", "active-tab", "i", "6"),
- ENTRY_MDI (NULL, KEY_SWITCH_TAB_PREFIX "8", "active-tab", "i", "7"),
- ENTRY_MDI (NULL, KEY_SWITCH_TAB_PREFIX "9", "active-tab", "i", "8"),
- ENTRY_MDI (NULL, KEY_SWITCH_TAB_PREFIX "10", "active-tab", "i", "9"),
- ENTRY_MDI (NULL, KEY_SWITCH_TAB_PREFIX "11", "active-tab", "i", "10"),
- ENTRY_MDI (NULL, KEY_SWITCH_TAB_PREFIX "12", "active-tab", "i", "11"),
- ENTRY_MDI (NULL, KEY_SWITCH_TAB_PREFIX "13", "active-tab", "i", "12"),
- ENTRY_MDI (NULL, KEY_SWITCH_TAB_PREFIX "14", "active-tab", "i", "13"),
- ENTRY_MDI (NULL, KEY_SWITCH_TAB_PREFIX "15", "active-tab", "i", "14"),
- ENTRY_MDI (NULL, KEY_SWITCH_TAB_PREFIX "16", "active-tab", "i", "15"),
- ENTRY_MDI (NULL, KEY_SWITCH_TAB_PREFIX "17", "active-tab", "i", "16"),
- ENTRY_MDI (NULL, KEY_SWITCH_TAB_PREFIX "18", "active-tab", "i", "17"),
- ENTRY_MDI (NULL, KEY_SWITCH_TAB_PREFIX "19", "active-tab", "i", "18"),
- ENTRY_MDI (NULL, KEY_SWITCH_TAB_PREFIX "20", "active-tab", "i", "19"),
- ENTRY_MDI (NULL, KEY_SWITCH_TAB_PREFIX "21", "active-tab", "i", "20"),
- ENTRY_MDI (NULL, KEY_SWITCH_TAB_PREFIX "22", "active-tab", "i", "21"),
- ENTRY_MDI (NULL, KEY_SWITCH_TAB_PREFIX "23", "active-tab", "i", "22"),
- ENTRY_MDI (NULL, KEY_SWITCH_TAB_PREFIX "24", "active-tab", "i", "23"),
- ENTRY_MDI (NULL, KEY_SWITCH_TAB_PREFIX "25", "active-tab", "i", "24"),
- ENTRY_MDI (NULL, KEY_SWITCH_TAB_PREFIX "26", "active-tab", "i", "25"),
- ENTRY_MDI (NULL, KEY_SWITCH_TAB_PREFIX "27", "active-tab", "i", "26"),
- ENTRY_MDI (NULL, KEY_SWITCH_TAB_PREFIX "28", "active-tab", "i", "27"),
- ENTRY_MDI (NULL, KEY_SWITCH_TAB_PREFIX "29", "active-tab", "i", "28"),
- ENTRY_MDI (NULL, KEY_SWITCH_TAB_PREFIX "30", "active-tab", "i", "29"),
- ENTRY_MDI (NULL, KEY_SWITCH_TAB_PREFIX "31", "active-tab", "i", "30"),
- ENTRY_MDI (NULL, KEY_SWITCH_TAB_PREFIX "32", "active-tab", "i", "31"),
- ENTRY_MDI (NULL, KEY_SWITCH_TAB_PREFIX "33", "active-tab", "i", "32"),
- ENTRY_MDI (NULL, KEY_SWITCH_TAB_PREFIX "34", "active-tab", "i", "33"),
- ENTRY_MDI (NULL, KEY_SWITCH_TAB_PREFIX "35", "active-tab", "i", "34"),
+ ENTRY_MDI (N_("Switch to Previous Tab"), KEY_PREV_TAB, "tab-switch-left", nullptr, nullptr),
+ ENTRY_MDI (N_("Switch to Next Tab"), KEY_NEXT_TAB, "tab-switch-right", nullptr, nullptr),
+ ENTRY_MDI (N_("Move Tab to the Left"), KEY_MOVE_TAB_LEFT, "tab-move-left", nullptr, nullptr),
+ ENTRY_MDI (N_("Move Tab to the Right"), KEY_MOVE_TAB_RIGHT, "tab-move-right", nullptr, nullptr),
+ ENTRY_MDI (N_("Detach Tab"), KEY_DETACH_TAB, "tab-detach", nullptr, nullptr),
+ ENTRY_MDI (nullptr, KEY_SWITCH_TAB_PREFIX "1", "active-tab", "i", "0"),
+ ENTRY_MDI (nullptr, KEY_SWITCH_TAB_PREFIX "2", "active-tab", "i", "1"),
+ ENTRY_MDI (nullptr, KEY_SWITCH_TAB_PREFIX "3", "active-tab", "i", "2"),
+ ENTRY_MDI (nullptr, KEY_SWITCH_TAB_PREFIX "4", "active-tab", "i", "3"),
+ ENTRY_MDI (nullptr, KEY_SWITCH_TAB_PREFIX "5", "active-tab", "i", "4"),
+ ENTRY_MDI (nullptr, KEY_SWITCH_TAB_PREFIX "6", "active-tab", "i", "5"),
+ ENTRY_MDI (nullptr, KEY_SWITCH_TAB_PREFIX "7", "active-tab", "i", "6"),
+ ENTRY_MDI (nullptr, KEY_SWITCH_TAB_PREFIX "8", "active-tab", "i", "7"),
+ ENTRY_MDI (nullptr, KEY_SWITCH_TAB_PREFIX "9", "active-tab", "i", "8"),
+ ENTRY_MDI (nullptr, KEY_SWITCH_TAB_PREFIX "10", "active-tab", "i", "9"),
+ ENTRY_MDI (nullptr, KEY_SWITCH_TAB_PREFIX "11", "active-tab", "i", "10"),
+ ENTRY_MDI (nullptr, KEY_SWITCH_TAB_PREFIX "12", "active-tab", "i", "11"),
+ ENTRY_MDI (nullptr, KEY_SWITCH_TAB_PREFIX "13", "active-tab", "i", "12"),
+ ENTRY_MDI (nullptr, KEY_SWITCH_TAB_PREFIX "14", "active-tab", "i", "13"),
+ ENTRY_MDI (nullptr, KEY_SWITCH_TAB_PREFIX "15", "active-tab", "i", "14"),
+ ENTRY_MDI (nullptr, KEY_SWITCH_TAB_PREFIX "16", "active-tab", "i", "15"),
+ ENTRY_MDI (nullptr, KEY_SWITCH_TAB_PREFIX "17", "active-tab", "i", "16"),
+ ENTRY_MDI (nullptr, KEY_SWITCH_TAB_PREFIX "18", "active-tab", "i", "17"),
+ ENTRY_MDI (nullptr, KEY_SWITCH_TAB_PREFIX "19", "active-tab", "i", "18"),
+ ENTRY_MDI (nullptr, KEY_SWITCH_TAB_PREFIX "20", "active-tab", "i", "19"),
+ ENTRY_MDI (nullptr, KEY_SWITCH_TAB_PREFIX "21", "active-tab", "i", "20"),
+ ENTRY_MDI (nullptr, KEY_SWITCH_TAB_PREFIX "22", "active-tab", "i", "21"),
+ ENTRY_MDI (nullptr, KEY_SWITCH_TAB_PREFIX "23", "active-tab", "i", "22"),
+ ENTRY_MDI (nullptr, KEY_SWITCH_TAB_PREFIX "24", "active-tab", "i", "23"),
+ ENTRY_MDI (nullptr, KEY_SWITCH_TAB_PREFIX "25", "active-tab", "i", "24"),
+ ENTRY_MDI (nullptr, KEY_SWITCH_TAB_PREFIX "26", "active-tab", "i", "25"),
+ ENTRY_MDI (nullptr, KEY_SWITCH_TAB_PREFIX "27", "active-tab", "i", "26"),
+ ENTRY_MDI (nullptr, KEY_SWITCH_TAB_PREFIX "28", "active-tab", "i", "27"),
+ ENTRY_MDI (nullptr, KEY_SWITCH_TAB_PREFIX "29", "active-tab", "i", "28"),
+ ENTRY_MDI (nullptr, KEY_SWITCH_TAB_PREFIX "30", "active-tab", "i", "29"),
+ ENTRY_MDI (nullptr, KEY_SWITCH_TAB_PREFIX "31", "active-tab", "i", "30"),
+ ENTRY_MDI (nullptr, KEY_SWITCH_TAB_PREFIX "32", "active-tab", "i", "31"),
+ ENTRY_MDI (nullptr, KEY_SWITCH_TAB_PREFIX "33", "active-tab", "i", "32"),
+ ENTRY_MDI (nullptr, KEY_SWITCH_TAB_PREFIX "34", "active-tab", "i", "33"),
+ ENTRY_MDI (nullptr, KEY_SWITCH_TAB_PREFIX "35", "active-tab", "i", "34"),
ENTRY_MDI (N_("Switch to Last Tab"), KEY_SWITCH_TAB_PREFIX "last", "active-tab", "i", "-1"),
};
static KeyEntry help_entries[] = {
- ENTRY (N_("Contents"), KEY_HELP, "help", NULL, NULL)
+ ENTRY (N_("Contents"), KEY_HELP, "help", nullptr, nullptr)
};
static KeyEntry global_entries[] = {
- ENTRY (N_("Show Primary Menu"), KEY_HEADER_MENU, "header-menu", NULL, NULL),
+ ENTRY (N_("Show Primary Menu"), KEY_HEADER_MENU, "header-menu", nullptr, nullptr),
};
#undef ENTRY_FULL
@@ -243,7 +243,7 @@ enum
};
static GHashTable *settings_key_to_entry;
-static GSettings *keybinding_settings = NULL;
+static GSettings *keybinding_settings = nullptr;
GS_DEFINE_CLEANUP_FUNCTION(GtkTreePath*, _terminal_local_free_tree_path, gtk_tree_path_free)
#define terminal_free_tree_path __attribute__((__cleanup__(_terminal_local_free_tree_path)))
@@ -264,7 +264,7 @@ key_changed_cb (GSettings *settings,
gpointer user_data)
{
GtkApplication *application = (GtkApplication*)user_data;
- const gchar *accels[2] = { NULL, NULL };
+ const gchar *accels[2] = { nullptr, nullptr };
_terminal_debug_print (TERMINAL_DEBUG_ACCELS,
"key %s changed\n",
@@ -298,7 +298,7 @@ key_changed_cb (GSettings *settings,
*/
if (g_str_equal (value, "disabled")) {
- accels[0] = NULL;
+ accels[0] = nullptr;
} else {
accels[0] = value;
}
@@ -321,13 +321,13 @@ add_accel_entries (GApplication*application,
for (j = 0; j < n_entries; ++j) {
KeyEntry *key_entry = &entries[j];
if (key_entry->action_parameter) {
- GError *err = NULL;
+ GError *err = nullptr;
key_entry->parameter = g_variant_parse (key_entry->action_parameter_type,
key_entry->action_parameter,
- NULL, NULL, &err);
+ nullptr, nullptr, &err);
g_assert_no_error (err);
- g_assert (key_entry->parameter != NULL);
+ g_assert (key_entry->parameter != nullptr);
}
g_hash_table_insert (settings_key_to_entry,
@@ -353,9 +353,9 @@ terminal_accels_init (GApplication *application,
j = 1;
for (i = 0; i < G_N_ELEMENTS (tabs_entries); i++)
{
- gs_free char *name = NULL;
+ gs_free char *name = nullptr;
- if (tabs_entries[i].user_visible_name != NULL)
+ if (tabs_entries[i].user_visible_name != nullptr)
continue;
name = g_strdup_printf (_("Switch to Tab %u"), j++);
@@ -408,7 +408,7 @@ foreach_row_cb (GtkTreeModel *model,
KEYVAL_COLUMN, &key_entry,
-1);
- if (key_entry == NULL ||
+ if (key_entry == nullptr ||
!g_str_equal (key_entry->settings_key, key))
return FALSE;
@@ -437,11 +437,11 @@ accel_set_func (GtkTreeViewColumn *tree_column,
KEYVAL_COLUMN, &ke,
-1);
- if (ke == NULL) {
+ if (ke == nullptr) {
/* This is a title row */
g_object_set (cell,
"visible", FALSE,
- NULL);
+ nullptr);
} else {
gs_free char *value;
guint key;
@@ -461,7 +461,7 @@ accel_set_func (GtkTreeViewColumn *tree_column,
"editable", writable,
"accel-key", key,
"accel-mods", mods,
- NULL);
+ nullptr);
}
}
@@ -473,10 +473,10 @@ accel_update (GtkTreeView *view,
GdkModifierType mask)
{
GtkTreeModel *model;
- terminal_free_tree_path GtkTreePath *path = NULL;
+ terminal_free_tree_path GtkTreePath *path = nullptr;
GtkTreeIter iter;
KeyEntry *ke;
- gs_free char *str = NULL;
+ gs_free char *str = nullptr;
model = gtk_tree_view_get_model (view);
@@ -490,7 +490,7 @@ accel_update (GtkTreeView *view,
gtk_tree_model_get (model, &iter, KEYVAL_COLUMN, &ke, -1);
/* sanity check */
- if (ke == NULL)
+ if (ke == nullptr)
return;
str = binding_name (keyval, mask);
@@ -543,7 +543,7 @@ terminal_accels_fill_treeview (GtkWidget *tree_view,
{
GtkTreeViewColumn *column;
GtkCellRenderer *cell_renderer;
- gs_unref_object GtkTreeStore *tree = NULL;
+ gs_unref_object GtkTreeStore *tree = nullptr;
guint i;
/* Column 1 */
@@ -551,7 +551,7 @@ terminal_accels_fill_treeview (GtkWidget *tree_view,
column = gtk_tree_view_column_new_with_attributes (_("_Action"),
cell_renderer,
"text", ACTION_COLUMN,
- NULL);
+ nullptr);
gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column);
/* Column 2 */
@@ -559,7 +559,7 @@ terminal_accels_fill_treeview (GtkWidget *tree_view,
g_object_set (cell_renderer,
"editable", TRUE,
"accel-mode", GTK_CELL_RENDERER_ACCEL_MODE_GTK,
- NULL);
+ nullptr);
g_signal_connect (cell_renderer, "accel-edited",
G_CALLBACK (accel_edited_callback), tree_view);
@@ -570,7 +570,7 @@ terminal_accels_fill_treeview (GtkWidget *tree_view,
gtk_tree_view_column_set_title (column, _("Shortcut _Key"));
gtk_tree_view_column_pack_start (column, cell_renderer, TRUE);
gtk_tree_view_column_set_cell_data_func (column, cell_renderer, accel_set_func,
- disable_shortcuts_button, NULL);
+ disable_shortcuts_button, nullptr);
gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column);
/* Add the data */
@@ -579,7 +579,7 @@ terminal_accels_fill_treeview (GtkWidget *tree_view,
#ifdef ENABLE_DEBUG
_TERMINAL_DEBUG_IF (TERMINAL_DEBUG_ACCELS)
- g_signal_connect (tree, "row-changed", G_CALLBACK (row_changed), NULL);
+ g_signal_connect (tree, "row-changed", G_CALLBACK (row_changed), nullptr);
#endif
for (i = 0; i < G_N_ELEMENTS (all_entries); ++i)
@@ -587,9 +587,9 @@ terminal_accels_fill_treeview (GtkWidget *tree_view,
GtkTreeIter parent_iter;
guint j;
- gtk_tree_store_insert_with_values (tree, &parent_iter, NULL, -1,
+ gtk_tree_store_insert_with_values (tree, &parent_iter, nullptr, -1,
ACTION_COLUMN, _(all_entries[i].user_visible_name),
- KEYVAL_COLUMN, NULL,
+ KEYVAL_COLUMN, nullptr,
-1);
for (j = 0; j < all_entries[i].n_elements; ++j)
diff --git a/src/terminal-app.cc b/src/terminal-app.cc
index 535c547c..538bc133 100644
--- a/src/terminal-app.cc
+++ b/src/terminal-app.cc
@@ -136,7 +136,7 @@ terminal_app_init_debug (void)
{
#ifdef ENABLE_DEBUG
const char *env = g_getenv ("GTK_TEXT_DIR");
- if (env != NULL) {
+ if (env != nullptr) {
if (g_str_equal (env, "help")) {
g_printerr ("Usage: GTK_TEXT_DIR=ltr|rtl\n");
} else {
@@ -151,7 +151,7 @@ terminal_app_init_debug (void)
}
env = g_getenv ("GTK_SETTINGS");
- if (env == NULL)
+ if (env == nullptr)
return;
GObject *settings = G_OBJECT (gtk_settings_get_default ());
@@ -177,14 +177,14 @@ terminal_app_init_debug (void)
"and '!setting' to invert.\n");
} else {
gs_strfreev char **tokens = g_strsplit (env, ",", -1);
- for (guint i = 0; tokens[i] != NULL; i++) {
+ for (guint i = 0; tokens[i] != nullptr; i++) {
const char *prop = tokens[i];
char c = prop[0];
if (c == '~' || c == '!')
prop++;
GParamSpec *pspec = g_object_class_find_property (settings_class, prop);
- if (pspec == NULL) {
+ if (pspec == nullptr) {
g_printerr ("Setting \"%s\" does not exist.\n", prop);
} else if (G_PARAM_SPEC_VALUE_TYPE (pspec) != G_TYPE_BOOLEAN) {
g_printerr ("Setting \"%s\" is not boolean.\n", prop);
@@ -212,10 +212,10 @@ terminal_app_init_debug (void)
static gboolean
strv_contains_gnome (char **strv)
{
- if (strv == NULL)
+ if (strv == nullptr)
return FALSE;
- for (int i = 0; strv[i] != NULL; i++) {
+ for (int i = 0; strv[i] != nullptr; i++) {
if (g_ascii_strcasecmp (strv[i], "gnome") == 0 ||
g_ascii_strcasecmp (strv[i], "gnome-classic") == 0)
return TRUE;
@@ -242,7 +242,7 @@ terminal_app_should_use_headerbar (TerminalApp *app)
return use;
const char *desktop = g_getenv ("XDG_CURRENT_DESKTOP");
- if (desktop == NULL)
+ if (desktop == nullptr)
return FALSE;
char **desktops = g_strsplit (desktop, G_SEARCHPATH_SEPARATOR_S, -1);
@@ -260,14 +260,14 @@ load_css_from_resource (GApplication *application,
const char *base_path;
gs_free char *uri;
gs_unref_object GFile *file;
- gs_free_error GError *error = NULL;
+ gs_free_error GError *error = nullptr;
base_path = g_application_get_resource_base_path (application);
if (theme) {
gs_free char *str, *theme_name;
- g_object_get (gtk_settings_get_default (), "gtk-theme-name", &str, NULL);
+ g_object_get (gtk_settings_get_default (), "gtk-theme-name", &str, nullptr);
theme_name = g_ascii_strdown (str, -1);
uri = g_strdup_printf ("resource://%s/css/%s/terminal.css", base_path, theme_name);
} else {
@@ -275,7 +275,7 @@ load_css_from_resource (GApplication *application,
}
file = g_file_new_for_uri (uri);
- if (!g_file_query_exists (file, NULL /* cancellable */))
+ if (!g_file_query_exists (file, nullptr /* cancellable */))
return FALSE;
if (!gtk_css_provider_load_from_file (provider, file, &error))
@@ -338,7 +338,7 @@ terminal_app_remove_profile (TerminalApp *app,
/* First, we need to switch any screen using this profile to the default profile */
gs_free_list GList *screens = g_hash_table_get_values (app->screen_map);
- for (GList *l = screens; l != NULL; l = l->next) {
+ for (GList *l = screens; l != nullptr; l = l->next) {
TerminalScreen *screen = TERMINAL_SCREEN (l->data);
if (terminal_screen_get_profile (screen) != profile)
continue;
@@ -365,7 +365,7 @@ terminal_app_theme_variant_changed_cb (GSettings *settings,
g_object_set (gtk_settings,
GTK_SETTING_PREFER_DARK_THEME,
theme == TERMINAL_THEME_VARIANT_DARK,
- NULL);
+ nullptr);
}
/* Submenus for New Terminal per profile, and to change profiles */
@@ -404,7 +404,7 @@ foreach_profile_cb (TerminalSettingsList *list,
/* only connect if we haven't seen this profile before */
if (g_signal_handler_find (profile,
GSignalMatchType(G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA),
- 0, 0, NULL,
+ 0, 0, nullptr,
(void*)terminal_app_update_profile_menus, user_data->app) == 0)
g_signal_connect_swapped (profile, "changed::" TERMINAL_PROFILE_VISIBLE_NAME_KEY,
G_CALLBACK (terminal_app_update_profile_menus), user_data->app);
@@ -447,7 +447,7 @@ menu_append_numbered (GMenu *menu,
g_string_append_c (str, *p);
}
- item = g_menu_item_new (str->str, NULL);
+ item = g_menu_item_new (str->str, nullptr);
g_menu_item_set_action_and_target_value (item, action_name, target);
g_menu_append_item (menu, item);
}
@@ -459,7 +459,7 @@ append_new_terminal_item (GMenu *section,
ProfileData *data,
guint n_profiles)
{
- gs_unref_object GMenuItem *item = g_menu_item_new (label, NULL);
+ gs_unref_object GMenuItem *item = g_menu_item_new (label, nullptr);
if (n_profiles > 1) {
gs_unref_object GMenu *submenu = g_menu_new ();
@@ -483,7 +483,7 @@ fill_header_new_terminal_menu (GMenuModel *menu,
ProfileData *data,
guint n_profiles)
{
- gs_unref_object GMenu *section = NULL;
+ gs_unref_object GMenu *section = nullptr;
if (n_profiles <= 1)
return;
@@ -519,7 +519,7 @@ set_profile_submenu_new (ProfileData *data,
{
/* No submenu if there's only one profile */
if (n_profiles <= 1)
- return NULL;
+ return nullptr;
GMenu *menu = g_menu_new ();
for (guint i = 0; i < n_profiles; i++) {
@@ -552,25 +552,25 @@ terminal_app_update_profile_menus (TerminalApp *app)
app->set_profile_menu = set_profile_submenu_new (profiles, n_profiles);
- if (app->menubar != NULL) {
+ if (app->menubar != nullptr) {
g_menu_remove_all (G_MENU (app->menubar_new_terminal_section));
fill_new_terminal_section (app, app->menubar_new_terminal_section, profiles, n_profiles);
g_menu_remove_all (G_MENU (app->menubar_set_profile_section));
- if (app->set_profile_menu != NULL) {
+ if (app->set_profile_menu != nullptr) {
g_menu_append_submenu (app->menubar_set_profile_section, _("Change _Profile"),
G_MENU_MODEL (app->set_profile_menu));
}
}
- if (app->profilemenu != NULL) {
+ if (app->profilemenu != nullptr) {
g_menu_remove_all (G_MENU (app->profilemenu));
fill_header_new_terminal_menu (app->profilemenu, profiles, n_profiles);
}
- if (app->headermenu != NULL) {
+ if (app->headermenu != nullptr) {
g_menu_remove_all (G_MENU (app->headermenu_set_profile_section));
- if (app->set_profile_menu != NULL) {
+ if (app->set_profile_menu != nullptr) {
g_menu_append_submenu (app->headermenu_set_profile_section, _("_Profile"),
G_MENU_MODEL (app->set_profile_menu));
}
@@ -595,7 +595,7 @@ terminal_app_create_menubar (TerminalApp *app,
"menubar", &app->menubar,
"new-terminal-section", &app->menubar_new_terminal_section,
"set-profile-section", &app->menubar_set_profile_section,
- NULL);
+ nullptr);
/* Install profile sections */
terminal_app_update_profile_menus (app);
@@ -609,7 +609,7 @@ terminal_app_create_headermenu (TerminalApp *app)
terminal_util_load_objects_resource ("/org/gnome/terminal/ui/headerbar-menu.ui",
"headermenu", &app->headermenu,
"set-profile-section", &app->headermenu_set_profile_section,
- NULL);
+ nullptr);
/* Install profile sections */
terminal_app_update_profile_menus (app);
@@ -630,7 +630,7 @@ static void
free_clipboard_targets (TerminalApp *app)
{
g_free (app->clipboard_targets);
- app->clipboard_targets = NULL;
+ app->clipboard_targets = nullptr;
app->n_clipboard_targets = 0;
}
@@ -641,8 +641,8 @@ update_clipboard_targets (TerminalApp *app,
{
free_clipboard_targets (app);
- /* Sometimes we receive targets == NULL but n_targets == -1 */
- if (targets != NULL && n_targets < 255) {
+ /* Sometimes we receive targets == nullptr but n_targets == -1 */
+ if (targets != nullptr && n_targets < 255) {
app->clipboard_targets = reinterpret_cast<GdkAtom*>
(g_memdup (targets, sizeof (targets[0]) * n_targets));
app->n_clipboard_targets = n_targets;
@@ -679,7 +679,7 @@ clipboard_owner_change_cb (GtkClipboard *clipboard,
_terminal_debug_print (TERMINAL_DEBUG_CLIPBOARD,
"Clipboard owner changed\n");
- clipboard_targets_received_cb (clipboard, NULL, 0, app); /* clear */
+ clipboard_targets_received_cb (clipboard, nullptr, 0, app); /* clear */
/* We can do this without holding a reference to @app since
* the app lives as long as the process.
@@ -699,7 +699,7 @@ app_menu_preferences_cb (GSimpleAction *action,
{
TerminalApp *app = (TerminalApp*)user_data;
- terminal_app_edit_preferences (app, NULL, NULL);
+ terminal_app_edit_preferences (app, nullptr, nullptr);
}
static void
@@ -707,7 +707,7 @@ app_menu_help_cb (GSimpleAction *action,
GVariant *parameter,
gpointer user_data)
{
- terminal_util_show_help (NULL);
+ terminal_util_show_help (nullptr);
}
static void
@@ -750,10 +750,10 @@ terminal_app_startup (GApplication *application)
{
TerminalApp *app = TERMINAL_APP (application);
const GActionEntry action_entries[] = {
- { "preferences", app_menu_preferences_cb, NULL, NULL, NULL },
- { "help", app_menu_help_cb, NULL, NULL, NULL },
- { "about", app_menu_about_cb, NULL, NULL, NULL },
- { "quit", app_menu_quit_cb, NULL, NULL, NULL }
+ { "preferences", app_menu_preferences_cb, nullptr, nullptr, nullptr },
+ { "help", app_menu_help_cb, nullptr, nullptr, nullptr },
+ { "about", app_menu_about_cb, nullptr, nullptr, nullptr },
+ { "quit", app_menu_quit_cb, nullptr, nullptr, nullptr }
};
g_application_set_resource_base_path (application, TERMINAL_RESOURCES_PATH_PREFIX);
@@ -773,7 +773,7 @@ terminal_app_startup (GApplication *application)
gboolean shell_shows_menubar;
g_object_get (gtk_settings_get_default (),
"gtk-shell-shows-menubar", &shell_shows_menubar,
- NULL);
+ nullptr);
/* Create menubar */
terminal_app_create_menubar (app, shell_shows_menubar);
@@ -830,7 +830,7 @@ terminal_app_init (TerminalApp *app)
/* Clipboard targets */
GdkDisplay *display = gdk_display_get_default ();
app->clipboard = gtk_clipboard_get_for_display (display, GDK_SELECTION_CLIPBOARD);
- clipboard_owner_change_cb (app->clipboard, NULL, app);
+ clipboard_owner_change_cb (app->clipboard, nullptr, app);
g_signal_connect (app->clipboard, "owner-change",
G_CALLBACK (clipboard_owner_change_cb), app);
@@ -840,7 +840,7 @@ terminal_app_init (TerminalApp *app)
/* Get the profiles */
app->profiles_list = terminal_profiles_list_new ();
- app->screen_map = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+ app->screen_map = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, nullptr);
gs_unref_object GSettings *settings = g_settings_get_child (app->global_settings, "keybindings");
terminal_accels_init (G_APPLICATION (app), settings, app->use_headerbar);
@@ -886,8 +886,8 @@ terminal_app_dbus_register (GApplication *application,
GError **error)
{
TerminalApp *app = TERMINAL_APP (application);
- gs_unref_object TerminalObjectSkeleton *object = NULL;
- gs_unref_object TerminalFactory *factory = NULL;
+ gs_unref_object TerminalObjectSkeleton *object = nullptr;
+ gs_unref_object TerminalFactory *factory = nullptr;
if (!G_APPLICATION_CLASS (terminal_app_parent_class)->dbus_register (application,
connection,
@@ -933,14 +933,14 @@ terminal_app_dbus_unregister (GApplication *application,
if (app->object_manager) {
g_dbus_object_manager_server_unexport (app->object_manager, TERMINAL_FACTORY_OBJECT_PATH);
g_object_unref (app->object_manager);
- app->object_manager = NULL;
+ app->object_manager = nullptr;
}
#ifdef ENABLE_SEARCH_PROVIDER
if (app->search_provider) {
terminal_search_provider_dbus_unregister (app->search_provider, connection, TERMINAL_SEARCH_PROVIDER_PATH);
g_object_unref (app->search_provider);
- app->search_provider = NULL;
+ app->search_provider = nullptr;
}
#endif /* ENABLE_SEARCH_PROVIDER */
@@ -967,7 +967,7 @@ terminal_app_class_init (TerminalAppClass *klass)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (TerminalAppClass, clipboard_targets_changed),
- NULL, NULL,
+ nullptr, nullptr,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1, G_TYPE_OBJECT);
}
@@ -990,7 +990,7 @@ TerminalScreen *
terminal_app_get_screen_by_uuid (TerminalApp *app,
const char *uuid)
{
- g_return_val_if_fail (TERMINAL_IS_APP (app), NULL);
+ g_return_val_if_fail (TERMINAL_IS_APP (app), nullptr);
return reinterpret_cast<TerminalScreen*>(g_hash_table_lookup (app->screen_map, uuid));
}
@@ -1011,7 +1011,7 @@ terminal_app_dup_screen_object_path (TerminalApp *app,
* @app:
* @object_path:
*
- * Returns: (transfer full): the #TerminalReceiverImpl for @object_path, or %NULL
+ * Returns: (transfer full): the #TerminalReceiverImpl for @object_path, or %nullptr
*/
static TerminalReceiverImpl *
terminal_app_get_receiver_impl_by_object_path (TerminalApp *app,
@@ -1020,13 +1020,13 @@ terminal_app_get_receiver_impl_by_object_path (TerminalApp *app,
gs_unref_object GDBusObject *skeleton =
g_dbus_object_manager_get_object (G_DBUS_OBJECT_MANAGER (app->object_manager),
object_path);
- if (skeleton == NULL || !TERMINAL_IS_OBJECT_SKELETON (skeleton))
- return NULL;
+ if (skeleton == nullptr || !TERMINAL_IS_OBJECT_SKELETON (skeleton))
+ return nullptr;
- TerminalReceiverImpl *impl = NULL;
- g_object_get (skeleton, "receiver", &impl, NULL);
- if (impl == NULL)
- return NULL;
+ TerminalReceiverImpl *impl = nullptr;
+ g_object_get (skeleton, "receiver", &impl, nullptr);
+ if (impl == nullptr)
+ return nullptr;
g_assert (TERMINAL_IS_RECEIVER_IMPL (impl));
return impl;
@@ -1037,7 +1037,7 @@ terminal_app_get_receiver_impl_by_object_path (TerminalApp *app,
* @app:
* @object_path:
*
- * Returns: (transfer full): the #TerminalScreen for @object_path, or %NULL
+ * Returns: (transfer full): the #TerminalScreen for @object_path, or %nullptr
*/
TerminalScreen *
terminal_app_get_screen_by_object_path (TerminalApp *app,
@@ -1045,8 +1045,8 @@ terminal_app_get_screen_by_object_path (TerminalApp *app,
{
gs_unref_object TerminalReceiverImpl *impl =
terminal_app_get_receiver_impl_by_object_path (app, object_path);
- if (impl == NULL)
- return NULL;
+ if (impl == nullptr)
+ return nullptr;
return terminal_receiver_impl_get_screen (impl);
}
@@ -1082,9 +1082,9 @@ terminal_app_unregister_screen (TerminalApp *app,
gs_free char *object_path = terminal_app_dup_screen_object_path (app, screen);
gs_unref_object TerminalReceiverImpl *impl =
terminal_app_get_receiver_impl_by_object_path (app, object_path);
- g_warn_if_fail (impl != NULL);
+ g_warn_if_fail (impl != nullptr);
- if (impl != NULL)
+ if (impl != nullptr)
terminal_receiver_impl_unset_screen (impl);
g_dbus_object_manager_server_unexport (app->object_manager, object_path);
@@ -1095,12 +1095,12 @@ terminal_app_get_clipboard_targets (TerminalApp *app,
GtkClipboard *clipboard,
int *n_targets)
{
- g_return_val_if_fail (TERMINAL_IS_APP (app), NULL);
- g_return_val_if_fail (n_targets != NULL, NULL);
+ g_return_val_if_fail (TERMINAL_IS_APP (app), nullptr);
+ g_return_val_if_fail (n_targets != nullptr, nullptr);
if (clipboard != app->clipboard) {
*n_targets = 0;
- return NULL;
+ return nullptr;
}
*n_targets = app->n_clipboard_targets;
@@ -1147,7 +1147,7 @@ terminal_app_get_menubar (TerminalApp *app)
GMenuModel *
terminal_app_get_headermenu (TerminalApp *app)
{
- if (app->headermenu == NULL)
+ if (app->headermenu == nullptr)
terminal_app_create_headermenu (app);
return app->headermenu;
@@ -1162,7 +1162,7 @@ terminal_app_get_headermenu (TerminalApp *app)
GMenuModel *
terminal_app_get_profilemenu (TerminalApp *app)
{
- if (app->profilemenu == NULL)
+ if (app->profilemenu == nullptr)
terminal_app_create_profilemenu (app);
return app->profilemenu;
@@ -1233,9 +1233,9 @@ terminal_app_get_gtk_debug_settings (TerminalApp *app)
PangoFontDescription *
terminal_app_get_system_font (TerminalApp *app)
{
- gs_free char *font = NULL;
+ gs_free char *font = nullptr;
- g_return_val_if_fail (TERMINAL_IS_APP (app), NULL);
+ g_return_val_if_fail (TERMINAL_IS_APP (app), nullptr);
font = g_settings_get_string (app->desktop_interface_settings, MONOSPACE_FONT_KEY_NAME);
@@ -1248,7 +1248,7 @@ terminal_app_get_system_font (TerminalApp *app)
GDBusObjectManagerServer *
terminal_app_get_object_manager (TerminalApp *app)
{
- g_warn_if_fail (app->object_manager != NULL);
+ g_warn_if_fail (app->object_manager != nullptr);
return app->object_manager;
}
@@ -1276,7 +1276,7 @@ terminal_app_get_dialog_use_headerbar (TerminalApp *app)
gboolean dialog_use_header;
g_object_get (gtk_settings_get_default (),
"gtk-dialogs-use-header", &dialog_use_header,
- NULL);
+ nullptr);
return dialog_use_header && app->use_headerbar;
}
diff --git a/src/terminal-client-utils.cc b/src/terminal-client-utils.cc
index ff5ba8e5..b3d6ae6d 100644
--- a/src/terminal-client-utils.cc
+++ b/src/terminal-client-utils.cc
@@ -62,7 +62,7 @@ terminal_client_append_create_instance_options (GVariantBuilder *builder,
gboolean fullscreen_window)
{
/* Bytestring options */
- if (display_name != NULL)
+ if (display_name != nullptr)
g_variant_builder_add (builder, "{sv}",
"display", g_variant_new_bytestring (display_name));
if (startup_id)
@@ -133,7 +133,7 @@ terminal_client_get_environment_filters (void)
"WATCHDOG_PID",
"WATCHDOG_USEC",
"WINDOWID",
- NULL
+ nullptr
};
return filters;
@@ -150,8 +150,8 @@ terminal_client_get_environment_filters (void)
char**
terminal_client_filter_environment (char** envv)
{
- if (envv == NULL)
- return NULL;
+ if (envv == nullptr)
+ return nullptr;
char const* const* filters = terminal_client_get_environment_filters ();
for (unsigned i = 0; filters[i]; ++i)
@@ -164,7 +164,7 @@ terminal_client_filter_environment (char** envv)
* terminal_client_append_exec_options:
* @builder: a #GVariantBuilder of #GVariantType "a{sv}"
* @pass_environment: whether to pass the current environment
- * @working_directory: (allow-none): the cwd, or %NULL
+ * @working_directory: (allow-none): the cwd, or %nullptr
* @fd_array: (array lenght=fd_array_len):
* @fd_array_len:
* @shell:
@@ -223,7 +223,7 @@ terminal_client_append_exec_options (GVariantBuilder *builder,
/**
* terminal_client_get_fallback_startup_id:
*
- * Returns: a fallback startup ID, or %NULL
+ * Returns: a fallback startup ID, or %nullptr
*/
char *
terminal_client_get_fallback_startup_id (void)
@@ -235,7 +235,7 @@ terminal_client_get_fallback_startup_id (void)
XEvent event;
display = gdk_display_get_default ();
- if (display == NULL || !GDK_IS_X11_DISPLAY (display))
+ if (display == nullptr || !GDK_IS_X11_DISPLAY (display))
goto out;
xdisplay = GDK_DISPLAY_XDISPLAY (display);
@@ -282,5 +282,5 @@ terminal_client_get_fallback_startup_id (void)
return g_strdup_printf ("_TIME%lu", event.xproperty.time);
out:
#endif
- return NULL;
+ return nullptr;
}
diff --git a/src/terminal-gdbus.cc b/src/terminal-gdbus.cc
index 6553644c..66bff6aa 100644
--- a/src/terminal-gdbus.cc
+++ b/src/terminal-gdbus.cc
@@ -60,7 +60,7 @@ terminal_receiver_impl_set_screen (TerminalReceiverImpl *impl,
TerminalReceiverImplPrivate *priv;
g_return_if_fail (TERMINAL_IS_RECEIVER_IMPL (impl));
- g_return_if_fail (screen == NULL || TERMINAL_IS_SCREEN (screen));
+ g_return_if_fail (screen == nullptr || TERMINAL_IS_SCREEN (screen));
priv = impl->priv;
if (priv->screen == screen)
@@ -69,7 +69,7 @@ terminal_receiver_impl_set_screen (TerminalReceiverImpl *impl,
if (priv->screen) {
g_signal_handlers_disconnect_matched (priv->screen,
G_SIGNAL_MATCH_DATA,
- 0, 0, NULL, NULL, impl);
+ 0, 0, nullptr, nullptr, impl);
}
priv->screen = screen;
@@ -98,8 +98,8 @@ exec_data_free (ExecData *data)
}
static void
-exec_cb (TerminalScreen *screen, /* unused, may be %NULL */
- GError *error, /* set on error, %NULL on success */
+exec_cb (TerminalScreen *screen, /* unused, may be %nullptr */
+ GError *error, /* set on error, %nullptr on success */
ExecData *data)
{
/* Note: these calls transfer the ref */
@@ -107,7 +107,7 @@ exec_cb (TerminalScreen *screen, /* unused, may be %NULL */
if (error) {
g_dbus_method_invocation_return_gerror (data->invocation, error);
} else {
- terminal_receiver_complete_exec (data->receiver, data->invocation, NULL /* outfdlist */);
+ terminal_receiver_complete_exec (data->receiver, data->invocation, nullptr /* outfdlist */);
}
}
@@ -123,11 +123,11 @@ terminal_receiver_impl_exec (TerminalReceiver *receiver,
const char *working_directory;
gboolean shell;
gsize exec_argc;
- gs_free char **exec_argv = NULL; /* container needs to be freed, strings not owned */
- gs_free char **envv = NULL; /* container needs to be freed, strings not owned */
- gs_unref_variant GVariant *fd_array = NULL;
+ gs_free char **exec_argv = nullptr; /* container needs to be freed, strings not owned */
+ gs_free char **envv = nullptr; /* container needs to be freed, strings not owned */
+ gs_unref_variant GVariant *fd_array = nullptr;
- if (priv->screen == NULL) {
+ if (priv->screen == nullptr) {
g_dbus_method_invocation_return_error_literal (invocation,
G_DBUS_ERROR,
G_DBUS_ERROR_FAILED,
@@ -136,13 +136,13 @@ terminal_receiver_impl_exec (TerminalReceiver *receiver,
}
if (!g_variant_lookup (options, "cwd", "^&ay", &working_directory))
- working_directory = NULL;
+ working_directory = nullptr;
if (!g_variant_lookup (options, "shell", "b", &shell))
shell = FALSE;
if (!g_variant_lookup (options, "environ", "^a&ay", &envv))
- envv = NULL;
+ envv = nullptr;
if (!g_variant_lookup (options, "fd-set", "@a(ih)", &fd_array))
- fd_array = NULL;
+ fd_array = nullptr;
/* Check environment */
if (!terminal_util_check_envv((const char * const*)envv)) {
@@ -154,14 +154,14 @@ terminal_receiver_impl_exec (TerminalReceiver *receiver,
}
/* Check FD passing */
- if ((fd_list != NULL) ^ (fd_array != NULL)) {
+ if ((fd_list != nullptr) ^ (fd_array != nullptr)) {
g_dbus_method_invocation_return_error_literal (invocation,
G_DBUS_ERROR,
G_DBUS_ERROR_INVALID_ARGS,
"Must pass both fd-set options and a FD list");
return TRUE; /* handled */
}
- if (fd_list != NULL && fd_array != NULL) {
+ if (fd_list != nullptr && fd_array != nullptr) {
const int *fd_array_data;
gsize fd_array_data_len, i;
int n_fds;
@@ -200,7 +200,7 @@ terminal_receiver_impl_exec (TerminalReceiver *receiver,
}
}
- if (working_directory != NULL)
+ if (working_directory != nullptr)
_terminal_debug_print (TERMINAL_DEBUG_SERVER,
"CWD is '%s'\n", working_directory);
@@ -216,9 +216,9 @@ terminal_receiver_impl_exec (TerminalReceiver *receiver,
*/
exec_data->invocation = (GDBusMethodInvocation*)g_object_ref (invocation);
- GError *err = NULL;
+ GError *err = nullptr;
if (!terminal_screen_exec (priv->screen,
- exec_argc > 0 ? exec_argv : NULL,
+ exec_argc > 0 ? exec_argv : nullptr,
envv,
shell,
working_directory,
@@ -226,7 +226,7 @@ terminal_receiver_impl_exec (TerminalReceiver *receiver,
(TerminalScreenExecCallback) exec_cb,
exec_data /* adopted */,
(GDestroyNotify) exec_data_free,
- NULL /* cancellable */,
+ nullptr /* cancellable */,
&err)) {
/* Transfers ownership of @invocation */
g_dbus_method_invocation_take_error (invocation, err);
@@ -258,7 +258,7 @@ terminal_receiver_impl_dispose (GObject *object)
{
TerminalReceiverImpl *impl = TERMINAL_RECEIVER_IMPL (object);
- terminal_receiver_impl_set_screen (impl, NULL);
+ terminal_receiver_impl_set_screen (impl, nullptr);
G_OBJECT_CLASS (terminal_receiver_impl_parent_class)->dispose (object);
}
@@ -311,7 +311,7 @@ terminal_receiver_impl_class_init (TerminalReceiverImplClass *klass)
g_object_class_install_property
(gobject_class,
PROP_SCREEN,
- g_param_spec_object ("screen", NULL, NULL,
+ g_param_spec_object ("screen", nullptr, nullptr,
TERMINAL_TYPE_SCREEN,
GParamFlags(G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY |
@@ -341,12 +341,12 @@ terminal_receiver_impl_new (TerminalScreen *screen)
* terminal_receiver_impl_get_screen:
* @impl: a #TerminalReceiverImpl
*
- * Returns: (transfer none): the impl's #TerminalScreen, or %NULL
+ * Returns: (transfer none): the impl's #TerminalScreen, or %nullptr
*/
TerminalScreen *
terminal_receiver_impl_get_screen (TerminalReceiverImpl *impl)
{
- g_return_val_if_fail (TERMINAL_IS_RECEIVER_IMPL (impl), NULL);
+ g_return_val_if_fail (TERMINAL_IS_RECEIVER_IMPL (impl), nullptr);
return impl->priv->screen;
}
@@ -362,7 +362,7 @@ terminal_receiver_impl_unset_screen (TerminalReceiverImpl *impl)
{
g_return_if_fail (TERMINAL_IS_RECEIVER_IMPL (impl));
- terminal_receiver_impl_set_screen (impl, NULL);
+ terminal_receiver_impl_set_screen (impl, nullptr);
}
/* ---------------------------------------------------------------------------
@@ -382,11 +382,11 @@ terminal_factory_impl_create_instance (TerminalFactory *factory,
TerminalApp *app = terminal_app_get ();
/* If a parent screen is specified, use that to fill in missing information */
- TerminalScreen *parent_screen = NULL;
+ TerminalScreen *parent_screen = nullptr;
const char *parent_screen_object_path;
if (g_variant_lookup (options, "parent-screen", "&o", &parent_screen_object_path)) {
parent_screen = terminal_app_get_screen_by_object_path (app, parent_screen_object_path);
- if (parent_screen == NULL) {
+ if (parent_screen == nullptr) {
g_dbus_method_invocation_return_error (invocation,
G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS,
"Failed to get screen from object path %s",
@@ -398,13 +398,13 @@ terminal_factory_impl_create_instance (TerminalFactory *factory,
/* Try getting a parent window, first by parent screen then by window ID;
* if that fails, create a new window.
*/
- TerminalWindow *window = NULL;
+ TerminalWindow *window = nullptr;
gboolean have_new_window = FALSE;
const char *window_from_screen_object_path;
if (g_variant_lookup (options, "window-from-screen", "&o", &window_from_screen_object_path)) {
TerminalScreen *window_screen =
terminal_app_get_screen_by_object_path (app, window_from_screen_object_path);
- if (window_screen == NULL) {
+ if (window_screen == nullptr) {
g_dbus_method_invocation_return_error (invocation,
G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS,
"Failed to get screen from object path %s",
@@ -419,7 +419,7 @@ terminal_factory_impl_create_instance (TerminalFactory *factory,
/* Support old client */
guint window_id;
- if (window == NULL && g_variant_lookup (options, "window-id", "u", &window_id)) {
+ if (window == nullptr && g_variant_lookup (options, "window-id", "u", &window_id)) {
GtkWindow *win = gtk_application_get_window_by_id (GTK_APPLICATION (app), window_id);
if (!TERMINAL_IS_WINDOW (win)) {
@@ -434,7 +434,7 @@ terminal_factory_impl_create_instance (TerminalFactory *factory,
}
/* Still no parent window? Create a new one */
- if (window == NULL) {
+ if (window == nullptr) {
const char *startup_id, *role;
gboolean start_maximized, start_fullscreen;
@@ -468,30 +468,30 @@ terminal_factory_impl_create_instance (TerminalFactory *factory,
const char *title;
if (!g_variant_lookup (options, "title", "&s", &title))
- title = NULL;
+ title = nullptr;
double zoom;
if (!g_variant_lookup (options, "zoom", "d", &zoom)) {
- if (parent_screen != NULL)
+ if (parent_screen != nullptr)
zoom = vte_terminal_get_font_scale (VTE_TERMINAL (parent_screen));
else
zoom = 1.0;
}
/* Look up the profile */
- gs_unref_object GSettings *profile = NULL;
+ gs_unref_object GSettings *profile = nullptr;
const char *profile_uuid;
if (!g_variant_lookup (options, "profile", "&s", &profile_uuid))
- profile_uuid = NULL;
+ profile_uuid = nullptr;
- if (profile_uuid == NULL && parent_screen != NULL) {
+ if (profile_uuid == nullptr && parent_screen != nullptr) {
profile = terminal_screen_ref_profile (parent_screen);
} else {
- GError *err = NULL;
+ GError *err = nullptr;
profile = terminal_profiles_list_ref_profile_by_uuid (terminal_app_get_profiles_list (app),
- profile_uuid /* default if NULL */,
+ profile_uuid /* default if nullptr */,
&err);
- if (profile == NULL) {
+ if (profile == nullptr) {
g_dbus_method_invocation_return_gerror (invocation, err);
g_error_free (err);
return TRUE;
diff --git a/src/terminal-icon-button.cc b/src/terminal-icon-button.cc
index 387fd30f..b4998242 100644
--- a/src/terminal-icon-button.cc
+++ b/src/terminal-icon-button.cc
@@ -32,7 +32,7 @@ terminal_icon_button_new (const char *gicon_name)
button = (GtkWidget *) g_object_new (GTK_TYPE_BUTTON,
"relief", GTK_RELIEF_NONE,
"focus-on-click", FALSE,
- NULL);
+ nullptr);
icon = g_themed_icon_new_with_default_fallbacks (gicon_name);
image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_MENU);
diff --git a/src/terminal-info-bar.cc b/src/terminal-info-bar.cc
index b855d6cd..dd2be784 100644
--- a/src/terminal-info-bar.cc
+++ b/src/terminal-info-bar.cc
@@ -76,7 +76,7 @@ terminal_info_bar_new (GtkMessageType type,
nullptr));
va_start (args, first_button_text);
- while (first_button_text != NULL) {
+ while (first_button_text != nullptr) {
int response_id;
response_id = va_arg (args, int);
@@ -96,7 +96,7 @@ terminal_info_bar_format_text (TerminalInfoBar *bar,
...)
{
TerminalInfoBarPrivate *priv;
- gs_free char *text = NULL;
+ gs_free char *text = nullptr;
GtkWidget *label;
va_list args;
diff --git a/src/terminal-libgsystem.hh b/src/terminal-libgsystem.hh
index 4c84dc30..dfa00558 100644
--- a/src/terminal-libgsystem.hh
+++ b/src/terminal-libgsystem.hh
@@ -26,7 +26,7 @@ G_BEGIN_DECLS
if (outp) \
{ \
*(outp) = *(srcp); \
- *(srcp) = NULL; \
+ *(srcp) = nullptr; \
} \
} G_STMT_END;
@@ -46,7 +46,7 @@ G_BEGIN_DECLS
/* These functions shouldn't be invoked directly;
* they are stubs that:
* 1) Take a pointer to the location (typically itself a pointer).
- * 2) Provide %NULL-safety where it doesn't exist already (e.g. g_object_unref)
+ * 2) Provide %nullptr-safety where it doesn't exist already (e.g. g_object_unref)
*/
GS_DEFINE_CLEANUP_FUNCTION0(GArray*, gs_local_array_unref, g_array_unref)
GS_DEFINE_CLEANUP_FUNCTION0(GBytes*, gs_local_bytes_unref, g_bytes_unref)
@@ -89,7 +89,7 @@ static inline void gs_local_gstring_free (void *v) \
*
* Call g_object_unref() on a variable location when it goes out of
* scope. Note that unlike g_object_unref(), the variable may be
- * %NULL.
+ * %nullptr.
*/
#define gs_unref_object __attribute__ ((cleanup(gs_local_obj_unref)))
@@ -98,7 +98,7 @@ static inline void gs_local_gstring_free (void *v) \
*
* Call g_variant_unref() on a variable location when it goes out of
* scope. Note that unlike g_variant_unref(), the variable may be
- * %NULL.
+ * %nullptr.
*/
#define gs_unref_variant __attribute__ ((cleanup(gs_local_variant_unref)))
@@ -123,7 +123,7 @@ static inline void gs_local_gstring_free (void *v) \
*
* Call g_array_unref() on a variable location when it goes out of
* scope. Note that unlike g_array_unref(), the variable may be
- * %NULL.
+ * %nullptr.
*/
#define gs_unref_array __attribute__ ((cleanup(gs_local_array_unref)))
@@ -133,7 +133,7 @@ static inline void gs_local_gstring_free (void *v) \
*
* Call g_ptr_array_unref() on a variable location when it goes out of
* scope. Note that unlike g_ptr_array_unref(), the variable may be
- * %NULL.
+ * %nullptr.
*/
#define gs_unref_ptrarray __attribute__ ((cleanup(gs_local_ptrarray_unref)))
@@ -143,7 +143,7 @@ static inline void gs_local_gstring_free (void *v) \
*
* Call g_hash_table_unref() on a variable location when it goes out
* of scope. Note that unlike g_hash_table_unref(), the variable may
- * be %NULL.
+ * be %nullptr.
*/
#define gs_unref_hashtable __attribute__ ((cleanup(gs_local_hashtable_unref)))
@@ -152,7 +152,7 @@ static inline void gs_local_gstring_free (void *v) \
*
* Call g_key_file_unref() on a variable location when it goes out
* of scope. Note that unlike g_key_file_unref(), the variable may
- * be %NULL.
+ * be %nullptr.
*/
#define gs_unref_key_file __attribute__ ((cleanup(gs_local_key_file_unref)))
@@ -161,7 +161,7 @@ static inline void gs_local_gstring_free (void *v) \
*
* Call g_checksum_free() on a variable location when it goes out
* of scope. Note that unlike g_checksum_free(), the variable may
- * be %NULL.
+ * be %nullptr.
*/
#define gs_free_checksum __attribute__ ((cleanup(gs_local_checksum_free)))
@@ -170,7 +170,7 @@ static inline void gs_local_gstring_free (void *v) \
*
* Call g_date_time_free() on a variable location when it goes out
* of scope. Note that unlike g_date_time_free(), the variable may
- * be %NULL.
+ * be %nullptr.
*/
#define gs_unref_date_time __attribute__ ((cleanup(gs_local_date_time_unref)))
@@ -179,7 +179,7 @@ static inline void gs_local_gstring_free (void *v) \
*
* Call g_bytes_unref() on a variable location when it goes out
* of scope. Note that unlike g_bytes_unref(), the variable may
- * be %NULL.
+ * be %nullptr.
*/
#define gs_unref_bytes __attribute__ ((cleanup(gs_local_bytes_unref)))
@@ -209,7 +209,7 @@ static inline void gs_local_gstring_free (void *v) \
*
* Call g_regex_unref() on a variable location when it goes out of
* scope. Note that unlike g_regex_unref(), the variable may be
- * %NULL.
+ * %nullptr.
*/
#define gs_unref_regex __attribute__ ((cleanup(gs_local_regex_unref)))
@@ -219,7 +219,7 @@ static inline void gs_local_gstring_free (void *v) \
*
* Call g_regex_unref() on a variable location when it goes out of
* scope. Note that unlike g_regex_unref(), the variable may be
- * %NULL.
+ * %nullptr.
*/
#define gs_free_match_info __attribute__ ((cleanup(gs_local_match_info_free)))
@@ -229,7 +229,7 @@ static inline void gs_local_gstring_free (void *v) \
*
* Call g_settings_schema_unref() on a variable location when it goes out of
* scope. Note that unlike g_settings_schema_unref(), the variable may be
- * %NULL.
+ * %nullptr.
*/
#define gs_unref_settings_schema __attribute__ ((cleanup(gs_local_settings_schema_unref)))
@@ -239,7 +239,7 @@ static inline void gs_local_gstring_free (void *v) \
*
* Call g_settings_schema_source_unref() on a variable location when it goes out of
* scope. Note that unlike g_settings_schema_source_unref(), the variable may be
- * %NULL.
+ * %nullptr.
*/
#define gs_unref_settings_schema_source __attribute__ ((cleanup(gs_local_settings_schema_source_unref)))
@@ -249,7 +249,7 @@ static inline void gs_local_gstring_free (void *v) \
*
* Call g_settings_schema_key_unref() on a variable location when it goes out of
* scope. Note that unlike g_settings_schema_key_unref(), the variable may be
- * %NULL.
+ * %nullptr.
*/
#define gs_unref_settings_schema_key __attribute__ ((cleanup(gs_local_settings_schema_key_unref)))
@@ -259,7 +259,7 @@ static inline void gs_local_gstring_free (void *v) \
*
* Call g_string_free(TRUE) on a variable location when it goes out
* of scope. Note that unlike g_string_free(), the variable may
- * be %NULL.
+ * be %nullptr.
*/
#define gs_free_gstring __attribute__ ((cleanup(gs_local_gstring_free)))
diff --git a/src/terminal-mdi-container.cc b/src/terminal-mdi-container.cc
index 581f05eb..f3c979d4 100644
--- a/src/terminal-mdi-container.cc
+++ b/src/terminal-mdi-container.cc
@@ -42,7 +42,7 @@ terminal_mdi_container_default_init (TerminalMdiContainerInterface *iface)
G_TYPE_FROM_INTERFACE (iface),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (TerminalMdiContainerInterface, screen_added),
- NULL, NULL,
+ nullptr, nullptr,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE,
1, TERMINAL_TYPE_SCREEN);
@@ -52,7 +52,7 @@ terminal_mdi_container_default_init (TerminalMdiContainerInterface *iface)
G_TYPE_FROM_INTERFACE (iface),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (TerminalMdiContainerInterface, screen_added),
- NULL, NULL,
+ nullptr, nullptr,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE,
1, TERMINAL_TYPE_SCREEN);
@@ -62,8 +62,8 @@ terminal_mdi_container_default_init (TerminalMdiContainerInterface *iface)
G_TYPE_FROM_INTERFACE (iface),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (TerminalMdiContainerInterface, screen_switched),
- NULL, NULL,
- NULL,
+ nullptr, nullptr,
+ nullptr,
G_TYPE_NONE,
2, TERMINAL_TYPE_SCREEN, TERMINAL_TYPE_SCREEN);
@@ -72,7 +72,7 @@ terminal_mdi_container_default_init (TerminalMdiContainerInterface *iface)
G_TYPE_FROM_INTERFACE (iface),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (TerminalMdiContainerInterface, screens_reordered),
- NULL, NULL,
+ nullptr, nullptr,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE,
0);
@@ -82,13 +82,13 @@ terminal_mdi_container_default_init (TerminalMdiContainerInterface *iface)
G_TYPE_FROM_INTERFACE (iface),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (TerminalMdiContainerInterface, screen_close_request),
- NULL, NULL,
+ nullptr, nullptr,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE,
1, TERMINAL_TYPE_SCREEN);
g_object_interface_install_property (iface,
- g_param_spec_object ("active-screen", NULL, NULL,
+ g_param_spec_object ("active-screen", nullptr, nullptr,
TERMINAL_TYPE_SCREEN,
GParamFlags(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
}
@@ -119,7 +119,7 @@ terminal_mdi_container_remove_screen (TerminalMdiContainer *container,
TerminalScreen *
terminal_mdi_container_get_active_screen (TerminalMdiContainer *container)
{
- g_return_val_if_fail (TERMINAL_IS_MDI_CONTAINER (container), NULL);
+ g_return_val_if_fail (TERMINAL_IS_MDI_CONTAINER (container), nullptr);
return TERMINAL_MDI_CONTAINER_GET_IFACE (container)->get_active_screen (container);
}
@@ -138,7 +138,7 @@ terminal_mdi_container_set_active_screen (TerminalMdiContainer *container,
GList *
terminal_mdi_container_list_screens (TerminalMdiContainer *container)
{
- g_return_val_if_fail (TERMINAL_IS_MDI_CONTAINER (container), NULL);
+ g_return_val_if_fail (TERMINAL_IS_MDI_CONTAINER (container), nullptr);
return TERMINAL_MDI_CONTAINER_GET_IFACE (container)->list_screens (container);
}
@@ -146,7 +146,7 @@ terminal_mdi_container_list_screens (TerminalMdiContainer *container)
GList *
terminal_mdi_container_list_screen_containers (TerminalMdiContainer *container)
{
- g_return_val_if_fail (TERMINAL_IS_MDI_CONTAINER (container), NULL);
+ g_return_val_if_fail (TERMINAL_IS_MDI_CONTAINER (container), nullptr);
return TERMINAL_MDI_CONTAINER_GET_IFACE (container)->list_screen_containers (container);
}
diff --git a/src/terminal-menu-button.cc b/src/terminal-menu-button.cc
index e25b86fe..30d1c7cc 100644
--- a/src/terminal-menu-button.cc
+++ b/src/terminal-menu-button.cc
@@ -128,7 +128,7 @@ terminal_menu_button_class_init (TerminalMenuButtonClass *klass)
G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (TerminalMenuButtonClass, update_menu),
- NULL, NULL,
+ nullptr, nullptr,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE,
0);
diff --git a/src/terminal-nautilus.cc b/src/terminal-nautilus.cc
index 7f4ea8ca..381d3945 100644
--- a/src/terminal-nautilus.cc
+++ b/src/terminal-nautilus.cc
@@ -112,7 +112,7 @@ get_terminal_file_info_from_uri (const char *uri)
uri_scheme = g_uri_parse_scheme (uri);
- if (uri_scheme == NULL) {
+ if (uri_scheme == nullptr) {
ret = FILE_INFO_OTHER;
} else if (strcmp (uri_scheme, "file") == 0) {
ret = FILE_INFO_LOCAL;
@@ -148,12 +148,12 @@ parse_sftp_uri (GFile *file,
char *uri;
uri = g_file_get_uri (file);
- g_assert (uri != NULL);
+ g_assert (uri != nullptr);
save = uri;
- *path = NULL;
- *user = NULL;
- *host = NULL;
+ *path = nullptr;
+ *user = nullptr;
+ *host = nullptr;
*port = 0;
/* skip intial 'sftp:// prefix */
@@ -162,18 +162,18 @@ parse_sftp_uri (GFile *file,
/* cut out the path */
tmp = strchr (uri, '/');
- if (tmp != NULL) {
+ if (tmp != nullptr) {
*path = g_uri_unescape_string (tmp, "/");
*tmp = '\0';
}
/* read the username - it ends with @ */
tmp = strchr (uri, '@');
- if (tmp != NULL) {
+ if (tmp != nullptr) {
*tmp++ = '\0';
*user = strdup (uri);
- if (strchr (*user, ':') != NULL) {
+ if (strchr (*user, ':') != nullptr) {
/* chop the password */
*(strchr (*user, ':')) = '\0';
}
@@ -183,7 +183,7 @@ parse_sftp_uri (GFile *file,
/* now read the port, starts with : */
tmp = strchr (uri, ':');
- if (tmp != NULL) {
+ if (tmp != nullptr) {
*tmp++ = '\0';
*port = atoi (tmp); /*FIXME: getservbyname*/
}
@@ -203,7 +203,7 @@ ssh_argv (const char *uri,
char *host_name, *path, *user_name, *quoted_path;
guint host_port;
- g_assert (uri != NULL);
+ g_assert (uri != nullptr);
argv = g_new0 (char *, 9);
argc = 0;
@@ -214,7 +214,7 @@ ssh_argv (const char *uri,
parse_sftp_uri (file, &user_name, &host_name, &host_port, &path);
g_object_unref (file);
- if (user_name != NULL) {
+ if (user_name != nullptr) {
argv[argc++ ]= g_strdup_printf ("%s@%s", user_name, host_name);
g_free (host_name);
g_free (user_name);
@@ -258,7 +258,7 @@ uri_has_local_path (const char *uri)
file = g_file_new_for_uri (uri);
path = g_file_get_path (file);
- ret = (path != NULL);
+ ret = (path != nullptr);
g_free (path);
g_object_unref (file);
@@ -293,7 +293,7 @@ create_terminal (ExecData *data /* transfer full */)
{
TerminalFactory *factory;
TerminalReceiver *receiver;
- GError *error = NULL;
+ GError *error = nullptr;
GVariantBuilder builder;
char *object_path;
char startup_id[32];
@@ -305,9 +305,9 @@ create_terminal (ExecData *data /* transfer full */)
G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS),
TERMINAL_APPLICATION_ID,
TERMINAL_FACTORY_OBJECT_PATH,
- NULL /* cancellable */,
+ nullptr /* cancellable */,
&error);
- if (factory == NULL) {
+ if (factory == nullptr) {
g_dbus_error_strip_remote_error (error);
g_printerr ("Error constructing proxy for %s:%s: %s\n",
TERMINAL_APPLICATION_ID, TERMINAL_FACTORY_OBJECT_PATH,
@@ -324,11 +324,11 @@ create_terminal (ExecData *data /* transfer full */)
terminal_client_append_create_instance_options (&builder,
gdk_display_get_name (gdk_display_get_default ()),
startup_id,
- NULL /* geometry */,
- NULL /* role */,
- NULL /* use default profile */,
- NULL /* use profile encoding */,
- NULL /* title */,
+ nullptr /* geometry */,
+ nullptr /* role */,
+ nullptr /* use default profile */,
+ nullptr /* use profile encoding */,
+ nullptr /* title */,
TRUE, /* active */
FALSE /* maximised */,
FALSE /* fullscreen */);
@@ -337,7 +337,7 @@ create_terminal (ExecData *data /* transfer full */)
(factory,
g_variant_builder_end (&builder),
&object_path,
- NULL /* cancellable */,
+ nullptr /* cancellable */,
&error)) {
g_dbus_error_strip_remote_error (error);
g_printerr ("Error creating terminal: %s\n", error->message);
@@ -354,9 +354,9 @@ create_terminal (ExecData *data /* transfer full */)
G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS),
TERMINAL_APPLICATION_ID,
object_path,
- NULL /* cancellable */,
+ nullptr /* cancellable */,
&error);
- if (receiver == NULL) {
+ if (receiver == nullptr) {
g_dbus_error_strip_remote_error (error);
g_printerr ("Failed to create proxy for terminal: %s\n", error->message);
g_error_free (error);
@@ -372,22 +372,22 @@ create_terminal (ExecData *data /* transfer full */)
terminal_client_append_exec_options (&builder,
TRUE, /* pass environment */
data->path,
- NULL, 0, /* FD array */
+ nullptr, 0, /* FD array */
TRUE /* shell */);
if (data->info == FILE_INFO_SFTP &&
data->remote) {
argv = ssh_argv (data->uri, &argc);
} else {
- argv = NULL; argc = 0;
+ argv = nullptr; argc = 0;
}
if (!terminal_receiver_call_exec_sync (receiver,
g_variant_builder_end (&builder),
g_variant_new_bytestring_array ((const char * const *) argv, argc),
- NULL /* in FD list */,
- NULL /* out FD list */,
- NULL /* cancellable */,
+ nullptr /* in FD list */,
+ nullptr /* out FD list */,
+ nullptr /* cancellable */,
&error)) {
g_dbus_error_strip_remote_error (error);
g_printerr ("Error: %s\n", error->message);
@@ -417,15 +417,15 @@ terminal_nautilus_menu_item_activate (NautilusMenuItem *item)
ExecData *data;
uri = nautilus_file_info_get_activation_uri (menu_item->file_info);
- if (uri == NULL)
+ if (uri == nullptr)
return;
- path = NULL;
+ path = nullptr;
info = get_terminal_file_info_from_uri (uri);
switch (info) {
case FILE_INFO_LOCAL:
- path = g_filename_from_uri (uri, NULL, NULL);
+ path = g_filename_from_uri (uri, nullptr, nullptr);
break;
case FILE_INFO_DESKTOP:
@@ -452,7 +452,7 @@ terminal_nautilus_menu_item_activate (NautilusMenuItem *item)
g_assert_not_reached ();
}
- if (path == NULL && (info != FILE_INFO_SFTP || !menu_item->remote_terminal)) {
+ if (path == nullptr && (info != FILE_INFO_SFTP || !menu_item->remote_terminal)) {
g_free (uri);
return;
}
@@ -480,13 +480,13 @@ terminal_nautilus_menu_item_dispose (GObject *object)
{
TerminalNautilusMenuItem *menu_item = TERMINAL_NAUTILUS_MENU_ITEM (object);
- if (menu_item->file_info != NULL) {
+ if (menu_item->file_info != nullptr) {
g_object_unref (menu_item->file_info);
- menu_item->file_info = NULL;
+ menu_item->file_info = nullptr;
}
- if (menu_item->nautilus != NULL) {
+ if (menu_item->nautilus != nullptr) {
g_object_unref (menu_item->nautilus);
- menu_item->nautilus = NULL;
+ menu_item->nautilus = nullptr;
}
G_OBJECT_CLASS (terminal_nautilus_menu_item_parent_class)->dispose (object);
@@ -591,13 +591,13 @@ terminal_nautilus_get_background_items (NautilusMenuProvider *provider,
TerminalFileInfo terminal_file_info;
if (terminal_locked_down (nautilus))
- return NULL;
+ return nullptr;
uri = nautilus_file_info_get_activation_uri (file_info);
- if (uri == NULL)
- return NULL;
+ if (uri == nullptr)
+ return nullptr;
- items = NULL;
+ items = nullptr;
terminal_file_info = get_terminal_file_info_from_uri (uri);
@@ -642,24 +642,24 @@ terminal_nautilus_get_file_items (NautilusMenuProvider *provider,
TerminalFileInfo terminal_file_info;
if (terminal_locked_down (nautilus))
- return NULL;
+ return nullptr;
/* Only add items when passed exactly one file */
- if (files == NULL || files->next != NULL)
- return NULL;
+ if (files == nullptr || files->next != nullptr)
+ return nullptr;
file_info = (NautilusFileInfo *) files->data;
file_type = nautilus_file_info_get_file_type (file_info);
if (!nautilus_file_info_is_directory (file_info) &&
file_type != G_FILE_TYPE_SHORTCUT &&
file_type != G_FILE_TYPE_MOUNTABLE)
- return NULL;
+ return nullptr;
uri = nautilus_file_info_get_activation_uri (file_info);
- if (uri == NULL)
- return NULL;
+ if (uri == nullptr)
+ return nullptr;
- items = NULL;
+ items = nullptr;
terminal_file_info = get_terminal_file_info_from_uri (uri);
diff --git a/src/terminal-notebook.cc b/src/terminal-notebook.cc
index d89b4940..6686d349 100644
--- a/src/terminal-notebook.cc
+++ b/src/terminal-notebook.cc
@@ -101,7 +101,7 @@ close_button_clicked_cb (TerminalTabLabel *tab_label,
notebook = TERMINAL_NOTEBOOK (gtk_widget_get_ancestor (GTK_WIDGET (screen),
TERMINAL_TYPE_NOTEBOOK));
- if (notebook != NULL)
+ if (notebook != nullptr)
g_signal_emit_by_name (notebook, "screen-close-request", screen);
}
@@ -126,7 +126,7 @@ terminal_notebook_add_screen (TerminalMdiContainer *container,
GtkNotebook *gtk_notebook = GTK_NOTEBOOK (notebook);
GtkWidget *screen_container, *tab_label;
- g_warn_if_fail (gtk_widget_get_parent (GTK_WIDGET (screen)) == NULL);
+ g_warn_if_fail (gtk_widget_get_parent (GTK_WIDGET (screen)) == nullptr);
screen_container = terminal_screen_container_new (screen);
gtk_widget_show (screen_container);
@@ -135,7 +135,7 @@ terminal_notebook_add_screen (TerminalMdiContainer *container,
tab_label = terminal_tab_label_new (screen);
g_signal_connect (tab_label, "close-button-clicked",
- G_CALLBACK (close_button_clicked_cb), NULL);
+ G_CALLBACK (close_button_clicked_cb), nullptr);
gtk_notebook_insert_page (gtk_notebook,
screen_container,
@@ -145,7 +145,7 @@ terminal_notebook_add_screen (TerminalMdiContainer *container,
screen_container,
"tab-expand", TRUE,
"tab-fill", TRUE,
- NULL);
+ nullptr);
gtk_notebook_set_tab_reorderable (gtk_notebook, screen_container, TRUE);
#if 0
gtk_notebook_set_tab_detachable (gtk_notebook, screen_container, TRUE);
@@ -208,7 +208,7 @@ terminal_notebook_list_screens (TerminalMdiContainer *container)
GList *list, *l;
list = terminal_notebook_list_screen_containers (container);
- for (l = list; l != NULL; l = l->next)
+ for (l = list; l != nullptr; l = l->next)
l->data = terminal_screen_container_get_screen ((TerminalScreenContainer *) l->data);
return list;
@@ -390,7 +390,7 @@ terminal_notebook_init (TerminalNotebook *notebook)
priv = notebook->priv = TERMINAL_NOTEBOOK_GET_PRIVATE (notebook);
- priv->active_screen = NULL;
+ priv->active_screen = nullptr;
priv->policy = GTK_POLICY_AUTOMATIC;
}
@@ -496,7 +496,7 @@ terminal_notebook_class_init (TerminalNotebookClass *klass)
g_object_class_install_property
(gobject_class,
PROP_TAB_POLICY,
- g_param_spec_enum ("tab-policy", NULL, NULL,
+ g_param_spec_enum ("tab-policy", nullptr, nullptr,
GTK_TYPE_POLICY_TYPE,
GTK_POLICY_AUTOMATIC,
GParamFlags(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
@@ -559,15 +559,15 @@ terminal_notebook_get_action_box (TerminalNotebook *notebook,
GtkNotebook *gtk_notebook;
GtkWidget *box, *inner_box;
- g_return_val_if_fail (TERMINAL_IS_NOTEBOOK (notebook), NULL);
+ g_return_val_if_fail (TERMINAL_IS_NOTEBOOK (notebook), nullptr);
gtk_notebook = GTK_NOTEBOOK (notebook);
box = gtk_notebook_get_action_widget (gtk_notebook, pack_type);
- if (box != NULL) {
+ if (box != nullptr) {
gs_free_list GList *list;
list = gtk_container_get_children (GTK_CONTAINER (box));
- g_assert (list->data != NULL);
+ g_assert (list->data != nullptr);
return (GtkWidget*)list->data;
}
diff --git a/src/terminal-options.cc b/src/terminal-options.cc
index 04e38e24..d015d167 100644
--- a/src/terminal-options.cc
+++ b/src/terminal-options.cc
@@ -110,7 +110,7 @@ static GOptionContext *get_goption_context (TerminalOptions *options);
static TerminalSettingsList *
terminal_options_ensure_profiles_list (TerminalOptions *options)
{
- if (options->profiles_list == NULL)
+ if (options->profiles_list == nullptr)
options->profiles_list = terminal_profiles_list_new ();
return options->profiles_list;
@@ -126,7 +126,7 @@ terminal_util_key_file_get_string_unescape (GKeyFile *key_file,
escaped = g_key_file_get_string (key_file, group, key, error);
if (!escaped)
- return NULL;
+ return nullptr;
unescaped = g_strcompress (escaped);
g_free (escaped);
@@ -147,7 +147,7 @@ terminal_util_key_file_get_argv (GKeyFile *key_file,
flat = terminal_util_key_file_get_string_unescape (key_file, group, key, error);
if (!flat)
- return NULL;
+ return nullptr;
retval = g_shell_parse_argv (flat, argc, &argv, error);
g_free (flat);
@@ -155,7 +155,7 @@ terminal_util_key_file_get_argv (GKeyFile *key_file,
if (retval)
return argv;
- return NULL;
+ return nullptr;
}
static InitialTab*
@@ -166,14 +166,14 @@ initial_tab_new (char *profile /* adopts */)
it = g_slice_new (InitialTab);
it->profile = profile;
- it->exec_argv = NULL;
- it->title = NULL;
- it->working_dir = NULL;
+ it->exec_argv = nullptr;
+ it->title = nullptr;
+ it->working_dir = nullptr;
it->zoom = 1.0;
it->zoom_set = FALSE;
it->active = FALSE;
- it->fd_list = NULL;
- it->fd_array = NULL;
+ it->fd_list = nullptr;
+ it->fd_array = nullptr;
return it;
}
@@ -218,10 +218,10 @@ apply_window_defaults (TerminalOptions *options,
if (options->default_role)
{
iw->role = options->default_role;
- options->default_role = NULL;
+ options->default_role = nullptr;
}
- if (iw->geometry == NULL)
+ if (iw->geometry == nullptr)
iw->geometry = g_strdup (options->default_geometry);
if (options->default_window_menubar_forced)
@@ -252,7 +252,7 @@ add_new_window (TerminalOptions *options,
InitialTab *it;
iw = initial_window_new (0);
- iw->implicit_first_window = (options->initial_windows == NULL) && implicit_if_first_window;
+ iw->implicit_first_window = (options->initial_windows == nullptr) && implicit_if_first_window;
apply_window_defaults (options, iw);
it = initial_tab_new (profile);
@@ -261,7 +261,7 @@ add_new_window (TerminalOptions *options,
if (iw->implicit_first_window)
it->active = TRUE;
- iw->tabs = g_list_prepend (NULL, it);
+ iw->tabs = g_list_prepend (nullptr, it);
apply_tab_defaults (options, it);
options->initial_windows = g_list_append (options->initial_windows, iw);
@@ -274,8 +274,8 @@ ensure_top_window (TerminalOptions *options,
{
InitialWindow *iw;
- if (options->initial_windows == NULL)
- iw = add_new_window (options, NULL /* profile */, implicit_if_first_window);
+ if (options->initial_windows == nullptr)
+ iw = add_new_window (options, nullptr /* profile */, implicit_if_first_window);
else
iw = (InitialWindow*)g_list_last (options->initial_windows)->data;
@@ -400,12 +400,12 @@ option_command_callback (const gchar *option_name,
GError **error)
{
TerminalOptions *options = (TerminalOptions*)data;
- GError *err = NULL;
+ GError *err = nullptr;
char **exec_argv;
deprecated_command_option_warning (option_name);
- if (!g_shell_parse_argv (value, NULL, &exec_argv, &err))
+ if (!g_shell_parse_argv (value, nullptr, &exec_argv, &err))
{
g_set_error(error,
G_OPTION_ERROR,
@@ -444,16 +444,16 @@ option_profile_cb (const gchar *option_name,
profile = terminal_profiles_list_dup_uuid_or_name (terminal_options_ensure_profiles_list (options),
value, error);
- if (profile == NULL)
+ if (profile == nullptr)
{
terminal_printerr ("Profile '%s' specified but not found. Attempting to fall back "
"to the default profile.\n", value);
g_clear_error (error);
profile = terminal_profiles_list_dup_uuid_or_name (terminal_options_ensure_profiles_list (options),
- NULL, error);
+ nullptr, error);
}
- if (profile == NULL)
+ if (profile == nullptr)
return FALSE;
if (options->initial_windows)
@@ -483,7 +483,7 @@ option_profile_id_cb (const gchar *option_name,
profile = terminal_profiles_list_dup_uuid (terminal_options_ensure_profiles_list (options),
value, error);
- if (profile == NULL)
+ if (profile == nullptr)
return FALSE;
if (options->initial_windows)
@@ -512,22 +512,22 @@ option_window_callback (const gchar *option_name,
TerminalOptions *options = (TerminalOptions*)data;
char *profile;
- if (value != NULL) {
+ if (value != nullptr) {
profile = terminal_profiles_list_dup_uuid_or_name (terminal_options_ensure_profiles_list (options),
value, error);
- if (value && profile == NULL) {
+ if (value && profile == nullptr) {
terminal_printerr ("Profile '%s' specified but not found. Attempting to fall back "
"to the default profile.\n", value);
g_clear_error (error);
profile = terminal_profiles_list_dup_uuid_or_name (terminal_options_ensure_profiles_list (options),
- NULL, error);
+ nullptr, error);
}
- if (profile == NULL)
+ if (profile == nullptr)
return FALSE;
} else
- profile = NULL;
+ profile = nullptr;
add_new_window (options, profile /* adopts */, FALSE);
@@ -543,13 +543,13 @@ option_tab_callback (const gchar *option_name,
TerminalOptions *options = (TerminalOptions*)data;
char *profile;
- if (value != NULL) {
+ if (value != nullptr) {
profile = terminal_profiles_list_dup_uuid_or_name (terminal_options_ensure_profiles_list (options),
value, error);
- if (profile == NULL)
+ if (profile == nullptr)
return FALSE;
} else
- profile = NULL;
+ profile = nullptr;
if (options->initial_windows)
{
@@ -843,9 +843,9 @@ option_pass_fd_cb (const gchar *option_name,
}
InitialTab *it = ensure_top_tab (options);
- if (it->fd_list == NULL)
+ if (it->fd_list == nullptr)
it->fd_list = g_unix_fd_list_new ();
- if (it->fd_array == NULL)
+ if (it->fd_array == nullptr)
it->fd_array = g_array_sized_new (FALSE /* zero terminate */,
TRUE /* clear */,
sizeof (PassFdElement),
@@ -910,10 +910,10 @@ option_zoom_callback (const gchar *option_name,
* typed by a person, then fall back to ascii_strtod (we
* always save session in C locale format)
*/
- end = NULL;
+ end = nullptr;
errno = 0;
zoom = g_strtod (value, &end);
- if (end == NULL || *end != '\0')
+ if (end == nullptr || *end != '\0')
{
g_set_error (error,
G_OPTION_ERROR,
@@ -966,7 +966,7 @@ digest_options_callback (GOptionContext *context,
if (options->execute)
{
- if (options->exec_argv == NULL)
+ if (options->exec_argv == nullptr)
{
g_set_error (error,
G_OPTION_ERROR,
@@ -980,7 +980,7 @@ digest_options_callback (GOptionContext *context,
/* Apply -x/--execute command only to the first tab */
it = ensure_top_tab (options);
it->exec_argv = options->exec_argv;
- options->exec_argv = NULL;
+ options->exec_argv = nullptr;
}
return TRUE;
@@ -996,7 +996,7 @@ digest_options_callback (GOptionContext *context,
* Parses the argument vector *@argvp.
*
* Returns: a new #TerminalOptions containing the windows and tabs to open,
- * or %NULL on error.
+ * or %nullptr on error.
*/
TerminalOptions *
terminal_options_parse (int *argcp,
@@ -1020,15 +1020,15 @@ terminal_options_parse (int *argcp,
const char *startup_id = g_getenv ("DESKTOP_STARTUP_ID");
if (startup_id && startup_id[0] &&
- g_utf8_validate (startup_id, -1, NULL))
+ g_utf8_validate (startup_id, -1, nullptr))
options->startup_id = g_strdup (startup_id);
else
- options->startup_id = NULL;
- options->display_name = NULL;
- options->initial_windows = NULL;
- options->default_role = NULL;
- options->default_geometry = NULL;
- options->default_title = NULL;
+ options->startup_id = nullptr;
+ options->display_name = nullptr;
+ options->initial_windows = nullptr;
+ options->default_role = nullptr;
+ options->default_geometry = nullptr;
+ options->default_title = nullptr;
options->zoom = 1.0;
options->zoom_set = FALSE;
@@ -1036,7 +1036,7 @@ terminal_options_parse (int *argcp,
/* Collect info from gnome-terminal private env vars */
const char *server_unique_name = g_getenv (TERMINAL_ENV_SERVICE_NAME);
- if (server_unique_name != NULL) {
+ if (server_unique_name != nullptr) {
if (g_dbus_is_unique_name (server_unique_name))
options->server_unique_name = g_strdup (server_unique_name);
else
@@ -1046,7 +1046,7 @@ terminal_options_parse (int *argcp,
}
const char *parent_screen_object_path = g_getenv (TERMINAL_ENV_SCREEN);
- if (parent_screen_object_path != NULL) {
+ if (parent_screen_object_path != nullptr) {
if (g_variant_is_object_path (parent_screen_object_path))
options->parent_screen_object_path = g_strdup (parent_screen_object_path);
else
@@ -1057,7 +1057,7 @@ terminal_options_parse (int *argcp,
/* The old -x/--execute option is broken, so we need to pre-scan for it. */
/* We now also support passing the command after the -- switch. */
- options->exec_argv = NULL;
+ options->exec_argv = nullptr;
for (i = 1 ; i < *argcp; ++i)
{
gboolean is_execute;
@@ -1085,7 +1085,7 @@ terminal_options_parse (int *argcp,
options->exec_argv = g_new0 (char*, *argcp - i + 1);
for (j = 0; i < *argcp; ++i, ++j)
options->exec_argv[j] = g_strdup (argv[i]);
- options->exec_argv[j] = NULL;
+ options->exec_argv[j] = nullptr;
*argcp = last;
break;
@@ -1097,25 +1097,25 @@ terminal_options_parse (int *argcp,
if (!retval) {
terminal_options_free (options);
- return NULL;
+ return nullptr;
}
/* Do this here so that gdk_display is initialized */
- if (options->startup_id == NULL)
+ if (options->startup_id == nullptr)
options->startup_id = terminal_client_get_fallback_startup_id ();
- /* Still NULL? */
- if (options->startup_id == NULL)
+ /* Still nullptr? */
+ if (options->startup_id == nullptr)
terminal_printerr_detail ("Warning: DESKTOP_STARTUP_ID not set and no fallback available.\n");
GdkDisplay *display = gdk_display_get_default ();
- if (display != NULL)
+ if (display != nullptr)
options->display_name = g_strdup (gdk_display_get_name (display));
/* Sanity check */
guint wait = 0;
- for (GList *lw = options->initial_windows; lw != NULL; lw = lw->next) {
+ for (GList *lw = options->initial_windows; lw != nullptr; lw = lw->next) {
InitialWindow *iw = (InitialWindow*)lw->data;
- for (GList *lt = iw->tabs; lt != NULL; lt = lt->next) {
+ for (GList *lt = iw->tabs; lt != nullptr; lt = lt->next) {
InitialTab *it = (InitialTab*)lt->data;
if (it->wait)
wait++;
@@ -1154,7 +1154,7 @@ terminal_options_merge_config (TerminalOptions *options,
char **groups;
guint i;
gboolean have_error = FALSE;
- GList *initial_windows = NULL;
+ GList *initial_windows = nullptr;
if (!g_key_file_has_group (key_file, TERMINAL_CONFIG_GROUP))
{
@@ -1164,8 +1164,8 @@ terminal_options_merge_config (TerminalOptions *options,
return FALSE;
}
- version = g_key_file_get_integer (key_file, TERMINAL_CONFIG_GROUP, TERMINAL_CONFIG_PROP_VERSION, NULL);
- compat_version = g_key_file_get_integer (key_file, TERMINAL_CONFIG_GROUP, TERMINAL_CONFIG_PROP_COMPAT_VERSION, NULL);
+ version = g_key_file_get_integer (key_file, TERMINAL_CONFIG_GROUP, TERMINAL_CONFIG_PROP_VERSION, nullptr);
+ compat_version = g_key_file_get_integer (key_file, TERMINAL_CONFIG_GROUP, TERMINAL_CONFIG_PROP_COMPAT_VERSION, nullptr);
if (version <= 0 ||
compat_version <= 0 ||
@@ -1177,7 +1177,7 @@ terminal_options_merge_config (TerminalOptions *options,
return FALSE;
}
- groups = g_key_file_get_string_list (key_file, TERMINAL_CONFIG_GROUP, TERMINAL_CONFIG_PROP_WINDOWS, NULL, error);
+ groups = g_key_file_get_string_list (key_file, TERMINAL_CONFIG_GROUP, TERMINAL_CONFIG_PROP_WINDOWS, nullptr, error);
if (!groups)
return FALSE;
@@ -1189,7 +1189,7 @@ terminal_options_merge_config (TerminalOptions *options,
InitialWindow *iw;
guint j;
- tab_groups = g_key_file_get_string_list (key_file, window_group, TERMINAL_CONFIG_WINDOW_PROP_TABS, NULL, error);
+ tab_groups = g_key_file_get_string_list (key_file, window_group, TERMINAL_CONFIG_WINDOW_PROP_TABS, nullptr, error);
if (!tab_groups)
continue; /* no tabs in this window, skip it */
@@ -1197,15 +1197,15 @@ terminal_options_merge_config (TerminalOptions *options,
initial_windows = g_list_append (initial_windows, iw);
apply_window_defaults (options, iw);
- active_terminal = g_key_file_get_string (key_file, window_group, TERMINAL_CONFIG_WINDOW_PROP_ACTIVE_TAB, NULL);
- iw->role = g_key_file_get_string (key_file, window_group, TERMINAL_CONFIG_WINDOW_PROP_ROLE, NULL);
- iw->geometry = g_key_file_get_string (key_file, window_group, TERMINAL_CONFIG_WINDOW_PROP_GEOMETRY, NULL);
- iw->start_fullscreen = g_key_file_get_boolean (key_file, window_group, TERMINAL_CONFIG_WINDOW_PROP_FULLSCREEN, NULL);
- iw->start_maximized = g_key_file_get_boolean (key_file, window_group, TERMINAL_CONFIG_WINDOW_PROP_MAXIMIZED, NULL);
- if (g_key_file_has_key (key_file, window_group, TERMINAL_CONFIG_WINDOW_PROP_MENUBAR_VISIBLE, NULL))
+ active_terminal = g_key_file_get_string (key_file, window_group, TERMINAL_CONFIG_WINDOW_PROP_ACTIVE_TAB, nullptr);
+ iw->role = g_key_file_get_string (key_file, window_group, TERMINAL_CONFIG_WINDOW_PROP_ROLE, nullptr);
+ iw->geometry = g_key_file_get_string (key_file, window_group, TERMINAL_CONFIG_WINDOW_PROP_GEOMETRY, nullptr);
+ iw->start_fullscreen = g_key_file_get_boolean (key_file, window_group, TERMINAL_CONFIG_WINDOW_PROP_FULLSCREEN, nullptr);
+ iw->start_maximized = g_key_file_get_boolean (key_file, window_group, TERMINAL_CONFIG_WINDOW_PROP_MAXIMIZED, nullptr);
+ if (g_key_file_has_key (key_file, window_group, TERMINAL_CONFIG_WINDOW_PROP_MENUBAR_VISIBLE, nullptr))
{
iw->force_menubar_state = TRUE;
- iw->menubar_state = g_key_file_get_boolean (key_file, window_group, TERMINAL_CONFIG_WINDOW_PROP_MENUBAR_VISIBLE, NULL);
+ iw->menubar_state = g_key_file_get_boolean (key_file, window_group, TERMINAL_CONFIG_WINDOW_PROP_MENUBAR_VISIBLE, nullptr);
}
for (j = 0; tab_groups[j]; ++j)
@@ -1214,7 +1214,7 @@ terminal_options_merge_config (TerminalOptions *options,
InitialTab *it;
char *profile;
- profile = g_key_file_get_string (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_PROFILE_ID, NULL);
+ profile = g_key_file_get_string (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_PROFILE_ID, nullptr);
it = initial_tab_new (profile /* adopts */);
iw->tabs = g_list_append (iw->tabs, it);
@@ -1222,13 +1222,13 @@ terminal_options_merge_config (TerminalOptions *options,
if (g_strcmp0 (active_terminal, tab_group) == 0)
it->active = TRUE;
-/* it->width = g_key_file_get_integer (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_WIDTH, NULL);
- it->height = g_key_file_get_integer (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_HEIGHT, NULL);*/
- it->working_dir = terminal_util_key_file_get_string_unescape (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_WORKING_DIRECTORY, NULL);
- it->title = g_key_file_get_string (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_TITLE, NULL);
+/* it->width = g_key_file_get_integer (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_WIDTH, nullptr);
+ it->height = g_key_file_get_integer (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_HEIGHT, nullptr);*/
+ it->working_dir = terminal_util_key_file_get_string_unescape (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_WORKING_DIRECTORY, nullptr);
+ it->title = g_key_file_get_string (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_TITLE, nullptr);
- if (g_key_file_has_key (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_COMMAND, NULL) &&
- !(it->exec_argv = terminal_util_key_file_get_argv (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_COMMAND, NULL, error)))
+ if (g_key_file_has_key (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_COMMAND, nullptr) &&
+ !(it->exec_argv = terminal_util_key_file_get_argv (key_file, tab_group, TERMINAL_CONFIG_TERMINAL_PROP_COMMAND, nullptr, error)))
{
have_error = TRUE;
break;
@@ -1328,7 +1328,7 @@ get_goption_context (TerminalOptions *options)
G_OPTION_ARG_CALLBACK,
(void*)unsupported_option_fatal_callback,
N_("Do not register with the activation nameserver, do not re-use an active terminal"),
- NULL
+ nullptr
},
{
"load-config",
@@ -1345,7 +1345,7 @@ get_goption_context (TerminalOptions *options)
G_OPTION_FLAG_FILENAME | G_OPTION_FLAG_HIDDEN,
G_OPTION_ARG_CALLBACK,
(void*)unsupported_option_callback,
- NULL, NULL
+ nullptr, nullptr
},
{
"no-environment",
@@ -1354,7 +1354,7 @@ get_goption_context (TerminalOptions *options)
G_OPTION_ARG_NONE,
&options->no_environment,
N_("Do not pass the environment"),
- NULL
+ nullptr
},
{
"preferences",
@@ -1363,7 +1363,7 @@ get_goption_context (TerminalOptions *options)
G_OPTION_ARG_NONE,
&options->show_preferences,
N_("Show preferences window"),
- NULL
+ nullptr
},
{
"print-environment",
@@ -1372,7 +1372,7 @@ get_goption_context (TerminalOptions *options)
G_OPTION_ARG_NONE,
&options->print_environment,
N_("Print environment variables to interact with the terminal"),
- NULL
+ nullptr
},
{
"version",
@@ -1380,8 +1380,8 @@ get_goption_context (TerminalOptions *options)
G_OPTION_FLAG_NO_ARG | G_OPTION_FLAG_HIDDEN,
G_OPTION_ARG_CALLBACK,
(void*)option_version_cb,
- NULL,
- NULL
+ nullptr,
+ nullptr
},
{
"verbose",
@@ -1390,7 +1390,7 @@ get_goption_context (TerminalOptions *options)
G_OPTION_ARG_CALLBACK,
(void*)option_verbosity_cb,
N_("Increase diagnostic verbosity"),
- NULL
+ nullptr
},
{
"quiet",
@@ -1399,9 +1399,9 @@ get_goption_context (TerminalOptions *options)
G_OPTION_ARG_CALLBACK,
(void*)option_verbosity_cb,
N_("Suppress output"),
- NULL
+ nullptr
},
- { NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL }
+ { nullptr, 0, 0, G_OPTION_ARG_NONE, nullptr, nullptr, nullptr }
};
const GOptionEntry global_multiple_goptions[] = {
@@ -1412,7 +1412,7 @@ get_goption_context (TerminalOptions *options)
G_OPTION_ARG_CALLBACK,
(void*)option_window_callback,
N_("Open a new window containing a tab with the default profile"),
- NULL
+ nullptr
},
{
"tab",
@@ -1421,9 +1421,9 @@ get_goption_context (TerminalOptions *options)
G_OPTION_ARG_CALLBACK,
(void*)option_tab_callback,
N_("Open a new tab in the last-opened window with the default profile"),
- NULL
+ nullptr
},
- { NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL }
+ { nullptr, 0, 0, G_OPTION_ARG_NONE, nullptr, nullptr, nullptr }
};
const GOptionEntry window_goptions[] = {
@@ -1434,7 +1434,7 @@ get_goption_context (TerminalOptions *options)
G_OPTION_ARG_CALLBACK,
(void*)option_show_menubar_callback,
N_("Turn on the menubar"),
- NULL
+ nullptr
},
{
"hide-menubar",
@@ -1443,7 +1443,7 @@ get_goption_context (TerminalOptions *options)
G_OPTION_ARG_CALLBACK,
(void*)option_hide_menubar_callback,
N_("Turn off the menubar"),
- NULL
+ nullptr
},
{
"maximize",
@@ -1452,7 +1452,7 @@ get_goption_context (TerminalOptions *options)
G_OPTION_ARG_CALLBACK,
(void*)option_maximize_callback,
N_("Maximize the window"),
- NULL
+ nullptr
},
{
"full-screen",
@@ -1461,7 +1461,7 @@ get_goption_context (TerminalOptions *options)
G_OPTION_ARG_CALLBACK,
(void*)option_fullscreen_callback,
N_("Full-screen the window"),
- NULL
+ nullptr
},
{
"geometry",
@@ -1488,9 +1488,9 @@ get_goption_context (TerminalOptions *options)
G_OPTION_ARG_CALLBACK,
(void*)option_active_callback,
N_("Set the last specified tab as the active one in its window"),
- NULL
+ nullptr
},
- { NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL }
+ { nullptr, 0, 0, G_OPTION_ARG_NONE, nullptr, nullptr, nullptr }
};
const GOptionEntry terminal_goptions[] = {
@@ -1501,7 +1501,7 @@ get_goption_context (TerminalOptions *options)
G_OPTION_ARG_CALLBACK,
(void*)option_command_callback,
N_("Execute the argument to this option inside the terminal"),
- NULL
+ nullptr
},
{
"profile",
@@ -1537,7 +1537,7 @@ get_goption_context (TerminalOptions *options)
G_OPTION_ARG_CALLBACK,
(void*)option_wait_cb,
N_("Wait until the child exits"),
- NULL
+ nullptr
},
{
"fd",
@@ -1558,7 +1558,7 @@ get_goption_context (TerminalOptions *options)
N_("Set the terminal’s zoom factor (1.0 = normal size)"),
N_("ZOOM")
},
- { NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL }
+ { nullptr, 0, 0, G_OPTION_ARG_NONE, nullptr, nullptr, nullptr }
};
const GOptionEntry internal_goptions[] = {
@@ -1568,7 +1568,7 @@ get_goption_context (TerminalOptions *options)
G_OPTION_FLAG_HIDDEN,
G_OPTION_ARG_CALLBACK,
(void*)option_profile_id_cb,
- NULL, NULL
+ nullptr, nullptr
},
{
"window-with-profile",
@@ -1576,7 +1576,7 @@ get_goption_context (TerminalOptions *options)
G_OPTION_FLAG_HIDDEN,
G_OPTION_ARG_CALLBACK,
(void*)option_window_callback,
- NULL, NULL
+ nullptr, nullptr
},
{
"tab-with-profile",
@@ -1584,7 +1584,7 @@ get_goption_context (TerminalOptions *options)
G_OPTION_FLAG_HIDDEN,
G_OPTION_ARG_CALLBACK,
(void*)option_tab_callback,
- NULL, NULL
+ nullptr, nullptr
},
{
"window-with-profile-internal-id",
@@ -1592,7 +1592,7 @@ get_goption_context (TerminalOptions *options)
G_OPTION_FLAG_HIDDEN,
G_OPTION_ARG_CALLBACK,
(void*)option_window_callback,
- NULL, NULL
+ nullptr, nullptr
},
{
"tab-with-profile-internal-id",
@@ -1600,7 +1600,7 @@ get_goption_context (TerminalOptions *options)
G_OPTION_FLAG_HIDDEN,
G_OPTION_ARG_CALLBACK,
(void*)option_tab_callback,
- NULL, NULL
+ nullptr, nullptr
},
{
"default-working-directory",
@@ -1608,7 +1608,7 @@ get_goption_context (TerminalOptions *options)
G_OPTION_FLAG_HIDDEN,
G_OPTION_ARG_FILENAME,
&options->default_working_dir,
- NULL, NULL,
+ nullptr, nullptr,
},
{
"use-factory",
@@ -1616,7 +1616,7 @@ get_goption_context (TerminalOptions *options)
G_OPTION_FLAG_NO_ARG | G_OPTION_FLAG_HIDDEN,
G_OPTION_ARG_CALLBACK,
(void*)unsupported_option_callback,
- NULL, NULL
+ nullptr, nullptr
},
{
"startup-id",
@@ -1624,19 +1624,19 @@ get_goption_context (TerminalOptions *options)
G_OPTION_FLAG_HIDDEN,
G_OPTION_ARG_STRING,
&options->startup_id,
- NULL,
- NULL
+ nullptr,
+ nullptr
},
- { NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL }
+ { nullptr, 0, 0, G_OPTION_ARG_NONE, nullptr, nullptr, nullptr }
};
const GOptionEntry smclient_goptions[] = {
- { "sm-client-disable", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &options->sm_client_disable, NULL, NULL },
- { "sm-client-state-file", 0, G_OPTION_FLAG_HIDDEN | G_OPTION_FLAG_FILENAME, G_OPTION_ARG_CALLBACK, (void*)option_load_config_cb, NULL, NULL },
- { "sm-client-id", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING, &options->sm_client_id, NULL, NULL },
- { "sm-disable", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &options->sm_client_disable, NULL, NULL },
- { "sm-config-prefix", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING, &options->sm_config_prefix, NULL, NULL },
- { NULL }
+ { "sm-client-disable", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &options->sm_client_disable, nullptr, nullptr },
+ { "sm-client-state-file", 0, G_OPTION_FLAG_HIDDEN | G_OPTION_FLAG_FILENAME, G_OPTION_ARG_CALLBACK, (void*)option_load_config_cb, nullptr, nullptr },
+ { "sm-client-id", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING, &options->sm_client_id, nullptr, nullptr },
+ { "sm-disable", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &options->sm_client_disable, nullptr, nullptr },
+ { "sm-config-prefix", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING, &options->sm_config_prefix, nullptr, nullptr },
+ { nullptr }
};
GOptionContext *context;
@@ -1654,18 +1654,18 @@ get_goption_context (TerminalOptions *options)
N_("GNOME Terminal Emulator"),
N_("Show GNOME Terminal options"),
options,
- NULL);
+ nullptr);
g_option_group_set_translation_domain (group, GETTEXT_PACKAGE);
g_option_group_add_entries (group, global_unique_goptions);
g_option_group_add_entries (group, internal_goptions);
- g_option_group_set_parse_hooks (group, NULL, digest_options_callback);
+ g_option_group_set_parse_hooks (group, nullptr, digest_options_callback);
g_option_context_set_main_group (context, group);
group = g_option_group_new ("terminal",
N_("Options to open new windows or terminal tabs; more than one of these may be specified:"),
N_("Show terminal options"),
options,
- NULL);
+ nullptr);
g_option_group_set_translation_domain (group, GETTEXT_PACKAGE);
g_option_group_add_entries (group, global_multiple_goptions);
g_option_context_add_group (context, group);
@@ -1674,7 +1674,7 @@ get_goption_context (TerminalOptions *options)
N_("Window options; if used before the first --window or --tab argument, sets the default for all windows:"),
N_("Show per-window options"),
options,
- NULL);
+ nullptr);
g_option_group_set_translation_domain (group, GETTEXT_PACKAGE);
g_option_group_add_entries (group, window_goptions);
g_option_context_add_group (context, group);
@@ -1683,12 +1683,12 @@ get_goption_context (TerminalOptions *options)
N_("Terminal options; if used before the first --window or --tab argument, sets the default for all terminals:"),
N_("Show per-terminal options"),
options,
- NULL);
+ nullptr);
g_option_group_set_translation_domain (group, GETTEXT_PACKAGE);
g_option_group_add_entries (group, terminal_goptions);
g_option_context_add_group (context, group);
- group = g_option_group_new ("sm-client", "", "", options, NULL);
+ group = g_option_group_new ("sm-client", "", "", options, nullptr);
g_option_group_add_entries (group, smclient_goptions);
g_option_context_add_group (context, group);
diff --git a/src/terminal-options.hh b/src/terminal-options.hh
index dacdae93..60adebb3 100644
--- a/src/terminal-options.hh
+++ b/src/terminal-options.hh
@@ -63,7 +63,7 @@ enum
typedef struct
{
- TerminalSettingsList *profiles_list; /* may be NULL */
+ TerminalSettingsList *profiles_list; /* may be nullptr */
gboolean print_environment;
diff --git a/src/terminal-prefs.cc b/src/terminal-prefs.cc
index 4f366a2b..0c0c248d 100644
--- a/src/terminal-prefs.cc
+++ b/src/terminal-prefs.cc
@@ -37,7 +37,7 @@
#include "terminal-profiles-list.hh"
#include "terminal-libgsystem.hh"
-PrefData *the_pref_data = NULL; /* global */
+PrefData *the_pref_data = nullptr; /* global */
/* Bottom */
@@ -64,7 +64,7 @@ lookup_action (GtkWindow *window,
GAction *action;
action = g_action_map_lookup_action (G_ACTION_MAP (window), name);
- g_return_val_if_fail (action != NULL, NULL);
+ g_return_val_if_fail (action != nullptr, nullptr);
return G_SIMPLE_ACTION (action);
}
@@ -84,16 +84,16 @@ listbox_update (GtkListBox *box)
/* GTK+ doesn't seem to like if a popover is assigned to multiple buttons at once
* (not even temporarily), so make sure to remove it from the previous button first. */
- for (i = 0; (row = gtk_list_box_get_row_at_index (box, i)) != NULL; i++) {
+ for (i = 0; (row = gtk_list_box_get_row_at_index (box, i)) != nullptr; i++) {
button = (GtkMenuButton*)g_object_get_data (G_OBJECT (row), "popover-button");
- gtk_menu_button_set_popover (button, NULL);
+ gtk_menu_button_set_popover (button, nullptr);
}
- for (i = 0; (row = gtk_list_box_get_row_at_index (box, i)) != NULL; i++) {
+ for (i = 0; (row = gtk_list_box_get_row_at_index (box, i)) != nullptr; i++) {
profile = (GSettings*)g_object_get_data (G_OBJECT (row), "gsettings");
- gboolean is_selected_profile = (profile != NULL && profile == the_pref_data->selected_profile);
- gboolean is_default_profile = (profile != NULL && profile == default_profile);
+ gboolean is_selected_profile = (profile != nullptr && profile == the_pref_data->selected_profile);
+ gboolean is_default_profile = (profile != nullptr && profile == default_profile);
stack = (GtkStack*)g_object_get_data (G_OBJECT (row), "home-stack");
gtk_stack_set_visible_child_name (stack, is_default_profile ? "home" : "placeholder");
@@ -116,7 +116,7 @@ static void
update_window_title (void)
{
GtkListBoxRow *row = the_pref_data->selected_list_box_row;
- if (row == NULL)
+ if (row == nullptr)
return;
GSettings *profile = (GSettings*)g_object_get_data (G_OBJECT (row), "gsettings");
@@ -125,7 +125,7 @@ update_window_title (void)
gs_free char *subtitle;
gs_free char *title;
- if (profile == NULL) {
+ if (profile == nullptr) {
subtitle = g_strdup (text);
} else {
subtitle = g_strdup_printf (_("Profile “%s”"), text);
@@ -143,21 +143,21 @@ listbox_row_selected_cb (GtkListBox *box,
{
profile_prefs_unload ();
- /* row can be NULL intermittently during a profile meta operations */
+ /* row can be nullptr intermittently during a profile meta operations */
g_free (the_pref_data->selected_profile_uuid);
- if (row != NULL) {
+ if (row != nullptr) {
the_pref_data->selected_profile = (GSettings*)g_object_get_data (G_OBJECT (row), "gsettings");
the_pref_data->selected_profile_uuid = g_strdup ((char const*)g_object_get_data (G_OBJECT (row), "uuid"));
} else {
- the_pref_data->selected_profile = NULL;
- the_pref_data->selected_profile_uuid = NULL;
+ the_pref_data->selected_profile = nullptr;
+ the_pref_data->selected_profile_uuid = nullptr;
}
the_pref_data->selected_list_box_row = row;
listbox_update (box);
- if (row != NULL) {
- if (the_pref_data->selected_profile != NULL) {
+ if (row != nullptr) {
+ if (the_pref_data->selected_profile != nullptr) {
profile_prefs_load (the_pref_data->selected_profile_uuid, the_pref_data->selected_profile);
}
@@ -185,7 +185,7 @@ static gboolean
listbox_select_profile (const char *uuid)
{
GtkListBoxRow *row;
- for (int i = 0; (row = gtk_list_box_get_row_at_index (the_pref_data->listbox, i)) != NULL; i++) {
+ for (int i = 0; (row = gtk_list_box_get_row_at_index (the_pref_data->listbox, i)) != nullptr; i++) {
const char *rowuuid = (char const*) g_object_get_data (G_OBJECT (row), "uuid");
if (g_strcmp0 (rowuuid, uuid) == 0) {
g_signal_emit_by_name (row, "activate");
@@ -199,7 +199,7 @@ listbox_select_profile (const char *uuid)
static void
profile_new_now (const char *name)
{
- gs_free char *uuid = terminal_app_new_profile (terminal_app_get (), NULL, name);
+ gs_free char *uuid = terminal_app_new_profile (terminal_app_get (), nullptr, name);
listbox_select_profile (uuid);
}
@@ -208,7 +208,7 @@ profile_new_now (const char *name)
static void
profile_clone_now (const char *name)
{
- if (the_pref_data->selected_profile == NULL)
+ if (the_pref_data->selected_profile == nullptr)
return;
gs_free char *uuid = terminal_app_new_profile (terminal_app_get (), the_pref_data->selected_profile, name);
@@ -220,7 +220,7 @@ profile_clone_now (const char *name)
static void
profile_rename_now (const char *name)
{
- if (the_pref_data->selected_profile == NULL)
+ if (the_pref_data->selected_profile == nullptr)
return;
/* This will automatically trigger a call to profile_name_changed_cb(). */
@@ -231,17 +231,17 @@ profile_rename_now (const char *name)
static void
profile_delete_now (const char *dummy)
{
- if (the_pref_data->selected_profile == NULL)
+ if (the_pref_data->selected_profile == nullptr)
return;
/* Prepare to select the next one, or if there's no such then the previous one. */
int index = gtk_list_box_row_get_index (the_pref_data->selected_list_box_row);
GtkListBoxRow *new_selected_row = gtk_list_box_get_row_at_index (the_pref_data->listbox, index + 1);
- if (new_selected_row == NULL)
+ if (new_selected_row == nullptr)
new_selected_row = gtk_list_box_get_row_at_index (the_pref_data->listbox, index - 1);
GSettings *new_selected_profile = (GSettings*)g_object_get_data (G_OBJECT (new_selected_row), "gsettings");
- gs_free char *uuid = NULL;
- if (new_selected_profile != NULL)
+ gs_free char *uuid = nullptr;
+ if (new_selected_profile != nullptr)
uuid = terminal_settings_list_dup_uuid_from_child (the_pref_data->profiles_list, new_selected_profile);
terminal_app_remove_profile (terminal_app_get (), the_pref_data->selected_profile);
@@ -255,7 +255,7 @@ profile_set_as_default_cb (GSimpleAction *simple,
GVariant *parameter,
gpointer user_data)
{
- if (the_pref_data->selected_profile_uuid == NULL)
+ if (the_pref_data->selected_profile_uuid == nullptr)
return;
/* This will automatically trigger a call to listbox_update() via "default-changed". */
@@ -283,7 +283,7 @@ popover_dialog_ok_clicked_cb (GtkButton *button,
(*fn) (name);
/* Hide/popdown the popover */
- popover_dialog_cancel_clicked_cb (button, NULL);
+ popover_dialog_cancel_clicked_cb (button, nullptr);
}
static void
@@ -297,12 +297,12 @@ popover_dialog_closed_cb (GtkPopover *popover,
GtkButton *ok = GTK_BUTTON (gtk_builder_get_object (the_pref_data->builder, "popover-dialog-ok"));
GtkButton *cancel = GTK_BUTTON (gtk_builder_get_object (the_pref_data->builder, "popover-dialog-cancel"));
- g_signal_handlers_disconnect_matched (ok, G_SIGNAL_MATCH_FUNC, 0, 0, NULL,
- (void*)popover_dialog_ok_clicked_cb, NULL);
- g_signal_handlers_disconnect_matched (cancel, G_SIGNAL_MATCH_FUNC, 0, 0, NULL,
- (void*)popover_dialog_cancel_clicked_cb, NULL);
- g_signal_handlers_disconnect_matched (popover, G_SIGNAL_MATCH_FUNC, 0, 0, NULL,
- (void*)popover_dialog_closed_cb, NULL);
+ g_signal_handlers_disconnect_matched (ok, G_SIGNAL_MATCH_FUNC, 0, 0, nullptr,
+ (void*)popover_dialog_ok_clicked_cb, nullptr);
+ g_signal_handlers_disconnect_matched (cancel, G_SIGNAL_MATCH_FUNC, 0, 0, nullptr,
+ (void*)popover_dialog_cancel_clicked_cb, nullptr);
+ g_signal_handlers_disconnect_matched (popover, G_SIGNAL_MATCH_FUNC, 0, 0, nullptr,
+ (void*)popover_dialog_closed_cb, nullptr);
}
@@ -334,7 +334,7 @@ profile_popup_dialog (GtkWidget *relative_to,
gtk_label_set_text (label2, body);
GtkEntry *entry = GTK_ENTRY (gtk_builder_get_object (the_pref_data->builder, "popover-dialog-entry"));
- if (entry_text != NULL) {
+ if (entry_text != nullptr) {
gtk_entry_set_text (entry, entry_text);
gtk_widget_show (GTK_WIDGET (entry));
} else {
@@ -348,8 +348,8 @@ profile_popup_dialog (GtkWidget *relative_to,
GtkPopover *popover_dialog = GTK_POPOVER (gtk_builder_get_object (the_pref_data->builder, "popover-dialog"));
g_signal_connect (ok, "clicked", G_CALLBACK (popover_dialog_ok_clicked_cb), (void*)fn);
- g_signal_connect (cancel, "clicked", G_CALLBACK (popover_dialog_cancel_clicked_cb), NULL);
- g_signal_connect (popover_dialog, "closed", G_CALLBACK (popover_dialog_closed_cb), NULL);
+ g_signal_connect (cancel, "clicked", G_CALLBACK (popover_dialog_cancel_clicked_cb), nullptr);
+ g_signal_connect (popover_dialog, "closed", G_CALLBACK (popover_dialog_closed_cb), nullptr);
gtk_popover_set_relative_to (popover_dialog, relative_to);
gtk_popover_set_position (popover_dialog, GTK_POS_BOTTOM);
@@ -357,7 +357,7 @@ profile_popup_dialog (GtkWidget *relative_to,
gtk_popover_popup (popover_dialog);
- gtk_widget_grab_focus (entry_text != NULL ? GTK_WIDGET (entry) : GTK_WIDGET (cancel));
+ gtk_widget_grab_focus (entry_text != nullptr ? GTK_WIDGET (entry) : GTK_WIDGET (cancel));
}
/* "New" selected, ask for profile name */
@@ -398,7 +398,7 @@ profile_rename_cb (GSimpleAction *simple,
GVariant *parameter,
gpointer user_data)
{
- if (the_pref_data->selected_profile == NULL)
+ if (the_pref_data->selected_profile == nullptr)
return;
gs_free char *name = g_settings_get_string (the_pref_data->selected_profile, TERMINAL_PROFILE_VISIBLE_NAME_KEY);
@@ -419,7 +419,7 @@ profile_delete_cb (GSimpleAction *simple,
GVariant *parameter,
gpointer user_data)
{
- if (the_pref_data->selected_profile == NULL)
+ if (the_pref_data->selected_profile == nullptr)
return;
gs_free char *name = g_settings_get_string (the_pref_data->selected_profile, TERMINAL_PROFILE_VISIBLE_NAME_KEY);
@@ -429,7 +429,7 @@ profile_delete_cb (GSimpleAction *simple,
profile_popup_dialog (GTK_WIDGET (the_pref_data->selected_list_box_row),
_("Delete Profile"),
label,
- NULL,
+ nullptr,
_("Delete"),
profile_delete_now);
}
@@ -446,7 +446,7 @@ listbox_create_row (const char *name,
g_object_set_data_full (G_OBJECT (row), "stack_child_name", g_strdup (stack_child_name), g_free);
g_object_set_data_full (G_OBJECT (row), "uuid", g_strdup (uuid), g_free);
- if (gsettings != NULL)
+ if (gsettings != nullptr)
g_object_set_data_full (G_OBJECT (row), "gsettings", gsettings, (GDestroyNotify)g_object_unref);
g_object_set_data (G_OBJECT (row), "sort_order", sort_order);
@@ -457,7 +457,7 @@ listbox_create_row (const char *name,
gtk_widget_set_margin_bottom (GTK_WIDGET (hbox), 6);
GtkLabel *label = GTK_LABEL (gtk_label_new (name));
- if (gsettings != NULL) {
+ if (gsettings != nullptr) {
g_signal_connect (label, "notify::label", G_CALLBACK (profile_name_changed_cb), row);
g_settings_bind (gsettings,
TERMINAL_PROFILE_VISIBLE_NAME_KEY,
@@ -515,12 +515,12 @@ listbox_add_all_globals (PrefData *data)
row = listbox_create_row (_("General"),
"general-prefs",
- NULL, NULL, (gpointer) 0);
+ nullptr, nullptr, (gpointer) 0);
gtk_list_box_insert (data->listbox, GTK_WIDGET (row), -1);
row = listbox_create_row (_("Shortcuts"),
"shortcut-prefs",
- NULL, NULL, (gpointer) 1);
+ nullptr, nullptr, (gpointer) 1);
gtk_list_box_insert (data->listbox, GTK_WIDGET (row), -1);
}
@@ -530,16 +530,16 @@ listbox_remove_all_profiles (PrefData *data)
{
int i = 0;
- data->selected_profile = NULL;
+ data->selected_profile = nullptr;
g_free (data->selected_profile_uuid);
- data->selected_profile_uuid = NULL;
+ data->selected_profile_uuid = nullptr;
profile_prefs_unload ();
GtkListBoxRow *row = gtk_list_box_get_row_at_index (GTK_LIST_BOX (the_pref_data->listbox), 0);
g_signal_emit_by_name (row, "activate");
- while ((row = gtk_list_box_get_row_at_index (data->listbox, i)) != NULL) {
- if (g_object_get_data (G_OBJECT (row), "gsettings") != NULL) {
+ while ((row = gtk_list_box_get_row_at_index (data->listbox, i)) != nullptr) {
+ if (g_object_get_data (G_OBJECT (row), "gsettings") != nullptr) {
gtk_widget_destroy (GTK_WIDGET (row));
} else {
i++;
@@ -556,11 +556,11 @@ listbox_add_all_profiles (PrefData *data)
list = terminal_settings_list_ref_children (data->profiles_list);
- for (l = list; l != NULL; l = l->next) {
+ for (l = list; l != nullptr; l = l->next) {
GSettings *profile = (GSettings *) l->data;
gs_free gchar *uuid = terminal_settings_list_dup_uuid_from_child (data->profiles_list, profile);
- row = listbox_create_row (NULL,
+ row = listbox_create_row (nullptr,
"profile-prefs",
uuid,
profile /* adopts */,
@@ -589,7 +589,7 @@ listbox_readd_profiles (PrefData *data)
listbox_remove_all_profiles (data);
listbox_add_all_profiles (data);
- if (uuid != NULL)
+ if (uuid != nullptr)
listbox_select_profile (uuid);
}
@@ -604,7 +604,7 @@ listboxrow_create_header (const char *text,
gtk_widget_set_margin_top (GTK_WIDGET (hbox), 6);
gtk_widget_set_margin_bottom (GTK_WIDGET (hbox), 6);
- GtkLabel *label = GTK_LABEL (gtk_label_new (NULL));
+ GtkLabel *label = GTK_LABEL (gtk_label_new (nullptr));
gs_free char *markup = g_markup_printf_escaped ("<b>%s</b>", text);
gtk_label_set_markup (label, markup);
gtk_label_set_xalign (label, 0);
@@ -626,7 +626,7 @@ listboxrow_create_header (const char *text,
if (visible_button) {
gtk_stack_set_visible_child_name (stack, "button");
- g_signal_connect (button, "clicked", G_CALLBACK (profile_new_cb), NULL);
+ g_signal_connect (button, "clicked", G_CALLBACK (profile_new_cb), nullptr);
the_pref_data->new_profile_button = GTK_WIDGET (button);
} else {
gtk_stack_set_visible_child_name (stack, "placeholder");
@@ -641,20 +641,20 @@ listboxrow_update_header (GtkListBoxRow *row,
GtkListBoxRow *before,
gpointer user_data)
{
- if (before == NULL) {
- if (gtk_list_box_row_get_header (row) == NULL) {
+ if (before == nullptr) {
+ if (gtk_list_box_row_get_header (row) == nullptr) {
gtk_list_box_row_set_header (row, listboxrow_create_header (_("Global"), FALSE));
}
return;
}
GSettings *profile = (GSettings*)g_object_get_data (G_OBJECT (row), "gsettings");
- if (profile != NULL) {
+ if (profile != nullptr) {
GSettings *profile_before = (GSettings*)g_object_get_data (G_OBJECT (before), "gsettings");
- if (profile_before != NULL) {
- gtk_list_box_row_set_header (row, NULL);
+ if (profile_before != nullptr) {
+ gtk_list_box_row_set_header (row, nullptr);
} else {
- if (gtk_list_box_row_get_header (row) == NULL) {
+ if (gtk_list_box_row_get_header (row) == nullptr) {
gtk_list_box_row_set_header (row, listboxrow_create_header (_("Profiles"), TRUE));
}
}
@@ -731,13 +731,13 @@ terminal_prefs_show_preferences (GSettings *profile, const char *widget_name)
GSettings *settings;
const GActionEntry action_entries[] = {
- { "clone", profile_clone_cb, NULL, NULL, NULL },
- { "rename", profile_rename_cb, NULL, NULL, NULL },
- { "delete", profile_delete_cb, NULL, NULL, NULL },
- { "set-as-default", profile_set_as_default_cb, NULL, NULL, NULL },
+ { "clone", profile_clone_cb, nullptr, nullptr, nullptr },
+ { "rename", profile_rename_cb, nullptr, nullptr, nullptr },
+ { "delete", profile_delete_cb, nullptr, nullptr, nullptr },
+ { "set-as-default", profile_set_as_default_cb, nullptr, nullptr, nullptr },
};
- if (the_pref_data != NULL)
+ if (the_pref_data != nullptr)
goto done;
{
@@ -766,7 +766,7 @@ terminal_prefs_show_preferences (GSettings *profile, const char *widget_name)
"accelerators-treeview", &tree_view,
"the-stack", &data->stack,
"the-listbox", &data->listbox,
- NULL);
+ nullptr);
data->dialog = dialog;
@@ -784,10 +784,10 @@ terminal_prefs_show_preferences (GSettings *profile, const char *widget_name)
gtk_list_box_set_header_func (GTK_LIST_BOX (data->listbox),
listboxrow_update_header,
- NULL,
- NULL);
+ nullptr,
+ nullptr);
g_signal_connect (data->listbox, "row-selected", G_CALLBACK (listbox_row_selected_cb), data->stack);
- gtk_list_box_set_sort_func (data->listbox, listboxrow_compare_cb, NULL, NULL);
+ gtk_list_box_set_sort_func (data->listbox, listboxrow_compare_cb, nullptr, nullptr);
listbox_add_all_globals (data);
listbox_add_all_profiles (data);
@@ -805,7 +805,7 @@ terminal_prefs_show_preferences (GSettings *profile, const char *widget_name)
gboolean shell_shows_menubar;
g_object_get (gtk_settings_get_default (),
"gtk-shell-shows-menubar", &shell_shows_menubar,
- NULL);
+ nullptr);
if (shell_shows_menubar || terminal_app_get_use_headerbar (app)) {
gtk_widget_set_visible (show_menubar_button, FALSE);
} else {
@@ -895,7 +895,7 @@ terminal_prefs_show_preferences (GSettings *profile, const char *widget_name)
gtk_window_set_titlebar (GTK_WINDOW (dialog), headerbar);
/* Remove extra spacing around the content, and extra frames */
- g_object_set (G_OBJECT (content_box), "margin", 0, NULL);
+ g_object_set (G_OBJECT (content_box), "margin", 0, nullptr);
gtk_frame_set_shadow_type (GTK_FRAME (general_frame), GTK_SHADOW_NONE);
gtk_frame_set_shadow_type (GTK_FRAME (keybindings_frame), GTK_SHADOW_NONE);
}
@@ -910,7 +910,7 @@ terminal_prefs_show_preferences (GSettings *profile, const char *widget_name)
}
done:
- if (profile != NULL) {
+ if (profile != nullptr) {
gs_free char *uuid = terminal_settings_list_dup_uuid_from_child (the_pref_data->profiles_list, profile);
listbox_select_profile (uuid);
} else {
diff --git a/src/terminal-profiles-list.cc b/src/terminal-profiles-list.cc
index c19bf2b6..6d4c6a56 100644
--- a/src/terminal-profiles-list.cc
+++ b/src/terminal-profiles-list.cc
@@ -36,7 +36,7 @@ strv_contains (char **strv,
{
guint n, i;
- if (strv == NULL)
+ if (strv == nullptr)
return 0;
n = 0;
@@ -96,7 +96,7 @@ get_profile_names (TerminalSettingsList *list,
names[i] = g_settings_get_string (profile, TERMINAL_PROFILE_VISIBLE_NAME_KEY);
}
- names[n] = NULL;
+ names[n] = nullptr;
}
/**
@@ -118,7 +118,7 @@ terminal_profiles_list_ref_children_sorted (TerminalSettingsList *list)
* @uuid: (allow-none):
* @error:
*
- * Returns: (transfer full): the UUID of the profile specified by @uuid, or %NULL
+ * Returns: (transfer full): the UUID of the profile specified by @uuid, or %nullptr
*/
char *
terminal_profiles_list_dup_uuid (TerminalSettingsList *list,
@@ -127,13 +127,13 @@ terminal_profiles_list_dup_uuid (TerminalSettingsList *list,
{
char *rv;
- if (uuid == NULL) {
+ if (uuid == nullptr) {
rv = terminal_settings_list_dup_default_child (list);
- if (rv == NULL)
+ if (rv == nullptr)
goto err;
return rv;
} else if (!valid_uuid (uuid, error))
- return NULL;
+ return nullptr;
if (terminal_settings_list_has_child (list, uuid))
return g_strdup (uuid);
@@ -141,7 +141,7 @@ terminal_profiles_list_dup_uuid (TerminalSettingsList *list,
err:
g_set_error (error, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE,
"No profile with UUID \"%s\" exists", uuid);
- return NULL;
+ return nullptr;
}
/**
@@ -150,7 +150,7 @@ terminal_profiles_list_dup_uuid (TerminalSettingsList *list,
* @uuid:
* @error:
*
- * Returns: (transfer full): the profile #GSettings specified by @uuid, or %NULL
+ * Returns: (transfer full): the profile #GSettings specified by @uuid, or %nullptr
*/
GSettings *
terminal_profiles_list_ref_profile_by_uuid (TerminalSettingsList *list,
@@ -161,8 +161,8 @@ terminal_profiles_list_ref_profile_by_uuid (TerminalSettingsList *list,
GSettings *profile;
profile_uuid = terminal_profiles_list_dup_uuid (list, uuid, error);
- if (profile_uuid == NULL)
- return NULL;
+ if (profile_uuid == nullptr)
+ return nullptr;
profile = terminal_settings_list_ref_child (list, profile_uuid);
return profile;
@@ -174,7 +174,7 @@ terminal_profiles_list_ref_profile_by_uuid (TerminalSettingsList *list,
* @uuid: (allow-none):
* @error:
*
- * Returns: (transfer full): the UUID of the profile specified by @uuid, or %NULL
+ * Returns: (transfer full): the UUID of the profile specified by @uuid, or %nullptr
*/
char *
terminal_profiles_list_dup_uuid_or_name (TerminalSettingsList *list,
@@ -185,8 +185,8 @@ terminal_profiles_list_dup_uuid_or_name (TerminalSettingsList *list,
char *rv;
guint n, i;
- rv = terminal_profiles_list_dup_uuid (list, uuid_or_name, NULL);
- if (rv != NULL)
+ rv = terminal_profiles_list_dup_uuid (list, uuid_or_name, nullptr);
+ if (rv != nullptr)
return rv;
/* Not found as UUID; try finding a profile with this string as 'visible-name' */
@@ -196,11 +196,11 @@ terminal_profiles_list_dup_uuid_or_name (TerminalSettingsList *list,
if (n == 0) {
g_set_error (error, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE,
"No profile with UUID or name \"%s\" exists", uuid_or_name);
- rv = NULL;
+ rv = nullptr;
} else if (n != 1) {
g_set_error (error, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE,
"No profile with UUID \"%s\" found and name is ambiguous", uuid_or_name);
- rv = NULL;
+ rv = nullptr;
} else {
rv = g_strdup (profiles[i]);
}
@@ -217,7 +217,7 @@ terminal_profiles_list_dup_uuid_or_name (TerminalSettingsList *list,
* @uuid:
* @error:
*
- * Returns: (transfer full): the profile #GSettings specified by @uuid, or %NULL
+ * Returns: (transfer full): the profile #GSettings specified by @uuid, or %nullptr
*/
GSettings *
terminal_profiles_list_ref_profile_by_uuid_or_name (TerminalSettingsList *list,
@@ -228,11 +228,11 @@ terminal_profiles_list_ref_profile_by_uuid_or_name (TerminalSettingsList *list,
GSettings *profile;
uuid = terminal_profiles_list_dup_uuid_or_name (list, uuid_or_name, error);
- if (uuid == NULL)
- return NULL;
+ if (uuid == nullptr)
+ return nullptr;
profile = terminal_settings_list_ref_child (list, uuid);
- g_assert (profile != NULL);
+ g_assert (profile != nullptr);
return profile;
}
@@ -242,17 +242,17 @@ terminal_profiles_compare (gconstpointer pa,
{
GSettings *a = (GSettings *) pa;
GSettings *b = (GSettings *) pb;
- gs_free char *na = NULL;
- gs_free char *nb = NULL;
- gs_free char *patha = NULL;
- gs_free char *pathb = NULL;
+ gs_free char *na = nullptr;
+ gs_free char *nb = nullptr;
+ gs_free char *patha = nullptr;
+ gs_free char *pathb = nullptr;
int result;
if (pa == pb)
return 0;
- if (pa == NULL)
+ if (pa == nullptr)
return 1;
- if (pb == NULL)
+ if (pb == nullptr)
return -1;
na = g_settings_get_string (a, TERMINAL_PROFILE_VISIBLE_NAME_KEY);
@@ -261,7 +261,7 @@ terminal_profiles_compare (gconstpointer pa,
if (result != 0)
return result;
- g_object_get (a, "path", &patha, NULL);
- g_object_get (b, "path", &pathb, NULL);
+ g_object_get (a, "path", &patha, nullptr);
+ g_object_get (b, "path", &pathb, nullptr);
return strcmp (patha, pathb);
}
diff --git a/src/terminal-regex.cc b/src/terminal-regex.cc
index 90b8f8a5..9b1d2529 100644
--- a/src/terminal-regex.cc
+++ b/src/terminal-regex.cc
@@ -34,7 +34,7 @@ get_match (const char *pattern, const char *string, GRegexMatchFlags match_flags
GMatchInfo *match_info;
gchar *match;
- regex = g_regex_new (pattern, GRegexCompileFlags(0), GRegexMatchFlags(0), NULL);
+ regex = g_regex_new (pattern, GRegexCompileFlags(0), GRegexMatchFlags(0), nullptr);
g_regex_match (regex, string, match_flags, &match_info);
match = g_match_info_fetch (match_info, 0);
@@ -68,7 +68,7 @@ main (int argc, char **argv)
assert_match_anchored (SCHEME, "HTTPS", ENTIRE);
/* USER is nonempty, alphanumeric, dot, plus and dash */
- assert_match_anchored (USER, "", NULL);
+ assert_match_anchored (USER, "", nullptr);
assert_match_anchored (USER, "dr.john-smith", ENTIRE);
assert_match_anchored (USER, "abc+def@ghi", "abc+def");
@@ -85,19 +85,19 @@ main (int argc, char **argv)
assert_match_anchored (HOSTNAME1, "déjà-vu.com", ENTIRE);
assert_match_anchored (HOSTNAME1, "➡.ws", ENTIRE);
assert_match_anchored (HOSTNAME1, "cömbining-áccents", ENTIRE);
- assert_match_anchored (HOSTNAME1, "12", NULL);
- assert_match_anchored (HOSTNAME1, "12.34", NULL);
+ assert_match_anchored (HOSTNAME1, "12", nullptr);
+ assert_match_anchored (HOSTNAME1, "12.34", nullptr);
assert_match_anchored (HOSTNAME1, "12.ab", ENTIRE);
-// assert_match_anchored (HOSTNAME1, "ab.12", NULL); /* errr... could we fail here?? */
+// assert_match_anchored (HOSTNAME1, "ab.12", nullptr); /* errr... could we fail here?? */
/* Hostname of at least 2 components, containing at least one non-digit in at least one of the segments */
assert_match_anchored (HOSTNAME2, "example.com", ENTIRE);
- assert_match_anchored (HOSTNAME2, "example", NULL);
- assert_match_anchored (HOSTNAME2, "12", NULL);
- assert_match_anchored (HOSTNAME2, "12.34", NULL);
+ assert_match_anchored (HOSTNAME2, "example", nullptr);
+ assert_match_anchored (HOSTNAME2, "12", nullptr);
+ assert_match_anchored (HOSTNAME2, "12.34", nullptr);
assert_match_anchored (HOSTNAME2, "12.ab", ENTIRE);
- assert_match_anchored (HOSTNAME2, "ab.12", NULL);
-// assert_match_anchored (HOSTNAME2, "ab.cd.12", NULL); /* errr... could we fail here?? */
+ assert_match_anchored (HOSTNAME2, "ab.12", nullptr);
+// assert_match_anchored (HOSTNAME2, "ab.cd.12", nullptr); /* errr... could we fail here?? */
/* IPv4 segment (number between 0 and 255) */
assert_match_anchored (DEFS "(?&S4)", "0", ENTIRE);
@@ -109,75 +109,75 @@ main (int argc, char **argv)
assert_match_anchored (DEFS "(?&S4)", "200", ENTIRE);
assert_match_anchored (DEFS "(?&S4)", "250", ENTIRE);
assert_match_anchored (DEFS "(?&S4)", "255", ENTIRE);
- assert_match_anchored (DEFS "(?&S4)", "256", NULL);
- assert_match_anchored (DEFS "(?&S4)", "260", NULL);
- assert_match_anchored (DEFS "(?&S4)", "300", NULL);
- assert_match_anchored (DEFS "(?&S4)", "1000", NULL);
- assert_match_anchored (DEFS "(?&S4)", "", NULL);
- assert_match_anchored (DEFS "(?&S4)", "a1b", NULL);
+ assert_match_anchored (DEFS "(?&S4)", "256", nullptr);
+ assert_match_anchored (DEFS "(?&S4)", "260", nullptr);
+ assert_match_anchored (DEFS "(?&S4)", "300", nullptr);
+ assert_match_anchored (DEFS "(?&S4)", "1000", nullptr);
+ assert_match_anchored (DEFS "(?&S4)", "", nullptr);
+ assert_match_anchored (DEFS "(?&S4)", "a1b", nullptr);
/* IPv4 addresses */
assert_match_anchored (DEFS "(?&IPV4)", "11.22.33.44", ENTIRE);
assert_match_anchored (DEFS "(?&IPV4)", "0.1.254.255", ENTIRE);
- assert_match_anchored (DEFS "(?&IPV4)", "75.150.225.300", NULL);
+ assert_match_anchored (DEFS "(?&IPV4)", "75.150.225.300", nullptr);
assert_match_anchored (DEFS "(?&IPV4)", "1.2.3.4.5", "1.2.3.4"); /* we could also bail out and not match at all */
/* IPv6 addresses */
- assert_match_anchored (DEFS "(?&IPV6)", "11:::22", NULL);
- assert_match_anchored (DEFS "(?&IPV6)", "11:22::33:44::55:66", NULL);
+ assert_match_anchored (DEFS "(?&IPV6)", "11:::22", nullptr);
+ assert_match_anchored (DEFS "(?&IPV6)", "11:22::33:44::55:66", nullptr);
assert_match_anchored (DEFS "(?&IPV6)", "dead::beef", ENTIRE);
- assert_match_anchored (DEFS "(?&IPV6)", "faded::bee", NULL);
- assert_match_anchored (DEFS "(?&IPV6)", "live::pork", NULL);
+ assert_match_anchored (DEFS "(?&IPV6)", "faded::bee", nullptr);
+ assert_match_anchored (DEFS "(?&IPV6)", "live::pork", nullptr);
assert_match_anchored (DEFS "(?&IPV6)", "::1", ENTIRE);
- assert_match_anchored (DEFS "(?&IPV6)", "11::22:33::44", NULL);
- assert_match_anchored (DEFS "(?&IPV6)", "11:22:::33", NULL);
+ assert_match_anchored (DEFS "(?&IPV6)", "11::22:33::44", nullptr);
+ assert_match_anchored (DEFS "(?&IPV6)", "11:22:::33", nullptr);
assert_match_anchored (DEFS "(?&IPV6)", "dead:beef::192.168.1.1", ENTIRE);
- assert_match_anchored (DEFS "(?&IPV6)", "192.168.1.1", NULL);
- assert_match_anchored (DEFS "(?&IPV6)", "11:22:33:44:55:66:77:87654", NULL);
- assert_match_anchored (DEFS "(?&IPV6)", "11:22::33:45678", NULL);
- assert_match_anchored (DEFS "(?&IPV6)", "11:22:33:44:55:66:192.168.1.12345", NULL);
+ assert_match_anchored (DEFS "(?&IPV6)", "192.168.1.1", nullptr);
+ assert_match_anchored (DEFS "(?&IPV6)", "11:22:33:44:55:66:77:87654", nullptr);
+ assert_match_anchored (DEFS "(?&IPV6)", "11:22::33:45678", nullptr);
+ assert_match_anchored (DEFS "(?&IPV6)", "11:22:33:44:55:66:192.168.1.12345", nullptr);
- assert_match_anchored (DEFS "(?&IPV6)", "11:22:33:44:55:66:77", NULL); /* no :: */
+ assert_match_anchored (DEFS "(?&IPV6)", "11:22:33:44:55:66:77", nullptr); /* no :: */
assert_match_anchored (DEFS "(?&IPV6)", "11:22:33:44:55:66:77:88", ENTIRE);
- assert_match_anchored (DEFS "(?&IPV6)", "11:22:33:44:55:66:77:88:99", NULL);
+ assert_match_anchored (DEFS "(?&IPV6)", "11:22:33:44:55:66:77:88:99", nullptr);
assert_match_anchored (DEFS "(?&IPV6)", "::11:22:33:44:55:66:77", ENTIRE); /* :: at the start */
- assert_match_anchored (DEFS "(?&IPV6)", "::11:22:33:44:55:66:77:88", NULL);
+ assert_match_anchored (DEFS "(?&IPV6)", "::11:22:33:44:55:66:77:88", nullptr);
assert_match_anchored (DEFS "(?&IPV6)", "11:22:33::44:55:66:77", ENTIRE); /* :: in the middle */
- assert_match_anchored (DEFS "(?&IPV6)", "11:22:33::44:55:66:77:88", NULL);
+ assert_match_anchored (DEFS "(?&IPV6)", "11:22:33::44:55:66:77:88", nullptr);
assert_match_anchored (DEFS "(?&IPV6)", "11:22:33:44:55:66:77::", ENTIRE); /* :: at the end */
- assert_match_anchored (DEFS "(?&IPV6)", "11:22:33:44:55:66:77:88::", NULL);
+ assert_match_anchored (DEFS "(?&IPV6)", "11:22:33:44:55:66:77:88::", nullptr);
assert_match_anchored (DEFS "(?&IPV6)", "::", ENTIRE); /* :: only */
- assert_match_anchored (DEFS "(?&IPV6)", "11:22:33:44:55:192.168.1.1", NULL); /* no :: */
+ assert_match_anchored (DEFS "(?&IPV6)", "11:22:33:44:55:192.168.1.1", nullptr); /* no :: */
assert_match_anchored (DEFS "(?&IPV6)", "11:22:33:44:55:66:192.168.1.1", ENTIRE);
- assert_match_anchored (DEFS "(?&IPV6)", "11:22:33:44:55:66:77:192.168.1.1", NULL);
+ assert_match_anchored (DEFS "(?&IPV6)", "11:22:33:44:55:66:77:192.168.1.1", nullptr);
assert_match_anchored (DEFS "(?&IPV6)", "::11:22:33:44:55:192.168.1.1", ENTIRE); /* :: at the start */
- assert_match_anchored (DEFS "(?&IPV6)", "::11:22:33:44:55:66:192.168.1.1", NULL);
+ assert_match_anchored (DEFS "(?&IPV6)", "::11:22:33:44:55:66:192.168.1.1", nullptr);
assert_match_anchored (DEFS "(?&IPV6)", "11:22:33::44:55:192.168.1.1", ENTIRE); /* :: in the imddle */
- assert_match_anchored (DEFS "(?&IPV6)", "11:22:33::44:55:66:192.168.1.1", NULL);
+ assert_match_anchored (DEFS "(?&IPV6)", "11:22:33::44:55:66:192.168.1.1", nullptr);
assert_match_anchored (DEFS "(?&IPV6)", "11:22:33:44:55::192.168.1.1", ENTIRE); /* :: at the end(ish) */
- assert_match_anchored (DEFS "(?&IPV6)", "11:22:33:44:55:66::192.168.1.1", NULL);
+ assert_match_anchored (DEFS "(?&IPV6)", "11:22:33:44:55:66::192.168.1.1", nullptr);
assert_match_anchored (DEFS "(?&IPV6)", "::192.168.1.1", ENTIRE); /* :: only(ish) */
/* URL_HOST is either a hostname, or an IPv4 address, or a bracket-enclosed IPv6 address */
assert_match_anchored (DEFS URL_HOST, "example", ENTIRE);
assert_match_anchored (DEFS URL_HOST, "example.com", ENTIRE);
assert_match_anchored (DEFS URL_HOST, "11.22.33.44", ENTIRE);
- assert_match_anchored (DEFS URL_HOST, "[11.22.33.44]", NULL);
+ assert_match_anchored (DEFS URL_HOST, "[11.22.33.44]", nullptr);
assert_match_anchored (DEFS URL_HOST, "dead::be:ef", "dead"); /* TODO: can/should we totally abort here? */
assert_match_anchored (DEFS URL_HOST, "[dead::be:ef]", ENTIRE);
/* EMAIL_HOST is either an at least two-component hostname, or a bracket-enclosed IPv[46] address */
- assert_match_anchored (DEFS EMAIL_HOST, "example", NULL);
+ assert_match_anchored (DEFS EMAIL_HOST, "example", nullptr);
assert_match_anchored (DEFS EMAIL_HOST, "example.com", ENTIRE);
- assert_match_anchored (DEFS EMAIL_HOST, "11.22.33.44", NULL);
+ assert_match_anchored (DEFS EMAIL_HOST, "11.22.33.44", nullptr);
assert_match_anchored (DEFS EMAIL_HOST, "[11.22.33.44]", ENTIRE);
- assert_match_anchored (DEFS EMAIL_HOST, "[11.22.33.456]", NULL);
- assert_match_anchored (DEFS EMAIL_HOST, "dead::be:ef", NULL);
+ assert_match_anchored (DEFS EMAIL_HOST, "[11.22.33.456]", nullptr);
+ assert_match_anchored (DEFS EMAIL_HOST, "dead::be:ef", nullptr);
assert_match_anchored (DEFS EMAIL_HOST, "[dead::be:ef]", ENTIRE);
/* Number between 1 and 65535 (helper for port) */
- assert_match_anchored (N_1_65535, "0", NULL);
+ assert_match_anchored (N_1_65535, "0", nullptr);
assert_match_anchored (N_1_65535, "1", ENTIRE);
assert_match_anchored (N_1_65535, "10", ENTIRE);
assert_match_anchored (N_1_65535, "100", ENTIRE);
@@ -188,14 +188,14 @@ main (int argc, char **argv)
assert_match_anchored (N_1_65535, "65500", ENTIRE);
assert_match_anchored (N_1_65535, "65530", ENTIRE);
assert_match_anchored (N_1_65535, "65535", ENTIRE);
- assert_match_anchored (N_1_65535, "65536", NULL);
- assert_match_anchored (N_1_65535, "65540", NULL);
- assert_match_anchored (N_1_65535, "65600", NULL);
- assert_match_anchored (N_1_65535, "66000", NULL);
- assert_match_anchored (N_1_65535, "70000", NULL);
- assert_match_anchored (N_1_65535, "100000", NULL);
- assert_match_anchored (N_1_65535, "", NULL);
- assert_match_anchored (N_1_65535, "a1b", NULL);
+ assert_match_anchored (N_1_65535, "65536", nullptr);
+ assert_match_anchored (N_1_65535, "65540", nullptr);
+ assert_match_anchored (N_1_65535, "65600", nullptr);
+ assert_match_anchored (N_1_65535, "66000", nullptr);
+ assert_match_anchored (N_1_65535, "70000", nullptr);
+ assert_match_anchored (N_1_65535, "100000", nullptr);
+ assert_match_anchored (N_1_65535, "", nullptr);
+ assert_match_anchored (N_1_65535, "a1b", nullptr);
/* PORT is an optional colon-prefixed value */
assert_match_anchored (PORT, "", ENTIRE);
@@ -231,7 +231,7 @@ main (int argc, char **argv)
/* Put the components together and test the big picture */
- assert_match (REGEX_URL_AS_IS, "There's no URL here http:/foo", NULL);
+ assert_match (REGEX_URL_AS_IS, "There's no URL here http:/foo", nullptr);
assert_match (REGEX_URL_AS_IS, "Visit http://example.com for details", "http://example.com");
assert_match (REGEX_URL_AS_IS, "Trailing dot http://foo/bar.html.", "http://foo/bar.html");
assert_match (REGEX_URL_AS_IS, "Trailing ellipsis http://foo/bar.html...", "http://foo/bar.html");
@@ -245,7 +245,7 @@ main (int argc, char **argv)
assert_match (REGEX_URL_AS_IS, "<a href='http://foo/bar'>foo</a>", "http://foo/bar");
assert_match (REGEX_URL_AS_IS, "<url>http://foo/bar</url>", "http://foo/bar");
- assert_match (REGEX_URL_AS_IS, "http://", NULL);
+ assert_match (REGEX_URL_AS_IS, "http://", nullptr);
assert_match (REGEX_URL_AS_IS, "http://a", ENTIRE);
assert_match (REGEX_URL_AS_IS, "http://aa.", "http://aa");
assert_match (REGEX_URL_AS_IS, "http://aa.b", ENTIRE);
@@ -266,9 +266,9 @@ main (int argc, char **argv)
assert_match (REGEX_URL_AS_IS, "https://[dead::beef:11.22.33.44]", ENTIRE);
assert_match (REGEX_URL_AS_IS, "http://1.2.3.4:", "http://1.2.3.4"); /* TODO: can/should we totally abort here? */
assert_match (REGEX_URL_AS_IS, "https://dead::beef/no-brackets-ipv6", "https://dead"); /* ditto */
- assert_match (REGEX_URL_AS_IS, "http://111.222.333.444/", NULL);
+ assert_match (REGEX_URL_AS_IS, "http://111.222.333.444/", nullptr);
assert_match (REGEX_URL_AS_IS, "http://1.2.3.4:70000", "http://1.2.3.4"); /* TODO: can/should we totally abort here? */
- assert_match (REGEX_URL_AS_IS, "http://[dead::beef:111.222.333.444]", NULL);
+ assert_match (REGEX_URL_AS_IS, "http://[dead::beef:111.222.333.444]", nullptr);
/* Username, password */
assert_match (REGEX_URL_AS_IS, "http://joe@example.com", ENTIRE);
@@ -279,7 +279,7 @@ main (int argc, char **argv)
assert_match (REGEX_URL_AS_IS, "http://invalidusername!@host", "http://invalidusername");
assert_match (REGEX_URL_AS_IS, "http://ab.cd/ef?g=h&i=j|k=l#m=n:o=p", ENTIRE);
- assert_match (REGEX_URL_AS_IS, "http:///foo", NULL);
+ assert_match (REGEX_URL_AS_IS, "http:///foo", nullptr);
/* Parentheses are only allowed in matching pairs, see bug 763980. */
assert_match (REGEX_URL_AS_IS, "https://en.wikipedia.org/wiki/The_Offspring_(album)", ENTIRE);
@@ -300,23 +300,23 @@ main (int argc, char **argv)
assert_match (REGEX_URL_HTTP, "WWW3.foo.bar/baz", ENTIRE);
assert_match (REGEX_URL_HTTP, "FTP.FOO.BAR/BAZ", ENTIRE); /* FIXME if no scheme is given and url starts with ftp, can we make the protocol ftp instead of http? */
assert_match (REGEX_URL_HTTP, "ftpxy.foo.bar/baz", ENTIRE);
-// assert_match (REGEX_URL_HTTP, "ftp.123/baz", NULL); /* errr... could we fail here?? */
- assert_match (REGEX_URL_HTTP, "foo.bar/baz", NULL);
- assert_match (REGEX_URL_HTTP, "abc.www.foo.bar/baz", NULL);
- assert_match (REGEX_URL_HTTP, "uvwww.foo.bar/baz", NULL);
- assert_match (REGEX_URL_HTTP, "xftp.foo.bar/baz", NULL);
+// assert_match (REGEX_URL_HTTP, "ftp.123/baz", nullptr); /* errr... could we fail here?? */
+ assert_match (REGEX_URL_HTTP, "foo.bar/baz", nullptr);
+ assert_match (REGEX_URL_HTTP, "abc.www.foo.bar/baz", nullptr);
+ assert_match (REGEX_URL_HTTP, "uvwww.foo.bar/baz", nullptr);
+ assert_match (REGEX_URL_HTTP, "xftp.foo.bar/baz", nullptr);
/* file:/ or file://(hostname)?/ */
- assert_match (REGEX_URL_FILE, "file:", NULL);
+ assert_match (REGEX_URL_FILE, "file:", nullptr);
assert_match (REGEX_URL_FILE, "file:/", ENTIRE);
- assert_match (REGEX_URL_FILE, "file://", NULL);
+ assert_match (REGEX_URL_FILE, "file://", nullptr);
assert_match (REGEX_URL_FILE, "file:///", ENTIRE);
- assert_match (REGEX_URL_FILE, "file:////", NULL);
- assert_match (REGEX_URL_FILE, "file:etc/passwd", NULL);
+ assert_match (REGEX_URL_FILE, "file:////", nullptr);
+ assert_match (REGEX_URL_FILE, "file:etc/passwd", nullptr);
assert_match (REGEX_URL_FILE, "File:/etc/passwd", ENTIRE);
assert_match (REGEX_URL_FILE, "FILE:///etc/passwd", ENTIRE);
- assert_match (REGEX_URL_FILE, "file:////etc/passwd", NULL);
- assert_match (REGEX_URL_FILE, "file://host.name", NULL);
+ assert_match (REGEX_URL_FILE, "file:////etc/passwd", nullptr);
+ assert_match (REGEX_URL_FILE, "file://host.name", nullptr);
assert_match (REGEX_URL_FILE, "file://host.name/", ENTIRE);
assert_match (REGEX_URL_FILE, "file://host.name/etc", ENTIRE);
@@ -331,13 +331,13 @@ main (int argc, char **argv)
assert_match (REGEX_EMAIL, "Write to mailto:foo@bar.com.", "mailto:foo@bar.com");
assert_match (REGEX_EMAIL, "Write to MAILTO:FOO@BAR.COM.", "MAILTO:FOO@BAR.COM");
assert_match (REGEX_EMAIL, "Write to foo@[1.2.3.4]", "foo@[1.2.3.4]");
- assert_match (REGEX_EMAIL, "Write to foo@[1.2.3.456]", NULL);
+ assert_match (REGEX_EMAIL, "Write to foo@[1.2.3.456]", nullptr);
assert_match (REGEX_EMAIL, "Write to foo@[1::2345]", "foo@[1::2345]");
assert_match (REGEX_EMAIL, "Write to foo@[dead::beef]", "foo@[dead::beef]");
- assert_match (REGEX_EMAIL, "Write to foo@1.2.3.4", NULL);
- assert_match (REGEX_EMAIL, "Write to foo@1.2.3.456", NULL);
- assert_match (REGEX_EMAIL, "Write to foo@1::2345", NULL);
- assert_match (REGEX_EMAIL, "Write to foo@dead::beef", NULL);
+ assert_match (REGEX_EMAIL, "Write to foo@1.2.3.4", nullptr);
+ assert_match (REGEX_EMAIL, "Write to foo@1.2.3.456", nullptr);
+ assert_match (REGEX_EMAIL, "Write to foo@1::2345", nullptr);
+ assert_match (REGEX_EMAIL, "Write to foo@dead::beef", nullptr);
assert_match (REGEX_EMAIL, "<baz email=\"foo@bar.com\"/>", "foo@bar.com");
assert_match (REGEX_EMAIL, "<baz email='foo@bar.com'/>", "foo@bar.com");
assert_match (REGEX_EMAIL, "<email>foo@bar.com</email>", "foo@bar.com");
diff --git a/src/terminal-regex.hh b/src/terminal-regex.hh
index 143a8fa0..868b017d 100644
--- a/src/terminal-regex.hh
+++ b/src/terminal-regex.hh
@@ -88,7 +88,7 @@
/* Ends with :: */
#define IPV6_RIGHT "(?x: (?&S6C){1,7} : )"
/* Is "::" and nothing more */
-#define IPV6_NULL "(?x: :: )"
+#define IPV6NULL "(?x: :: )"
/* The same ones for IPv4-embedded notation, without the actual IPv4 part */
#define IPV6V4_FULL "(?x: (?&S6C){6} )"
@@ -98,7 +98,7 @@
/* IPV6: An IPv6 address (possibly with an embedded IPv4).
* This macro defines both IPV4 and IPV6, since the latter one requires the former. */
-#define IP_DEF IPV4_DEF S6_DEF "(?(DEFINE)(?<IPV6>(?x: (?: " IPV6_NULL " | " IPV6_LEFT " | " IPV6_MID " | " IPV6_RIGHT " | " IPV6_FULL " | (?: " IPV6V4_FULL " | " IPV6V4_LEFT " | " IPV6V4_MID " | " IPV6V4_RIGHT " ) (?&IPV4) ) (?! [.:[:xdigit:]] ) )))"
+#define IP_DEF IPV4_DEF S6_DEF "(?(DEFINE)(?<IPV6>(?x: (?: " IPV6NULL " | " IPV6_LEFT " | " IPV6_MID " | " IPV6_RIGHT " | " IPV6_FULL " | (?: " IPV6V4_FULL " | " IPV6V4_LEFT " | " IPV6V4_MID " | " IPV6V4_RIGHT " ) (?&IPV4) ) (?! [.:[:xdigit:]] ) )))"
/* Either an alphanumeric character or dash; or if [negative lookahead] not ASCII
* then any graphical Unicode character.
diff --git a/src/terminal-screen-container.cc b/src/terminal-screen-container.cc
index 6158d213..6d851908 100644
--- a/src/terminal-screen-container.cc
+++ b/src/terminal-screen-container.cc
@@ -84,12 +84,12 @@ terminal_screen_container_style_updated (GtkWidget *widget)
gtk_widget_style_get (widget,
"window-placement", &corner,
"window-placement-set", &set,
- NULL);
+ nullptr);
if (!set) {
g_object_get (gtk_widget_get_settings (widget),
"gtk-scrolled-window-placement", &corner,
- NULL);
+ nullptr);
}
switch (corner) {
@@ -129,7 +129,7 @@ terminal_screen_container_constructed (GObject *object)
G_OBJECT_CLASS (terminal_screen_container_parent_class)->constructed (object);
- g_assert (priv->screen != NULL);
+ g_assert (priv->screen != nullptr);
#ifdef USE_SCROLLED_WINDOW
{
@@ -236,13 +236,13 @@ terminal_screen_container_class_init (TerminalScreenContainerClass *klass)
widget_class->style_updated = terminal_screen_container_style_updated;
gtk_widget_class_install_style_property (widget_class,
- g_param_spec_enum ("window-placement", NULL, NULL,
+ g_param_spec_enum ("window-placement", nullptr, nullptr,
GTK_TYPE_CORNER_TYPE,
GTK_CORNER_BOTTOM_RIGHT,
GParamFlags(G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS)));
gtk_widget_class_install_style_property (widget_class,
- g_param_spec_boolean ("window-placement-set", NULL, NULL,
+ g_param_spec_boolean ("window-placement-set", nullptr, nullptr,
FALSE,
GParamFlags(G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS)));
@@ -253,7 +253,7 @@ terminal_screen_container_class_init (TerminalScreenContainerClass *klass)
g_object_class_install_property
(gobject_class,
PROP_SCREEN,
- g_param_spec_object ("screen", NULL, NULL,
+ g_param_spec_object ("screen", nullptr, nullptr,
TERMINAL_TYPE_SCREEN,
GParamFlags(G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY |
@@ -262,7 +262,7 @@ terminal_screen_container_class_init (TerminalScreenContainerClass *klass)
g_object_class_install_property
(gobject_class,
PROP_HSCROLLBAR_POLICY,
- g_param_spec_enum ("hscrollbar-policy", NULL, NULL,
+ g_param_spec_enum ("hscrollbar-policy", nullptr, nullptr,
GTK_TYPE_POLICY_TYPE,
GTK_POLICY_AUTOMATIC,
GParamFlags(G_PARAM_READWRITE |
@@ -270,7 +270,7 @@ terminal_screen_container_class_init (TerminalScreenContainerClass *klass)
g_object_class_install_property
(gobject_class,
PROP_VSCROLLBAR_POLICY,
- g_param_spec_enum ("vscrollbar-policy", NULL, NULL,
+ g_param_spec_enum ("vscrollbar-policy", nullptr, nullptr,
GTK_TYPE_POLICY_TYPE,
GTK_POLICY_AUTOMATIC,
GParamFlags(G_PARAM_READWRITE |
@@ -303,10 +303,10 @@ terminal_screen_container_new (TerminalScreen *screen)
TerminalScreen *
terminal_screen_container_get_screen (TerminalScreenContainer *container)
{
- if (container == NULL)
- return NULL;
+ if (container == nullptr)
+ return nullptr;
- g_return_val_if_fail (TERMINAL_IS_SCREEN_CONTAINER (container), NULL);
+ g_return_val_if_fail (TERMINAL_IS_SCREEN_CONTAINER (container), nullptr);
return container->priv->screen;
}
@@ -320,10 +320,10 @@ terminal_screen_container_get_screen (TerminalScreenContainer *container)
TerminalScreenContainer *
terminal_screen_container_get_from_screen (TerminalScreen *screen)
{
- if (screen == NULL)
- return NULL;
+ if (screen == nullptr)
+ return nullptr;
- g_return_val_if_fail (TERMINAL_IS_SCREEN (screen), NULL);
+ g_return_val_if_fail (TERMINAL_IS_SCREEN (screen), nullptr);
return TERMINAL_SCREEN_CONTAINER (gtk_widget_get_ancestor (GTK_WIDGET (screen), TERMINAL_TYPE_SCREEN_CONTAINER));
}
diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc
index 06ab3164..382ac296 100644
--- a/src/terminal-screen.cc
+++ b/src/terminal-screen.cc
@@ -100,7 +100,7 @@ struct _TerminalScreenPrivate
char *uuid;
gboolean registered; /* D-Bus interface is registered */
- GSettings *profile; /* never NULL */
+ GSettings *profile; /* never nullptr */
guint profile_changed_id;
guint profile_forgotten_id;
int child_pid;
@@ -244,8 +244,8 @@ strv_to_string (char **strv)
static char*
exec_data_to_string (ExecData *data)
{
- gs_free char *str1 = NULL;
- gs_free char *str2 = NULL;
+ gs_free char *str1 = nullptr;
+ gs_free char *str2 = nullptr;
return data ? g_strdup_printf ("data %p argv:[%s] exec-argv:[%s] envv:%p(%u) as-shell:%s cwd:%s",
data,
(str1 = strv_to_string (data->argv)),
@@ -268,15 +268,15 @@ exec_data_new (void)
static ExecData *
exec_data_clone (ExecData *data)
{
- if (data == NULL)
- return NULL;
+ if (data == nullptr)
+ return nullptr;
ExecData *clone = exec_data_new ();
clone->envv = g_strdupv (data->envv);
clone->cwd = g_strdup (data->cwd);
/* If FDs were passed, cannot repeat argv. Return data only for env and cwd */
- if (data->fd_list != NULL) {
+ if (data->fd_list != nullptr) {
clone->as_shell = TRUE;
return clone;
}
@@ -306,7 +306,7 @@ exec_data_ref (ExecData *data)
static void
exec_data_unref (ExecData *data)
{
- if (data == NULL)
+ if (data == nullptr)
return;
if (--data->refcount > 0)
@@ -336,18 +336,18 @@ terminal_screen_clear_exec_data (TerminalScreen *screen,
{
TerminalScreenPrivate *priv = screen->priv;
- if (priv->exec_data == NULL)
+ if (priv->exec_data == nullptr)
return;
if (cancelled) {
- gs_free_error GError *err = NULL;
+ gs_free_error GError *err = nullptr;
g_set_error_literal (&err, G_IO_ERROR, G_IO_ERROR_CANCELLED,
"Spawning was cancelled");
exec_data_callback (priv->exec_data, err, screen);
}
exec_data_unref (priv->exec_data);
- priv->exec_data = NULL;
+ priv->exec_data = nullptr;
}
G_DEFINE_TYPE (TerminalScreen, terminal_screen, VTE_TYPE_TERMINAL)
@@ -371,7 +371,7 @@ precompile_regexes (const TerminalRegexPattern *regex_patterns,
for (i = 0; i < n_regexes; ++i)
{
- GError *error = NULL;
+ GError *error = nullptr;
(*regexes)[i] = vte_regex_new_for_match (regex_patterns[i].pattern, -1,
PCRE2_UTF | PCRE2_NO_UTF_CHECK | PCRE2_UCP | PCRE2_MULTILINE,
@@ -420,7 +420,7 @@ terminal_screen_get_window (TerminalScreen *screen)
toplevel = gtk_widget_get_toplevel (widget);
if (!gtk_widget_is_toplevel (toplevel))
- return NULL;
+ return nullptr;
return TERMINAL_WINDOW (toplevel);
}
@@ -524,7 +524,7 @@ terminal_screen_init (TerminalScreen *screen)
}
/* Setup DND */
- target_list = gtk_target_list_new (NULL, 0);
+ target_list = gtk_target_list_new (nullptr, 0);
gtk_target_list_add_uri_targets (target_list, 0);
gtk_target_list_add_text_targets (target_list, 0);
gtk_target_list_add_table (target_list, target_table, G_N_ELEMENTS (target_table));
@@ -552,8 +552,8 @@ terminal_screen_init (TerminalScreen *screen)
#ifdef ENABLE_DEBUG
_TERMINAL_DEBUG_IF (TERMINAL_DEBUG_GEOMETRY)
{
- g_signal_connect_after (screen, "size-request", G_CALLBACK (size_request), NULL);
- g_signal_connect_after (screen, "size-allocate", G_CALLBACK (size_allocate), NULL);
+ g_signal_connect_after (screen, "size-request", G_CALLBACK (size_request), nullptr);
+ g_signal_connect_after (screen, "size-allocate", G_CALLBACK (size_allocate), nullptr);
}
#endif
}
@@ -628,7 +628,7 @@ terminal_screen_class_init (TerminalScreenClass *klass)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (TerminalScreenClass, profile_set),
- NULL, NULL,
+ nullptr, nullptr,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE,
1, G_TYPE_SETTINGS);
@@ -638,7 +638,7 @@ terminal_screen_class_init (TerminalScreenClass *klass)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (TerminalScreenClass, show_popup_menu),
- NULL, NULL,
+ nullptr, nullptr,
g_cclosure_marshal_VOID__POINTER,
G_TYPE_NONE,
1,
@@ -649,7 +649,7 @@ terminal_screen_class_init (TerminalScreenClass *klass)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (TerminalScreenClass, match_clicked),
- g_signal_accumulator_true_handled, NULL,
+ g_signal_accumulator_true_handled, nullptr,
_terminal_marshal_BOOLEAN__STRING_INT_UINT,
G_TYPE_BOOLEAN,
3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_UINT);
@@ -659,7 +659,7 @@ terminal_screen_class_init (TerminalScreenClass *klass)
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (TerminalScreenClass, close_screen),
- NULL, NULL,
+ nullptr, nullptr,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE,
0);
@@ -667,7 +667,7 @@ terminal_screen_class_init (TerminalScreenClass *klass)
g_object_class_install_property
(object_class,
PROP_PROFILE,
- g_param_spec_object ("profile", NULL, NULL,
+ g_param_spec_object ("profile", nullptr, nullptr,
G_TYPE_SETTINGS,
GParamFlags(G_PARAM_READWRITE |
G_PARAM_STATIC_NAME |
@@ -677,8 +677,8 @@ terminal_screen_class_init (TerminalScreenClass *klass)
g_object_class_install_property
(object_class,
PROP_TITLE,
- g_param_spec_string ("title", NULL, NULL,
- NULL,
+ g_param_spec_string ("title", nullptr, nullptr,
+ nullptr,
GParamFlags(G_PARAM_READABLE |
G_PARAM_STATIC_NAME |
G_PARAM_STATIC_NICK |
@@ -724,7 +724,7 @@ terminal_screen_dispose (GObject *object)
settings = gtk_widget_get_settings (GTK_WIDGET (screen));
g_signal_handlers_disconnect_matched (settings, G_SIGNAL_MATCH_DATA,
- 0, 0, NULL, NULL,
+ 0, 0, nullptr, nullptr,
screen);
if (priv->idle_exec_source != 0)
@@ -758,7 +758,7 @@ terminal_screen_finalize (GObject *object)
(void*)terminal_screen_system_font_changed_cb,
screen);
- terminal_screen_set_profile (screen, NULL);
+ terminal_screen_set_profile (screen, nullptr);
g_slist_free_full (priv->match_tags, (GDestroyNotify) free_tag_data);
@@ -772,7 +772,7 @@ terminal_screen_new (GSettings *profile,
const char *title,
double zoom)
{
- g_return_val_if_fail (G_IS_SETTINGS (profile), NULL);
+ g_return_val_if_fail (G_IS_SETTINGS (profile), nullptr);
TerminalScreen *screen = (TerminalScreen*)g_object_new (TERMINAL_TYPE_SCREEN, nullptr);
@@ -785,7 +785,7 @@ terminal_screen_new (GSettings *profile,
/* If given an initial title, strip it of control characters and
* feed it to the terminal.
*/
- if (title != NULL) {
+ if (title != nullptr) {
GString *seq;
const char *p;
@@ -830,13 +830,13 @@ terminal_screen_reexec_from_exec_data (TerminalScreen *screen,
}
return terminal_screen_exec (screen,
- data ? data->argv : NULL,
- envv ? envv : data ? data->envv : NULL,
+ data ? data->argv : nullptr,
+ envv ? envv : data ? data->envv : nullptr,
data ? data->as_shell : TRUE,
/* If we have command line args, must always pass the cwd from the command line, too */
- data && data->argv ? data->cwd : cwd ? cwd : data ? data->cwd : NULL,
- NULL /* fd list */, NULL /* fd array */,
- NULL, NULL, NULL, /* callback + data + destroy notify */
+ data && data->argv ? data->cwd : cwd ? cwd : data ? data->cwd : nullptr,
+ nullptr /* fd list */, nullptr /* fd array */,
+ nullptr, nullptr, nullptr, /* callback + data + destroy notify */
cancellable,
error);
}
@@ -849,7 +849,7 @@ terminal_screen_reexec_from_screen (TerminalScreen *screen,
{
g_return_val_if_fail (TERMINAL_IS_SCREEN (screen), FALSE);
- if (parent_screen == NULL)
+ if (parent_screen == nullptr)
return TRUE;
g_return_val_if_fail (TERMINAL_IS_SCREEN (parent_screen), FALSE);
@@ -863,8 +863,8 @@ terminal_screen_reexec_from_screen (TerminalScreen *screen,
cwd);
return terminal_screen_reexec_from_exec_data (screen,
- NULL /* exec data */,
- NULL /* envv */,
+ nullptr /* exec data */,
+ nullptr /* envv */,
cwd,
cancellable,
error);
@@ -909,12 +909,12 @@ terminal_screen_exec (TerminalScreen *screen,
GError **error)
{
g_return_val_if_fail (TERMINAL_IS_SCREEN (screen), FALSE);
- g_return_val_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable), FALSE);
- g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
- g_return_val_if_fail (gtk_widget_get_parent (GTK_WIDGET (screen)) != NULL, FALSE);
+ g_return_val_if_fail (cancellable == nullptr || G_IS_CANCELLABLE (cancellable), FALSE);
+ g_return_val_if_fail (error == nullptr || *error == nullptr, FALSE);
+ g_return_val_if_fail (gtk_widget_get_parent (GTK_WIDGET (screen)) != nullptr, FALSE);
_TERMINAL_DEBUG_IF (TERMINAL_DEBUG_PROCESSES) {
- gs_free char *argv_str = NULL;
+ gs_free char *argv_str = nullptr;
_terminal_debug_print (TERMINAL_DEBUG_PROCESSES,
"[screen %p] exec: argv:[%s] envv:%p(%u) as-shell:%s cwd:%s\n",
screen,
@@ -931,7 +931,7 @@ terminal_screen_exec (TerminalScreen *screen,
data->callback_data = user_data;
data->callback_data_destroy_notify = destroy_notify;
- GError *err = NULL;
+ GError *err = nullptr;
if (priv->child_pid != -1) {
g_set_error_literal (&err, G_DBUS_ERROR, G_DBUS_ERROR_FAILED,
"Cannot launch a new child process while the terminal is still running another child process");
@@ -942,8 +942,8 @@ terminal_screen_exec (TerminalScreen *screen,
return FALSE;
}
- gs_free char *path = NULL;
- gs_free char *shell = NULL;
+ gs_free char *path = nullptr;
+ gs_free char *shell = nullptr;
gs_strfreev char **envv = terminal_screen_get_child_environment (screen,
initial_envv,
&path,
@@ -952,7 +952,7 @@ terminal_screen_exec (TerminalScreen *screen,
gboolean preserve_cwd = FALSE;
GSpawnFlags spawn_flags = GSpawnFlags(G_SPAWN_SEARCH_PATH_FROM_ENVP |
VTE_SPAWN_NO_PARENT_ENVV);
- gs_strfreev char **exec_argv = NULL;
+ gs_strfreev char **exec_argv = nullptr;
if (!terminal_screen_get_child_command (screen,
argv,
path,
@@ -994,7 +994,7 @@ terminal_screen_exec (TerminalScreen *screen,
}
} else {
data->n_fd_map = 0;
- data->fd_map = NULL;
+ data->fd_map = nullptr;
}
data->argv = g_strdupv (argv);
@@ -1047,8 +1047,8 @@ terminal_screen_profile_changed_cb (GSettings *profile,
{
gs_free char *charset = g_settings_get_string (profile, TERMINAL_PROFILE_ENCODING_KEY);
const char *encoding = terminal_util_translate_encoding (charset);
- if (encoding != NULL)
- vte_terminal_set_encoding (vte_terminal, encoding, NULL);
+ if (encoding != nullptr)
+ vte_terminal_set_encoding (vte_terminal, encoding, nullptr);
}
if (!prop_name || prop_name == I_(TERMINAL_PROFILE_CJK_UTF8_AMBIGUOUS_WIDTH_KEY))
@@ -1161,8 +1161,8 @@ update_color_scheme (TerminalScreen *screen)
GdkRGBA cursor_bg, cursor_fg;
GdkRGBA highlight_bg, highlight_fg;
GdkRGBA *boldp;
- GdkRGBA *cursor_bgp = NULL, *cursor_fgp = NULL;
- GdkRGBA *highlight_bgp = NULL, *highlight_fgp = NULL;
+ GdkRGBA *cursor_bgp = nullptr, *cursor_fgp = nullptr;
+ GdkRGBA *highlight_bgp = nullptr, *highlight_fgp = nullptr;
GtkStyleContext *context;
gboolean use_theme_colors;
@@ -1186,7 +1186,7 @@ update_color_scheme (TerminalScreen *screen)
terminal_g_settings_get_rgba (profile, TERMINAL_PROFILE_BOLD_COLOR_KEY, &bold))
boldp = &bold;
else
- boldp = NULL;
+ boldp = nullptr;
if (g_settings_get_boolean (profile, TERMINAL_PROFILE_CURSOR_COLORS_SET_KEY) &&
!use_theme_colors)
@@ -1296,7 +1296,7 @@ terminal_screen_set_profile (TerminalScreen *screen,
g_signal_connect (profile, "changed",
G_CALLBACK (terminal_screen_profile_changed_cb),
screen);
- terminal_screen_profile_changed_cb (profile, NULL, screen);
+ terminal_screen_profile_changed_cb (profile, nullptr, screen);
g_signal_emit (G_OBJECT (screen), signals[PROFILE_SET], 0, old_profile);
}
@@ -1320,9 +1320,9 @@ terminal_screen_ref_profile (TerminalScreen *screen)
{
TerminalScreenPrivate *priv = screen->priv;
- if (priv->profile != NULL)
+ if (priv->profile != nullptr)
return (GSettings*)g_object_ref (priv->profile);
- return NULL;
+ return nullptr;
}
static gboolean
@@ -1333,7 +1333,7 @@ should_preserve_cwd (TerminalPreserveWorkingDirectory preserve_cwd,
switch (preserve_cwd) {
case TERMINAL_PRESERVE_WORKING_DIRECTORY_SAFE: {
gs_free char *resolved_arg0 = terminal_util_find_program_in_path (path, arg0);
- return resolved_arg0 != NULL &&
+ return resolved_arg0 != nullptr &&
terminal_util_get_is_shell (resolved_arg0);
}
@@ -1362,9 +1362,9 @@ terminal_screen_get_child_command (TerminalScreen *screen,
TerminalPreserveWorkingDirectory preserve_cwd;
char **exec_argv;
- g_assert (spawn_flags_p != NULL && exec_argv_p != NULL && preserve_cwd_p != NULL);
+ g_assert (spawn_flags_p != nullptr && exec_argv_p != nullptr && preserve_cwd_p != nullptr);
- *exec_argv_p = exec_argv = NULL;
+ *exec_argv_p = exec_argv = nullptr;
preserve_cwd = TerminalPreserveWorkingDirectory
(g_settings_get_enum (profile, TERMINAL_PROFILE_PRESERVE_WORKING_DIRECTORY_KEY));
@@ -1382,7 +1382,7 @@ terminal_screen_get_child_command (TerminalScreen *screen,
gs_free char *exec_argv_str;
exec_argv_str = g_settings_get_string (profile, TERMINAL_PROFILE_CUSTOM_COMMAND_KEY);
- if (!g_shell_parse_argv (exec_argv_str, NULL, &exec_argv, err))
+ if (!g_shell_parse_argv (exec_argv_str, nullptr, &exec_argv, err))
return FALSE;
*preserve_cwd_p = should_preserve_cwd (preserve_cwd, path_env, exec_argv[0]);
@@ -1397,7 +1397,7 @@ terminal_screen_get_child_command (TerminalScreen *screen,
shell = egg_shell (shell_env);
only_name = strrchr (shell, '/');
- if (only_name != NULL)
+ if (only_name != nullptr)
only_name++;
else {
only_name = shell;
@@ -1409,11 +1409,11 @@ terminal_screen_get_child_command (TerminalScreen *screen,
exec_argv[argc++] = shell;
if (g_settings_get_boolean (profile, TERMINAL_PROFILE_LOGIN_SHELL_KEY))
- exec_argv[argc++] = g_strconcat ("-", only_name, NULL);
+ exec_argv[argc++] = g_strconcat ("-", only_name, nullptr);
else
exec_argv[argc++] = g_strdup (only_name);
- exec_argv[argc++] = NULL;
+ exec_argv[argc++] = nullptr;
*preserve_cwd_p = should_preserve_cwd (preserve_cwd, path_env, shell);
*spawn_flags_p = GSpawnFlags(*spawn_flags_p | G_SPAWN_FILE_AND_ARGV_ZERO);
@@ -1439,7 +1439,7 @@ terminal_screen_get_child_environment (TerminalScreen *screen,
{
TerminalApp *app = terminal_app_get ();
char **env;
- gs_strfreev char** current_environ = NULL;
+ gs_strfreev char** current_environ = nullptr;
char *e, *v;
GHashTable *env_table;
GHashTableIter iter;
@@ -1462,7 +1462,7 @@ terminal_screen_get_child_environment (TerminalScreen *screen,
if (v)
g_hash_table_replace (env_table, g_strndup (env[i], v - env[i]), g_strdup (v + 1));
else
- g_hash_table_replace (env_table, g_strdup (env[i]), NULL);
+ g_hash_table_replace (env_table, g_strdup (env[i]), nullptr);
}
/* Remove unwanted env variables */
@@ -1485,7 +1485,7 @@ terminal_screen_get_child_environment (TerminalScreen *screen,
g_hash_table_iter_init (&iter, env_table);
while (g_hash_table_iter_next (&iter, (gpointer *) &e, (gpointer *) &v))
g_ptr_array_add (retval, g_strdup_printf ("%s=%s", e, v ? v : ""));
- g_ptr_array_add (retval, NULL);
+ g_ptr_array_add (retval, nullptr);
*path = g_strdup ((char const*)g_hash_table_lookup (env_table, "PATH"));
*shell = g_strdup ((char const*)g_hash_table_lookup (env_table, "SHELL"));
@@ -1513,7 +1513,7 @@ info_bar_response_cb (GtkWidget *info_bar,
break;
case RESPONSE_RELAUNCH:
gtk_widget_destroy (info_bar);
- terminal_screen_reexec (screen, NULL, NULL, NULL, NULL);
+ terminal_screen_reexec (screen, nullptr, nullptr, nullptr, nullptr);
break;
case RESPONSE_EDIT_PREFERENCES:
terminal_app_edit_preferences (terminal_app_get (),
@@ -1538,8 +1538,8 @@ terminal_screen_show_info_bar (TerminalScreen *screen,
info_bar = terminal_info_bar_new (GTK_MESSAGE_ERROR,
_("_Preferences"), RESPONSE_EDIT_PREFERENCES,
- !show_relaunch ? NULL : _("_Relaunch"), RESPONSE_RELAUNCH,
- NULL);
+ !show_relaunch ? nullptr : _("_Relaunch"), RESPONSE_RELAUNCH,
+ nullptr);
terminal_info_bar_format_text (TERMINAL_INFO_BAR (info_bar),
_("There was an error creating the child process for this terminal"));
terminal_info_bar_format_text (TERMINAL_INFO_BAR (info_bar),
@@ -1565,7 +1565,7 @@ spawn_result_cb (VteTerminal *terminal,
ExecData *exec_data = (ExecData*)user_data;
/* Terminal was destroyed while the spawn operation was in progress; nothing to do. */
- if (terminal == NULL)
+ if (terminal == nullptr)
goto out;
{
@@ -1575,7 +1575,7 @@ spawn_result_cb (VteTerminal *terminal,
if (error) {
// FIXMEchpe should be unnecessary, vte already does this internally
- vte_terminal_set_pty (terminal, NULL);
+ vte_terminal_set_pty (terminal, nullptr);
gboolean can_reexec = TRUE; /* FIXME */
terminal_screen_show_info_bar (screen, error, can_reexec);
@@ -1615,7 +1615,7 @@ idle_exec_cb (TerminalScreen *screen)
if (data->fd_list) {
fds = g_unix_fd_list_steal_fds(data->fd_list, &n_fds);
} else {
- fds = NULL;
+ fds = nullptr;
n_fds = 0;
}
@@ -1628,7 +1628,7 @@ idle_exec_cb (TerminalScreen *screen)
fds, n_fds,
data->fd_map, data->n_fd_map,
data->spawn_flags,
- NULL, NULL, NULL, /* child setup, data, destroy */
+ nullptr, nullptr, nullptr, /* child setup, data, destroy */
-1,
data->cancellable,
spawn_result_cb,
@@ -1671,7 +1671,7 @@ terminal_screen_popup_info_new (TerminalScreen *screen)
TerminalScreenPopupInfo *
terminal_screen_popup_info_ref (TerminalScreenPopupInfo *info)
{
- g_return_val_if_fail (info != NULL, NULL);
+ g_return_val_if_fail (info != nullptr, nullptr);
info->ref_count++;
return info;
@@ -1680,7 +1680,7 @@ terminal_screen_popup_info_ref (TerminalScreenPopupInfo *info)
void
terminal_screen_popup_info_unref (TerminalScreenPopupInfo *info)
{
- g_return_if_fail (info != NULL);
+ g_return_if_fail (info != nullptr);
if (--info->ref_count > 0)
return;
@@ -1740,11 +1740,11 @@ terminal_screen_button_press (GtkWidget *widget,
TerminalScreen *screen = TERMINAL_SCREEN (widget);
gboolean (* button_press_event) (GtkWidget*, GdkEventButton*) =
GTK_WIDGET_CLASS (terminal_screen_parent_class)->button_press_event;
- gs_free char *hyperlink = NULL;
- gs_free char *url = NULL;
+ gs_free char *hyperlink = nullptr;
+ gs_free char *url = nullptr;
int url_flavor = 0;
- gs_free char *number_info = NULL;
- gs_free char *timestamp_info = NULL;
+ gs_free char *number_info = nullptr;
+ gs_free char *timestamp_info = nullptr;
guint state;
state = event->state & gtk_accelerator_get_default_mod_mask ();
@@ -1753,7 +1753,7 @@ terminal_screen_button_press (GtkWidget *widget,
url = terminal_screen_check_match (screen, (GdkEvent*)event, &url_flavor);
terminal_screen_check_extra (screen, (GdkEvent*)event, &number_info, &timestamp_info);
- if (hyperlink != NULL &&
+ if (hyperlink != nullptr &&
(event->button == 1 || event->button == 2) &&
(state & GDK_CONTROL_MASK))
{
@@ -1768,7 +1768,7 @@ terminal_screen_button_press (GtkWidget *widget,
return TRUE; /* don't do anything else such as select with the click */
}
- if (url != NULL &&
+ if (url != nullptr &&
(event->button == 1 || event->button == 2) &&
(state & GDK_CONTROL_MASK))
{
@@ -1793,20 +1793,20 @@ terminal_screen_button_press (GtkWidget *widget,
return TRUE;
terminal_screen_do_popup (screen, event, hyperlink, url, url_flavor, number_info, timestamp_info);
- hyperlink = NULL; /* adopted to the popup info */
- url = NULL; /* ditto */
- number_info = NULL; /* ditto */
- timestamp_info = NULL; /* ditto */
+ hyperlink = nullptr; /* adopted to the popup info */
+ url = nullptr; /* ditto */
+ number_info = nullptr; /* ditto */
+ timestamp_info = nullptr; /* ditto */
return TRUE;
}
else if (!(event->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK)))
{
/* do popup on shift+right-click */
terminal_screen_do_popup (screen, event, hyperlink, url, url_flavor, number_info, timestamp_info);
- hyperlink = NULL; /* adopted to the popup info */
- url = NULL; /* ditto */
- number_info = NULL; /* ditto */
- timestamp_info = NULL; /* ditto */
+ hyperlink = nullptr; /* adopted to the popup info */
+ url = nullptr; /* ditto */
+ number_info = nullptr; /* ditto */
+ timestamp_info = nullptr; /* ditto */
return TRUE;
}
}
@@ -1826,7 +1826,7 @@ terminal_screen_button_press (GtkWidget *widget,
* in @screen's PTY.
*
* Returns: a newly allocated string containing the current working directory,
- * or %NULL on failure
+ * or %nullptr on failure
*/
char *
terminal_screen_get_current_dir (TerminalScreen *screen)
@@ -1834,14 +1834,14 @@ terminal_screen_get_current_dir (TerminalScreen *screen)
const char *uri;
uri = vte_terminal_get_current_directory_uri (VTE_TERMINAL (screen));
- if (uri != NULL)
- return g_filename_from_uri (uri, NULL, NULL);
+ if (uri != nullptr)
+ return g_filename_from_uri (uri, nullptr, nullptr);
ExecData *data = screen->priv->exec_data;
if (data && data->cwd)
return g_strdup (data->cwd);
- return NULL;
+ return nullptr;
}
static void
@@ -1863,7 +1863,7 @@ terminal_screen_child_exited (VteTerminal *terminal,
if (priv->child_pid == -1)
return;
- /* No need to chain up to VteTerminalClass::child_exited since it's NULL */
+ /* No need to chain up to VteTerminalClass::child_exited since it's nullptr */
_terminal_debug_print (TERMINAL_DEBUG_PROCESSES,
"[screen %p] child process exited\n",
@@ -1879,14 +1879,14 @@ terminal_screen_child_exited (VteTerminal *terminal,
g_signal_emit (screen, signals[CLOSE_SCREEN], 0);
break;
case TERMINAL_EXIT_RESTART:
- terminal_screen_reexec (screen, NULL, NULL, NULL, NULL);
+ terminal_screen_reexec (screen, nullptr, nullptr, nullptr, nullptr);
break;
case TERMINAL_EXIT_HOLD: {
GtkWidget *info_bar;
info_bar = terminal_info_bar_new (GTK_MESSAGE_INFO,
_("_Relaunch"), RESPONSE_RELAUNCH,
- NULL);
+ nullptr);
if (WIFEXITED (status)) {
terminal_info_bar_format_text (TERMINAL_INFO_BAR (info_bar),
_("The child process exited normally with status %d."), WEXITSTATUS (status));
@@ -1940,7 +1940,7 @@ terminal_screen_drag_data_received (GtkWidget *widget,
g_print ("info: %d\n", info);
tmp = context->targets;
- while (tmp != NULL)
+ while (tmp != nullptr)
{
GdkAtom atom = GDK_POINTER_TO_ATOM (tmp->data);
@@ -1956,7 +1956,7 @@ terminal_screen_drag_data_received (GtkWidget *widget,
if (gtk_targets_include_uri (&selection_data_target, 1))
{
gs_strfreev char **uris;
- gs_free char *text = NULL;
+ gs_free char *text = nullptr;
gsize len;
uris = gtk_selection_data_get_uris (selection_data);
@@ -2024,12 +2024,12 @@ terminal_screen_drag_data_received (GtkWidget *widget,
utf8_data = g_utf16_to_utf8 ((const gunichar2*) selection_data_data,
selection_data_length / 2,
- NULL, NULL, NULL);
+ nullptr, nullptr, nullptr);
if (!utf8_data)
return;
uris[0] = g_strdelimit(utf8_data, "\r\n", 0);
- uris[1] = NULL;
+ uris[1] = nullptr;
terminal_util_transform_uris_to_quoted_fuse_paths (uris); /* This may replace uris[0] */
text = terminal_util_concat_uris (uris, &len);
@@ -2057,7 +2057,7 @@ terminal_screen_drag_data_received (GtkWidget *widget,
*newline = '\0';
uris[0] = utf8_data;
- uris[1] = NULL;
+ uris[1] = nullptr;
terminal_util_transform_uris_to_quoted_fuse_paths (uris); /* This may replace uris[0] */
text = terminal_util_concat_uris (uris, &len);
@@ -2108,7 +2108,7 @@ _terminal_screen_update_scrollbar (TerminalScreen *screen)
GtkPolicyType vpolicy;
container = terminal_screen_container_get_from_screen (screen);
- if (container == NULL)
+ if (container == nullptr)
return;
vpolicy = GtkPolicyType(g_settings_get_enum (priv->profile, TERMINAL_PROFILE_SCROLLBAR_POLICY_KEY));
@@ -2156,7 +2156,7 @@ terminal_screen_check_match (TerminalScreen *screen,
char *match;
match = vte_terminal_match_check_event (VTE_TERMINAL (screen), event, &tag);
- for (tags = priv->match_tags; tags != NULL; tags = tags->next)
+ for (tags = priv->match_tags; tags != nullptr; tags = tags->next)
{
TagData *tag_data = (TagData*) tags->data;
if (tag_data->tag == tag)
@@ -2168,7 +2168,7 @@ terminal_screen_check_match (TerminalScreen *screen,
}
g_free (match);
- return NULL;
+ return nullptr;
}
static void
@@ -2194,7 +2194,7 @@ terminal_screen_check_extra (TerminalScreen *screen,
{
for (i = 0; i < n_extra_regexes; i++)
{
- if (matches[i] != NULL)
+ if (matches[i] != nullptr)
{
/* Store the first match for each flavor, free all the others */
switch (extra_regex_flavors[i])
@@ -2219,8 +2219,8 @@ terminal_screen_check_extra (TerminalScreen *screen,
/**
* terminal_screen_has_foreground_process:
* @screen:
- * @process_name: (out) (allow-none): the basename of the program, or %NULL
- * @cmdline: (out) (allow-none): the full command line, or %NULL
+ * @process_name: (out) (allow-none): the basename of the program, or %nullptr
+ * @cmdline: (out) (allow-none): the full command line, or %nullptr
*
* Checks whether there's a foreground process running in
* this terminal.
@@ -2233,10 +2233,10 @@ terminal_screen_has_foreground_process (TerminalScreen *screen,
char **cmdline)
{
TerminalScreenPrivate *priv = screen->priv;
- gs_free char *command = NULL;
- gs_free char *data_buf = NULL;
- gs_free char *basename = NULL;
- gs_free char *name = NULL;
+ gs_free char *command = nullptr;
+ gs_free char *data_buf = nullptr;
+ gs_free char *basename = nullptr;
+ gs_free char *name = nullptr;
VtePty *pty;
int fd;
#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
@@ -2253,7 +2253,7 @@ terminal_screen_has_foreground_process (TerminalScreen *screen,
return FALSE;
pty = vte_terminal_get_pty (VTE_TERMINAL (screen));
- if (pty == NULL)
+ if (pty == nullptr)
return FALSE;
fd = vte_pty_get_fd (pty);
@@ -2269,11 +2269,11 @@ terminal_screen_has_foreground_process (TerminalScreen *screen,
mib[1] = KERN_PROC;
mib[2] = KERN_PROC_ARGS;
mib[3] = fgpid;
- if (sysctl (mib, G_N_ELEMENTS (mib), NULL, &len, NULL, 0) == -1)
+ if (sysctl (mib, G_N_ELEMENTS (mib), nullptr, &len, nullptr, 0) == -1)
return TRUE;
data_buf = g_malloc0 (len);
- if (sysctl (mib, G_N_ELEMENTS (mib), data_buf, &len, NULL, 0) == -1)
+ if (sysctl (mib, G_N_ELEMENTS (mib), data_buf, &len, nullptr, 0) == -1)
return TRUE;
data = data_buf;
#elif defined(__OpenBSD__)
@@ -2281,16 +2281,16 @@ terminal_screen_has_foreground_process (TerminalScreen *screen,
mib[1] = KERN_PROC_ARGS;
mib[2] = fgpid;
mib[3] = KERN_PROC_ARGV;
- if (sysctl (mib, G_N_ELEMENTS (mib), NULL, &len, NULL, 0) == -1)
+ if (sysctl (mib, G_N_ELEMENTS (mib), nullptr, &len, nullptr, 0) == -1)
return TRUE;
data_buf = g_malloc0 (len);
- if (sysctl (mib, G_N_ELEMENTS (mib), data_buf, &len, NULL, 0) == -1)
+ if (sysctl (mib, G_N_ELEMENTS (mib), data_buf, &len, nullptr, 0) == -1)
return TRUE;
data = ((char**)data_buf)[0];
#else
g_snprintf (filename, sizeof (filename), "/proc/%d/cmdline", fgpid);
- if (!g_file_get_contents (filename, &data_buf, &len, NULL))
+ if (!g_file_get_contents (filename, &data_buf, &len, nullptr))
return TRUE;
data = data_buf;
#endif
@@ -2299,7 +2299,7 @@ terminal_screen_has_foreground_process (TerminalScreen *screen,
if (!basename)
return TRUE;
- name = g_filename_to_utf8 (basename, -1, NULL, NULL, NULL);
+ name = g_filename_to_utf8 (basename, -1, nullptr, nullptr, nullptr);
if (!name)
return TRUE;
@@ -2316,7 +2316,7 @@ terminal_screen_has_foreground_process (TerminalScreen *screen,
data[i] = ' ';
}
- command = g_filename_to_utf8 (data, -1, NULL, NULL, NULL);
+ command = g_filename_to_utf8 (data, -1, nullptr, nullptr, nullptr);
if (!command)
return TRUE;
@@ -2328,7 +2328,7 @@ terminal_screen_has_foreground_process (TerminalScreen *screen,
const char *
terminal_screen_get_uuid (TerminalScreen *screen)
{
- g_return_val_if_fail (TERMINAL_IS_SCREEN (screen), NULL);
+ g_return_val_if_fail (TERMINAL_IS_SCREEN (screen), nullptr);
return screen->priv->uuid;
}
diff --git a/src/terminal-search-popover.cc b/src/terminal-search-popover.cc
index 8b1dec81..73d682ff 100644
--- a/src/terminal-search-popover.cc
+++ b/src/terminal-search-popover.cc
@@ -98,11 +98,11 @@ history_enabled (void)
gboolean enabled;
/* not quite an exact setting for this, but close enough… */
- g_object_get (gtk_settings_get_default (), "gtk-recent-files-enabled", &enabled, NULL);
+ g_object_get (gtk_settings_get_default (), "gtk-recent-files-enabled", &enabled, nullptr);
if (!enabled)
return FALSE;
- if (history_store == NULL) {
+ if (history_store == nullptr) {
history_store = gtk_list_store_new (1, G_TYPE_STRING);
g_object_set_data_full (G_OBJECT (terminal_app_get ()), "search-history-store",
history_store, (GDestroyNotify) g_object_unref);
@@ -125,7 +125,7 @@ history_remove_item (const char *text)
gtk_tree_model_get (model, &iter, 0, &item_text, -1);
- if (item_text != NULL && strcmp (item_text, text) == 0) {
+ if (item_text != nullptr && strcmp (item_text, text) == 0) {
gtk_list_store_remove (history_store, &iter);
return TRUE;
}
@@ -156,7 +156,7 @@ history_insert_item (const char *text)
{
GtkTreeIter iter;
- if (!history_enabled () || text == NULL)
+ if (!history_enabled () || text == nullptr)
return;
if (g_utf8_strlen (text, -1) <= HISTORY_MIN_ITEM_LEN)
@@ -182,7 +182,7 @@ update_sensitivity (TerminalSearchPopover *popover)
TerminalSearchPopoverPrivate *priv = PRIV (popover);
gboolean can_search;
- can_search = priv->regex != NULL;
+ can_search = priv->regex != nullptr;
gtk_widget_set_sensitive (priv->search_prev_button, can_search);
gtk_widget_set_sensitive (priv->search_next_button, can_search);
@@ -194,7 +194,7 @@ perform_search (TerminalSearchPopover *popover,
{
TerminalSearchPopoverPrivate *priv = PRIV (popover);
- if (priv->regex == NULL)
+ if (priv->regex == nullptr)
return;
/* Add to search history */
@@ -259,7 +259,7 @@ update_regex (TerminalSearchPopover *popover)
const char *search_text;
gboolean caseless;
gs_free char *pattern;
- gs_free_error GError *error = NULL;
+ gs_free_error GError *error = nullptr;
search_text = gtk_entry_get_text (GTK_ENTRY (priv->search_entry));
@@ -297,15 +297,15 @@ update_regex (TerminalSearchPopover *popover)
compile_flags |= PCRE2_CASELESS;
priv->regex = vte_regex_new_for_search (pattern, -1, compile_flags, &error);
- if (priv->regex != NULL &&
- (!vte_regex_jit (priv->regex, PCRE2_JIT_COMPLETE, NULL) ||
- !vte_regex_jit (priv->regex, PCRE2_JIT_PARTIAL_SOFT, NULL))) {
+ if (priv->regex != nullptr &&
+ (!vte_regex_jit (priv->regex, PCRE2_JIT_COMPLETE, nullptr) ||
+ !vte_regex_jit (priv->regex, PCRE2_JIT_PARTIAL_SOFT, nullptr))) {
}
- if (priv->regex != NULL)
+ if (priv->regex != nullptr)
gs_transfer_out_value (&priv->regex_pattern, &pattern);
} else {
- priv->regex = NULL;
+ priv->regex = nullptr;
}
priv->regex_caseless = caseless;
@@ -371,7 +371,7 @@ terminal_search_popover_init (TerminalSearchPopover *popover)
g_object_set (G_OBJECT (priv->search_entry),
"model", history_store,
"entry-text-column", 0,
- NULL);
+ nullptr);
#endif
if (history_enabled ()) {
@@ -414,7 +414,7 @@ terminal_search_popover_init (TerminalSearchPopover *popover)
g_signal_connect (priv->wrap_around_checkbutton, "toggled", G_CALLBACK (wrap_around_toggled_cb), popover);
- g_signal_connect (popover, "key-press-event", G_CALLBACK (key_press_cb), NULL);
+ g_signal_connect (popover, "key-press-event", G_CALLBACK (key_press_cb), nullptr);
if (terminal_app_get_dialog_use_headerbar (terminal_app_get ())) {
GtkWidget *headerbar;
@@ -501,14 +501,14 @@ terminal_search_popover_class_init (TerminalSearchPopoverClass *klass)
G_OBJECT_CLASS_TYPE (gobject_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (TerminalSearchPopoverClass, search),
- NULL, NULL,
+ nullptr, nullptr,
g_cclosure_marshal_VOID__BOOLEAN,
G_TYPE_NONE,
1,
G_TYPE_BOOLEAN);
pspecs[PROP_REGEX] =
- g_param_spec_boxed ("regex", NULL, NULL,
+ g_param_spec_boxed ("regex", nullptr, nullptr,
VTE_TYPE_REGEX,
GParamFlags(G_PARAM_READABLE |
G_PARAM_STATIC_NAME |
@@ -516,7 +516,7 @@ terminal_search_popover_class_init (TerminalSearchPopoverClass *klass)
G_PARAM_STATIC_BLURB));
pspecs[PROP_WRAP_AROUND] =
- g_param_spec_boolean ("wrap-around", NULL, NULL,
+ g_param_spec_boolean ("wrap-around", nullptr, nullptr,
FALSE,
GParamFlags(G_PARAM_READABLE |
G_PARAM_STATIC_NAME |
@@ -562,12 +562,12 @@ terminal_search_popover_new (GtkWidget *relative_to_widget)
* terminal_search_popover_get_regex:
* @popover: a #TerminalSearchPopover
*
- * Returns: (transfer none): the search regex, or %NULL
+ * Returns: (transfer none): the search regex, or %nullptr
*/
VteRegex *
terminal_search_popover_get_regex (TerminalSearchPopover *popover)
{
- g_return_val_if_fail (TERMINAL_IS_SEARCH_POPOVER (popover), NULL);
+ g_return_val_if_fail (TERMINAL_IS_SEARCH_POPOVER (popover), nullptr);
return PRIV (popover)->regex;
}
diff --git a/src/terminal-search-provider.cc b/src/terminal-search-provider.cc
index 448b733b..deb5dc10 100644
--- a/src/terminal-search-provider.cc
+++ b/src/terminal-search-provider.cc
@@ -44,15 +44,15 @@ G_DEFINE_TYPE (TerminalSearchProvider, terminal_search_provider, G_TYPE_OBJECT)
static char *
normalize_casefold_and_unaccent (const char *str)
{
- gs_free char *casefolded = NULL, *normalized = NULL;
- char *retval = NULL;
+ gs_free char *casefolded = nullptr, *normalized = nullptr;
+ char *retval = nullptr;
- if (str == NULL)
+ if (str == nullptr)
goto out;
normalized = g_utf8_normalize (str, -1, G_NORMALIZE_ALL_COMPOSE);
casefolded = g_utf8_casefold (normalized, -1);
- retval = g_str_to_ascii (casefolded, NULL);
+ retval = g_str_to_ascii (casefolded, nullptr);
out:
return retval;
@@ -69,7 +69,7 @@ normalize_casefold_and_unaccent_terms (const char* const *terms)
for (i = 0; i < n; i++)
casefolded_terms[i] = normalize_casefold_and_unaccent (terms[i]);
- casefolded_terms[n] = NULL;
+ casefolded_terms[n] = nullptr;
return casefolded_terms;
}
@@ -78,20 +78,20 @@ static gboolean
match_terms (const char *str,
const char* const *terms)
{
- gs_free char *casefolded_str = NULL;
+ gs_free char *casefolded_str = nullptr;
gboolean matches = TRUE;
guint i;
- if (str == NULL)
+ if (str == nullptr)
{
matches = FALSE;
goto out;
}
casefolded_str = normalize_casefold_and_unaccent (str);
- for (i = 0; terms[i] != NULL; i++)
+ for (i = 0; terms[i] != nullptr; i++)
{
- if (strstr (casefolded_str, terms[i]) == NULL)
+ if (strstr (casefolded_str, terms[i]) == nullptr)
{
matches = FALSE;
break;
@@ -108,16 +108,16 @@ handle_get_initial_result_set_cb (TerminalSearchProvider2 *skeleton,
const char *const *terms,
gpointer user_data)
{
- GList *l, *screens = NULL, *windows;
+ GList *l, *screens = nullptr, *windows;
gs_unref_ptrarray GPtrArray *results;
TerminalApp *app;
- gs_strfreev char **casefolded_terms = NULL;
+ gs_strfreev char **casefolded_terms = nullptr;
_terminal_debug_print (TERMINAL_DEBUG_SEARCH, "GetInitialResultSet started\n");
app = terminal_app_get ();
windows = gtk_application_get_windows (GTK_APPLICATION (app));
- for (l = windows; l != NULL; l = l->next)
+ for (l = windows; l != nullptr; l = l->next)
{
TerminalWindow *window = (TerminalWindow*)(l->data);
GList *c, *containers;
@@ -126,7 +126,7 @@ handle_get_initial_result_set_cb (TerminalSearchProvider2 *skeleton,
continue;
containers = terminal_window_list_screen_containers (window);
- for (c = containers; c != NULL; c = c->next)
+ for (c = containers; c != nullptr; c = c->next)
{
TerminalScreenContainer *container = TERMINAL_SCREEN_CONTAINER (c->data);
TerminalScreen *screen;
@@ -139,10 +139,10 @@ handle_get_initial_result_set_cb (TerminalSearchProvider2 *skeleton,
casefolded_terms = normalize_casefold_and_unaccent_terms (terms);
results = g_ptr_array_new_with_free_func (g_free);
- for (l = screens; l != NULL; l = l->next)
+ for (l = screens; l != nullptr; l = l->next)
{
TerminalScreen *screen = TERMINAL_SCREEN (l->data);
- gs_free char *cmdline = NULL, *process = NULL;
+ gs_free char *cmdline = nullptr, *process = nullptr;
const char *cwd, *title;
cwd = vte_terminal_get_current_directory_uri (VTE_TERMINAL (screen));
@@ -162,7 +162,7 @@ handle_get_initial_result_set_cb (TerminalSearchProvider2 *skeleton,
}
}
- g_ptr_array_add (results, NULL);
+ g_ptr_array_add (results, nullptr);
terminal_search_provider2_complete_get_initial_result_set (skeleton,
invocation,
(const char *const *) results->pdata);
@@ -180,7 +180,7 @@ handle_get_subsearch_result_set_cb (TerminalSearchProvider2 *skeleton,
{
gs_unref_ptrarray GPtrArray *results;
TerminalApp *app;
- gs_strfreev char **casefolded_terms = NULL;
+ gs_strfreev char **casefolded_terms = nullptr;
guint i;
_terminal_debug_print (TERMINAL_DEBUG_SEARCH, "GetSubsearchResultSet started\n");
@@ -189,14 +189,14 @@ handle_get_subsearch_result_set_cb (TerminalSearchProvider2 *skeleton,
casefolded_terms = normalize_casefold_and_unaccent_terms (terms);
results = g_ptr_array_new_with_free_func (g_free);
- for (i = 0; previous_results[i] != NULL; i++)
+ for (i = 0; previous_results[i] != nullptr; i++)
{
TerminalScreen *screen;
- gs_free char *cmdline = NULL, *process = NULL;
+ gs_free char *cmdline = nullptr, *process = nullptr;
const char *cwd, *title;
screen = terminal_app_get_screen_by_uuid (app, previous_results[i]);
- if (screen == NULL)
+ if (screen == nullptr)
{
_terminal_debug_print (TERMINAL_DEBUG_SEARCH, "Not a screen: %s\n", previous_results[i]);
continue;
@@ -215,7 +215,7 @@ handle_get_subsearch_result_set_cb (TerminalSearchProvider2 *skeleton,
}
}
- g_ptr_array_add (results, NULL);
+ g_ptr_array_add (results, nullptr);
terminal_search_provider2_complete_get_subsearch_result_set (skeleton,
invocation,
(const char *const *) results->pdata);
@@ -239,38 +239,38 @@ handle_get_result_metas_cb (TerminalSearchProvider2 *skeleton,
app = terminal_app_get ();
g_variant_builder_init (&builder, G_VARIANT_TYPE ("aa{sv}"));
- for (i = 0; results[i] != NULL; i++)
+ for (i = 0; results[i] != nullptr; i++)
{
TerminalScreen *screen;
const char *title;
- gs_free char *escaped_text = NULL;
- gs_free char *text = NULL;
+ gs_free char *escaped_text = nullptr;
+ gs_free char *text = nullptr;
screen = terminal_app_get_screen_by_uuid (app, results[i]);
- if (screen == NULL)
+ if (screen == nullptr)
{
_terminal_debug_print (TERMINAL_DEBUG_SEARCH, "Not a screen: %s\n", results[i]);
continue;
}
title = terminal_screen_get_title (screen);
- if (terminal_screen_has_foreground_process (screen, NULL, NULL)) {
+ if (terminal_screen_has_foreground_process (screen, nullptr, nullptr)) {
VteTerminal *terminal = VTE_TERMINAL (screen);
long cursor_row;
- vte_terminal_get_cursor_position (terminal, NULL, &cursor_row);
+ vte_terminal_get_cursor_position (terminal, nullptr, &cursor_row);
text = vte_terminal_get_text_range (terminal,
MAX(0, cursor_row - 1),
0,
cursor_row + 1,
vte_terminal_get_column_count (terminal) - 1,
- NULL, NULL, NULL);
+ nullptr, nullptr, nullptr);
}
g_variant_builder_open (&builder, G_VARIANT_TYPE ("a{sv}"));
g_variant_builder_add (&builder, "{sv}", "id", g_variant_new_string (results[i]));
g_variant_builder_add (&builder, "{sv}", "name", g_variant_new_string (title));
- if (text != NULL)
+ if (text != nullptr)
{
escaped_text = g_markup_escape_text (text, -1);
g_variant_builder_add (&builder, "{sv}", "description", g_variant_new_string (escaped_text));
@@ -301,7 +301,7 @@ handle_activate_result_cb (TerminalSearchProvider2 *skeleton,
app = terminal_app_get ();
screen = terminal_app_get_screen_by_uuid (app, identifier);
- if (screen == NULL)
+ if (screen == nullptr)
goto out;
toplevel = gtk_widget_get_toplevel (GTK_WIDGET (screen));
diff --git a/src/terminal-settings-list.cc b/src/terminal-settings-list.cc
index a8abf27c..a247765b 100644
--- a/src/terminal-settings-list.cc
+++ b/src/terminal-settings-list.cc
@@ -74,7 +74,7 @@ strv_printerr (char **strv)
{
char **p;
- if (strv == NULL) {
+ if (strv == nullptr) {
g_printerr ("(null)");
return;
}
@@ -96,7 +96,7 @@ strv_equal (char **a,
{
char **e, **f;
- if (a == NULL || b == NULL)
+ if (a == nullptr || b == nullptr)
return a == b;
for (e = a, f = b; *e && *f; e++, f++) {
@@ -113,7 +113,7 @@ strv_find (char **strv,
{
int i;
- if (strv == NULL || str == NULL)
+ if (strv == nullptr || str == nullptr)
return -1;
for (i = 0; strv[i]; i++) {
@@ -132,8 +132,8 @@ strv_dupv_insert (char **strv,
{
char **nstrv, **p, **q;
- if (strv == NULL) {
- char *s[2] = { (char *) str, NULL };
+ if (strv == nullptr) {
+ char *s[2] = { (char *) str, nullptr };
return g_strdupv (s);
}
@@ -147,7 +147,7 @@ strv_dupv_insert (char **strv,
for (p = strv, q = nstrv; *p; p++, q++)
*q = g_strdup (*p);
*q++ = g_strdup (str);
- *q = NULL;
+ *q = nullptr;
return strv_sort (nstrv);
}
@@ -158,8 +158,8 @@ strv_dupv_remove (char **strv,
{
char **nstrv, **p, **q;
- if (strv == NULL)
- return NULL;
+ if (strv == nullptr)
+ return nullptr;
nstrv = g_strdupv (strv);
for (p = q = nstrv; *p; p++) {
@@ -168,7 +168,7 @@ strv_dupv_remove (char **strv,
else
g_free (*p);
}
- *q = NULL;
+ *q = nullptr;
return nstrv;
}
@@ -178,7 +178,7 @@ terminal_settings_list_valid_uuid (const char *str)
{
uuid_t u;
- if (str == NULL)
+ if (str == nullptr)
return FALSE;
return uuid_parse ((char *) str, u) == 0;
@@ -213,7 +213,7 @@ validate_list (TerminalSettingsList *list,
gboolean allow_empty = (list->flags & TERMINAL_SETTINGS_LIST_FLAG_ALLOW_EMPTY) != 0;
guint i;
- if (entries == NULL)
+ if (entries == nullptr)
return allow_empty;
for (i = 0; entries[i]; i++) {
@@ -232,7 +232,7 @@ list_map_func (GVariant *value,
TerminalSettingsList *list = (TerminalSettingsList*)user_data;
gs_strfreev char **entries;
- entries = strv_sort (g_variant_dup_strv (value, NULL));
+ entries = strv_sort (g_variant_dup_strv (value, nullptr));
if (validate_list (list, entries)) {
gs_transfer_out_value(result, &entries);
@@ -254,10 +254,10 @@ terminal_settings_list_ref_child_internal (TerminalSettingsList *list,
const char *uuid)
{
GSettings *child;
- gs_free char *path = NULL;
+ gs_free char *path = nullptr;
if (strv_find (list->uuids, uuid) == -1)
- return NULL;
+ return nullptr;
_terminal_debug_print (TERMINAL_DEBUG_SETTINGS_LIST,
"%s UUID %s\n", G_STRFUNC, uuid);
@@ -280,7 +280,7 @@ new_child (TerminalSettingsList *list,
{
char *new_uuid = new_list_entry ();
- if (name != NULL) {
+ if (name != nullptr) {
gs_free char *new_path = path_new (list, new_uuid);
gs_unref_object GSettings *child = g_settings_new_with_path (list->child_schema_id, new_path);
g_settings_set_string (child, TERMINAL_PROFILE_VISIBLE_NAME_KEY, name);
@@ -317,7 +317,7 @@ clone_child (TerminalSettingsList *list,
list->child_schema_id,
TRUE);
/* shouldn't really happen ever */
- if (schema == NULL)
+ if (schema == nullptr)
return new_uuid;
gs_strfreev char **keys = g_settings_schema_list_keys (schema);
@@ -326,26 +326,26 @@ clone_child (TerminalSettingsList *list,
gs_free char *rkey;
gs_unref_variant GVariant *value;
- rkey = g_strconcat (path, keys[i], NULL);
+ rkey = g_strconcat (path, keys[i], nullptr);
value = dconf_client_read (client, rkey);
if (value) {
gs_free char *wkey;
- wkey = g_strconcat (new_path, keys[i], NULL);
+ wkey = g_strconcat (new_path, keys[i], nullptr);
dconf_changeset_set (changeset, wkey, value);
}
}
- if (name != NULL) {
+ if (name != nullptr) {
GVariant *value;
value = g_variant_new_string (name);
if (value) {
gs_free char *wkey;
- wkey = g_strconcat (new_path, TERMINAL_PROFILE_VISIBLE_NAME_KEY, NULL);
+ wkey = g_strconcat (new_path, TERMINAL_PROFILE_VISIBLE_NAME_KEY, nullptr);
dconf_changeset_set (changeset, wkey, value);
}
}
- dconf_client_change_sync (client, changeset, NULL, NULL, NULL);
+ dconf_client_change_sync (client, changeset, nullptr, nullptr, nullptr);
dconf_changeset_unref (changeset);
return new_uuid;
@@ -385,13 +385,13 @@ terminal_settings_list_remove_child_internal (TerminalSettingsList *list,
new_uuids = strv_dupv_remove (list->uuids, uuid);
- if ((new_uuids == NULL || new_uuids[0] == NULL) &&
+ if ((new_uuids == nullptr || new_uuids[0] == nullptr) &&
(list->flags & TERMINAL_SETTINGS_LIST_FLAG_ALLOW_EMPTY) == 0)
return;
g_settings_set_strv (&list->parent, TERMINAL_SETTINGS_LIST_LIST_KEY, (const char * const *) new_uuids);
- if (list->default_uuid != NULL &&
+ if (list->default_uuid != nullptr &&
g_str_equal (list->default_uuid, uuid))
g_settings_set_string (&list->parent, TERMINAL_SETTINGS_LIST_DEFAULT_KEY, "");
@@ -402,7 +402,7 @@ terminal_settings_list_remove_child_internal (TerminalSettingsList *list,
path = path_new (list, uuid);
client = dconf_client_new ();
- dconf_client_write_sync (client, path, NULL, NULL, NULL, NULL);
+ dconf_client_write_sync (client, path, nullptr, nullptr, nullptr, nullptr);
}
}
@@ -439,7 +439,7 @@ terminal_settings_list_update_list (TerminalSettingsList *list)
(GDestroyNotify) g_object_unref);
if (uuids) {
- for (i = 0; uuids[i] != NULL; i++) {
+ for (i = 0; uuids[i] != nullptr; i++) {
uuid = uuids[i];
child = (GSettings*)g_hash_table_lookup (list->children, uuid);
@@ -493,13 +493,13 @@ terminal_settings_list_changed (GSettings *list_settings,
_terminal_debug_print (TERMINAL_DEBUG_SETTINGS_LIST,
"%s key %s", G_STRFUNC, key ? key : "(null)");
- if (key == NULL ||
+ if (key == nullptr ||
g_str_equal (key, TERMINAL_SETTINGS_LIST_LIST_KEY)) {
terminal_settings_list_update_list (list);
terminal_settings_list_update_default (list);
}
- if (key == NULL)
+ if (key == nullptr)
return;
if (g_str_equal (key, TERMINAL_SETTINGS_LIST_DEFAULT_KEY)) {
@@ -520,15 +520,15 @@ terminal_settings_list_constructed (GObject *object)
G_OBJECT_CLASS (terminal_settings_list_parent_class)->constructed (object);
- g_assert (list->child_schema_id != NULL);
+ g_assert (list->child_schema_id != nullptr);
- g_object_get (object, "path", &list->path, NULL);
+ g_object_get (object, "path", &list->path, nullptr);
list->children = g_hash_table_new_full (g_str_hash, g_str_equal,
(GDestroyNotify) g_free,
(GDestroyNotify) g_object_unref);
- terminal_settings_list_changed (&list->parent, NULL);
+ terminal_settings_list_changed (&list->parent, nullptr);
}
static void
@@ -582,8 +582,8 @@ terminal_settings_list_class_init (TerminalSettingsListClass *klass)
* The name of the schema of the children of this list.
*/
g_object_class_install_property (object_class, PROP_CHILD_SCHEMA_ID,
- g_param_spec_string ("child-schema-id", NULL, NULL,
- NULL,
+ g_param_spec_string ("child-schema-id", nullptr, nullptr,
+ nullptr,
GParamFlags(G_PARAM_CONSTRUCT_ONLY |
G_PARAM_WRITABLE |
G_PARAM_STATIC_STRINGS)));
@@ -594,7 +594,7 @@ terminal_settings_list_class_init (TerminalSettingsListClass *klass)
* Flags from #TerminalSettingsListFlags.
*/
g_object_class_install_property (object_class, PROP_FLAGS,
- g_param_spec_flags ("flags", NULL,NULL,
+ g_param_spec_flags ("flags", nullptr,nullptr,
TERMINAL_TYPE_SETTINGS_LIST_FLAGS,
TERMINAL_SETTINGS_LIST_FLAG_NONE,
GParamFlags(G_PARAM_CONSTRUCT_ONLY |
@@ -612,7 +612,7 @@ terminal_settings_list_class_init (TerminalSettingsListClass *klass)
g_signal_new ("children-changed", TERMINAL_TYPE_SETTINGS_LIST,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (TerminalSettingsListClass, children_changed),
- NULL, NULL,
+ nullptr, nullptr,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE,
0);
@@ -628,7 +628,7 @@ terminal_settings_list_class_init (TerminalSettingsListClass *klass)
g_signal_new ("default-changed", TERMINAL_TYPE_SETTINGS_LIST,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (TerminalSettingsListClass, default_changed),
- NULL, NULL,
+ nullptr, nullptr,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE,
0);
@@ -652,10 +652,10 @@ terminal_settings_list_new (const char *path,
const char *child_schema_id,
TerminalSettingsListFlags flags)
{
- g_return_val_if_fail (path != NULL, NULL);
- g_return_val_if_fail (schema_id != NULL, NULL);
- g_return_val_if_fail (child_schema_id != NULL, NULL);
- g_return_val_if_fail (g_str_has_suffix (path, ":/"), NULL);
+ g_return_val_if_fail (path != nullptr, nullptr);
+ g_return_val_if_fail (schema_id != nullptr, nullptr);
+ g_return_val_if_fail (child_schema_id != nullptr, nullptr);
+ g_return_val_if_fail (g_str_has_suffix (path, ":/"), nullptr);
return reinterpret_cast<TerminalSettingsList*>(g_object_new (TERMINAL_TYPE_SETTINGS_LIST,
"schema-id", schema_id,
@@ -669,13 +669,13 @@ terminal_settings_list_new (const char *path,
* terminal_settings_list_dupv_children:
* @list: a #TerminalSettingsList
*
- * Returns: (transfer full): the UUIDs of the children in the settings list, or %NULL
+ * Returns: (transfer full): the UUIDs of the children in the settings list, or %nullptr
* if the list is empty
*/
char **
terminal_settings_list_dupv_children (TerminalSettingsList *list)
{
- g_return_val_if_fail (TERMINAL_IS_SETTINGS_LIST (list), NULL);
+ g_return_val_if_fail (TERMINAL_IS_SETTINGS_LIST (list), nullptr);
return g_strdupv (list->uuids);
}
@@ -689,10 +689,10 @@ terminal_settings_list_dupv_children (TerminalSettingsList *list)
char *
terminal_settings_list_dup_default_child (TerminalSettingsList *list)
{
- g_return_val_if_fail (TERMINAL_IS_SETTINGS_LIST (list), NULL);
+ g_return_val_if_fail (TERMINAL_IS_SETTINGS_LIST (list), nullptr);
if ((list->flags & TERMINAL_SETTINGS_LIST_FLAG_HAS_DEFAULT) == 0)
- return NULL;
+ return nullptr;
if ((strv_find (list->uuids, list->default_uuid)) != -1)
return g_strdup (list->default_uuid);
@@ -700,9 +700,9 @@ terminal_settings_list_dup_default_child (TerminalSettingsList *list)
/* Just randomly designate the first child as default, but don't write that
* to dconf.
*/
- if (list->uuids == NULL || list->uuids[0] == NULL) {
+ if (list->uuids == nullptr || list->uuids[0] == nullptr) {
g_warn_if_fail ((list->flags & TERMINAL_SETTINGS_LIST_FLAG_ALLOW_EMPTY));
- return NULL;
+ return nullptr;
}
return g_strdup (list->uuids[0]);
@@ -730,17 +730,17 @@ terminal_settings_list_has_child (TerminalSettingsList *list,
* @list: a #TerminalSettingsList
* @uuid: the UUID of a list child
*
- * Returns the child #GSettings for the list child with UUID @uuid, or %NULL
+ * Returns the child #GSettings for the list child with UUID @uuid, or %nullptr
* if @list has no such child.
*
- * Returns: (transfer full): a reference to the #GSettings for the child, or %NULL
+ * Returns: (transfer full): a reference to the #GSettings for the child, or %nullptr
*/
GSettings *
terminal_settings_list_ref_child (TerminalSettingsList *list,
const char *uuid)
{
- g_return_val_if_fail (TERMINAL_IS_SETTINGS_LIST (list), NULL);
- g_return_val_if_fail (terminal_settings_list_valid_uuid (uuid), NULL);
+ g_return_val_if_fail (TERMINAL_IS_SETTINGS_LIST (list), nullptr);
+ g_return_val_if_fail (terminal_settings_list_valid_uuid (uuid), nullptr);
return terminal_settings_list_ref_child_internal (list, uuid);
}
@@ -759,12 +759,12 @@ terminal_settings_list_ref_children (TerminalSettingsList *list)
GList *l;
guint i;
- g_return_val_if_fail (TERMINAL_IS_SETTINGS_LIST (list), NULL);
+ g_return_val_if_fail (TERMINAL_IS_SETTINGS_LIST (list), nullptr);
- if (list->uuids == NULL)
- return NULL;
+ if (list->uuids == nullptr)
+ return nullptr;
- l = NULL;
+ l = nullptr;
for (i = 0; list->uuids[i]; i++)
l = g_list_prepend (l, terminal_settings_list_ref_child (list, list->uuids[i]));
@@ -775,21 +775,21 @@ terminal_settings_list_ref_children (TerminalSettingsList *list)
* terminal_settings_list_ref_default_child:
* @list: a #TerminalSettingsList
*
- * Returns the default child #GSettings for the list, or %NULL if @list has no
+ * Returns the default child #GSettings for the list, or %nullptr if @list has no
* children.
*
- * Returns: (transfer full): a reference to the #GSettings for the default child, or %NULL
+ * Returns: (transfer full): a reference to the #GSettings for the default child, or %nullptr
*/
GSettings *
terminal_settings_list_ref_default_child (TerminalSettingsList *list)
{
- gs_free char *uuid = NULL;
+ gs_free char *uuid = nullptr;
- g_return_val_if_fail (TERMINAL_IS_SETTINGS_LIST (list), NULL);
+ g_return_val_if_fail (TERMINAL_IS_SETTINGS_LIST (list), nullptr);
uuid = terminal_settings_list_dup_default_child (list);
- if (uuid == NULL)
- return NULL;
+ if (uuid == nullptr)
+ return nullptr;
return terminal_settings_list_ref_child_internal (list, uuid);
}
@@ -807,9 +807,9 @@ char *
terminal_settings_list_add_child (TerminalSettingsList *list,
const char *name)
{
- g_return_val_if_fail (TERMINAL_IS_SETTINGS_LIST (list), NULL);
+ g_return_val_if_fail (TERMINAL_IS_SETTINGS_LIST (list), nullptr);
- return terminal_settings_list_add_child_internal (list, NULL, name);
+ return terminal_settings_list_add_child_internal (list, nullptr, name);
}
/**
@@ -828,8 +828,8 @@ terminal_settings_list_clone_child (TerminalSettingsList *list,
const char *uuid,
const char *name)
{
- g_return_val_if_fail (TERMINAL_IS_SETTINGS_LIST (list), NULL);
- g_return_val_if_fail (terminal_settings_list_valid_uuid (uuid), NULL);
+ g_return_val_if_fail (TERMINAL_IS_SETTINGS_LIST (list), nullptr);
+ g_return_val_if_fail (terminal_settings_list_valid_uuid (uuid), nullptr);
return terminal_settings_list_add_child_internal (list, uuid, name);
}
@@ -856,9 +856,9 @@ terminal_settings_list_remove_child (TerminalSettingsList *list,
* @list: a #TerminalSettingsList
* @child: a #GSettings of a child in the list
*
- * Returns the UUID of @child in the list, or %NULL if @child is not in the list.
+ * Returns the UUID of @child in the list, or %nullptr if @child is not in the list.
*
- * Returns: (transfer full): the UUID of the child in the settings list, or %NULL
+ * Returns: (transfer full): the UUID of the child in the settings list, or %nullptr
*/
char *
terminal_settings_list_dup_uuid_from_child (TerminalSettingsList *list,
@@ -867,16 +867,16 @@ terminal_settings_list_dup_uuid_from_child (TerminalSettingsList *list,
gs_free char *path;
char *p;
- g_return_val_if_fail (TERMINAL_IS_SETTINGS_LIST (list), NULL);
+ g_return_val_if_fail (TERMINAL_IS_SETTINGS_LIST (list), nullptr);
- g_object_get (child, "path", &path, NULL);
- g_return_val_if_fail (g_str_has_prefix (path, list->path), NULL);
+ g_object_get (child, "path", &path, nullptr);
+ g_return_val_if_fail (g_str_has_prefix (path, list->path), nullptr);
p = path + strlen (list->path);
- g_return_val_if_fail (p[0] == ':', NULL);
+ g_return_val_if_fail (p[0] == ':', nullptr);
p++;
- g_return_val_if_fail (strlen (p) == 37, NULL);
- g_return_val_if_fail (p[36] == '/', NULL);
+ g_return_val_if_fail (strlen (p) == 37, nullptr);
+ g_return_val_if_fail (p[36] == '/', nullptr);
p[36] = '\0';
g_assert (terminal_settings_list_valid_uuid (p));
@@ -924,7 +924,7 @@ terminal_settings_list_foreach_child (TerminalSettingsList *list,
for (char **p = list->uuids; *p; p++) {
const char *uuid = *p;
gs_unref_object GSettings *child = terminal_settings_list_ref_child_internal (list, uuid);
- if (child != NULL)
+ if (child != nullptr)
callback (list, uuid, child, user_data);
}
}
diff --git a/src/terminal-tab-label.cc b/src/terminal-tab-label.cc
index fa18b1e8..88af5d41 100644
--- a/src/terminal-tab-label.cc
+++ b/src/terminal-tab-label.cc
@@ -87,7 +87,7 @@ sync_tab_label (TerminalScreen *screen,
*/
window = TERMINAL_WINDOW (gtk_widget_get_ancestor (GTK_WIDGET (label),
TERMINAL_TYPE_WINDOW));
- if (window != NULL)
+ if (window != nullptr)
terminal_window_update_size (window);
}
@@ -139,7 +139,7 @@ terminal_tab_label_parent_set (GtkWidget *widget,
parent = gtk_widget_get_parent (widget);
if (GTK_IS_NOTEBOOK (parent)) {
- notify_tab_pos_cb (GTK_NOTEBOOK (parent), NULL, TERMINAL_TAB_LABEL (widget));
+ notify_tab_pos_cb (GTK_NOTEBOOK (parent), nullptr, TERMINAL_TAB_LABEL (widget));
g_signal_connect (parent, "notify::tab-pos",
G_CALLBACK (notify_tab_pos_cb), widget);
}
@@ -185,11 +185,11 @@ terminal_tab_label_constructed (GObject *object)
hbox = GTK_WIDGET (tab_label);
- g_assert (priv->screen != NULL);
+ g_assert (priv->screen != nullptr);
gtk_box_set_spacing (GTK_BOX (hbox), SPACING);
- priv->label = label = gtk_label_new (NULL);
+ priv->label = label = gtk_label_new (nullptr);
gtk_widget_set_halign (label, GTK_ALIGN_CENTER);
gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
gtk_widget_set_margin_start (label, 0);
@@ -206,7 +206,7 @@ terminal_tab_label_constructed (GObject *object)
gtk_widget_set_tooltip_text (close_button, _("Close tab"));
gtk_box_pack_end (GTK_BOX (hbox), close_button, FALSE, FALSE, 0);
- sync_tab_label (priv->screen, NULL, label);
+ sync_tab_label (priv->screen, nullptr, label);
g_signal_connect (priv->screen, "notify::title",
G_CALLBACK (sync_tab_label), label);
@@ -222,12 +222,12 @@ terminal_tab_label_dispose (GObject *object)
TerminalTabLabel *tab_label = TERMINAL_TAB_LABEL (object);
TerminalTabLabelPrivate *priv = tab_label->priv;
- if (priv->screen != NULL) {
+ if (priv->screen != nullptr) {
g_signal_handlers_disconnect_by_func (priv->screen,
(void*)sync_tab_label,
priv->label);
g_object_unref (priv->screen);
- priv->screen = NULL;
+ priv->screen = nullptr;
}
G_OBJECT_CLASS (terminal_tab_label_parent_class)->dispose (object);
@@ -298,7 +298,7 @@ terminal_tab_label_class_init (TerminalTabLabelClass *klass)
G_OBJECT_CLASS_TYPE (gobject_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (TerminalTabLabelClass, close_button_clicked),
- NULL, NULL,
+ nullptr, nullptr,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE,
0);
@@ -306,7 +306,7 @@ terminal_tab_label_class_init (TerminalTabLabelClass *klass)
g_object_class_install_property
(gobject_class,
PROP_SCREEN,
- g_param_spec_object ("screen", NULL, NULL,
+ g_param_spec_object ("screen", nullptr, nullptr,
TERMINAL_TYPE_SCREEN,
GParamFlags(G_PARAM_READWRITE |
G_PARAM_STATIC_NAME |
@@ -389,7 +389,7 @@ terminal_tab_label_set_bold (TerminalTabLabel *tab_label,
TerminalScreen *
terminal_tab_label_get_screen (TerminalTabLabel *tab_label)
{
- g_return_val_if_fail (TERMINAL_IS_TAB_LABEL (tab_label), NULL);
+ g_return_val_if_fail (TERMINAL_IS_TAB_LABEL (tab_label), nullptr);
return tab_label->priv->screen;
}
diff --git a/src/terminal-util.cc b/src/terminal-util.cc
index 007ca782..48f6f8c9 100644
--- a/src/terminal-util.cc
+++ b/src/terminal-util.cc
@@ -48,11 +48,11 @@
* terminal_util_show_error_dialog:
* @transient_parent: parent of the future dialog window;
* @weap_ptr: pointer to a #Widget pointer, to control the population.
- * @error: a #GError, or %NULL
+ * @error: a #GError, or %nullptr
* @message_format: printf() style format string
*
* Create a #GtkMessageDialog window with the message, and present it, handling its buttons.
- * If @weap_ptr is not #NULL, only create the dialog if <literal>*weap_ptr</literal> is #NULL
+ * If @weap_ptr is not #nullptr, only create the dialog if <literal>*weap_ptr</literal> is #nullptr
* (and in that * case, set @weap_ptr to be a weak pointer to the new dialog), otherwise just
* present <literal>*weak_ptr</literal>. Note that in this last case, the message <emph>will</emph>
* be changed.
@@ -73,25 +73,25 @@ terminal_util_show_error_dialog (GtkWindow *transient_parent,
message = g_strdup_vprintf (message_format, args);
va_end (args);
}
- else message = NULL;
+ else message = nullptr;
- if (weak_ptr == NULL || *weak_ptr == NULL)
+ if (weak_ptr == nullptr || *weak_ptr == nullptr)
{
GtkWidget *dialog;
dialog = gtk_message_dialog_new (transient_parent,
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK,
- message ? "%s" : NULL,
+ message ? "%s" : nullptr,
message);
- if (error != NULL)
+ if (error != nullptr)
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
"%s", error->message);
- g_signal_connect (G_OBJECT (dialog), "response", G_CALLBACK (gtk_widget_destroy), NULL);
+ g_signal_connect (G_OBJECT (dialog), "response", G_CALLBACK (gtk_widget_destroy), nullptr);
- if (weak_ptr != NULL)
+ if (weak_ptr != nullptr)
{
*weak_ptr = dialog;
g_object_add_weak_pointer (G_OBJECT (dialog), (void**)weak_ptr);
@@ -106,7 +106,7 @@ terminal_util_show_error_dialog (GtkWindow *transient_parent,
g_return_if_fail (GTK_IS_MESSAGE_DIALOG (*weak_ptr));
/* Sucks that there's no direct accessor for "text" property */
- g_object_set (G_OBJECT (*weak_ptr), "text", message, NULL);
+ g_object_set (G_OBJECT (*weak_ptr), "text", message, nullptr);
gtk_window_present (GTK_WINDOW (*weak_ptr));
}
@@ -127,7 +127,7 @@ open_url (GtkWindow *parent,
screen = gdk_screen_get_default ();
uri_fixed = terminal_util_uri_fixup (uri, error);
- if (uri_fixed == NULL)
+ if (uri_fixed == nullptr)
return FALSE;
return gtk_show_uri (screen, uri_fixed, user_time, error);
@@ -136,7 +136,7 @@ open_url (GtkWindow *parent,
void
terminal_util_show_help (const char *topic)
{
- gs_free_error GError *error = NULL;
+ gs_free_error GError *error = nullptr;
gs_free char *uri;
if (topic) {
@@ -145,9 +145,9 @@ terminal_util_show_help (const char *topic)
uri = g_strdup ("help:gnome-terminal");
}
- if (!open_url (NULL, uri, gtk_get_current_event_time (), &error))
+ if (!open_url (nullptr, uri, gtk_get_current_event_time (), &error))
{
- terminal_util_show_error_dialog (NULL, NULL, error,
+ terminal_util_show_error_dialog (nullptr, nullptr, error,
_("There was an error displaying help"));
}
}
@@ -170,7 +170,7 @@ terminal_util_show_about (void)
GBytes *bytes;
const guint8 *data;
gsize data_len;
- GError *error = NULL;
+ GError *error = nullptr;
char **authors, **contributors, **artists, **documenters, **array_strv;
gsize n_authors = 0, n_contributors = 0, n_artists = 0, n_documenters = 0 , i;
GPtrArray *array;
@@ -189,10 +189,10 @@ terminal_util_show_about (void)
g_key_file_load_from_data (key_file, (const char *) data, data_len, GKeyFileFlags(0), &error);
g_assert_no_error (error);
- authors = g_key_file_get_string_list (key_file, ABOUT_GROUP, "Authors", &n_authors, NULL);
- contributors = g_key_file_get_string_list (key_file, ABOUT_GROUP, "Contributors", &n_contributors, NULL);
- artists = g_key_file_get_string_list (key_file, ABOUT_GROUP, "Artists", &n_artists, NULL);
- documenters = g_key_file_get_string_list (key_file, ABOUT_GROUP, "Documenters", &n_documenters, NULL);
+ authors = g_key_file_get_string_list (key_file, ABOUT_GROUP, "Authors", &n_authors, nullptr);
+ contributors = g_key_file_get_string_list (key_file, ABOUT_GROUP, "Contributors", &n_contributors, nullptr);
+ artists = g_key_file_get_string_list (key_file, ABOUT_GROUP, "Artists", &n_artists, nullptr);
+ documenters = g_key_file_get_string_list (key_file, ABOUT_GROUP, "Documenters", &n_documenters, nullptr);
g_key_file_free (key_file);
g_bytes_unref (bytes);
@@ -212,7 +212,7 @@ terminal_util_show_about (void)
}
g_free (contributors); /* strings are now owned by the array */
- g_ptr_array_add (array, NULL);
+ g_ptr_array_add (array, nullptr);
array_strv = (char **) g_ptr_array_free (array, FALSE);
for (i = 0; i < n_artists; ++i)
@@ -254,7 +254,7 @@ terminal_util_show_about (void)
"logo-icon-name", GNOME_TERMINAL_ICON_NAME,
nullptr);
- g_signal_connect (dialog, "response", G_CALLBACK (gtk_widget_destroy), NULL);
+ g_signal_connect (dialog, "response", G_CALLBACK (gtk_widget_destroy), nullptr);
gtk_window_present (dialog);
g_strfreev (array_strv);
@@ -274,7 +274,7 @@ terminal_util_set_atk_name_description (GtkWidget *widget,
obj = gtk_widget_get_accessible (widget);
- if (obj == NULL)
+ if (obj == nullptr)
{
g_warning ("%s: for some reason widget has no GtkAccessible",
G_STRFUNC);
@@ -297,10 +297,10 @@ terminal_util_open_url (GtkWidget *parent,
TerminalURLFlavor flavor,
guint32 user_time)
{
- gs_free_error GError *error = NULL;
- gs_free char *uri = NULL;
+ gs_free_error GError *error = nullptr;
+ gs_free char *uri = nullptr;
- g_return_if_fail (orig_url != NULL);
+ g_return_if_fail (orig_url != nullptr);
switch (flavor)
{
@@ -318,13 +318,13 @@ terminal_util_open_url (GtkWidget *parent,
uri = g_strdup (orig_url);
break;
default:
- uri = NULL;
+ uri = nullptr;
g_assert_not_reached ();
}
if (!open_url (GTK_WINDOW (parent), uri, user_time, &error))
{
- terminal_util_show_error_dialog (GTK_WINDOW (parent), NULL, error,
+ terminal_util_show_error_dialog (GTK_WINDOW (parent), nullptr, error,
_("Could not open the address “%s”"),
uri);
}
@@ -406,13 +406,13 @@ terminal_util_get_licence_text (void)
"along with GNOME Terminal. If not, see <http://www.gnu.org/licenses/>.")
};
- return g_strjoin ("\n\n", _(license[0]), _(license[1]), _(license[2]), NULL);
+ return g_strjoin ("\n\n", _(license[0]), _(license[1]), _(license[2]), nullptr);
}
static void
main_object_destroy_cb (GtkWidget *widget)
{
- g_object_set_data (G_OBJECT (widget), "builder", NULL);
+ g_object_set_data (G_OBJECT (widget), "builder", nullptr);
}
GtkBuilder *
@@ -422,7 +422,7 @@ terminal_util_load_widgets_resource (const char *path,
...)
{
GtkBuilder *builder;
- GError *error = NULL;
+ GError *error = nullptr;
va_list args;
builder = gtk_builder_new ();
@@ -450,7 +450,7 @@ terminal_util_load_widgets_resource (const char *path,
main_object = gtk_builder_get_object (builder, main_object_name);
g_object_set_data_full (main_object, "builder", g_object_ref (builder), (GDestroyNotify) g_object_unref);
- g_signal_connect (main_object, "destroy", G_CALLBACK (main_object_destroy_cb), NULL);
+ g_signal_connect (main_object, "destroy", G_CALLBACK (main_object_destroy_cb), nullptr);
/* Fixup dialogue padding, #735242 */
if (GTK_IS_DIALOG (main_object) &&
@@ -470,7 +470,7 @@ terminal_util_load_objects_resource (const char *path,
...)
{
gs_unref_object GtkBuilder *builder;
- GError *error = NULL;
+ GError *error = nullptr;
va_list args;
builder = gtk_builder_new ();
@@ -508,21 +508,21 @@ terminal_util_dialog_focus_widget (GtkBuilder *builder,
{
GtkWidget *widget, *page, *page_parent;
- if (widget_name == NULL)
+ if (widget_name == nullptr)
return;
widget = GTK_WIDGET (gtk_builder_get_object (builder, widget_name));
- if (widget == NULL)
+ if (widget == nullptr)
return;
page = widget;
- while (page != NULL &&
- (page_parent = gtk_widget_get_parent (page)) != NULL &&
+ while (page != nullptr &&
+ (page_parent = gtk_widget_get_parent (page)) != nullptr &&
!GTK_IS_NOTEBOOK (page_parent))
page = page_parent;
page_parent = gtk_widget_get_parent (page);
- if (page != NULL && GTK_IS_NOTEBOOK (page_parent)) {
+ if (page != nullptr && GTK_IS_NOTEBOOK (page_parent)) {
GtkNotebook *notebook;
notebook = GTK_NOTEBOOK (page_parent);
@@ -549,20 +549,20 @@ set_proxy_env (GHashTable *env_table,
const char *key,
char *value /* consumed */)
{
- char *key1 = NULL, *key2 = NULL;
- char *value1 = NULL, *value2 = NULL;
+ char *key1 = nullptr, *key2 = nullptr;
+ char *value1 = nullptr, *value2 = nullptr;
if (!value)
return;
- if (g_hash_table_lookup (env_table, key) == NULL)
+ if (g_hash_table_lookup (env_table, key) == nullptr)
key1 = g_strdup (key);
key2 = g_ascii_strup (key, -1);
- if (g_hash_table_lookup (env_table, key) != NULL)
+ if (g_hash_table_lookup (env_table, key) != nullptr)
{
g_free (key2);
- key2 = NULL;
+ key2 = nullptr;
}
if (key1 && key2)
@@ -619,13 +619,13 @@ setup_proxy_env (GSettings *proxy_settings,
{
gs_free char *password;
- g_string_append_uri_escaped (buf, user, NULL, TRUE);
+ g_string_append_uri_escaped (buf, user, nullptr, TRUE);
password = g_settings_get_string (child_settings, "authentication-password");
if (password[0])
{
g_string_append_c (buf, ':');
- g_string_append_uri_escaped (buf, password, NULL, TRUE);
+ g_string_append_uri_escaped (buf, password, nullptr, TRUE);
}
g_string_append_c (buf, '@');
}
@@ -661,11 +661,11 @@ setup_ignore_proxy_env (GSettings *proxy_settings,
int i;
g_settings_get (proxy_settings, "ignore-hosts", "^as", &ignore);
- if (ignore == NULL)
+ if (ignore == nullptr)
return;
buf = g_string_sized_new (64);
- for (i = 0; ignore[i] != NULL; ++i)
+ for (i = 0; ignore[i] != nullptr; ++i)
{
if (buf->len)
g_string_append_c (buf, ',');
@@ -714,9 +714,9 @@ terminal_util_add_proxy_env (GHashTable *env_table)
char **
terminal_util_get_etc_shells (void)
{
- GError *err = NULL;
+ GError *err = nullptr;
gsize len;
- gs_free char *contents = NULL;
+ gs_free char *contents = nullptr;
char *str, *nl, *end;
GPtrArray *arr;
@@ -725,7 +725,7 @@ terminal_util_get_etc_shells (void)
char *default_shells[3] = {
(char*) "/bin/sh",
(char*) "/bin/csh",
- NULL
+ nullptr
};
return g_strdupv (default_shells);
}
@@ -733,7 +733,7 @@ terminal_util_get_etc_shells (void)
arr = g_ptr_array_new ();
str = contents;
end = contents + len;
- while (str < end && (nl = strchr (str, '\n')) != NULL) {
+ while (str < end && (nl = strchr (str, '\n')) != nullptr) {
if (str != nl) /* non-empty? */
g_ptr_array_add (arr, g_strndup (str, nl - str));
str = nl + 1;
@@ -742,7 +742,7 @@ terminal_util_get_etc_shells (void)
if (str < end && str[0])
g_ptr_array_add (arr, g_strdup (str));
- g_ptr_array_add (arr, NULL);
+ g_ptr_array_add (arr, nullptr);
return (char **) g_ptr_array_free (arr, FALSE);
}
@@ -761,7 +761,7 @@ terminal_util_get_is_shell (const char *command)
guint i;
shells = terminal_util_get_etc_shells ();
- if (shells == NULL)
+ if (shells == nullptr)
return FALSE;
for (i = 0; shells[i]; i++)
@@ -779,9 +779,9 @@ s_to_rgba (GVariant *variant,
GdkRGBA *color = (GdkRGBA*)user_data;
const char *str;
- if (variant == NULL) {
+ if (variant == nullptr) {
/* Fallback */
- *result = NULL;
+ *result = nullptr;
return TRUE;
}
@@ -801,10 +801,10 @@ s_to_rgba (GVariant *variant,
* @mandatory_key_type: the expected value type of @mandatory_key
*
* Creates a #GSettings for @schema_id, if this schema exists and
- * has a key named @mandatory_key (if non-%NULL) with the value type
+ * has a key named @mandatory_key (if non-%nullptr) with the value type
* @mandatory_key_type.
*
- * Returns: (transfer full): a new #GSettings, or %NULL
+ * Returns: (transfer full): a new #GSettings, or %nullptr
*/
GSettings *
terminal_g_settings_new (const char *schema_id,
@@ -816,22 +816,22 @@ terminal_g_settings_new (const char *schema_id,
schema = g_settings_schema_source_lookup (g_settings_schema_source_get_default (),
schema_id,
TRUE);
- if (schema == NULL)
- return NULL;
+ if (schema == nullptr)
+ return nullptr;
if (mandatory_key) {
gs_unref_settings_schema_key GSettingsSchemaKey *key;
key = g_settings_schema_get_key (schema, mandatory_key);
- if (key == NULL)
- return NULL;
+ if (key == nullptr)
+ return nullptr;
if (!g_variant_type_equal (g_settings_schema_key_get_value_type (key),
mandatory_key_type))
- return NULL;
+ return nullptr;
}
- return g_settings_new_full (schema, NULL, NULL);
+ return g_settings_new_full (schema, nullptr, nullptr);
}
/**
@@ -842,14 +842,14 @@ terminal_g_settings_new (const char *schema_id,
*
* Gets a color from @key in @settings.
*
- * Returns: @color if parsing succeeded, or %NULL otherwise
+ * Returns: @color if parsing succeeded, or %nullptr otherwise
*/
const GdkRGBA *
terminal_g_settings_get_rgba (GSettings *settings,
const char *key,
GdkRGBA *color)
{
- g_return_val_if_fail (color != NULL, FALSE);
+ g_return_val_if_fail (color != nullptr, FALSE);
return (GdkRGBA const*)g_settings_get_mapped (settings, key,
s_to_rgba,
@@ -881,14 +881,14 @@ as_to_rgba_palette (GVariant *variant,
gpointer user_data)
{
gsize *n_colors = (gsize*)user_data;
- gs_free GdkRGBA *colors = NULL;
+ gs_free GdkRGBA *colors = nullptr;
gsize n = 0;
GVariantIter iter;
const char *str;
gsize i;
/* Fallback */
- if (variant == NULL)
+ if (variant == nullptr)
goto out;
g_variant_iter_init (&iter, variant);
@@ -914,7 +914,7 @@ as_to_rgba_palette (GVariant *variant,
* terminal_g_settings_get_rgba_palette:
* @settings: a #GSettings
* @key: a valid key in @settings or type "s"
- * @n_colors: (allow-none): location to store the number of palette entries, or %NULL
+ * @n_colors: (allow-none): location to store the number of palette entries, or %nullptr
*
* Returns: (transfer full):
*/
@@ -940,7 +940,7 @@ terminal_g_settings_set_rgba_palette (GSettings *settings,
strv = g_new (char *, n_colors + 1);
for (i = 0; i < n_colors; ++i)
strv[i] = gdk_rgba_to_string (&colors[i]);
- strv[n_colors] = NULL;
+ strv[n_colors] = nullptr;
g_settings_set (settings, key, "^as", strv);
}
@@ -963,7 +963,7 @@ terminal_util_bind_mnemonic_label_sensitivity (GtkWidget *widget)
GList *list, *l;
list = gtk_widget_list_mnemonic_labels (widget);
- for (l = list; l != NULL; l = l->next) {
+ for (l = list; l != nullptr; l = l->next) {
GtkWidget *label = (GtkWidget*)l->data;
if (gtk_widget_is_ancestor (label, widget))
@@ -975,7 +975,7 @@ terminal_util_bind_mnemonic_label_sensitivity (GtkWidget *widget)
gtk_buildable_get_name (GTK_BUILDABLE (label)));
#endif
- mnemonic_label_set_sensitive_cb (widget, NULL, label);
+ mnemonic_label_set_sensitive_cb (widget, nullptr, label);
g_signal_connect (widget, "notify::sensitive",
G_CALLBACK (mnemonic_label_set_sensitive_cb),
label);
@@ -986,7 +986,7 @@ terminal_util_bind_mnemonic_label_sensitivity (GtkWidget *widget)
gtk_container_foreach (GTK_CONTAINER (widget),
/* See #96 for double casting. */
(GtkCallback) (GCallback) terminal_util_bind_mnemonic_label_sensitivity,
- NULL);
+ nullptr);
}
/*
@@ -1028,15 +1028,15 @@ add_separators (const char *in, const char *sep, int groupby)
* terminal_util_number_info:
* @str: a dec or hex number as string
*
- * Returns: (transfer full): Useful info about @str, or %NULL if it's too large
+ * Returns: (transfer full): Useful info about @str, or %nullptr if it's too large
*/
char *
terminal_util_number_info (const char *str)
{
- gs_free char *decstr = NULL;
- gs_free char *hextmp = NULL;
- gs_free char *hexstr = NULL;
- gs_free char *magnitudestr = NULL;
+ gs_free char *decstr = nullptr;
+ gs_free char *hextmp = nullptr;
+ gs_free char *hexstr = nullptr;
+ gs_free char *magnitudestr = nullptr;
gboolean exact = TRUE;
gboolean hex = FALSE;
const char *thousep;
@@ -1051,11 +1051,11 @@ terminal_util_number_info (const char *str)
char* end;
gint64 num = g_ascii_strtoull(str, &end, hex ? 16 : 10);
if (errno || str == end || num == -1)
- return NULL;
+ return nullptr;
/* No use in dec-hex conversion for so small numbers */
if (num < 10) {
- return NULL;
+ return nullptr;
}
/* Group the decimal digits */
@@ -1103,14 +1103,14 @@ terminal_util_number_info (const char *str)
* terminal_util_timestamp_info:
* @str: a dec or hex number as string
*
- * Returns: (transfer full): Formatted localtime if @str is decimal and looks like a timestamp, or %NULL
+ * Returns: (transfer full): Formatted localtime if @str is decimal and looks like a timestamp, or %nullptr
*/
char *
terminal_util_timestamp_info (const char *str)
{
/* Bail out on hex numbers */
if (str[0] == '0' && (str[1] == 'x' || str[1] == 'X')) {
- return NULL;
+ return nullptr;
}
/* Deliberately not handle octal */
@@ -1118,7 +1118,7 @@ terminal_util_timestamp_info (const char *str)
char* end;
gint64 num = g_ascii_strtoull (str, &end, 10);
if (errno || end == str || num == -1)
- return NULL;
+ return nullptr;
/* Java uses Unix time in milliseconds. */
if (num >= 1000000000000 && num <= 1999999999999)
@@ -1128,11 +1128,11 @@ terminal_util_timestamp_info (const char *str)
* and check the human-readable time in gnome-terminal.
* (They're Sep 9 2001 and May 18 2033 by the way.) */
if (num < 1000000000 || num > 1999999999)
- return NULL;
+ return nullptr;
gs_unref_date_time GDateTime* date = g_date_time_new_from_unix_utc (num);
- if (date == NULL)
- return NULL;
+ if (date == nullptr)
+ return nullptr;
return g_date_time_format(date, "%c");
}
@@ -1154,7 +1154,7 @@ terminal_util_timestamp_info (const char *str)
* work around bug 781800 (LibreOffice bug 107461).
*
* Returns: The possibly rewritten URI if gnome-terminal should attempt
- * to handle it, NULL if it should refuse to handle.
+ * to handle it, nullptr if it should refuse to handle.
*/
char *
terminal_util_uri_fixup (const char *uri,
@@ -1163,9 +1163,9 @@ terminal_util_uri_fixup (const char *uri,
gs_free char *filename;
gs_free char *hostname;
- filename = g_filename_from_uri (uri, &hostname, NULL);
- if (filename != NULL &&
- hostname != NULL &&
+ filename = g_filename_from_uri (uri, &hostname, nullptr);
+ if (filename != nullptr &&
+ hostname != nullptr &&
hostname[0] != '\0') {
/* "file" scheme and nonempty hostname */
if (g_ascii_strcasecmp (hostname, "localhost") == 0 ||
@@ -1177,7 +1177,7 @@ terminal_util_uri_fixup (const char *uri,
* "file:/etc/passwd", but just in case we do, or encounter
* something else unexpected, leave the URI unchanged. */
slash1 = strchr(uri, '/');
- if (slash1 == NULL)
+ if (slash1 == nullptr)
return g_strdup (uri);
slash2 = slash1 + 1;
@@ -1185,7 +1185,7 @@ terminal_util_uri_fixup (const char *uri,
return g_strdup (uri);
slash3 = strchr(slash2 + 1, '/');
- if (slash3 == NULL)
+ if (slash3 == nullptr)
return g_strdup (uri);
return g_strdup_printf("%.*s%s",
@@ -1199,7 +1199,7 @@ terminal_util_uri_fixup (const char *uri,
G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED,
_("“file” scheme with remote hostname not supported"));
- return NULL;
+ return nullptr;
}
} else {
/* "file" scheme without hostname, or some other scheme */
@@ -1218,26 +1218,26 @@ terminal_util_uri_fixup (const char *uri,
*/
char *terminal_util_hyperlink_uri_label (const char *uri)
{
- gs_free char *unesc = NULL;
+ gs_free char *unesc = nullptr;
gboolean replace_hostname;
- if (uri == NULL)
- return NULL;
+ if (uri == nullptr)
+ return nullptr;
- unesc = g_uri_unescape_string(uri, NULL);
- if (unesc == NULL)
+ unesc = g_uri_unescape_string(uri, nullptr);
+ if (unesc == nullptr)
unesc = g_strdup(uri);
if (g_ascii_strncasecmp(unesc, "ftp://", 6) == 0 ||
g_ascii_strncasecmp(unesc, "http://", 7) == 0 ||
g_ascii_strncasecmp(unesc, "https://", 8) == 0) {
- gs_free char *unidn = NULL;
+ gs_free char *unidn = nullptr;
char *hostname = strchr(unesc, '/') + 2;
char *hostname_end = strchrnul(hostname, '/');
char save = *hostname_end;
*hostname_end = '\0';
unidn = g_hostname_to_unicode(hostname);
- replace_hostname = unidn != NULL && g_ascii_strcasecmp(unidn, hostname) != 0;
+ replace_hostname = unidn != nullptr && g_ascii_strcasecmp(unidn, hostname) != 0;
*hostname_end = save;
if (replace_hostname) {
char *new_unesc = g_strdup_printf("%.*s%s%s",
@@ -1264,7 +1264,7 @@ char *terminal_util_hyperlink_uri_label (const char *uri)
static char *
get_cache_dir (void)
{
- return g_build_filename (g_get_user_cache_dir (), TERMINAL_CACHE_DIR, NULL);
+ return g_build_filename (g_get_user_cache_dir (), TERMINAL_CACHE_DIR, nullptr);
}
static gboolean
@@ -1285,7 +1285,7 @@ static char *
get_cache_filename (const char *filename)
{
gs_free char *cache_dir = get_cache_dir ();
- return g_build_filename (cache_dir, filename, NULL);
+ return g_build_filename (cache_dir, filename, nullptr);
}
static GKeyFile *
@@ -1298,32 +1298,32 @@ load_cache_keyfile (const char *filename,
path = get_cache_filename (filename);
keyfile = g_key_file_new ();
- if (g_key_file_load_from_file (keyfile, path, flags, NULL) || ignore_error)
+ if (g_key_file_load_from_file (keyfile, path, flags, nullptr) || ignore_error)
return keyfile;
g_key_file_unref (keyfile);
- return NULL;
+ return nullptr;
}
static void
save_cache_keyfile (GKeyFile *keyfile,
const char *filename)
{
- gs_free char *path = NULL;
- gs_free char *data = NULL;
+ gs_free char *path = nullptr;
+ gs_free char *data = nullptr;
gsize len = 0;
if (!ensure_cache_dir ())
return;
- data = g_key_file_to_data (keyfile, &len, NULL);
- if (data == NULL || len == 0)
+ data = g_key_file_to_data (keyfile, &len, nullptr);
+ if (data == nullptr || len == 0)
return;
path = get_cache_filename (filename);
/* Ignore errors */
- GError *err = NULL;
+ GError *err = nullptr;
if (!g_file_set_contents (path, data, len, &err)) {
g_printerr ("Error saving print settings: %s\n", err->message);
g_error_free (err);
@@ -1339,8 +1339,8 @@ keyfile_remove_keys (GKeyFile *keyfile,
const char *key;
va_start (args, group_name);
- while ((key = va_arg (args, const char *)) != NULL) {
- g_key_file_remove_key (keyfile, group_name, key, NULL);
+ while ((key = va_arg (args, const char *)) != nullptr) {
+ g_key_file_remove_key (keyfile, group_name, key, nullptr);
}
va_end (args);
}
@@ -1357,19 +1357,19 @@ terminal_util_load_print_settings (GtkPrintSettings **settings,
gs_unref_key_file GKeyFile *keyfile = load_cache_keyfile (TERMINAL_PRINT_SETTINGS_FILENAME,
KEYFILE_FLAGS_FOR_LOAD,
FALSE);
- if (keyfile == NULL) {
- *settings = NULL;
- *page_setup = NULL;
+ if (keyfile == nullptr) {
+ *settings = nullptr;
+ *page_setup = nullptr;
return;
}
/* Ignore errors */
*settings = gtk_print_settings_new_from_key_file (keyfile,
TERMINAL_PRINT_SETTINGS_GROUP_NAME,
- NULL);
+ nullptr);
*page_setup = gtk_page_setup_new_from_key_file (keyfile,
TERMINAL_PAGE_SETUP_GROUP_NAME,
- NULL);
+ nullptr);
}
/**
@@ -1383,14 +1383,14 @@ void
terminal_util_save_print_settings (GtkPrintSettings *settings,
GtkPageSetup *page_setup)
{
- gs_unref_key_file GKeyFile *keyfile = NULL;
+ gs_unref_key_file GKeyFile *keyfile = nullptr;
keyfile = load_cache_keyfile (TERMINAL_PRINT_SETTINGS_FILENAME,
KEYFILE_FLAGS_FOR_SAVE,
TRUE);
- g_assert (keyfile != NULL);
+ g_assert (keyfile != nullptr);
- if (settings != NULL)
+ if (settings != nullptr)
gtk_print_settings_to_key_file (settings, keyfile,
TERMINAL_PRINT_SETTINGS_GROUP_NAME);
@@ -1408,9 +1408,9 @@ terminal_util_save_print_settings (GtkPrintSettings *settings,
GTK_PRINT_SETTINGS_PRINT_PAGES,
GTK_PRINT_SETTINGS_REVERSE,
GTK_PRINT_SETTINGS_SCALE,
- NULL);
+ nullptr);
- if (page_setup != NULL)
+ if (page_setup != nullptr)
gtk_page_setup_to_key_file (page_setup, keyfile,
TERMINAL_PAGE_SETUP_GROUP_NAME);
@@ -1424,7 +1424,7 @@ terminal_util_save_print_settings (GtkPrintSettings *settings,
"page-setup-margin-left",
"page-setup-margin-right",
"page-setup-margin-top",
- NULL);
+ nullptr);
save_cache_keyfile (keyfile, TERMINAL_PRINT_SETTINGS_FILENAME);
}
@@ -1434,9 +1434,9 @@ terminal_util_save_print_settings (GtkPrintSettings *settings,
* @encoding: the encoding name
*
* Translates old encoding name to the one supported by ICU, or
- * to %NULL if the encoding is not known to ICU.
+ * to %nullptr if the encoding is not known to ICU.
*
- * Returns: (transfer none): the translated encoding, or %NULL if
+ * Returns: (transfer none): the translated encoding, or %nullptr if
* not translation was possible.
*/
const char*
@@ -1450,9 +1450,9 @@ terminal_util_translate_encoding (const char *encoding)
const char *name;
const char *replacement;
} translations[] = {
- { "ARMSCII-8", NULL }, /* apparently not supported by ICU */
- { "GEORGIAN-PS", NULL }, /* no idea which charset this even is */
- { "ISO-IR-111", NULL }, /* ISO-IR-111 refers to ECMA-94, but that
+ { "ARMSCII-8", nullptr }, /* apparently not supported by ICU */
+ { "GEORGIAN-PS", nullptr }, /* no idea which charset this even is */
+ { "ISO-IR-111", nullptr }, /* ISO-IR-111 refers to ECMA-94, but that
* standard does not contain cyrillic letters.
* ECMA-94 refers to ECMA-113 (ISO-IR-144),
* whose assignment differs greatly from ISO-IR-111,
@@ -1461,28 +1461,28 @@ terminal_util_translate_encoding (const char *encoding)
/* All the MAC_* charsets appear to be unknown to even glib iconv, so
* why did we have them in our list in the first place?
*/
- { "MAC_DEVANAGARI", NULL }, /* apparently not supported by ICU */
- { "MAC_FARSI", NULL }, /* apparently not supported by ICU */
+ { "MAC_DEVANAGARI", nullptr }, /* apparently not supported by ICU */
+ { "MAC_FARSI", nullptr }, /* apparently not supported by ICU */
{ "MAC_GREEK", "x-MacGreek" },
- { "MAC_GUJARATI", NULL }, /* apparently not supported by ICU */
- { "MAC_GURMUKHI", NULL }, /* apparently not supported by ICU */
- { "MAC_ICELANDIC", NULL }, /* apparently not supported by ICU */
+ { "MAC_GUJARATI", nullptr }, /* apparently not supported by ICU */
+ { "MAC_GURMUKHI", nullptr }, /* apparently not supported by ICU */
+ { "MAC_ICELANDIC", nullptr }, /* apparently not supported by ICU */
{ "MAC_ROMANIAN", "x-macroman" }, /* not sure this is the right one */
{ "MAC_TURKISH", "x-MacTurkish" },
{ "MAC_UKRAINIAN", "x-MacUkraine" },
- { "TCVN", NULL }, /* apparently not supported by ICU */
+ { "TCVN", nullptr }, /* apparently not supported by ICU */
{ "UHC", "cp949" },
- { "VISCII", NULL }, /* apparently not supported by ICU */
+ { "VISCII", nullptr }, /* apparently not supported by ICU */
/* ISO-2022-* are known to ICU, but they simply cannot work in vte as
* I/O encoding, so don't even try.
*/
- { "ISO-2022-JP", NULL },
- { "ISO-2022-KR", NULL },
+ { "ISO-2022-JP", nullptr },
+ { "ISO-2022-KR", nullptr },
};
- const char *replacement = NULL;
+ const char *replacement = nullptr;
for (guint i = 0; i < G_N_ELEMENTS (translations); ++i) {
if (g_str_equal (encoding, translations[i].name)) {
replacement = translations[i].replacement;
@@ -1514,7 +1514,7 @@ terminal_util_translate_encoding (const char *encoding)
* PATH environment variable as the search path.
*
* Returns: (type filename) (transfer full) (nullable): a newly allocated
- * string containing the full path to @program, or %NULL if @program
+ * string containing the full path to @program, or %nullptr if @program
* could not be found in @path.
*/
char *
@@ -1526,24 +1526,24 @@ terminal_util_find_program_in_path (const char *path,
gsize len;
gsize pathlen;
- if (program == NULL)
- return NULL;
+ if (program == nullptr)
+ return nullptr;
/* If it is an absolute path, or a relative path including subdirectories,
* don't look in PATH.
*/
if (g_path_is_absolute (program)
- || strchr (program, G_DIR_SEPARATOR) != NULL
+ || strchr (program, G_DIR_SEPARATOR) != nullptr
)
{
if (g_file_test (program, G_FILE_TEST_IS_EXECUTABLE) &&
!g_file_test (program, G_FILE_TEST_IS_DIR))
return g_strdup (program);
else
- return NULL;
+ return nullptr;
}
- if (path == NULL)
+ if (path == nullptr)
{
/* There is no 'PATH' in the environment. The default
* search path in GNU libc is the current directory followed by
@@ -1596,7 +1596,7 @@ terminal_util_find_program_in_path (const char *path,
while (*p++ != '\0');
g_free (freeme);
- return NULL;
+ return nullptr;
}
/* END code copied from glib */
@@ -1616,7 +1616,7 @@ terminal_util_check_envv(char const* const* strv)
for (int i = 0; strv[i]; ++i) {
const char *str = strv[i];
const char *equal = strchr(str, '=');
- if (equal == NULL || equal == str)
+ if (equal == nullptr || equal == str)
return FALSE;
}
diff --git a/src/terminal-window.cc b/src/terminal-window.cc
index 393ebf8e..02a96d81 100644
--- a/src/terminal-window.cc
+++ b/src/terminal-window.cc
@@ -231,7 +231,7 @@ lookup_action (TerminalWindow *window,
GAction *action;
action = g_action_map_lookup_action (G_ACTION_MAP (window), name);
- g_return_val_if_fail (action != NULL, NULL);
+ g_return_val_if_fail (action != nullptr, nullptr);
return G_SIMPLE_ACTION (action);
}
@@ -239,7 +239,7 @@ lookup_action (TerminalWindow *window,
/* Context menu helpers */
/* We don't want context menus to show accelerators.
- * Setting the menu's accel group and/or accel path to NULL
+ * Setting the menu's accel group and/or accel path to nullptr
* unfortunately doesn't hide accelerators; we need to walk
* the menu items and remove the accelerators on each,
* manually.
@@ -251,7 +251,7 @@ popup_menu_remove_accelerators (GtkWidget *menu)
GList *l;
menu_items = gtk_container_get_children (GTK_CONTAINER (menu));
- for (l = menu_items; l != NULL; l = l ->next) {
+ for (l = menu_items; l != nullptr; l = l ->next) {
GtkMenuItem *item = (GtkMenuItem*) (l->data);
GtkWidget *label, *submenu;
@@ -295,7 +295,7 @@ popup_menu_selection_done_cb (GtkMenu *menu,
/* g_printerr ("selection-done %p\n", menu); */
/* This will remove the ref from the attach widget widget, and destroy the menu */
- if (gtk_menu_get_attach_widget (menu) != NULL)
+ if (gtk_menu_get_attach_widget (menu) != nullptr)
gtk_menu_detach (menu);
}
@@ -340,7 +340,7 @@ action_new_terminal_cb (GSimpleAction *action,
TerminalWindowPrivate *priv = window->priv;
TerminalApp *app;
TerminalSettingsList *profiles_list;
- gs_unref_object GSettings *profile = NULL;
+ gs_unref_object GSettings *profile = nullptr;
gboolean can_toggle = FALSE;
g_assert (TERMINAL_IS_WINDOW (window));
@@ -366,7 +366,7 @@ action_new_terminal_cb (GSimpleAction *action,
if (can_toggle) {
GdkEvent *event = gtk_get_current_event ();
- if (event != NULL) {
+ if (event != nullptr) {
GdkModifierType modifiers;
if ((gdk_event_get_state (event, &modifiers) &&
@@ -391,14 +391,14 @@ action_new_terminal_cb (GSimpleAction *action,
else
profile = terminal_settings_list_ref_child (profiles_list, uuid_str);
- if (profile == NULL)
+ if (profile == nullptr)
return;
if (mode == TERMINAL_NEW_TERMINAL_MODE_WINDOW)
window = terminal_window_new (G_APPLICATION (app));
TerminalScreen *screen = terminal_screen_new (profile,
- NULL /* title */,
+ nullptr /* title */,
1.0);
/* Now add the new screen to the window */
@@ -407,7 +407,7 @@ action_new_terminal_cb (GSimpleAction *action,
gtk_widget_grab_focus (GTK_WIDGET (screen));
/* Start child process, if possible by using the same args as the parent screen */
- terminal_screen_reexec_from_screen (screen, parent_screen, NULL, NULL);
+ terminal_screen_reexec_from_screen (screen, parent_screen, nullptr, nullptr);
if (mode == TERMINAL_NEW_TERMINAL_MODE_WINDOW)
gtk_window_present (GTK_WINDOW (window));
@@ -422,10 +422,10 @@ save_contents_dialog_on_response (GtkDialog *dialog,
{
VteTerminal *terminal = (VteTerminal*)user_data;
GtkWindow *parent;
- gs_free gchar *filename_uri = NULL;
- gs_unref_object GFile *file = NULL;
+ gs_free gchar *filename_uri = nullptr;
+ gs_unref_object GFile *file = nullptr;
GOutputStream *stream;
- gs_free_error GError *error = NULL;
+ gs_free_error GError *error = nullptr;
if (response_id != GTK_RESPONSE_ACCEPT)
{
@@ -438,11 +438,11 @@ save_contents_dialog_on_response (GtkDialog *dialog,
gtk_widget_destroy (GTK_WIDGET (dialog));
- if (filename_uri == NULL)
+ if (filename_uri == nullptr)
return;
file = g_file_new_for_uri (filename_uri);
- stream = G_OUTPUT_STREAM (g_file_replace (file, NULL, FALSE, G_FILE_CREATE_NONE, NULL, &error));
+ stream = G_OUTPUT_STREAM (g_file_replace (file, nullptr, FALSE, G_FILE_CREATE_NONE, nullptr, &error));
if (stream)
{
@@ -453,13 +453,13 @@ save_contents_dialog_on_response (GtkDialog *dialog,
*/
vte_terminal_write_contents_sync (terminal, stream,
VTE_WRITE_DEFAULT,
- NULL, &error);
+ nullptr, &error);
g_object_unref (stream);
}
if (error)
{
- terminal_util_show_error_dialog (parent, NULL, error,
+ terminal_util_show_error_dialog (parent, nullptr, error,
"%s", _("Could not save contents"));
}
}
@@ -470,11 +470,11 @@ action_save_contents_cb (GSimpleAction *action,
gpointer user_data)
{
TerminalWindow *window = (TerminalWindow*)user_data;
- GtkWidget *dialog = NULL;
+ GtkWidget *dialog = nullptr;
TerminalWindowPrivate *priv = window->priv;
VteTerminal *terminal;
- if (priv->active_screen == NULL)
+ if (priv->active_screen == nullptr)
return;
terminal = VTE_TERMINAL (priv->active_screen);
@@ -485,7 +485,7 @@ action_save_contents_cb (GSimpleAction *action,
GTK_FILE_CHOOSER_ACTION_SAVE,
_("_Cancel"), GTK_RESPONSE_CANCEL,
_("_Save"), GTK_RESPONSE_ACCEPT,
- NULL);
+ nullptr);
gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS));
@@ -495,7 +495,7 @@ action_save_contents_cb (GSimpleAction *action,
gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
g_signal_connect (dialog, "response", G_CALLBACK (save_contents_dialog_on_response), terminal);
- g_signal_connect (dialog, "delete_event", G_CALLBACK (terminal_util_dialog_response_on_delete), NULL);
+ g_signal_connect (dialog, "delete_event", G_CALLBACK (terminal_util_dialog_response_on_delete), nullptr);
gtk_window_present (GTK_WINDOW (dialog));
}
@@ -539,24 +539,24 @@ action_print_cb (GSimpleAction *action,
{
TerminalWindow *window = user_data;
TerminalWindowPrivate *priv = window->priv;
- gs_unref_object GtkPrintSettings *settings = NULL;
- gs_unref_object GtkPageSetup *page_setup = NULL;
- gs_unref_object GtkPrintOperation *op = NULL;
- gs_free_error GError *error = NULL;
+ gs_unref_object GtkPrintSettings *settings = nullptr;
+ gs_unref_object GtkPageSetup *page_setup = nullptr;
+ gs_unref_object GtkPrintOperation *op = nullptr;
+ gs_free_error GError *error = nullptr;
GtkPrintOperationResult result;
- if (priv->active_screen == NULL)
+ if (priv->active_screen == nullptr)
return;
op = vte_print_operation_new (VTE_TERMINAL (priv->active_screen),
VTE_PRINT_OPERATION_DEFAULT /* flags */);
- if (op == NULL)
+ if (op == nullptr)
return;
terminal_util_load_print_settings (&settings, &page_setup);
- if (settings != NULL)
+ if (settings != nullptr)
gtk_print_operation_set_print_settings (op, settings);
- if (page_setup != NULL)
+ if (page_setup != nullptr)
gtk_print_operation_set_default_page_setup (op, page_setup);
g_signal_connect (op, "begin-print", G_CALLBACK (print_begin_cb), window);
@@ -584,23 +584,23 @@ action_export_cb (GSimpleAction *action,
{
TerminalWindow *window = user_data;
TerminalWindowPrivate *priv = window->priv;
- gs_unref_object VteExportOperation *op = NULL;
- gs_free_error GError *error = NULL;
+ gs_unref_object VteExportOperation *op = nullptr;
+ gs_free_error GError *error = nullptr;
- if (priv->active_screen == NULL)
+ if (priv->active_screen == nullptr)
return;
op = vte_export_operation_new (VTE_TERMINAL (priv->active_screen),
TRUE /* interactive */,
VTE_EXPORT_FORMAT_ASK /* allow user to choose export format */,
- NULL, NULL /* GSettings & key to load/store default directory from, FIXME */,
- NULL, NULL /* progress callback & user data, FIXME */);
- if (op == NULL)
+ nullptr, nullptr /* GSettings & key to load/store default directory from, FIXME */,
+ nullptr, nullptr /* progress callback & user data, FIXME */);
+ if (op == nullptr)
return;
/* FIXME: show progress better */
- vte_export_operation_run_async (op, GTK_WINDOW (window), NULL /* cancellable */);
+ vte_export_operation_run_async (op, GTK_WINDOW (window), nullptr /* cancellable */);
}
#endif /* ENABLE_EXPORT */
@@ -621,7 +621,7 @@ action_close_cb (GSimpleAction *action,
if (g_str_equal (mode_str, "tab"))
screen = priv->active_screen;
else if (g_str_equal (mode_str, "window"))
- screen = NULL;
+ screen = nullptr;
else
return;
@@ -644,7 +644,7 @@ action_copy_cb (GSimpleAction *action,
const char *format_str;
VteFormat format;
- if (priv->active_screen == NULL)
+ if (priv->active_screen == nullptr)
return;
g_assert_nonnull (parameter);
@@ -671,9 +671,9 @@ clipboard_uris_received_cb (GtkClipboard *clipboard,
/* const */ char **uris,
PasteData *data)
{
- gs_unref_object TerminalScreen *screen = NULL;
+ gs_unref_object TerminalScreen *screen = nullptr;
- if (uris != NULL && uris[0] != NULL &&
+ if (uris != nullptr && uris[0] != nullptr &&
(screen = (TerminalScreen*)g_weak_ref_get (&data->screen_weak_ref))) {
gs_free char *text;
gsize len;
@@ -697,13 +697,13 @@ request_clipboard_contents_for_paste (TerminalWindow *window,
GdkAtom *targets;
int n_targets;
- if (priv->active_screen == NULL)
+ if (priv->active_screen == nullptr)
return;
targets = terminal_app_get_clipboard_targets (terminal_app_get (),
priv->clipboard,
&n_targets);
- if (targets == NULL)
+ if (targets == nullptr)
return;
if (paste_as_uris && gtk_targets_include_uri (targets, n_targets)) {
@@ -747,7 +747,7 @@ action_select_all_cb (GSimpleAction *action,
TerminalWindow *window = (TerminalWindow*)user_data;
TerminalWindowPrivate *priv = window->priv;
- if (priv->active_screen == NULL)
+ if (priv->active_screen == nullptr)
return;
vte_terminal_select_all (VTE_TERMINAL (priv->active_screen));
@@ -763,7 +763,7 @@ action_reset_cb (GSimpleAction *action,
g_assert_nonnull (parameter);
- if (priv->active_screen == NULL)
+ if (priv->active_screen == nullptr)
return;
vte_terminal_reset (VTE_TERMINAL (priv->active_screen),
@@ -784,7 +784,7 @@ tab_switch_relative (TerminalWindow *window,
gboolean keynav_wrap_around;
g_object_get (gtk_widget_get_settings (GTK_WIDGET (window)),
"gtk-keynav-wrap-around", &keynav_wrap_around,
- NULL);
+ nullptr);
if (keynav_wrap_around) {
if (value < 0)
value += n_screens;
@@ -828,7 +828,7 @@ action_tab_move_left_cb (GSimpleAction *action,
TerminalWindowPrivate *priv = window->priv;
int change;
- if (priv->active_screen == NULL)
+ if (priv->active_screen == nullptr)
return;
change = gtk_widget_get_direction (GTK_WIDGET (window)) == GTK_TEXT_DIR_RTL ? 1 : -1;
@@ -846,7 +846,7 @@ action_tab_move_right_cb (GSimpleAction *action,
TerminalWindowPrivate *priv = window->priv;
int change;
- if (priv->active_screen == NULL)
+ if (priv->active_screen == nullptr)
return;
change = gtk_widget_get_direction (GTK_WIDGET (window)) == GTK_TEXT_DIR_RTL ? -1 : 1;
@@ -864,7 +864,7 @@ action_zoom_in_cb (GSimpleAction *action,
TerminalWindowPrivate *priv = window->priv;
double zoom;
- if (priv->active_screen == NULL)
+ if (priv->active_screen == nullptr)
return;
zoom = vte_terminal_get_font_scale (VTE_TERMINAL (priv->active_screen));
@@ -884,7 +884,7 @@ action_zoom_out_cb (GSimpleAction *action,
TerminalWindowPrivate *priv = window->priv;
double zoom;
- if (priv->active_screen == NULL)
+ if (priv->active_screen == nullptr)
return;
zoom = vte_terminal_get_font_scale (VTE_TERMINAL (priv->active_screen));
@@ -903,7 +903,7 @@ action_zoom_normal_cb (GSimpleAction *action,
TerminalWindow *window = (TerminalWindow*)user_data;
TerminalWindowPrivate *priv = window->priv;
- if (priv->active_screen == NULL)
+ if (priv->active_screen == nullptr)
return;
vte_terminal_set_font_scale (VTE_TERMINAL (priv->active_screen), PANGO_SCALE_MEDIUM);
@@ -944,7 +944,7 @@ action_help_cb (GSimpleAction *action,
GVariant *parameter,
gpointer user_data)
{
- terminal_util_show_help (NULL);
+ terminal_util_show_help (nullptr);
}
static void
@@ -965,7 +965,7 @@ action_edit_preferences_cb (GSimpleAction *action,
terminal_app_edit_preferences (terminal_app_get (),
terminal_screen_get_profile (priv->active_screen),
- NULL);
+ nullptr);
}
static void
@@ -979,7 +979,7 @@ action_size_to_cb (GSimpleAction *action,
g_assert_nonnull (parameter);
- if (priv->active_screen == NULL)
+ if (priv->active_screen == nullptr)
return;
g_variant_get (parameter, "(uu)", &width, &height);
@@ -1000,9 +1000,9 @@ action_open_match_cb (GSimpleAction *action,
TerminalWindowPrivate *priv = window->priv;
TerminalScreenPopupInfo *info = priv->popup_info;
- if (info == NULL)
+ if (info == nullptr)
return;
- if (info->url == NULL)
+ if (info->url == nullptr)
return;
terminal_util_open_url (GTK_WIDGET (window), info->url, info->url_flavor,
@@ -1018,9 +1018,9 @@ action_copy_match_cb (GSimpleAction *action,
TerminalWindowPrivate *priv = window->priv;
TerminalScreenPopupInfo *info = priv->popup_info;
- if (info == NULL)
+ if (info == nullptr)
return;
- if (info->url == NULL)
+ if (info->url == nullptr)
return;
gtk_clipboard_set_text (priv->clipboard, info->url, -1);
@@ -1035,9 +1035,9 @@ action_open_hyperlink_cb (GSimpleAction *action,
TerminalWindowPrivate *priv = window->priv;
TerminalScreenPopupInfo *info = priv->popup_info;
- if (info == NULL)
+ if (info == nullptr)
return;
- if (info->hyperlink == NULL)
+ if (info->hyperlink == nullptr)
return;
terminal_util_open_url (GTK_WIDGET (window), info->hyperlink, FLAVOR_AS_IS,
@@ -1053,9 +1053,9 @@ action_copy_hyperlink_cb (GSimpleAction *action,
TerminalWindowPrivate *priv = window->priv;
TerminalScreenPopupInfo *info = priv->popup_info;
- if (info == NULL)
+ if (info == nullptr)
return;
- if (info->hyperlink == NULL)
+ if (info->hyperlink == nullptr)
return;
gtk_clipboard_set_text (priv->clipboard, info->hyperlink, -1);
@@ -1098,7 +1098,7 @@ search_popover_search_cb (TerminalSearchPopover *popover,
{
TerminalWindowPrivate *priv = window->priv;
- if (G_UNLIKELY (priv->active_screen == NULL))
+ if (G_UNLIKELY (priv->active_screen == nullptr))
return;
if (backward)
@@ -1115,7 +1115,7 @@ search_popover_notify_regex_cb (TerminalSearchPopover *popover,
TerminalWindowPrivate *priv = window->priv;
VteRegex *regex;
- if (G_UNLIKELY (priv->active_screen == NULL))
+ if (G_UNLIKELY (priv->active_screen == nullptr))
return;
regex = terminal_search_popover_get_regex (popover);
@@ -1132,7 +1132,7 @@ search_popover_notify_wrap_around_cb (TerminalSearchPopover *popover,
TerminalWindowPrivate *priv = window->priv;
gboolean wrap;
- if (G_UNLIKELY (priv->active_screen == NULL))
+ if (G_UNLIKELY (priv->active_screen == nullptr))
return;
wrap = terminal_search_popover_get_wrap_around (popover);
@@ -1147,12 +1147,12 @@ action_find_cb (GSimpleAction *action,
TerminalWindow *window = (TerminalWindow*)user_data;
TerminalWindowPrivate *priv = window->priv;
- if (G_UNLIKELY(priv->active_screen == NULL))
+ if (G_UNLIKELY(priv->active_screen == nullptr))
return;
- if (priv->search_popover != NULL) {
- search_popover_notify_regex_cb (priv->search_popover, NULL, window);
- search_popover_notify_wrap_around_cb (priv->search_popover, NULL, window);
+ if (priv->search_popover != nullptr) {
+ search_popover_notify_regex_cb (priv->search_popover, nullptr, window);
+ search_popover_notify_wrap_around_cb (priv->search_popover, nullptr, window);
gtk_window_present_with_time (GTK_WINDOW (priv->search_popover),
gtk_get_current_event_time ());
@@ -1160,17 +1160,17 @@ action_find_cb (GSimpleAction *action,
return;
}
- if (priv->active_screen == NULL)
+ if (priv->active_screen == nullptr)
return;
priv->search_popover = terminal_search_popover_new (GTK_WIDGET (window));
g_signal_connect (priv->search_popover, "search", G_CALLBACK (search_popover_search_cb), window);
- search_popover_notify_regex_cb (priv->search_popover, NULL, window);
+ search_popover_notify_regex_cb (priv->search_popover, nullptr, window);
g_signal_connect (priv->search_popover, "notify::regex", G_CALLBACK (search_popover_notify_regex_cb), window);
- search_popover_notify_wrap_around_cb (priv->search_popover, NULL, window);
+ search_popover_notify_wrap_around_cb (priv->search_popover, nullptr, window);
g_signal_connect (priv->search_popover, "notify::wrap-around", G_CALLBACK (search_popover_notify_wrap_around_cb), window);
g_signal_connect (priv->search_popover, "destroy", G_CALLBACK (gtk_widget_destroyed), &priv->search_popover);
@@ -1187,7 +1187,7 @@ action_find_forward_cb (GSimpleAction *action,
TerminalWindow *window = (TerminalWindow*)user_data;
TerminalWindowPrivate *priv = window->priv;
- if (priv->active_screen == NULL)
+ if (priv->active_screen == nullptr)
return;
vte_terminal_search_find_next (VTE_TERMINAL (priv->active_screen));
@@ -1201,7 +1201,7 @@ action_find_backward_cb (GSimpleAction *action,
TerminalWindow *window = (TerminalWindow*)user_data;
TerminalWindowPrivate *priv = window->priv;
- if (priv->active_screen == NULL)
+ if (priv->active_screen == nullptr)
return;
vte_terminal_search_find_previous (VTE_TERMINAL (priv->active_screen));
@@ -1215,10 +1215,10 @@ action_find_clear_cb (GSimpleAction *action,
TerminalWindow *window = (TerminalWindow*)user_data;
TerminalWindowPrivate *priv = window->priv;
- if (priv->active_screen == NULL)
+ if (priv->active_screen == nullptr)
return;
- vte_terminal_search_set_regex (VTE_TERMINAL (priv->active_screen), NULL, 0);
+ vte_terminal_search_set_regex (VTE_TERMINAL (priv->active_screen), nullptr, 0);
vte_terminal_unselect_all (VTE_TERMINAL (priv->active_screen));
}
@@ -1285,7 +1285,7 @@ action_read_only_state_cb (GSimpleAction *action,
terminal_window_update_paste_sensitivity (window);
- if (priv->active_screen == NULL)
+ if (priv->active_screen == nullptr)
return;
vte_terminal_set_input_enabled (VTE_TERMINAL (priv->active_screen),
@@ -1305,10 +1305,10 @@ action_profile_state_cb (GSimpleAction *action,
g_assert_nonnull (state);
- uuid = g_variant_get_string (state, NULL);
+ uuid = g_variant_get_string (state, nullptr);
profiles_list = terminal_app_get_profiles_list (terminal_app_get ());
profile = terminal_settings_list_ref_child (profiles_list, uuid);
- if (profile == NULL)
+ if (profile == nullptr)
return;
g_simple_action_set_state (action, state);
@@ -1363,7 +1363,7 @@ enable_menubar_accel_changed_cb (GSettings *settings,
if (g_settings_get_boolean (settings, key))
gtk_settings_reset_property (gtk_settings, "gtk-menu-bar-accel");
else
- g_object_set (gtk_settings, "gtk-menu-bar-accel", NULL, NULL);
+ g_object_set (gtk_settings, "gtk-menu-bar-accel", nullptr, nullptr);
}
/* The menubar is shown by the app, and the use of mnemonics (e.g. Alt+F for File) is toggled.
@@ -1412,7 +1412,7 @@ find_tab_num_at_pos (GtkNotebook *notebook,
int max_x, max_y, x_root, y_root;
tab = gtk_notebook_get_tab_label (nb, page);
- g_return_val_if_fail (tab != NULL, -1);
+ g_return_val_if_fail (tab != nullptr, -1);
if (!gtk_widget_get_mapped (GTK_WIDGET (tab)))
{
@@ -1446,7 +1446,7 @@ terminal_window_update_set_profile_menu_active_profile (TerminalWindow *window)
TerminalSettingsList *profiles_list;
char *uuid;
- if (priv->active_screen == NULL)
+ if (priv->active_screen == nullptr)
return;
new_active_profile = terminal_screen_get_profile (priv->active_screen);
@@ -1463,7 +1463,7 @@ terminal_window_update_terminal_menu (TerminalWindow *window)
{
TerminalWindowPrivate *priv = window->priv;
- if (priv->active_screen == NULL)
+ if (priv->active_screen == nullptr)
return;
gboolean read_only = !vte_terminal_get_input_enabled (VTE_TERMINAL (priv->active_screen));
@@ -1494,7 +1494,7 @@ terminal_window_update_zoom_sensitivity (TerminalWindow *window)
TerminalScreen *screen;
screen = priv->active_screen;
- if (screen == NULL)
+ if (screen == nullptr)
return;
double v;
@@ -1516,7 +1516,7 @@ terminal_window_update_search_sensitivity (TerminalScreen *screen,
if (screen != priv->active_screen)
return;
- gboolean can_search = vte_terminal_search_get_regex (VTE_TERMINAL (screen)) != NULL;
+ gboolean can_search = vte_terminal_search_get_regex (VTE_TERMINAL (screen)) != nullptr;
g_simple_action_set_enabled (lookup_action (window, "find-forward"), can_search);
g_simple_action_set_enabled (lookup_action (window, "find-backward"), can_search);
@@ -1623,7 +1623,7 @@ terminal_window_update_tabs_actions_sensitivity (TerminalWindow *window)
gboolean keynav_wrap_around;
g_object_get (gtk_widget_get_settings (GTK_WIDGET (window)),
"gtk-keynav-wrap-around", &keynav_wrap_around,
- NULL);
+ nullptr);
gboolean wrap = keynav_wrap_around && not_only;
g_simple_action_set_enabled (lookup_action (window, "tab-switch-left"), not_first || wrap);
@@ -1645,7 +1645,7 @@ handle_tab_droped_on_desktop (GtkNotebook *source_notebook,
TerminalWindowPrivate *new_priv;
source_window = TERMINAL_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (source_notebook)));
- g_return_val_if_fail (TERMINAL_IS_WINDOW (source_window), NULL);
+ g_return_val_if_fail (TERMINAL_IS_WINDOW (source_window), nullptr);
new_window = terminal_window_new (G_APPLICATION (terminal_app_get ()));
new_priv = new_window->priv;
@@ -1661,10 +1661,10 @@ remove_popup_info (TerminalWindow *window)
{
TerminalWindowPrivate *priv = window->priv;
- if (priv->popup_info != NULL)
+ if (priv->popup_info != nullptr)
{
terminal_screen_popup_info_unref (priv->popup_info);
- priv->popup_info = NULL;
+ priv->popup_info = nullptr;
}
}
@@ -1699,18 +1699,18 @@ screen_show_popup_menu_cb (TerminalScreen *screen,
gs_unref_object GMenu *menu = g_menu_new ();
/* Hyperlink section */
- if (info->hyperlink != NULL) {
+ if (info->hyperlink != nullptr) {
gs_unref_object GMenu *section1 = g_menu_new ();
g_menu_append (section1, _("Open _Hyperlink"), "win.open-hyperlink");
g_menu_append (section1, _("Copy Hyperlink _Address"), "win.copy-hyperlink");
- g_menu_append_section (menu, NULL, G_MENU_MODEL (section1));
+ g_menu_append_section (menu, nullptr, G_MENU_MODEL (section1));
}
/* Matched link section */
- else if (info->url != NULL) {
+ else if (info->url != nullptr) {
gs_unref_object GMenu *section2 = g_menu_new ();
- const char *open_label = NULL, *copy_label = NULL;
+ const char *open_label = nullptr, *copy_label = nullptr;
switch (info->url_flavor) {
case FLAVOR_EMAIL:
open_label = _("Send Mail _To…");
@@ -1730,7 +1730,7 @@ screen_show_popup_menu_cb (TerminalScreen *screen,
g_menu_append (section2, open_label, "win.open-match");
g_menu_append (section2, copy_label, "win.copy-match");
- g_menu_append_section (menu, NULL, G_MENU_MODEL (section2));
+ g_menu_append_section (menu, nullptr, G_MENU_MODEL (section2));
}
/* Info section */
@@ -1739,18 +1739,18 @@ screen_show_popup_menu_cb (TerminalScreen *screen,
gs_unref_object GMenu *section3 = g_menu_new ();
- for (int i = 0; citems[i] != NULL; ++i) {
+ for (int i = 0; citems[i] != nullptr; ++i) {
const char *citem = citems[i];
if (g_str_equal (citem, "numbers") &&
- info->number_info != NULL) {
+ info->number_info != nullptr) {
/* Non-existent action will make this item insensitive */
gs_unref_object GMenuItem *item3 = g_menu_item_new (info->number_info, "win.notexist");
g_menu_append_item (section3, item3);
}
if (g_str_equal (citem, "timestamps") &&
- info->timestamp_info != NULL) {
+ info->timestamp_info != nullptr) {
/* Non-existent action will make this item insensitive */
gs_unref_object GMenuItem *item3 = g_menu_item_new (info->timestamp_info, "win.notexist");
g_menu_append_item (section3, item3);
@@ -1758,7 +1758,7 @@ screen_show_popup_menu_cb (TerminalScreen *screen,
}
if (g_menu_model_get_n_items(G_MENU_MODEL (section3)) > 0)
- g_menu_append_section (menu, NULL, G_MENU_MODEL (section3));
+ g_menu_append_section (menu, nullptr, G_MENU_MODEL (section3));
/* Clipboard section */
gs_unref_object GMenu *section4 = g_menu_new ();
@@ -1769,44 +1769,44 @@ screen_show_popup_menu_cb (TerminalScreen *screen,
if (g_action_get_enabled (G_ACTION (lookup_action (window, "paste-uris"))))
g_menu_append (section4, _("Paste as _Filenames"), "win.paste-uris");
- g_menu_append_section (menu, NULL, G_MENU_MODEL (section4));
+ g_menu_append_section (menu, nullptr, G_MENU_MODEL (section4));
/* Profile and property section */
gs_unref_object GMenu *section5 = g_menu_new ();
g_menu_append (section5, _("Read-_Only"), "win.read-only");
GMenuModel *profiles_menu = terminal_app_get_profile_section (app);
- if (profiles_menu != NULL && g_menu_model_get_n_items (profiles_menu) > 1) {
+ if (profiles_menu != nullptr && g_menu_model_get_n_items (profiles_menu) > 1) {
gs_unref_object GMenu *submenu5 = g_menu_new ();
- g_menu_append_section (submenu5, NULL, profiles_menu);
+ g_menu_append_section (submenu5, nullptr, profiles_menu);
- gs_unref_object GMenuItem *item5 = g_menu_item_new (_("P_rofiles"), NULL);
+ gs_unref_object GMenuItem *item5 = g_menu_item_new (_("P_rofiles"), nullptr);
g_menu_item_set_submenu (item5, G_MENU_MODEL (submenu5));
g_menu_append_item (section5, item5);
}
g_menu_append (section5, _("_Preferences"), "win.edit-preferences");
- g_menu_append_section (menu, NULL, G_MENU_MODEL (section5));
+ g_menu_append_section (menu, nullptr, G_MENU_MODEL (section5));
/* New Terminal section */
gs_unref_object GMenu *section6 = g_menu_new ();
if (terminal_app_get_menu_unified (app)) {
- gs_unref_object GMenuItem *item6 = g_menu_item_new (_("New _Terminal"), NULL);
+ gs_unref_object GMenuItem *item6 = g_menu_item_new (_("New _Terminal"), nullptr);
g_menu_item_set_action_and_target (item6, "win.new-terminal",
"(ss)", "default", "current");
g_menu_append_item (section6, item6);
} else {
- gs_unref_object GMenuItem *item61 = g_menu_item_new (_("New _Window"), NULL);
+ gs_unref_object GMenuItem *item61 = g_menu_item_new (_("New _Window"), nullptr);
g_menu_item_set_action_and_target (item61, "win.new-terminal",
"(ss)", "window", "current");
g_menu_append_item (section6, item61);
- gs_unref_object GMenuItem *item62 = g_menu_item_new (_("New _Tab"), NULL);
+ gs_unref_object GMenuItem *item62 = g_menu_item_new (_("New _Tab"), nullptr);
g_menu_item_set_action_and_target (item62, "win.new-terminal",
"(ss)", "tab", "current");
g_menu_append_item (section6, item62);
}
- g_menu_append_section (menu, NULL, G_MENU_MODEL (section6));
+ g_menu_append_section (menu, nullptr, G_MENU_MODEL (section6));
/* Window section */
gs_unref_object GMenu *section7 = g_menu_new ();
@@ -1817,7 +1817,7 @@ screen_show_popup_menu_cb (TerminalScreen *screen,
if (g_action_get_enabled (G_ACTION (lookup_action (window, "leave-fullscreen"))))
g_menu_append (section7, _("L_eave Full Screen"), "win.leave-fullscreen");
- g_menu_append_section (menu, NULL, G_MENU_MODEL (section7));
+ g_menu_append_section (menu, nullptr, G_MENU_MODEL (section7));
/* Now create the popup menu and show it */
GtkWidget *popup_menu = context_menu_new (G_MENU_MODEL (menu), GTK_WIDGET (window));
@@ -1826,8 +1826,8 @@ screen_show_popup_menu_cb (TerminalScreen *screen,
g_signal_connect (popup_menu, "selection-done",
G_CALLBACK (screen_popup_menu_selection_done_cb), window);
- gtk_menu_popup (GTK_MENU (popup_menu), NULL, NULL,
- NULL, NULL,
+ gtk_menu_popup (GTK_MENU (popup_menu), nullptr, nullptr,
+ nullptr, nullptr,
info->button,
info->timestamp);
@@ -1873,25 +1873,25 @@ notebook_update_tabs_menu_cb (GtkMenuButton *button,
menu = g_menu_new ();
tabs = terminal_window_list_screen_containers (window);
- for (t = tabs, i = 0; t != NULL; t = t->next, i++) {
+ for (t = tabs, i = 0; t != nullptr; t = t->next, i++) {
TerminalScreenContainer *container = (TerminalScreenContainer*)t->data;
TerminalScreen *screen = terminal_screen_container_get_screen (container);
gs_unref_object GMenuItem *item;
const char *title;
- if (t->next == NULL) {
+ if (t->next == nullptr) {
/* Last entry. If it has no dedicated shortcut "Switch to Tab N",
* display the accel of "Switch to Last Tab". */
GtkApplication *app = GTK_APPLICATION (g_application_get_default ());
gs_free gchar *detailed_action = g_strdup_printf("win.active-tab(%d)", i);
gs_strfreev gchar **accels = gtk_application_get_accels_for_action (app, detailed_action);
- if (accels[0] == NULL)
+ if (accels[0] == nullptr)
i = -1;
}
title = terminal_screen_get_title (screen);
- item = g_menu_item_new (title && title[0] ? title : _("Terminal"), NULL);
+ item = g_menu_item_new (title && title[0] ? title : _("Terminal"), nullptr);
g_menu_item_set_action_and_target (item, "win.active-tab", "i", i);
g_menu_append_item (menu, item);
}
@@ -2064,58 +2064,58 @@ terminal_window_init (TerminalWindow *window)
{
const GActionEntry action_entries[] = {
/* Actions without state */
- { "about", action_about_cb, NULL, NULL, NULL },
- { "close", action_close_cb, "s", NULL, NULL },
- { "copy", action_copy_cb, "s", NULL, NULL },
- { "copy-hyperlink", action_copy_hyperlink_cb, NULL, NULL, NULL },
- { "copy-match", action_copy_match_cb, NULL, NULL, NULL },
- { "edit-preferences", action_edit_preferences_cb, NULL, NULL, NULL },
- { "enter-fullscreen", action_enter_fullscreen_cb, NULL, NULL, NULL },
- { "find", action_find_cb, NULL, NULL, NULL },
- { "find-backward", action_find_backward_cb, NULL, NULL, NULL },
- { "find-clear", action_find_clear_cb, NULL, NULL, NULL },
- { "find-forward", action_find_forward_cb, NULL, NULL, NULL },
- { "help", action_help_cb, NULL, NULL, NULL },
- { "inspector", action_inspector_cb, NULL, NULL, NULL },
- { "leave-fullscreen", action_leave_fullscreen_cb, NULL, NULL, NULL },
- { "new-terminal", action_new_terminal_cb, "(ss)", NULL, NULL },
- { "open-match", action_open_match_cb, NULL, NULL, NULL },
- { "open-hyperlink", action_open_hyperlink_cb, NULL, NULL, NULL },
- { "paste-text", action_paste_text_cb, NULL, NULL, NULL },
- { "paste-uris", action_paste_uris_cb, NULL, NULL, NULL },
- { "reset", action_reset_cb, "b", NULL, NULL },
- { "select-all", action_select_all_cb, NULL, NULL, NULL },
- { "size-to", action_size_to_cb, "(uu)", NULL, NULL },
- { "tab-detach", action_tab_detach_cb, NULL, NULL, NULL },
- { "tab-move-left", action_tab_move_left_cb, NULL, NULL, NULL },
- { "tab-move-right", action_tab_move_right_cb, NULL, NULL, NULL },
- { "tab-switch-left", action_tab_switch_left_cb, NULL, NULL, NULL },
- { "tab-switch-right", action_tab_switch_right_cb, NULL, NULL, NULL },
- { "tabs-menu", NULL, NULL, NULL, NULL },
- { "zoom-in", action_zoom_in_cb, NULL, NULL, NULL },
- { "zoom-normal", action_zoom_normal_cb, NULL, NULL, NULL },
- { "zoom-out", action_zoom_out_cb, NULL, NULL, NULL },
+ { "about", action_about_cb, nullptr, nullptr, nullptr },
+ { "close", action_close_cb, "s", nullptr, nullptr },
+ { "copy", action_copy_cb, "s", nullptr, nullptr },
+ { "copy-hyperlink", action_copy_hyperlink_cb, nullptr, nullptr, nullptr },
+ { "copy-match", action_copy_match_cb, nullptr, nullptr, nullptr },
+ { "edit-preferences", action_edit_preferences_cb, nullptr, nullptr, nullptr },
+ { "enter-fullscreen", action_enter_fullscreen_cb, nullptr, nullptr, nullptr },
+ { "find", action_find_cb, nullptr, nullptr, nullptr },
+ { "find-backward", action_find_backward_cb, nullptr, nullptr, nullptr },
+ { "find-clear", action_find_clear_cb, nullptr, nullptr, nullptr },
+ { "find-forward", action_find_forward_cb, nullptr, nullptr, nullptr },
+ { "help", action_help_cb, nullptr, nullptr, nullptr },
+ { "inspector", action_inspector_cb, nullptr, nullptr, nullptr },
+ { "leave-fullscreen", action_leave_fullscreen_cb, nullptr, nullptr, nullptr },
+ { "new-terminal", action_new_terminal_cb, "(ss)", nullptr, nullptr },
+ { "open-match", action_open_match_cb, nullptr, nullptr, nullptr },
+ { "open-hyperlink", action_open_hyperlink_cb, nullptr, nullptr, nullptr },
+ { "paste-text", action_paste_text_cb, nullptr, nullptr, nullptr },
+ { "paste-uris", action_paste_uris_cb, nullptr, nullptr, nullptr },
+ { "reset", action_reset_cb, "b", nullptr, nullptr },
+ { "select-all", action_select_all_cb, nullptr, nullptr, nullptr },
+ { "size-to", action_size_to_cb, "(uu)", nullptr, nullptr },
+ { "tab-detach", action_tab_detach_cb, nullptr, nullptr, nullptr },
+ { "tab-move-left", action_tab_move_left_cb, nullptr, nullptr, nullptr },
+ { "tab-move-right", action_tab_move_right_cb, nullptr, nullptr, nullptr },
+ { "tab-switch-left", action_tab_switch_left_cb, nullptr, nullptr, nullptr },
+ { "tab-switch-right", action_tab_switch_right_cb, nullptr, nullptr, nullptr },
+ { "tabs-menu", nullptr, nullptr, nullptr, nullptr },
+ { "zoom-in", action_zoom_in_cb, nullptr, nullptr, nullptr },
+ { "zoom-normal", action_zoom_normal_cb, nullptr, nullptr, nullptr },
+ { "zoom-out", action_zoom_out_cb, nullptr, nullptr, nullptr },
#ifdef ENABLE_EXPORT
- { "export", action_export_cb, NULL, NULL, NULL },
+ { "export", action_export_cb, nullptr, nullptr, nullptr },
#endif
#ifdef ENABLE_PRINT
- { "print", action_print_cb, NULL, NULL, NULL },
+ { "print", action_print_cb, nullptr, nullptr, nullptr },
#endif
#ifdef ENABLE_SAVE
- { "save-contents", action_save_contents_cb, NULL, NULL, NULL },
+ { "save-contents", action_save_contents_cb, nullptr, nullptr, nullptr },
#endif
/* Shadow actions for keybinding comsumption, see comment in terminal-accels.c */
- { "shadow", action_shadow_activate_cb, "s", NULL, NULL },
- { "shadow-mdi", action_shadow_activate_cb, "s", NULL, NULL },
+ { "shadow", action_shadow_activate_cb, "s", nullptr, nullptr },
+ { "shadow-mdi", action_shadow_activate_cb, "s", nullptr, nullptr },
/* Actions with state */
{ "active-tab", action_active_tab_set_cb, "i", "@i 0", action_active_tab_state_cb },
- { "header-menu", NULL /* toggles state */, NULL, "false", NULL },
- { "fullscreen", NULL /* toggles state */, NULL, "false", action_fullscreen_state_cb },
- { "menubar-visible", NULL /* toggles state */, NULL, "true", action_menubar_visible_state_cb },
- { "profile", NULL /* changes state */, "s", "''", action_profile_state_cb },
- { "read-only", NULL /* toggles state */, NULL, "false", action_read_only_state_cb },
+ { "header-menu", nullptr /* toggles state */, nullptr, "false", nullptr },
+ { "fullscreen", nullptr /* toggles state */, nullptr, "false", action_fullscreen_state_cb },
+ { "menubar-visible", nullptr /* toggles state */, nullptr, "true", action_menubar_visible_state_cb },
+ { "profile", nullptr /* changes state */, "s", "''", action_profile_state_cb },
+ { "read-only", nullptr /* toggles state */, nullptr, "false", action_read_only_state_cb },
};
TerminalWindowPrivate *priv;
TerminalApp *app;
@@ -2140,12 +2140,12 @@ terminal_window_init (TerminalWindow *window)
g_signal_connect (G_OBJECT (window), "delete_event",
G_CALLBACK(terminal_window_delete_event),
- NULL);
+ nullptr);
#ifdef ENABLE_DEBUG
_TERMINAL_DEBUG_IF (TERMINAL_DEBUG_GEOMETRY)
{
- g_signal_connect_after (window, "size-request", G_CALLBACK (terminal_window_size_request_cb), NULL);
- g_signal_connect_after (window, "size-allocate", G_CALLBACK (terminal_window_size_allocate_cb), NULL);
+ g_signal_connect_after (window, "size-request", G_CALLBACK (terminal_window_size_request_cb), nullptr);
+ g_signal_connect_after (window, "size-allocate", G_CALLBACK (terminal_window_size_allocate_cb), nullptr);
}
#endif
@@ -2159,7 +2159,7 @@ terminal_window_init (TerminalWindow *window)
gtk_window_set_title (GTK_WINDOW (window), _("Terminal"));
- priv->active_screen = NULL;
+ priv->active_screen = nullptr;
priv->main_vbox = gtk_bin_get_child (GTK_BIN (window));
@@ -2205,7 +2205,7 @@ terminal_window_init (TerminalWindow *window)
priv->old_padding_width = -1;
priv->old_padding_height = -1;
- priv->old_geometry_widget = NULL;
+ priv->old_geometry_widget = nullptr;
/* GAction setup */
g_action_map_add_action_entries (G_ACTION_MAP (window),
@@ -2222,7 +2222,7 @@ terminal_window_init (TerminalWindow *window)
/* Hide "menubar-visible" when the menubar is shown by the shell */
g_object_get (gtk_widget_get_settings (GTK_WIDGET (window)),
"gtk-shell-shows-menubar", &shell_shows_menubar,
- NULL);
+ nullptr);
if (shell_shows_menubar) {
g_simple_action_set_enabled (lookup_action (window, "menubar-visible"), FALSE);
} else {
@@ -2238,7 +2238,7 @@ terminal_window_init (TerminalWindow *window)
/* Maybe make Inspector available */
action = lookup_action (window, "inspector");
gtk_debug_settings = terminal_app_get_gtk_debug_settings (app);
- if (gtk_debug_settings != NULL)
+ if (gtk_debug_settings != nullptr)
g_settings_bind (gtk_debug_settings,
"enable-inspector-keybinding",
action,
@@ -2325,21 +2325,21 @@ terminal_window_dispose (GObject *object)
priv->disposed = TRUE;
- if (priv->clipboard != NULL) {
+ if (priv->clipboard != nullptr) {
g_signal_handlers_disconnect_by_func (app,
(void*)clipboard_targets_changed_cb,
window);
- priv->clipboard = NULL;
+ priv->clipboard = nullptr;
}
remove_popup_info (window);
- if (priv->search_popover != NULL)
+ if (priv->search_popover != nullptr)
{
g_signal_handlers_disconnect_matched (priv->search_popover, G_SIGNAL_MATCH_DATA,
- 0, 0, NULL, NULL, window);
+ 0, 0, nullptr, nullptr, window);
gtk_widget_destroy (GTK_WIDGET (priv->search_popover));
- priv->search_popover = NULL;
+ priv->search_popover = nullptr;
}
G_OBJECT_CLASS (terminal_window_parent_class)->dispose (object);
@@ -2365,7 +2365,7 @@ terminal_window_delete_event (GtkWidget *widget,
GdkEvent *event,
gpointer data)
{
- return confirm_close_window_or_tab (TERMINAL_WINDOW (widget), NULL);
+ return confirm_close_window_or_tab (TERMINAL_WINDOW (widget), nullptr);
}
static void
@@ -2391,7 +2391,7 @@ terminal_window_show (GtkWidget *widget)
gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->mdi_container)) == -1)
gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->mdi_container), 0);
- if (priv->active_screen != NULL)
+ if (priv->active_screen != nullptr)
{
/* At this point, we have our GdkScreen, and hence the right
* font size, so we can go ahead and size the window. */
@@ -2465,7 +2465,7 @@ screen_hyperlink_hover_uri_changed (TerminalScreen *screen,
const GdkRectangle *bbox G_GNUC_UNUSED,
TerminalWindow *window G_GNUC_UNUSED)
{
- gs_free char *label = NULL;
+ gs_free char *label = nullptr;
if (!gtk_widget_get_realized (GTK_WIDGET (screen)))
return;
@@ -2590,7 +2590,7 @@ terminal_window_set_menubar_visible (TerminalWindow *window,
{
TerminalWindowPrivate *priv = window->priv;
- if (priv->menubar == NULL)
+ if (priv->menubar == nullptr)
return;
/* it's been set now, so don't override when adding a screen.
@@ -2601,7 +2601,7 @@ terminal_window_set_menubar_visible (TerminalWindow *window,
g_simple_action_set_state (lookup_action (window, "menubar-visible"),
g_variant_new_boolean (setting));
- g_object_set (priv->menubar, "visible", setting, NULL);
+ g_object_set (priv->menubar, "visible", setting, nullptr);
/* FIXMEchpe: use gtk_widget_get_realized instead? */
if (priv->active_screen)
@@ -2619,7 +2619,7 @@ terminal_window_get_mdi_container (TerminalWindow *window)
{
TerminalWindowPrivate *priv = window->priv;
- g_return_val_if_fail (TERMINAL_IS_WINDOW (window), NULL);
+ g_return_val_if_fail (TERMINAL_IS_WINDOW (window), nullptr);
return GTK_WIDGET (priv->mdi_container);
}
@@ -2634,7 +2634,7 @@ terminal_window_update_size (TerminalWindow *window)
gdk_window = gtk_widget_get_window (GTK_WIDGET (window));
- if (gdk_window != NULL &&
+ if (gdk_window != nullptr &&
(gdk_window_get_state (gdk_window) &
(GDK_WINDOW_STATE_MAXIMIZED | WINDOW_STATE_TILED | GDK_WINDOW_STATE_FULLSCREEN)))
{
@@ -2693,13 +2693,13 @@ notebook_show_context_menu (TerminalWindow *window,
gs_unref_object GMenu *menu;
terminal_util_load_objects_resource ("/org/gnome/terminal/ui/notebook-menu.ui",
"notebook-popup", &menu,
- NULL);
+ nullptr);
GtkWidget *popup_menu = context_menu_new (G_MENU_MODEL (menu), GTK_WIDGET (window));
gtk_widget_set_halign (popup_menu, GTK_ALIGN_START);
- gtk_menu_popup (GTK_MENU (popup_menu), NULL, NULL,
- NULL, NULL,
+ gtk_menu_popup (GTK_MENU (popup_menu), nullptr, nullptr,
+ nullptr, nullptr,
button, timestamp);
if (button == 0)
@@ -2742,7 +2742,7 @@ notebook_popup_menu_cb (GtkWidget *widget,
if (focus_widget != GTK_WIDGET (priv->mdi_container))
return FALSE;
- notebook_show_context_menu (window, NULL, 0, gtk_get_current_event_time ());
+ notebook_show_context_menu (window, nullptr, 0, gtk_get_current_event_time ());
return TRUE;
}
@@ -2762,17 +2762,17 @@ mdi_screen_switched_cb (TerminalMdiContainer *container,
if (priv->disposed)
return;
- if (screen == NULL || old_active_screen == screen)
+ if (screen == nullptr || old_active_screen == screen)
return;
- if (priv->search_popover != NULL)
+ if (priv->search_popover != nullptr)
gtk_widget_hide (GTK_WIDGET (priv->search_popover));
_terminal_debug_print (TERMINAL_DEBUG_MDI,
"[window %p] MDI: setting active tab to screen %p (old active screen %p)\n",
window, screen, priv->active_screen);
- if (old_active_screen != NULL && screen != NULL) {
+ if (old_active_screen != nullptr && screen != nullptr) {
terminal_screen_get_size (old_active_screen, &old_grid_width, &old_grid_height);
/* This is so that we maintain the same grid */
@@ -2791,7 +2791,7 @@ mdi_screen_switched_cb (TerminalMdiContainer *container,
terminal_window_set_menubar_visible (window, setting);
}
- sync_screen_title (screen, NULL, window);
+ sync_screen_title (screen, nullptr, window);
/* set size of window to current grid size */
_terminal_debug_print (TERMINAL_DEBUG_GEOMETRY,
@@ -2943,7 +2943,7 @@ mdi_screen_removed_cb (TerminalMdiContainer *container,
pages = terminal_mdi_container_get_n_screens (container);
if (pages == 0)
{
- priv->active_screen = NULL;
+ priv->active_screen = nullptr;
/* That was the last tab in the window; close it. */
gtk_widget_destroy (GTK_WIDGET (window));
@@ -3022,7 +3022,7 @@ terminal_window_update_geometry (TerminalWindow *window)
if (gtk_widget_in_destruction (GTK_WIDGET (window)))
return;
- if (priv->active_screen == NULL)
+ if (priv->active_screen == nullptr)
return;
widget = GTK_WIDGET (priv->active_screen);
@@ -3047,7 +3047,7 @@ terminal_window_update_geometry (TerminalWindow *window)
padding.left + padding.right,
padding.top + padding.bottom);
- gtk_widget_get_preferred_size (priv->main_vbox, NULL, &vbox_request);
+ gtk_widget_get_preferred_size (priv->main_vbox, nullptr, &vbox_request);
_terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, "content area requests %dx%d px\n",
vbox_request.width, vbox_request.height);
@@ -3081,7 +3081,7 @@ terminal_window_update_geometry (TerminalWindow *window)
csd_width, csd_height);
}
- gtk_widget_get_preferred_size (widget, NULL, &widget_request);
+ gtk_widget_get_preferred_size (widget, nullptr, &widget_request);
_terminal_debug_print (TERMINAL_DEBUG_GEOMETRY, "terminal widget requests %dx%d px\n",
widget_request.width, widget_request.height);
@@ -3119,7 +3119,7 @@ terminal_window_update_geometry (TerminalWindow *window)
hints.min_height = hints.base_height + hints.height_inc * MIN_HEIGHT_CHARS;
gtk_window_set_geometry_hints (GTK_WINDOW (window),
- NULL,
+ nullptr,
&hints,
GdkWindowHints(GDK_HINT_RESIZE_INC |
GDK_HINT_MIN_SIZE |
@@ -3202,7 +3202,7 @@ confirm_close_window_or_tab (TerminalWindow *window,
if (screen)
{
- do_confirm = terminal_screen_has_foreground_process (screen, NULL, NULL);
+ do_confirm = terminal_screen_has_foreground_process (screen, nullptr, nullptr);
n_tabs = 1;
}
else
@@ -3214,12 +3214,12 @@ confirm_close_window_or_tab (TerminalWindow *window,
tabs = terminal_window_list_screen_containers (window);
n_tabs = g_list_length (tabs);
- for (t = tabs; t != NULL; t = t->next)
+ for (t = tabs; t != nullptr; t = t->next)
{
TerminalScreen *terminal_screen;
terminal_screen = terminal_screen_container_get_screen (TERMINAL_SCREEN_CONTAINER (t->data));
- if (terminal_screen_has_foreground_process (terminal_screen, NULL, NULL))
+ if (terminal_screen_has_foreground_process (terminal_screen, nullptr, nullptr))
{
do_confirm = TRUE;
break;
@@ -3271,7 +3271,7 @@ terminal_window_request_close (TerminalWindow *window)
{
g_return_if_fail (TERMINAL_IS_WINDOW (window));
- if (confirm_close_window_or_tab (window, NULL))
+ if (confirm_close_window_or_tab (window, nullptr))
return;
gtk_widget_destroy (GTK_WIDGET (window));
@@ -3280,7 +3280,7 @@ terminal_window_request_close (TerminalWindow *window)
const char *
terminal_window_get_uuid (TerminalWindow *window)
{
- g_return_val_if_fail (TERMINAL_IS_WINDOW (window), NULL);
+ g_return_val_if_fail (TERMINAL_IS_WINDOW (window), nullptr);
return window->priv->uuid;
}
diff --git a/src/terminal.cc b/src/terminal.cc
index 7fc567a5..27ee91e5 100644
--- a/src/terminal.cc
+++ b/src/terminal.cc
@@ -70,12 +70,12 @@ factory_name_owner_notify_cb (TerminalFactory *factory,
GParamSpec *pspec,
RunData *data)
{
- /* Name owner change to NULL can only mean that the server
+ /* Name owner change to nullptr can only mean that the server
* went away before it could send out our child-exited signal.
* Assume the server was killed and thus our child process
* too, and return with the corresponding exit code.
*/
- if (g_dbus_proxy_get_name_owner(G_DBUS_PROXY (factory)) != NULL)
+ if (g_dbus_proxy_get_name_owner(G_DBUS_PROXY (factory)) != nullptr)
return;
data->status = W_EXITCODE(0, SIGKILL);
@@ -88,7 +88,7 @@ static int
run_receiver (TerminalFactory *factory,
TerminalReceiver *receiver)
{
- RunData data = { g_main_loop_new (NULL, FALSE), 0 };
+ RunData data = { g_main_loop_new (nullptr, FALSE), 0 };
gulong receiver_exited_id = g_signal_connect (receiver, "child-exited",
G_CALLBACK (receiver_child_exited_cb), &data);
gulong factory_notify_id = g_signal_connect (factory, "notify::g-name-owner",
@@ -119,12 +119,12 @@ get_factory_exit_status (const char *service_name,
const char *message,
int *exit_status)
{
- gs_free char *pattern = NULL, *number = NULL;
- gs_unref_regex GRegex *regex = NULL;
- gs_free_match_info GMatchInfo *match_info = NULL;
+ gs_free char *pattern = nullptr, *number = nullptr;
+ gs_unref_regex GRegex *regex = nullptr;
+ gs_free_match_info GMatchInfo *match_info = nullptr;
gint64 v;
char *end;
- GError *err = NULL;
+ GError *err = nullptr;
pattern = g_strdup_printf ("org.freedesktop.DBus.Error.Spawn.ChildExited: Process %s exited with status (\\d+)$",
service_name);
@@ -225,24 +225,24 @@ factory_proxy_new_for_service_name (const char *service_name,
char **service_name_ptr,
GError **error)
{
- if (service_name == NULL)
+ if (service_name == nullptr)
service_name = TERMINAL_APPLICATION_ID;
- gs_free_error GError *err = NULL;
+ gs_free_error GError *err = nullptr;
gs_unref_object TerminalFactory *factory =
terminal_factory_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
GDBusProxyFlags(G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
connect_signals ? 0 : G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS),
service_name,
TERMINAL_FACTORY_OBJECT_PATH,
- NULL /* cancellable */,
+ nullptr /* cancellable */,
&err);
- if (factory == NULL) {
+ if (factory == nullptr) {
if (!handle_factory_error (service_name, err))
terminal_printerr ("Error constructing proxy for %s:%s: %s\n",
service_name, TERMINAL_FACTORY_OBJECT_PATH, err->message);
g_propagate_error (error, err);
- err = NULL;
+ err = nullptr;
return FALSE;
}
@@ -257,11 +257,11 @@ factory_proxy_new_for_service_name (const char *service_name,
g_variant_new ("()"),
G_DBUS_CALL_FLAGS_NONE,
1000 /* 1s */,
- NULL /* cancelleable */,
+ nullptr /* cancelleable */,
&err);
- if (v == NULL) {
+ if (v == nullptr) {
g_propagate_error (error, err);
- err = NULL;
+ err = nullptr;
return FALSE;
}
}
@@ -287,9 +287,9 @@ factory_proxy_new (TerminalOptions *options,
* If the server specified by the environment doesn't exist, fall back to the
* default server, and ignore the environment-specified parent screen.
*/
- if (options->server_app_id == NULL &&
- options->server_unique_name != NULL) {
- gs_free_error GError *err = NULL;
+ if (options->server_app_id == nullptr &&
+ options->server_unique_name != nullptr) {
+ gs_free_error GError *err = nullptr;
if (factory_proxy_new_for_service_name (options->server_unique_name,
TRUE,
options->wait,
@@ -305,10 +305,10 @@ factory_proxy_new (TerminalOptions *options,
terminal_printerr ("Falling back to default server.\n");
/* Fall back to the default */
- service_name = NULL;
+ service_name = nullptr;
}
- *parent_screen_object_path_ptr = NULL;
+ *parent_screen_object_path_ptr = nullptr;
return factory_proxy_new_for_service_name (service_name,
FALSE,
@@ -322,13 +322,13 @@ static void
handle_show_preferences (TerminalOptions *options,
const char *service_name)
{
- gs_free_error GError *error = NULL;
- gs_unref_object GDBusConnection *bus = NULL;
- gs_free char *object_path = NULL;
+ gs_free_error GError *error = nullptr;
+ gs_unref_object GDBusConnection *bus = nullptr;
+ gs_free char *object_path = nullptr;
GVariantBuilder builder;
- bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
- if (bus == NULL) {
+ bus = g_bus_get_sync (G_BUS_TYPE_SESSION, nullptr, &error);
+ if (bus == nullptr) {
terminal_printerr ("Failed to get session bus: %s\n", error->message);
return;
}
@@ -365,7 +365,7 @@ handle_show_preferences (TerminalOptions *options,
G_VARIANT_TYPE ("()"),
G_DBUS_CALL_FLAGS_NO_AUTO_START,
30 * 1000 /* ms timeout */,
- NULL /* cancelleable */,
+ nullptr /* cancelleable */,
&error)) {
terminal_printerr ("Activate call failed: %s\n", error->message);
return;
@@ -406,7 +406,7 @@ handle_options (TerminalOptions *options,
const char *factory_unique_name = g_dbus_proxy_get_name_owner (G_DBUS_PROXY (factory));
- for (GList *lw = options->initial_windows; lw != NULL; lw = lw->next)
+ for (GList *lw = options->initial_windows; lw != nullptr; lw = lw->next)
{
InitialWindow *iw = (InitialWindow*)lw->data;
@@ -414,12 +414,12 @@ handle_options (TerminalOptions *options,
guint window_id = 0;
- gs_free char *previous_screen_object_path = NULL;
+ gs_free char *previous_screen_object_path = nullptr;
if (iw->implicit_first_window)
previous_screen_object_path = g_strdup (parent_screen_object_path);
/* Now add the tabs */
- for (GList *lt = iw->tabs; lt != NULL; lt = lt->next)
+ for (GList *lt = iw->tabs; lt != nullptr; lt = lt->next)
{
InitialTab *it = (InitialTab*)lt->data;
g_assert_nonnull (it);
@@ -440,7 +440,7 @@ handle_options (TerminalOptions *options,
iw->start_fullscreen);
/* This will be used to apply missing defaults */
- if (parent_screen_object_path != NULL)
+ if (parent_screen_object_path != nullptr)
g_variant_builder_add (&builder, "{sv}",
"parent-screen", g_variant_new_object_path (parent_screen_object_path));
@@ -462,13 +462,13 @@ handle_options (TerminalOptions *options,
g_variant_builder_add (&builder, "{sv}",
"show-menubar", g_variant_new_boolean (iw->menubar_state));
- gs_free_error GError *err = NULL;
- gs_free char *object_path = NULL;
+ gs_free_error GError *err = nullptr;
+ gs_free char *object_path = nullptr;
if (!terminal_factory_call_create_instance_sync
(factory,
g_variant_builder_end (&builder),
&object_path,
- NULL /* cancellable */,
+ nullptr /* cancellable */,
&err)) {
if (handle_create_instance_error (service_name, err))
return FALSE;
@@ -479,7 +479,7 @@ handle_options (TerminalOptions *options,
/* Deprecated and not working on new server anymore */
char *p = strstr (object_path, "/window/");
if (p) {
- char *end = NULL;
+ char *end = nullptr;
guint64 value;
errno = 0;
@@ -498,9 +498,9 @@ handle_options (TerminalOptions *options,
(it->wait ? 0 : G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS)),
factory_unique_name,
object_path,
- NULL /* cancellable */,
+ nullptr /* cancellable */,
&err);
- if (receiver == NULL) {
+ if (receiver == nullptr) {
if (handle_create_receiver_proxy_error (service_name, err))
return FALSE;
else
@@ -512,7 +512,7 @@ handle_options (TerminalOptions *options,
char **argv = it->exec_argv ? it->exec_argv : options->exec_argv;
int argc = argv ? g_strv_length (argv) : 0;
- PassFdElement *fd_array = it->fd_array ? (PassFdElement*)it->fd_array->data : NULL;
+ PassFdElement *fd_array = it->fd_array ? (PassFdElement*)it->fd_array->data : nullptr;
gsize fd_array_len = it->fd_array ? it->fd_array->len : 0;
terminal_client_append_exec_options (&builder,
@@ -525,8 +525,8 @@ handle_options (TerminalOptions *options,
if (!terminal_receiver_call_exec_sync (receiver,
g_variant_builder_end (&builder),
g_variant_new_bytestring_array ((const char * const *) argv, argc),
- it->fd_list, NULL /* outfdlist */,
- NULL /* cancellable */,
+ it->fd_list, nullptr /* outfdlist */,
+ nullptr /* cancellable */,
&err)) {
if (handle_exec_error (service_name, err))
return FALSE;
@@ -550,7 +550,7 @@ main (int argc, char **argv)
{
int exit_code = EXIT_FAILURE;
- g_log_set_writer_func (terminal_log_writer, NULL, NULL);
+ g_log_set_writer_func (terminal_log_writer, nullptr, nullptr);
g_set_prgname ("gnome-terminal");
@@ -560,18 +560,18 @@ main (int argc, char **argv)
_terminal_debug_init ();
- gs_free_error GError *error = NULL;
+ gs_free_error GError *error = nullptr;
gs_free_options TerminalOptions *options = terminal_options_parse (&argc, &argv, &error);
- if (options == NULL) {
+ if (options == nullptr) {
terminal_printerr (_("Failed to parse arguments: %s\n"), error->message);
return exit_code;
}
g_set_application_name (_("Terminal"));
- gs_unref_object TerminalFactory *factory = NULL;
- gs_free char *service_name = NULL;
- gs_free char *parent_screen_object_path = NULL;
+ gs_unref_object TerminalFactory *factory = nullptr;
+ gs_free char *service_name = nullptr;
+ gs_free char *parent_screen_object_path = nullptr;
if (!factory_proxy_new (options,
&factory,
&service_name,
@@ -581,17 +581,17 @@ main (int argc, char **argv)
if (options->print_environment) {
const char *name_owner = g_dbus_proxy_get_name_owner (G_DBUS_PROXY (factory));
- if (name_owner != NULL)
+ if (name_owner != nullptr)
g_print ("%s=%s\n", TERMINAL_ENV_SERVICE_NAME, name_owner);
else
return exit_code;
}
- TerminalReceiver *receiver = NULL;
+ TerminalReceiver *receiver = nullptr;
if (!handle_options (options, factory, service_name, parent_screen_object_path, &receiver))
return exit_code;
- if (receiver != NULL) {
+ if (receiver != nullptr) {
exit_code = run_receiver (factory, receiver);
g_object_unref (receiver);
} else
View Lorry Controller Status