summaryrefslogtreecommitdiffstats
path: root/src/widgets/widgets/qtextedit.cpp
diff options
context:
space:
mode:
authorPekka Vuorela <pekka.ta.vuorela@nokia.com>2011-11-07 11:52:56 +0200
committerQt by Nokia <qt-info@nokia.com>2011-11-10 13:07:20 +0100
commit1dbfbf4c66187e7522888c19d78024cfceaea570 (patch)
tree84eb001b1078eb29cc7589115ce87b278ca365ae /src/widgets/widgets/qtextedit.cpp
parent77082cd7c91905aaffcf341ab55adb07839aa33e (diff)
Implement partial tentativeCommit support in QTextEdit
Available on plain text for now, html support still pending. Change-Id: I0818b97874e80c8c1b33a9127aa7bb3330a8761d Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/widgets/widgets/qtextedit.cpp')
-rw-r--r--src/widgets/widgets/qtextedit.cpp15
1 files changed, 13 insertions, 2 deletions
diff --git a/src/widgets/widgets/qtextedit.cpp b/src/widgets/widgets/qtextedit.cpp
index f345cb2f7c..73d78171db 100644
--- a/src/widgets/widgets/qtextedit.cpp
+++ b/src/widgets/widgets/qtextedit.cpp
@@ -1099,13 +1099,17 @@ void QTextEdit::setPlainText(const QString &text)
}
/*!
- \fn QString QTextEdit::toPlainText() const
+ QString QTextEdit::toPlainText() const
Returns the text of the text edit as plain text.
\sa QTextEdit::setPlainText()
*/
-
+QString QTextEdit::toPlainText() const
+{
+ Q_D(const QTextEdit);
+ return d->control->toPlainText();
+}
/*!
\property QTextEdit::html
@@ -1135,8 +1139,15 @@ void QTextEdit::setHtml(const QString &text)
d->control->setHtml(text);
d->preferRichText = true;
}
+
+QString QTextEdit::toHtml() const
+{
+ Q_D(const QTextEdit);
+ return d->control->toHtml();
+}
#endif
+
/*! \reimp
*/
void QTextEdit::keyPressEvent(QKeyEvent *e)