Changeset 561 for trunk/src/corelib/tools/qtextboundaryfinder.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/corelib/tools/qtextboundaryfinder.cpp (modified) (8 diffs)

trunk/src/corelib/tools/qtextboundaryfinder.cpp

@@ -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$
 **
 ****************************************************************************/
-#include "private/qharfbuzz_p.h"
 #include <QtCore/qtextboundaryfinder.h>
 #include <QtCore/qvarlengtharray.h>
 #include <private/qunicodetables_p.h>
 #include <qdebug.h>
+
 
 QT_BEGIN_NAMESPACE
@@ -108 +108 @@
     \ingroup tools
     \ingroup shared
-    \ingroup text
+    \ingroup 
     \reentrant
 
@@ -177 +177 @@
 {
     d = (QTextBoundaryFinderPrivate *) malloc(length*sizeof(HB_CharAttributes));
+
     memcpy(d, other.d, length*sizeof(HB_CharAttributes));
 }
@@ -194 +195 @@
     pos = other.pos;
     freePrivate = true;
-    
-    d = (QTextBoundaryFinderPrivate *) realloc(d, length*sizeof(HB_CharAttributes));
+
+    QTextBoundaryFinderPrivate *newD = (QTextBoundaryFinderPrivate *)
+        realloc(d, length*sizeof(HB_CharAttributes));
+    Q_CHECK_PTR(newD);
+    d = newD;
     memcpy(d, other.d, length*sizeof(HB_CharAttributes));
 
@@ -222 +226 @@
 {
     d = (QTextBoundaryFinderPrivate *) malloc(length*sizeof(HB_CharAttributes));
+
     init(t, chars, length, d->attributes);
 }
@@ -249 +254 @@
     } else {
         d = (QTextBoundaryFinderPrivate *) malloc(length*sizeof(HB_CharAttributes));
+
         freePrivate = true;
     }