aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2021-10-22 16:28:36 -0700
committerWireshark GitLab Utility <gerald+gitlab-utility@wireshark.org>2021-10-23 00:37:03 +0000
commita8226d7b1da73b75e215fab20a4f8639d46c0ca3 (patch)
tree0adf53112d866d7d41e5f8b693a09fe18a93321e
parenta37168822b38d8bf2a646334bad20f27462bfe42 (diff)
downloadwireshark-a8226d7b1da73b75e215fab20a4f8639d46c0ca3.tar.gz
wireshark-a8226d7b1da73b75e215fab20a4f8639d46c0ca3.tar.bz2
wireshark-a8226d7b1da73b75e215fab20a4f8639d46c0ca3.zip
Qt: Add back some Q_OBJECT calls.
They're needed in some places for translations. (cherry picked from commit ca8e6f3db4eb5dce209ad55635e9fcd33410eb7d)
-rw-r--r--ui/qt/conversation_hash_tables_dialog.h2
-rw-r--r--ui/qt/models/coloring_rules_model.h2
-rw-r--r--ui/qt/models/column_list_model.h2
-rw-r--r--ui/qt/models/credentials_model.h2
-rw-r--r--ui/qt/models/dissector_tables_model.h5
-rw-r--r--ui/qt/models/enabled_protocols_model.h4
-rw-r--r--ui/qt/models/expert_info_proxy_model.h2
-rw-r--r--ui/qt/models/export_objects_model.h2
-rw-r--r--ui/qt/models/fileset_entry_model.h2
-rw-r--r--ui/qt/models/filter_list_model.h2
-rw-r--r--ui/qt/models/interface_tree_model.h3
-rw-r--r--ui/qt/models/pref_models.h5
-rw-r--r--ui/qt/models/profile_model.h2
-rw-r--r--ui/qt/models/resolved_addresses_models.h4
-rw-r--r--ui/qt/models/supported_protocols_model.h2
-rw-r--r--ui/qt/models/voip_calls_info_model.h2
-rw-r--r--ui/qt/scsi_service_response_time_dialog.h3
17 files changed, 41 insertions, 5 deletions
diff --git a/ui/qt/conversation_hash_tables_dialog.h b/ui/qt/conversation_hash_tables_dialog.h
index b5af346cba..0bfcc8bc3f 100644
--- a/ui/qt/conversation_hash_tables_dialog.h
+++ b/ui/qt/conversation_hash_tables_dialog.h
@@ -19,6 +19,8 @@ class ConversationHashTablesDialog;
class ConversationHashTablesDialog : public GeometryStateDialog
{
+ Q_OBJECT
+
public:
explicit ConversationHashTablesDialog(QWidget *parent = 0);
~ConversationHashTablesDialog();
diff --git a/ui/qt/models/coloring_rules_model.h b/ui/qt/models/coloring_rules_model.h
index ad51a0828e..f9cb6583ec 100644
--- a/ui/qt/models/coloring_rules_model.h
+++ b/ui/qt/models/coloring_rules_model.h
@@ -44,6 +44,8 @@ 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 b0cc2581c7..47002a93e5 100644
--- a/ui/qt/models/column_list_model.h
+++ b/ui/qt/models/column_list_model.h
@@ -48,6 +48,8 @@ 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 4a75126e64..9dcb81585e 100644
--- a/ui/qt/models/credentials_model.h
+++ b/ui/qt/models/credentials_model.h
@@ -22,6 +22,8 @@
class CredentialsModel : public QAbstractListModel
{
+ Q_OBJECT
+
public:
CredentialsModel(QObject *parent);
virtual int rowCount(const QModelIndex &parent = QModelIndex()) const ;
diff --git a/ui/qt/models/dissector_tables_model.h b/ui/qt/models/dissector_tables_model.h
index d87093d981..9d7191b6f4 100644
--- a/ui/qt/models/dissector_tables_model.h
+++ b/ui/qt/models/dissector_tables_model.h
@@ -34,6 +34,8 @@ protected:
class DissectorTablesModel : public QAbstractItemModel
{
+ Q_OBJECT
+
public:
explicit DissectorTablesModel(QObject * parent = Q_NULLPTR);
virtual ~DissectorTablesModel();
@@ -60,8 +62,9 @@ private:
class DissectorTablesProxyModel : public QSortFilterProxyModel
{
-public:
+ Q_OBJECT
+public:
explicit DissectorTablesProxyModel(QObject * parent = Q_NULLPTR);
virtual bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
diff --git a/ui/qt/models/enabled_protocols_model.h b/ui/qt/models/enabled_protocols_model.h
index 1f25fcf820..83340671a3 100644
--- a/ui/qt/models/enabled_protocols_model.h
+++ b/ui/qt/models/enabled_protocols_model.h
@@ -54,6 +54,8 @@ protected:
class EnabledProtocolsModel : public QAbstractItemModel
{
+ Q_OBJECT
+
public:
explicit EnabledProtocolsModel(QObject * parent = Q_NULLPTR);
virtual ~EnabledProtocolsModel();
@@ -97,8 +99,8 @@ private:
class EnabledProtocolsProxyModel : public QSortFilterProxyModel
{
Q_OBJECT
-public:
+public:
enum SearchType
{
EveryWhere,
diff --git a/ui/qt/models/expert_info_proxy_model.h b/ui/qt/models/expert_info_proxy_model.h
index 59241c6f04..300a887f75 100644
--- a/ui/qt/models/expert_info_proxy_model.h
+++ b/ui/qt/models/expert_info_proxy_model.h
@@ -19,6 +19,8 @@ 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 3930f0e729..ee32319319 100644
--- a/ui/qt/models/export_objects_model.h
+++ b/ui/qt/models/export_objects_model.h
@@ -26,6 +26,8 @@ typedef struct export_object_list_gui_t {
class ExportObjectModel : public QAbstractTableModel
{
+ Q_OBJECT
+
public:
ExportObjectModel(register_eo_t* eo, QObject *parent);
diff --git a/ui/qt/models/fileset_entry_model.h b/ui/qt/models/fileset_entry_model.h
index 4de658f428..bbb23043ad 100644
--- a/ui/qt/models/fileset_entry_model.h
+++ b/ui/qt/models/fileset_entry_model.h
@@ -22,6 +22,8 @@
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 1b4739a52e..6fa6c87f96 100644
--- a/ui/qt/models/filter_list_model.h
+++ b/ui/qt/models/filter_list_model.h
@@ -19,6 +19,8 @@
class FilterListModel : public QAbstractListModel
{
+ Q_OBJECT
+
public:
enum FilterListType {
Display,
diff --git a/ui/qt/models/interface_tree_model.h b/ui/qt/models/interface_tree_model.h
index cb66c137ac..eded0da960 100644
--- a/ui/qt/models/interface_tree_model.h
+++ b/ui/qt/models/interface_tree_model.h
@@ -54,7 +54,8 @@ enum InterfaceTreeColumns
class InterfaceTreeModel : public QAbstractTableModel
{
- //Q_OBJECT
+ Q_OBJECT
+
public:
InterfaceTreeModel(QObject *parent);
~InterfaceTreeModel();
diff --git a/ui/qt/models/pref_models.h b/ui/qt/models/pref_models.h
index 7b95917d00..af6cff594b 100644
--- a/ui/qt/models/pref_models.h
+++ b/ui/qt/models/pref_models.h
@@ -49,6 +49,8 @@ private:
class PrefsModel : public QAbstractItemModel
{
+ Q_OBJECT
+
public:
explicit PrefsModel(QObject * parent = Q_NULLPTR);
virtual ~PrefsModel();
@@ -91,8 +93,9 @@ private:
class AdvancedPrefsModel : public QSortFilterProxyModel
{
-public:
+ Q_OBJECT
+public:
explicit AdvancedPrefsModel(QObject * parent = Q_NULLPTR);
enum AdvancedPrefsModelColumn {
diff --git a/ui/qt/models/profile_model.h b/ui/qt/models/profile_model.h
index 4cd40b0215..3f5e7b5c0e 100644
--- a/ui/qt/models/profile_model.h
+++ b/ui/qt/models/profile_model.h
@@ -24,6 +24,8 @@ Q_DECLARE_LOGGING_CATEGORY(profileLogger)
class ProfileSortModel : public QSortFilterProxyModel
{
+ Q_OBJECT
+
public:
ProfileSortModel(QObject *parent = Q_NULLPTR);
diff --git a/ui/qt/models/resolved_addresses_models.h b/ui/qt/models/resolved_addresses_models.h
index 3bee0afe69..f6e6b41c32 100644
--- a/ui/qt/models/resolved_addresses_models.h
+++ b/ui/qt/models/resolved_addresses_models.h
@@ -17,6 +17,8 @@
class EthernetAddressModel : public AStringListListModel
{
+ Q_OBJECT
+
public:
EthernetAddressModel(QObject * parent = Q_NULLPTR);
@@ -30,6 +32,8 @@ 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 6a2bc9dc40..4760e8fcab 100644
--- a/ui/qt/models/supported_protocols_model.h
+++ b/ui/qt/models/supported_protocols_model.h
@@ -41,6 +41,8 @@ private:
class SupportedProtocolsModel : public QAbstractItemModel
{
+ Q_OBJECT
+
public:
explicit SupportedProtocolsModel(QObject * parent = Q_NULLPTR);
virtual ~SupportedProtocolsModel();
diff --git a/ui/qt/models/voip_calls_info_model.h b/ui/qt/models/voip_calls_info_model.h
index cf46b4c2d7..e7b2b84c6f 100644
--- a/ui/qt/models/voip_calls_info_model.h
+++ b/ui/qt/models/voip_calls_info_model.h
@@ -21,6 +21,8 @@
class VoipCallsInfoModel : public QAbstractTableModel
{
+ Q_OBJECT
+
public:
VoipCallsInfoModel(QObject *parent = 0);
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
diff --git a/ui/qt/scsi_service_response_time_dialog.h b/ui/qt/scsi_service_response_time_dialog.h
index b12c54558f..44fc07f3ee 100644
--- a/ui/qt/scsi_service_response_time_dialog.h
+++ b/ui/qt/scsi_service_response_time_dialog.h
@@ -16,8 +16,9 @@ class QComboBox;
class ScsiServiceResponseTimeDialog : public ServiceResponseTimeDialog
{
-public:
+ Q_OBJECT
+public:
ScsiServiceResponseTimeDialog(QWidget &parent, CaptureFile &cf, struct register_srt *srt, const QString filter);
static TapParameterDialog *createScsiSrtDialog(QWidget &parent, const QString, const QString opt_arg, CaptureFile &cf);