From 0554d1391028e6deffd7b52fa95650bc1f95d295 Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Mon, 13 Feb 2012 14:43:40 +0100 Subject: Remove needless line "#define d d_ptr" 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 Reviewed-by: Thiago Macieira --- src/network/ssl/qsslsocket.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index ffc9f3f9fe..311ac5fe86 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -2345,6 +2345,4 @@ QList QSslSocketPrivate::unixRootCertDirectories() QT_END_NAMESPACE -// For private slots -#define d d_ptr #include "moc_qsslsocket.cpp" -- cgit v1.2.3