[gnome-commander/Implement_CppCheck_suggestions] C++ cast, use nullptr instead of NULL
- From: Uwe Scholz <uwescholz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-commander/Implement_CppCheck_suggestions] C++ cast, use nullptr instead of NULL
- Date: Mon, 8 Apr 2019 19:56:16 +0000 (UTC)
commit 5c67fdad36d9ddd26a24c163d56e919d201f8204
Author: Uwe Scholz <u scholz83 gmx de>
Date: Mon Apr 8 21:23:56 2019 +0200
C++ cast, use nullptr instead of NULL
src/gnome-cmd-list-popmenu.cc | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/src/gnome-cmd-list-popmenu.cc b/src/gnome-cmd-list-popmenu.cc
index 354b7eb4..a56c09c5 100644
--- a/src/gnome-cmd-list-popmenu.cc
+++ b/src/gnome-cmd-list-popmenu.cc
@@ -34,7 +34,7 @@
using namespace std;
-static GtkMenuClass *parent_class = NULL;
+static GtkMenuClass *parent_class = nullptr;
static void on_new_directory (GtkMenuItem *item, GnomeCmdFileSelector *fs)
@@ -74,7 +74,7 @@ static void destroy (GtkObject *object)
static void map (GtkWidget *widget)
{
- if (GTK_WIDGET_CLASS (parent_class)->map != NULL)
+ if (GTK_WIDGET_CLASS (parent_class)->map != nullptr)
GTK_WIDGET_CLASS (parent_class)->map (widget);
}
@@ -101,23 +101,23 @@ static void init (GnomeCmdListPopmenu *menu)
GtkWidget *gnome_cmd_list_popmenu_new (GnomeCmdFileSelector *fs)
{
- g_return_val_if_fail (GNOME_CMD_IS_FILE_SELECTOR (fs), NULL);
+ g_return_val_if_fail (GNOME_CMD_IS_FILE_SELECTOR (fs), nullptr);
static GnomeUIInfo new_uiinfo[] =
{
- GNOMEUIINFO_ITEM(N_("_Directory"), NULL, on_new_directory, file_type_dir_xpm),
- GNOMEUIINFO_ITEM(N_("_Text File"), NULL, on_new_textfile, file_type_regular_xpm),
+ GNOMEUIINFO_ITEM(N_("_Directory"), nullptr, on_new_directory, file_type_dir_xpm),
+ GNOMEUIINFO_ITEM(N_("_Text File"), nullptr, on_new_textfile, file_type_regular_xpm),
GNOMEUIINFO_END
};
static GnomeUIInfo popmenu_uiinfo[] =
{
GNOMEUIINFO_SUBTREE(N_("_New"), new_uiinfo),
- GNOMEUIINFO_ITEM_STOCK(N_("_Paste"), NULL, on_paste, GTK_STOCK_PASTE),
+ GNOMEUIINFO_ITEM_STOCK(N_("_Paste"), nullptr, on_paste, GTK_STOCK_PASTE),
GNOMEUIINFO_SEPARATOR,
- GNOMEUIINFO_ITEM_FILENAME (N_("Open _terminal here"), NULL, command_open_terminal__internal,
PACKAGE_NAME G_DIR_SEPARATOR_S "terminal.svg"),
+ GNOMEUIINFO_ITEM_FILENAME (N_("Open _terminal here"), nullptr, command_open_terminal__internal,
PACKAGE_NAME G_DIR_SEPARATOR_S "terminal.svg"),
GNOMEUIINFO_SEPARATOR,
- GNOMEUIINFO_ITEM_STOCK(N_("_Refresh"), NULL, on_refresh, GTK_STOCK_REFRESH),
+ GNOMEUIINFO_ITEM_STOCK(N_("_Refresh"), nullptr, on_refresh, GTK_STOCK_REFRESH),
GNOMEUIINFO_END
};
@@ -132,11 +132,11 @@ GtkWidget *gnome_cmd_list_popmenu_new (GnomeCmdFileSelector *fs)
if (popmenu_uiinfo[i].type == GNOME_APP_UI_ITEM)
popmenu_uiinfo[i].user_data = fs;
- GnomeCmdListPopmenu *menu = (GnomeCmdListPopmenu *) g_object_new (GNOME_CMD_TYPE_LIST_POPMENU, NULL);
+ auto menu = static_cast<GnomeCmdListPopmenu*> (g_object_new (GNOME_CMD_TYPE_LIST_POPMENU, nullptr));
// Fill the menu
- gnome_app_fill_menu (GTK_MENU_SHELL (menu), popmenu_uiinfo, NULL, FALSE, 0);
+ gnome_app_fill_menu (GTK_MENU_SHELL (menu), popmenu_uiinfo, nullptr, FALSE, 0);
return GTK_WIDGET (menu);
}
@@ -155,9 +155,9 @@ GtkType gnome_cmd_list_popmenu_get_type ()
sizeof (GnomeCmdListPopmenuClass),
(GtkClassInitFunc) class_init,
(GtkObjectInitFunc) init,
- /* reserved_1 */ NULL,
- /* reserved_2 */ NULL,
- (GtkClassInitFunc) NULL
+ /* reserved_1 */ nullptr,
+ /* reserved_2 */ nullptr,
+ (GtkClassInitFunc) nullptr
};
type = gtk_type_unique (gtk_menu_get_type (), &info);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]