sort #includes by directories

svn path=/trunk/; revision=24968
network-analytics · Apr 13, 2008 · 8e3e8b5 · 8e3e8b5
1 parent 0b97c42
commit 8e3e8b5
Show file tree

Hide file tree

Showing 38 changed files with 457 additions and 424 deletions.
diff --git a/gtk/dcerpc_stat.c b/gtk/dcerpc_stat.c
@@ -36,25 +36,25 @@
 #include <string.h>
 
 #include <gtk/gtk.h>
-#include <glib.h>
 
 #include <epan/packet_info.h>
 #include <epan/epan.h>
-
 #include <epan/stat_cmd_args.h>
-#include "../stat_menu.h"
-#include "gui_stat_menu.h"
-#include "simple_dialog.h"
-#include "dlg_utils.h"
-#include "gui_utils.h"
 #include <epan/tap.h>
-#include "../register.h"
 #include <epan/dissectors/packet-dcerpc.h>
+
+#include "../stat_menu.h"
+#include "../simple_dialog.h"
+#include "../register.h"
 #include "../globals.h"
-#include "filter_dlg.h"
-#include "stock_icons.h"
-#include "service_response_time_table.h"
-#include "gtkglobals.h"
+
+#include "gtk/gui_stat_menu.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/gui_utils.h"
+#include "gtk/filter_dlg.h"
+#include "gtk/stock_icons.h"
+#include "gtk/service_response_time_table.h"
+#include "gtk/gtkglobals.h"
 
 
 /* used to keep track of the statistics for an entire program interface */

diff --git a/gtk/decode_as_ber.c b/gtk/decode_as_ber.c
@@ -24,23 +24,24 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#include <string.h>
 
 #include <gtk/gtk.h>
-#include <string.h>
 
-#include "decode_as_dlg.h"
-#include "dlg_utils.h"
-#include "globals.h"
-#include "simple_dialog.h"
 #include <epan/packet.h>
 #include <epan/ipproto.h>
-#include "gui_utils.h"
 #include <epan/epan_dissect.h>
-#include "decode_as_dcerpc.h"
-#include "decode_as_ber.h"
-
 #include <epan/dissectors/packet-ber.h>
 
+#include "../globals.h"
+#include "../simple_dialog.h"
+
+#include "gtk/decode_as_dlg.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/gui_utils.h"
+#include "gtk/decode_as_dcerpc.h"
+#include "gtk/decode_as_ber.h"
+
 
 /**************************************************/
 /* Action routines for the "Decode As..." dialog  */

diff --git a/gtk/decode_as_dcerpc.c b/gtk/decode_as_dcerpc.c
@@ -24,22 +24,23 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#include <string.h>
 
 #include <gtk/gtk.h>
-#include <string.h>
 
-#include "decode_as_dlg.h"
-#include "dlg_utils.h"
-#include "globals.h"
-#include "simple_dialog.h"
 #include <epan/packet.h>
 #include <epan/ipproto.h>
-#include "gui_utils.h"
 #include <epan/epan_dissect.h>
-#include "decode_as_dcerpc.h"
-
 #include <epan/dissectors/packet-dcerpc.h>
 
+#include "../globals.h"
+#include "../simple_dialog.h"
+
+#include "gtk/decode_as_dlg.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/gui_utils.h"
+#include "gtk/decode_as_dcerpc.h"
+
 
 /**************************************************/
 /*                Typedefs & Enums                */

diff --git a/gtk/decode_as_dlg.c b/gtk/decode_as_dlg.c
@@ -25,21 +25,23 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#include <string.h>
 
 #include <gtk/gtk.h>
-#include <string.h>
 
-#include "decode_as_dlg.h"
-#include "dlg_utils.h"
-#include "globals.h"
-#include "simple_dialog.h"
 #include <epan/packet.h>
 #include <epan/ipproto.h>
-#include "gui_utils.h"
 #include <epan/epan_dissect.h>
-#include "decode_as_dcerpc.h"
-#include "decode_as_ber.h"
-#include "help_dlg.h"
+
+#include "../globals.h"
+#include "../simple_dialog.h"
+
+#include "gtk/decode_as_dlg.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/gui_utils.h"
+#include "gtk/decode_as_dcerpc.h"
+#include "gtk/decode_as_ber.h"
+#include "gtk/help_dlg.h"
 
 #undef DEBUG
 

diff --git a/gtk/dfilter_expr_dlg.c b/gtk/dfilter_expr_dlg.c
@@ -42,19 +42,21 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
-#include <gtk/gtk.h>
 #include <ctype.h>
 #include <string.h>
 
-#include "globals.h"
-#include "main.h"
-#include "gui_utils.h"
-#include "simple_dialog.h"
-#include "dlg_utils.h"
-#include "proto_dlg.h"
-#include "filter_dlg.h"
-#include "dfilter_expr_dlg.h"
+#include <gtk/gtk.h>
+
+#include "../globals.h"
+#include "../simple_dialog.h"
+
+#include "gtk/main.h"
+#include "gtk/gui_utils.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/proto_dlg.h"
+#include "gtk/filter_dlg.h"
+#include "gtk/dfilter_expr_dlg.h"
+
 
 #define E_DFILTER_EXPR_TREE_KEY			"dfilter_expr_tree"
 #define E_DFILTER_EXPR_CURRENT_VAR_KEY		"dfilter_expr_current_var"

diff --git a/gtk/dlg_utils.c b/gtk/dlg_utils.c
@@ -25,17 +25,16 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#include <string.h>
+#include <stdarg.h>
 
 #include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
 
