Remove needless line "#define d d_ptr"
authorKent Hansen <kent.hansen@nokia.com>
Mon, 13 Feb 2012 13:43:40 +0000 (14:43 +0100)
committerQt by Nokia <qt-info@nokia.com>
Wed, 15 Feb 2012 01:35:10 +0000 (02:35 +0100)
There was a time when qsslsocket.h declared its private slots as

Q_PRIVATE_SLOT(d, void _q_connectedSlot())

But now they are correctly declared as

Q_PRIVATE_SLOT(d_func(), void _q_connectedSlot())

so the "#define d d_ptr" hack isn't needed.
Specifically, the define would break moc-generated code that refers
to the member d of a structure (which a future moc revision does,
namely QByteArrayData::d).

Change-Id: Ic94fa4d523fb17e8088973cfc0d090d5cce97267
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
src/network/ssl/qsslsocket.cpp

index ffc9f3f..311ac5f 100644 (file)
@@ -2345,6 +2345,4 @@ QList<QByteArray> QSslSocketPrivate::unixRootCertDirectories()
 
 QT_END_NAMESPACE
 
-// For private slots
-#define d d_ptr
 #include "moc_qsslsocket.cpp"