diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-08-21 05:22:59 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-08-21 05:22:59 (GMT) |
| commit | 9093368f33ddc422047103a89effcd40338b4dbc (patch) | |
| tree | 78c9660b403214de7ba793c9b06bbb0b65cd5eac /src/network/ssl/qsslcertificate.cpp | |
| parent | 5365c1cdf1e79b60f913f8fba2b5a25058d65b5c (diff) | |
| parent | 1af6fc12def29e3f44dd7fcf5635c688902f29c8 (diff) | |
| download | Qt-9093368f33ddc422047103a89effcd40338b4dbc.zip Qt-9093368f33ddc422047103a89effcd40338b4dbc.tar.gz Qt-9093368f33ddc422047103a89effcd40338b4dbc.tar.bz2 | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
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; } /*! |