diff --git a/CMakeLists.txt b/CMakeLists.txt index de949c1fab..081e9a6b9d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2110,7 +2110,6 @@ if( (BUILD_wireshark AND QT_FOUND) OR (BUILD_wireshark_gtk AND GTK_FOUND) ) capture_opts.c file.c fileset.c - summary.c ${SHARK_COMMON_SRC} ${PLATFORM_UI_SRC} ) diff --git a/Makefile.am b/Makefile.am index 66c71e9b88..240ec1833d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -390,7 +390,6 @@ WIRESHARK_COMMON_SRC = \ capture_opts.c \ file.c \ fileset.c \ - summary.c \ version_info.c EPAN_EXTRA_LIBS = \ @@ -731,7 +730,6 @@ noinst_HEADERS = \ fileset.h \ frame_tvbuff.h \ ringbuffer.h \ - summary.h \ sync_pipe.h \ version_info.h diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt index 9c2bb03584..84a2896549 100644 --- a/ui/CMakeLists.txt +++ b/ui/CMakeLists.txt @@ -50,6 +50,7 @@ set(COMMON_UI_SRC service_response_time.c software_update.c ssl_key_export.c + summary.c tap_export_pdu.c tap-iax2-analysis.c tap-rtp-common.c diff --git a/ui/Makefile.am b/ui/Makefile.am index 9f64a2e2a4..cd341381a6 100644 --- a/ui/Makefile.am +++ b/ui/Makefile.am @@ -75,6 +75,7 @@ WIRESHARK_UI_SRC = \ service_response_time.c \ software_update.c \ ssl_key_export.c \ + summary.c \ tap_export_pdu.c \ tap-iax2-analysis.c \ tap-rlc-graph.c \ @@ -126,6 +127,7 @@ WIRESHARK_UI_INCLUDES = \ simple_dialog.h \ software_update.h \ ssl_key_export.h \ + summary.h \ tap_export_pdu.h \ tap-iax2-analysis.h \ tap-rlc-graph.h \ diff --git a/ui/gtk/gsm_map_summary.c b/ui/gtk/gsm_map_summary.c index e3dcd57d7b..e258889731 100644 --- a/ui/gtk/gsm_map_summary.c +++ b/ui/gtk/gsm_map_summary.c @@ -37,9 +37,9 @@ #include #include "globals.h" -#include "summary.h" #include "ui/simple_dialog.h" +#include "ui/summary.h" #include #include "ui/gtk/gui_stat_menu.h" diff --git a/ui/gtk/main.c b/ui/gtk/main.c index e76fa72100..647735e1f3 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -88,7 +88,6 @@ /* general (not GTK specific) */ #include "../../file.h" #include "../../frame_tvbuff.h" -#include "../../summary.h" #include #include "epan/register.h" #include "../../ringbuffer.h" @@ -106,6 +105,7 @@ #include "ui/recent.h" #include "ui/recent_utils.h" #include "ui/software_update.h" +#include "ui/summary.h" #include "ui/ws_ui_util.h" #include "ui/util.h" #include "ui/dissect_opts.h" diff --git a/ui/gtk/mtp3_summary.c b/ui/gtk/mtp3_summary.c index 7e2d4c93c3..79ec05640f 100644 --- a/ui/gtk/mtp3_summary.c +++ b/ui/gtk/mtp3_summary.c @@ -39,9 +39,9 @@ #include #include "globals.h" -#include "summary.h" #include "ui/simple_dialog.h" +#include "ui/summary.h" #include "ui/gtk/gui_stat_menu.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/gtk/packet_win.c b/ui/gtk/packet_win.c index 6cf084ac2c..15cd0ddd6b 100644 --- a/ui/gtk/packet_win.c +++ b/ui/gtk/packet_win.c @@ -51,10 +51,10 @@ #include #include "../../file.h" -#include "../../summary.h" #include "ui/recent.h" #include "ui/simple_dialog.h" +#include "ui/summary.h" #include "ui/ws_ui_util.h" #include "ui/gtk/font_utils.h" diff --git a/ui/gtk/summary_dlg.c b/ui/gtk/summary_dlg.c index 2a7bfe7f99..6a24690178 100644 --- a/ui/gtk/summary_dlg.c +++ b/ui/gtk/summary_dlg.c @@ -29,7 +29,6 @@ #include #include "../../file.h" -#include "../../summary.h" #ifdef HAVE_LIBPCAP #include "ui/capture.h" @@ -38,6 +37,7 @@ #include "ui/main_statusbar.h" #include "ui/gtk/main.h" #include "ui/gtk/summary_dlg.h" +#include "ui/summary.h" #include "ui/gtk/dlg_utils.h" #include "ui/gtk/gui_utils.h" #include "ui/gtk/help_dlg.h" diff --git a/ui/qt/capture_file_properties_dialog.cpp b/ui/qt/capture_file_properties_dialog.cpp index dfdb63d49d..d97b4beaa1 100644 --- a/ui/qt/capture_file_properties_dialog.cpp +++ b/ui/qt/capture_file_properties_dialog.cpp @@ -11,7 +11,7 @@ #include "capture_file_properties_dialog.h" #include -#include "summary.h" +#include "ui/summary.h" #include "wsutil/str_util.h" #include "wsutil/utf8_entities.h" diff --git a/ui/qt/gsm_map_summary_dialog.cpp b/ui/qt/gsm_map_summary_dialog.cpp index 52f4cceec0..585f7c36c2 100644 --- a/ui/qt/gsm_map_summary_dialog.cpp +++ b/ui/qt/gsm_map_summary_dialog.cpp @@ -17,7 +17,7 @@ #include -#include "summary.h" +#include "ui/summary.h" #include #include diff --git a/ui/qt/mtp3_summary_dialog.cpp b/ui/qt/mtp3_summary_dialog.cpp index 20a2300342..31d6fdcfdd 100644 --- a/ui/qt/mtp3_summary_dialog.cpp +++ b/ui/qt/mtp3_summary_dialog.cpp @@ -17,8 +17,6 @@ #include -#include "summary.h" - #include #include @@ -27,6 +25,7 @@ #include "ui/capture_globals.h" #include "ui/simple_dialog.h" +#include "ui/summary.h" #include diff --git a/summary.c b/ui/summary.c similarity index 100% rename from summary.c rename to ui/summary.c diff --git a/summary.h b/ui/summary.h similarity index 100% rename from summary.h rename to ui/summary.h