aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorJörg Mayer <jmayer@loplof.de>2013-10-18 13:06:05 +0000
committerJörg Mayer <jmayer@loplof.de>2013-10-18 13:06:05 +0000
commit662c7704f871f58bf85421701d04f0881a6a1bd8 (patch)
tree728a31b72d35b8fd85bc7a86ce3c5be397526c6a /ui
parent2197f291e536036c386acde07a6bead9a636434c (diff)
After looking for something in the column-*.h files and
not finding it, I finally found it in column_info.h Renamed column_info.h to column-info.h to have consistency with the column*h files. svn path=/trunk/; revision=52667
Diffstat (limited to 'ui')
-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
10 files changed, 10 insertions, 10 deletions
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>