Rename new_stat_tap_ui to stat_tap_table_ui.

A "new" statistics tap UI is a statistics tap UI where the statistics
are maintained as tables and common code handles the tables; what
matters is the tables, not that it's "new".

Change-Id: I7a0e63cfac98c24cd5e7dce973b9a0cc5b6a03ba
Reviewed-on: https://code.wireshark.org/review/12897
Reviewed-by: Guy Harris <guy@alum.mit.edu>

5 files changed, 15 insertions, 15 deletions

diff --git a/ui/cli/tap-simple_stattable.c b/ui/cli/tap-simple_stattable.c
index 54569687c7..e6a8e3cea7 100644
--- a/ui/cli/tap-simple_stattable.c
+++ b/ui/cli/tap-simple_stattable.c
@@ -101,7 +101,7 @@ simple_draw(void *arg)
 }
 
 static void
-init_stat_table(new_stat_tap_ui *new_stat_tap, const char *filter)
+init_stat_table(stat_tap_table_ui *new_stat_tap, const char *filter)
 {
 	GString *error_string;
 	table_stat_t* ui;
@@ -125,7 +125,7 @@ init_stat_table(new_stat_tap_ui *new_stat_tap, const char *filter)
 static void
 simple_stat_init(const char *opt_arg, void* userdata)
 {
-	new_stat_tap_ui *new_stat_tap = (new_stat_tap_ui*)userdata;
+	stat_tap_table_ui *new_stat_tap = (stat_tap_table_ui*)userdata;
 	const char *filter=NULL;
 	char* err = NULL;
 
@@ -143,7 +143,7 @@ simple_stat_init(const char *opt_arg, void* userdata)
 void
 register_simple_stat_tables(gpointer data, gpointer user_data _U_)
 {
-	new_stat_tap_ui *new_stat_tap = (new_stat_tap_ui*)data;
+	stat_tap_table_ui *new_stat_tap = (stat_tap_table_ui*)data;
 	stat_tap_ui ui_info;
 
 	ui_info.group = new_stat_tap->group;
diff --git a/ui/gtk/simple_stattable.c b/ui/gtk/simple_stattable.c
index 87a7a0e224..669815d916 100644
--- a/ui/gtk/simple_stattable.c
+++ b/ui/gtk/simple_stattable.c
@@ -51,7 +51,7 @@ typedef struct _gtk_simplestat_t {
 typedef struct _simple_stat_t {
 	const char *filter;
 	gtk_simplestat_t_t gtk_data;
-	new_stat_tap_ui *new_stat_tap;
+	stat_tap_table_ui *new_stat_tap;
 	new_stat_data_t data;
 } simple_stat_t;
 
@@ -193,7 +193,7 @@ simple_stat_reset(void *arg)
 }
 
 static void
-init_simple_stat_tables(new_stat_tap_ui *new_stat_tap, const char *filter)
+init_simple_stat_tables(stat_tap_table_ui *new_stat_tap, const char *filter)
 {
 	simple_stat_t *ss;
 	GString *error_string;
@@ -248,7 +248,7 @@ init_simple_stat_tables(new_stat_tap_ui *new_stat_tap, const char *filter)
 static void
 gtk_simple_stat_init(const char *opt_arg, void *userdata)
 {
-	new_stat_tap_ui *new_stat_tap = (new_stat_tap_ui*)userdata;
+	stat_tap_table_ui *new_stat_tap = (stat_tap_table_ui*)userdata;
 	const char *filter=NULL;
 	char* err;
 
@@ -266,7 +266,7 @@ gtk_simple_stat_init(const char *opt_arg, void *userdata)
 
 void register_simple_stat_tables(gpointer data, gpointer user_data _U_)
 {
-	new_stat_tap_ui *new_stat_tap = (new_stat_tap_ui*)data;
+	stat_tap_table_ui *new_stat_tap = (stat_tap_table_ui*)data;
 	tap_param_dlg* stat_dlg;
 
 	stat_dlg = g_new(tap_param_dlg, 1);
diff --git a/ui/gtk/simple_stattable.h b/ui/gtk/simple_stattable.h
index 6256947d2e..88da1e07e5 100644
--- a/ui/gtk/simple_stattable.h
+++ b/ui/gtk/simple_stattable.h
@@ -29,7 +29,7 @@
 
 /** Register function to register dissectors that support a "simple" statistics table.
  *
- * @param data new_stat_tap_ui* representing dissetor stat table
+ * @param data stat_tap_table_ui* representing dissetor stat table
  * @param user_data is unused
  */
 void register_simple_stat_tables(gpointer data, gpointer user_data);
diff --git a/ui/qt/simple_statistics_dialog.cpp b/ui/qt/simple_statistics_dialog.cpp
index 2ea4a27aec..a950482045 100644
--- a/ui/qt/simple_statistics_dialog.cpp
+++ b/ui/qt/simple_statistics_dialog.cpp
@@ -32,7 +32,7 @@
 // To do:
 // - Hide rows with zero counts.
 
-static QHash<const QString, new_stat_tap_ui *> cfg_str_to_stu_;
+static QHash<const QString, stat_tap_table_ui *> cfg_str_to_stu_;
 
 extern "C" {
 static void
@@ -50,7 +50,7 @@ simple_stat_init(const char *args, void*) {
 }
 
 void register_simple_stat_tables(gpointer data, gpointer) {
-    new_stat_tap_ui *stu = (new_stat_tap_ui*)data;
+    stat_tap_table_ui *stu = (stat_tap_table_ui*)data;
 
     cfg_str_to_stu_[stu->cli_string] = stu;
     TapParameterDialog::registerDialog(
@@ -154,7 +154,7 @@ private:
     const stat_tap_table_item_type *fields_;
 };
 
-SimpleStatisticsDialog::SimpleStatisticsDialog(QWidget &parent, CaptureFile &cf, struct _new_stat_tap_ui *stu, const QString filter, int help_topic) :
+SimpleStatisticsDialog::SimpleStatisticsDialog(QWidget &parent, CaptureFile &cf, struct _stat_tap_table_ui *stu, const QString filter, int help_topic) :
     TapParameterDialog(parent, cf, help_topic),
     stu_(stu)
 {
@@ -182,7 +182,7 @@ TapParameterDialog *SimpleStatisticsDialog::createSimpleStatisticsDialog(QWidget
         return NULL;
     }
 
-    new_stat_tap_ui *stu = cfg_str_to_stu_[cfg_str];
+    stat_tap_table_ui *stu = cfg_str_to_stu_[cfg_str];
 
     return new SimpleStatisticsDialog(parent, cf, stu, filter);
 }
diff --git a/ui/qt/simple_statistics_dialog.h b/ui/qt/simple_statistics_dialog.h
index 5513112d9e..47d1388514 100644
--- a/ui/qt/simple_statistics_dialog.h
+++ b/ui/qt/simple_statistics_dialog.h
@@ -31,7 +31,7 @@ class SimpleStatisticsDialog : public TapParameterDialog
     Q_OBJECT
 
 public:
-    SimpleStatisticsDialog(QWidget &parent, CaptureFile &cf, struct _new_stat_tap_ui *stu, const QString filter, int help_topic = 0);
+    SimpleStatisticsDialog(QWidget &parent, CaptureFile &cf, struct _stat_tap_table_ui *stu, const QString filter, int help_topic = 0);
     static TapParameterDialog *createSimpleStatisticsDialog(QWidget &parent, const QString cfg_str, const QString filter, CaptureFile &cf);
 
 protected:
@@ -43,7 +43,7 @@ protected:
     void addMissingRows(struct _new_stat_data_t *stat_data);
 
 private:
-    struct _new_stat_tap_ui *stu_;
+    struct _stat_tap_table_ui *stu_;
 
     // Callbacks for register_tap_listener
     static void tapReset(void *sd_ptr);
@@ -56,7 +56,7 @@ private slots:
 
 /** Register function to register dissectors that support a "simple" statistics table.
  *
- * @param data new_stat_tap_ui* representing dissetor stat table
+ * @param data stat_tap_table_ui* representing dissetor stat table
  */
 void register_simple_stat_tables(gpointer data, gpointer);