Changeset 561 for trunk/src/gui/text/qtextdocument_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/gui/text/qtextdocument_p.h (modified) (8 diffs)

trunk/src/gui/text/qtextdocument_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 QtGui 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$
 **
@@ -140 +140 @@
     };
     quint16 command;
-    quint8 block; ///< All undo commands that have this set to zero/false are combined with the preceding command on undo/redo.
+    uint block_part : 1; // all commands that are part of an undo block (including the first and the last one) have this set to 1
+    uint block_end : 1; // the last command in an undo block has this set to 1.
+    uint block_padding : 6; // padding since block used to be a quint8
     quint8 operation;
     int format;
@@ -200 +202 @@
     inline void redo() { undoRedo(false); }
     void appendUndoItem(QAbstractUndoItem *);
-    inline void beginEditBlock() { editBlock++; }
+    inline void beginEditBlock() { ; }
     void joinPreviousEditBlock();
     void endEditBlock();
+
     inline bool isInEditBlock() const { return editBlock; }
     void enableUndoRedo(bool enable);
@@ -209 +212 @@
     inline bool isUndoAvailable() const { return undoEnabled && undoState > 0; }
     inline bool isRedoAvailable() const { return undoEnabled && undoState < undoStack.size(); }
+
+
+
 
     inline QString buffer() const { return text; }
@@ -303 +309 @@
     bool undoEnabled;
     int undoState;
+
     // position in undo stack of the last setModified(false) call
     int modifiedState;
@@ -335 +342 @@
 #endif
     int maximumBlockCount;
-    bool needsEnsureMaximumBlockCount;
-    bool inContentsChange;
+    ;
+    ;
     QSizeF pageSize;
     QString title;