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

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/qtextcursor.cpp (modified) (12 diffs)

trunk/src/gui/text/qtextcursor.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])
@@ -65 +65 @@
 QTextCursorPrivate::QTextCursorPrivate(QTextDocumentPrivate *p)
     : priv(p), x(0), position(0), anchor(0), adjusted_anchor(0),
-      currentCharFormat(-1), visualNavigation(false)
+      currentCharFormat(-1), visualNavigation(false), keepPositionOnInsert(false),
+      changed(false)
 {
     priv->addCursor(this);
@@ -80 +81 @@
     currentCharFormat = rhs.currentCharFormat;
     visualNavigation = rhs.visualNavigation;
+
+
     priv->addCursor(this);
 }
@@ -96 +99 @@
         || (position == positionOfChange
             && (op == QTextUndoCommand::KeepCursor
-                || anchor < position)
+                || )
             )
          ) {
@@ -361 +364 @@
     QTextBlock blockIt = block();
 
+
+
+
     if (op >= QTextCursor::Left && op <= QTextCursor::WordRight
-        && blockIt.blockFormat().layoutDirection() == Qt::RightToLeft) {
+        && blockIt.tDirection() == Qt::RightToLeft) {
         if (op == QTextCursor::Left)
             op = QTextCursor::NextCharacter;
@@ -1146 +1152 @@
     The cursor is positioned between characters.
 
-    \sa setPosition() movePosition() anchor()
+    \sa setPosition() movePosition() anchor()
 */
 int QTextCursor::position() const
@@ -1153 +1159 @@
         return -1;
     return d->position;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 
@@ -1261 +1283 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 /*!
     Inserts \a text at the current position, using the current
@@ -1393 +1489 @@
     if (!d || !d->priv)
         return;
-    
+
     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();
@@ -1414 +1510 @@
             --d->anchor;
     }
-    
+
     d->adjusted_anchor = d->anchor;
     d->remove();
@@ -2347 +2443 @@
         return;
 
+
+
+
     d->priv->beginEditBlock();
 }
@@ -2415 +2514 @@
 }
 
+
 /*!
     \since 4.2
     Returns the position of the cursor within its containing line.
+
+
+
+
+
+
+
 */
 int QTextCursor::columnNumber() const