aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2018-04-16 08:53:54 +0200
committerAnders Broman <a.broman58@gmail.com>2018-04-16 20:16:00 +0000
commit5e7cd2dfc6634fcdb005eef5ba3a7c3852b20a9a (patch)
tree30da86a606ff40ecf29e0bb2d526f1e5ddce27d0
parent129d574d96556e32ce66a8056b53b289cf246461 (diff)
Qt: Rename packet_list_enable_color
Rename packet_list_enable_color() to packet_list_recolor_packets() to reflect what it does. Remove the call from where it's not needed. Change-Id: I55dd1a9af8f5b1dbd83b06136a5bbcfddea06cdb Reviewed-on: https://code.wireshark.org/review/26959 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r--ui/qt/main_window_slots.cpp2
-rw-r--r--ui/qt/packet_list.cpp2
-rw-r--r--ui/qt/wireshark_application.cpp1
-rw-r--r--ui/ws_ui_util.h2
-rw-r--r--wireshark-qt.cpp2
5 files changed, 3 insertions, 6 deletions
diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp
index b23d22c408..ceb1873ca6 100644
--- a/ui/qt/main_window_slots.cpp
+++ b/ui/qt/main_window_slots.cpp
@@ -2554,7 +2554,7 @@ void MainWindow::on_actionViewNormalSize_triggered()
void MainWindow::on_actionViewColorizePacketList_triggered(bool checked) {
recent.packet_list_colorize = checked;
- packet_list_enable_color(checked);
+ packet_list_recolor_packets();
packet_list_->packetListModel()->resetColorized();
}
diff --git a/ui/qt/packet_list.cpp b/ui/qt/packet_list.cpp
index a1d1a9857d..f77215d248 100644
--- a/ui/qt/packet_list.cpp
+++ b/ui/qt/packet_list.cpp
@@ -149,7 +149,7 @@ packet_list_clear(void)
}
void
-packet_list_enable_color(gboolean)
+packet_list_recolor_packets(void)
{
if (gbl_cur_packet_list) {
gbl_cur_packet_list->recolorPackets();
diff --git a/ui/qt/wireshark_application.cpp b/ui/qt/wireshark_application.cpp
index ad30ed10f8..cf76419736 100644
--- a/ui/qt/wireshark_application.cpp
+++ b/ui/qt/wireshark_application.cpp
@@ -423,7 +423,6 @@ void WiresharkApplication::setConfigurationProfile(const gchar *profile_name, bo
timestamp_set_type(recent.gui_time_format);
timestamp_set_precision(recent.gui_time_precision);
timestamp_set_seconds_type (recent.gui_seconds_format);
- packet_list_enable_color(recent.packet_list_colorize);
tap_update_timer_.setInterval(prefs.tap_update_interval);
prefs_to_capture_opts();
diff --git a/ui/ws_ui_util.h b/ui/ws_ui_util.h
index 20cf4d3fe3..03a1415d6c 100644
--- a/ui/ws_ui_util.h
+++ b/ui/ws_ui_util.h
@@ -64,7 +64,7 @@ void packet_list_prev(void);
guint packet_list_append(column_info *cinfo, frame_data *fdata);
frame_data *packet_list_get_row_data(gint row);
void packet_list_set_selected_row(gint row);
-void packet_list_enable_color(gboolean enable);
+void packet_list_recolor_packets(void);
void packet_list_queue_draw(void);
void packet_list_select_first_row(void);
void packet_list_moveto_end(void);
diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp
index 7be8fcfede..cb4f413d7e 100644
--- a/wireshark-qt.cpp
+++ b/wireshark-qt.cpp
@@ -821,8 +821,6 @@ int main(int argc, char *qt_argv[])
/* For update of WindowTitle (When use gui.window_title preference) */
main_w->setWSWindowTitle();
- packet_list_enable_color(recent.packet_list_colorize);
-
if (!color_filters_init(&err_msg, color_filter_add_cb)) {
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", err_msg);
g_free(err_msg);