Changeset 846 for trunk/src/gui/text/qtextformat.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/text/qtextformat.cpp (modified) (3 diffs)

trunk/src/gui/text/qtextformat.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -266 +266 @@
 };
 
-// this is only safe if sizeof(int) == sizeof(float)
+// this is only safe  sizeof(int) == sizeof(float)
 static inline uint hash(float d)
 {
+
+
+
+
+
+
+
     return reinterpret_cast<uint&>(d);
+
 }
 
@@ -901 +909 @@
 int QTextFormat::intProperty(int propertyId) const
 {
+
+
+
     if (!d)
-        return 0;
+        return ;
     const QVariant prop = d->property(propertyId);
     if (prop.userType() != QVariant::Int)
-        return 0;
+        return ;
     return prop.toInt();
 }