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>

11 files changed, 10 insertions, 10 deletions

diff --git a/ui/qt/CMakeLists.txt b/ui/qt/CMakeLists.txt
index 4803ccf7e4..89cce56069 100644
--- a/ui/qt/CMakeLists.txt
+++ b/ui/qt/CMakeLists.txt
@@ -37,10 +37,12 @@ set(WIRESHARK_WIDGET_HEADERS
 	widgets/packet_list_header.h
 	widgets/qcustomplot.h
 	widgets/range_syntax_lineedit.h
+	widgets/splash_overlay.h
 	widgets/stock_icon_tool_button.h
 	widgets/syntax_line_edit.h
 	widgets/tabnav_tree_view.h
 	widgets/wireshark_file_dialog.h
+	widgets/wireless_timeline.h
 )
 
 set(WIRESHARK_MANAGER_HEADERS
@@ -207,7 +209,6 @@ set(WIRESHARK_QT_HEADERS
 	sequence_diagram.h
 	sequence_dialog.h
 	show_packet_bytes_dialog.h
-	splash_overlay.h
 	stats_tree_dialog.h
 	service_response_time_dialog.h
 	simple_statistics_dialog.h
@@ -221,7 +222,6 @@ set(WIRESHARK_QT_HEADERS
 	uat_frame.h
 	voip_calls_dialog.h
 	wireless_frame.h
-	wireless_timeline.h
 	wireshark_application.h
 	wireshark_dialog.h
 	wlan_statistics_dialog.h
@@ -263,9 +263,11 @@ set(WIRESHARK_WIDGET_SRCS
 	widgets/pref_module_view.cpp
 	widgets/qcustomplot.cpp
 	widgets/range_syntax_lineedit.cpp
+	widgets/splash_overlay.cpp
 	widgets/stock_icon_tool_button.cpp
 	widgets/syntax_line_edit.cpp
 	widgets/tabnav_tree_view.cpp
+	widgets/wireless_timeline.cpp
 	widgets/wireshark_file_dialog.cpp
 )
 
@@ -425,7 +427,6 @@ set(WIRESHARK_QT_SRC
 	show_packet_bytes_dialog.cpp
 	simple_dialog.cpp
 	simple_statistics_dialog.cpp
-	splash_overlay.cpp
 	supported_protocols_dialog.cpp
 	tabnav_tree_widget.cpp
 	tap_parameter_dialog.cpp
@@ -436,7 +437,6 @@ set(WIRESHARK_QT_SRC
 	uat_frame.cpp
 	voip_calls_dialog.cpp
 	wireless_frame.cpp
-	wireless_timeline.cpp
 	wireshark_application.cpp
 	wireshark_dialog.cpp
 	${WIRESHARK_CUSTOM_QT_SRCS}
@@ -545,7 +545,7 @@ set(WIRESHARK_QT_UI
 	search_frame.ui
 	sequence_dialog.ui
 	show_packet_bytes_dialog.ui
-	splash_overlay.ui
+	widgets/splash_overlay.ui
 	supported_protocols_dialog.ui
 	tap_parameter_dialog.ui
 	tcp_stream_dialog.ui
diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp
index 501f7a0e7e..203c39a5b6 100644
--- a/ui/qt/main.cpp
+++ b/ui/qt/main.cpp
@@ -90,7 +90,7 @@
 #include "ui/qt/service_response_time_dialog.h"
 #include "ui/qt/simple_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 "caputils/capture-pcap-util.h"
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp
index 6f5593b20d..9b4e251191 100644
--- a/ui/qt/main_window.cpp
+++ b/ui/qt/main_window.cpp
@@ -62,7 +62,7 @@ DIAG_ON(frame-larger-than=)
 #include "simple_dialog.h"
 #include "tap_parameter_dialog.h"
 #include "wireless_frame.h"
-#include "wireless_timeline.h"
+#include <ui/qt/widgets/wireless_timeline.h>
 #include "wireshark_application.h"
 
 #include <ui/qt/widgets/additional_toolbar.h>
diff --git a/ui/qt/main_window.ui b/ui/qt/main_window.ui
index d3d2b59dc2..25aa705607 100644
--- a/ui/qt/main_window.ui
+++ b/ui/qt/main_window.ui
@@ -3031,7 +3031,7 @@
   <customwidget>
    <class>WirelessTimeline</class>
    <extends>QWidget</extends>
-   <header>wireless_timeline.h</header>
+   <header>widgets/wireless_timeline.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp
index f82589624c..af9dc9e10b 100644
--- a/ui/qt/main_window_slots.cpp
+++ b/ui/qt/main_window_slots.cpp
@@ -154,7 +154,7 @@ DIAG_ON(frame-larger-than=)
 #include "voip_calls_dialog.h"
 #include "wireshark_application.h"
 #include "wlan_statistics_dialog.h"
-#include "wireless_timeline.h"
+#include <ui/qt/widgets/wireless_timeline.h>
 
 #include <QClipboard>
 #include <QFileInfo>
diff --git a/ui/qt/welcome_page.h b/ui/qt/welcome_page.h
index 73aa7f2218..ebedce5647 100644
--- a/ui/qt/welcome_page.h
+++ b/ui/qt/welcome_page.h
@@ -16,7 +16,7 @@ class QListWidget;
 class QListWidgetItem;
 class QMenu;
 
-#include "splash_overlay.h"
+#include <ui/qt/widgets/splash_overlay.h>
 #include "interface_frame.h"
 
 namespace Ui {
diff --git a/ui/qt/splash_overlay.cpp b/ui/qt/widgets/splash_overlay.cpp
index 0ba729f0bd..0ba729f0bd 100644
--- a/ui/qt/splash_overlay.cpp
+++ b/ui/qt/widgets/splash_overlay.cpp
diff --git a/ui/qt/splash_overlay.h b/ui/qt/widgets/splash_overlay.h
index cb576baa02..cb576baa02 100644
--- a/ui/qt/splash_overlay.h
+++ b/ui/qt/widgets/splash_overlay.h
diff --git a/ui/qt/splash_overlay.ui b/ui/qt/widgets/splash_overlay.ui
index 657daefdfb..657daefdfb 100644
--- a/ui/qt/splash_overlay.ui
+++ b/ui/qt/widgets/splash_overlay.ui
diff --git a/ui/qt/wireless_timeline.cpp b/ui/qt/widgets/wireless_timeline.cpp
index c222bb14e3..c222bb14e3 100644
--- a/ui/qt/wireless_timeline.cpp
+++ b/ui/qt/widgets/wireless_timeline.cpp
diff --git a/ui/qt/wireless_timeline.h b/ui/qt/widgets/wireless_timeline.h
index 9a2972f067..9a2972f067 100644
--- a/ui/qt/wireless_timeline.h
+++ b/ui/qt/widgets/wireless_timeline.h