aboutsummaryrefslogtreecommitdiffstats
path: root/ui/qt
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2021-10-07 17:48:26 -0700
committerWireshark GitLab Utility <gerald+gitlab-utility@wireshark.org>2021-10-08 03:29:30 +0000
commit991fc16e85fc3aa35b528af8b0256646b226471f (patch)
treeb4a7bfe15ac7d7471a8961a8efc93cdba652f703 /ui/qt
parent4d2f4692129b1953c8631d58036bd6ce8cde6d50 (diff)
Qt: Remove Q_OBJECT in a few places where it's not needed.
Q_OBJECT is only needed for signals+slots, translations, and other meta-object services. Remove it in some classes, since having it means we're generating and compiling code unnecessarily.
Diffstat (limited to 'ui/qt')
-rw-r--r--ui/qt/manager/preference_manager.h3
-rw-r--r--ui/qt/models/uat_model.h2
-rw-r--r--ui/qt/tabnav_tree_widget.h1
-rw-r--r--ui/qt/utils/color_utils.h5
-rw-r--r--ui/qt/utils/rtp_audio_file.h2
-rw-r--r--ui/qt/utils/rtp_audio_routing_filter.h2
-rw-r--r--ui/qt/utils/rtp_audio_silence_generator.h2
7 files changed, 0 insertions, 17 deletions
diff --git a/ui/qt/manager/preference_manager.h b/ui/qt/manager/preference_manager.h
index d948c6c8e1..4817a3187f 100644
--- a/ui/qt/manager/preference_manager.h
+++ b/ui/qt/manager/preference_manager.h
@@ -25,8 +25,6 @@ class WiresharkPreference;
class PreferenceManager : public QObject
{
- Q_OBJECT
-
public:
static PreferenceManager* instance();
virtual ~PreferenceManager();
@@ -44,7 +42,6 @@ private:
class PreferenceFactory : public QObject
{
- Q_OBJECT
public:
virtual ~PreferenceFactory();
virtual WiresharkPreference * create(QObject * parent = Q_NULLPTR) = 0;
diff --git a/ui/qt/models/uat_model.h b/ui/qt/models/uat_model.h
index 7008db8b30..7b788f2289 100644
--- a/ui/qt/models/uat_model.h
+++ b/ui/qt/models/uat_model.h
@@ -23,8 +23,6 @@
class UatModel : public QAbstractTableModel
{
- Q_OBJECT
-
public:
UatModel(QObject *parent, uat_t *uat = 0);
UatModel(QObject *parent, QString tableName);
diff --git a/ui/qt/tabnav_tree_widget.h b/ui/qt/tabnav_tree_widget.h
index 9dc7d57ee8..e42800909c 100644
--- a/ui/qt/tabnav_tree_widget.h
+++ b/ui/qt/tabnav_tree_widget.h
@@ -22,7 +22,6 @@
*/
class TabnavTreeWidget : public QTreeWidget
{
- Q_OBJECT
public:
TabnavTreeWidget(QWidget *parent = 0);
QModelIndex moveCursor(CursorAction cursorAction, Qt::KeyboardModifiers modifiers);
diff --git a/ui/qt/utils/color_utils.h b/ui/qt/utils/color_utils.h
index ccee66fb02..d5bc4bc808 100644
--- a/ui/qt/utils/color_utils.h
+++ b/ui/qt/utils/color_utils.h
@@ -22,7 +22,6 @@
class ColorUtils : public QObject
{
- Q_OBJECT
public:
explicit ColorUtils(QObject *parent = 0);
@@ -77,10 +76,6 @@ public:
*/
static const QColor warningBackground();
-signals:
-
-public slots:
-
private:
static QList<QRgb> graph_colors_;
static QList<QRgb> sequence_colors_;
diff --git a/ui/qt/utils/rtp_audio_file.h b/ui/qt/utils/rtp_audio_file.h
index 15a1b2929c..8d6d145d6c 100644
--- a/ui/qt/utils/rtp_audio_file.h
+++ b/ui/qt/utils/rtp_audio_file.h
@@ -44,8 +44,6 @@ typedef struct {
class RtpAudioFile: public QIODevice
{
- Q_OBJECT
-
public:
explicit RtpAudioFile(bool use_disk_for_temp, bool use_disk_for_frames);
~RtpAudioFile();
diff --git a/ui/qt/utils/rtp_audio_routing_filter.h b/ui/qt/utils/rtp_audio_routing_filter.h
index 783e933897..0b9081d9b9 100644
--- a/ui/qt/utils/rtp_audio_routing_filter.h
+++ b/ui/qt/utils/rtp_audio_routing_filter.h
@@ -20,8 +20,6 @@
class AudioRoutingFilter: public QIODevice
{
- Q_OBJECT
-
public:
explicit AudioRoutingFilter(QIODevice *input, bool stereo_required, AudioRouting audio_routing);
~AudioRoutingFilter() { }
diff --git a/ui/qt/utils/rtp_audio_silence_generator.h b/ui/qt/utils/rtp_audio_silence_generator.h
index ea6f6c9df7..323000b2d2 100644
--- a/ui/qt/utils/rtp_audio_silence_generator.h
+++ b/ui/qt/utils/rtp_audio_silence_generator.h
@@ -16,8 +16,6 @@
class AudioSilenceGenerator: public QIODevice
{
- Q_OBJECT
-
public:
explicit AudioSilenceGenerator();
~AudioSilenceGenerator() { }