Changeset 561 for trunk/src/gui/text/qtextcursor.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/gui/text/qtextcursor.cpp (modified) (16 diffs)

trunk/src/gui/text/qtextcursor.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 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$
 **
@@ -93 +93 @@
     QTextCursorPrivate::AdjustResult result = QTextCursorPrivate::CursorMoved;
     // not(!) <= , so that inserting text adjusts the cursor correctly
-    if (position < positionOfChange ||
-        (position == positionOfChange && op == QTextUndoCommand::KeepCursor)) {
+    if (position < positionOfChange
+        || (position == positionOfChange
+            && (op == QTextUndoCommand::KeepCursor
+                || anchor < position)
+            )
+         ) {
         result = CursorUnchanged;
     } else {
@@ -126 +130 @@
 void QTextCursorPrivate::setX()
 {
-    if (priv && priv->isInEditBlock()) {
+    if (priv->isInEditBlock()) {
         x = -1; // mark dirty
         return;
@@ -146 +150 @@
     if (anchor == position)
         return;
-    priv->beginEditBlock();
     currentCharFormat = -1;
     int pos1 = position;
@@ -160 +163 @@
     QTextTable *table = complexSelectionTable();
     if (table) {
+
         int startRow, startCol, numRows, numCols;
         selectedTableCells(&startRow, &numRows, &startCol, &numCols);
         clearCells(table, startRow, startCol, numRows, numCols, op);
+
+
     } else {
         priv->remove(pos1, pos2-pos1, op);
-    }
-
-    adjusted_anchor = anchor = position;
-    priv->endEditBlock();
+    
+        priv->finishEdit();
+    
+
 }
 
@@ -854 +860 @@
     \brief The QTextCursor class offers an API to access and modify QTextDocuments.
 
-    \ingroup text
+    \ingroup 
     \ingroup shared
-    \mainclass
+
 
     Text cursors are objects that are used to access and modify the contents
@@ -1075 +1081 @@
 
 /*!
-    Makes a copy of \a cursor and assigns it to this QTextCursor.
+    Makes a copy of \a cursor and assigns it to this QTextCursor. Note
+    that QTextCursor is an \l{Implicitly Shared Classes}{implicitly
+    shared} class.
+
  */
 QTextCursor &QTextCursor::operator=(const QTextCursor &cursor)
@@ -1289 +1298 @@
     format.clearProperty(QTextFormat::ObjectIndex);
 
-    d->priv->beginEditBlock();
-
-    d->remove();
+    bool hasEditBlock = false;
+
+    if (d->anchor != d->position) {
+        hasEditBlock = true;
+        d->priv->beginEditBlock();
+        d->remove();
+    }
+
     if (!text.isEmpty()) {
         QTextFormatCollection *formats = d->priv->formatCollection();
@@ -1319 +1333 @@
             if (ch == QLatin1Char('\n')
                 || ch == QChar::ParagraphSeparator
+
+
                 || ch == QLatin1Char('\r')) {
+
+
+
+
+
 
                 if (blockEnd > blockStart)
@@ -1331 +1352 @@
             d->priv->insert(d->position, textStart + blockStart, textEnd - textStart - blockStart, formatIdx);
     }
-    d->priv->endEditBlock();
+    if (hasEditBlock)
+        d->priv->endEditBlock();
     d->setX();
 }
@@ -1346 +1368 @@
         return;
 
-    if (d->position == d->anchor) {
-        if (!d->canDelete(d->position))
-            return;
-        d->adjusted_anchor = d->anchor =
-                             d->priv->nextCursorPosition(d->anchor, QTextLayout::SkipCharacters);
-    }
+    if (d->position != d->anchor) {
+        removeSelectedText();
+        return;
+    }
+
+    if (!d->canDelete(d->position))
+        return;
+    d->adjusted_anchor = d->anchor =
+                         d->priv->nextCursorPosition(d->anchor, QTextLayout::SkipCharacters);
     d->remove();
     d->setX();
@@ -1366 +1391 @@
     if (!d || !d->priv)
         return;
-
-    if (d->position == d->anchor) {
-        if (d->anchor < 1 || !d->canDelete(d->anchor-1))
-            return;
-        d->anchor--;
-
-        QTextDocumentPrivate::FragmentIterator fragIt = d->priv->find(d->anchor);
-        const QTextFragmentData * const frag = fragIt.value();
-        int fpos = fragIt.position();
-        QChar uc = d->priv->buffer().at(d->anchor - fpos + frag->stringPosition);
-        if (d->anchor > fpos && uc.unicode() >= 0xdc00 && uc.unicode() < 0xe000) {
-            // second half of a surrogate, check if we have the first half as well,
-            // if yes delete both at once
-            uc = d->priv->buffer().at(d->anchor - 1 - fpos + frag->stringPosition);
-            if (uc.unicode() >= 0xd800 && uc.unicode() < 0xdc00)
-                --d->anchor;
-        }
-
-        d->adjusted_anchor = d->anchor;
-    }
-
+    
+    if (d->position != d->anchor) {
+        removeSelectedText();
+        return;
+    }
+    
+    if (d->anchor < 1 || !d->canDelete(d->anchor-1))
+        return;
+    d->anchor--;
+    
+    QTextDocumentPrivate::FragmentIterator fragIt = d->priv->find(d->anchor);
+    const QTextFragmentData * const frag = fragIt.value();
+    int fpos = fragIt.position();
+    QChar uc = d->priv->buffer().at(d->anchor - fpos + frag->stringPosition);
+    if (d->anchor > fpos && uc.unicode() >= 0xdc00 && uc.unicode() < 0xe000) {
+        // second half of a surrogate, check if we have the first half as well,
+        // if yes delete both at once
+        uc = d->priv->buffer().at(d->anchor - 1 - fpos + frag->stringPosition);
+        if (uc.unicode() >= 0xd800 && uc.unicode() < 0xdc00)
+            --d->anchor;
+    }
+    
+    d->adjusted_anchor = d->anchor;
     d->remove();
     d->setX();
@@ -1502 +1529 @@
         return;
 
+
     d->remove();
+
     d->setX();
 }
@@ -1834 +1863 @@
 
 /*!
+
+
     Returns true if the cursor is at the end of the document;
     otherwise returns false.