diff options
author | Iain <qt-info@nokia.com> | 2009-08-21 13:23:16 (GMT) |
---|---|---|
committer | Iain <qt-info@nokia.com> | 2009-08-21 13:23:16 (GMT) |
commit | d2cfe342ff109e7135fe2fcb00f60d918a7bfaa5 (patch) | |
tree | 26a2edc99e561721fad57d27f84a2a6c0be73a3c /src/network/ssl/qsslcertificate.cpp | |
parent | 6df41a9378e39f4d46cee1a085463d55fe2af5aa (diff) | |
parent | ab1df6dea670a60bfef5efd81d6687f9534cfc5d (diff) | |
download | Qt-d2cfe342ff109e7135fe2fcb00f60d918a7bfaa5.zip Qt-d2cfe342ff109e7135fe2fcb00f60d918a7bfaa5.tar.gz Qt-d2cfe342ff109e7135fe2fcb00f60d918a7bfaa5.tar.bz2 |
Merge commit 'origin/master' into symbolVisibility
Diffstat (limited to 'src/network/ssl/qsslcertificate.cpp')
-rw-r--r-- | src/network/ssl/qsslcertificate.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp index 2ea6d9f..a09b8c43 100644 --- a/src/network/ssl/qsslcertificate.cpp +++ b/src/network/ssl/qsslcertificate.cpp @@ -159,9 +159,8 @@ QSslCertificate::QSslCertificate(const QByteArray &data, QSsl::EncodingFormat fo /*! Constructs an identical copy of \a other. */ -QSslCertificate::QSslCertificate(const QSslCertificate &other) : d(other.d.data()) +QSslCertificate::QSslCertificate(const QSslCertificate &other) : d(other.d) { - d->ref.ref(); } /*! @@ -177,7 +176,7 @@ QSslCertificate::~QSslCertificate() */ QSslCertificate &QSslCertificate::operator=(const QSslCertificate &other) { - d.assign(other.d.data()); + d = other.d; return *this; } @@ -243,7 +242,7 @@ void QSslCertificate::clear() { if (isNull()) return; - d.reset(new QSslCertificatePrivate); + d = new QSslCertificatePrivate; } /*! |