Qt: Remove more Q_OBJECT macro calls.

31 files changed, 3 insertions, 68 deletions

diff --git a/ui/qt/conversation_hash_tables_dialog.h b/ui/qt/conversation_hash_tables_dialog.h
index 0bfcc8bc3f..b5af346cba 100644
--- a/ui/qt/conversation_hash_tables_dialog.h
+++ b/ui/qt/conversation_hash_tables_dialog.h
@@ -19,8 +19,6 @@ class ConversationHashTablesDialog;
 
 class ConversationHashTablesDialog : public GeometryStateDialog
 {
-    Q_OBJECT
-
 public:
     explicit ConversationHashTablesDialog(QWidget *parent = 0);
     ~ConversationHashTablesDialog();
diff --git a/ui/qt/geometry_state_dialog.h b/ui/qt/geometry_state_dialog.h
index 46d7eb45f3..7e28719b01 100644
--- a/ui/qt/geometry_state_dialog.h
+++ b/ui/qt/geometry_state_dialog.h
@@ -14,8 +14,6 @@
 
 class GeometryStateDialog : public QDialog
 {
-    Q_OBJECT
-
 public:
 
 // As discussed in change 7072, QDialogs have different minimize and "on
diff --git a/ui/qt/manager/preference_manager.cpp b/ui/qt/manager/preference_manager.cpp
index 83baca1120..28cfe42a3d 100644
--- a/ui/qt/manager/preference_manager.cpp
+++ b/ui/qt/manager/preference_manager.cpp
@@ -61,7 +61,8 @@ WiresharkPreference * PreferenceManager::getPreference(PrefsItem * pref)
         return Q_NULLPTR;
 
     /* All actions are parented with this manager, to clear the objects together with the manager */
-    WiresharkPreference * wspref = qobject_cast<WiresharkPreference *>(PreferenceManager::factories()[key]->create(this));
+//    WiresharkPreference * wspref = qobject_cast<WiresharkPreference *>(PreferenceManager::factories()[key]->create(this));
+    WiresharkPreference * wspref = PreferenceManager::factories()[key]->create(this);
     if (wspref)
         wspref->setPrefsItem(pref);
 
diff --git a/ui/qt/manager/wireshark_preference.h b/ui/qt/manager/wireshark_preference.h
index 11cba31415..ef60cf2b00 100644
--- a/ui/qt/manager/wireshark_preference.h
+++ b/ui/qt/manager/wireshark_preference.h
@@ -18,7 +18,6 @@
 
 class WiresharkPreference : public QObject
 {
-    Q_OBJECT
 public:
     explicit Q_INVOKABLE WiresharkPreference(QObject * parent = Q_NULLPTR);
 
diff --git a/ui/qt/models/astringlist_list_model.h b/ui/qt/models/astringlist_list_model.h
index 02d96c0fb0..c505a6175c 100644
--- a/ui/qt/models/astringlist_list_model.h
+++ b/ui/qt/models/astringlist_list_model.h
@@ -21,8 +21,6 @@
 
 class AStringListListModel : public QAbstractTableModel
 {
-    Q_OBJECT
-
 public:
     explicit AStringListListModel(QObject * parent = Q_NULLPTR);
     virtual ~AStringListListModel();
@@ -93,7 +91,6 @@ private:
 
 class AStringListListUrlProxyModel : public QIdentityProxyModel
 {
-    Q_OBJECT
 public:
     explicit AStringListListUrlProxyModel(QObject * parent = Q_NULLPTR);
 
diff --git a/ui/qt/models/coloring_rules_model.h b/ui/qt/models/coloring_rules_model.h
index f9cb6583ec..ad51a0828e 100644
--- a/ui/qt/models/coloring_rules_model.h
+++ b/ui/qt/models/coloring_rules_model.h
@@ -44,8 +44,6 @@ public:
 
 class ColoringRulesModel : public QAbstractItemModel
 {
-    Q_OBJECT
-
 public:
     ColoringRulesModel(QColor defaultForeground, QColor defaultBackground, QObject *parent);
     virtual ~ColoringRulesModel();
diff --git a/ui/qt/models/column_list_model.h b/ui/qt/models/column_list_model.h
index 38b7a50838..b0cc2581c7 100644
--- a/ui/qt/models/column_list_model.h
+++ b/ui/qt/models/column_list_model.h
@@ -32,7 +32,6 @@ private:
 
 class ColumnTypeDelegate : public QStyledItemDelegate
 {
-    Q_OBJECT
 public:
     ColumnTypeDelegate(QObject * parent = Q_NULLPTR);
 
@@ -49,8 +48,6 @@ public:
 
 class ColumnListModel : public QAbstractTableModel
 {
-    Q_OBJECT
-
 public:
     ColumnListModel(QObject * parent = Q_NULLPTR);
 
diff --git a/ui/qt/models/credentials_model.h b/ui/qt/models/credentials_model.h
index bdb62d7764..4a75126e64 100644
--- a/ui/qt/models/credentials_model.h
+++ b/ui/qt/models/credentials_model.h
@@ -22,7 +22,6 @@
 
 class CredentialsModel : public QAbstractListModel
 {
-    Q_OBJECT
 public:
     CredentialsModel(QObject *parent);
     virtual int rowCount(const QModelIndex &parent = QModelIndex()) const ;
diff --git a/ui/qt/models/decode_as_delegate.h b/ui/qt/models/decode_as_delegate.h
index 88a9b6c8b4..9466719bd1 100644
--- a/ui/qt/models/decode_as_delegate.h
+++ b/ui/qt/models/decode_as_delegate.h
@@ -29,8 +29,6 @@ typedef struct _packet_proto_data_t {
 
 class DecodeAsDelegate : public QStyledItemDelegate
 {
-    Q_OBJECT
-
 public:
     DecodeAsDelegate(QObject *parent = 0, capture_file *cf = NULL);
 
diff --git a/ui/qt/models/dissector_tables_model.h b/ui/qt/models/dissector_tables_model.h
index 8d27eafa6d..d87093d981 100644
--- a/ui/qt/models/dissector_tables_model.h
+++ b/ui/qt/models/dissector_tables_model.h
@@ -34,8 +34,6 @@ protected:
 
 class DissectorTablesModel : public QAbstractItemModel
 {
-    Q_OBJECT
-
 public:
     explicit DissectorTablesModel(QObject * parent = Q_NULLPTR);
     virtual ~DissectorTablesModel();
@@ -62,7 +60,6 @@ private:
 
 class DissectorTablesProxyModel : public QSortFilterProxyModel
 {
-    Q_OBJECT
 public:
 
     explicit DissectorTablesProxyModel(QObject * parent = Q_NULLPTR);
diff --git a/ui/qt/models/enabled_protocols_model.h b/ui/qt/models/enabled_protocols_model.h
index e5e02c2ef2..1f25fcf820 100644
--- a/ui/qt/models/enabled_protocols_model.h
+++ b/ui/qt/models/enabled_protocols_model.h
@@ -54,8 +54,6 @@ protected:
 
 class EnabledProtocolsModel : public QAbstractItemModel
 {
-    Q_OBJECT
-
 public:
     explicit EnabledProtocolsModel(QObject * parent = Q_NULLPTR);
     virtual ~EnabledProtocolsModel();
diff --git a/ui/qt/models/expert_info_model.h b/ui/qt/models/expert_info_model.h
index 8a95424774..ca558b0e81 100644
--- a/ui/qt/models/expert_info_model.h
+++ b/ui/qt/models/expert_info_model.h
@@ -65,8 +65,6 @@ private:
 
 class ExpertInfoModel : public QAbstractItemModel
 {
-    Q_OBJECT
-
 public:
     ExpertInfoModel(CaptureFile& capture_file, QObject *parent = 0);
     virtual ~ExpertInfoModel();
diff --git a/ui/qt/models/expert_info_proxy_model.h b/ui/qt/models/expert_info_proxy_model.h
index 300a887f75..59241c6f04 100644
--- a/ui/qt/models/expert_info_proxy_model.h
+++ b/ui/qt/models/expert_info_proxy_model.h
@@ -19,8 +19,6 @@ class ExpertPacketItem;
 
 class ExpertInfoProxyModel : public QSortFilterProxyModel
 {
-    Q_OBJECT
-
 public:
     ExpertInfoProxyModel(QObject *parent = 0);
 
diff --git a/ui/qt/models/export_objects_model.h b/ui/qt/models/export_objects_model.h
index f254fca3ff..3930f0e729 100644
--- a/ui/qt/models/export_objects_model.h
+++ b/ui/qt/models/export_objects_model.h
@@ -26,8 +26,6 @@ typedef struct export_object_list_gui_t {
 
 class ExportObjectModel : public QAbstractTableModel
 {
-    Q_OBJECT
-
 public:
     ExportObjectModel(register_eo_t* eo, QObject *parent);
 
@@ -69,7 +67,6 @@ private:
 
 class ExportObjectProxyModel : public QSortFilterProxyModel
 {
-    Q_OBJECT
 public:
 
     explicit ExportObjectProxyModel(QObject * parent = Q_NULLPTR);
diff --git a/ui/qt/models/fileset_entry_model.h b/ui/qt/models/fileset_entry_model.h
index bbb23043ad..4de658f428 100644
--- a/ui/qt/models/fileset_entry_model.h
+++ b/ui/qt/models/fileset_entry_model.h
@@ -22,8 +22,6 @@
 
 class FilesetEntryModel : public QAbstractItemModel
 {
-    Q_OBJECT
-
 public:
     explicit FilesetEntryModel(QObject * parent = 0);
 
diff --git a/ui/qt/models/filter_list_model.h b/ui/qt/models/filter_list_model.h
index 6fa6c87f96..1b4739a52e 100644
--- a/ui/qt/models/filter_list_model.h
+++ b/ui/qt/models/filter_list_model.h
@@ -19,8 +19,6 @@
 
 class FilterListModel : public QAbstractListModel
 {
-    Q_OBJECT
-
 public:
     enum FilterListType {
         Display,
diff --git a/ui/qt/models/info_proxy_model.h b/ui/qt/models/info_proxy_model.h
index cc63781243..cd7187f637 100644
--- a/ui/qt/models/info_proxy_model.h
+++ b/ui/qt/models/info_proxy_model.h
@@ -18,8 +18,6 @@
 
 class InfoProxyModel : public QIdentityProxyModel
 {
-    Q_OBJECT
-
 public:
     explicit InfoProxyModel(QObject * parent = 0);
     ~InfoProxyModel();
diff --git a/ui/qt/models/interface_tree_cache_model.h b/ui/qt/models/interface_tree_cache_model.h
index c09264a002..752bb90fc1 100644
--- a/ui/qt/models/interface_tree_cache_model.h
+++ b/ui/qt/models/interface_tree_cache_model.h
@@ -19,8 +19,6 @@
 
 class InterfaceTreeCacheModel : public QIdentityProxyModel
 {
-    Q_OBJECT
-
 public:
     explicit InterfaceTreeCacheModel(QObject *parent);
     ~InterfaceTreeCacheModel();
diff --git a/ui/qt/models/interface_tree_model.h b/ui/qt/models/interface_tree_model.h
index cfe17cec7e..cb66c137ac 100644
--- a/ui/qt/models/interface_tree_model.h
+++ b/ui/qt/models/interface_tree_model.h
@@ -54,7 +54,7 @@ enum InterfaceTreeColumns
 
 class InterfaceTreeModel : public QAbstractTableModel
 {
-    Q_OBJECT
+    //Q_OBJECT
 public:
     InterfaceTreeModel(QObject *parent);
     ~InterfaceTreeModel();
diff --git a/ui/qt/models/percent_bar_delegate.h b/ui/qt/models/percent_bar_delegate.h
index d367fafce8..baab083e71 100644
--- a/ui/qt/models/percent_bar_delegate.h
+++ b/ui/qt/models/percent_bar_delegate.h
@@ -35,8 +35,6 @@
 
 class PercentBarDelegate : public QStyledItemDelegate
 {
-    Q_OBJECT
-
 public:
     PercentBarDelegate(QWidget *parent = 0) : QStyledItemDelegate(parent) { }
 
diff --git a/ui/qt/models/pref_delegate.h b/ui/qt/models/pref_delegate.h
index 8c41493f88..ca1b25b1e6 100644
--- a/ui/qt/models/pref_delegate.h
+++ b/ui/qt/models/pref_delegate.h
@@ -20,8 +20,6 @@
 
 class AdvancedPrefDelegate : public QStyledItemDelegate
 {
-    Q_OBJECT
-
 public:
     AdvancedPrefDelegate(QObject *parent = 0);
 
diff --git a/ui/qt/models/pref_models.h b/ui/qt/models/pref_models.h
index 880dce6316..7b95917d00 100644
--- a/ui/qt/models/pref_models.h
+++ b/ui/qt/models/pref_models.h
@@ -49,8 +49,6 @@ private:
 
 class PrefsModel : public QAbstractItemModel
 {
-    Q_OBJECT
-
 public:
     explicit PrefsModel(QObject * parent = Q_NULLPTR);
     virtual ~PrefsModel();
@@ -93,7 +91,6 @@ private:
 
 class AdvancedPrefsModel : public QSortFilterProxyModel
 {
-    Q_OBJECT
 public:
 
     explicit AdvancedPrefsModel(QObject * parent = Q_NULLPTR);
@@ -131,7 +128,6 @@ private:
 
 class ModulePrefsModel : public QSortFilterProxyModel
 {
-    Q_OBJECT
 public:
 
     explicit ModulePrefsModel(QObject * parent = Q_NULLPTR);
diff --git a/ui/qt/models/profile_model.h b/ui/qt/models/profile_model.h
index f94e291d3f..4cd40b0215 100644
--- a/ui/qt/models/profile_model.h
+++ b/ui/qt/models/profile_model.h
@@ -24,7 +24,6 @@ Q_DECLARE_LOGGING_CATEGORY(profileLogger)
 
 class ProfileSortModel : public QSortFilterProxyModel
 {
-    Q_OBJECT
 public:
     ProfileSortModel(QObject *parent = Q_NULLPTR);
 
diff --git a/ui/qt/models/related_packet_delegate.h b/ui/qt/models/related_packet_delegate.h
index 6b1f644739..4537bba66c 100644
--- a/ui/qt/models/related_packet_delegate.h
+++ b/ui/qt/models/related_packet_delegate.h
@@ -46,9 +46,6 @@ private:
     void drawArrow(QPainter *painter, const QPoint tail, const QPoint head, int head_size) const;
     void drawChevrons(QPainter *painter, const QPoint tail, const QPoint head, int head_size) const;
     void drawCheckMark(QPainter *painter, const QRect bbox) const;
-signals:
-
-
 };
 
 #endif // RELATED_PACKET_DELEGATE_H
diff --git a/ui/qt/models/resolved_addresses_models.h b/ui/qt/models/resolved_addresses_models.h
index f6e6b41c32..3bee0afe69 100644
--- a/ui/qt/models/resolved_addresses_models.h
+++ b/ui/qt/models/resolved_addresses_models.h
@@ -17,8 +17,6 @@
 
 class EthernetAddressModel : public AStringListListModel
 {
-    Q_OBJECT
-
 public:
     EthernetAddressModel(QObject * parent = Q_NULLPTR);
 
@@ -32,8 +30,6 @@ protected:
 
 class PortsModel : public AStringListListModel
 {
-    Q_OBJECT
-
 public:
     PortsModel(QObject * parent = Q_NULLPTR);
 
diff --git a/ui/qt/models/supported_protocols_model.h b/ui/qt/models/supported_protocols_model.h
index 80e2b4101d..6a2bc9dc40 100644
--- a/ui/qt/models/supported_protocols_model.h
+++ b/ui/qt/models/supported_protocols_model.h
@@ -41,8 +41,6 @@ private:
 
 class SupportedProtocolsModel : public QAbstractItemModel
 {
-    Q_OBJECT
-
 public:
     explicit SupportedProtocolsModel(QObject * parent = Q_NULLPTR);
     virtual ~SupportedProtocolsModel();
@@ -77,7 +75,6 @@ private:
 
 class SupportedProtocolsProxyModel : public QSortFilterProxyModel
 {
-    Q_OBJECT
 public:
 
     explicit SupportedProtocolsProxyModel(QObject * parent = Q_NULLPTR);
diff --git a/ui/qt/models/timeline_delegate.h b/ui/qt/models/timeline_delegate.h
index e0b0aa2aba..a36f6487c5 100644
--- a/ui/qt/models/timeline_delegate.h
+++ b/ui/qt/models/timeline_delegate.h
@@ -42,8 +42,6 @@ Q_DECLARE_METATYPE(timeline_span)
 
 class TimelineDelegate : public QStyledItemDelegate
 {
-    Q_OBJECT
-
 public:
     TimelineDelegate(QWidget *parent = 0);
 
diff --git a/ui/qt/models/url_link_delegate.h b/ui/qt/models/url_link_delegate.h
index 7057b8ff96..4ab1843368 100644
--- a/ui/qt/models/url_link_delegate.h
+++ b/ui/qt/models/url_link_delegate.h
@@ -19,8 +19,6 @@ class QRegExp;
 
 class UrlLinkDelegate : public QStyledItemDelegate
 {
-    Q_OBJECT
-
 public:
     explicit UrlLinkDelegate(QObject *parent = Q_NULLPTR);
     ~UrlLinkDelegate();
diff --git a/ui/qt/models/voip_calls_info_model.h b/ui/qt/models/voip_calls_info_model.h
index dad742a0d2..cf46b4c2d7 100644
--- a/ui/qt/models/voip_calls_info_model.h
+++ b/ui/qt/models/voip_calls_info_model.h
@@ -21,8 +21,6 @@
 
 class VoipCallsInfoModel : public QAbstractTableModel
 {
-    Q_OBJECT
-
 public:
     VoipCallsInfoModel(QObject *parent = 0);
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
@@ -61,8 +59,6 @@ private:
 
 class VoipCallsInfoSortedModel : public QSortFilterProxyModel
 {
-    Q_OBJECT
-
 public:
     VoipCallsInfoSortedModel(QObject *parent = 0);
 
diff --git a/ui/qt/scsi_service_response_time_dialog.h b/ui/qt/scsi_service_response_time_dialog.h
index 57de4c42ea..b12c54558f 100644
--- a/ui/qt/scsi_service_response_time_dialog.h
+++ b/ui/qt/scsi_service_response_time_dialog.h
@@ -16,8 +16,6 @@ class QComboBox;
 
 class ScsiServiceResponseTimeDialog : public ServiceResponseTimeDialog
 {
-    Q_OBJECT
-
 public:
 
     ScsiServiceResponseTimeDialog(QWidget &parent, CaptureFile &cf, struct register_srt *srt, const QString filter);
diff --git a/ui/qt/widgets/stock_icon_tool_button.h b/ui/qt/widgets/stock_icon_tool_button.h
index 3fd3d8867b..6302b13ef2 100644
--- a/ui/qt/widgets/stock_icon_tool_button.h
+++ b/ui/qt/widgets/stock_icon_tool_button.h
@@ -14,7 +14,6 @@
 
 class StockIconToolButton : public QToolButton
 {
-    Q_OBJECT
 public:
     explicit StockIconToolButton(QWidget * parent = 0, QString stock_icon_name = QString());