Wireshark-commits: [Wireshark-commits] master 5e4bbcd: Refactor GUI dependencies out of color_filte
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=5e4bbcda9839d9fd4480db8c4f9386ff388d166c
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
5e4bbcd by Michael Mann (mmann78@xxxxxxxxxxxx):
Refactor GUI dependencies out of color_filters.[ch] and move it to epan directory.
This also moved color.h into color_filters.h
Change-Id: Ic19e27aa1b3ec67e764aa7ee8bbef7b1187bb12e
Reviewed-on: https://code.wireshark.org/review/12831
Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
Actions performed:
from c752daf [docsis->bpkmattrib] Correction for TLV 15 text from 14->15
adds 5e4bbcd Refactor GUI dependencies out of color_filters.[ch] and move it to epan directory.
Summary of changes:
CMakeLists.txt | 3 +-
Makefile.common | 3 -
Makefile.nmake | 16 +--
color.h | 74 -----------
debian/libwireshark-dev.install | 1 -
epan/CMakeLists.txt | 3 +-
epan/Makefile.am | 2 +-
epan/Makefile.common | 2 +
color_filters.c => epan/color_filters.c | 213 +++++++++++++++++--------------
color_filters.h => epan/color_filters.h | 94 ++++++++------
epan/dissectors/file-file.c | 3 +-
epan/dissectors/packet-frame.c | 3 +-
epan/prefs.h | 2 +-
file.c | 3 +-
ui/gtk/capture_file_dlg.c | 15 ++-
ui/gtk/color_dlg.c | 57 ++++++---
ui/gtk/color_edit_dlg.c | 3 +-
ui/gtk/color_utils.c | 9 +-
ui/gtk/color_utils.h | 10 +-
ui/gtk/compare_stat.c | 9 +-
ui/gtk/funnel_stat.c | 9 +-
ui/gtk/main.c | 41 ++++--
ui/gtk/main_menubar.c | 13 +-
ui/gtk/packet_list.c | 2 +-
ui/gtk/packet_list_store.c | 3 +-
ui/qt/Wireshark.pro | 1 -
ui/qt/color_utils.cpp | 22 ----
ui/qt/color_utils.h | 4 +-
ui/qt/coloring_rules_dialog.cpp | 72 ++++++++---
ui/qt/column_preferences_frame.cpp | 2 -
ui/qt/funnel_statistics.cpp | 10 +-
ui/qt/main_window_slots.cpp | 28 +++-
ui/qt/module_preferences_scroll_area.h | 2 -
ui/qt/packet_list.cpp | 3 +-
ui/qt/packet_list_model.cpp | 3 +-
ui/qt/packet_list_record.cpp | 3 +-
ui/qt/preferences_dialog.h | 2 -
ui/qt/wireshark_application.cpp | 12 +-
ui/ui_util.h | 10 ++
ui/win32/file_dlg_win32.c | 16 ++-
wireshark-qt.cpp | 15 ++-
41 files changed, 432 insertions(+), 366 deletions(-)
delete mode 100644 color.h
rename color_filters.c => epan/color_filters.c (80%)
rename color_filters.h => epan/color_filters.h (67%)
