[gnome-commander/Implement_CppCheck_suggestions] C++11 initialization list, 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++11 initialization list, use nullptr instead of NULL
- Date: Mon, 8 Apr 2019 19:56:01 +0000 (UTC)
commit ffedb246caaff9d6d5adf5f1b47fef5ff6307d2b
Author: Uwe Scholz <u scholz83 gmx de>
Date: Mon Apr 8 20:55:59 2019 +0200
C++11 initialization list, use nullptr instead of NULL
src/gnome-cmd-file-list.cc | 11 -----------
src/gnome-cmd-file-list.h | 25 +++++++++++++------------
2 files changed, 13 insertions(+), 23 deletions(-)
---
diff --git a/src/gnome-cmd-file-list.cc b/src/gnome-cmd-file-list.cc
index 14bbd8fe..a948bfaf 100644
--- a/src/gnome-cmd-file-list.cc
+++ b/src/gnome-cmd-file-list.cc
@@ -265,17 +265,6 @@ void GnomeCmdFileList::Private::on_dnd_popup_menu(GnomeCmdFileList *fl, GnomeVFS
GnomeCmdFileList::GnomeCmdFileList(ColumnID sort_col, GtkSortType sort_order)
{
- tab_label_pin = nullptr;
- tab_label_text = nullptr;
- realized = FALSE;
- modifier_click = FALSE;
- locked = FALSE;
-
- con = nullptr;
- cwd = nullptr;
- lwd = nullptr;
- connected_dir = nullptr;
-
#if defined (__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wuninitialized"
diff --git a/src/gnome-cmd-file-list.h b/src/gnome-cmd-file-list.h
index 7ef5d909..eaee834b 100644
--- a/src/gnome-cmd-file-list.h
+++ b/src/gnome-cmd-file-list.h
@@ -69,13 +69,13 @@ struct GnomeCmdFileList
Private *priv;
- GtkWidget *tab_label_pin;
- GtkWidget *tab_label_text;
+ GtkWidget *tab_label_pin {nullptr};
+ GtkWidget *tab_label_text {nullptr};
- gboolean realized;
- gboolean modifier_click;
+ gboolean realized {FALSE};
+ gboolean modifier_click {FALSE};
- gboolean locked;
+ gboolean locked {FALSE};
void *operator new (size_t size);
void operator delete (void *p) { g_object_unref (p); }
@@ -100,15 +100,16 @@ struct GnomeCmdFileList
NUM_COLUMNS
};
- GnomeCmdCon *con;
- GnomeCmdDir *cwd, *lwd; // current & last working dir
- GnomeCmdDir *connected_dir;
+ GnomeCmdCon *con {nullptr};
+ GnomeCmdDir *cwd {nullptr}; // current working dir
+ GnomeCmdDir *lwd {nullptr}; // last working dir
+ GnomeCmdDir *connected_dir {nullptr};
GnomeCmdFileList(ColumnID sort_col, GtkSortType sort_order);
~GnomeCmdFileList();
guint size() { return g_list_length (get_visible_files()); }
- bool empty() { return get_visible_files()==NULL; } // FIXME
should be: size()==0
+ bool empty() { return get_visible_files() == nullptr; } // FIXME
should be: size()==0
void clear();
void reload();
@@ -207,7 +208,7 @@ struct GnomeCmdFileList
* already exist, or just set the file list to the last or the
* current working dir.
*/
- void set_connection(GnomeCmdCon *con, GnomeCmdDir *start_dir=NULL);
+ void set_connection(GnomeCmdCon *con, GnomeCmdDir *start_dir = nullptr);
void set_directory(GnomeCmdDir *dir);
void goto_directory(const gchar *dir);
@@ -222,7 +223,7 @@ struct GnomeCmdFileList
inline void *GnomeCmdFileList::operator new (size_t size)
{
- return g_object_new (GNOME_CMD_TYPE_FILE_LIST, "n-columns", GnomeCmdFileList::NUM_COLUMNS, NULL);
+ return g_object_new (GNOME_CMD_TYPE_FILE_LIST, "n-columns", GnomeCmdFileList::NUM_COLUMNS, nullptr);
}
inline GnomeCmdFileList::~GnomeCmdFileList()
@@ -246,7 +247,7 @@ inline GnomeCmdFile *GnomeCmdFileList::get_selected_file()
{
GnomeCmdFile *f = get_focused_file();
- return !f || f->is_dotdot ? NULL : f;
+ return !f || f->is_dotdot ? nullptr : f;
}
void gnome_cmd_file_list_show_delete_dialog (GnomeCmdFileList *fl);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]