osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Qt: Remove more Q_OBJECT macro calls.

This commit is contained in:
Gerald Combs 2021-10-09 16:48:04 -07:00
parent f26ef902b2
commit f9d3b9d51a
31 changed files with 3 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/qt/conversation_hash_tables_dialog.h
View File

@ -19,8 +19,6 @@ class ConversationHashTablesDialog;
class ConversationHashTablesDialog : public GeometryStateDialog
{
Q_OBJECT
public:
explicit ConversationHashTablesDialog(QWidget *parent = 0);
~ConversationHashTablesDialog();

2
ui/qt/geometry_state_dialog.h
View File

@ -14,8 +14,6 @@
class GeometryStateDialog : public QDialog
{
Q_OBJECT
public:
// As discussed in change 7072, QDialogs have different minimize and "on

3
ui/qt/manager/preference_manager.cpp
View File

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

1
ui/qt/manager/wireshark_preference.h
View File

@ -18,7 +18,6 @@
class WiresharkPreference : public QObject
{
Q_OBJECT
public:
explicit Q_INVOKABLE WiresharkPreference(QObject * parent = Q_NULLPTR);

3
ui/qt/models/astringlist_list_model.h
View File

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

2
ui/qt/models/coloring_rules_model.h
View File

@ -44,8 +44,6 @@ public:
class ColoringRulesModel : public QAbstractItemModel
{
Q_OBJECT
public:
ColoringRulesModel(QColor defaultForeground, QColor defaultBackground, QObject *parent);
virtual ~ColoringRulesModel();

3
ui/qt/models/column_list_model.h
View File

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

1
ui/qt/models/credentials_model.h
View File

@ -22,7 +22,6 @@
class CredentialsModel : public QAbstractListModel
{
Q_OBJECT
public:
CredentialsModel(QObject *parent);
virtual int rowCount(const QModelIndex &parent = QModelIndex()) const ;

2
ui/qt/models/decode_as_delegate.h
View File

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

3
ui/qt/models/dissector_tables_model.h
View File

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

2
ui/qt/models/enabled_protocols_model.h
View File

@ -54,8 +54,6 @@ protected:
class EnabledProtocolsModel : public QAbstractItemModel
{
Q_OBJECT
public:
explicit EnabledProtocolsModel(QObject * parent = Q_NULLPTR);
virtual ~EnabledProtocolsModel();

2
ui/qt/models/expert_info_model.h
View File

@ -65,8 +65,6 @@ private:
class ExpertInfoModel : public QAbstractItemModel
{
Q_OBJECT
public:
ExpertInfoModel(CaptureFile& capture_file, QObject *parent = 0);
virtual ~ExpertInfoModel();

2
ui/qt/models/expert_info_proxy_model.h
View File

@ -19,8 +19,6 @@ class ExpertPacketItem;
class ExpertInfoProxyModel : public QSortFilterProxyModel
{
Q_OBJECT
public:
ExpertInfoProxyModel(QObject *parent = 0);

3
ui/qt/models/export_objects_model.h
View File

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

2
ui/qt/models/fileset_entry_model.h
View File

@ -22,8 +22,6 @@
class FilesetEntryModel : public QAbstractItemModel
{
Q_OBJECT
public:
explicit FilesetEntryModel(QObject * parent = 0);

2
ui/qt/models/filter_list_model.h
View File

@ -19,8 +19,6 @@
class FilterListModel : public QAbstractListModel
{
Q_OBJECT
public:
enum FilterListType {
Display,

2
ui/qt/models/info_proxy_model.h
View File

@ -18,8 +18,6 @@
class InfoProxyModel : public QIdentityProxyModel
{
Q_OBJECT
public:
explicit InfoProxyModel(QObject * parent = 0);
~InfoProxyModel();

2
ui/qt/models/interface_tree_cache_model.h
View File

@ -19,8 +19,6 @@
class InterfaceTreeCacheModel : public QIdentityProxyModel
{
Q_OBJECT
public:
explicit InterfaceTreeCacheModel(QObject *parent);
~InterfaceTreeCacheModel();

2
ui/qt/models/interface_tree_model.h
View File

@ -54,7 +54,7 @@ enum InterfaceTreeColumns
class InterfaceTreeModel : public QAbstractTableModel
{
Q_OBJECT
//Q_OBJECT
public:
InterfaceTreeModel(QObject *parent);
~InterfaceTreeModel();

2
ui/qt/models/percent_bar_delegate.h
View File

@ -35,8 +35,6 @@
class PercentBarDelegate : public QStyledItemDelegate
{
Q_OBJECT
public:
PercentBarDelegate(QWidget *parent = 0) : QStyledItemDelegate(parent) { }

2
ui/qt/models/pref_delegate.h
View File

@ -20,8 +20,6 @@
class AdvancedPrefDelegate : public QStyledItemDelegate
{
Q_OBJECT
public:
AdvancedPrefDelegate(QObject *parent = 0);

4
ui/qt/models/pref_models.h
View File

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

1
ui/qt/models/profile_model.h
View File

@ -24,7 +24,6 @@ Q_DECLARE_LOGGING_CATEGORY(profileLogger)
class ProfileSortModel : public QSortFilterProxyModel
{
Q_OBJECT
public:
ProfileSortModel(QObject *parent = Q_NULLPTR);

3
ui/qt/models/related_packet_delegate.h
View File

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

4
ui/qt/models/resolved_addresses_models.h
View File

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

3
ui/qt/models/supported_protocols_model.h
View File

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

2
ui/qt/models/timeline_delegate.h
View File

@ -42,8 +42,6 @@ Q_DECLARE_METATYPE(timeline_span)
class TimelineDelegate : public QStyledItemDelegate
{
Q_OBJECT
public:
TimelineDelegate(QWidget *parent = 0);

2
ui/qt/models/url_link_delegate.h
View File

@ -19,8 +19,6 @@ class QRegExp;
class UrlLinkDelegate : public QStyledItemDelegate
{
Q_OBJECT
public:
explicit UrlLinkDelegate(QObject *parent = Q_NULLPTR);
~UrlLinkDelegate();

4
ui/qt/models/voip_calls_info_model.h
View File

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

2
ui/qt/scsi_service_response_time_dialog.h
View File

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

1
ui/qt/widgets/stock_icon_tool_button.h
View File

@ -14,7 +14,6 @@
class StockIconToolButton : public QToolButton
{
Q_OBJECT
public:
explicit StockIconToolButton(QWidget * parent = 0, QString stock_icon_name = QString());