Changeset 561 for trunk/src/corelib/kernel/qvariant_p.h

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/corelib/kernel/qvariant_p.h (modified) (7 diffs)

trunk/src/corelib/kernel/qvariant_p.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the QtCore 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 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -58 +58 @@
 
 #include <QtCore/qglobal.h>
+
 
 QT_BEGIN_NAMESPACE
@@ -92 +93 @@
 #endif
 
+
+
+
+
+
+
+
+
+
+
+
+
 // constructs a new variant if copy is 0, otherwise copy-constructs
 template <class T>
@@ -97 +110 @@
 {
     if (sizeof(T) > sizeof(QVariant::Private::Data)) {
-        x->data.shared = copy ? new QVariant::PrivateShared(new T(*static_cast<const T *>(copy)))
-                              : new QVariant::PrivateShared(new T);
+        x->data.shared = copy ? new QVariant))
+                              : new QVariant;
         x->is_shared = true;
     } else {
@@ -108 +121 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
 // deletes the internal structures
 template <class T>
 inline void v_clear(QVariant::Private *d, T* = 0)
 {
+
     if (sizeof(T) > sizeof(QVariant::Private::Data)) {
-        delete v_cast<T>(d);
-        delete d->data.shared;
+        //now we need to cast
+        //because QVariant::PrivateShared doesn't have a virtual destructor
+        delete static_cast<QVariantPrivateSharedEx<T>*>(d->data.shared);
     } else {
         v_cast<T>(d)->~T();
     }
+
 }
+
+
 
 QT_END_NAMESPACE