Changeset 561 for trunk/src/network/ssl/qsslkey.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/network/ssl/qsslkey.cpp (modified) (9 diffs)

trunk/src/network/ssl/qsslkey.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtNetwork module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -47 +47 @@
 
     \reentrant
-    \ingroup io
+    \ingroup network
     \ingroup ssl
     \inmodule QtNetwork
@@ -272 +272 @@
 QSslKey::QSslKey(const QSslKey &other) : d(other.d)
 {
-    d->ref.ref();
 }
 
@@ -280 +279 @@
 QSslKey::~QSslKey()
 {
-    if (!d->ref.deref())
-        delete d;
 }
 
@@ -292 +289 @@
 QSslKey &QSslKey::operator=(const QSslKey &other)
 {
-    qAtomicAssign(d, other.d);
+    d = other.d;
     return *this;
 }
@@ -313 +310 @@
 void QSslKey::clear()
 {
-    if (!d->ref.deref()) {
-        delete d;
-        d = new QSslKeyPrivate;
-    }
+    d = new QSslKeyPrivate;
 }
 
@@ -461 +455 @@
           << ", " << (key.algorithm() == QSsl::Rsa ? "RSA" : "DSA")
           << ", " << key.length()
-          << ")";
+          << ')';
     return debug;
 }