[19/66] Inline constructors and initializers

Message ID 20190623224329.16060-20-tom@tromey.com
State New
Headers show
Series
  • Clean up the TUI
Related show

Commit Message

Tom Tromey June 23, 2019, 10:42 p.m.
This inlines the constructors and initializers for tui_cmd_window and
tui_data_window.  This makes the code a bit simpler.

gdb/ChangeLog
2019-06-23  Tom Tromey  <tom@tromey.com>

	* tui/tui-data.h (struct tui_data_window, struct tui_cmd_window):
	Inline constructor.  Add initializers for members.
	* tui/tui-data.c (tui_data_window, tui_cmd_window): Remove
	constructors; now inline in class.
---
 gdb/ChangeLog      |  7 +++++++
 gdb/tui/tui-data.c | 17 -----------------
 gdb/tui/tui-data.h | 31 +++++++++++++++++++++----------
 3 files changed, 28 insertions(+), 27 deletions(-)

-- 
2.17.2

Patch

diff --git a/gdb/tui/tui-data.c b/gdb/tui/tui-data.c
index fe751574b95..c9c0bdf3f21 100644
--- a/gdb/tui/tui-data.c
+++ b/gdb/tui/tui-data.c
@@ -495,23 +495,6 @@  tui_source_window_base::tui_source_window_base (enum tui_win_type type)
   start_line_or_addr.u.addr = 0;
 }
 
-tui_data_window::tui_data_window ()
-  : tui_win_info (DATA_WIN)
-{
-  data_content = NULL;
-  data_content_count = 0;
-  regs_content = NULL;
-  regs_content_count = 0;
-  regs_column_count = 1;
-  display_regs = false;
-  current_group = 0;
-}
-
-tui_cmd_window::tui_cmd_window ()
-  : tui_win_info (CMD_WIN)
-{
-}
-
 struct tui_win_info *
 tui_alloc_win_info (enum tui_win_type type)
 {
diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h
index 50e926c42ad..48c92bf99f0 100644
--- a/gdb/tui/tui-data.h
+++ b/gdb/tui/tui-data.h
@@ -346,19 +346,26 @@  protected:
 
 struct tui_data_window : public tui_win_info
 {
-  tui_data_window ();
+  tui_data_window ()
+    : tui_win_info (DATA_WIN)
+  {
+  }
+
   ~tui_data_window () override;
   DISABLE_COPY_AND_ASSIGN (tui_data_window);
 
   void clear_detail () override;
 
-  tui_win_content data_content;	/* Start of data display content.  */
-  int data_content_count;
-  tui_win_content regs_content;	/* Start of regs display content.  */
-  int regs_content_count;
-  int regs_column_count;
-  bool display_regs;		/* Should regs be displayed at all?  */
-  struct reggroup *current_group;
+  /* Start of data display content.  */
+  tui_win_content data_content = NULL;
+  int data_content_count = 0;
+  /* Start of regs display content.  */
+  tui_win_content regs_content = NULL;
+  int regs_content_count = 0;
+  int regs_column_count = 0;
+  /* Should regs be displayed at all?  */
+  bool display_regs = false;
+  struct reggroup *current_group = nullptr;
 
 protected:
 
@@ -372,12 +379,16 @@  protected:
 
 struct tui_cmd_window : public tui_win_info
 {
-  tui_cmd_window ();
+  tui_cmd_window ()
+    : tui_win_info (CMD_WIN)
+  {
+  }
+
   DISABLE_COPY_AND_ASSIGN (tui_cmd_window);
 
   void clear_detail () override;
 
-  int start_line;
+  int start_line = 0;
 
 protected: