Qt: Move widgets to sub-directory

General code cleanup

Change-Id: Ic99fc24b8f8c6142a7ec46f535f8d5b896236390
Reviewed-on: https://code.wireshark.org/review/33769
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Roland Knall 2019-06-29 14:30:51 +02:00 committed by Anders Broman
parent ae089f1613
commit 9ad5dc26dd
11 changed files with 10 additions and 10 deletions

View File

@ -37,10 +37,12 @@ set(WIRESHARK_WIDGET_HEADERS
widgets/packet_list_header.h widgets/packet_list_header.h
widgets/qcustomplot.h widgets/qcustomplot.h
widgets/range_syntax_lineedit.h widgets/range_syntax_lineedit.h
widgets/splash_overlay.h
widgets/stock_icon_tool_button.h widgets/stock_icon_tool_button.h
widgets/syntax_line_edit.h widgets/syntax_line_edit.h
widgets/tabnav_tree_view.h widgets/tabnav_tree_view.h
widgets/wireshark_file_dialog.h widgets/wireshark_file_dialog.h
widgets/wireless_timeline.h
) )
set(WIRESHARK_MANAGER_HEADERS set(WIRESHARK_MANAGER_HEADERS
@ -207,7 +209,6 @@ set(WIRESHARK_QT_HEADERS
sequence_diagram.h sequence_diagram.h
sequence_dialog.h sequence_dialog.h
show_packet_bytes_dialog.h show_packet_bytes_dialog.h
splash_overlay.h
stats_tree_dialog.h stats_tree_dialog.h
service_response_time_dialog.h service_response_time_dialog.h
simple_statistics_dialog.h simple_statistics_dialog.h
@ -221,7 +222,6 @@ set(WIRESHARK_QT_HEADERS
uat_frame.h uat_frame.h
voip_calls_dialog.h voip_calls_dialog.h
wireless_frame.h wireless_frame.h
wireless_timeline.h
wireshark_application.h wireshark_application.h
wireshark_dialog.h wireshark_dialog.h
wlan_statistics_dialog.h wlan_statistics_dialog.h
@ -263,9 +263,11 @@ set(WIRESHARK_WIDGET_SRCS
widgets/pref_module_view.cpp widgets/pref_module_view.cpp
widgets/qcustomplot.cpp widgets/qcustomplot.cpp
widgets/range_syntax_lineedit.cpp widgets/range_syntax_lineedit.cpp
widgets/splash_overlay.cpp
widgets/stock_icon_tool_button.cpp widgets/stock_icon_tool_button.cpp
widgets/syntax_line_edit.cpp widgets/syntax_line_edit.cpp
widgets/tabnav_tree_view.cpp widgets/tabnav_tree_view.cpp
widgets/wireless_timeline.cpp
widgets/wireshark_file_dialog.cpp widgets/wireshark_file_dialog.cpp
) )
@ -425,7 +427,6 @@ set(WIRESHARK_QT_SRC
show_packet_bytes_dialog.cpp show_packet_bytes_dialog.cpp
simple_dialog.cpp simple_dialog.cpp
simple_statistics_dialog.cpp simple_statistics_dialog.cpp
splash_overlay.cpp
supported_protocols_dialog.cpp supported_protocols_dialog.cpp
tabnav_tree_widget.cpp tabnav_tree_widget.cpp
tap_parameter_dialog.cpp tap_parameter_dialog.cpp
@ -436,7 +437,6 @@ set(WIRESHARK_QT_SRC
uat_frame.cpp uat_frame.cpp
voip_calls_dialog.cpp voip_calls_dialog.cpp
wireless_frame.cpp wireless_frame.cpp
wireless_timeline.cpp
wireshark_application.cpp wireshark_application.cpp
wireshark_dialog.cpp wireshark_dialog.cpp
${WIRESHARK_CUSTOM_QT_SRCS} ${WIRESHARK_CUSTOM_QT_SRCS}
@ -545,7 +545,7 @@ set(WIRESHARK_QT_UI
search_frame.ui search_frame.ui
sequence_dialog.ui sequence_dialog.ui
show_packet_bytes_dialog.ui show_packet_bytes_dialog.ui
splash_overlay.ui widgets/splash_overlay.ui
supported_protocols_dialog.ui supported_protocols_dialog.ui
tap_parameter_dialog.ui tap_parameter_dialog.ui
tcp_stream_dialog.ui tcp_stream_dialog.ui

View File

@ -90,7 +90,7 @@
#include "ui/qt/service_response_time_dialog.h" #include "ui/qt/service_response_time_dialog.h"
#include "ui/qt/simple_dialog.h" #include "ui/qt/simple_dialog.h"
#include "ui/qt/simple_statistics_dialog.h" #include "ui/qt/simple_statistics_dialog.h"
#include "ui/qt/splash_overlay.h" #include <ui/qt/widgets/splash_overlay.h>
#include "ui/qt/wireshark_application.h" #include "ui/qt/wireshark_application.h"
#include "caputils/capture-pcap-util.h" #include "caputils/capture-pcap-util.h"

View File

@ -62,7 +62,7 @@ DIAG_ON(frame-larger-than=)
#include "simple_dialog.h" #include "simple_dialog.h"
#include "tap_parameter_dialog.h" #include "tap_parameter_dialog.h"
#include "wireless_frame.h" #include "wireless_frame.h"
#include "wireless_timeline.h" #include <ui/qt/widgets/wireless_timeline.h>
#include "wireshark_application.h" #include "wireshark_application.h"
#include <ui/qt/widgets/additional_toolbar.h> #include <ui/qt/widgets/additional_toolbar.h>

View File

@ -3031,7 +3031,7 @@
<customwidget> <customwidget>
<class>WirelessTimeline</class> <class>WirelessTimeline</class>
<extends>QWidget</extends> <extends>QWidget</extends>
<header>wireless_timeline.h</header> <header>widgets/wireless_timeline.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
</customwidgets> </customwidgets>

View File

@ -154,7 +154,7 @@ DIAG_ON(frame-larger-than=)
#include "voip_calls_dialog.h" #include "voip_calls_dialog.h"
#include "wireshark_application.h" #include "wireshark_application.h"
#include "wlan_statistics_dialog.h" #include "wlan_statistics_dialog.h"
#include "wireless_timeline.h" #include <ui/qt/widgets/wireless_timeline.h>
#include <QClipboard> #include <QClipboard>
#include <QFileInfo> #include <QFileInfo>

View File

@ -16,7 +16,7 @@ class QListWidget;
class QListWidgetItem; class QListWidgetItem;
class QMenu; class QMenu;
#include "splash_overlay.h" #include <ui/qt/widgets/splash_overlay.h>
#include "interface_frame.h" #include "interface_frame.h"
namespace Ui { namespace Ui {