Remove qDeleteInEventHandler
It's equivalent to delete these days, and has been for a long time, since 2011 in fact, when the last remnants of QT_JAMBI_BUILD were removed. Change-Id: I7703e41c04204844da4ee75fa251b361e0db4ead Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>bb10
parent
400426acb2
commit
c90ee82789
|
|
@ -1430,7 +1430,7 @@ bool QObject::event(QEvent *e)
|
|||
break;
|
||||
|
||||
case QEvent::DeferredDelete:
|
||||
qDeleteInEventHandler(this);
|
||||
delete this;
|
||||
break;
|
||||
|
||||
case QEvent::MetaCall:
|
||||
|
|
@ -4940,11 +4940,6 @@ QDebug operator<<(QDebug dbg, const QObject *o)
|
|||
Synonym for QList<QObject *>.
|
||||
*/
|
||||
|
||||
void qDeleteInEventHandler(QObject *o)
|
||||
{
|
||||
delete o;
|
||||
}
|
||||
|
||||
/*!
|
||||
\fn template<typename PointerToMemberFunction> QMetaObject::Connection QObject::connect(const QObject *sender, PointerToMemberFunction signal, const QObject *receiver, PointerToMemberFunction method, Qt::ConnectionType type)
|
||||
\overload connect()
|
||||
|
|
|
|||
|
|
@ -460,8 +460,6 @@ private:
|
|||
bool reset;
|
||||
};
|
||||
|
||||
void Q_CORE_EXPORT qDeleteInEventHandler(QObject *o);
|
||||
|
||||
struct QAbstractDynamicMetaObject;
|
||||
struct Q_CORE_EXPORT QDynamicMetaObjectData
|
||||
{
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@ void QSingleShotTimer::timerEvent(QTimerEvent *)
|
|||
// we would like to use delete later here, but it feels like a
|
||||
// waste to post a new event to handle this event, so we just unset the flag
|
||||
// and explicitly delete...
|
||||
qDeleteInEventHandler(this);
|
||||
delete this;
|
||||
}
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
|
|
|||
|
|
@ -948,15 +948,15 @@ void QNativeSocketEngine::close()
|
|||
d->peerAddress.clear();
|
||||
d->inboundStreamCount = d->outboundStreamCount = 0;
|
||||
if (d->readNotifier) {
|
||||
qDeleteInEventHandler(d->readNotifier);
|
||||
delete d->readNotifier;
|
||||
d->readNotifier = nullptr;
|
||||
}
|
||||
if (d->writeNotifier) {
|
||||
qDeleteInEventHandler(d->writeNotifier);
|
||||
delete d->writeNotifier;
|
||||
d->writeNotifier = nullptr;
|
||||
}
|
||||
if (d->exceptNotifier) {
|
||||
qDeleteInEventHandler(d->exceptNotifier);
|
||||
delete d->exceptNotifier;
|
||||
d->exceptNotifier = nullptr;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -97,8 +97,6 @@ QT_BEGIN_NAMESPACE
|
|||
\sa QToolTip
|
||||
*/
|
||||
|
||||
Q_CORE_EXPORT void qDeleteInEventHandler(QObject *o);
|
||||
|
||||
class QWhatsThat : public QWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
|
|
@ -610,7 +608,7 @@ void QWhatsThis::showText(const QPoint &pos, const QString &text, QWidget *w)
|
|||
*/
|
||||
void QWhatsThis::hideText()
|
||||
{
|
||||
qDeleteInEventHandler(QWhatsThat::instance);
|
||||
delete QWhatsThat::instance;
|
||||
}
|
||||
|
||||
/*!
|
||||
|
|
|
|||
|
|
@ -520,7 +520,7 @@ void QStatusBar::clearMessage()
|
|||
if (d->tempItem.isEmpty())
|
||||
return;
|
||||
if (d->timer) {
|
||||
qDeleteInEventHandler(d->timer);
|
||||
delete d->timer;
|
||||
d->timer = nullptr;
|
||||
}
|
||||
d->tempItem.clear();
|
||||
|
|
|
|||
Loading…
Reference in New Issue