summaryrefslogtreecommitdiffstats
path: root/src/gui/text
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2010-02-19 15:08:45 (GMT)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2010-02-19 15:08:45 (GMT)
commitaaeb5a1f1e4d9ef6b24c3641ce1a0f9ba630b6d5 (patch)
treed8cdf354de1650927087b723cf1421cff8ee2972 /src/gui/text
parentbbdee08472a0763ed9a60ce60f60ddb86bd946df (diff)
parent477bf4379b0eb7b9a44f4730ce9b8fc07a8e635e (diff)
downloadQt-aaeb5a1f1e4d9ef6b24c3641ce1a0f9ba630b6d5.zip
Qt-aaeb5a1f1e4d9ef6b24c3641ce1a0f9ba630b6d5.tar.gz
Qt-aaeb5a1f1e4d9ef6b24c3641ce1a0f9ba630b6d5.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2
Diffstat (limited to 'src/gui/text')
-rw-r--r--src/gui/text/qtextdocument.cpp19
1 files changed, 13 insertions, 6 deletions
diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp
index 44e6ba5..9a1b70c 100644
--- a/src/gui/text/qtextdocument.cpp
+++ b/src/gui/text/qtextdocument.cpp
@@ -435,16 +435,23 @@ void QTextDocument::redo(QTextCursor *cursor)
}
}
+/*! \enum QTextDocument::Stacks
+
+ \value UndoStack The undo stack.
+ \value RedoStack The redo stack.
+ \value UndoAndRedoStacks Both the undo and redo stacks.
+*/
+
/*!
\since 4.7
- Clears the specified stacks.
+ Clears the stacks specified by \a stacksToClear.
- This method clears any commands on the undo stack, the redo stack, or both (the
- default). If any commands got cleared, the appropriate signals
- (\a QTextDocument::undoAvailable or \a QTextDocument::redoAvailable) get
- emitted.
+ This method clears any commands on the undo stack, the redo stack,
+ or both (the default). If commands are cleared, the appropriate
+ signals are emitted, QTextDocument::undoAvailable() or
+ QTextDocument::redoAvailable().
- \sa QTextDocument::undoAvailable QTextDocument::redoAvailable
+ \sa QTextDocument::undoAvailable() QTextDocument::redoAvailable()
*/
void QTextDocument::clearUndoRedoStacks(Stacks stacksToClear)
{