Qt: Remove more Q_OBJECT macro calls.
This commit is contained in:
parent
f26ef902b2
commit
f9d3b9d51a
|
@ -19,8 +19,6 @@ class ConversationHashTablesDialog;
|
||||||
|
|
||||||
class ConversationHashTablesDialog : public GeometryStateDialog
|
class ConversationHashTablesDialog : public GeometryStateDialog
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit ConversationHashTablesDialog(QWidget *parent = 0);
|
explicit ConversationHashTablesDialog(QWidget *parent = 0);
|
||||||
~ConversationHashTablesDialog();
|
~ConversationHashTablesDialog();
|
||||||
|
|
|
@ -14,8 +14,6 @@
|
||||||
|
|
||||||
class GeometryStateDialog : public QDialog
|
class GeometryStateDialog : public QDialog
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
// As discussed in change 7072, QDialogs have different minimize and "on
|
// As discussed in change 7072, QDialogs have different minimize and "on
|
||||||
|
|
|
@ -61,7 +61,8 @@ WiresharkPreference * PreferenceManager::getPreference(PrefsItem * pref)
|
||||||
return Q_NULLPTR;
|
return Q_NULLPTR;
|
||||||
|
|
||||||
/* All actions are parented with this manager, to clear the objects together with the manager */
|
/* 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)
|
if (wspref)
|
||||||
wspref->setPrefsItem(pref);
|
wspref->setPrefsItem(pref);
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,6 @@
|
||||||
|
|
||||||
class WiresharkPreference : public QObject
|
class WiresharkPreference : public QObject
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
|
||||||
public:
|
public:
|
||||||
explicit Q_INVOKABLE WiresharkPreference(QObject * parent = Q_NULLPTR);
|
explicit Q_INVOKABLE WiresharkPreference(QObject * parent = Q_NULLPTR);
|
||||||
|
|
||||||
|
|
|
@ -21,8 +21,6 @@
|
||||||
|
|
||||||
class AStringListListModel : public QAbstractTableModel
|
class AStringListListModel : public QAbstractTableModel
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit AStringListListModel(QObject * parent = Q_NULLPTR);
|
explicit AStringListListModel(QObject * parent = Q_NULLPTR);
|
||||||
virtual ~AStringListListModel();
|
virtual ~AStringListListModel();
|
||||||
|
@ -93,7 +91,6 @@ private:
|
||||||
|
|
||||||
class AStringListListUrlProxyModel : public QIdentityProxyModel
|
class AStringListListUrlProxyModel : public QIdentityProxyModel
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
|
||||||
public:
|
public:
|
||||||
explicit AStringListListUrlProxyModel(QObject * parent = Q_NULLPTR);
|
explicit AStringListListUrlProxyModel(QObject * parent = Q_NULLPTR);
|
||||||
|
|
||||||
|
|
|
@ -44,8 +44,6 @@ public:
|
||||||
|
|
||||||
class ColoringRulesModel : public QAbstractItemModel
|
class ColoringRulesModel : public QAbstractItemModel
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
ColoringRulesModel(QColor defaultForeground, QColor defaultBackground, QObject *parent);
|
ColoringRulesModel(QColor defaultForeground, QColor defaultBackground, QObject *parent);
|
||||||
virtual ~ColoringRulesModel();
|
virtual ~ColoringRulesModel();
|
||||||
|
|
|
@ -32,7 +32,6 @@ private:
|
||||||
|
|
||||||
class ColumnTypeDelegate : public QStyledItemDelegate
|
class ColumnTypeDelegate : public QStyledItemDelegate
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
|
||||||
public:
|
public:
|
||||||
ColumnTypeDelegate(QObject * parent = Q_NULLPTR);
|
ColumnTypeDelegate(QObject * parent = Q_NULLPTR);
|
||||||
|
|
||||||
|
@ -49,8 +48,6 @@ public:
|
||||||
|
|
||||||
class ColumnListModel : public QAbstractTableModel
|
class ColumnListModel : public QAbstractTableModel
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
ColumnListModel(QObject * parent = Q_NULLPTR);
|
ColumnListModel(QObject * parent = Q_NULLPTR);
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,6 @@
|
||||||
|
|
||||||
class CredentialsModel : public QAbstractListModel
|
class CredentialsModel : public QAbstractListModel
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
|
||||||
public:
|
public:
|
||||||
CredentialsModel(QObject *parent);
|
CredentialsModel(QObject *parent);
|
||||||
virtual int rowCount(const QModelIndex &parent = QModelIndex()) const ;
|
virtual int rowCount(const QModelIndex &parent = QModelIndex()) const ;
|
||||||
|
|
|
@ -29,8 +29,6 @@ typedef struct _packet_proto_data_t {
|
||||||
|
|
||||||
class DecodeAsDelegate : public QStyledItemDelegate
|
class DecodeAsDelegate : public QStyledItemDelegate
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
DecodeAsDelegate(QObject *parent = 0, capture_file *cf = NULL);
|
DecodeAsDelegate(QObject *parent = 0, capture_file *cf = NULL);
|
||||||
|
|
||||||
|
|
|
@ -34,8 +34,6 @@ protected:
|
||||||
|
|
||||||
class DissectorTablesModel : public QAbstractItemModel
|
class DissectorTablesModel : public QAbstractItemModel
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit DissectorTablesModel(QObject * parent = Q_NULLPTR);
|
explicit DissectorTablesModel(QObject * parent = Q_NULLPTR);
|
||||||
virtual ~DissectorTablesModel();
|
virtual ~DissectorTablesModel();
|
||||||
|
@ -62,7 +60,6 @@ private:
|
||||||
|
|
||||||
class DissectorTablesProxyModel : public QSortFilterProxyModel
|
class DissectorTablesProxyModel : public QSortFilterProxyModel
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
explicit DissectorTablesProxyModel(QObject * parent = Q_NULLPTR);
|
explicit DissectorTablesProxyModel(QObject * parent = Q_NULLPTR);
|
||||||
|
|
|
@ -54,8 +54,6 @@ protected:
|
||||||
|
|
||||||
class EnabledProtocolsModel : public QAbstractItemModel
|
class EnabledProtocolsModel : public QAbstractItemModel
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit EnabledProtocolsModel(QObject * parent = Q_NULLPTR);
|
explicit EnabledProtocolsModel(QObject * parent = Q_NULLPTR);
|
||||||
virtual ~EnabledProtocolsModel();
|
virtual ~EnabledProtocolsModel();
|
||||||
|
|
|
@ -65,8 +65,6 @@ private:
|
||||||
|
|
||||||
class ExpertInfoModel : public QAbstractItemModel
|
class ExpertInfoModel : public QAbstractItemModel
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
ExpertInfoModel(CaptureFile& capture_file, QObject *parent = 0);
|
ExpertInfoModel(CaptureFile& capture_file, QObject *parent = 0);
|
||||||
virtual ~ExpertInfoModel();
|
virtual ~ExpertInfoModel();
|
||||||
|
|
|
@ -19,8 +19,6 @@ class ExpertPacketItem;
|
||||||
|
|
||||||
class ExpertInfoProxyModel : public QSortFilterProxyModel
|
class ExpertInfoProxyModel : public QSortFilterProxyModel
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
ExpertInfoProxyModel(QObject *parent = 0);
|
ExpertInfoProxyModel(QObject *parent = 0);
|
||||||
|
|
||||||
|
|
|
@ -26,8 +26,6 @@ typedef struct export_object_list_gui_t {
|
||||||
|
|
||||||
class ExportObjectModel : public QAbstractTableModel
|
class ExportObjectModel : public QAbstractTableModel
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
ExportObjectModel(register_eo_t* eo, QObject *parent);
|
ExportObjectModel(register_eo_t* eo, QObject *parent);
|
||||||
|
|
||||||
|
@ -69,7 +67,6 @@ private:
|
||||||
|
|
||||||
class ExportObjectProxyModel : public QSortFilterProxyModel
|
class ExportObjectProxyModel : public QSortFilterProxyModel
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
explicit ExportObjectProxyModel(QObject * parent = Q_NULLPTR);
|
explicit ExportObjectProxyModel(QObject * parent = Q_NULLPTR);
|
||||||
|
|
|
@ -22,8 +22,6 @@
|
||||||
|
|
||||||
class FilesetEntryModel : public QAbstractItemModel
|
class FilesetEntryModel : public QAbstractItemModel
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit FilesetEntryModel(QObject * parent = 0);
|
explicit FilesetEntryModel(QObject * parent = 0);
|
||||||
|
|
||||||
|
|
|
@ -19,8 +19,6 @@
|
||||||
|
|
||||||
class FilterListModel : public QAbstractListModel
|
class FilterListModel : public QAbstractListModel
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
enum FilterListType {
|
enum FilterListType {
|
||||||
Display,
|
Display,
|
||||||
|
|
|
@ -18,8 +18,6 @@
|
||||||
|
|
||||||
class InfoProxyModel : public QIdentityProxyModel
|
class InfoProxyModel : public QIdentityProxyModel
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit InfoProxyModel(QObject * parent = 0);
|
explicit InfoProxyModel(QObject * parent = 0);
|
||||||
~InfoProxyModel();
|
~InfoProxyModel();
|
||||||
|
|
|
@ -19,8 +19,6 @@
|
||||||
|
|
||||||
class InterfaceTreeCacheModel : public QIdentityProxyModel
|
class InterfaceTreeCacheModel : public QIdentityProxyModel
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit InterfaceTreeCacheModel(QObject *parent);
|
explicit InterfaceTreeCacheModel(QObject *parent);
|
||||||
~InterfaceTreeCacheModel();
|
~InterfaceTreeCacheModel();
|
||||||
|
|
|
@ -54,7 +54,7 @@ enum InterfaceTreeColumns
|
||||||
|
|
||||||
class InterfaceTreeModel : public QAbstractTableModel
|
class InterfaceTreeModel : public QAbstractTableModel
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
//Q_OBJECT
|
||||||
public:
|
public:
|
||||||
InterfaceTreeModel(QObject *parent);
|
InterfaceTreeModel(QObject *parent);
|
||||||
~InterfaceTreeModel();
|
~InterfaceTreeModel();
|
||||||
|
|
|
@ -35,8 +35,6 @@
|
||||||
|
|
||||||
class PercentBarDelegate : public QStyledItemDelegate
|
class PercentBarDelegate : public QStyledItemDelegate
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
PercentBarDelegate(QWidget *parent = 0) : QStyledItemDelegate(parent) { }
|
PercentBarDelegate(QWidget *parent = 0) : QStyledItemDelegate(parent) { }
|
||||||
|
|
||||||
|
|
|
@ -20,8 +20,6 @@
|
||||||
|
|
||||||
class AdvancedPrefDelegate : public QStyledItemDelegate
|
class AdvancedPrefDelegate : public QStyledItemDelegate
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
AdvancedPrefDelegate(QObject *parent = 0);
|
AdvancedPrefDelegate(QObject *parent = 0);
|
||||||
|
|
||||||
|
|
|
@ -49,8 +49,6 @@ private:
|
||||||
|
|
||||||
class PrefsModel : public QAbstractItemModel
|
class PrefsModel : public QAbstractItemModel
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit PrefsModel(QObject * parent = Q_NULLPTR);
|
explicit PrefsModel(QObject * parent = Q_NULLPTR);
|
||||||
virtual ~PrefsModel();
|
virtual ~PrefsModel();
|
||||||
|
@ -93,7 +91,6 @@ private:
|
||||||
|
|
||||||
class AdvancedPrefsModel : public QSortFilterProxyModel
|
class AdvancedPrefsModel : public QSortFilterProxyModel
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
explicit AdvancedPrefsModel(QObject * parent = Q_NULLPTR);
|
explicit AdvancedPrefsModel(QObject * parent = Q_NULLPTR);
|
||||||
|
@ -131,7 +128,6 @@ private:
|
||||||
|
|
||||||
class ModulePrefsModel : public QSortFilterProxyModel
|
class ModulePrefsModel : public QSortFilterProxyModel
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
explicit ModulePrefsModel(QObject * parent = Q_NULLPTR);
|
explicit ModulePrefsModel(QObject * parent = Q_NULLPTR);
|
||||||
|
|
|
@ -24,7 +24,6 @@ Q_DECLARE_LOGGING_CATEGORY(profileLogger)
|
||||||
|
|
||||||
class ProfileSortModel : public QSortFilterProxyModel
|
class ProfileSortModel : public QSortFilterProxyModel
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
|
||||||
public:
|
public:
|
||||||
ProfileSortModel(QObject *parent = Q_NULLPTR);
|
ProfileSortModel(QObject *parent = Q_NULLPTR);
|
||||||
|
|
||||||
|
|
|
@ -46,9 +46,6 @@ private:
|
||||||
void drawArrow(QPainter *painter, const QPoint tail, const QPoint head, int head_size) const;
|
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 drawChevrons(QPainter *painter, const QPoint tail, const QPoint head, int head_size) const;
|
||||||
void drawCheckMark(QPainter *painter, const QRect bbox) const;
|
void drawCheckMark(QPainter *painter, const QRect bbox) const;
|
||||||
signals:
|
|
||||||
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // RELATED_PACKET_DELEGATE_H
|
#endif // RELATED_PACKET_DELEGATE_H
|
||||||
|
|
|
@ -17,8 +17,6 @@
|
||||||
|
|
||||||
class EthernetAddressModel : public AStringListListModel
|
class EthernetAddressModel : public AStringListListModel
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
EthernetAddressModel(QObject * parent = Q_NULLPTR);
|
EthernetAddressModel(QObject * parent = Q_NULLPTR);
|
||||||
|
|
||||||
|
@ -32,8 +30,6 @@ protected:
|
||||||
|
|
||||||
class PortsModel : public AStringListListModel
|
class PortsModel : public AStringListListModel
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
PortsModel(QObject * parent = Q_NULLPTR);
|
PortsModel(QObject * parent = Q_NULLPTR);
|
||||||
|
|
||||||
|
|
|
@ -41,8 +41,6 @@ private:
|
||||||
|
|
||||||
class SupportedProtocolsModel : public QAbstractItemModel
|
class SupportedProtocolsModel : public QAbstractItemModel
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit SupportedProtocolsModel(QObject * parent = Q_NULLPTR);
|
explicit SupportedProtocolsModel(QObject * parent = Q_NULLPTR);
|
||||||
virtual ~SupportedProtocolsModel();
|
virtual ~SupportedProtocolsModel();
|
||||||
|
@ -77,7 +75,6 @@ private:
|
||||||
|
|
||||||
class SupportedProtocolsProxyModel : public QSortFilterProxyModel
|
class SupportedProtocolsProxyModel : public QSortFilterProxyModel
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
explicit SupportedProtocolsProxyModel(QObject * parent = Q_NULLPTR);
|
explicit SupportedProtocolsProxyModel(QObject * parent = Q_NULLPTR);
|
||||||
|
|
|
@ -42,8 +42,6 @@ Q_DECLARE_METATYPE(timeline_span)
|
||||||
|
|
||||||
class TimelineDelegate : public QStyledItemDelegate
|
class TimelineDelegate : public QStyledItemDelegate
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
TimelineDelegate(QWidget *parent = 0);
|
TimelineDelegate(QWidget *parent = 0);
|
||||||
|
|
||||||
|
|
|
@ -19,8 +19,6 @@ class QRegExp;
|
||||||
|
|
||||||
class UrlLinkDelegate : public QStyledItemDelegate
|
class UrlLinkDelegate : public QStyledItemDelegate
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit UrlLinkDelegate(QObject *parent = Q_NULLPTR);
|
explicit UrlLinkDelegate(QObject *parent = Q_NULLPTR);
|
||||||
~UrlLinkDelegate();
|
~UrlLinkDelegate();
|
||||||
|
|
|
@ -21,8 +21,6 @@
|
||||||
|
|
||||||
class VoipCallsInfoModel : public QAbstractTableModel
|
class VoipCallsInfoModel : public QAbstractTableModel
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
VoipCallsInfoModel(QObject *parent = 0);
|
VoipCallsInfoModel(QObject *parent = 0);
|
||||||
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
|
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
|
||||||
|
@ -61,8 +59,6 @@ private:
|
||||||
|
|
||||||
class VoipCallsInfoSortedModel : public QSortFilterProxyModel
|
class VoipCallsInfoSortedModel : public QSortFilterProxyModel
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
VoipCallsInfoSortedModel(QObject *parent = 0);
|
VoipCallsInfoSortedModel(QObject *parent = 0);
|
||||||
|
|
||||||
|
|
|
@ -16,8 +16,6 @@ class QComboBox;
|
||||||
|
|
||||||
class ScsiServiceResponseTimeDialog : public ServiceResponseTimeDialog
|
class ScsiServiceResponseTimeDialog : public ServiceResponseTimeDialog
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
ScsiServiceResponseTimeDialog(QWidget &parent, CaptureFile &cf, struct register_srt *srt, const QString filter);
|
ScsiServiceResponseTimeDialog(QWidget &parent, CaptureFile &cf, struct register_srt *srt, const QString filter);
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
|
|
||||||
class StockIconToolButton : public QToolButton
|
class StockIconToolButton : public QToolButton
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
|
||||||
public:
|
public:
|
||||||
explicit StockIconToolButton(QWidget * parent = 0, QString stock_icon_name = QString());
|
explicit StockIconToolButton(QWidget * parent = 0, QString stock_icon_name = QString());
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue