aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--epan/column-info.h (renamed from epan/column_info.h)2
-rw-r--r--epan/column-utils.c2
-rw-r--r--epan/column-utils.h2
-rw-r--r--epan/column.c4
-rw-r--r--epan/epan.h2
-rw-r--r--epan/frame_data.h2
-rw-r--r--epan/packet.h2
-rw-r--r--ui/gtk/packet_list.c2
-rw-r--r--ui/gtk/packet_list_store.c2
-rw-r--r--ui/gtk/packet_list_store.h2
-rw-r--r--ui/gtk/prefs_column.c2
-rw-r--r--ui/gtk/prefs_filter_expressions.c2
-rw-r--r--ui/preference_utils.c2
-rw-r--r--ui/qt/column_preferences_frame.cpp2
-rw-r--r--ui/qt/packet_list.cpp2
-rw-r--r--ui/qt/packet_list_model.cpp2
-rw-r--r--ui/qt/packet_list_record.h2
17 files changed, 18 insertions, 18 deletions
diff --git a/epan/column_info.h b/epan/column-info.h
index 5e5c151b9f..6cfb695a2a 100644
--- a/epan/column_info.h
+++ b/epan/column-info.h
@@ -1,4 +1,4 @@
-/* column_info.h
+/* column-info.h
* Definitions for column structures and routines
*
* $Id$
diff --git a/epan/column-utils.c b/epan/column-utils.c
index 3da1cc91fd..9ece8e7f1d 100644
--- a/epan/column-utils.c
+++ b/epan/column-utils.c
@@ -38,7 +38,7 @@
#include "ipv6-utils.h"
#include "osi-utils.h"
#include "value_string.h"
-#include "column_info.h"
+#include "column-info.h"
#include "proto.h"
#include <epan/strutil.h>
diff --git a/epan/column-utils.h b/epan/column-utils.h
index 1ea0fd39ce..e2edd5641a 100644
--- a/epan/column-utils.h
+++ b/epan/column-utils.h
@@ -27,7 +27,7 @@
#include <glib.h>
-#include "column_info.h"
+#include "column-info.h"
#include "packet_info.h"
#include <epan/epan.h>
#include "ws_symbol_export.h"
diff --git a/epan/column.c b/epan/column.c
index fefe9de2c4..d012f8f3ed 100644
--- a/epan/column.c
+++ b/epan/column.c
@@ -39,7 +39,7 @@
#include <epan/column.h>
#include <epan/packet.h>
-/* Given a format number (as defined in column_info.h), returns its equivalent
+/* Given a format number (as defined in column-info.h), returns its equivalent
string */
const gchar *
col_format_to_string(const gint fmt) {
@@ -113,7 +113,7 @@ col_format_to_string(const gint fmt) {
return(slist[fmt]);
}
-/* Given a format number (as defined in column_info.h), returns its
+/* Given a format number (as defined in column-info.h), returns its
description */
const gchar *
col_format_desc(const gint fmt) {
diff --git a/epan/epan.h b/epan/epan.h
index f022cf2fa6..cfa7a4d046 100644
--- a/epan/epan.h
+++ b/epan/epan.h
@@ -30,7 +30,7 @@ extern "C" {
#include <glib.h>
#include "frame_data.h"
-#include "column_info.h"
+#include "column-info.h"
#include "register.h"
#include "ws_symbol_export.h"
diff --git a/epan/frame_data.h b/epan/frame_data.h
index 57f95e5c0b..72f30db7f3 100644
--- a/epan/frame_data.h
+++ b/epan/frame_data.h
@@ -25,7 +25,7 @@
#ifndef __FRAME_DATA_H__
#define __FRAME_DATA_H__
-#include <epan/column_info.h>
+#include <epan/column-info.h>
#include <epan/tvbuff.h>
#include <wsutil/nstime.h>
#include "ws_symbol_export.h"
diff --git a/epan/packet.h b/epan/packet.h
index f5b81bf076..fd75b4ccbf 100644
--- a/epan/packet.h
+++ b/epan/packet.h
@@ -31,7 +31,7 @@
#include "wsutil/pint.h"
#include "to_str.h"
#include "value_string.h"
-#include "column_info.h"
+#include "column-info.h"
#include "frame_data.h"
#include "packet_info.h"
#include "column-utils.h"
diff --git a/ui/gtk/packet_list.c b/ui/gtk/packet_list.c
index b74166388d..8c2d46336e 100644
--- a/ui/gtk/packet_list.c
+++ b/ui/gtk/packet_list.c
@@ -33,7 +33,7 @@
#include <gtk/gtk.h>
#include <glib.h>
-#include <epan/column_info.h>
+#include <epan/column-info.h>
#include <epan/prefs.h>
#include <epan/packet.h>
#include <epan/epan_dissect.h>
diff --git a/ui/gtk/packet_list_store.c b/ui/gtk/packet_list_store.c
index 4aeca56045..cdba760ea4 100644
--- a/ui/gtk/packet_list_store.c
+++ b/ui/gtk/packet_list_store.c
@@ -43,7 +43,7 @@
#include "ui/gtk/old-gtk-compat.h"
#include <epan/epan_dissect.h>
-#include <epan/column_info.h>
+#include <epan/column-info.h>
#include <epan/column.h>
#include "color.h"
diff --git a/ui/gtk/packet_list_store.h b/ui/gtk/packet_list_store.h
index e53dae2f88..fff2164112 100644
--- a/ui/gtk/packet_list_store.h
+++ b/ui/gtk/packet_list_store.h
@@ -30,7 +30,7 @@
#include <glib.h>
-#include "epan/column_info.h"
+#include "epan/column-info.h"
#include "epan/frame_data.h"
/** @file
diff --git a/ui/gtk/prefs_column.c b/ui/gtk/prefs_column.c
index eb634ed781..d95f3cbe9f 100644
--- a/ui/gtk/prefs_column.c
+++ b/ui/gtk/prefs_column.c
@@ -29,7 +29,7 @@
#include <gtk/gtk.h>
#include <epan/prefs.h>
-#include <epan/column_info.h>
+#include <epan/column-info.h>
#include <epan/column.h>
#include <epan/strutil.h>
diff --git a/ui/gtk/prefs_filter_expressions.c b/ui/gtk/prefs_filter_expressions.c
index b0264de9fd..53a465dbbb 100644
--- a/ui/gtk/prefs_filter_expressions.c
+++ b/ui/gtk/prefs_filter_expressions.c
@@ -29,7 +29,7 @@
#include <gtk/gtk.h>
#include <epan/prefs.h>
-#include <epan/column_info.h>
+#include <epan/column-info.h>
#include <epan/column.h>
#include <epan/strutil.h>
#include <epan/filter_expressions.h>
diff --git a/ui/preference_utils.c b/ui/preference_utils.c
index 04aea8c5fc..efcc160a35 100644
--- a/ui/preference_utils.c
+++ b/ui/preference_utils.c
@@ -28,7 +28,7 @@
#include <glib.h>
-#include <epan/column_info.h>
+#include <epan/column-info.h>
#include <epan/column.h>
#include <epan/filesystem.h>
#include <epan/prefs.h>
diff --git a/ui/qt/column_preferences_frame.cpp b/ui/qt/column_preferences_frame.cpp
index 8c7ffcca50..b1f803adc8 100644
--- a/ui/qt/column_preferences_frame.cpp
+++ b/ui/qt/column_preferences_frame.cpp
@@ -27,7 +27,7 @@
#include "color.h"
-#include <epan/column_info.h>
+#include <epan/column-info.h>
#include <epan/column.h>
#include <epan/prefs.h>
#include <epan/proto.h>
diff --git a/ui/qt/packet_list.cpp b/ui/qt/packet_list.cpp
index 0083b51c1f..8ec780ec35 100644
--- a/ui/qt/packet_list.cpp
+++ b/ui/qt/packet_list.cpp
@@ -28,7 +28,7 @@
#include <epan/epan.h>
#include <epan/epan_dissect.h>
-#include <epan/column_info.h>
+#include <epan/column-info.h>
#include <epan/column.h>
#include <epan/packet.h>
diff --git a/ui/qt/packet_list_model.cpp b/ui/qt/packet_list_model.cpp
index b45dff94e5..e30dbbf75b 100644
--- a/ui/qt/packet_list_model.cpp
+++ b/ui/qt/packet_list_model.cpp
@@ -24,7 +24,7 @@
#include "packet_list_model.h"
#include <epan/epan_dissect.h>
-#include <epan/column_info.h>
+#include <epan/column-info.h>
#include <epan/column.h>
#include <wsutil/nstime.h>
#include <epan/prefs.h>
diff --git a/ui/qt/packet_list_record.h b/ui/qt/packet_list_record.h
index e9df17e86a..0a62f36fe8 100644
--- a/ui/qt/packet_list_record.h
+++ b/ui/qt/packet_list_record.h
@@ -28,7 +28,7 @@
#include <glib.h>
-#include <epan/column_info.h>
+#include <epan/column-info.h>
#include <epan/packet.h>
#include <QList>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-12 09:28:25 +0000