diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-09-27 14:48:51 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-28 03:18:16 +0200 |
commit | a85d343a39577cdf953d0759e356c59a77ae743f (patch) | |
tree | fdbd9229902d5efc0ca637dc79d6aa7cc5645635 /src/widgets/widgets/qtextedit.cpp | |
parent | 3b6bb13e6a197bb4ba85b397ae9d2b8c659d6b26 (diff) |
Widgets: Remove QT3_SUPPPORT.
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Change-Id: Ie884f0cc9b3970b01c3c0c26600b1bcd92548077
Reviewed-on: http://codereview.qt-project.org/5629
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/widgets/widgets/qtextedit.cpp')
-rw-r--r-- | src/widgets/widgets/qtextedit.cpp | 154 |
1 files changed, 0 insertions, 154 deletions
diff --git a/src/widgets/widgets/qtextedit.cpp b/src/widgets/widgets/qtextedit.cpp index 67be9dbed3..967496cee1 100644 --- a/src/widgets/widgets/qtextedit.cpp +++ b/src/widgets/widgets/qtextedit.cpp @@ -571,28 +571,6 @@ void QTextEditPrivate::_q_ensureVisible(const QRectF &_rect) automatic bullet lists are supported. */ -#ifdef QT3_SUPPORT -/*! - \enum QTextEdit::CursorAction - \compat - - \value MoveBackward - \value MoveForward - \value MoveWordBackward - \value MoveWordForward - \value MoveUp - \value MoveDown - \value MoveLineStart - \value MoveLineEnd - \value MoveHome - \value MoveEnd - \value MovePageUp - \value MovePageDown - - \omitvalue MovePgUp - \omitvalue MovePgDown -*/ -#endif /*! Constructs an empty QTextEdit with parent \a @@ -626,19 +604,6 @@ QTextEdit::QTextEdit(const QString &text, QWidget *parent) d->init(text); } -#ifdef QT3_SUPPORT -/*! - Use one of the constructors that doesn't take the \a name - argument and then use setObjectName() instead. -*/ -QTextEdit::QTextEdit(QWidget *parent, const char *name) - : QAbstractScrollArea(*new QTextEditPrivate, parent) -{ - Q_D(QTextEdit); - d->init(); - setObjectName(QString::fromAscii(name)); -} -#endif /*! @@ -1516,11 +1481,6 @@ void QTextEditPrivate::_q_currentCharFormatChanged(const QTextCharFormat &fmt) { Q_Q(QTextEdit); emit q->currentCharFormatChanged(fmt); -#ifdef QT3_SUPPORT - // compat signals - emit q->currentFontChanged(fmt.font()); - emit q->currentColorChanged(fmt.foreground().color()); -#endif } void QTextEditPrivate::updateDefaultTextOption() @@ -2486,120 +2446,6 @@ void QTextEdit::setText(const QString &text) setPlainText(text); } -#ifdef QT3_SUPPORT -/*! - Use the QTextCursor class instead. -*/ -void QTextEdit::moveCursor(CursorAction action, QTextCursor::MoveMode mode) -{ - Q_D(QTextEdit); - if (action == MovePageUp) { - d->pageUpDown(QTextCursor::Up, mode); - return; - } else if (action == MovePageDown) { - d->pageUpDown(QTextCursor::Down, mode); - return; - } - - QTextCursor cursor = d->control->textCursor(); - QTextCursor::MoveOperation op = QTextCursor::NoMove; - switch (action) { - case MoveBackward: op = QTextCursor::Left; break; - case MoveForward: op = QTextCursor::Right; break; - case MoveWordBackward: op = QTextCursor::WordLeft; break; - case MoveWordForward: op = QTextCursor::WordRight; break; - case MoveUp: op = QTextCursor::Up; break; - case MoveDown: op = QTextCursor::Down; break; - case MoveLineStart: op = QTextCursor::StartOfLine; break; - case MoveLineEnd: op = QTextCursor::EndOfLine; break; - case MoveHome: op = QTextCursor::Start; break; - case MoveEnd: op = QTextCursor::End; break; - default: return; - } - cursor.movePosition(op, mode); - d->control->setTextCursor(cursor); -} - -/*! - Use the QTextCursor class instead. -*/ -void QTextEdit::moveCursor(CursorAction action, bool select) -{ - moveCursor(action, select ? QTextCursor::KeepAnchor : QTextCursor::MoveAnchor); -} - -/*! - Executes keyboard action \a action. - - Use the QTextCursor class instead. - - \sa textCursor() -*/ -void QTextEdit::doKeyboardAction(KeyboardAction action) -{ - Q_D(QTextEdit); - QTextCursor cursor = d->control->textCursor(); - switch (action) { - case ActionBackspace: cursor.deletePreviousChar(); break; - case ActionDelete: cursor.deleteChar(); break; - case ActionReturn: cursor.insertBlock(); break; - case ActionKill: { - QTextBlock block = cursor.block(); - if (cursor.position() == block.position() + block.length() - 2) - cursor.movePosition(QTextCursor::Right, QTextCursor::KeepAnchor); - else - cursor.movePosition(QTextCursor::EndOfBlock, QTextCursor::KeepAnchor); - cursor.deleteChar(); - break; - } - case ActionWordBackspace: - cursor.movePosition(QTextCursor::PreviousWord, QTextCursor::KeepAnchor); - cursor.deletePreviousChar(); - break; - case ActionWordDelete: - cursor.movePosition(QTextCursor::EndOfWord, QTextCursor::KeepAnchor); - cursor.deleteChar(); - break; - } - d->control->setTextCursor(cursor); -} - -/*! - Returns all the text in the text edit as plain text. -*/ -QString QTextEdit::text() const -{ - Q_D(const QTextEdit); - if (d->textFormat == Qt::RichText || d->textFormat == Qt::LogText || (d->textFormat == Qt::AutoText && d->preferRichText)) - return d->control->toHtml(); - else - return d->control->toPlainText(); -} - - -/*! - Sets the text format to format \a f. - - \sa textFormat() -*/ -void QTextEdit::setTextFormat(Qt::TextFormat f) -{ - Q_D(QTextEdit); - d->textFormat = f; -} - -/*! - Returns the text format. - - \sa setTextFormat() -*/ -Qt::TextFormat QTextEdit::textFormat() const -{ - Q_D(const QTextEdit); - return d->textFormat; -} - -#endif // QT3_SUPPORT /*! Appends a new paragraph with \a text to the end of the text edit. |