[gnome-commander/gcmd-1-10: 56/57] C++ cast, use nullptr instead of NULL, C++ auto
- From: Uwe Scholz <uwescholz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-commander/gcmd-1-10: 56/57] C++ cast, use nullptr instead of NULL, C++ auto
- Date: Thu, 11 Apr 2019 20:09:03 +0000 (UTC)
commit e26d4d52b134eb48b9162148e23d6630ead0785a
Author: Uwe Scholz <u scholz83 gmx de>
Date: Thu Apr 11 20:54:42 2019 +0200
C++ cast, use nullptr instead of NULL, C++ auto
src/gnome-cmd-dir-indicator.cc | 66 +++++++++----------
src/gnome-cmd-file-list.cc | 2 +-
src/intviewer/search-dlg.cc | 66 +++++++++----------
src/intviewer/viewer-window.cc | 142 ++++++++++++++++++++---------------------
src/tags/gnome-cmd-tags-doc.cc | 22 +++----
5 files changed, 149 insertions(+), 149 deletions(-)
---
diff --git a/src/gnome-cmd-dir-indicator.cc b/src/gnome-cmd-dir-indicator.cc
index 3069e182..e961b0c3 100644
--- a/src/gnome-cmd-dir-indicator.cc
+++ b/src/gnome-cmd-dir-indicator.cc
@@ -1,4 +1,4 @@
-/**
+/**
* @file gnome-cmd-dir-indicator.cc
* @copyright (C) 2001-2006 Marcus Bjurman\n
* @copyright (C) 2007-2012 Piotr Eljasiak\n
@@ -53,7 +53,7 @@ struct GnomeCmdDirIndicatorPrivate
};
-static GtkFrameClass *parent_class = NULL;
+static GtkFrameClass *parent_class = nullptr;
/*******************************
@@ -156,7 +156,7 @@ inline void update_markup (GnomeCmdDirIndicator *indicator, gint i)
gchar *mt = get_mono_text (t);
gchar *ms = get_bold_mono_text (s);
- m = g_strconcat (ms, mt, NULL);
+ m = g_strconcat (ms, mt, nullptr);
g_free (t);
g_free (mt);
g_free (ms);
@@ -174,9 +174,9 @@ static gint on_dir_indicator_motion (GnomeCmdDirIndicator *indicator, GdkEventMo
{
g_return_val_if_fail (GNOME_CMD_IS_DIR_INDICATOR (indicator), FALSE);
- if (indicator->priv->slashCharPosition == NULL)
+ if (indicator->priv->slashCharPosition == nullptr)
return FALSE;
- if (indicator->priv->slashPixelPosition == NULL)
+ if (indicator->priv->slashPixelPosition == nullptr)
return FALSE;
// find out where in the label the pointer is at
@@ -198,7 +198,7 @@ static gint on_dir_indicator_motion (GnomeCmdDirIndicator *indicator, GdkEventMo
// clear underline, cursor=pointer
update_markup (indicator, -1);
- gdk_window_set_cursor (GTK_WIDGET (indicator)->window, NULL);
+ gdk_window_set_cursor (GTK_WIDGET (indicator)->window, nullptr);
}
return TRUE;
@@ -211,7 +211,7 @@ static gint on_dir_indicator_leave (GnomeCmdDirIndicator *indicator, GdkEventMot
// clear underline, cursor=pointer
update_markup (indicator, -1);
- gdk_window_set_cursor (GTK_WIDGET (indicator)->window, NULL);
+ gdk_window_set_cursor (GTK_WIDGET (indicator)->window, nullptr);
return TRUE;
}
@@ -253,26 +253,26 @@ static gboolean on_history_button_clicked (GtkWidget *button, GnomeCmdDirIndicat
static void on_dir_history_popup_hide (GtkMenu *menu, GnomeCmdDirIndicator *indicator)
{
- indicator->priv->dir_history_popup = NULL;
+ indicator->priv->dir_history_popup = nullptr;
indicator->priv->history_is_popped = FALSE;
}
static void on_bookmark_popup_hide (GtkMenu *menu, GnomeCmdDirIndicator *indicator)
{
- indicator->priv->bookmark_popup = NULL;
+ indicator->priv->bookmark_popup = nullptr;
indicator->priv->bookmark_is_popped = FALSE;
}
static void on_dir_history_item_selected (GtkMenuItem *item, const gchar *path)
{
- g_return_if_fail (path != NULL);
+ g_return_if_fail (path != nullptr);
GdkModifierType mask;
- gdk_window_get_pointer (NULL, NULL, NULL, &mask);
+ gdk_window_get_pointer (nullptr, nullptr, nullptr, &mask);
- GnomeCmdDirIndicator *indicator = (GnomeCmdDirIndicator *) g_object_get_data (G_OBJECT (item),
"indicator");
+ auto indicator = static_cast<GnomeCmdDirIndicator*> (g_object_get_data (G_OBJECT (item), "indicator"));
g_return_if_fail (GNOME_CMD_IS_DIR_INDICATOR (indicator));
@@ -291,12 +291,12 @@ static void on_dir_history_item_selected (GtkMenuItem *item, const gchar *path)
static void on_bookmark_item_selected (GtkMenuItem *item, GnomeCmdBookmark *bm)
{
- g_return_if_fail (bm != NULL);
+ g_return_if_fail (bm != nullptr);
GdkModifierType mask;
- gdk_window_get_pointer (NULL, NULL, NULL, &mask);
+ gdk_window_get_pointer (nullptr, nullptr, nullptr, &mask);
- GnomeCmdDirIndicator *indicator = (GnomeCmdDirIndicator *) g_object_get_data (G_OBJECT (item),
"indicator");
+ auto indicator = static_cast<GnomeCmdDirIndicator*> (g_object_get_data (G_OBJECT (item), "indicator"));
g_return_if_fail (GNOME_CMD_IS_DIR_INDICATOR (indicator));
@@ -364,9 +364,9 @@ void gnome_cmd_dir_indicator_show_history (GnomeCmdDirIndicator *indicator)
gnome_popup_menu_do_popup (indicator->priv->dir_history_popup,
(GtkMenuPositionFunc) get_popup_pos,
indicator,
- NULL,
- NULL,
- NULL);
+ nullptr,
+ nullptr,
+ nullptr);
gint w = -1;
@@ -385,7 +385,7 @@ static void on_bookmarks_add_current (GtkMenuItem *item, GnomeCmdDirIndicator *i
static void on_bookmarks_manage (GtkMenuItem *item, GnomeCmdDirIndicator *indicator)
{
- bookmarks_edit (NULL, NULL);
+ bookmarks_edit (nullptr, nullptr);
}
@@ -403,7 +403,7 @@ void gnome_cmd_dir_indicator_show_bookmarks (GnomeCmdDirIndicator *indicator)
for (GList *l = group->bookmarks; l; l = l->next)
{
- GnomeCmdBookmark *bm = (GnomeCmdBookmark *) l->data;
+ auto bm = static_cast<GnomeCmdBookmark*> (l->data);
add_menu_item (indicator,
GTK_MENU_SHELL (indicator->priv->bookmark_popup),
bm->name,
@@ -411,11 +411,11 @@ void gnome_cmd_dir_indicator_show_bookmarks (GnomeCmdDirIndicator *indicator)
bm);
}
- add_menu_item (indicator, GTK_MENU_SHELL (indicator->priv->bookmark_popup), NULL, NULL, indicator);
+ add_menu_item (indicator, GTK_MENU_SHELL (indicator->priv->bookmark_popup), nullptr, nullptr, indicator);
add_menu_item (indicator, GTK_MENU_SHELL (indicator->priv->bookmark_popup), _("Add current dir"),
GTK_SIGNAL_FUNC (on_bookmarks_add_current), indicator);
add_menu_item (indicator, GTK_MENU_SHELL (indicator->priv->bookmark_popup), _("Manage bookmarks…"),
GTK_SIGNAL_FUNC (on_bookmarks_manage), indicator);
- gnome_popup_menu_do_popup (indicator->priv->bookmark_popup, (GtkMenuPositionFunc) get_popup_pos,
indicator, NULL, NULL, NULL);
+ gnome_popup_menu_do_popup (indicator->priv->bookmark_popup, (GtkMenuPositionFunc) get_popup_pos,
indicator, nullptr, nullptr, nullptr);
gint w = -1;
@@ -432,11 +432,11 @@ static void init (GnomeCmdDirIndicator *indicator)
indicator->priv = g_new0 (GnomeCmdDirIndicatorPrivate, 1);
// below assignments are not necessary any longer due to above g_new0()
- // indicator->priv->dir_history_popup = NULL;
- // indicator->priv->bookmark_popup = NULL;
+ // indicator->priv->dir_history_popup = nullptr;
+ // indicator->priv->bookmark_popup = nullptr;
// indicator->priv->history_is_popped = FALSE;
- // indicator->priv->slashCharPosition = NULL;
- // indicator->priv->slashPixelPosition = NULL;
+ // indicator->priv->slashCharPosition = nullptr;
+ // indicator->priv->slashPixelPosition = nullptr;
// indicator->priv->numPositions = 0;
// create the directory label and its event box
@@ -466,7 +466,7 @@ static void init (GnomeCmdDirIndicator *indicator)
gtk_container_add (GTK_CONTAINER (indicator->priv->history_button), arrow);
// create the bookmark popup button
- indicator->priv->bookmark_button = create_styled_pixmap_button (NULL, IMAGE_get_gnome_cmd_pixmap
(PIXMAP_BOOKMARK));
+ indicator->priv->bookmark_button = create_styled_pixmap_button (nullptr, IMAGE_get_gnome_cmd_pixmap
(PIXMAP_BOOKMARK));
GTK_WIDGET_UNSET_FLAGS (indicator->priv->bookmark_button, GTK_CAN_FOCUS);
gtk_button_set_relief (GTK_BUTTON (indicator->priv->bookmark_button), GTK_RELIEF_NONE);
g_object_set_data_full (G_OBJECT (indicator), "button", indicator->priv->bookmark_button,
g_object_unref);
@@ -501,9 +501,9 @@ GtkType gnome_cmd_dir_indicator_get_type ()
sizeof(GnomeCmdDirIndicatorClass),
(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_frame_get_type (), &info);
@@ -515,7 +515,7 @@ GtkType gnome_cmd_dir_indicator_get_type ()
GtkWidget *gnome_cmd_dir_indicator_new (GnomeCmdFileSelector *fs)
{
- GnomeCmdDirIndicator *dir_indicator = (GnomeCmdDirIndicator *) g_object_new
(GNOME_CMD_TYPE_DIR_INDICATOR, NULL);
+ auto dir_indicator = static_cast<GnomeCmdDirIndicator*> (g_object_new (GNOME_CMD_TYPE_DIR_INDICATOR,
nullptr));
g_signal_connect (dir_indicator, "button-press-event", G_CALLBACK (on_dir_indicator_clicked), fs);
@@ -535,8 +535,8 @@ void gnome_cmd_dir_indicator_set_dir (GnomeCmdDirIndicator *indicator, gchar *pa
g_free (indicator->priv->slashCharPosition);
g_free (indicator->priv->slashPixelPosition);
indicator->priv->numPositions = 0;
- indicator->priv->slashCharPosition = NULL;
- indicator->priv->slashPixelPosition = NULL;
+ indicator->priv->slashCharPosition = nullptr;
+ indicator->priv->slashPixelPosition = nullptr;
if (!path)
return;
diff --git a/src/gnome-cmd-file-list.cc b/src/gnome-cmd-file-list.cc
index a948bfaf..7265fe04 100644
--- a/src/gnome-cmd-file-list.cc
+++ b/src/gnome-cmd-file-list.cc
@@ -748,7 +748,7 @@ static char *build_selected_file_list (GnomeCmdFileList *fl, int *file_list_len)
// create a list with the uri's of the selected files and calculate the total_length needed
for (auto i = sel_files; i; i = i->next)
{
- GnomeCmdFile *f = (GnomeCmdFile *) i->data;
+ auto f = static_cast<GnomeCmdFile*> (i->data);
const gchar *fn = nullptr;
if (gnome_vfs_uri_is_local (f->get_uri()))
diff --git a/src/intviewer/search-dlg.cc b/src/intviewer/search-dlg.cc
index e478bbc1..f7e7d783 100644
--- a/src/intviewer/search-dlg.cc
+++ b/src/intviewer/search-dlg.cc
@@ -35,7 +35,7 @@ using namespace std;
// HEX history doesn't work yet
#undef HEX_HISTORY
-static GtkDialogClass *parent_class = NULL;
+static GtkDialogClass *parent_class = nullptr;
void entry_changed(GtkEntry *entry, gpointer user_data);
static void search_dlg_destroy (GtkObject *object);
@@ -59,10 +59,10 @@ struct GViewerSearchDlgPrivate
guint8 *gviewer_search_dlg_get_search_hex_buffer (GViewerSearchDlg *sdlg, /*out*/ guint &buflen)
{
- g_return_val_if_fail (sdlg!=NULL, NULL);
- g_return_val_if_fail (sdlg->priv!=NULL, NULL);
- g_return_val_if_fail (sdlg->priv->search_hex_buffer!=NULL, NULL);
- g_return_val_if_fail (sdlg->priv->search_hex_buflen>0, NULL);
+ g_return_val_if_fail (sdlg != nullptr, nullptr);
+ g_return_val_if_fail (sdlg->priv != nullptr, nullptr);
+ g_return_val_if_fail (sdlg->priv->search_hex_buffer != nullptr, nullptr);
+ g_return_val_if_fail (sdlg->priv->search_hex_buflen>0, nullptr);
guint8 *result = g_new0 (guint8, sdlg->priv->search_hex_buflen);
memcpy (result, sdlg->priv->search_hex_buffer, sdlg->priv->search_hex_buflen);
@@ -75,9 +75,9 @@ guint8 *gviewer_search_dlg_get_search_hex_buffer (GViewerSearchDlg *sdlg, /*out*
gchar *gviewer_search_dlg_get_search_text_string (GViewerSearchDlg *sdlg)
{
- g_return_val_if_fail (sdlg!=NULL, NULL);
- g_return_val_if_fail (sdlg->priv!=NULL, NULL);
- g_return_val_if_fail (sdlg->priv->search_text_string!=NULL, NULL);
+ g_return_val_if_fail (sdlg != nullptr, nullptr);
+ g_return_val_if_fail (sdlg->priv != nullptr, nullptr);
+ g_return_val_if_fail (sdlg->priv->search_text_string != nullptr, nullptr);
return g_strdup (sdlg->priv->search_text_string);
}
@@ -85,8 +85,8 @@ gchar *gviewer_search_dlg_get_search_text_string (GViewerSearchDlg *sdlg)
SEARCHMODE gviewer_search_dlg_get_search_mode (GViewerSearchDlg *sdlg)
{
- g_return_val_if_fail (sdlg!=NULL, SEARCH_MODE_TEXT);
- g_return_val_if_fail (sdlg->priv!=NULL, SEARCH_MODE_TEXT);
+ g_return_val_if_fail (sdlg != nullptr, SEARCH_MODE_TEXT);
+ g_return_val_if_fail (sdlg->priv != nullptr, SEARCH_MODE_TEXT);
return sdlg->priv->searchmode;
}
@@ -94,8 +94,8 @@ SEARCHMODE gviewer_search_dlg_get_search_mode (GViewerSearchDlg *sdlg)
gboolean gviewer_search_dlg_get_case_sensitive (GViewerSearchDlg *sdlg)
{
- g_return_val_if_fail (sdlg!=NULL, TRUE);
- g_return_val_if_fail (sdlg->priv!=NULL, TRUE);
+ g_return_val_if_fail (sdlg != nullptr, TRUE);
+ g_return_val_if_fail (sdlg->priv != nullptr, TRUE);
return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (sdlg->priv->case_sensitive_checkbox));
}
@@ -141,8 +141,8 @@ static void set_hex_mode (GViewerSearchDlg *sdlg)
static void search_mode_text (GtkToggleButton *btn, GViewerSearchDlg *sdlg)
{
- g_return_if_fail (btn!=NULL);
- g_return_if_fail (sdlg!=NULL);
+ g_return_if_fail (btn != nullptr);
+ g_return_if_fail (sdlg != nullptr);
if (!gtk_toggle_button_get_active(btn))
return;
@@ -153,8 +153,8 @@ static void search_mode_text (GtkToggleButton *btn, GViewerSearchDlg *sdlg)
static void search_mode_hex (GtkToggleButton *btn, GViewerSearchDlg *sdlg)
{
- g_return_if_fail (btn!=NULL);
- g_return_if_fail (sdlg!=NULL);
+ g_return_if_fail (btn != nullptr);
+ g_return_if_fail (sdlg != nullptr);
if (gtk_toggle_button_get_active(btn))
set_hex_mode(sdlg);
@@ -163,14 +163,14 @@ static void search_mode_hex (GtkToggleButton *btn, GViewerSearchDlg *sdlg)
static void search_dlg_action_response (GtkDialog *dlg, gint arg1, GViewerSearchDlg *sdlg)
{
- g_return_if_fail (sdlg!=NULL);
- g_return_if_fail (sdlg->priv!=NULL);
+ g_return_if_fail (sdlg != nullptr);
+ g_return_if_fail (sdlg->priv != nullptr);
if (arg1 != GTK_RESPONSE_OK)
return;
- g_return_if_fail (sdlg->priv->search_text_string==NULL);
- g_return_if_fail (sdlg->priv->search_hex_buffer==NULL);
+ g_return_if_fail (sdlg->priv->search_text_string==nullptr);
+ g_return_if_fail (sdlg->priv->search_hex_buffer==nullptr);
gchar *pattern = gtk_combo_box_get_active_text (GTK_COMBO_BOX (sdlg->priv->entry));
@@ -186,7 +186,7 @@ static void search_dlg_action_response (GtkDialog *dlg, gint arg1, GViewerSearch
else // hex mode search
{
sdlg->priv->search_hex_buffer = text2hex (pattern, sdlg->priv->search_hex_buflen);
- g_return_if_fail (sdlg->priv->search_hex_buffer!=NULL);
+ g_return_if_fail (sdlg->priv->search_hex_buffer != nullptr);
gnome_cmd_data.intviewer_defaults.hex_patterns.add(pattern);
}
@@ -209,7 +209,7 @@ void entry_changed (GtkEntry *entry, gpointer user_data)
gboolean enable = FALSE;
GViewerSearchDlg *sdlg = GVIEWER_SEARCH_DLG (user_data);
- g_return_if_fail (sdlg->priv!=NULL);
+ g_return_if_fail (sdlg->priv != nullptr);
if (sdlg->priv->searchmode==SEARCH_MODE_HEX)
{
@@ -217,7 +217,7 @@ void entry_changed (GtkEntry *entry, gpointer user_data)
guint len;
guint8 *buf = text2hex (gtk_entry_get_text (entry), len);
- enable = buf!=NULL && len>0;
+ enable = buf != nullptr && len>0;
g_free (buf);
}
else
@@ -256,21 +256,21 @@ static void search_dlg_init (GViewerSearchDlg *sdlg)
sdlg->priv->table = GTK_WIDGET (table);
// Label
- sdlg->priv->label = gtk_label_new(NULL);
+ sdlg->priv->label = gtk_label_new(nullptr);
gtk_label_set_markup_with_mnemonic (GTK_LABEL (sdlg->priv->label), "_Search for:");
gtk_table_attach(table, sdlg->priv->label, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
// Entry Box
sdlg->priv->entry = gtk_combo_box_entry_new_text();
entry = gtk_bin_get_child (GTK_BIN (sdlg->priv->entry));
- g_object_set(entry, "activates-default", TRUE, NULL);
+ g_object_set(entry, "activates-default", TRUE, nullptr);
g_signal_connect (entry, "changed", G_CALLBACK (entry_changed), sdlg);
gtk_table_attach(table, sdlg->priv->entry, 1, 3, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
set_text_history (sdlg);
// Search mode radio buttons
- sdlg->priv->text_mode = gtk_radio_button_new_with_mnemonic(NULL, _("_Text"));
+ sdlg->priv->text_mode = gtk_radio_button_new_with_mnemonic(nullptr, _("_Text"));
sdlg->priv->hex_mode = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON
(sdlg->priv->text_mode), _("_Hexadecimal"));
g_signal_connect (sdlg->priv->text_mode, "toggled", G_CALLBACK (search_mode_text), sdlg);
@@ -318,10 +318,10 @@ static void search_dlg_destroy (GtkObject *object)
gnome_cmd_data.intviewer_defaults.search_mode = w->priv->searchmode;
g_free (w->priv->search_text_string);
- w->priv->search_text_string = NULL;
+ w->priv->search_text_string = nullptr;
g_free (w->priv);
- w->priv = NULL;
+ w->priv = nullptr;
}
if (GTK_OBJECT_CLASS (parent_class)->destroy)
@@ -337,11 +337,11 @@ GType gviewer_search_dlg_get_type ()
static const GTypeInfo ttt_info =
{
sizeof (GViewerSearchDlgClass),
- NULL, // base_init
- NULL, // base_finalize
+ nullptr, // base_init
+ nullptr, // base_finalize
(GClassInitFunc) class_init,
- NULL, // class_finalize
- NULL, // class_data
+ nullptr, // class_finalize
+ nullptr, // class_data
sizeof (GViewerSearchDlg),
0, // n_preallocs
(GInstanceInitFunc) search_dlg_init,
@@ -356,7 +356,7 @@ GType gviewer_search_dlg_get_type ()
GtkWidget* gviewer_search_dlg_new (GtkWindow *parent)
{
- GViewerSearchDlg *dlg = (GViewerSearchDlg *) g_object_new (gviewer_search_dlg_get_type(), NULL);
+ auto dlg = static_cast<GViewerSearchDlg*> (g_object_new (gviewer_search_dlg_get_type(), nullptr));
return GTK_WIDGET (dlg);
}
\ No newline at end of file
diff --git a/src/intviewer/viewer-window.cc b/src/intviewer/viewer-window.cc
index f03459bc..cde6e816 100644
--- a/src/intviewer/viewer-window.cc
+++ b/src/intviewer/viewer-window.cc
@@ -90,7 +90,7 @@ static void iv_settings_class_init (InternalViewerSettingsClass *klass)
InternalViewerSettings *iv_settings_new ()
{
- return (InternalViewerSettings *) g_object_new (INTERNAL_VIEWER_SETTINGS, NULL);
+ return (InternalViewerSettings *) g_object_new (INTERNAL_VIEWER_SETTINGS, nullptr);
}
static void iv_settings_init (InternalViewerSettings *gs)
@@ -100,7 +100,7 @@ static void iv_settings_init (InternalViewerSettings *gs)
/***********************************/
-static GtkWindowClass *parent_class = NULL;
+static GtkWindowClass *parent_class = nullptr;
static double image_scale_factors[] = {0.1, 0.2, 0.33, 0.5, 0.67, 1, 1.25, 1.50, 2, 3, 4, 5, 6, 7, 8};
@@ -209,8 +209,8 @@ GtkWidget *gviewer_window_file_view (GnomeCmdFile *f, GViewerWindowSettings *ini
void gviewer_window_load_file (GViewerWindow *obj, GnomeCmdFile *f)
{
- g_return_if_fail (obj!=NULL);
- g_return_if_fail (f!=NULL);
+ g_return_if_fail (obj != nullptr);
+ g_return_if_fail (f != nullptr);
g_free (obj->priv->filename);
@@ -230,11 +230,11 @@ GtkType gviewer_window_get_type ()
GTypeInfo info =
{
sizeof (GViewerWindowClass),
- NULL,
- NULL,
+ nullptr,
+ nullptr,
(GClassInitFunc) gviewer_window_class_init,
- NULL,
- NULL,
+ nullptr,
+ nullptr,
sizeof(GViewerWindow),
0,
(GInstanceInitFunc) gviewer_window_init
@@ -247,7 +247,7 @@ GtkType gviewer_window_get_type ()
static void gviewer_window_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);
}
@@ -269,15 +269,15 @@ static void gviewer_window_init (GViewerWindow *w)
w->priv = g_new0 (GViewerWindowPrivate, 1);
// w->priv->status_bar_msg = FALSE;
- // w->priv->filename = NULL;
- // w->priv->metadata_view = NULL;
+ // w->priv->filename = nullptr;
+ // w->priv->metadata_view = nullptr;
// w->priv->metadata_visible = FALSE;
w->priv->current_scale_index = 5;
GtkWindow *win = GTK_WINDOW (w);
gtk_window_set_title (win, "GViewer");
- g_signal_connect (w, "key-press-event", G_CALLBACK (gviewer_window_key_pressed), NULL);
+ g_signal_connect (w, "key-press-event", G_CALLBACK (gviewer_window_key_pressed), nullptr);
w->priv->vbox = gtk_vbox_new (FALSE, 0);
gtk_widget_show (w->priv->vbox);
@@ -286,7 +286,7 @@ static void gviewer_window_init (GViewerWindow *w)
gtk_widget_show (w->priv->menubar);
gtk_box_pack_start (GTK_BOX (w->priv->vbox), w->priv->menubar, FALSE, FALSE, 0);
- w->priv->viewer = (GViewer *) gviewer_new();
+ w->priv->viewer = reinterpret_cast<GViewer*> (gviewer_new());
g_object_ref (w->priv->viewer);
gtk_widget_show (GTK_WIDGET (w->priv->viewer));
gtk_box_pack_start (GTK_BOX (w->priv->vbox), GTK_WIDGET (w->priv->viewer), TRUE, TRUE, 0);
@@ -317,15 +317,15 @@ static void gviewer_window_status_line_changed(GViewer *obj, const gchar *status
if (status_line)
gtk_statusbar_push (GTK_STATUSBAR (w->priv->statusbar), w->priv->statusbar_ctx_id, status_line);
- w->priv->status_bar_msg = status_line!=NULL;
+ w->priv->status_bar_msg = status_line != nullptr;
}
void gviewer_window_set_settings(GViewerWindow *obj, /*in*/ GViewerWindowSettings *settings)
{
g_return_if_fail (IS_GVIEWER_WINDOW (obj));
- g_return_if_fail (settings!=NULL);
- g_return_if_fail (obj->priv->viewer!=NULL);
+ g_return_if_fail (settings != nullptr);
+ g_return_if_fail (obj->priv->viewer != nullptr);
gviewer_set_font_size(obj->priv->viewer, settings->font_size);
gviewer_set_tab_size(obj->priv->viewer, settings->tab_size);
@@ -461,8 +461,8 @@ void gviewer_window_set_settings(GViewerWindow *obj, /*in*/ GViewerWindowSetting
void gviewer_window_get_current_settings(GViewerWindow *obj, /* out */ GViewerWindowSettings *settings)
{
g_return_if_fail (IS_GVIEWER_WINDOW (obj));
- g_return_if_fail (settings!=NULL);
- g_return_if_fail (obj->priv->viewer!=NULL);
+ g_return_if_fail (settings != nullptr);
+ g_return_if_fail (obj->priv->viewer != nullptr);
memset(settings, 0, sizeof(GViewerWindowSettings));
@@ -499,10 +499,10 @@ static void gviewer_window_destroy (GtkObject *widget)
g_object_unref (w->priv->viewer);
g_free (w->priv->filename);
- w->priv->filename = NULL;
+ w->priv->filename = nullptr;
g_free (w->priv);
- w->priv = NULL;
+ w->priv = nullptr;
}
if (GTK_OBJECT_CLASS(parent_class)->destroy)
@@ -521,12 +521,12 @@ static gboolean gviewer_window_key_pressed(GtkWidget *widget, GdkEventKey *event
case GDK_plus:
case GDK_KP_Add:
case GDK_equal:
- menu_view_zoom_in(NULL, w);
+ menu_view_zoom_in(nullptr, w);
return TRUE;
case GDK_minus:
case GDK_KP_Subtract:
- menu_view_zoom_out(NULL, w);
+ menu_view_zoom_out(nullptr, w);
return TRUE;
default:
@@ -557,7 +557,7 @@ static gboolean gviewer_window_key_pressed(GtkWidget *widget, GdkEventKey *event
switch (event->keyval)
{
case GDK_F7:
- menu_edit_find_next(NULL, w);
+ menu_edit_find_next(nullptr, w);
return TRUE;
default:
break;
@@ -585,7 +585,7 @@ static gboolean gviewer_window_key_pressed(GtkWidget *widget, GdkEventKey *event
return TRUE;
case GDK_F7:
- menu_edit_find(NULL, w);
+ menu_edit_find(nullptr, w);
return TRUE;
default:
@@ -672,9 +672,9 @@ static GtkWidget *create_menu_item (MENUITEMTYPE type,
#pragma GCC diagnostic pop
#endif
- if (pixmap_type != GNOME_APP_PIXMAP_NONE && pixmap_info != NULL)
+ if (pixmap_type != GNOME_APP_PIXMAP_NONE && pixmap_info != nullptr)
{
- GtkWidget *pixmap = create_ui_pixmap (NULL, pixmap_type, pixmap_info, GTK_ICON_SIZE_MENU);
+ GtkWidget *pixmap = create_ui_pixmap (nullptr, pixmap_type, pixmap_info, GTK_ICON_SIZE_MENU);
if (pixmap)
{
gtk_widget_show (pixmap);
@@ -732,12 +732,12 @@ inline GtkWidget *create_sub_menu(const gchar *name, GtkWidget *container)
static void create_menu_items (GtkWidget *container, GtkAccelGroup *accel, gpointer user_data,
MENU_ITEM_DATA *menudata)
{
- g_return_if_fail (menudata!=NULL);
- g_return_if_fail (container!=NULL);
+ g_return_if_fail (menudata != nullptr);
+ g_return_if_fail (container != nullptr);
while (menudata && menudata->menutype!=MI_NONE)
{
- GtkWidget *item = NULL;
+ GtkWidget *item = nullptr;
switch (menudata->menutype)
{
@@ -756,7 +756,7 @@ static void create_menu_items (GtkWidget *container, GtkAccelGroup *accel, gpoin
case MI_CHECK:
item = create_menu_item(menudata->menutype,
menudata->label, container,
- menudata->keyval ? accel : NULL,
+ menudata->keyval ? accel : nullptr,
menudata->keyval,
menudata->modifier,
menudata->callback,
@@ -765,12 +765,12 @@ static void create_menu_items (GtkWidget *container, GtkAccelGroup *accel, gpoin
case MI_RADIO:
if (!menudata->radio_list)
- g_warning ("radio_list field is NULL in \"%s\" menu item", menudata->label);
+ g_warning ("radio_list field is nullptr in \"%s\" menu item", menudata->label);
else
{
item = create_radio_menu_item(menudata->radio_list,
menudata->label, container,
- menudata->keyval ? accel : NULL,
+ menudata->keyval ? accel : nullptr,
menudata->keyval,
menudata->modifier,
menudata->callback, user_data);
@@ -793,10 +793,10 @@ static void create_menu_items (GtkWidget *container, GtkAccelGroup *accel, gpoin
#define NO_KEYVAL 0
#define NO_MODIFIER 0
-#define NO_GOBJ_KEY NULL
-#define NO_GOBJ_VAL NULL
-#define NO_MENU_ITEM NULL
-#define NO_GSLIST NULL
+#define NO_GOBJ_KEY nullptr
+#define NO_GOBJ_VAL nullptr
+#define NO_MENU_ITEM nullptr
+#define NO_GSLIST nullptr
#define NO_PIXMAP_INFO 0
static GtkWidget *gviewer_window_create_menus(GViewerWindow *obj)
@@ -812,7 +812,7 @@ static void create_menu_items (GtkWidget *container, GtkAccelGroup *accel, gpoin
{MI_NONE}
};
- GSList *view_mode_list = NULL;
+ GSList *view_mode_list = nullptr;
MENU_ITEM_DATA view_menu_items[] = {
{MI_RADIO, _("_Text"), GDK_1, NO_MODIFIER, G_CALLBACK (menu_view_display_mode),
@@ -852,7 +852,7 @@ static void create_menu_items (GtkWidget *container, GtkAccelGroup *accel, gpoin
};
- GtkWidget *encoding_submenu = NULL;
+ GtkWidget *encoding_submenu = nullptr;
MENU_ITEM_DATA text_menu_items[] = {
{MI_NORMAL, _("_Copy Text Selection"), GDK_C, GDK_CONTROL_MASK, G_CALLBACK (menu_edit_copy),
GNOME_APP_PIXMAP_STOCK, GTK_STOCK_COPY,
@@ -876,7 +876,7 @@ static void create_menu_items (GtkWidget *container, GtkAccelGroup *accel, gpoin
NO_GOBJ_KEY, NO_GOBJ_VAL,
&obj->priv->wrap_mode_menu_item, NO_GSLIST},
{MI_SEPERATOR},
- {MI_SUBMENU, _("_Encoding"), NO_KEYVAL, NO_MODIFIER, G_CALLBACK (NULL),
+ {MI_SUBMENU, _("_Encoding"), NO_KEYVAL, NO_MODIFIER, G_CALLBACK (nullptr),
GNOME_APP_PIXMAP_NONE, NO_PIXMAP_INFO,
NO_GOBJ_KEY, NO_GOBJ_VAL,
&encoding_submenu, NO_GSLIST},
@@ -889,7 +889,7 @@ static void create_menu_items (GtkWidget *container, GtkAccelGroup *accel, gpoin
G_OBJ_CHARSET_KEY, (gpointer *) GUINT_TO_POINTER(value), \
&obj->priv->encoding_menu_item[item_number], &text_encoding_list}
- GSList *text_encoding_list = NULL;
+ GSList *text_encoding_list = nullptr;
MENU_ITEM_DATA encoding_menu_items[] = {
ENCODING_MENU_ITEM("_UTF-8", GDK_u, "UTF8", 0),
ENCODING_MENU_ITEM("English (US-_ASCII)", GDK_a, "ASCII", 1),
@@ -951,10 +951,10 @@ static void create_menu_items (GtkWidget *container, GtkAccelGroup *accel, gpoin
{MI_NONE}
};
- GtkWidget *binary_mode_settings_submenu = NULL;
+ GtkWidget *binary_mode_settings_submenu = nullptr;
MENU_ITEM_DATA settings_menu_items[] = {
{MI_SUBMENU, _("_Binary Mode"), NO_KEYVAL, NO_MODIFIER,
- G_CALLBACK (NULL),
+ G_CALLBACK (nullptr),
GNOME_APP_PIXMAP_NONE, NO_PIXMAP_INFO,
NO_GOBJ_KEY, NO_GOBJ_VAL,
&binary_mode_settings_submenu, NO_GSLIST},
@@ -973,7 +973,7 @@ static void create_menu_items (GtkWidget *container, GtkAccelGroup *accel, gpoin
{MI_NONE}
};
- GSList *binmode_chars_per_line_list = NULL;
+ GSList *binmode_chars_per_line_list = nullptr;
MENU_ITEM_DATA binmode_settings_menu_items[] = {
{MI_RADIO, _("_20 chars/line"), GDK_2, GDK_CONTROL_MASK | GDK_SHIFT_MASK,
G_CALLBACK (menu_settings_binary_bytes_per_line),
@@ -1047,8 +1047,8 @@ static void menu_file_close (GtkMenuItem *item, GViewerWindow *obj)
static void menu_view_exif_information(GtkMenuItem *item, GViewerWindow *obj)
{
- g_return_if_fail (obj!=NULL);
- g_return_if_fail (obj->priv->viewer!=NULL);
+ g_return_if_fail (obj != nullptr);
+ g_return_if_fail (obj->priv->viewer != nullptr);
if (gviewer_get_display_mode(obj->priv->viewer) != DISP_MODE_IMAGE)
return;
@@ -1083,7 +1083,7 @@ static void menu_view_display_mode(GtkMenuItem *item, GViewerWindow *obj)
gviewer_set_display_mode(obj->priv->viewer, dispmode);
gtk_widget_grab_focus (GTK_WIDGET (obj->priv->viewer));
- gtk_widget_draw (GTK_WIDGET (obj->priv->viewer), NULL);
+ gtk_widget_draw (GTK_WIDGET (obj->priv->viewer), nullptr);
}
@@ -1096,10 +1096,10 @@ static void menu_view_set_charset(GtkMenuItem *item, GViewerWindow *obj)
return;
gchar *charset = (gchar *) g_object_get_data (G_OBJECT (item), G_OBJ_CHARSET_KEY);
- g_return_if_fail (charset!=NULL);
+ g_return_if_fail (charset != nullptr);
gviewer_set_encoding(obj->priv->viewer, charset);
- gtk_widget_draw (GTK_WIDGET (obj->priv->viewer), NULL);
+ gtk_widget_draw (GTK_WIDGET (obj->priv->viewer), nullptr);
}
@@ -1112,7 +1112,7 @@ static void menu_image_operation(GtkMenuItem *item, GViewerWindow *obj)
gviewer_image_operation(obj->priv->viewer, imageop);
- gtk_widget_draw (GTK_WIDGET (obj->priv->viewer), NULL);
+ gtk_widget_draw (GTK_WIDGET (obj->priv->viewer), nullptr);
}
@@ -1240,7 +1240,7 @@ static void menu_settings_binary_bytes_per_line(GtkMenuItem *item, GViewerWindow
int bytes_per_line = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), G_OBJ_BYTES_PER_LINE_KEY));
gviewer_set_fixed_limit(obj->priv->viewer, bytes_per_line);
- gtk_widget_draw (GTK_WIDGET (obj->priv->viewer), NULL);
+ gtk_widget_draw (GTK_WIDGET (obj->priv->viewer), nullptr);
}
@@ -1298,13 +1298,13 @@ static void menu_edit_find(GtkMenuItem *item, GViewerWindow *obj)
}
// If a previous search is active, delete it
- if (obj->priv->srchr!=NULL)
+ if (obj->priv->srchr != nullptr)
{
g_object_unref (obj->priv->srchr);
- obj->priv->srchr = NULL;
+ obj->priv->srchr = nullptr;
g_free (obj->priv->search_pattern);
- obj->priv->search_pattern = NULL;
+ obj->priv->search_pattern = nullptr;
}
// Get the search information from the search dialog
@@ -1331,7 +1331,7 @@ static void menu_edit_find(GtkMenuItem *item, GViewerWindow *obj)
guint buflen;
guint8 *buffer = gviewer_search_dlg_get_search_hex_buffer (srch_dlg, buflen);
- g_return_if_fail (buffer!=NULL);
+ g_return_if_fail (buffer != nullptr);
obj->priv->search_pattern_len = buflen;
g_viewer_searcher_setup_new_hex_search(obj->priv->srchr,
@@ -1387,7 +1387,7 @@ static void menu_view_wrap(GtkMenuItem *item, GViewerWindow *obj)
gboolean wrap = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (item));
gviewer_set_wrap_mode(obj->priv->viewer, wrap);
- gtk_widget_draw (GTK_WIDGET (obj->priv->viewer), NULL);
+ gtk_widget_draw (GTK_WIDGET (obj->priv->viewer), nullptr);
}
@@ -1403,7 +1403,7 @@ static void menu_settings_hex_decimal_offset(GtkMenuItem *item, GViewerWindow *o
void gviewer_window_load_settings(/* out */ GViewerWindowSettings *settings)
{
- g_return_if_fail (settings!=NULL);
+ g_return_if_fail (settings != nullptr);
InternalViewerSettings *iv_settings;
iv_settings = iv_settings_new();
@@ -1478,15 +1478,15 @@ static void menu_help_keyboard(GtkMenuItem *item, GViewerWindow *obj)
inline void gviewer_window_show_metadata(GViewerWindow *w)
{
- g_return_if_fail (w!=NULL);
- g_return_if_fail (w->priv->f!=NULL);
+ g_return_if_fail (w != nullptr);
+ g_return_if_fail (w->priv->f != nullptr);
if (w->priv->metadata_visible)
return;
if (!w->priv->metadata_view)
{
- GtkWidget *scrolledwindow = gtk_scrolled_window_new (NULL, NULL);
+ GtkWidget *scrolledwindow = gtk_scrolled_window_new (nullptr, nullptr);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow), GTK_POLICY_NEVER,
GTK_POLICY_AUTOMATIC);
gtk_container_set_border_width (GTK_CONTAINER (scrolledwindow), 10);
gtk_container_add (GTK_CONTAINER (scrolledwindow), create_view ());
@@ -1514,8 +1514,8 @@ inline void gviewer_window_show_metadata(GViewerWindow *w)
inline void gviewer_window_hide_metadata(GViewerWindow *obj)
{
- g_return_if_fail (obj!=NULL);
- g_return_if_fail (obj->priv->metadata_view!=NULL);
+ g_return_if_fail (obj != nullptr);
+ g_return_if_fail (obj->priv->metadata_view != nullptr);
if (!obj->priv->metadata_visible)
return;
@@ -1569,7 +1569,7 @@ inline void fill_model (GtkTreeStore *tree, GnomeCmdFile *f)
if (prev_tagclass!=curr_tagclass)
{
- gtk_tree_store_append (tree, &toplevel, NULL);
+ gtk_tree_store_append (tree, &toplevel, nullptr);
gtk_tree_store_set (tree, &toplevel,
COL_TAG, TAG_NONE,
COL_TYPE, gcmd_tags_get_class_name(t),
@@ -1603,36 +1603,36 @@ GtkWidget *create_view ()
"rules-hint", TRUE,
"enable-search", TRUE,
"search-column", COL_VALUE,
- NULL);
+ nullptr);
- GtkCellRenderer *renderer = NULL;
- GtkTreeViewColumn *col = NULL;
+ GtkCellRenderer *renderer = nullptr;
+ GtkTreeViewColumn *col = nullptr;
GtkTooltips *tips = gtk_tooltips_new ();
col = gnome_cmd_treeview_create_new_text_column (GTK_TREE_VIEW (view), renderer, COL_TYPE, _("Type"));
- gtk_tooltips_set_tip (tips, col->button, _("Metadata namespace"), NULL);
+ gtk_tooltips_set_tip (tips, col->button, _("Metadata namespace"), nullptr);
g_object_set (renderer,
"weight-set", TRUE,
"weight", PANGO_WEIGHT_BOLD,
- NULL);
+ nullptr);
col = gnome_cmd_treeview_create_new_text_column (GTK_TREE_VIEW (view), COL_NAME, _("Name"));
- gtk_tooltips_set_tip (tips, col->button, _("Tag name"), NULL);
+ gtk_tooltips_set_tip (tips, col->button, _("Tag name"), nullptr);
col = gnome_cmd_treeview_create_new_text_column (GTK_TREE_VIEW (view), COL_VALUE, _("Value"));
- gtk_tooltips_set_tip (tips, col->button, _("Tag value"), NULL);
+ gtk_tooltips_set_tip (tips, col->button, _("Tag value"), nullptr);
col = gnome_cmd_treeview_create_new_text_column (GTK_TREE_VIEW (view), renderer, COL_DESC,
_("Description"));
- gtk_tooltips_set_tip (tips, col->button, _("Metadata tag description"), NULL);
+ gtk_tooltips_set_tip (tips, col->button, _("Metadata tag description"), nullptr);
g_object_set (renderer,
"foreground-set", TRUE,
"foreground", "DarkGray",
"ellipsize-set", TRUE,
"ellipsize", PANGO_ELLIPSIZE_END,
- NULL);
+ nullptr);
return view;
}
diff --git a/src/tags/gnome-cmd-tags-doc.cc b/src/tags/gnome-cmd-tags-doc.cc
index 9014ad82..1c37df86 100644
--- a/src/tags/gnome-cmd-tags-doc.cc
+++ b/src/tags/gnome-cmd-tags-doc.cc
@@ -63,7 +63,7 @@ static void process_metadata(gpointer key, gpointer value, gpointer user_data)
{
char *type = (char *) key;
const GsfDocProp *prop = (const GsfDocProp *) value;
- GnomeCmdFileMetadata *metadata = (GnomeCmdFileMetadata *) user_data;
+ auto metadata = static_cast<GnomeCmdFileMetadata*> (user_data);
if (!key || !value || !metadata) return;
@@ -206,9 +206,9 @@ inline void process_msole_SO(GsfInput *input, GnomeCmdFileMetadata *metadata)
inline void process_msole_infile(GsfInfile *infile, GnomeCmdFileMetadata *metadata)
{
- // static gchar *names[] = {"\005SummaryInformation", "\005DocumentSummaryInformation",
"SfxDocumentInfo", NULL};
+ // static gchar *names[] = {"\005SummaryInformation", "\005DocumentSummaryInformation",
"SfxDocumentInfo", nullptr};
- // GsfInput *src = NULL;
+ // GsfInput *src = nullptr;
// src = gsf_infile_child_by_name (infile, "\005SummaryInformation");
@@ -345,8 +345,8 @@ void gcmd_tags_libgsf_shutdown()
void gcmd_tags_libgsf_load_metadata(GnomeCmdFile *f)
{
- g_return_if_fail (f != NULL);
- g_return_if_fail (f->info != NULL);
+ g_return_if_fail (f != nullptr);
+ g_return_if_fail (f->info != nullptr);
#ifdef HAVE_GSF
if (f->metadata && f->metadata->is_accessed(TAG_DOC)) return;
@@ -360,18 +360,18 @@ void gcmd_tags_libgsf_load_metadata(GnomeCmdFile *f)
if (!f->is_local()) return;
- GError *err = NULL;
+ GError *err = nullptr;
gchar *fname = f->get_real_path();
DEBUG('t', "Loading doc metadata for '%s'\n", fname);
- GsfInput *input = gsf_input_mmap_new (fname, NULL);
+ GsfInput *input = gsf_input_mmap_new (fname, nullptr);
if (!input)
input = gsf_input_stdio_new (fname, &err);
if (!input)
{
- g_return_if_fail (err != NULL);
+ g_return_if_fail (err != nullptr);
g_warning ("'%s' error: %s", fname, err->message);
g_error_free (err);
g_free (fname);
@@ -380,12 +380,12 @@ void gcmd_tags_libgsf_load_metadata(GnomeCmdFile *f)
g_free (fname);
- GsfInfile *infile = NULL;
+ GsfInfile *infile = nullptr;
- if ((infile = gsf_infile_msole_new (input, NULL)))
+ if ((infile = gsf_infile_msole_new (input, nullptr)))
process_msole_infile(infile, f->metadata);
else
- if ((infile = gsf_infile_zip_new (input, NULL)))
+ if ((infile = gsf_infile_zip_new (input, nullptr)))
process_opendoc_infile(infile, f->metadata);
if (infile)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
