Changeset 846 for trunk/src/gui/text/qtextengine_p.h

Timestamp:

May 5, 2011, 5:36:53 AM (14 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/qtextengine_p.h (modified) (7 diffs)

trunk/src/gui/text/qtextengine_p.h

@@ -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])
@@ -312 +312 @@
     {}
     QTextItemInt(const QScriptItem &si, QFont *font, const QTextCharFormat &format = QTextCharFormat());
+
 
     /// copy the structure items, adjusting the glyphs arrays to the right subarrays.
@@ -390 +391 @@
     uint hasTrailingSpaces : 1;
     uint leadingIncluded : 1;
-    QFixed height() const { return ascent + descent + 1
+    QFixed height() const { return  + 1
                             + (leadingIncluded?  qMax(QFixed(),leading) : QFixed()); }
     QFixed base() const { return ascent
@@ -416 +417 @@
 class Q_GUI_EXPORT QTextEngine {
 public:
+
+
+
+
+
     struct LayoutData {
         LayoutData(const QString &str, void **stack_memory, int mem_size);
@@ -428 +434 @@
         mutable int used;
         uint hasBidi : 1;
-        uint inLayout : 1;
+        uint ;
         uint memory_on_stack : 1;
         bool haveCharAttributes;
         QString string;
-        void reallocate(int totalGlyphs);
+         reallocate(int totalGlyphs);
     };
 
@@ -458 +464 @@
     void itemize() const;
 
+
     static void bidiReorder(int numRuns, const quint8 *levels, int *visualOrder);
 
@@ -519 +526 @@
     }
 
-    inline void ensureSpace(int nGlyphs) const {
+    inline  ensureSpace(int nGlyphs) const {
         if (layoutData->glyphLayout.numGlyphs - layoutData->used < nGlyphs)
-            layoutData->reallocate((((layoutData->used + nGlyphs)*3/2 + 15) >> 4) << 4);
+            return layoutData->reallocate((((layoutData->used + nGlyphs)*3/2 + 15) >> 4) << 4);
+        return true;
     }