Qt/C++: Change a bunch of includes to forward declarations.

In theory this this should reduce compilation times. On my particular
system it makes no difference but hopefully it will elsewhere.

Change-Id: I570177d3ca4eec691c82d46b4dbbce74092aac1d
Reviewed-on: https://code.wireshark.org/review/7060
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

37 files changed, 98 insertions, 45 deletions

diff --git a/ui/qt/accordion_frame.cpp b/ui/qt/accordion_frame.cpp
index 61ea101117..ff8a6a47dd 100644
--- a/ui/qt/accordion_frame.cpp
+++ b/ui/qt/accordion_frame.cpp
@@ -27,6 +27,7 @@
 #include "ui/util.h"
 
 #include <QLayout>
+#include <QPropertyAnimation>
 
 const int duration_ = 150;
 
diff --git a/ui/qt/accordion_frame.h b/ui/qt/accordion_frame.h
index b205c6248f..5d7a5fca61 100644
--- a/ui/qt/accordion_frame.h
+++ b/ui/qt/accordion_frame.h
@@ -23,7 +23,8 @@
 #define ACCORDION_FRAME_H
 
 #include <QFrame>
-#include <QPropertyAnimation>
+
+class QPropertyAnimation;
 
 class AccordionFrame : public QFrame
 {
diff --git a/ui/qt/bluetooth_att_server_attributes_dialog.cpp b/ui/qt/bluetooth_att_server_attributes_dialog.cpp
index c21e1b7766..86950c7277 100644
--- a/ui/qt/bluetooth_att_server_attributes_dialog.cpp
+++ b/ui/qt/bluetooth_att_server_attributes_dialog.cpp
@@ -30,8 +30,10 @@
 
 #include "ui/simple_dialog.h"
 
-#include <QContextMenuEvent>
 #include <QClipboard>
+#include <QContextMenuEvent>
+#include <QPushButton>
+#include <QTreeWidget>
 
 static const int column_number_handle = 0;
 static const int column_number_uuid = 1;
diff --git a/ui/qt/bluetooth_att_server_attributes_dialog.h b/ui/qt/bluetooth_att_server_attributes_dialog.h
index 25fc4d4e1e..0b258a701c 100644
--- a/ui/qt/bluetooth_att_server_attributes_dialog.h
+++ b/ui/qt/bluetooth_att_server_attributes_dialog.h
@@ -32,10 +32,9 @@
 #include "epan/tap.h"
 
 #include <QMenu>
-#include <QPushButton>
-#include <QTreeWidget>
 
 class QAbstractButton;
+class QPushButton;
 class QTreeWidgetItem;
 
 typedef struct _tapinfo_t {
diff --git a/ui/qt/byte_view_tab.h b/ui/qt/byte_view_tab.h
index c36931a881..ef8ef01e81 100644
--- a/ui/qt/byte_view_tab.h
+++ b/ui/qt/byte_view_tab.h
@@ -31,7 +31,9 @@
 #include "cfile.h"
 
 #include <QTabWidget>
-#include <QTreeWidget>
+
+class QTreeWidget;
+class QTreeWidgetItem;
 
 class ByteViewTab : public QTabWidget
 {
diff --git a/ui/qt/column_preferences_frame.cpp b/ui/qt/column_preferences_frame.cpp
index 550f64da38..0fc2c10eac 100644
--- a/ui/qt/column_preferences_frame.cpp
+++ b/ui/qt/column_preferences_frame.cpp
@@ -38,6 +38,7 @@
 #include "syntax_line_edit.h"
 #include "wireshark_application.h"
 
+#include <QComboBox>
 #include <QTreeWidgetItemIterator>
 #include <QLineEdit>
 #include <QKeyEvent>
diff --git a/ui/qt/column_preferences_frame.h b/ui/qt/column_preferences_frame.h
index 08845d6ac5..adca04c0b3 100644
--- a/ui/qt/column_preferences_frame.h
+++ b/ui/qt/column_preferences_frame.h
@@ -23,8 +23,10 @@
 #define COLUMN_PREFERENCES_FRAME_H
 
 #include <QFrame>
-#include <QComboBox>
-#include <QTreeWidgetItem>
+
+class QComboBox;
+class QLineEdit;
+class QTreeWidgetItem;
 
 namespace Ui {
 class ColumnPreferencesFrame;
diff --git a/ui/qt/conversation_dialog.cpp b/ui/qt/conversation_dialog.cpp
index 4c46d7614c..f9604ee5e6 100644
--- a/ui/qt/conversation_dialog.cpp
+++ b/ui/qt/conversation_dialog.cpp
@@ -33,6 +33,8 @@
 
 #include "wireshark_application.h"
 
+#include <QCheckBox>
+#include <QDialogButtonBox>
 #include <QMessageBox>
 #include <QPushButton>
 
diff --git a/ui/qt/decode_as_dialog.cpp b/ui/qt/decode_as_dialog.cpp
index d1b4952890..f4ea8ff58f 100644
--- a/ui/qt/decode_as_dialog.cpp
+++ b/ui/qt/decode_as_dialog.cpp
@@ -31,6 +31,7 @@
 
 #include "wireshark_application.h"
 
+#include <QComboBox>
 #include <QFont>
 #include <QFontMetrics>
 #include <QLineEdit>
diff --git a/ui/qt/decode_as_dialog.h b/ui/qt/decode_as_dialog.h
index b057000401..25e7ee7a0d 100644
--- a/ui/qt/decode_as_dialog.h
+++ b/ui/qt/decode_as_dialog.h
@@ -28,10 +28,11 @@
 
 #include "cfile.h"
 
-#include <QComboBox>
 #include <QDialog>
 #include <QMap>
-#include <QTreeWidgetItem>
+
+class QTreeWidgetItem;
+class QComboBox;
 
 namespace Ui {
 class DecodeAsDialog;
diff --git a/ui/qt/endpoint_dialog.cpp b/ui/qt/endpoint_dialog.cpp
index 478936d60c..62023ec935 100644
--- a/ui/qt/endpoint_dialog.cpp
+++ b/ui/qt/endpoint_dialog.cpp
@@ -36,8 +36,11 @@
 
 #include "wireshark_application.h"
 
+#include <QCheckBox>
 #include <QDesktopServices>
+#include <QDialogButtonBox>
 #include <QMessageBox>
+#include <QPushButton>
 #include <QUrl>
 
 const QString table_name_ = QObject::tr("Endpoint");
diff --git a/ui/qt/export_object_dialog.h b/ui/qt/export_object_dialog.h
index 56ab284cbd..45b34e640c 100644
--- a/ui/qt/export_object_dialog.h
+++ b/ui/qt/export_object_dialog.h
@@ -37,8 +37,9 @@
 #include "wireshark_dialog.h"
 
 #include <QMetaType>
-#include <QTreeWidgetItem>
-#include <QAbstractButton>
+
+class QTreeWidgetItem;
+class QAbstractButton;
 
 Q_DECLARE_METATYPE(export_object_entry_t *)
 
diff --git a/ui/qt/file_set_dialog.cpp b/ui/qt/file_set_dialog.cpp
index 2a9dd7763b..4649a099f9 100644
--- a/ui/qt/file_set_dialog.cpp
+++ b/ui/qt/file_set_dialog.cpp
@@ -39,6 +39,7 @@
 #include <QDateTime>
 #include <QFontMetrics>
 #include <QFont>
+#include <QTreeWidgetItem>
 #include <QUrl>
 
 Q_DECLARE_METATYPE(fileset_entry *)
diff --git a/ui/qt/file_set_dialog.h b/ui/qt/file_set_dialog.h
index 227bf6d19f..a3fe809b99 100644
--- a/ui/qt/file_set_dialog.h
+++ b/ui/qt/file_set_dialog.h
@@ -30,7 +30,8 @@
 #include "fileset.h"
 
 #include <QDialog>
-#include <QTreeWidgetItem>
+
+class QTreeWidgetItem;
 
 namespace Ui {
 class FileSetDialog;
diff --git a/ui/qt/filter_expressions_preferences_frame.cpp b/ui/qt/filter_expressions_preferences_frame.cpp
index 36d0a46a9a..7f30abf6a4 100644
--- a/ui/qt/filter_expressions_preferences_frame.cpp
+++ b/ui/qt/filter_expressions_preferences_frame.cpp
@@ -32,6 +32,7 @@
 
 #include "qt_ui_utils.h"
 
+#include <QLineEdit>
 #include <QKeyEvent>
 #include <QTreeWidgetItemIterator>
 
diff --git a/ui/qt/filter_expressions_preferences_frame.h b/ui/qt/filter_expressions_preferences_frame.h
index 0c4d587d4c..45c35dd0a1 100644
--- a/ui/qt/filter_expressions_preferences_frame.h
+++ b/ui/qt/filter_expressions_preferences_frame.h
@@ -23,8 +23,9 @@
 #define FILTER_EXPRESSIONS_PREFERENCES_FRAME_H
 
 #include <QFrame>
-#include <QLineEdit>
-#include <QTreeWidgetItem>
+
+class QLineEdit;
+class QTreeWidgetItem;
 
 namespace Ui {
 class FilterExpressionsPreferencesFrame;
diff --git a/ui/qt/io_graph_dialog.cpp b/ui/qt/io_graph_dialog.cpp
index 548e349268..0aefba4881 100644
--- a/ui/qt/io_graph_dialog.cpp
+++ b/ui/qt/io_graph_dialog.cpp
@@ -39,9 +39,12 @@
 #include <QFontMetrics>
 #include <QFrame>
 #include <QHBoxLayout>
+#include <QLineEdit>
 #include <QMessageBox>
 #include <QPushButton>
+#include <QRubberBand>
 #include <QSpacerItem>
+#include <QTimer>
 #include <QTreeWidget>
 #include <QVariant>
 
diff --git a/ui/qt/io_graph_dialog.h b/ui/qt/io_graph_dialog.h
index 8498ae66aa..d74bc5350e 100644
--- a/ui/qt/io_graph_dialog.h
+++ b/ui/qt/io_graph_dialog.h
@@ -36,15 +36,16 @@
 #include "syntax_line_edit.h"
 #include "wireshark_dialog.h"
 
-#include <QComboBox>
 #include <QIcon>
-#include <QLineEdit>
 #include <QMenu>
-#include <QRubberBand>
-#include <QTimer>
-#include <QTreeWidgetItem>
 #include "qcustomplot.h"
 
+class QComboBox;
+class QLineEdit;
+class QRubberBand;
+class QTimer;
+class QTreeWidgetItem;
+
 // GTK+ sets this to 100000 (NUM_IO_ITEMS)
 const int max_io_items_ = 250000;
 
diff --git a/ui/qt/lbm_lbtrm_transport_dialog.cpp b/ui/qt/lbm_lbtrm_transport_dialog.cpp
index c2d7d42f6b..9370a257e3 100644
--- a/ui/qt/lbm_lbtrm_transport_dialog.cpp
+++ b/ui/qt/lbm_lbtrm_transport_dialog.cpp
@@ -30,10 +30,12 @@
 #include "wireshark_application.h"
 
 #include <QClipboard>
+#include <QMenu>
 #include <QMessageBox>
 #include <QTreeWidget>
 #include <QTreeWidgetItemIterator>
 #include <QMenu>
+
 #include <epan/packet_info.h>
 #include <epan/tap.h>
 #include <epan/to_str.h>
diff --git a/ui/qt/lbm_lbtrm_transport_dialog.h b/ui/qt/lbm_lbtrm_transport_dialog.h
index c46898e549..5b6a78bc29 100644
--- a/ui/qt/lbm_lbtrm_transport_dialog.h
+++ b/ui/qt/lbm_lbtrm_transport_dialog.h
@@ -31,7 +31,10 @@
 #include "cfile.h"
 #include <epan/packet_info.h>
 #include <QDialog>
-#include <QTreeWidgetItem>
+
+class QHeaderView;
+class QMenu;
+class QTreeWidgetItem;
 
 namespace Ui
 {
diff --git a/ui/qt/lbm_lbtru_transport_dialog.cpp b/ui/qt/lbm_lbtru_transport_dialog.cpp
index 7eef151644..f8e847bc00 100644
--- a/ui/qt/lbm_lbtru_transport_dialog.cpp
+++ b/ui/qt/lbm_lbtru_transport_dialog.cpp
@@ -34,6 +34,8 @@
 #include <QTreeWidget>
 #include <QTreeWidgetItemIterator>
 #include <QMenu>
+#include <QTreeWidgetItem>
+
 #include <epan/packet_info.h>
 #include <epan/tap.h>
 #include <epan/to_str.h>
diff --git a/ui/qt/lbm_lbtru_transport_dialog.h b/ui/qt/lbm_lbtru_transport_dialog.h
index b73e1525a7..57e106c2c4 100644
--- a/ui/qt/lbm_lbtru_transport_dialog.h
+++ b/ui/qt/lbm_lbtru_transport_dialog.h
@@ -31,7 +31,10 @@
 #include "cfile.h"
 #include <epan/packet_info.h>
 #include <QDialog>
-#include <QTreeWidgetItem>
+
+class QHeaderView;
+class QMenu;
+class QTreeWidgetItem;
 
 namespace Ui
 {
diff --git a/ui/qt/main_welcome.cpp b/ui/qt/main_welcome.cpp
index 2a556ee6cf..4694f361a7 100644
--- a/ui/qt/main_welcome.cpp
+++ b/ui/qt/main_welcome.cpp
@@ -34,8 +34,11 @@
 #include "wireshark_application.h"
 #include "interface_tree.h"
 
-#include <QWidget>
+#include <QListWidget>
 #include <QResizeEvent>
+#include <QTreeWidgetItem>
+#include <QWidget>
+
 #if !defined(Q_OS_MAC) || QT_VERSION > QT_VERSION_CHECK(5, 0, 0)
 #include <QGraphicsBlurEffect>
 #endif
diff --git a/ui/qt/main_welcome.h b/ui/qt/main_welcome.h
index 3c01e0bbda..b195e2de72 100644
--- a/ui/qt/main_welcome.h
+++ b/ui/qt/main_welcome.h
@@ -23,8 +23,10 @@
 #define MAIN_WELCOME_H
 
 #include <QFrame>
-#include <QListWidget>
-#include <QTreeWidgetItem>
+
+class QListWidget;
+class QListWidgetItem;
+class QTreeWidgetItem;
 
 #include "splash_overlay.h"
 #include "interface_tree.h"
diff --git a/ui/qt/manage_interfaces_dialog.cpp b/ui/qt/manage_interfaces_dialog.cpp
index f28affc72f..93164c5fa8 100644
--- a/ui/qt/manage_interfaces_dialog.cpp
+++ b/ui/qt/manage_interfaces_dialog.cpp
@@ -46,6 +46,8 @@
 #include <QCheckBox>
 #include <QFileDialog>
 #include <QHBoxLayout>
+#include <QLineEdit>
+#include <QStandardItemModel>
 #include <QTreeWidgetItemIterator>
 
 // To do:
diff --git a/ui/qt/manage_interfaces_dialog.h b/ui/qt/manage_interfaces_dialog.h
index 28ff425605..1c37f62701 100644
--- a/ui/qt/manage_interfaces_dialog.h
+++ b/ui/qt/manage_interfaces_dialog.h
@@ -28,11 +28,13 @@
 #include "capture_opts.h"
 
 #include <QDialog>
-#include <QLineEdit>
-#include <QTableWidget>
 #include <QStyledItemDelegate>
-#include <QTreeWidgetItem>
-#include <QStandardItemModel>
+
+class QTreeWidget;
+class QTreeWidgetItem;
+class QStandardItemModel;
+
+class QLineEdit;
 
 class PathChooserDelegate : public QStyledItemDelegate
 {
diff --git a/ui/qt/packet_list.h b/ui/qt/packet_list.h
index f4368f7f11..8641aef521 100644
--- a/ui/qt/packet_list.h
+++ b/ui/qt/packet_list.h
@@ -29,7 +29,6 @@
 #include "related_packet_delegate.h"
 
 #include <QTreeView>
-#include <QTreeWidget>
 #include <QMenu>
 
 class QAction;
diff --git a/ui/qt/preferences_dialog.cpp b/ui/qt/preferences_dialog.cpp
index 1cec06f1a5..46db04d345 100644
--- a/ui/qt/preferences_dialog.cpp
+++ b/ui/qt/preferences_dialog.cpp
@@ -41,6 +41,7 @@
 #include "wireshark_application.h"
 
 #include <QColorDialog>
+#include <QComboBox>
 #include <QFileDialog>
 #include <QFrame>
 #include <QHBoxLayout>
diff --git a/ui/qt/preferences_dialog.h b/ui/qt/preferences_dialog.h
index 17271e388f..19e51c055e 100644
--- a/ui/qt/preferences_dialog.h
+++ b/ui/qt/preferences_dialog.h
@@ -34,7 +34,8 @@
 
 #include <QDialog>
 #include <QTreeWidgetItem>
-#include <QComboBox>
+
+class QComboBox;
 
 extern pref_t *prefFromPrefPtr(void *pref_ptr);
 extern guint fill_advanced_prefs(module_t *module, gpointer root_ptr);
diff --git a/ui/qt/profile_dialog.cpp b/ui/qt/profile_dialog.cpp
index 9c11291481..6c9e5c35f8 100644
--- a/ui/qt/profile_dialog.cpp
+++ b/ui/qt/profile_dialog.cpp
@@ -38,6 +38,8 @@
 #include <QDir>
 #include <QFont>
 #include <QMessageBox>
+#include <QPushButton>
+#include <QTreeWidgetItem>
 #include <QUrl>
 
 Q_DECLARE_METATYPE(GList *)
diff --git a/ui/qt/profile_dialog.h b/ui/qt/profile_dialog.h
index 4a7033dc82..b6f83341ae 100644
--- a/ui/qt/profile_dialog.h
+++ b/ui/qt/profile_dialog.h
@@ -23,8 +23,9 @@
 #define PROFILE_DIALOG_H
 
 #include <QDialog>
-#include <QTreeWidgetItem>
-#include <QPushButton>
+
+class QPushButton;
+class QTreeWidgetItem;
 
 namespace Ui {
 class ProfileDialog;
diff --git a/ui/qt/traffic_table_dialog.cpp b/ui/qt/traffic_table_dialog.cpp
index 4e3865f215..b44487ed7f 100644
--- a/ui/qt/traffic_table_dialog.cpp
+++ b/ui/qt/traffic_table_dialog.cpp
@@ -36,10 +36,12 @@
 #include <QCheckBox>
 #include <QClipboard>
 #include <QContextMenuEvent>
+#include <QDialogButtonBox>
 #include <QList>
 #include <QMap>
 #include <QMessageBox>
 #include <QPushButton>
+#include <QTabWidget>
 #include <QTreeWidget>
 #include <QTextStream>
 #include <QToolButton>
diff --git a/ui/qt/traffic_table_dialog.h b/ui/qt/traffic_table_dialog.h
index e8b6ba39fb..acf8d1342e 100644
--- a/ui/qt/traffic_table_dialog.h
+++ b/ui/qt/traffic_table_dialog.h
@@ -34,13 +34,15 @@
 #include "filter_action.h"
 #include "wireshark_dialog.h"
 
-#include <QPushButton>
-#include <QCheckBox>
 #include <QDialog>
-#include <QDialogButtonBox>
 #include <QMenu>
-#include <QTabWidget>
-#include <QTreeWidget>
+#include <QTreeWidgetItem>
+
+class QCheckBox;
+class QDialogButtonBox;
+class QPushButton;
+class QTabWidget;
+class QTreeWidget;
 
 namespace Ui {
 class TrafficTableDialog;
diff --git a/ui/qt/uat_dialog.cpp b/ui/qt/uat_dialog.cpp
index ab96ad3257..d13eeec088 100644
--- a/ui/qt/uat_dialog.cpp
+++ b/ui/qt/uat_dialog.cpp
@@ -31,10 +31,12 @@
 
 #include "qt_ui_utils.h"
 
+#include <QComboBox>
 #include <QDesktopServices>
 #include <QFileDialog>
 #include <QFont>
 #include <QKeyEvent>
+#include <QPushButton>
 #include <QTreeWidget>
 #include <QTreeWidgetItemIterator>
 #include <QUrl>
diff --git a/ui/qt/uat_dialog.h b/ui/qt/uat_dialog.h
index 525be44d12..3906f78a0b 100644
--- a/ui/qt/uat_dialog.h
+++ b/ui/qt/uat_dialog.h
@@ -30,11 +30,11 @@
 
 #include "syntax_line_edit.h"
 
-#include <QComboBox>
 #include <QDialog>
-#include <QLineEdit>
-#include <QPushButton>
-#include <QTreeWidgetItem>
+
+class QComboBox;
+class QPushButton;
+class QTreeWidgetItem;
 
 namespace Ui {
 class UatDialog;
diff --git a/ui/qt/wireshark_application.cpp b/ui/qt/wireshark_application.cpp
index 4288d26a89..d27dcc77a4 100644
--- a/ui/qt/wireshark_application.cpp
+++ b/ui/qt/wireshark_application.cpp
@@ -65,6 +65,8 @@
 #include <QLibraryInfo>
 #include <QLocale>
 #include <QMutableListIterator>
+#include <QSocketNotifier>
+#include <QThread>
 #include <QTimer>
 #include <QUrl>
 
diff --git a/ui/qt/wireshark_application.h b/ui/qt/wireshark_application.h
index f66a926e09..a23e4b86ed 100644
--- a/ui/qt/wireshark_application.h
+++ b/ui/qt/wireshark_application.h
@@ -36,15 +36,13 @@
 #include "ui/help_url.h"
 
 #include <QApplication>
-#include <QFileInfo>
+#include <QDir>
 #include <QFont>
 #include <QIcon>
-#include <QList>
-#include <QSocketNotifier>
-#include <QThread>
 #include <QTimer>
 #include <QTranslator>
 
+class QSocketNotifier;
 
 // Recent items:
 // - Read from prefs