diff options
| author | Alessandro Portale <aportale@trolltech.com> | 2009-08-21 14:54:09 (GMT) |
|---|---|---|
| committer | Alessandro Portale <aportale@trolltech.com> | 2009-08-21 21:36:39 (GMT) |
| commit | be77c837ff678ce62a24e84db5061ff027ffd3c0 (patch) | |
| tree | 50ef4a489d9a4a9539c91e07ba5cf44a9b4d4638 /src/gui/text | |
| parent | b62e7fc2fb6dcc7e667cf47f9d5ef3ba0731f188 (diff) | |
| download | Qt-be77c837ff678ce62a24e84db5061ff027ffd3c0.zip Qt-be77c837ff678ce62a24e84db5061ff027ffd3c0.tar.gz Qt-be77c837ff678ce62a24e84db5061ff027ffd3c0.tar.bz2 | |
Fixed an MSVC 9.0 /2008 warning
Reviewed-By: Harald Fernengel
Diffstat (limited to 'src/gui/text')
| -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); |