-#include "gtkglobals.h"
-#include "gui_utils.h"
-#include "dlg_utils.h"
-#include "stock_icons.h"
+#include "gtk/gtkglobals.h"
+#include "gtk/gui_utils.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/stock_icons.h"
 
-#include <string.h>
-#include <stdarg.h>
 
 static void
 dlg_activate (GtkWidget *widget, gpointer ok_button);

diff --git a/gtk/drag_and_drop.c b/gtk/drag_and_drop.c
@@ -29,26 +29,26 @@
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
+#include <string.h>
+#include <stdio.h>
 
 #include <gtk/gtk.h>
 
-#include "globals.h"
+#include <epan/prefs.h>
 
-#include "gtkglobals.h"
-#include "util.h"
-#include "capture_file_dlg.h"
-#include "file.h"
-#include "simple_dialog.h"
-#include "drag_and_drop.h"
-#include "main.h"
-#include "main_menu.h"
+#include "../globals.h"
+#include "../util.h"
+#include "../file.h"
+#include "../simple_dialog.h"
 #ifdef HAVE_LIBPCAP
-#include "capture.h"
+#include "../capture.h"
 #endif
-#include <epan/prefs.h>
 
-#include <string.h>
-#include <stdio.h>
+#include "gtk/gtkglobals.h"
+#include "gtk/capture_file_dlg.h"
+#include "gtk/drag_and_drop.h"
+#include "gtk/main.h"
+#include "gtk/main_menu.h"
 
 
 enum { DND_TARGET_STRING, DND_TARGET_ROOTWIN, DND_TARGET_URL };

diff --git a/gtk/expert_comp_dlg.c b/gtk/expert_comp_dlg.c
@@ -29,22 +29,26 @@
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
-
 #include <string.h>
+
 #include <gtk/gtk.h>
+
 #include <epan/packet_info.h>
 #include <epan/tap.h>
+#include <epan/stat_cmd_args.h>
+
 #include "../register.h"
 #include "../simple_dialog.h"
-#include "gui_utils.h"
-#include "dlg_utils.h"
 #include "../globals.h"
-#include "expert_comp_table.h"
 #include "../stat_menu.h"
-#include "gui_stat_menu.h"
-#include <epan/stat_cmd_args.h>
-#include "help_dlg.h"
-#include "expert_comp_dlg.h"
+
+#include "gtk/gui_utils.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/expert_comp_table.h"
+#include "gtk/gui_stat_menu.h"
+#include "gtk/help_dlg.h"
+#include "gtk/expert_comp_dlg.h"
+
 
 /* used to keep track of the statistics for an entire program interface */
 typedef struct _expert_comp_dlg_t {

diff --git a/gtk/expert_comp_table.c b/gtk/expert_comp_table.c
@@ -33,21 +33,25 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
+
 #include <gtk/gtk.h>
+
 #include "epan/packet_info.h"
-#include "expert_comp_table.h"
+#include <epan/expert.h>
+#include <epan/emem.h>
 
-#include "simple_dialog.h"
-#include "globals.h"
+#include "../simple_dialog.h"
+#include "../globals.h"
+#include "../color.h"
+
+#include "gtk/expert_comp_table.h"
 #include "gtk/find_dlg.h"
-#include "color.h"
 #include "gtk/color_dlg.h"
-#include "main.h"
-#include "gui_utils.h"
-#include "gtkglobals.h"
-#include "webbrowser.h"
-#include <epan/expert.h>
-#include <epan/emem.h>
+#include "gtk/main.h"
+#include "gtk/gui_utils.h"
+#include "gtk/gtkglobals.h"
+#include "gtk/webbrowser.h"
+
 
 #define GTK_MENU_FUNC(a) ((GtkItemFactoryCallback)(a))
 

diff --git a/gtk/expert_dlg.c b/gtk/expert_dlg.c
@@ -27,38 +27,39 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-
-#include <epan/packet.h>
-#include <epan/expert.h>
-#include <epan/emem.h>
-#include <epan/tap.h>
-
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
+
 #include <gtk/gtk.h>
+
+#include <epan/packet.h>
+#include <epan/expert.h>
+#include <epan/emem.h>
+#include <epan/tap.h>
 #include "epan/packet_info.h"
+#include <epan/stat_cmd_args.h>
+#include <epan/prefs.h>
+
+#include "../simple_dialog.h"
+#include "../globals.h"
+#include "../color.h"
+#include "../stat_menu.h"
 #include "image/clist_ascend.xpm"
 #include "image/clist_descend.xpm"
-#include "simple_dialog.h"
-#include "globals.h"
+
 #include "gtk/find_dlg.h"
-#include "color.h"
 #include "gtk/color_dlg.h"
-#include "main.h"
-#include "gui_utils.h"
-#include "gtkglobals.h"
-#include "dlg_utils.h"
-#include "../stat_menu.h"
-#include "gui_stat_menu.h"
-#include "tap_dfilter_dlg.h"
-#include <epan/stat_cmd_args.h>
-
-#include <epan/prefs.h>
-#include "colors.h"
-#include "main_proto_draw.h"
-#include "help_dlg.h"
+#include "gtk/main.h"
+#include "gtk/gui_utils.h"
+#include "gtk/gtkglobals.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/gui_stat_menu.h"
+#include "gtk/tap_dfilter_dlg.h"
+#include "gtk/colors.h"
+#include "gtk/main_proto_draw.h"
+#include "gtk/help_dlg.h"
 
 
 static const value_string expert_severity_om_vals[] = {