diff options
| author | Iain <qt-info@nokia.com> | 2009-08-21 15:19:28 (GMT) |
|---|---|---|
| committer | Iain <qt-info@nokia.com> | 2009-08-21 15:19:28 (GMT) |
| commit | 160b5dd70aa95a515c207c58b48e89bf2c0b72e5 (patch) | |
| tree | 7e3e4a0cc6ef49c55c8acfadbfad878e043360d7 | |
| parent | 6263cef1bb703e7c78cd1896efb950fe0ec4d56f (diff) | |
| parent | 64b1a268f6a9f79ac3c96293ab2dd3f29802101f (diff) | |
| download | Qt-160b5dd70aa95a515c207c58b48e89bf2c0b72e5.zip Qt-160b5dd70aa95a515c207c58b48e89bf2c0b72e5.tar.gz Qt-160b5dd70aa95a515c207c58b48e89bf2c0b72e5.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
| -rw-r--r-- | src/gui/text/qtextdocument_p.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/text/qtextdocument_p.cpp b/src/gui/text/qtextdocument_p.cpp index dec44ab..2110cac 100644 --- a/src/gui/text/qtextdocument_p.cpp +++ b/src/gui/text/qtextdocument_p.cpp @@ -421,7 +421,7 @@ int QTextDocumentPrivate::insertBlock(const QChar &blockSeparator, int b = blocks.findNode(pos); QTextBlockData *B = blocks.fragment(b); - QT_INIT_TEXTUNDOCOMMAND(c, QTextUndoCommand::BlockInserted, editBlock != 0, + QT_INIT_TEXTUNDOCOMMAND(c, QTextUndoCommand::BlockInserted, (editBlock != 0), op, charFormat, strPos, pos, blockFormat, B->revision); @@ -462,7 +462,7 @@ void QTextDocumentPrivate::insert(int pos, int strPos, int strLength, int format int b = blocks.findNode(pos); QTextBlockData *B = blocks.fragment(b); - QT_INIT_TEXTUNDOCOMMAND(c, QTextUndoCommand::Inserted, editBlock != 0, + QT_INIT_TEXTUNDOCOMMAND(c, QTextUndoCommand::Inserted, (editBlock != 0), QTextUndoCommand::MoveCursor, format, strPos, pos, strLength, B->revision); appendUndoItem(c); @@ -621,10 +621,10 @@ void QTextDocumentPrivate::move(int pos, int to, int length, QTextUndoCommand::O int blockRevision = B->revision; QTextFragmentData *X = fragments.fragment(x); - QT_INIT_TEXTUNDOCOMMAND(c, QTextUndoCommand::Removed, editBlock != 0, + QT_INIT_TEXTUNDOCOMMAND(c, QTextUndoCommand::Removed, (editBlock != 0), op, X->format, X->stringPosition, key, X->size_array[0], blockRevision); - QT_INIT_TEXTUNDOCOMMAND(cInsert, QTextUndoCommand::Inserted, editBlock != 0, + QT_INIT_TEXTUNDOCOMMAND(cInsert, QTextUndoCommand::Inserted, (editBlock != 0), op, X->format, X->stringPosition, dstKey, X->size_array[0], blockRevision); @@ -1319,7 +1319,7 @@ void QTextDocumentPrivate::changeObjectFormat(QTextObject *obj, int format) if (f) documentChange(f->firstPosition(), f->lastPosition() - f->firstPosition()); - QT_INIT_TEXTUNDOCOMMAND(c, QTextUndoCommand::GroupFormatChange, editBlock != 0, QTextUndoCommand::MoveCursor, oldFormatIndex, + QT_INIT_TEXTUNDOCOMMAND(c, QTextUndoCommand::GroupFormatChange, (editBlock != 0), QTextUndoCommand::MoveCursor, oldFormatIndex, 0, 0, obj->d_func()->objectIndex, 0); appendUndoItem(c); |