Remove trailing whitespace

Change-Id: I8116f63ff88687c8db3fd6e8e23b22ab2f759af0
Reviewed-on: https://code.wireshark.org/review/385
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>

83 files changed, 214 insertions, 214 deletions

diff --git a/ui/cli/tap-dcerpcstat.c b/ui/cli/tap-dcerpcstat.c
index 71a8393844..5e05b0270e 100644
--- a/ui/cli/tap-dcerpcstat.c
+++ b/ui/cli/tap-dcerpcstat.c
@@ -152,7 +152,7 @@ dcerpcstat_draw(void *prs)
 	printf("%s Major Version %u SRT Statistics:\n", rs->prog, rs->ver);
 	printf("Filter: %s\n",rs->filter?rs->filter:"");
 	printf("Procedure                        Calls    Min SRT    Max SRT    Avg SRT\n");
-	
+
 	for(i=0;i<rs->num_procedures;i++){
 		/* Only display procs with non-zero calls */
 		if(rs->procedures[i].num==0){
diff --git a/ui/cli/tap-funnel.c b/ui/cli/tap-funnel.c
index b9a4982d18..71a6b915c0 100644
--- a/ui/cli/tap-funnel.c
+++ b/ui/cli/tap-funnel.c
@@ -23,7 +23,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include "config.h"
@@ -49,18 +49,18 @@ static funnel_text_window_t* new_text_window(const gchar* title) {
     funnel_text_window_t* tw = g_new(funnel_text_window_t,1);
     tw->title = g_strdup(title);
     tw->text = g_string_new("");
-    
+
     if (!text_windows)
         text_windows = g_ptr_array_new();
-    
+
     g_ptr_array_add(text_windows,tw);
-    
+
     return tw;
 }
 
 static void text_window_clear(funnel_text_window_t*  tw) {
     g_string_free(tw->text,TRUE);
-    tw->text = g_string_new("");    
+    tw->text = g_string_new("");
 }
 
 static void text_window_append(funnel_text_window_t*  tw, const char *text ) {
@@ -73,7 +73,7 @@ static void text_window_set_text(funnel_text_window_t*  tw, const char* text) {
 }
 
 static void text_window_prepend(funnel_text_window_t*  tw, const char *text) {
-    g_string_prepend(tw->text,text);    
+    g_string_prepend(tw->text,text);
 }
 
 static const gchar* text_window_get_text(funnel_text_window_t*  tw) {
@@ -127,18 +127,18 @@ void initialize_funnel_ops(void) {
 
 void funnel_dump_all_text_windows(void) {
     guint i;
-    
+
     if (!text_windows) return;
-    
+
     for ( i = 0 ; i < text_windows->len; i++) {
         funnel_text_window_t*  tw = (funnel_text_window_t*)g_ptr_array_index(text_windows,i);
         printf("\n========================== %s "
                "==========================\n%s\n",tw->title,tw->text->str);
-        
+
         g_ptr_array_remove_index(text_windows,i);
         g_free(tw->title);
         g_string_free(tw->text,TRUE);
-        g_free(tw);        
+        g_free(tw);
     }
 }
 
@@ -152,18 +152,18 @@ typedef struct _menu_cb_t {
 
 
 static void  init_funnel_cmd(const char *opt_arg, void* data ) {
-    gchar** args = g_strsplit(opt_arg,",",0); 
+    gchar** args = g_strsplit(opt_arg,",",0);
     gchar** arg;
     menu_cb_t* mcb = data;
-    
+
     for(arg = args; *arg ; arg++) {
         g_strstrip(*arg);
     }
-    
+
     if (mcb->callback) {
         mcb->callback(mcb->callback_data);
     }
-    
+
 }
 
 static void register_menu_cb(const char *name,
@@ -172,7 +172,7 @@ static void register_menu_cb(const char *name,
                              gpointer callback_data,
                              gboolean retap _U_) {
     menu_cb_t* mcb = g_malloc(sizeof(menu_cb_t));
-    
+
     mcb->callback = callback;
     mcb->callback_data = callback_data;
 
@@ -180,7 +180,7 @@ static void register_menu_cb(const char *name,
         menus = g_hash_table_new(g_str_hash,g_str_equal);
 
     g_hash_table_insert(menus,g_strdup(name),mcb);
-    
+
     register_stat_cmd_arg(name,init_funnel_cmd,mcb);
 }
 
diff --git a/ui/cli/tap-iousers.c b/ui/cli/tap-iousers.c
index 4c7ebbf9e8..890598cc9a 100644
--- a/ui/cli/tap-iousers.c
+++ b/ui/cli/tap-iousers.c
@@ -129,7 +129,7 @@ iousers_process_name_packet_with_conv_id(
 }
 
 static void
-iousers_process_address_packet(io_users_t *iu, const address *src, const address *dst, guint64 pkt_len, 
+iousers_process_address_packet(io_users_t *iu, const address *src, const address *dst, guint64 pkt_len,
 								nstime_t *ts)
 {
 	const address *addr1, *addr2;
@@ -209,7 +209,7 @@ iousers_udpip_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, con
 	}
 
 	iousers_process_name_packet(iu, name1, name2, direction, pinfo->fd->pkt_len, &pinfo->rel_ts, &pinfo->fd->abs_ts);
-	
+
 	return 1;
 }
 
diff --git a/ui/cli/tap-rlcltestat.c b/ui/cli/tap-rlcltestat.c
index 70220df125..02291eb8ae 100644
--- a/ui/cli/tap-rlcltestat.c
+++ b/ui/cli/tap-rlcltestat.c
@@ -322,7 +322,7 @@ rlc_lte_stat_draw(void *phs)
            hs->common_stats.pcch_frames, hs->common_stats.pcch_bytes);
 
     /* Per-UE table entries */
-    
+
 
     /* Set title that shows how many UEs currently in table */
     for (tmp = list; (tmp!=NULL); tmp=tmp->next, number_of_ues++);
diff --git a/ui/cli/tap-rtspstat.c b/ui/cli/tap-rtspstat.c
index 1a57e9488b..fbb52fe659 100644
--- a/ui/cli/tap-rtspstat.c
+++ b/ui/cli/tap-rtspstat.c
@@ -1,5 +1,5 @@
 /* tap-rtspstat.c
- * tap-rtspstat   March 2011 
+ * tap-rtspstat   March 2011
  *
  * Stephane GORSE (Orange Labs / France Telecom)
  * Copied from Jean-Michel FAYARD's works (HTTP)
@@ -9,17 +9,17 @@
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -71,8 +71,8 @@ rtsp_init_hash( rtspstat_t *sp)
 {
 	int i;
 
-	sp->hash_responses = g_hash_table_new( g_int_hash, g_int_equal);		
-			
+	sp->hash_responses = g_hash_table_new( g_int_hash, g_int_equal);
+
 	for (i=0 ; rtsp_status_code_vals[i].strptr ; i++ )
 	{
 		gint *key = g_new (gint,1);
@@ -91,7 +91,7 @@ rtsp_draw_hash_requests( gchar *key _U_ , rtsp_request_methode_t *data, gchar *
 {
 	if (data->packets==0)
 		return;
-	printf( format, data->response, data->packets); 		
+	printf( format, data->response, data->packets);
 }
 
 static void
@@ -106,9 +106,9 @@ rtsp_draw_hash_responses( gint * key _U_ , rtsp_response_code_t *data, char * fo
 	/* "     RTSP %3d %-35s %9d packets", */
 	printf(format,  data->response_code, data->name, data->packets );
 }
-		
 
-		
+
+
 /* NOT USED at this moment */
 /*
 static void
@@ -120,12 +120,12 @@ rtsp_free_hash( gpointer key, gpointer value, gpointer user_data _U_ )
 */
 static void
 rtsp_reset_hash_responses(gchar *key _U_ , rtsp_response_code_t *data, gpointer ptr _U_ )
-{	
+{
 	data->packets = 0;
 }
 static void
 rtsp_reset_hash_requests(gchar *key _U_ , rtsp_request_methode_t *data, gpointer ptr _U_ )
-{	
+{
 	data->packets = 0;
 }
 
@@ -152,8 +152,8 @@ rtspstat_packet(void *psp , packet_info *pinfo _U_, epan_dissect_t *edt _U_, con
 		rtsp_response_code_t *sc;
 
 		*key=value->response_code;
-		sc =  (rtsp_response_code_t *)g_hash_table_lookup( 
-				sp->hash_responses, 
+		sc =  (rtsp_response_code_t *)g_hash_table_lookup(
+				sp->hash_responses,
 				key);
 		if (sc==NULL){
 			/* non standard status code ; we classify it as others
@@ -178,19 +178,19 @@ rtspstat_packet(void *psp , packet_info *pinfo _U_, epan_dissect_t *edt _U_, con
 			else{
 				*key=599;
 			}
-			sc =  (rtsp_response_code_t *)g_hash_table_lookup( 
-				sp->hash_responses, 
+			sc =  (rtsp_response_code_t *)g_hash_table_lookup(
+				sp->hash_responses,
 				key);
 			if (sc==NULL)
 				return 0;
 		}
 		sc->packets++;
-	} 
+	}
 	else if (value->request_method){
 		rtsp_request_methode_t *sc;
 
-		sc =  (rtsp_request_methode_t *)g_hash_table_lookup( 
-				sp->hash_requests, 
+		sc =  (rtsp_request_methode_t *)g_hash_table_lookup(
+				sp->hash_requests,
 				value->request_method);
 		if (sc==NULL){
 			sc=g_new(rtsp_request_methode_t,1);
@@ -238,13 +238,13 @@ gtk_rtspstat_init(const char *opt_arg,void* userdata _U_)
 	rtspstat_t *sp;
 	const char *filter=NULL;
 	GString	*error_string;
-	
+
 	if (!strncmp (opt_arg, "rtsp,stat,", 10)){
 		filter=opt_arg+10;
 	} else {
 		filter=NULL;
 	}
-	
+
 	sp = (rtspstat_t *)g_malloc( sizeof(rtspstat_t) );
 	if(filter){
 		sp->filter=g_strdup(filter);
@@ -254,7 +254,7 @@ gtk_rtspstat_init(const char *opt_arg,void* userdata _U_)
 	/*g_hash_table_foreach( rtsp_status, (GHFunc)rtsp_reset_hash_responses, NULL);*/
 
 
-	error_string = register_tap_listener( 
+	error_string = register_tap_listener(
 			"rtsp",
 			sp,
 			filter,
diff --git a/ui/cli/tap-stats_tree.c b/ui/cli/tap-stats_tree.c
index 345e898579..722f1ff6fe 100644
--- a/ui/cli/tap-stats_tree.c
+++ b/ui/cli/tap-stats_tree.c
@@ -7,17 +7,17 @@
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -46,7 +46,7 @@ struct _tree_pres {
 };
 
 struct _tree_cfg_pres {
-	gchar *init_string;	
+	gchar *init_string;
 };
 
 static void
@@ -54,12 +54,12 @@ draw_stats_tree(void *psp)
 {
 	stats_tree *st = (stats_tree *)psp;
 	GString *s;
-	
+
 	s= stats_tree_format_as_str(st, ST_FORMAT_PLAIN, stats_tree_get_default_sort_col(st),
 				stats_tree_is_default_sort_DESC(st));
 
 	printf("%s",s->str);
-	g_string_free(s,TRUE);	
+	g_string_free(s,TRUE);
 }
 
 static void
@@ -69,7 +69,7 @@ init_stats_tree(const char *opt_arg, void *userdata _U_)
 	GString	*error_string;
 	stats_tree_cfg *cfg = NULL;
 	stats_tree *st = NULL;
-	
+
 	if (abbr) {
 		cfg = stats_tree_get_cfg_by_abbr(abbr);
 
@@ -84,14 +84,14 @@ init_stats_tree(const char *opt_arg, void *userdata _U_)
 			report_failure("no such stats_tree (%s) found in stats_tree registry",abbr);
 			return;
 		}
-		
+
 		g_free(abbr);
-		
+
 	} else {
-		report_failure("could not obtain stats_tree abbr (%s) from arg '%s'",abbr,opt_arg);		
+		report_failure("could not obtain stats_tree abbr (%s) from arg '%s'",abbr,opt_arg);
 		return;
 	}
-	
+
 	error_string = register_tap_listener(st->cfg->tapname,
 					     st,
 					     st->filter,
@@ -99,7 +99,7 @@ init_stats_tree(const char *opt_arg, void *userdata _U_)
 					     stats_tree_reset,
 					     stats_tree_packet,
 					     draw_stats_tree);
-	
+
 	if (error_string) {
 		report_failure("stats_tree for: %s failed to attach to the tap: %s",cfg->name,error_string->str);
 		return;
@@ -113,12 +113,12 @@ static void
 register_stats_tree_tap (gpointer k _U_, gpointer v, gpointer p _U_)
 {
 	stats_tree_cfg *cfg = (stats_tree_cfg *)v;
-	
+
 	cfg->pr = (tree_cfg_pres *)g_malloc(sizeof(tree_cfg_pres));
 	cfg->pr->init_string = g_strdup_printf("%s,tree", cfg->abbr);
 
 	register_stat_cmd_arg(cfg->pr->init_string, init_stats_tree, NULL);
-	
+
 }
 
 static void
diff --git a/ui/gtk/color_dlg.c b/ui/gtk/color_dlg.c
index 3b57eaa000..5259524e84 100644
--- a/ui/gtk/color_dlg.c
+++ b/ui/gtk/color_dlg.c
@@ -1019,7 +1019,7 @@ color_clear_cb(GtkWidget *widget, gpointer data _U_) {
 }
 
 
-static void 
+static void
 overwrite_existing_colorfilters_cb(gpointer dialog _U_, gint btn, gpointer data _U_)
 {
 	switch (btn) {
diff --git a/ui/gtk/conversation_hastables_dlg.c b/ui/gtk/conversation_hastables_dlg.c
index 7f6648b87c..32514383b8 100644
--- a/ui/gtk/conversation_hastables_dlg.c
+++ b/ui/gtk/conversation_hastables_dlg.c
@@ -54,7 +54,7 @@ static GtkWidget *conversation_hastables_dlg_w = NULL;
  * Compute the hash value for two given address/port pairs if the match
  * is to be exact.
  */
-/* http://eternallyconfuzzled.com/tuts/algorithms/jsw_tut_hashing.aspx#existing 
+/* http://eternallyconfuzzled.com/tuts/algorithms/jsw_tut_hashing.aspx#existing
  * One-at-a-Time hash
  */
 static guint
@@ -152,7 +152,7 @@ conversation_info_to_texbuff(GtkTextBuffer *buffer)
 
 	conversation_hashtable_exact = get_conversation_hashtable_exact();
 	if(conversation_hashtable_exact){
-		g_snprintf(string_buff, CONV_STR_BUF_MAX, "conversation_hashtable_exact %i entries\n#\n", 
+		g_snprintf(string_buff, CONV_STR_BUF_MAX, "conversation_hashtable_exact %i entries\n#\n",
 			g_hash_table_size(conversation_hashtable_exact));
 		gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
 		g_hash_table_foreach( conversation_hashtable_exact, conversation_hashtable_exact_to_texbuff, buffer);
@@ -160,7 +160,7 @@ conversation_info_to_texbuff(GtkTextBuffer *buffer)
 
 	conversation_hashtable_no_addr2 = get_conversation_hashtable_no_addr2();
 	if(conversation_hashtable_no_addr2){
-		g_snprintf(string_buff, CONV_STR_BUF_MAX, "conversation_hashtable_no_addr2 %i entries\n#\n", 
+		g_snprintf(string_buff, CONV_STR_BUF_MAX, "conversation_hashtable_no_addr2 %i entries\n#\n",
 			g_hash_table_size(conversation_hashtable_no_addr2));
 		gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
 
@@ -168,7 +168,7 @@ conversation_info_to_texbuff(GtkTextBuffer *buffer)
 
 	conversation_hashtable_no_port2 = get_conversation_hashtable_no_port2();
 	if(conversation_hashtable_no_port2){
-		g_snprintf(string_buff, CONV_STR_BUF_MAX, "conversation_hashtable_no_port2 %i entries\n#\n", 
+		g_snprintf(string_buff, CONV_STR_BUF_MAX, "conversation_hashtable_no_port2 %i entries\n#\n",
 			g_hash_table_size(conversation_hashtable_no_port2));
 		gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
 
@@ -176,7 +176,7 @@ conversation_info_to_texbuff(GtkTextBuffer *buffer)
 
 	conversation_hashtable_no_addr2_or_port2 = get_conversation_hashtable_no_addr2_or_port2();
 	if(conversation_hashtable_no_addr2_or_port2){
-		g_snprintf(string_buff, CONV_STR_BUF_MAX, "conversation_hashtable_no_addr2_or_port2 %i entries\n#\n", 
+		g_snprintf(string_buff, CONV_STR_BUF_MAX, "conversation_hashtable_no_addr2_or_port2 %i entries\n#\n",
 			g_hash_table_size(conversation_hashtable_no_addr2_or_port2));
 		gtk_text_buffer_insert_at_cursor (buffer, string_buff, -1);
 
diff --git a/ui/gtk/decode_as_dlg.c b/ui/gtk/decode_as_dlg.c
index 9b4ae16c21..bbb96faa8e 100644
--- a/ui/gtk/decode_as_dlg.c
+++ b/ui/gtk/decode_as_dlg.c
@@ -161,7 +161,7 @@ write_da_entry(gpointer item, gpointer user_data)
   da_entry_t *entry = (da_entry_t *)item;
   FILE *daf = (FILE *)user_data;
   gchar *selector_str = g_strdup_printf("%d", entry->selector);
-  
+
   decode_as_write_entry(daf, entry->table, selector_str, entry->initial, entry->current);
   g_free(selector_str);
 }
@@ -456,7 +456,7 @@ decode_show_save_cb (GtkWidget *win _U_, gpointer user_data _U_)
   FILE        *daf = decode_as_open();
 
   if (!daf) return;
-  
+
   g_slist_foreach(da_entries, write_da_entry, daf);
 
   fclose(daf);
@@ -977,7 +977,7 @@ decode_add_multivalue_combo_box (GtkWidget *page, decode_as_t *entry)
     gchar prompt[MAX_DECODE_AS_PROMPT_LEN];
 
     combo_box = ws_combo_box_new_text_and_pointer();
-    
+
     for (value = 0; value < entry->num_items; value++)
     {
         entry->values[value].label_func(&cfile.edt->pi, prompt);
@@ -1219,7 +1219,7 @@ decode_add_simple_menu (GtkWidget *page, decode_as_t *entry)
  * @return GtkWidget * A pointer to the notebook page created by this
  * routine.
  */
-static GtkWidget *    
+static GtkWidget *
 decode_add_simple_page (decode_as_t *entry)
 {
     GtkWidget  *page, *label, *scrolled_window, *combo_box;
diff --git a/ui/gtk/diameter_stat.c b/ui/gtk/diameter_stat.c
index c59c212472..5ccf3bb99f 100644
--- a/ui/gtk/diameter_stat.c
+++ b/ui/gtk/diameter_stat.c
@@ -184,11 +184,11 @@ gtk_diameterstat_init(const char *opt_arg, void *userdata _U_)
 	init_srt_table_row(&diameter->diameter_srt_table, 0, "Unknown");
 
 	error_string=register_tap_listener(
-		"diameter", 
-		diameter, filter, 
-		TL_REQUIRES_PROTO_TREE, 
-		diameterstat_reset, 
-		diameterstat_packet, 
+		"diameter",
+		diameter, filter,
+		TL_REQUIRES_PROTO_TREE,
+		diameterstat_reset,
+		diameterstat_packet,
 		diameterstat_draw);
 
 	if(error_string){
diff --git a/ui/gtk/dissector_tables_dlg.h b/ui/gtk/dissector_tables_dlg.h
index e0276a7052..2466332454 100644
--- a/ui/gtk/dissector_tables_dlg.h
+++ b/ui/gtk/dissector_tables_dlg.h
@@ -6,17 +6,17 @@
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/ui/gtk/edit_packet_comment_dlg.c b/ui/gtk/edit_packet_comment_dlg.c
index 0765d7f59e..062ed614be 100644
--- a/ui/gtk/edit_packet_comment_dlg.c
+++ b/ui/gtk/edit_packet_comment_dlg.c
@@ -251,7 +251,7 @@ edit_capture_comment_dlg_launch (void)
   gtk_widget_show (edit_or_add_capture_comment_dlg);
 
 }
-    
+
 
 void
 edit_capture_comment_dlg_hide(void)
diff --git a/ui/gtk/expert_comp_dlg.h b/ui/gtk/expert_comp_dlg.h
index d7a9240af9..e597a4849f 100644
--- a/ui/gtk/expert_comp_dlg.h
+++ b/ui/gtk/expert_comp_dlg.h
@@ -6,17 +6,17 @@
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/ui/gtk/expert_comp_table.h b/ui/gtk/expert_comp_table.h
index 3e4c0eaa0f..03036a37b1 100644
--- a/ui/gtk/expert_comp_table.h
+++ b/ui/gtk/expert_comp_table.h
@@ -1,6 +1,6 @@
 /* expert_comp_table.h
  * expert_comp_table   2005 Greg Morris
- * Portions copied from service_response_time_table.h by Ronnie Sahlberg 
+ * Portions copied from service_response_time_table.h by Ronnie Sahlberg
  * Helper routines common to all composite expert statistics
  * tap.
  *
@@ -9,17 +9,17 @@
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/ui/gtk/export_sslkeys.c b/ui/gtk/export_sslkeys.c
index a6a2e2f4cd..9538e6b200 100644
--- a/ui/gtk/export_sslkeys.c
+++ b/ui/gtk/export_sslkeys.c
@@ -127,7 +127,7 @@ gtk_export_sslkeys_file(guint keylist_len)
      * Build the dialog box we need.
      */
     savesslkeys_dlg = file_selection_new("Wireshark: Export SSL Session Keys",
-                                         GTK_WINDOW(top_level), 
+                                         GTK_WINDOW(top_level),
                                          FILE_SELECTION_SAVE);
 
     /* label */
diff --git a/ui/gtk/file_dlg.h b/ui/gtk/file_dlg.h
index f0c0106dbf..cd48771cf5 100644
--- a/ui/gtk/file_dlg.h
+++ b/ui/gtk/file_dlg.h
@@ -24,7 +24,7 @@
 
 /** @defgroup filesel_dialog_group File Selection Dialogs
  *
- * Dialogs are specially created windows and are related to their parent windows (usually the main window). 
+ * Dialogs are specially created windows and are related to their parent windows (usually the main window).
  * See: @ref howto_window_page for details.
  *
  * File selection dialogs are created using file_selection_new().
@@ -39,7 +39,7 @@
  * - "Save Data As CSV" save_csv_as_cb()
  * - "Save Payload As ..." on_save_bt_clicked()
  * - "Save selected stream in rtpdump" rtpstream_on_save()
- * 
+ *
  */
 
 /** @file
@@ -57,7 +57,7 @@ typedef enum {
 	FILE_SELECTION_READ_BROWSE,     /**< browse for a file to read */
 	FILE_SELECTION_SAVE,            /**< save/export a file */
 	FILE_SELECTION_WRITE_BROWSE,    /**< browse for a file to write to */
-	FILE_SELECTION_CREATE_FOLDER    /**< browse for a dir. to save in */  
+	FILE_SELECTION_CREATE_FOLDER    /**< browse for a dir. to save in */
 } file_selection_action_t;
 
 /** Create a file selection dialog box window that belongs to a top-level
@@ -88,7 +88,7 @@ extern gboolean file_selection_set_current_folder(GtkWidget *fs, const gchar *fi
 #define file_selection_set_current_file(chooser, filename) \
 	gtk_file_chooser_set_filename(chooser, filename)
 
-/** Set the "extra" widget for a file selection dialog. This is needed to support 
+/** Set the "extra" widget for a file selection dialog. This is needed to support
  *  user-supplied options.
  *
  * @param fs the file selection dialog from file_selection_new()
diff --git a/ui/gtk/filter_autocomplete.c b/ui/gtk/filter_autocomplete.c
index 3513ba5075..5bd4c81a0e 100644
--- a/ui/gtk/filter_autocomplete.c
+++ b/ui/gtk/filter_autocomplete.c
@@ -76,7 +76,7 @@ is_protocol_name_being_typed(GtkWidget *filter_te, int str_len)
   int op_len, cursor_pos;
   gchar *start;
   gchar *pos;
-  static const gchar *logic_ops[] = 
+  static const gchar *logic_ops[] =
               { "!", "not",
                 "||", "or",
                 "&&", "and",
diff --git a/ui/gtk/filter_autocomplete.h b/ui/gtk/filter_autocomplete.h
index ae5a73c30c..336ef094f5 100644
--- a/ui/gtk/filter_autocomplete.h
+++ b/ui/gtk/filter_autocomplete.h
@@ -22,7 +22,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */ 
+ */
 
 #ifndef _FILTER_AUTO_COMPLETE_H_
 #define _FILTER_AUTO_COMPLETE_H_
diff --git a/ui/gtk/filter_dlg.c b/ui/gtk/filter_dlg.c
index e1963027b4..7db090107c 100644
--- a/ui/gtk/filter_dlg.c
+++ b/ui/gtk/filter_dlg.c
@@ -1280,7 +1280,7 @@ colorize_filter_te_as_empty(GtkWidget *w)
     gtk_widget_override_color(w, GTK_STATE_FLAG_NORMAL, NULL);
     gtk_widget_override_background_color(w, GTK_STATE_FLAG_NORMAL, NULL);
     gtk_widget_override_cursor(w, NULL, NULL);
-#else    
+#else
     /* use defaults */
     gtk_widget_modify_text(w, GTK_STATE_NORMAL, NULL);
     gtk_widget_modify_base(w, GTK_STATE_NORMAL, NULL);
diff --git a/ui/gtk/firewall_dlg.c b/ui/gtk/firewall_dlg.c
index 3a065fd7b0..623dd9fe28 100644
--- a/ui/gtk/firewall_dlg.c
+++ b/ui/gtk/firewall_dlg.c
@@ -297,7 +297,7 @@ firewall_rule_cb(GtkWidget *w _U_, gpointer data _U_)
 
     /* Make sure this widget gets destroyed if we quit the main loop,
        so that if we exit, we clean up any temporary files we have
-       for "Follow SSL Stream" windows. 
+       for "Follow SSL Stream" windows.
        gtk_quit_add_destroy is deprecated and should not be used in newly-written code. This function is going to be removed in GTK+ 3.0
 
        gtk_quit_add_destroy(gtk_main_level(), GTK_OBJECT(rule_w));
diff --git a/ui/gtk/follow_stream.c b/ui/gtk/follow_stream.c
index 79bf7547e1..ab56567bd7 100644
--- a/ui/gtk/follow_stream.c
+++ b/ui/gtk/follow_stream.c
@@ -838,8 +838,8 @@ follow_stream(const gchar *title, follow_info_t *follow_info,
 
     /* Make sure this widget gets destroyed if we quit the main loop,
        so that if we exit, we clean up any temporary files we have
-       for "Follow TCP Stream" windows. 
-       gtk_quit_add_destroy is deprecated and should not be used in newly-written code. 
+       for "Follow TCP Stream" windows.
+       gtk_quit_add_destroy is deprecated and should not be used in newly-written code.
        This function is going to be removed in GTK+ 3.0
        gtk_quit_add_destroy(gtk_main_level(), GTK_OBJECT(streamwindow));
        */
diff --git a/ui/gtk/font_utils.h b/ui/gtk/font_utils.h
index 47214da69b..0fc5fb4477 100644
--- a/ui/gtk/font_utils.h
+++ b/ui/gtk/font_utils.h
@@ -24,12 +24,12 @@
 
 
 /** @file
- * Utilities for font manipulation. 
+ * Utilities for font manipulation.
  *
  * There are two different fonts used:
  * - the application font for menu's, dialog's and such
  * - the user font for the packet panes
- * 
+ *
  * The user font is also available in regular (m_r_font) and bold (m_b_font) versions.
  */
 
@@ -46,7 +46,7 @@ typedef enum {
 	FA_FONT_NOT_AVAILABLE   /**< the chosen font isn't available */
 } fa_ret_t;
 
-/** Applies a new user font, corresponding to the preferences font name and recent zoom level. 
+/** Applies a new user font, corresponding to the preferences font name and recent zoom level.
  *  Will also redraw the screen.
  *
  * @return if the new font could be set or not
diff --git a/ui/gtk/graph_analysis.c b/ui/gtk/graph_analysis.c
index 2314009466..fe5ebcf1f9 100644
--- a/ui/gtk/graph_analysis.c
+++ b/ui/gtk/graph_analysis.c
@@ -1111,7 +1111,7 @@ mouse_scrolled(GtkWidget *widget _U_, GdkEventScroll *event, gpointer data)
 	GtkAdjustment *adjustment;
 	gdouble v_scroll_items;
 	GtkAllocation draw_area_alloc, scroll_window_alloc;
-	
+
 	if (event->direction == GDK_SCROLL_UP) {
 		adjustment = user_data->dlg.v_scrollbar_adjustment;
 		v_scroll_items = pow(gtk_adjustment_get_page_size(adjustment), 2.0/3.0);
@@ -1122,7 +1122,7 @@ mouse_scrolled(GtkWidget *widget _U_, GdkEventScroll *event, gpointer data)
 			gtk_adjustment_set_value(adjustment, gtk_adjustment_get_value(adjustment) - v_scroll_items);
 		}
 	}
-	
+
 	else if (event->direction == GDK_SCROLL_DOWN) {
 		adjustment = user_data->dlg.v_scrollbar_adjustment;
 		v_scroll_items = pow (gtk_adjustment_get_page_size(adjustment), 2.0/3.0);
@@ -1133,7 +1133,7 @@ mouse_scrolled(GtkWidget *widget _U_, GdkEventScroll *event, gpointer data)
 			gtk_adjustment_set_value(adjustment, gtk_adjustment_get_value(adjustment) + v_scroll_items);
 		}
 	}
-	
+
 	else if (event->direction == GDK_SCROLL_LEFT) {
 		if (widget == user_data->dlg.scroll_window) {
 			scroll_window = user_data->dlg.scroll_window;
@@ -1151,7 +1151,7 @@ mouse_scrolled(GtkWidget *widget _U_, GdkEventScroll *event, gpointer data)
 		}
 		gtk_scrolled_window_set_hadjustment(GTK_SCROLLED_WINDOW(scroll_window), adjustment);
 	}
-	
+
 	else if (event->direction == GDK_SCROLL_RIGHT) {
 		if (widget == user_data->dlg.scroll_window) {
 			scroll_window = user_data->dlg.scroll_window;
@@ -1519,7 +1519,7 @@ static void create_draw_area(graph_analysis_data_t *user_data, GtkWidget *box)
 	/* creating time scroll window to enable mouse scroll */
 	user_data->dlg.scroll_window_time = gtk_scrolled_window_new(NULL, NULL);
 	gtk_widget_set_size_request(user_data->dlg.scroll_window_time, TIME_WIDTH, user_data->dlg.surface_height);
-	
+
 	/* create "comments" draw area */
 	user_data->dlg.draw_area_comments = gtk_drawing_area_new();
 	gtk_widget_set_size_request(user_data->dlg.draw_area_comments, COMMENT_WIDTH, user_data->dlg.surface_height);
@@ -1529,12 +1529,12 @@ static void create_draw_area(graph_analysis_data_t *user_data, GtkWidget *box)
 	 * Set the scrollbar policy for the horizontal and vertical scrollbars
 	 * The policy determines when the scrollbar should appear
 	 */
-	
+
 	/* we only want mouse scroll from this window */
 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW (user_data->dlg.scroll_window_time),
 		GTK_POLICY_NEVER, /* Policy for horizontal bar. */
 		GTK_POLICY_NEVER); /* Policy for vertical bar */
-	
+
 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW (user_data->dlg.scroll_window_comments),
 		GTK_POLICY_ALWAYS, /* Policy for horizontal bar. */
 		GTK_POLICY_NEVER); /* Policy for vertical bar */
@@ -1542,7 +1542,7 @@ static void create_draw_area(graph_analysis_data_t *user_data, GtkWidget *box)
 	/* Changes the type of shadow drawn around the contents of scrolled_window. */
 	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(user_data->dlg.scroll_window_time),
 		GTK_SHADOW_ETCHED_IN);
-	
+
 	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(user_data->dlg.scroll_window_comments),
 		GTK_SHADOW_ETCHED_IN);
 
diff --git a/ui/gtk/hostlist_table.h b/ui/gtk/hostlist_table.h
index 08f1017261..abd3e99309 100644
--- a/ui/gtk/hostlist_table.h
+++ b/ui/gtk/hostlist_table.h
@@ -44,8 +44,8 @@ typedef struct _hostlist_talker_t {
 	guint64 rx_bytes;       /**< number of received bytes */
 	guint64 tx_bytes;       /**< number of transmitted bytes */
 
-        gboolean modified;      /**< new to redraw the row */   
-        GtkTreeIter iter; 
+        gboolean modified;      /**< new to redraw the row */
+        GtkTreeIter iter;
         gboolean iter_valid;    /**< not a new row */
 
 } hostlist_talker_t;
diff --git a/ui/gtk/iax2_analysis.h b/ui/gtk/iax2_analysis.h
index 5bcbdc3089..ea0c23f052 100644
--- a/ui/gtk/iax2_analysis.h
+++ b/ui/gtk/iax2_analysis.h
@@ -38,7 +38,7 @@
 #include <epan/packet_info.h>
 
 /** @file
- *  ??? 
+ *  ???
  *  @todo what's this?
  */
 
@@ -60,7 +60,7 @@ typedef struct _iax2_bw_history_item {
         guint32 bytes;
 } iax2_bw_history_item;
 
-#define BUFF_BW 300 
+#define BUFF_BW 300
 
 typedef struct _tap_iax2_stat_t {
 	gboolean first_packet;     /* do not use in code that is called after rtp_packet_analyse */
diff --git a/ui/gtk/macros_dlg.c b/ui/gtk/macros_dlg.c
index 41b1445946..082eff9224 100644
--- a/ui/gtk/macros_dlg.c
+++ b/ui/gtk/macros_dlg.c
@@ -5,17 +5,17 @@
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2001 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/ui/gtk/macros_dlg.h b/ui/gtk/macros_dlg.h
index 1a4e50c4ed..36caffea2c 100644
--- a/ui/gtk/macros_dlg.h
+++ b/ui/gtk/macros_dlg.h
@@ -5,17 +5,17 @@
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2001 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c
index 3d5f681001..cdd705e5d8 100644
--- a/ui/gtk/main_menubar.c
+++ b/ui/gtk/main_menubar.c
@@ -4227,7 +4227,7 @@ add_tap_plugins (guint merge_id, GtkUIManager *ui_manager)
     gchar          *stat_name_buf;
     gchar          *stat_name;
     gchar          *sep;
-        
+
     action_group = gtk_action_group_new ("tap-plugins-group");
 
     submenu_statistics = gtk_ui_manager_get_widget(ui_manager_main_menubar, MENU_STATISTICS_PATH);
@@ -4280,7 +4280,7 @@ add_tap_plugins (guint merge_id, GtkUIManager *ui_manager)
                     stat_name= sep;
                 }
             }
-        
+
             action_name = g_strdup_printf("%s/%s", submenu_path, cfg->abbr);
             action = (GtkAction *)g_object_new (GTK_TYPE_ACTION,
                  "name", action_name,
@@ -5003,7 +5003,7 @@ set_menus_for_selected_packet(capture_file *cf)
             } else if (!strcmp(proto_name, "sctp")) {
                 is_sctp = TRUE;
             }
-            
+
             protos = wmem_list_frame_next(protos);
         }
     }
diff --git a/ui/gtk/main_titlebar.h b/ui/gtk/main_titlebar.h
index b7362c4929..b1ade8eb54 100644
--- a/ui/gtk/main_titlebar.h
+++ b/ui/gtk/main_titlebar.h
@@ -26,7 +26,7 @@
 #define __MAIN_TITLEBAR_H__
 
 /** Construct the main window's title with the current main_window_name optionally appended
- *  with the user-specified title and/or wireshark version. 
+ *  with the user-specified title and/or wireshark version.
  *  Display the result in the main window's title bar and in its icon title
  */
 extern void main_titlebar_update(void);
diff --git a/ui/gtk/main_toolbar.c b/ui/gtk/main_toolbar.c
index e629937c8e..a18f0af28b 100644
--- a/ui/gtk/main_toolbar.c
+++ b/ui/gtk/main_toolbar.c
@@ -77,7 +77,7 @@ static GtkToolItem *resize_columns_button;
 static GtkToolItem *color_display_button, *prefs_button, *help_button;
 
 /*
- * Redraw all toolbars 
+ * Redraw all toolbars
  */
 void
 toolbar_redraw_all(void)
diff --git a/ui/gtk/main_toolbar.h b/ui/gtk/main_toolbar.h
index df8b188262..b32ea82c2a 100644
--- a/ui/gtk/main_toolbar.h
+++ b/ui/gtk/main_toolbar.h
@@ -35,8 +35,8 @@
 /** Redraw the main toolbar. Used, when user changes preferences. */
 void toolbar_redraw_all(void);
 
-/** Set object data of some buttons (where needed). It's needed so callback 
- *  functions can read back their required data. Acts like g_object_set_data() 
+/** Set object data of some buttons (where needed). It's needed so callback
+ *  functions can read back their required data. Acts like g_object_set_data()
  *  on multiple buttons.
  *
  * @param key the key
diff --git a/ui/gtk/old-gtk-compat.h b/ui/gtk/old-gtk-compat.h
index 770b2d7f1d..cc94c44056 100644
--- a/ui/gtk/old-gtk-compat.h
+++ b/ui/gtk/old-gtk-compat.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Definitions to provide some functions that are not present in older
  * GTK versions (down to 2.12.0)
  *
diff --git a/ui/gtk/packet_win.c b/ui/gtk/packet_win.c
index 5e78b9e65b..1aac3ba09d 100644
--- a/ui/gtk/packet_win.c
+++ b/ui/gtk/packet_win.c
@@ -919,7 +919,7 @@ void new_packet_window(GtkWidget *w _U_, gboolean reference, gboolean editable _
 		  *bv_nb_ptr;
 	struct PacketWinData *DataPtr;
 	frame_data *fd;
-	
+
 	if(reference) {
 		guint32            framenum;
 		header_field_info *hfinfo;
diff --git a/ui/gtk/pixmap_save.h b/ui/gtk/pixmap_save.h
index 54ab558d98..9fcf1288bf 100644
--- a/ui/gtk/pixmap_save.h
+++ b/ui/gtk/pixmap_save.h
@@ -7,17 +7,17 @@
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/ui/gtk/prefs_dlg.c b/ui/gtk/prefs_dlg.c
index c76f0670be..428f431abf 100644
--- a/ui/gtk/prefs_dlg.c
+++ b/ui/gtk/prefs_dlg.c
@@ -1419,15 +1419,15 @@ prefs_main_save(gpointer parent_w)
     const gchar *msg3 = "that version of Wireshark, ";
     const gchar *msg4 = "an older or nonstandard Wireshark version, ";
     const gchar *msg5 = "click 'Continue without Saving' and save this profile under a another name.\n";
-    
+
     if (prefs.saved_at_version) {
       gulong tot_msg_len = 246 + (gulong)strlen(prefs.saved_at_version) + 1;
-      
+
       msg = (gchar *)g_malloc(tot_msg_len);
       g_snprintf(msg, tot_msg_len, "%s\"%s\". %s%s%s",
         msg1, prefs.saved_at_version, msg2, msg3, msg5);
       dialog = simple_dialog(ESD_TYPE_CONFIRMATION, ESD_BTNS_SAVE_DONTSAVE, "%s", msg);
-    } else { 
+    } else {
       msg = (gchar *)g_malloc(214);
 
       g_snprintf(msg, 214, "%s%s%s", msg2, msg4, msg5);
@@ -1436,7 +1436,7 @@ prefs_main_save(gpointer parent_w)
 
     simple_dialog_set_cb(dialog, overwrite_existing_prefs_cb, parent_w);
     g_free(msg);
-    
+
   } else {
     prefs_main_write();
   }
diff --git a/ui/gtk/proto_dlg.c b/ui/gtk/proto_dlg.c
index 304ffe844d..fd21fc492d 100644
--- a/ui/gtk/proto_dlg.c
+++ b/ui/gtk/proto_dlg.c
@@ -364,7 +364,7 @@ proto_cb(GtkWidget *w _U_, gpointer data _U_)
   GtkWidget *main_vb, *main_nb, *page_lb, *protocols_page;
 #if defined(HEUR_DISSECTOR_LIST)
   GtkWidget *heur_dissectors_page;
-#endif            
+#endif
   if (proto_w != NULL) {
     reactivate_window(proto_w);
     return;
diff --git a/ui/gtk/proto_dlg.h b/ui/gtk/proto_dlg.h
index d9f7820953..76611c76db 100644
--- a/ui/gtk/proto_dlg.h
+++ b/ui/gtk/proto_dlg.h
@@ -33,14 +33,14 @@
  */
 
 /** Show the enabled protocols dialog.
- * 
+ *
  * @param widget parent widget (unused)
  * @param data unused
  */
 void proto_cb(GtkWidget *widget, gpointer data);
 
 /** Disable (temporarily) the selected protocol.
- * 
+ *
  * @param widget parent widget (unused)
  * @param data unused
  */
diff --git a/ui/gtk/proto_hier_stats_dlg.h b/ui/gtk/proto_hier_stats_dlg.h
index 258dc34885..84058141b7 100644
--- a/ui/gtk/proto_hier_stats_dlg.h
+++ b/ui/gtk/proto_hier_stats_dlg.h
@@ -30,7 +30,7 @@
  */
 
 /** Show protocol hierarchy statistics.
- * 
+ *
  * @param widget parent widget (unused)
  * @param data unused
  */
diff --git a/ui/gtk/proto_hier_tree_model.c b/ui/gtk/proto_hier_tree_model.c
index fb71c34afd..17b7f404a1 100644
--- a/ui/gtk/proto_hier_tree_model.c
+++ b/ui/gtk/proto_hier_tree_model.c
@@ -320,7 +320,7 @@ proto_hier_tree_get_path(GtkTreeModel *tree_model, GtkTreeIter *iter)
 
 	int p_id;
 	void *cookie;
-	
+
 	g_return_val_if_fail(PROTOHIER_IS_TREE(tree_model), NULL);
 	model = (ProtoHierTreeModel *) tree_model;
 
@@ -438,7 +438,7 @@ proto_hier_tree_class_init(ProtoHierTreeModelClass *klass)
 	object_class->finalize = _class_finalize;
 }
 
-GType 
+GType
 proto_hier_tree_get_type(void)
 {
 	static GType proto_hier_tree_type = 0;
diff --git a/ui/gtk/proto_tree_model.c b/ui/gtk/proto_tree_model.c
index e9348fbab7..b7d4db9484 100644
--- a/ui/gtk/proto_tree_model.c
+++ b/ui/gtk/proto_tree_model.c
@@ -159,7 +159,7 @@ fi_get_string(field_info *fi)
 	if (!fi->rep) {
 		label_ptr = label_str;
 		proto_item_fill_label(fi, label_str);
-	} else 
+	} else
 		label_ptr = fi->rep->representation;
 
 	if (FI_GET_FLAG(fi, FI_GENERATED)) {
@@ -415,7 +415,7 @@ proto_tree_model_class_init(ProtoTreeModelClass *klass)
 	object_class->finalize = _class_finalize;
 }
 
-GType 
+GType
 proto_tree_model_get_type(void)
 {
 	static GType proto_tree_type = 0;
@@ -453,7 +453,7 @@ proto_tree_model_get_type(void)
 	return proto_tree_type;
 }
 
-void 
+void
 proto_tree_model_force_resolv(ProtoTreeModel *model, const e_addr_resolve *flags)
 {
 	model->resolv_forced = TRUE;
diff --git a/ui/gtk/sat.h b/ui/gtk/sat.h
index e1fb4eb789..ac489b9986 100644
--- a/ui/gtk/sat.h
+++ b/ui/gtk/sat.h
@@ -7,17 +7,17 @@
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/ui/gtk/sctp_assoc_analyse.c b/ui/gtk/sctp_assoc_analyse.c
index 72296813b1..d930384619 100644
--- a/ui/gtk/sctp_assoc_analyse.c
+++ b/ui/gtk/sctp_assoc_analyse.c
@@ -355,7 +355,7 @@ update_analyse_dlg(struct sctp_analyse *u_data)
 			GtkListStore *list_store;
 
 			store = (address *)(list->data);
-			if (store->type != AT_NONE) {			
+			if (store->type != AT_NONE) {
 				if (store->type == AT_IPv4)
 				{
 					g_snprintf(field[0], 30, "%s", ip_to_str((const guint8 *)(store->data)));
diff --git a/ui/gtk/sctp_stat_gtk.h b/ui/gtk/sctp_stat_gtk.h
index 517caae8d1..8cff204fd1 100644
--- a/ui/gtk/sctp_stat_gtk.h
+++ b/ui/gtk/sctp_stat_gtk.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright 2004-2013, Irene Ruengeler <i.ruengeler [AT] fh-muenster.de>
  *
  * $Id$
@@ -21,7 +21,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
- 
+
 #ifndef __SCTP_STAT_GTK_H__
 #define __SCTP_STAT_GTK_H__
 
diff --git a/ui/gtk/service_response_time_table.h b/ui/gtk/service_response_time_table.h
index f6505a6522..ae7e4d1924 100644
--- a/ui/gtk/service_response_time_table.h
+++ b/ui/gtk/service_response_time_table.h
@@ -8,17 +8,17 @@
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -48,7 +48,7 @@ typedef struct _srt_stat_table {
 	GtkWidget *scrolled_window; /**< window widget */
 	GtkTreeView  *table;        /**< Tree view */
 	GtkWidget *menu;            /**< context menu */
-	char *filter_string;        /**< append procedure number (%d) to this string 
+	char *filter_string;        /**< append procedure number (%d) to this string
 				to create a display filter */
 	int num_procs;              /**< number of elements on procedures array */
 	srt_procedure_t *procedures;/**< the procedures array */
diff --git a/ui/gtk/smb2_stat.c b/ui/gtk/smb2_stat.c
index 72a4e03e34..406d43c504 100644
--- a/ui/gtk/smb2_stat.c
+++ b/ui/gtk/smb2_stat.c
@@ -88,11 +88,11 @@ smb2stat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, const vo
 	/* SMB2 SRT can be very inaccurate in the presence of retransmissions. Retransmitted responses
 	 * not only add additional (bogus) transactions but also the latency associated with them.
 	 * This can greatly inflate the maximum and average SRT stats especially in the case of
-	 * retransmissions triggered by the expiry of the rexmit timer (RTOs). Only calculating SRT 
-	 * for the last received response accomplishes this goal without requiring the TCP pref 
+	 * retransmissions triggered by the expiry of the rexmit timer (RTOs). Only calculating SRT
+	 * for the last received response accomplishes this goal without requiring the TCP pref
 	 * "Do not call subdissectors for error packets" to be set. */
 	if(si->saved->frame_req
-	&& si->saved->frame_res==pinfo->fd->num) 
+	&& si->saved->frame_res==pinfo->fd->num)
 		add_srt_table_data(&ss->smb2_srt_table, si->opcode, &si->saved->req_time, pinfo);
 	else
 		return 0;
diff --git a/ui/gtk/stats_tree_stat.c b/ui/gtk/stats_tree_stat.c
index 57495d9b0c..87ef8a7b8e 100644
--- a/ui/gtk/stats_tree_stat.c
+++ b/ui/gtk/stats_tree_stat.c
@@ -383,7 +383,7 @@ st_sort_func(GtkTreeModel *model,
 	gint result;
 
 	gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (user_data), &sort_column, &order);
-														
+
 	gtk_tree_model_get(model, a, NODEPTR_COLUMN, &node_a, -1);
 	gtk_tree_model_get(model, b, NODEPTR_COLUMN, &node_b, -1);
 
@@ -589,7 +589,7 @@ register_tap_listener_stats_tree_stat(void)
 
 void gtk_stats_tree_cb(GtkAction *action, gpointer user_data _U_)
 {
-	const gchar *action_name; 
+	const gchar *action_name;
 	gchar *abbr;
 	stats_tree_cfg* cfg = NULL;
 
diff --git a/ui/gtk/uat_gui.h b/ui/gtk/uat_gui.h
index 9837d0e69d..f60a4e865f 100644
--- a/ui/gtk/uat_gui.h
+++ b/ui/gtk/uat_gui.h
@@ -5,23 +5,23 @@
  *
  *  User Accessible Tables GUI
  *  Mantain an array of user accessible data strucures
- *  
+ *
  * (c) 2007, Luis E. Garcia Ontanon <luis@ontanon.org>
  *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2001 Gerald Combs
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/ui/gtk/voip_calls.c b/ui/gtk/voip_calls.c
index 448bfcec0d..acc7b44950 100644
--- a/ui/gtk/voip_calls.c
+++ b/ui/gtk/voip_calls.c
@@ -211,7 +211,7 @@ void voip_calls_reset(voip_calls_tapinfo_t *tapinfo)
 		g_free(graph_item->comment);
 		g_free((void *)graph_item->src_addr.data);
 		g_free((void *)graph_item->dst_addr.data);
-		g_free(graph_item->time_str);        
+		g_free(graph_item->time_str);
 		g_free(list->data);
 		list = g_list_next(list);
 	}
diff --git a/ui/gtk/voip_calls.h b/ui/gtk/voip_calls.h
index 9ff41a2a0e..bfcd30f070 100644
--- a/ui/gtk/voip_calls.h
+++ b/ui/gtk/voip_calls.h
@@ -100,7 +100,7 @@ typedef struct _h245_address {
 typedef struct _h323_calls_info {
 	e_guid_t *guid;	/* Call ID to identify a H225 */
 	GList*  h245_list;				/**< list of H245 Address and ports for tunneling off calls*/
-	address h225SetupAddr;			/**< we use the SETUP H225 IP to determine if packets are forward or reverse */					
+	address h225SetupAddr;			/**< we use the SETUP H225 IP to determine if packets are forward or reverse */
 	gboolean is_h245;
 	gboolean is_faststart_Setup;	/**< if faststart field is included in Setup*/
 	gboolean is_faststart_Proc;		/**< if faststart field is included in Proce, Alerting, Progress or Connect*/
@@ -149,7 +149,7 @@ typedef struct _voip_calls_info {
 	gchar *call_comment;
 	guint16 call_num;
 	/**> The frame_data struct holds the frame number and timing information needed. */
-	frame_data *start_fd; 
+	frame_data *start_fd;
 	nstime_t start_rel_ts;
 	frame_data *stop_fd;
 	nstime_t stop_rel_ts;
@@ -157,7 +157,7 @@ typedef struct _voip_calls_info {
 
 } voip_calls_info_t;
 
-/** 
+/**
  * structure that holds the information about all detected calls */
 /* struct holding all information of the tap */
 
@@ -174,7 +174,7 @@ typedef struct _voip_calls_tapinfo {
 	seq_analysis_info_t* graph_analysis;
 	gboolean reversed;
 	gboolean redraw;
-	/* 
+	/*
 	 * Now add dummy variables, one for each tap listener.
 	 * Their address will be used to distinguish between them.
 	 */
diff --git a/ui/gtk/voip_calls_dlg.h b/ui/gtk/voip_calls_dlg.h
index bccfcb8195..794e48d1f2 100644
--- a/ui/gtk/voip_calls_dlg.h
+++ b/ui/gtk/voip_calls_dlg.h
@@ -9,7 +9,7 @@
  * based on h323_conversations_dlg.h
  * Copyright 2004, Iskratel, Ltd, Kranj
  * By Miha Jemec <m.jemec@iskratel.si>
- * 
+ *
  * H323, RTP and Graph Support
  * By Alejandro Vaquero, alejandro.vaquero@verso.com
  * Copyright 2005, Verso Technologies Inc.
diff --git a/ui/iface_lists.c b/ui/iface_lists.c
index caccbfb419..a55318cf5f 100644
--- a/ui/iface_lists.c
+++ b/ui/iface_lists.c
@@ -360,8 +360,8 @@ scan_local_interfaces(void (*update_cb)(void))
 }
 
 /*
- * Get the global interface list.  Generate it if we haven't done so 
- * already.  This can be quite time consuming the first time, so 
+ * Get the global interface list.  Generate it if we haven't done so
+ * already.  This can be quite time consuming the first time, so
  * record how long it takes in the info log.
  */
 void
@@ -375,7 +375,7 @@ fill_in_local_interfaces(void(*update_cb)(void))
 	/* record the time we started, so we can log total time later */
 	g_get_current_time(&start_time);
 	g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_INFO, "fill_in_local_interfaces() starts");
-	
+
     if (!initialized) {
 		/* do the actual work */
         scan_local_interfaces(update_cb);
diff --git a/ui/preference_utils.c b/ui/preference_utils.c
index 602412b5ff..5100c00ccb 100644
--- a/ui/preference_utils.c
+++ b/ui/preference_utils.c
@@ -317,7 +317,7 @@ column_prefs_remove_link(GList *col_link)
     fmt_data *cfmt;
 
     if (!col_link || !col_link->data) return;
-    
+
     cfmt = (fmt_data *) col_link->data;
 
     g_free(cfmt->title);
diff --git a/ui/qt/accordion_frame.h b/ui/qt/accordion_frame.h
index a4d5a87e55..699e0151fb 100644
--- a/ui/qt/accordion_frame.h
+++ b/ui/qt/accordion_frame.h
@@ -36,7 +36,7 @@ public:
     void animatedHide();
 
 signals:
-    
+
 public slots:
 
 private:
@@ -45,7 +45,7 @@ private:
 
 private slots:
     void animationFinished();
-    
+
 };
 
 #endif // ACCORDION_FRAME_H
diff --git a/ui/qt/capture_preferences_frame.h b/ui/qt/capture_preferences_frame.h
index 670253a850..6905959629 100644
--- a/ui/qt/capture_preferences_frame.h
+++ b/ui/qt/capture_preferences_frame.h
@@ -35,11 +35,11 @@ class CapturePreferencesFrame;
 class CapturePreferencesFrame : public QFrame
 {
     Q_OBJECT
-    
+
 public:
     explicit CapturePreferencesFrame(QWidget *parent = 0);
     ~CapturePreferencesFrame();
-    
+
 protected:
     void showEvent(QShowEvent *evt);
 
diff --git a/ui/qt/column_preferences_frame.h b/ui/qt/column_preferences_frame.h
index 24d1e4e16c..ae0c09136c 100644
--- a/ui/qt/column_preferences_frame.h
+++ b/ui/qt/column_preferences_frame.h
@@ -35,13 +35,13 @@ class ColumnPreferencesFrame;
 class ColumnPreferencesFrame : public QFrame
 {
     Q_OBJECT
-    
+
 public:
     explicit ColumnPreferencesFrame(QWidget *parent = 0);
     ~ColumnPreferencesFrame();
 
     void unstash();
-    
+
 protected:
     void keyPressEvent(QKeyEvent *evt);
 
diff --git a/ui/qt/elided_label.h b/ui/qt/elided_label.h
index 9821586323..3455f8719c 100644
--- a/ui/qt/elided_label.h
+++ b/ui/qt/elided_label.h
@@ -43,7 +43,7 @@ private:
     void updateText();
 
 signals:
-    
+
 public slots:
     void clear();
     void setText(const QString &text);
diff --git a/ui/qt/export_dissection_dialog.h b/ui/qt/export_dissection_dialog.h
index 3dc2cfb1be..f67afece40 100644
--- a/ui/qt/export_dissection_dialog.h
+++ b/ui/qt/export_dissection_dialog.h
@@ -44,11 +44,11 @@
 class ExportDissectionDialog : public QFileDialog
 {
     Q_OBJECT
-    
+
 public:
     explicit ExportDissectionDialog(QWidget *parent, capture_file *cap_file, export_type_e export_type);
     ~ExportDissectionDialog();
-    
+
 public slots:
     int exec();
 
diff --git a/ui/qt/export_object_dialog.h b/ui/qt/export_object_dialog.h
index 7c5ce0ac68..992ed6815d 100644
--- a/ui/qt/export_object_dialog.h
+++ b/ui/qt/export_object_dialog.h
@@ -55,7 +55,7 @@ struct _export_object_list_t {
 class ExportObjectDialog : public QDialog
 {
     Q_OBJECT
-    
+
 public:
     enum ObjectType { Dicom, Http, Smb };
 
diff --git a/ui/qt/filter_expressions_preferences_frame.h b/ui/qt/filter_expressions_preferences_frame.h
index 90ee5a38aa..19482980f5 100644
--- a/ui/qt/filter_expressions_preferences_frame.h
+++ b/ui/qt/filter_expressions_preferences_frame.h
@@ -35,7 +35,7 @@ class FilterExpressionsPreferencesFrame;
 class FilterExpressionsPreferencesFrame : public QFrame
 {
     Q_OBJECT
-    
+
 public:
     explicit FilterExpressionsPreferencesFrame(QWidget *parent = 0);
     ~FilterExpressionsPreferencesFrame();
diff --git a/ui/qt/font_color_preferences_frame.h b/ui/qt/font_color_preferences_frame.h
index f7630a0e5a..e533ebef9b 100644
--- a/ui/qt/font_color_preferences_frame.h
+++ b/ui/qt/font_color_preferences_frame.h
@@ -36,11 +36,11 @@ class FontColorPreferencesFrame;
 class FontColorPreferencesFrame : public QFrame
 {
     Q_OBJECT
-    
+
 public:
     explicit FontColorPreferencesFrame(QWidget *parent = 0);
     ~FontColorPreferencesFrame();
-    
+
 protected:
     void showEvent(QShowEvent *evt);
 
diff --git a/ui/qt/import_text_dialog.h b/ui/qt/import_text_dialog.h
index 6abb68a9a6..abe0b25565 100644
--- a/ui/qt/import_text_dialog.h
+++ b/ui/qt/import_text_dialog.h
@@ -45,12 +45,12 @@ class ImportTextDialog;
 class ImportTextDialog : public QDialog
 {
     Q_OBJECT
-    
+
 public:
     explicit ImportTextDialog(QWidget *parent = 0);
     ~ImportTextDialog();
     QString &capfileName();
-    
+
 private:
     void convertTextFile();
     void enableHeaderWidgets(bool enable_buttons = true);
diff --git a/ui/qt/main_window_preferences_frame.h b/ui/qt/main_window_preferences_frame.h
index b94bf05359..50d9885e58 100644
--- a/ui/qt/main_window_preferences_frame.h
+++ b/ui/qt/main_window_preferences_frame.h
@@ -35,11 +35,11 @@ class MainWindowPreferencesFrame;
 class MainWindowPreferencesFrame : public QFrame
 {
     Q_OBJECT
-    
+
 public:
     explicit MainWindowPreferencesFrame(QWidget *parent = 0);
     ~MainWindowPreferencesFrame();
-    
+
 protected:
     void showEvent(QShowEvent *evt);
 
diff --git a/ui/qt/packet_comment_dialog.h b/ui/qt/packet_comment_dialog.h
index 2822841e0b..ecd679ba2e 100644
--- a/ui/qt/packet_comment_dialog.h
+++ b/ui/qt/packet_comment_dialog.h
@@ -33,12 +33,12 @@ class PacketCommentDialog;
 class PacketCommentDialog : public QDialog
 {
     Q_OBJECT
-    
+
 public:
     explicit PacketCommentDialog(QWidget *parent = 0, QString comment = QString());
     ~PacketCommentDialog();
     QString text();
-    
+
 private slots:
     void on_buttonBox_helpRequested();
 
diff --git a/ui/qt/packet_format_group_box.h b/ui/qt/packet_format_group_box.h
index f16e7f23ab..2371050bb1 100644
--- a/ui/qt/packet_format_group_box.h
+++ b/ui/qt/packet_format_group_box.h
@@ -34,7 +34,7 @@ class PacketFormatGroupBox;
 class PacketFormatGroupBox : public QGroupBox
 {
     Q_OBJECT
-    
+
 public:
     explicit PacketFormatGroupBox(QWidget *parent = 0);
     ~PacketFormatGroupBox();
diff --git a/ui/qt/packet_range_group_box.h b/ui/qt/packet_range_group_box.h
index 371d63dca2..f633dcfc6b 100644
--- a/ui/qt/packet_range_group_box.h
+++ b/ui/qt/packet_range_group_box.h
@@ -40,7 +40,7 @@ class PacketRangeGroupBox;
 class PacketRangeGroupBox : public QGroupBox
 {
     Q_OBJECT
-    
+
 public:
     explicit PacketRangeGroupBox(QWidget *parent = 0);
     ~PacketRangeGroupBox();
diff --git a/ui/qt/preferences_dialog.h b/ui/qt/preferences_dialog.h
index fe4db669b7..97b7e246d3 100644
--- a/ui/qt/preferences_dialog.h
+++ b/ui/qt/preferences_dialog.h
@@ -46,7 +46,7 @@ class PreferencesDialog;
 class PreferencesDialog : public QDialog
 {
     Q_OBJECT
-    
+
 public:
     explicit PreferencesDialog(QWidget *parent = 0);
     ~PreferencesDialog();
diff --git a/ui/qt/print_dialog.h b/ui/qt/print_dialog.h
index 0f4591f0d0..b6aa9d68c2 100644
--- a/ui/qt/print_dialog.h
+++ b/ui/qt/print_dialog.h
@@ -42,7 +42,7 @@ class PrintDialog;
 class PrintDialog : public QDialog
 {
     Q_OBJECT
-    
+
 public:
     explicit PrintDialog(QWidget *parent = 0, capture_file *cf = NULL);
     ~PrintDialog();
diff --git a/ui/qt/profile_dialog.h b/ui/qt/profile_dialog.h
index 5325df303c..cd79d0c236 100644
--- a/ui/qt/profile_dialog.h
+++ b/ui/qt/profile_dialog.h
@@ -35,7 +35,7 @@ class ProfileDialog;
 class ProfileDialog : public QDialog
 {
     Q_OBJECT
-    
+
 public:
     enum ProfileAction { ShowProfiles, NewProfile, EditCurrentProfile, DeleteCurrentProfile };
 
diff --git a/ui/qt/search_frame.h b/ui/qt/search_frame.h
index 576beb5e1b..e7e5ce985e 100644
--- a/ui/qt/search_frame.h
+++ b/ui/qt/search_frame.h
@@ -37,7 +37,7 @@ class SearchFrame;
 class SearchFrame : public AccordionFrame
 {
     Q_OBJECT
-    
+
 public:
     explicit SearchFrame(QWidget *parent = 0);
     ~SearchFrame();
@@ -48,7 +48,7 @@ public:
 public slots:
     void setCaptureFile(capture_file *cf);
     void findFrameWithFilter(QString &filter);
-    
+
 signals:
     void pushFilterSyntaxStatus(QString&);
 
diff --git a/ui/qt/sequence_dialog.h b/ui/qt/sequence_dialog.h
index 1daaaa0e96..5b392b2358 100644
--- a/ui/qt/sequence_dialog.h
+++ b/ui/qt/sequence_dialog.h
@@ -44,13 +44,13 @@ class SequenceDialog;
 class SequenceDialog : public QDialog
 {
     Q_OBJECT
-    
+
 public:
     enum SequenceType { any, tcp, voip };
 
     explicit SequenceDialog(QWidget *parent = 0, capture_file *cf = NULL, SequenceType type = any);
     ~SequenceDialog();
-    
+
 signals:
     void goToPacket(int packet_num);
 
diff --git a/ui/qt/splash_overlay.h b/ui/qt/splash_overlay.h
index 5c55b9e8d8..77ae8e6fd0 100644
--- a/ui/qt/splash_overlay.h
+++ b/ui/qt/splash_overlay.h
@@ -42,11 +42,11 @@ class SplashOverlay;
 class SplashOverlay : public QWidget
 {
     Q_OBJECT
-    
+
 public:
     explicit SplashOverlay(QWidget *parent = 0);
     ~SplashOverlay();
-    
+
 protected:
     void paintEvent(QPaintEvent *event);
 
diff --git a/ui/qt/summary_dialog.h b/ui/qt/summary_dialog.h
index be58d53fb1..cf97dc008c 100644
--- a/ui/qt/summary_dialog.h
+++ b/ui/qt/summary_dialog.h
@@ -58,7 +58,7 @@ class SummaryDialog;
 class SummaryDialog : public QDialog
 {
     Q_OBJECT
-    
+
 public:
     explicit SummaryDialog(QWidget *parent = 0);
     ~SummaryDialog();
@@ -79,7 +79,7 @@ protected slots:
     void CopyComment();
     void on_tabWidget_currentChanged(int index);
 
-    
+
 private:
     Ui::SummaryDialog   *ui;
 
diff --git a/ui/qt/syntax_line_edit.h b/ui/qt/syntax_line_edit.h
index 73a096c261..138ac93d4e 100644
--- a/ui/qt/syntax_line_edit.h
+++ b/ui/qt/syntax_line_edit.h
@@ -45,7 +45,7 @@ private:
     QString state_style_sheet_;
 
 signals:
-    
+
 public slots:
     void setStyleSheet(const QString &style_sheet);
 };
diff --git a/ui/qt/time_shift_dialog.h b/ui/qt/time_shift_dialog.h
index d150cbfce9..0759c84cf8 100644
--- a/ui/qt/time_shift_dialog.h
+++ b/ui/qt/time_shift_dialog.h
@@ -42,7 +42,7 @@ class TimeShiftDialog;
 class TimeShiftDialog : public QDialog
 {
     Q_OBJECT
-    
+
 public:
     explicit TimeShiftDialog(QWidget *parent = 0, capture_file *cf = NULL);
     ~TimeShiftDialog();
diff --git a/ui/qt/uat_dialog.h b/ui/qt/uat_dialog.h
index a777230bf9..c81aa8f1d5 100644
--- a/ui/qt/uat_dialog.h
+++ b/ui/qt/uat_dialog.h
@@ -45,13 +45,13 @@ class UatDialog;
 class UatDialog : public QDialog
 {
     Q_OBJECT
-    
+
 public:
     explicit UatDialog(QWidget *parent = 0, uat_t *uat = NULL);
     ~UatDialog();
 
     void setUat(uat_t *uat = NULL);
-    
+
 protected:
     void keyPressEvent(QKeyEvent *evt);
 
diff --git a/ui/rtp_analysis.h b/ui/rtp_analysis.h
index 2eb495c96b..f142be87a4 100644
--- a/ui/rtp_analysis.h
+++ b/ui/rtp_analysis.h
@@ -37,7 +37,7 @@
 #include <epan/packet_info.h>
 
 /** @file
- *  ??? 
+ *  ???
  *  @todo what's this?
  */
 
@@ -61,7 +61,7 @@ typedef struct _bw_history_item {
         guint32 bytes;
 } bw_history_item;
 
-#define BUFF_BW 300 
+#define BUFF_BW 300
 
 typedef struct _tap_rtp_stat_t {
 	gboolean first_packet;     /**< do not use in code that is called after rtp_packet_analyse */
diff --git a/ui/tap-sctp-analysis.c b/ui/tap-sctp-analysis.c
index 362eb07a70..a413fbbaac 100644
--- a/ui/tap-sctp-analysis.c
+++ b/ui/tap-sctp-analysis.c
@@ -465,7 +465,7 @@ packet(void *tapdata _U_, packet_info *pinfo , epan_dissect_t *edt _U_ , const v
 			info->sort_tsn2         = g_ptr_array_new();
 			info->sort_sack1        = g_ptr_array_new();
 			info->sort_sack2        = g_ptr_array_new();
-			
+
 			for (i=0; i < NUM_CHUNKS; i++)
 			{
 				info->chunk_count[i] = 0;
diff --git a/ui/tap-sctp-analysis.h b/ui/tap-sctp-analysis.h
index ad985ee7a2..3b93acf084 100644
--- a/ui/tap-sctp-analysis.h
+++ b/ui/tap-sctp-analysis.h
@@ -27,7 +27,7 @@
 
 #ifdef __cplusplus
 extern "C" {
-#endif /* __cplusplus */ 
+#endif /* __cplusplus */
 
 #include <epan/dissectors/packet-sctp.h>
 #include <epan/address.h>
diff --git a/ui/tap-sequence-analysis.c b/ui/tap-sequence-analysis.c
index 600c60766f..a84f610094 100644
--- a/ui/tap-sequence-analysis.c
+++ b/ui/tap-sequence-analysis.c
@@ -4,7 +4,7 @@
  * $Id$
  *
  * Some code from from gtk/flow_graph.c
- * 
+ *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
diff --git a/ui/tap-sequence-analysis.h b/ui/tap-sequence-analysis.h
index f48bfbbba7..c97784510a 100644
--- a/ui/tap-sequence-analysis.h
+++ b/ui/tap-sequence-analysis.h
@@ -4,7 +4,7 @@
  * $Id$
  *
  * Copied from gtk/graph_analysis.h
- * 
+ *
  * Copyright 2004, Verso Technologies Inc.
  * By Alejandro Vaquero <alejandrovaquero@yahoo.com>
  *
diff --git a/ui/tap-tcp-stream.c b/ui/tap-tcp-stream.c
index 958480884b..4b2d253b95 100644
--- a/ui/tap-tcp-stream.c
+++ b/ui/tap-tcp-stream.c
@@ -297,7 +297,7 @@ select_tcpip_session(capture_file *cf, struct segment *hdrs)
 
     if (!cf || !hdrs)
         return NULL;
-    
+
     fdata = cf->current_frame;
 
     /* no real filter yet */
diff --git a/ui/util.h b/ui/util.h
index 7fb5e17df1..5cbfd151d3 100644
--- a/ui/util.h
+++ b/ui/util.h
@@ -37,7 +37,7 @@ char *get_args_as_string(int argc, char **argv, int optindex);
 /* Compute the difference between two seconds/microseconds time stamps.
  * Beware: we're using nanosecond resolution now and function is currently unused
  */
-void compute_timestamp_diff(gint *diffsec, gint *diffusec, 
+void compute_timestamp_diff(gint *diffsec, gint *diffusec,
                             guint32 sec1, guint32 usec1, guint32 sec2, guint32 usec2);
 
 /* Try to figure out if we're remotely connected, e.g. via ssh or
diff --git a/ui/win32/file_dlg_win32.c b/ui/win32/file_dlg_win32.c
index d6bc34825c..b7c9c993de 100644
--- a/ui/win32/file_dlg_win32.c
+++ b/ui/win32/file_dlg_win32.c
@@ -1779,13 +1779,13 @@ save_as_statstree_hook_proc(HWND sf_hwnd, UINT msg, WPARAM w_param, LPARAM l_par
         case WM_INITDIALOG:
             g_sf_hwnd = sf_hwnd;
             break;
-			
+
         case WM_COMMAND:
             break;
-			
+
         case WM_NOTIFY:
             break;
-			
+
         default:
             break;
     }