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>
This commit is contained in:
Gerald Combs 2015-02-08 12:24:19 -08:00 committed by Gerald Combs
parent 88d62dffe8
commit c34ded4ae2
37 changed files with 98 additions and 45 deletions

View File

@ -27,6 +27,7 @@
#include "ui/util.h"
#include <QLayout>
#include <QPropertyAnimation>
const int duration_ = 150;

View File

@ -23,7 +23,8 @@
#define ACCORDION_FRAME_H
#include <QFrame>
#include <QPropertyAnimation>
class QPropertyAnimation;
class AccordionFrame : public QFrame
{

View File

@ -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;

View File

@ -32,10 +32,9 @@
#include "epan/tap.h"
#include <QMenu>
#include <QPushButton>
#include <QTreeWidget>
class QAbstractButton;
class QPushButton;
class QTreeWidgetItem;
typedef struct _tapinfo_t {

View File

@ -31,7 +31,9 @@
#include "cfile.h"
#include <QTabWidget>
#include <QTreeWidget>
class QTreeWidget;
class QTreeWidgetItem;
class ByteViewTab : public QTabWidget
{

View File

@ -38,6 +38,7 @@
#include "syntax_line_edit.h"
#include "wireshark_application.h"
#include <QComboBox>
#include <QTreeWidgetItemIterator>
#include <QLineEdit>
#include <QKeyEvent>

View File

@ -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;

View File

@ -33,6 +33,8 @@
#include "wireshark_application.h"
#include <QCheckBox>
#include <QDialogButtonBox>
#include <QMessageBox>
#include <QPushButton>

View File

@ -31,6 +31,7 @@
#include "wireshark_application.h"
#include <QComboBox>
#include <QFont>
#include <QFontMetrics>
#include <QLineEdit>

View File

@ -28,10 +28,11 @@
#include "cfile.h"
#include <QComboBox>
#include <QDialog>
#include <QMap>
#include <QTreeWidgetItem>
class QTreeWidgetItem;
class QComboBox;
namespace Ui {
class DecodeAsDialog;

View File

@ -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");

View File

@ -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 *)

View File

@ -39,6 +39,7 @@
#include <QDateTime>
#include <QFontMetrics>
#include <QFont>
#include <QTreeWidgetItem>
#include <QUrl>
Q_DECLARE_METATYPE(fileset_entry *)

View File

@ -30,7 +30,8 @@
#include "fileset.h"
#include <QDialog>
#include <QTreeWidgetItem>
class QTreeWidgetItem;
namespace Ui {
class FileSetDialog;

View File

@ -32,6 +32,7 @@
#include "qt_ui_utils.h"
#include <QLineEdit>
#include <QKeyEvent>
#include <QTreeWidgetItemIterator>

View File

@ -23,8 +23,9 @@
#define FILTER_EXPRESSIONS_PREFERENCES_FRAME_H
#include <QFrame>
#include <QLineEdit>
#include <QTreeWidgetItem>
class QLineEdit;
class QTreeWidgetItem;
namespace Ui {
class FilterExpressionsPreferencesFrame;

View File

@ -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>

View File

@ -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;

View File

@ -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>

View File

@ -31,7 +31,10 @@
#include "cfile.h"
#include <epan/packet_info.h>
#include <QDialog>
#include <QTreeWidgetItem>
class QHeaderView;
class QMenu;
class QTreeWidgetItem;
namespace Ui
{

View File

@ -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>

View File

@ -31,7 +31,10 @@
#include "cfile.h"
#include <epan/packet_info.h>
#include <QDialog>
#include <QTreeWidgetItem>
class QHeaderView;
class QMenu;
class QTreeWidgetItem;
namespace Ui
{

View File

@ -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

View File

@ -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"

View File

@ -46,6 +46,8 @@
#include <QCheckBox>
#include <QFileDialog>
#include <QHBoxLayout>
#include <QLineEdit>
#include <QStandardItemModel>
#include <QTreeWidgetItemIterator>
// To do:

View File

@ -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
{

View File

@ -29,7 +29,6 @@
#include "related_packet_delegate.h"
#include <QTreeView>
#include <QTreeWidget>
#include <QMenu>
class QAction;

View File

@ -41,6 +41,7 @@
#include "wireshark_application.h"
#include <QColorDialog>
#include <QComboBox>
#include <QFileDialog>
#include <QFrame>
#include <QHBoxLayout>

View File

@ -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);

View File

@ -38,6 +38,8 @@
#include <QDir>
#include <QFont>
#include <QMessageBox>
#include <QPushButton>
#include <QTreeWidgetItem>
#include <QUrl>
Q_DECLARE_METATYPE(GList *)

View File

@ -23,8 +23,9 @@
#define PROFILE_DIALOG_H
#include <QDialog>
#include <QTreeWidgetItem>
#include <QPushButton>
class QPushButton;
class QTreeWidgetItem;
namespace Ui {
class ProfileDialog;

View File

@ -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>

View File

@ -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;

View File

@ -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>

View File

@ -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;

View File

@ -65,6 +65,8 @@
#include <QLibraryInfo>
#include <QLocale>
#include <QMutableListIterator>
#include <QSocketNotifier>
#include <QThread>
#include <QTimer>
#include <QUrl>

View File

@ -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