diff options
24 files changed, 366 insertions, 367 deletions
diff --git a/src/gui/text/qabstracttextdocumentlayout.h b/src/gui/text/qabstracttextdocumentlayout.h index 12f3ed1217..9da2d80235 100644 --- a/src/gui/text/qabstracttextdocumentlayout.h +++ b/src/gui/text/qabstracttextdocumentlayout.h @@ -122,7 +122,7 @@ protected: QTextCharFormat format(int pos); private: - friend class QTextControl; + friend class QWidgetTextControl; friend class QTextDocument; friend class QTextDocumentPrivate; friend class QTextEngine; diff --git a/src/gui/text/qtextcursor.h b/src/gui/text/qtextcursor.h index 697899bcfa..61419b7979 100644 --- a/src/gui/text/qtextcursor.h +++ b/src/gui/text/qtextcursor.h @@ -230,7 +230,7 @@ private: QSharedDataPointer<QTextCursorPrivate> d; friend class QTextDocumentFragmentPrivate; friend class QTextCopyHelper; - friend class QTextControlPrivate; + friend class QWidgetTextControlPrivate; }; QT_END_NAMESPACE diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp index 1b1db0d64d..3ca72bf14e 100644 --- a/src/gui/text/qtextdocument.cpp +++ b/src/gui/text/qtextdocument.cpp @@ -1978,7 +1978,7 @@ QVariant QTextDocument::loadResource(int type, const QUrl &name) } #endif #ifndef QT_NO_TEXTCONTROL - else if (QTextControl *control = qobject_cast<QTextControl *>(parent())) { + else if (QWidgetTextControl *control = qobject_cast<QWidgetTextControl *>(parent())) { r = control->loadResource(type, name); } #endif diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp index f0851abc9a..26180ab38b 100644 --- a/src/widgets/dialogs/qmessagebox.cpp +++ b/src/widgets/dialogs/qmessagebox.cpp @@ -341,7 +341,7 @@ void QMessageBoxPrivate::updateSize() if (width > hardLimit) { label->d_func()->ensureTextControl(); - if (QTextControl *control = label->d_func()->control) { + if (QWidgetTextControl *control = label->d_func()->control) { QTextOption opt = control->document()->defaultTextOption(); opt.setWrapMode(QTextOption::WrapAnywhere); control->document()->setDefaultTextOption(opt); @@ -367,7 +367,7 @@ void QMessageBoxPrivate::updateSize() width = qMax(width, layoutMinimumWidth()); if (width > hardLimit) { // longest word is really big, so wrap anywhere informativeLabel->d_func()->ensureTextControl(); - if (QTextControl *control = informativeLabel->d_func()->control) { + if (QWidgetTextControl *control = informativeLabel->d_func()->control) { QTextOption opt = control->document()->defaultTextOption(); opt.setWrapMode(QTextOption::WrapAnywhere); control->document()->setDefaultTextOption(opt); diff --git a/src/widgets/graphicsview/qgraphicsitem.cpp b/src/widgets/graphicsview/qgraphicsitem.cpp index d49ab01214..7070d49579 100644 --- a/src/widgets/graphicsview/qgraphicsitem.cpp +++ b/src/widgets/graphicsview/qgraphicsitem.cpp @@ -750,7 +750,7 @@ #include <private/qgraphicsitem_p.h> #include <private/qgraphicswidget_p.h> -#include <private/qtextcontrol_p.h> +#include <private/qwidgettextcontrol_p.h> #include <private/qtextdocumentlayout_p.h> #include <private/qtextengine_p.h> #include <private/qwidget_p.h> @@ -9854,8 +9854,8 @@ public: : control(0), pageNumber(0), useDefaultImpl(false), tabChangesFocus(false), clickCausedFocus(0) { } - mutable QTextControl *control; - QTextControl *textControl() const; + mutable QWidgetTextControl *control; + QWidgetTextControl *textControl() const; inline QPointF controlOffset() const { return QPointF(0., pageNumber * control->document()->pageSize().height()); } @@ -10005,7 +10005,7 @@ void QGraphicsTextItem::setFont(const QFont &font) */ void QGraphicsTextItem::setDefaultTextColor(const QColor &col) { - QTextControl *c = dd->textControl(); + QWidgetTextControl *c = dd->textControl(); QPalette pal = c->palette(); QColor old = pal.color(QPalette::Text); pal.setColor(QPalette::Text, col); @@ -10502,11 +10502,11 @@ void QGraphicsTextItemPrivate::_q_ensureVisible(QRectF rect) } } -QTextControl *QGraphicsTextItemPrivate::textControl() const +QWidgetTextControl *QGraphicsTextItemPrivate::textControl() const { if (!control) { QGraphicsTextItem *that = const_cast<QGraphicsTextItem *>(qq); - control = new QTextControl(that); + control = new QWidgetTextControl(that); control->setTextInteractionFlags(Qt::NoTextInteraction); QObject::connect(control, SIGNAL(updateRequest(QRectF)), diff --git a/src/widgets/kernel/qapplication.h b/src/widgets/kernel/qapplication.h index 4c62d0b9ea..c7ec35c83d 100644 --- a/src/widgets/kernel/qapplication.h +++ b/src/widgets/kernel/qapplication.h @@ -390,7 +390,7 @@ private: #ifndef QT_NO_SHORTCUT friend class QShortcut; friend class QLineEdit; - friend class QTextControl; + friend class QWidgetTextControl; #endif friend class QAction; diff --git a/src/widgets/to_be_moved/to_be_moved.pri b/src/widgets/to_be_moved/to_be_moved.pri index 95bfc0a2b4..fc570ce2d9 100644 --- a/src/widgets/to_be_moved/to_be_moved.pri +++ b/src/widgets/to_be_moved/to_be_moved.pri @@ -1,12 +1,7 @@ HEADERS += \ - to_be_moved/qlinecontrol_p.h \ - to_be_moved/qtextcontrol_p.h \ - to_be_moved/qtextcontrol_p_p.h \ to_be_moved/qshortcut.h \ to_be_moved/qshortcutmap_p.h \ SOURCES += \ - to_be_moved/qlinecontrol.cpp \ - to_be_moved/qtextcontrol.cpp \ to_be_moved/qshortcut.cpp \ to_be_moved/qshortcutmap.cpp \ diff --git a/src/widgets/util/qsystemtrayicon.cpp b/src/widgets/util/qsystemtrayicon.cpp index 28d493248f..f6eeaa02b2 100644 --- a/src/widgets/util/qsystemtrayicon.cpp +++ b/src/widgets/util/qsystemtrayicon.cpp @@ -474,7 +474,7 @@ QBalloonTip::QBalloonTip(QSystemTrayIcon::MessageIcon icon, const QString& title msgLabel->setWordWrap(true); if (msgLabel->sizeHint().width() > limit) { msgLabel->d_func()->ensureTextControl(); - if (QTextControl *control = msgLabel->d_func()->control) { + if (QWidgetTextControl *control = msgLabel->d_func()->control) { QTextOption opt = control->document()->defaultTextOption(); opt.setWrapMode(QTextOption::WrapAnywhere); control->document()->setDefaultTextOption(opt); diff --git a/src/widgets/widgets/qlabel.cpp b/src/widgets/widgets/qlabel.cpp index 26dd0e1120..7db7b42ef2 100644 --- a/src/widgets/widgets/qlabel.cpp +++ b/src/widgets/widgets/qlabel.cpp @@ -339,7 +339,7 @@ void QLabel::setText(const QString &text) if (d->text == text) return; - QTextControl *oldControl = d->control; + QWidgetTextControl *oldControl = d->control; d->control = 0; d->clearContents(); @@ -1599,7 +1599,7 @@ void QLabelPrivate::ensureTextControl() const if (!isTextLabel) return; if (!control) { - control = new QTextControl(const_cast<QLabel *>(q)); + control = new QWidgetTextControl(const_cast<QLabel *>(q)); control->document()->setUndoRedoEnabled(false); control->document()->setDefaultFont(q->font()); control->setTextInteractionFlags(textInteractionFlags); diff --git a/src/widgets/widgets/qlabel_p.h b/src/widgets/widgets/qlabel_p.h index 000fcd2fec..b6f2db6a25 100644 --- a/src/widgets/widgets/qlabel_p.h +++ b/src/widgets/widgets/qlabel_p.h @@ -56,7 +56,7 @@ #include "qlabel.h" #include "private/qtextdocumentlayout_p.h" -#include "private/qtextcontrol_p.h" +#include "private/qwidgettextcontrol_p.h" #include "qtextdocumentfragment.h" #include "qframe_p.h" #include "qtextdocument.h" @@ -112,7 +112,7 @@ public: mutable uint isTextLabel : 1; mutable uint hasShortcut : 1; Qt::TextFormat textformat; - mutable QTextControl *control; + mutable QWidgetTextControl *control; mutable QTextCursor shortcutCursor; Qt::TextInteractionFlags textInteractionFlags; diff --git a/src/widgets/widgets/qlineedit.cpp b/src/widgets/widgets/qlineedit.cpp index 3c401fd166..1ca3886fc5 100644 --- a/src/widgets/widgets/qlineedit.cpp +++ b/src/widgets/widgets/qlineedit.cpp @@ -1979,13 +1979,13 @@ void QLineEdit::paintEvent(QPaintEvent *) #endif p.setPen(pal.text().color()); - int flags = QLineControl::DrawText; + int flags = QWidgetLineControl::DrawText; #ifdef QT_KEYPAD_NAVIGATION if (!QApplication::keypadNavigationEnabled() || hasEditFocus()) #endif if (d->control->hasSelectedText() || (d->cursorVisible && !d->control->inputMask().isEmpty() && !d->control->isReadOnly())){ - flags |= QLineControl::DrawSelections; + flags |= QWidgetLineControl::DrawSelections; // Palette only used for selections/mask and may not be in sync if (d->control->palette() != pal || d->control->palette().currentColorGroup() != pal.currentColorGroup()) @@ -1996,7 +1996,7 @@ void QLineEdit::paintEvent(QPaintEvent *) // selection phase of input method, so the ordinary cursor should be // invisible if we have a preedit string. if (d->cursorVisible && !d->control->isReadOnly()) - flags |= QLineControl::DrawCursor; + flags |= QWidgetLineControl::DrawCursor; d->control->setCursorWidth(style()->pixelMetric(QStyle::PM_TextCursorWidth)); d->control->draw(&p, topLeft, r, flags); diff --git a/src/widgets/widgets/qlineedit_p.cpp b/src/widgets/widgets/qlineedit_p.cpp index b7e43240a9..8511d0c9e5 100644 --- a/src/widgets/widgets/qlineedit_p.cpp +++ b/src/widgets/widgets/qlineedit_p.cpp @@ -153,7 +153,7 @@ void QLineEditPrivate::_q_updateNeeded(const QRect &rect) void QLineEditPrivate::init(const QString& txt) { Q_Q(QLineEdit); - control = new QLineControl(txt); + control = new QWidgetLineControl(txt); control->setParent(q); control->setFont(q->font()); QObject::connect(control, SIGNAL(textChanged(QString)), diff --git a/src/widgets/widgets/qlineedit_p.h b/src/widgets/widgets/qlineedit_p.h index 996b84efc2..74717fd2fa 100644 --- a/src/widgets/widgets/qlineedit_p.h +++ b/src/widgets/widgets/qlineedit_p.h @@ -65,7 +65,7 @@ #include "QtCore/qpointer.h" #include "QtWidgets/qlineedit.h" -#include "private/qlinecontrol_p.h" +#include "private/qwidgetlinecontrol_p.h" QT_BEGIN_NAMESPACE @@ -86,7 +86,7 @@ public: { } - QLineControl *control; + QWidgetLineControl *control; #ifndef QT_NO_CONTEXTMENU QPointer<QAction> selectAllAction; diff --git a/src/widgets/widgets/qplaintextedit.cpp b/src/widgets/widgets/qplaintextedit.cpp index f2fca8fbdf..5f65b957fd 100644 --- a/src/widgets/widgets/qplaintextedit.cpp +++ b/src/widgets/widgets/qplaintextedit.cpp @@ -57,7 +57,6 @@ #include "qtextdocument.h" #include "private/qtextdocument_p.h" #include "qtextlist.h" -#include "private/qtextcontrol_p.h" #include <qtextformat.h> #include <qdatetime.h> @@ -434,7 +433,7 @@ qreal QPlainTextDocumentLayout::blockWidth(const QTextBlock &block) QPlainTextEditControl::QPlainTextEditControl(QPlainTextEdit *parent) - : QTextControl(parent), textEdit(parent), + : QWidgetTextControl(parent), textEdit(parent), topBlock(0) { setAcceptRichText(false); @@ -456,19 +455,19 @@ void QPlainTextEditPrivate::_q_verticalScrollbarActionTriggered(int action) { QMimeData *QPlainTextEditControl::createMimeDataFromSelection() const { QPlainTextEdit *ed = qobject_cast<QPlainTextEdit *>(parent()); if (!ed) - return QTextControl::createMimeDataFromSelection(); + return QWidgetTextControl::createMimeDataFromSelection(); return ed->createMimeDataFromSelection(); } bool QPlainTextEditControl::canInsertFromMimeData(const QMimeData *source) const { QPlainTextEdit *ed = qobject_cast<QPlainTextEdit *>(parent()); if (!ed) - return QTextControl::canInsertFromMimeData(source); + return QWidgetTextControl::canInsertFromMimeData(source); return ed->canInsertFromMimeData(source); } void QPlainTextEditControl::insertFromMimeData(const QMimeData *source) { QPlainTextEdit *ed = qobject_cast<QPlainTextEdit *>(parent()); if (!ed) - QTextControl::insertFromMimeData(source); + QWidgetTextControl::insertFromMimeData(source); else ed->insertFromMimeData(source); } @@ -2356,7 +2355,7 @@ QList<QTextEdit::ExtraSelection> QPlainTextEdit::extraSelections() const QMimeData *QPlainTextEdit::createMimeDataFromSelection() const { Q_D(const QPlainTextEdit); - return d->control->QTextControl::createMimeDataFromSelection(); + return d->control->QWidgetTextControl::createMimeDataFromSelection(); } /*! @@ -2368,7 +2367,7 @@ QMimeData *QPlainTextEdit::createMimeDataFromSelection() const bool QPlainTextEdit::canInsertFromMimeData(const QMimeData *source) const { Q_D(const QPlainTextEdit); - return d->control->QTextControl::canInsertFromMimeData(source); + return d->control->QWidgetTextControl::canInsertFromMimeData(source); } /*! @@ -2381,7 +2380,7 @@ bool QPlainTextEdit::canInsertFromMimeData(const QMimeData *source) const void QPlainTextEdit::insertFromMimeData(const QMimeData *source) { Q_D(QPlainTextEdit); - d->control->QTextControl::insertFromMimeData(source); + d->control->QWidgetTextControl::insertFromMimeData(source); } /*! diff --git a/src/widgets/widgets/qplaintextedit_p.h b/src/widgets/widgets/qplaintextedit_p.h index c47ae21a1a..190156a684 100644 --- a/src/widgets/widgets/qplaintextedit_p.h +++ b/src/widgets/widgets/qplaintextedit_p.h @@ -61,7 +61,7 @@ #include "QtWidgets/qmenu.h" #include "QtGui/qabstracttextdocumentlayout.h" #include "QtCore/qbasictimer.h" -#include "private/qtextcontrol_p.h" +#include "private/qwidgettextcontrol_p.h" #include "qplaintextedit.h" #ifndef QT_NO_TEXTEDIT @@ -73,7 +73,7 @@ class QMimeData; class QPlainTextEdit; class ExtraArea; -class QPlainTextEditControl : public QTextControl +class QPlainTextEditControl : public QWidgetTextControl { Q_OBJECT public: @@ -86,7 +86,7 @@ public: int hitTest(const QPointF &point, Qt::HitTestAccuracy = Qt::FuzzyHit) const; QRectF blockBoundingRect(const QTextBlock &block) const; inline QRectF cursorRect(const QTextCursor &cursor) const { - QRectF r = QTextControl::cursorRect(cursor); + QRectF r = QWidgetTextControl::cursorRect(cursor); r.setLeft(qMax(r.left(), (qreal) 0.)); return r; } diff --git a/src/widgets/widgets/qtextedit.cpp b/src/widgets/widgets/qtextedit.cpp index 2670089133..550db2d2b0 100644 --- a/src/widgets/widgets/qtextedit.cpp +++ b/src/widgets/widgets/qtextedit.cpp @@ -58,7 +58,7 @@ #include "qtextdocument.h" #include "private/qtextdocument_p.h" #include "qtextlist.h" -#include "private/qtextcontrol_p.h" +#include "private/qwidgettextcontrol_p.h" #include <qtextformat.h> #include <qdatetime.h> @@ -79,27 +79,27 @@ static inline bool shouldEnableInputMethod(QTextEdit *textedit) return !textedit->isReadOnly(); } -class QTextEditControl : public QTextControl +class QTextEditControl : public QWidgetTextControl { public: - inline QTextEditControl(QObject *parent) : QTextControl(parent) {} + inline QTextEditControl(QObject *parent) : QWidgetTextControl(parent) {} virtual QMimeData *createMimeDataFromSelection() const { QTextEdit *ed = qobject_cast<QTextEdit *>(parent()); if (!ed) - return QTextControl::createMimeDataFromSelection(); + return QWidgetTextControl::createMimeDataFromSelection(); return ed->createMimeDataFromSelection(); } virtual bool canInsertFromMimeData(const QMimeData *source) const { QTextEdit *ed = qobject_cast<QTextEdit *>(parent()); if (!ed) - return QTextControl::canInsertFromMimeData(source); + return QWidgetTextControl::canInsertFromMimeData(source); return ed->canInsertFromMimeData(source); } virtual void insertFromMimeData(const QMimeData *source) { QTextEdit *ed = qobject_cast<QTextEdit *>(parent()); if (!ed) - QTextControl::insertFromMimeData(source); + QWidgetTextControl::insertFromMimeData(source); else ed->insertFromMimeData(source); } @@ -235,7 +235,7 @@ void QTextEditPrivate::pageUpDown(QTextCursor::MoveOperation op, QTextCursor::Mo } #ifndef QT_NO_SCROLLBAR -static QSize documentSize(QTextControl *control) +static QSize documentSize(QWidgetTextControl *control) { QTextDocument *doc = control->document(); QAbstractTextDocumentLayout *layout = doc->documentLayout(); @@ -2019,7 +2019,7 @@ QList<QTextEdit::ExtraSelection> QTextEdit::extraSelections() const QMimeData *QTextEdit::createMimeDataFromSelection() const { Q_D(const QTextEdit); - return d->control->QTextControl::createMimeDataFromSelection(); + return d->control->QWidgetTextControl::createMimeDataFromSelection(); } /*! @@ -2034,7 +2034,7 @@ QMimeData *QTextEdit::createMimeDataFromSelection() const bool QTextEdit::canInsertFromMimeData(const QMimeData *source) const { Q_D(const QTextEdit); - return d->control->QTextControl::canInsertFromMimeData(source); + return d->control->QWidgetTextControl::canInsertFromMimeData(source); } /*! @@ -2049,7 +2049,7 @@ bool QTextEdit::canInsertFromMimeData(const QMimeData *source) const void QTextEdit::insertFromMimeData(const QMimeData *source) { Q_D(QTextEdit); - d->control->QTextControl::insertFromMimeData(source); + d->control->QWidgetTextControl::insertFromMimeData(source); } /*! diff --git a/src/widgets/widgets/qtextedit.h b/src/widgets/widgets/qtextedit.h index 11c81939ab..793337b969 100644 --- a/src/widgets/widgets/qtextedit.h +++ b/src/widgets/widgets/qtextedit.h @@ -417,7 +417,7 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_ensureVisible(const QRectF &)) friend class QTextEditControl; friend class QTextDocument; - friend class QTextControl; + friend class QWidgetTextControl; }; Q_DECLARE_OPERATORS_FOR_FLAGS(QTextEdit::AutoFormatting) diff --git a/src/widgets/widgets/qtextedit_p.h b/src/widgets/widgets/qtextedit_p.h index 23307edea7..3512c80ac4 100644 --- a/src/widgets/widgets/qtextedit_p.h +++ b/src/widgets/widgets/qtextedit_p.h @@ -62,7 +62,7 @@ #include "QtGui/qabstracttextdocumentlayout.h" #include "QtCore/qbasictimer.h" #include "QtCore/qurl.h" -#include "private/qtextcontrol_p.h" +#include "private/qwidgettextcontrol_p.h" #include "qtextedit.h" QT_BEGIN_NAMESPACE @@ -106,7 +106,7 @@ public: virtual QUrl resolveUrl(const QUrl &url) const { return url; } - QTextControl *control; + QWidgetTextControl *control; QTextEdit::AutoFormatting autoFormatting; bool tabChangesFocus; diff --git a/src/widgets/to_be_moved/qlinecontrol.cpp b/src/widgets/widgets/qwidgetlinecontrol.cpp index bf36033c08..fee401d6ae 100644 --- a/src/widgets/to_be_moved/qlinecontrol.cpp +++ b/src/widgets/widgets/qwidgetlinecontrol.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qlinecontrol_p.h" +#include "qwidgetlinecontrol_p.h" #ifndef QT_NO_LINEEDIT @@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE Updates the display text based of the current edit text If the text has changed will emit displayTextChanged() */ -void QLineControl::updateDisplayText(bool forceUpdate) +void QWidgetLineControl::updateDisplayText(bool forceUpdate) { QString orig = m_textLayout.text(); QString str; @@ -117,7 +117,7 @@ void QLineControl::updateDisplayText(bool forceUpdate) will not work. This is to prevent using copy as a method of bypassing password features of the line control. */ -void QLineControl::copy(QClipboard::Mode mode) const +void QWidgetLineControl::copy(QClipboard::Mode mode) const { QString t = selectedText(); if (!t.isEmpty() && m_echoMode == QLineEdit::Normal) { @@ -136,7 +136,7 @@ void QLineControl::copy(QClipboard::Mode mode) const \sa insert() */ -void QLineControl::paste(QClipboard::Mode clipboardMode) +void QWidgetLineControl::paste(QClipboard::Mode clipboardMode) { QString clip = QApplication::clipboard()->text(clipboardMode); if (!clip.isEmpty() || hasSelectedText()) { @@ -157,7 +157,7 @@ void QLineControl::paste(QClipboard::Mode clipboardMode) \sa del() */ -void QLineControl::backspace() +void QWidgetLineControl::backspace() { int priorState = m_undoState; if (hasSelectedText()) { @@ -190,7 +190,7 @@ void QLineControl::backspace() \sa del() */ -void QLineControl::del() +void QWidgetLineControl::del() { int priorState = m_undoState; if (hasSelectedText()) { @@ -210,7 +210,7 @@ void QLineControl::del() If there is any selected text it is removed prior to insertion of the new text. */ -void QLineControl::insert(const QString &newText) +void QWidgetLineControl::insert(const QString &newText) { int priorState = m_undoState; removeSelectedText(); @@ -223,7 +223,7 @@ void QLineControl::insert(const QString &newText) Clears the line control text. */ -void QLineControl::clear() +void QWidgetLineControl::clear() { int priorState = m_undoState; m_selstart = 0; @@ -241,10 +241,10 @@ void QLineControl::clear() the line control. If \a length characters cannot be selected, then the selection will extend to the end of the current text. */ -void QLineControl::setSelection(int start, int length) +void QWidgetLineControl::setSelection(int start, int length) { if(start < 0 || start > (int)m_text.length()){ - qWarning("QLineControl::setSelection: Invalid start position"); + qWarning("QWidgetLineControl::setSelection: Invalid start position"); return; } @@ -273,11 +273,11 @@ void QLineControl::setSelection(int start, int length) emitCursorPositionChanged(); } -void QLineControl::_q_clipboardChanged() +void QWidgetLineControl::_q_clipboardChanged() { } -void QLineControl::_q_deleteSelected() +void QWidgetLineControl::_q_deleteSelected() { if (!hasSelectedText()) return; @@ -294,7 +294,7 @@ void QLineControl::_q_deleteSelected() Initializes the line control with a starting text value of \a txt. */ -void QLineControl::init(const QString &txt) +void QWidgetLineControl::init(const QString &txt) { m_text = txt; updateDisplayText(); @@ -309,7 +309,7 @@ void QLineControl::init(const QString &txt) mode is set to QLineEdit::PasswordEchoOnEdit. Password echoing editing does not affect other echo modes. */ -void QLineControl::updatePasswordEchoEditing(bool editing) +void QWidgetLineControl::updatePasswordEchoEditing(bool editing) { m_passwordEchoEditing = editing; updateDisplayText(); @@ -322,7 +322,7 @@ void QLineControl::updatePasswordEchoEditing(bool editing) to the displayed text. The given \a betweenOrOn specified what kind of cursor position is requested. */ -int QLineControl::xToPos(int x, QTextLine::CursorPosition betweenOrOn) const +int QWidgetLineControl::xToPos(int x, QTextLine::CursorPosition betweenOrOn) const { return m_textLayout.lineAt(0).xToCursor(x, betweenOrOn); } @@ -333,7 +333,7 @@ int QLineControl::xToPos(int x, QTextLine::CursorPosition betweenOrOn) const Returns the bounds of the current cursor, as defined as a between characters cursor. */ -QRect QLineControl::cursorRect() const +QRect QWidgetLineControl::cursorRect() const { QTextLine l = m_textLayout.lineAt(0); int c = m_cursor; @@ -353,7 +353,7 @@ QRect QLineControl::cursorRect() const Returns true if the text was changed. Otherwise returns false. */ -bool QLineControl::fixup() // this function assumes that validate currently returns != Acceptable +bool QWidgetLineControl::fixup() // this function assumes that validate currently returns != Acceptable { #ifndef QT_NO_VALIDATOR if (m_validator) { @@ -376,7 +376,7 @@ bool QLineControl::fixup() // this function assumes that validate currently retu Moves the cursor to the given position \a pos. If \a mark is true will adjust the currently selected text. */ -void QLineControl::moveCursor(int pos, bool mark) +void QWidgetLineControl::moveCursor(int pos, bool mark) { if (pos != m_cursor) { separate(); @@ -411,7 +411,7 @@ void QLineControl::moveCursor(int pos, bool mark) Applies the given input method event \a event to the text of the line control */ -void QLineControl::processInputMethodEvent(QInputMethodEvent *event) +void QWidgetLineControl::processInputMethodEvent(QInputMethodEvent *event) { int priorState = 0; bool isGettingInput = !event->commitString().isEmpty() @@ -515,7 +515,7 @@ void QLineControl::processInputMethodEvent(QInputMethodEvent *event) The display text will only be drawn if the flags contain DrawText */ -void QLineControl::draw(QPainter *painter, const QPoint &offset, const QRect &clip, int flags) +void QWidgetLineControl::draw(QPainter *painter, const QPoint &offset, const QRect &clip, int flags) { QVector<QTextLayout::FormatRange> selections; if (flags & DrawSelections) { @@ -556,7 +556,7 @@ void QLineControl::draw(QPainter *painter, const QPoint &offset, const QRect &cl The word boundaries are defined by the behavior of QTextLayout::SkipWords cursor mode. */ -void QLineControl::selectWordAtPos(int cursor) +void QWidgetLineControl::selectWordAtPos(int cursor) { int next = cursor + 1; if(next > end()) @@ -582,7 +582,7 @@ void QLineControl::selectWordAtPos(int cursor) The \a update value is currently unused. */ -bool QLineControl::finishChange(int validateFromState, bool update, bool edited) +bool QWidgetLineControl::finishChange(int validateFromState, bool update, bool edited) { Q_UNUSED(update) bool lineDirty = m_selDirty; @@ -638,7 +638,7 @@ bool QLineControl::finishChange(int validateFromState, bool update, bool edited) An internal function for setting the text of the line control. */ -void QLineControl::internalSetText(const QString &txt, int pos, bool edited) +void QWidgetLineControl::internalSetText(const QString &txt, int pos, bool edited) { internalDeselect(); emit resetInputContext(); @@ -668,7 +668,7 @@ void QLineControl::internalSetText(const QString &txt, int pos, bool edited) Adds the given \a command to the undo history of the line control. Does not apply the command. */ -void QLineControl::addCommand(const Command &cmd) +void QWidgetLineControl::addCommand(const Command &cmd) { if (m_separator && m_undoState && m_history[m_undoState - 1].type != Separator) { m_history.resize(m_undoState + 2); @@ -690,7 +690,7 @@ void QLineControl::addCommand(const Command &cmd) This function does not call finishChange(), and may leave the text in an invalid state. */ -void QLineControl::internalInsert(const QString &s) +void QWidgetLineControl::internalInsert(const QString &s) { if (hasSelectedText()) addCommand(Command(SetSelection, m_cursor, 0, m_selstart, m_selend)); @@ -726,7 +726,7 @@ void QLineControl::internalInsert(const QString &s) This function does not call finishChange(), and may leave the text in an invalid state. */ -void QLineControl::internalDelete(bool wasBackspace) +void QWidgetLineControl::internalDelete(bool wasBackspace) { if (m_cursor < (int) m_text.length()) { if (hasSelectedText()) @@ -752,7 +752,7 @@ void QLineControl::internalDelete(bool wasBackspace) This function does not call finishChange(), and may leave the text in an invalid state. */ -void QLineControl::removeSelectedText() +void QWidgetLineControl::removeSelectedText() { if (m_selstart < m_selend && m_selend <= (int) m_text.length()) { separate(); @@ -789,7 +789,7 @@ void QLineControl::removeSelectedText() Parses the input mask specified by \a maskFields to generate the mask data used to handle input masks. */ -void QLineControl::parseInputMask(const QString &maskFields) +void QWidgetLineControl::parseInputMask(const QString &maskFields) { int delimiter = maskFields.indexOf(QLatin1Char(';')); if (maskFields.isEmpty() || delimiter == 0) { @@ -892,7 +892,7 @@ void QLineControl::parseInputMask(const QString &maskFields) checks if the key is valid compared to the inputMask */ -bool QLineControl::isValidInput(QChar key, QChar mask) const +bool QWidgetLineControl::isValidInput(QChar key, QChar mask) const { switch (mask.unicode()) { case 'A': @@ -969,7 +969,7 @@ bool QLineControl::isValidInput(QChar key, QChar mask) const Otherwise returns false */ -bool QLineControl::hasAcceptableInput(const QString &str) const +bool QWidgetLineControl::hasAcceptableInput(const QString &str) const { #ifndef QT_NO_VALIDATOR QString textCopy = str; @@ -1005,7 +1005,7 @@ bool QLineControl::hasAcceptableInput(const QString &str) const that blanks will be used, false that previous input is used. Calling this when no inputMask is set is undefined. */ -QString QLineControl::maskString(uint pos, const QString &str, bool clear) const +QString QWidgetLineControl::maskString(uint pos, const QString &str, bool clear) const { if (pos >= (uint)m_maxLength) return QString::fromLatin1(""); @@ -1080,7 +1080,7 @@ QString QLineControl::maskString(uint pos, const QString &str, bool clear) const Returns a "cleared" string with only separators and blank chars. Calling this when no inputMask is set is undefined. */ -QString QLineControl::clearString(uint pos, uint len) const +QString QWidgetLineControl::clearString(uint pos, uint len) const { if (pos >= (uint)m_maxLength) return QString(); @@ -1099,10 +1099,10 @@ QString QLineControl::clearString(uint pos, uint len) const /*! \internal - Strips blank parts of the input in a QLineControl when an inputMask is set, + Strips blank parts of the input in a QWidgetLineControl when an inputMask is set, separators are still included. Typically "127.0__.0__.1__" becomes "127.0.0.1". */ -QString QLineControl::stripString(const QString &str) const +QString QWidgetLineControl::stripString(const QString &str) const { if (!m_maskData) return str; @@ -1123,7 +1123,7 @@ QString QLineControl::stripString(const QString &str) const \internal searches forward/backward in m_maskData for either a separator or a m_blank */ -int QLineControl::findInMask(int pos, bool forward, bool findSeparator, QChar searchChar) const +int QWidgetLineControl::findInMask(int pos, bool forward, bool findSeparator, QChar searchChar) const { if (pos >= m_maxLength || pos < 0) return -1; @@ -1149,7 +1149,7 @@ int QLineControl::findInMask(int pos, bool forward, bool findSeparator, QChar se return -1; } -void QLineControl::internalUndo(int until) +void QWidgetLineControl::internalUndo(int until) { if (!isUndoAvailable()) return; @@ -1190,7 +1190,7 @@ void QLineControl::internalUndo(int until) emitCursorPositionChanged(); } -void QLineControl::internalRedo() +void QWidgetLineControl::internalRedo() { if (!isRedoAvailable()) return; @@ -1239,7 +1239,7 @@ void QLineControl::internalRedo() If the current cursor position differs from the last emitted cursor position, emits cursorPositionChanged(). */ -void QLineControl::emitCursorPositionChanged() +void QWidgetLineControl::emitCursorPositionChanged() { if (m_cursor != m_lastCursorPos) { const int oldLast = m_lastCursorPos; @@ -1254,7 +1254,7 @@ void QLineControl::emitCursorPositionChanged() #ifndef QT_NO_COMPLETER // iterating forward(dir=1)/backward(dir=-1) from the // current row based. dir=0 indicates a new completion prefix was set. -bool QLineControl::advanceToEnabledItem(int dir) +bool QWidgetLineControl::advanceToEnabledItem(int dir) { int start = m_completer->currentRow(); if (start == -1) @@ -1278,7 +1278,7 @@ bool QLineControl::advanceToEnabledItem(int dir) return false; } -void QLineControl::complete(int key) +void QWidgetLineControl::complete(int key) { if (!m_completer || isReadOnly() || echoMode() != QLineEdit::Normal) return; @@ -1318,7 +1318,7 @@ void QLineControl::complete(int key) } #endif -void QLineControl::setCursorBlinkPeriod(int msec) +void QWidgetLineControl::setCursorBlinkPeriod(int msec) { if (msec == m_blinkPeriod) return; @@ -1336,7 +1336,7 @@ void QLineControl::setCursorBlinkPeriod(int msec) m_blinkPeriod = msec; } -void QLineControl::resetCursorBlinkTimer() +void QWidgetLineControl::resetCursorBlinkTimer() { if (m_blinkPeriod == 0 || m_blinkTimer == 0) return; @@ -1345,7 +1345,7 @@ void QLineControl::resetCursorBlinkTimer() m_blinkStatus = 1; } -void QLineControl::timerEvent(QTimerEvent *event) +void QWidgetLineControl::timerEvent(QTimerEvent *event) { if (event->timerId() == m_blinkTimer) { m_blinkStatus = !m_blinkStatus; @@ -1360,7 +1360,7 @@ void QLineControl::timerEvent(QTimerEvent *event) } } -bool QLineControl::processEvent(QEvent* ev) +bool QWidgetLineControl::processEvent(QEvent* ev) { #ifdef QT_KEYPAD_NAVIGATION if (QApplication::keypadNavigationEnabled()) { @@ -1457,7 +1457,7 @@ bool QLineControl::processEvent(QEvent* ev) return true; } -void QLineControl::processMouseEvent(QMouseEvent* ev) +void QWidgetLineControl::processMouseEvent(QMouseEvent* ev) { switch (ev->type()) { @@ -1511,7 +1511,7 @@ void QLineControl::processMouseEvent(QMouseEvent* ev) } } -void QLineControl::processKeyEvent(QKeyEvent* event) +void QWidgetLineControl::processKeyEvent(QKeyEvent* event) { bool inlineCompletionAccepted = false; diff --git a/src/widgets/to_be_moved/qlinecontrol_p.h b/src/widgets/widgets/qwidgetlinecontrol_p.h index eab66c4908..edc8d16e7f 100644 --- a/src/widgets/to_be_moved/qlinecontrol_p.h +++ b/src/widgets/widgets/qwidgetlinecontrol_p.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QLINECONTROL_P_H -#define QLINECONTROL_P_H +#ifndef QWidgetLineControl_P_H +#define QWidgetLineControl_P_H // // W A R N I N G @@ -71,12 +71,12 @@ QT_BEGIN_NAMESPACE QT_MODULE(Gui) -class Q_WIDGETS_EXPORT QLineControl : public QObject +class Q_WIDGETS_EXPORT QWidgetLineControl : public QObject { Q_OBJECT public: - QLineControl(const QString &txt = QString()) + QWidgetLineControl(const QString &txt = QString()) : m_cursor(0), m_preeditCursor(0), m_cursorWidth(0), m_layoutDirection(Qt::LayoutDirectionAuto), m_hideCursor(false), m_separator(0), m_readOnly(0), m_dragEnabled(0), m_echoMode(0), m_textDirty(0), m_selDirty(0), @@ -88,7 +88,7 @@ public: init(txt); } - ~QLineControl() + ~QWidgetLineControl() { delete [] m_maskData; } @@ -459,4 +459,4 @@ QT_END_HEADER #endif // QT_NO_LINEEDIT -#endif // QLINECONTROL_P_H +#endif // QWidgetLineControl_P_H diff --git a/src/widgets/to_be_moved/qtextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp index aeb2ede106..462fe094cf 100644 --- a/src/widgets/to_be_moved/qtextcontrol.cpp +++ b/src/widgets/widgets/qwidgettextcontrol.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qtextcontrol_p.h" -#include "qtextcontrol_p_p.h" +#include "qwidgettextcontrol_p.h" +#include "qwidgettextcontrol_p_p.h" #ifndef QT_NO_TEXTCONTROL @@ -60,7 +60,7 @@ #include "qtextdocument.h" #include "private/qtextdocument_p.h" #include "qtextlist.h" -#include "private/qtextcontrol_p.h" +#include "private/qwidgettextcontrol_p.h" #include "qgraphicssceneevent.h" #include "qprinter.h" #include "qtextdocumentwriter.h" @@ -112,7 +112,7 @@ static QTextLine currentTextLine(const QTextCursor &cursor) return layout->lineForTextPosition(relativePos); } -QTextControlPrivate::QTextControlPrivate() +QWidgetTextControlPrivate::QWidgetTextControlPrivate() : doc(0), cursorOn(false), cursorIsFocusIndicator(false), interactionFlags(Qt::TextEditorInteraction), dragEnabled(true), @@ -134,13 +134,13 @@ QTextControlPrivate::QTextControlPrivate() wordSelectionEnabled(false) {} -bool QTextControlPrivate::cursorMoveKeyEvent(QKeyEvent *e) +bool QWidgetTextControlPrivate::cursorMoveKeyEvent(QKeyEvent *e) { #ifdef QT_NO_SHORTCUT Q_UNUSED(e); #endif - Q_Q(QTextControl); + Q_Q(QWidgetTextControl); if (cursor.isNull()) return false; @@ -296,9 +296,9 @@ bool QTextControlPrivate::cursorMoveKeyEvent(QKeyEvent *e) return true; } -void QTextControlPrivate::updateCurrentCharFormat() +void QWidgetTextControlPrivate::updateCurrentCharFormat() { - Q_Q(QTextControl); + Q_Q(QWidgetTextControl); QTextCharFormat fmt = cursor.charFormat(); if (fmt == lastCharFormat) @@ -309,7 +309,7 @@ void QTextControlPrivate::updateCurrentCharFormat() emit q->microFocusChanged(); } -void QTextControlPrivate::indent() +void QWidgetTextControlPrivate::indent() { QTextBlockFormat blockFmt = cursor.blockFormat(); @@ -329,7 +329,7 @@ void QTextControlPrivate::indent() } } -void QTextControlPrivate::outdent() +void QWidgetTextControlPrivate::outdent() { QTextBlockFormat blockFmt = cursor.blockFormat(); @@ -346,7 +346,7 @@ void QTextControlPrivate::outdent() } } -void QTextControlPrivate::gotoNextTableCell() +void QWidgetTextControlPrivate::gotoNextTableCell() { QTextTable *table = cursor.currentTable(); QTextTableCell cell = table->cellAt(cursor); @@ -365,7 +365,7 @@ void QTextControlPrivate::gotoNextTableCell() cursor = cell.firstCursorPosition(); } -void QTextControlPrivate::gotoPreviousTableCell() +void QWidgetTextControlPrivate::gotoPreviousTableCell() { QTextTable *table = cursor.currentTable(); QTextTableCell cell = table->cellAt(cursor); @@ -384,7 +384,7 @@ void QTextControlPrivate::gotoPreviousTableCell() cursor = cell.firstCursorPosition(); } -void QTextControlPrivate::createAutoBulletList() +void QWidgetTextControlPrivate::createAutoBulletList() { cursor.beginEditBlock(); @@ -402,18 +402,18 @@ void QTextControlPrivate::createAutoBulletList() cursor.endEditBlock(); } -void QTextControlPrivate::init(Qt::TextFormat format, const QString &text, QTextDocument *document) +void QWidgetTextControlPrivate::init(Qt::TextFormat format, const QString &text, QTextDocument *document) { - Q_Q(QTextControl); + Q_Q(QWidgetTextControl); setContent(format, text, document); doc->setUndoRedoEnabled(interactionFlags & Qt::TextEditable); q->setCursorWidth(-1); } -void QTextControlPrivate::setContent(Qt::TextFormat format, const QString &text, QTextDocument *document) +void QWidgetTextControlPrivate::setContent(Qt::TextFormat format, const QString &text, QTextDocument *document) { - Q_Q(QTextControl); + Q_Q(QWidgetTextControl); // for use when called from setPlainText. we may want to re-use the currently // set char format then. @@ -425,7 +425,7 @@ void QTextControlPrivate::setContent(Qt::TextFormat format, const QString &text, doc = document; clearDocument = false; } else { - palette = QApplication::palette("QTextControl"); + palette = QApplication::palette("QWidgetTextControl"); doc = new QTextDocument(q); } _q_documentLayoutChanged(); @@ -450,7 +450,7 @@ void QTextControlPrivate::setContent(Qt::TextFormat format, const QString &text, //Saving the index save some time. static int contentsChangedIndex = QTextDocument::staticMetaObject.indexOfSignal("contentsChanged()"); - static int textChangedIndex = QTextControl::staticMetaObject.indexOfSignal("textChanged()"); + static int textChangedIndex = QWidgetTextControl::staticMetaObject.indexOfSignal("textChanged()"); // avoid multiple textChanged() signals being emitted QMetaObject::disconnect(doc, contentsChangedIndex, q, textChangedIndex); @@ -499,10 +499,10 @@ void QTextControlPrivate::setContent(Qt::TextFormat format, const QString &text, emit q->cursorPositionChanged(); } -void QTextControlPrivate::startDrag() +void QWidgetTextControlPrivate::startDrag() { #ifndef QT_NO_DRAGANDDROP - Q_Q(QTextControl); + Q_Q(QWidgetTextControl); mousePressed = false; if (!contextWidget) return; @@ -525,16 +525,16 @@ void QTextControlPrivate::startDrag() #endif } -void QTextControlPrivate::setCursorPosition(const QPointF &pos) +void QWidgetTextControlPrivate::setCursorPosition(const QPointF &pos) { - Q_Q(QTextControl); + Q_Q(QWidgetTextControl); const int cursorPos = q->hitTest(pos, Qt::FuzzyHit); if (cursorPos == -1) return; cursor.setPosition(cursorPos); } -void QTextControlPrivate::setCursorPosition(int pos, QTextCursor::MoveMode mode) +void QWidgetTextControlPrivate::setCursorPosition(int pos, QTextCursor::MoveMode mode) { cursor.setPosition(pos, mode); @@ -544,15 +544,15 @@ void QTextControlPrivate::setCursorPosition(int pos, QTextCursor::MoveMode mode) } } -void QTextControlPrivate::repaintCursor() +void QWidgetTextControlPrivate::repaintCursor() { - Q_Q(QTextControl); + Q_Q(QWidgetTextControl); emit q->updateRequest(cursorRectPlusUnicodeDirectionMarkers(cursor)); } -void QTextControlPrivate::repaintOldAndNewSelection(const QTextCursor &oldSelection) +void QWidgetTextControlPrivate::repaintOldAndNewSelection(const QTextCursor &oldSelection) { - Q_Q(QTextControl); + Q_Q(QWidgetTextControl); if (cursor.hasSelection() && oldSelection.hasSelection() && cursor.currentFrame() == oldSelection.currentFrame() @@ -571,9 +571,9 @@ void QTextControlPrivate::repaintOldAndNewSelection(const QTextCursor &oldSelect } } -void QTextControlPrivate::selectionChanged(bool forceEmitSelectionChanged /*=false*/) +void QWidgetTextControlPrivate::selectionChanged(bool forceEmitSelectionChanged /*=false*/) { - Q_Q(QTextControl); + Q_Q(QWidgetTextControl); if (forceEmitSelectionChanged) emit q->selectionChanged(); @@ -588,36 +588,36 @@ void QTextControlPrivate::selectionChanged(bool forceEmitSelectionChanged /*=fal emit q->microFocusChanged(); } -void QTextControlPrivate::_q_updateCurrentCharFormatAndSelection() +void QWidgetTextControlPrivate::_q_updateCurrentCharFormatAndSelection() { updateCurrentCharFormat(); selectionChanged(); } #ifndef QT_NO_CLIPBOARD -void QTextControlPrivate::setClipboardSelection() +void QWidgetTextControlPrivate::setClipboardSelection() { QClipboard *clipboard = QApplication::clipboard(); if (!cursor.hasSelection() || !clipboard->supportsSelection()) return; - Q_Q(QTextControl); + Q_Q(QWidgetTextControl); QMimeData *data = q->createMimeDataFromSelection(); clipboard->setMimeData(data, QClipboard::Selection); } #endif -void QTextControlPrivate::_q_emitCursorPosChanged(const QTextCursor &someCursor) +void QWidgetTextControlPrivate::_q_emitCursorPosChanged(const QTextCursor &someCursor) { - Q_Q(QTextControl); + Q_Q(QWidgetTextControl); if (someCursor.isCopyOf(cursor)) { emit q->cursorPositionChanged(); emit q->microFocusChanged(); } } -void QTextControlPrivate::_q_documentLayoutChanged() +void QWidgetTextControlPrivate::_q_documentLayoutChanged() { - Q_Q(QTextControl); + Q_Q(QWidgetTextControl); QAbstractTextDocumentLayout *layout = doc->documentLayout(); QObject::connect(layout, SIGNAL(update(QRectF)), q, SIGNAL(updateRequest(QRectF))); QObject::connect(layout, SIGNAL(updateBlock(QTextBlock)), q, SLOT(_q_updateBlock(QTextBlock))); @@ -625,9 +625,9 @@ void QTextControlPrivate::_q_documentLayoutChanged() } -void QTextControlPrivate::setBlinkingCursorEnabled(bool enable) +void QWidgetTextControlPrivate::setBlinkingCursorEnabled(bool enable) { - Q_Q(QTextControl); + Q_Q(QWidgetTextControl); if (enable && QApplication::cursorFlashTime() > 0) cursorBlinkTimer.start(QApplication::cursorFlashTime() / 2, q); @@ -639,9 +639,9 @@ void QTextControlPrivate::setBlinkingCursorEnabled(bool enable) repaintCursor(); } -void QTextControlPrivate::extendWordwiseSelection(int suggestedNewPosition, qreal mouseXPosition) +void QWidgetTextControlPrivate::extendWordwiseSelection(int suggestedNewPosition, qreal mouseXPosition) { - Q_Q(QTextControl); + Q_Q(QWidgetTextControl); // if inside the initial selected word keep that if (suggestedNewPosition >= selectedWordOnDoubleClick.selectionStart() @@ -703,9 +703,9 @@ void QTextControlPrivate::extendWordwiseSelection(int suggestedNewPosition, qrea } } -void QTextControlPrivate::extendBlockwiseSelection(int suggestedNewPosition) +void QWidgetTextControlPrivate::extendBlockwiseSelection(int suggestedNewPosition) { - Q_Q(QTextControl); + Q_Q(QWidgetTextControl); // if inside the initial selected line keep that if (suggestedNewPosition >= selectedBlockOnTrippleClick.selectionStart() @@ -733,16 +733,16 @@ void QTextControlPrivate::extendBlockwiseSelection(int suggestedNewPosition) } } -void QTextControlPrivate::_q_deleteSelected() +void QWidgetTextControlPrivate::_q_deleteSelected() { if (!(interactionFlags & Qt::TextEditable) || !cursor.hasSelection()) return; cursor.removeSelectedText(); } -void QTextControl::undo() +void QWidgetTextControl::undo() { - Q_D(QTextControl); + Q_D(QWidgetTextControl); d->repaintSelection(); const int oldCursorPos = d->cursor.position(); d->doc->undo(&d->cursor); @@ -752,9 +752,9 @@ void QTextControl::undo() ensureCursorVisible(); } -void QTextControl::redo() +void QWidgetTextControl::redo() { - Q_D(QTextControl); + Q_D(QWidgetTextControl); d->repaintSelection(); const int oldCursorPos = d->cursor.position(); d->doc->redo(&d->cursor); @@ -764,34 +764,34 @@ void QTextControl::redo() ensureCursorVisible(); } -QTextControl::QTextControl(QObject *parent) - : QObject(*new QTextControlPrivate, parent) +QWidgetTextControl::QWidgetTextControl(QObject *parent) + : QObject(*new QWidgetTextControlPrivate, parent) { - Q_D(QTextControl); + Q_D(QWidgetTextControl); d->init(); } -QTextControl::QTextControl(const QString &text, QObject *parent) - : QObject(*new QTextControlPrivate, parent) +QWidgetTextControl::QWidgetTextControl(const QString &text, QObject *parent) + : QObject(*new QWidgetTextControlPrivate, parent) { - Q_D(QTextControl); + Q_D(QWidgetTextControl); d->init(Qt::RichText, text); } -QTextControl::QTextControl(QTextDocument *doc, QObject *parent) - : QObject(*new QTextControlPrivate, parent) +QWidgetTextControl::QWidgetTextControl(QTextDocument *doc, QObject *parent) + : QObject(*new QWidgetTextControlPrivate, parent) { - Q_D(QTextControl); + Q_D(QWidgetTextControl); d->init(Qt::RichText, QString(), doc); } -QTextControl::~QTextControl() +QWidgetTextControl::~QWidgetTextControl() { } -void QTextControl::setDocument(QTextDocument *document) +void QWidgetTextControl::setDocument(QTextDocument *document) { - Q_D(QTextControl); + Q_D(QWidgetTextControl); if (d->doc == document) return; @@ -806,15 +806,15 @@ void QTextControl::setDocument(QTextDocument *document) d->setContent(Qt::RichText, QString(), document); } -QTextDocument *QTextControl::document() const +QTextDocument *QWidgetTextControl::document() const { - Q_D(const QTextControl); + Q_D(const QWidgetTextControl); return d->doc; } -void QTextControl::setTextCursor(const QTextCursor &cursor) +void QWidgetTextControl::setTextCursor(const QTextCursor &cursor) { - Q_D(QTextControl); + Q_D(QWidgetTextControl); d->cursorIsFocusIndicator = false; const bool posChanged = cursor.position() != d->cursor.position(); const QTextCursor oldSelection = d->cursor; @@ -827,33 +827,33 @@ void QTextControl::setTextCursor(const QTextCursor &cursor) emit cursorPositionChanged(); } -QTextCursor QTextControl::textCursor() const +QTextCursor QWidgetTextControl::textCursor() const { - Q_D(const QTextControl); + Q_D(const QWidgetTextControl); return d->cursor; } #ifndef QT_NO_CLIPBOARD -void QTextControl::cut() +void QWidgetTextControl::cut() { - Q_D(QTextControl); + Q_D(QWidgetTextControl); if (!(d->interactionFlags & Qt::TextEditable) || !d->cursor.hasSelection()) return; copy(); d->cursor.removeSelectedText(); } -void QTextControl::copy() +void QWidgetTextControl::copy() { - Q_D(QTextControl); + Q_D(QWidgetTextControl); if (!d->cursor.hasSelection()) return; QMimeData *data = createMimeDataFromSelection(); QApplication::clipboard()->setMimeData(data); } -void QTextControl::paste(QClipboard::Mode mode) +void QWidgetTextControl::paste(QClipboard::Mode mode) { const QMimeData *md = QApplication::clipboard()->mimeData(mode); if (md) @@ -861,18 +861,18 @@ void QTextControl::paste(QClipboard::Mode mode) } #endif -void QTextControl::clear() +void QWidgetTextControl::clear() { - Q_D(QTextControl); + Q_D(QWidgetTextControl); // clears and sets empty content d->extraSelections.clear(); d->setContent(); } -void QTextControl::selectAll() +void QWidgetTextControl::selectAll() { - Q_D(QTextControl); + Q_D(QWidgetTextControl); const int selectionLength = qAbs(d->cursor.position() - d->cursor.anchor()); d->cursor.select(QTextCursor::Document); d->selectionChanged(selectionLength != qAbs(d->cursor.position() - d->cursor.anchor())); @@ -880,16 +880,16 @@ void QTextControl::selectAll() emit updateRequest(); } -void QTextControl::processEvent(QEvent *e, const QPointF &coordinateOffset, QWidget *contextWidget) +void QWidgetTextControl::processEvent(QEvent *e, const QPointF &coordinateOffset, QWidget *contextWidget) { QMatrix m; m.translate(coordinateOffset.x(), coordinateOffset.y()); processEvent(e, m, contextWidget); } -void QTextControl::processEvent(QEvent *e, const QMatrix &matrix, QWidget *contextWidget) +void QWidgetTextControl::processEvent(QEvent *e, const QMatrix &matrix, QWidget *contextWidget) { - Q_D(QTextControl); + Q_D(QWidgetTextControl); if (d->interactionFlags == Qt::NoTextInteraction) { e->ignore(); return; @@ -1110,14 +1110,14 @@ void QTextControl::processEvent(QEvent *e, const QMatrix &matrix, QWidget *conte } } -bool QTextControl::event(QEvent *e) +bool QWidgetTextControl::event(QEvent *e) { return QObject::event(e); } -void QTextControl::timerEvent(QTimerEvent *e) +void QWidgetTextControl::timerEvent(QTimerEvent *e) { - Q_D(QTextControl); + Q_D(QWidgetTextControl); if (e->timerId() == d->cursorBlinkTimer.timerId()) { d->cursorOn = !d->cursorOn; @@ -1131,21 +1131,21 @@ void QTextControl::timerEvent(QTimerEvent *e) } } -void QTextControl::setPlainText(const QString &text) +void QWidgetTextControl::setPlainText(const QString &text) { - Q_D(QTextControl); + Q_D(QWidgetTextControl); d->setContent(Qt::PlainText, text); } -void QTextControl::setHtml(const QString &text) +void QWidgetTextControl::setHtml(const QString &text) { - Q_D(QTextControl); + Q_D(QWidgetTextControl); d->setContent(Qt::RichText, text); } -void QTextControlPrivate::keyPressEvent(QKeyEvent *e) +void QWidgetTextControlPrivate::keyPressEvent(QKeyEvent *e) { - Q_Q(QTextControl); + Q_Q(QWidgetTextControl); #ifndef QT_NO_SHORTCUT if (e == QKeySequence::SelectAll) { e->accept(); @@ -1302,7 +1302,7 @@ process: updateCurrentCharFormat(); } -QVariant QTextControl::loadResource(int type, const QUrl &name) +QVariant QWidgetTextControl::loadResource(int type, const QUrl &name) { #ifdef QT_NO_TEXTEDIT Q_UNUSED(type); @@ -1316,17 +1316,17 @@ QVariant QTextControl::loadResource(int type, const QUrl &name) return QVariant(); } -void QTextControlPrivate::_q_updateBlock(const QTextBlock &block) +void QWidgetTextControlPrivate::_q_updateBlock(const QTextBlock &block) { - Q_Q(QTextControl); + Q_Q(QWidgetTextControl); QRectF br = q->blockBoundingRect(block); br.setRight(qreal(INT_MAX)); // the block might have shrunk emit q->updateRequest(br); } -QRectF QTextControlPrivate::rectForPosition(int position) const +QRectF QWidgetTextControlPrivate::rectForPosition(int position) const { - Q_Q(const QTextControl); + Q_Q(const QWidgetTextControl); const QTextBlock block = doc->findBlock(position); if (!block.isValid()) return QRectF(); @@ -1400,9 +1400,9 @@ static QRectF boundingRectOfFloatsInSelection(const QTextCursor &cursor) return r; } -QRectF QTextControl::selectionRect(const QTextCursor &cursor) const +QRectF QWidgetTextControl::selectionRect(const QTextCursor &cursor) const { - Q_D(const QTextControl); + Q_D(const QWidgetTextControl); QRectF r = d->rectForPosition(cursor.selectionStart()); @@ -1484,16 +1484,16 @@ QRectF QTextControl::selectionRect(const QTextCursor &cursor) const return r; } -QRectF QTextControl::selectionRect() const +QRectF QWidgetTextControl::selectionRect() const { - Q_D(const QTextControl); + Q_D(const QWidgetTextControl); return selectionRect(d->cursor); } -void QTextControlPrivate::mousePressEvent(QEvent *e, Qt::MouseButton button, const QPointF &pos, Qt::KeyboardModifiers modifiers, +void QWidgetTextControlPrivate::mousePressEvent(QEvent *e, Qt::MouseButton button, const QPointF &pos, Qt::KeyboardModifiers modifiers, Qt::MouseButtons buttons, const QPoint &globalPos) { - Q_Q(QTextControl); + Q_Q(QWidgetTextControl); if (sendMouseEventToInputContext( e, QEvent::MouseButtonPress, button, pos, modifiers, buttons, globalPos)) { @@ -1589,10 +1589,10 @@ void QTextControlPrivate::mousePressEvent(QEvent *e, Qt::MouseButton button, con hadSelectionOnMousePress = cursor.hasSelection(); } -void QTextControlPrivate::mouseMoveEvent(QEvent *e, Qt::MouseButton button, const QPointF &mousePos, Qt::KeyboardModifiers modifiers, +void QWidgetTextControlPrivate::mouseMoveEvent(QEvent *e, Qt::MouseButton button, const QPointF &mousePos, Qt::KeyboardModifiers modifiers, Qt::MouseButtons buttons, const QPoint &globalPos) { - Q_Q(QTextControl); + Q_Q(QWidgetTextControl); if (sendMouseEventToInputContext( e, QEvent::MouseMove, button, mousePos, modifiers, buttons, globalPos)) { @@ -1672,10 +1672,10 @@ void QTextControlPrivate::mouseMoveEvent(QEvent *e, Qt::MouseButton button, cons repaintOldAndNewSelection(oldSelection); } -void QTextControlPrivate::mouseReleaseEvent(QEvent *e, Qt::MouseButton button, const QPointF &pos, Qt::KeyboardModifiers modifiers, +void QWidgetTextControlPrivate::mouseReleaseEvent(QEvent *e, Qt::MouseButton button, const QPointF &pos, Qt::KeyboardModifiers modifiers, Qt::MouseButtons buttons, const QPoint &globalPos) { - Q_Q(QTextControl); + Q_Q(QWidgetTextControl); if (sendMouseEventToInputContext( e, QEvent::MouseButtonRelease, button, pos, modifiers, buttons, globalPos)) { @@ -1737,10 +1737,10 @@ void QTextControlPrivate::mouseReleaseEvent(QEvent *e, Qt::MouseButton button, c } } -void QTextControlPrivate::mouseDoubleClickEvent(QEvent *e, Qt::MouseButton button, const QPointF &pos, Qt::KeyboardModifiers modifiers, +void QWidgetTextControlPrivate::mouseDoubleClickEvent(QEvent *e, Qt::MouseButton button, const QPointF &pos, Qt::KeyboardModifiers modifiers, Qt::MouseButtons buttons, const QPoint &globalPos) { - Q_Q(QTextControl); + Q_Q(QWidgetTextControl); if (sendMouseEventToInputContext( e, QEvent::MouseButtonDblClick, button, pos, modifiers, buttons, globalPos)) { @@ -1780,12 +1780,12 @@ void QTextControlPrivate::mouseDoubleClickEvent(QEvent *e, Qt::MouseButton butto } } -bool QTextControlPrivate::sendMouseEventToInputContext( +bool QWidgetTextControlPrivate::sendMouseEventToInputContext( QEvent *e, QEvent::Type eventType, Qt::MouseButton button, const QPointF &pos, Qt::KeyboardModifiers modifiers, Qt::MouseButtons buttons, const QPoint &globalPos) { #if !defined(QT_NO_IM) - Q_Q(QTextControl); + Q_Q(QWidgetTextControl); QTextLayout *layout = cursor.block().layout(); if (contextWidget && layout && !layout->preeditAreaText().isEmpty()) { @@ -1819,14 +1819,14 @@ bool QTextControlPrivate::sendMouseEventToInputContext( return false; } -void QTextControlPrivate::contextMenuEvent(const QPoint &screenPos, const QPointF &docPos, QWidget *contextWidget) +void QWidgetTextControlPrivate::contextMenuEvent(const QPoint &screenPos, const QPointF &docPos, QWidget *contextWidget) { #ifdef QT_NO_CONTEXTMENU Q_UNUSED(screenPos); Q_UNUSED(docPos); Q_UNUSED(contextWidget); #else - Q_Q(QTextControl); + Q_Q(QWidgetTextControl); if (!hasFocus) return; QMenu *menu = q->createStandardContextMenu(docPos, contextWidget); @@ -1837,9 +1837,9 @@ void QTextControlPrivate::contextMenuEvent(const QPoint &screenPos, const QPoint #endif } -bool QTextControlPrivate::dragEnterEvent(QEvent *e, const QMimeData *mimeData) +bool QWidgetTextControlPrivate::dragEnterEvent(QEvent *e, const QMimeData *mimeData) { - Q_Q(QTextControl); + Q_Q(QWidgetTextControl); if (!(interactionFlags & Qt::TextEditable) || !q->canInsertFromMimeData(mimeData)) { e->ignore(); return false; @@ -1850,9 +1850,9 @@ bool QTextControlPrivate::dragEnterEvent(QEvent *e, const QMimeData *mimeData) return true; // accept proposed action } -void QTextControlPrivate::dragLeaveEvent() +void QWidgetTextControlPrivate::dragLeaveEvent() { - Q_Q(QTextControl); + Q_Q(QWidgetTextControl); const QRectF crect = q->cursorRect(dndFeedbackCursor); dndFeedbackCursor = QTextCursor(); @@ -1861,9 +1861,9 @@ void QTextControlPrivate::dragLeaveEvent() emit q->updateRequest(crect); } -bool QTextControlPrivate::dragMoveEvent(QEvent *e, const QMimeData *mimeData, const QPointF &pos) +bool QWidgetTextControlPrivate::dragMoveEvent(QEvent *e, const QMimeData *mimeData, const QPointF &pos) { - Q_Q(QTextControl); + Q_Q(QWidgetTextControl); if (!(interactionFlags & Qt::TextEditable) || !q->canInsertFromMimeData(mimeData)) { e->ignore(); return false; @@ -1885,9 +1885,9 @@ bool QTextControlPrivate::dragMoveEvent(QEvent *e, const QMimeData *mimeData, co return true; // accept proposed action } -bool QTextControlPrivate::dropEvent(const QMimeData *mimeData, const QPointF &pos, Qt::DropAction dropAction, QObject *source) +bool QWidgetTextControlPrivate::dropEvent(const QMimeData *mimeData, const QPointF &pos, Qt::DropAction dropAction, QObject *source) { - Q_Q(QTextControl); + Q_Q(QWidgetTextControl); dndFeedbackCursor = QTextCursor(); if (!(interactionFlags & Qt::TextEditable) || !q->canInsertFromMimeData(mimeData)) @@ -1908,9 +1908,9 @@ bool QTextControlPrivate::dropEvent(const QMimeData *mimeData, const QPointF &po return true; // accept proposed action } -void QTextControlPrivate::inputMethodEvent(QInputMethodEvent *e) +void QWidgetTextControlPrivate::inputMethodEvent(QInputMethodEvent *e) { - Q_Q(QTextControl); + Q_Q(QWidgetTextControl); if (!(interactionFlags & Qt::TextEditable) || cursor.isNull()) { e->ignore(); return; @@ -1976,9 +1976,9 @@ void QTextControlPrivate::inputMethodEvent(QInputMethodEvent *e) emit q->microFocusChanged(); } -QVariant QTextControl::inputMethodQuery(Qt::InputMethodQuery property) const +QVariant QWidgetTextControl::inputMethodQuery(Qt::InputMethodQuery property) const { - Q_D(const QTextControl); + Q_D(const QWidgetTextControl); QTextBlock block = d->cursor.block(); switch(property) { case Qt::ImMicroFocus: @@ -2000,16 +2000,16 @@ QVariant QTextControl::inputMethodQuery(Qt::InputMethodQuery property) const } } -void QTextControl::setFocus(bool focus, Qt::FocusReason reason) +void QWidgetTextControl::setFocus(bool focus, Qt::FocusReason reason) { QFocusEvent ev(focus ? QEvent::FocusIn : QEvent::FocusOut, reason); processEvent(&ev); } -void QTextControlPrivate::focusEvent(QFocusEvent *e) +void QWidgetTextControlPrivate::focusEvent(QFocusEvent *e) { - Q_Q(QTextControl); + Q_Q(QWidgetTextControl); emit q->updateRequest(q->selectionRect()); if (e->gotFocus()) { #ifdef QT_KEYPAD_NAVIGATION @@ -2039,7 +2039,7 @@ void QTextControlPrivate::focusEvent(QFocusEvent *e) hasFocus = e->gotFocus(); } -QString QTextControlPrivate::anchorForCursor(const QTextCursor &anchorCursor) const +QString QWidgetTextControlPrivate::anchorForCursor(const QTextCursor &anchorCursor) const { if (anchorCursor.hasSelection()) { QTextCursor cursor = anchorCursor; @@ -2054,9 +2054,9 @@ QString QTextControlPrivate::anchorForCursor(const QTextCursor &anchorCursor) co } #ifdef QT_KEYPAD_NAVIGATION -void QTextControlPrivate::editFocusEvent(QEvent *e) +void QWidgetTextControlPrivate::editFocusEvent(QEvent *e) { - Q_Q(QTextControl); + Q_Q(QWidgetTextControl); if (QApplication::keypadNavigationEnabled()) { if (e->type() == QEvent::EnterEditFocus && interactionFlags & Qt::TextEditable) { @@ -2082,9 +2082,9 @@ void QTextControlPrivate::editFocusEvent(QEvent *e) #endif #ifndef QT_NO_CONTEXTMENU -QMenu *QTextControl::createStandardContextMenu(const QPointF &pos, QWidget *parent) +QMenu *QWidgetTextControl::createStandardContextMenu(const QPointF &pos, QWidget *parent) { - Q_D(QTextControl); + Q_D(QWidgetTextControl); const bool showTextSelectionActions = d->interactionFlags & (Qt::TextEditable | Qt::TextSelectableByKeyboard | Qt::TextSelectableByMouse); @@ -2162,9 +2162,9 @@ QMenu *QTextControl::createStandardContextMenu(const QPointF &pos, QWidget *pare } #endif // QT_NO_CONTEXTMENU -QTextCursor QTextControl::cursorForPosition(const QPointF &pos) const +QTextCursor QWidgetTextControl::cursorForPosition(const QPointF &pos) const { - Q_D(const QTextControl); + Q_D(const QWidgetTextControl); int cursorPos = hitTest(pos, Qt::FuzzyHit); if (cursorPos == -1) cursorPos = 0; @@ -2173,22 +2173,22 @@ QTextCursor QTextControl::cursorForPosition(const QPointF &pos) const return c; } -QRectF QTextControl::cursorRect(const QTextCursor &cursor) const +QRectF QWidgetTextControl::cursorRect(const QTextCursor &cursor) const { - Q_D(const QTextControl); + Q_D(const QWidgetTextControl); if (cursor.isNull()) return QRectF(); return d->rectForPosition(cursor.position()); } -QRectF QTextControl::cursorRect() const +QRectF QWidgetTextControl::cursorRect() const { - Q_D(const QTextControl); + Q_D(const QWidgetTextControl); return cursorRect(d->cursor); } -QRectF QTextControlPrivate::cursorRectPlusUnicodeDirectionMarkers(const QTextCursor &cursor) const +QRectF QWidgetTextControlPrivate::cursorRectPlusUnicodeDirectionMarkers(const QTextCursor &cursor) const { if (cursor.isNull()) return QRectF(); @@ -2196,44 +2196,44 @@ QRectF QTextControlPrivate::cursorRectPlusUnicodeDirectionMarkers(const QTextCur return rectForPosition(cursor.position()).adjusted(-4, 0, 4, 0); } -QString QTextControl::anchorAt(const QPointF &pos) const +QString QWidgetTextControl::anchorAt(const QPointF &pos) const { - Q_D(const QTextControl); + Q_D(const QWidgetTextControl); return d->doc->documentLayout()->anchorAt(pos); } -QString QTextControl::anchorAtCursor() const +QString QWidgetTextControl::anchorAtCursor() const { - Q_D(const QTextControl); + Q_D(const QWidgetTextControl); return d->anchorForCursor(d->cursor); } -bool QTextControl::overwriteMode() const +bool QWidgetTextControl::overwriteMode() const { - Q_D(const QTextControl); + Q_D(const QWidgetTextControl); return d->overwriteMode; } -void QTextControl::setOverwriteMode(bool overwrite) +void QWidgetTextControl::setOverwriteMode(bool overwrite) { - Q_D(QTextControl); + Q_D(QWidgetTextControl); d->overwriteMode = overwrite; } -int QTextControl::cursorWidth() const +int QWidgetTextControl::cursorWidth() const { #ifndef QT_NO_PROPERTIES - Q_D(const QTextControl); + Q_D(const QWidgetTextControl); return d->doc->documentLayout()->property("cursorWidth").toInt(); #else return 1; #endif } -void QTextControl::setCursorWidth(int width) +void QWidgetTextControl::setCursorWidth(int width) { - Q_D(QTextControl); + Q_D(QWidgetTextControl); #ifdef QT_NO_PROPERTIES Q_UNUSED(width); #else @@ -2244,23 +2244,23 @@ void QTextControl::setCursorWidth(int width) d->repaintCursor(); } -bool QTextControl::acceptRichText() const +bool QWidgetTextControl::acceptRichText() const { - Q_D(const QTextControl); + Q_D(const QWidgetTextControl); return d->acceptRichText; } -void QTextControl::setAcceptRichText(bool accept) +void QWidgetTextControl::setAcceptRichText(bool accept) { - Q_D(QTextControl); + Q_D(QWidgetTextControl); d->acceptRichText = accept; } #ifndef QT_NO_TEXTEDIT -void QTextControl::setExtraSelections(const QList<QTextEdit::ExtraSelection> &selections) +void QWidgetTextControl::setExtraSelections(const QList<QTextEdit::ExtraSelection> &selections) { - Q_D(QTextControl); + Q_D(QWidgetTextControl); QHash<int, int> hash; for (int i = 0; i < d->extraSelections.count(); ++i) { @@ -2304,9 +2304,9 @@ void QTextControl::setExtraSelections(const QList<QTextEdit::ExtraSelection> &se } } -QList<QTextEdit::ExtraSelection> QTextControl::extraSelections() const +QList<QTextEdit::ExtraSelection> QWidgetTextControl::extraSelections() const { - Q_D(const QTextControl); + Q_D(const QWidgetTextControl); QList<QTextEdit::ExtraSelection> selections; for (int i = 0; i < d->extraSelections.count(); ++i) { QTextEdit::ExtraSelection sel; @@ -2319,51 +2319,51 @@ QList<QTextEdit::ExtraSelection> QTextControl::extraSelections() const #endif // QT_NO_TEXTEDIT -void QTextControl::setTextWidth(qreal width) +void QWidgetTextControl::setTextWidth(qreal width) { - Q_D(QTextControl); + Q_D(QWidgetTextControl); d->doc->setTextWidth(width); } -qreal QTextControl::textWidth() const +qreal QWidgetTextControl::textWidth() const { - Q_D(const QTextControl); + Q_D(const QWidgetTextControl); return d->doc->textWidth(); } -QSizeF QTextControl::size() const +QSizeF QWidgetTextControl::size() const { - Q_D(const QTextControl); + Q_D(const QWidgetTextControl); return d->doc->size(); } -void QTextControl::setOpenExternalLinks(bool open) +void QWidgetTextControl::setOpenExternalLinks(bool open) { - Q_D(QTextControl); + Q_D(QWidgetTextControl); d->openExternalLinks = open; } -bool QTextControl::openExternalLinks() const +bool QWidgetTextControl::openExternalLinks() const { - Q_D(const QTextControl); + Q_D(const QWidgetTextControl); return d->openExternalLinks; } -bool QTextControl::ignoreUnusedNavigationEvents() const +bool QWidgetTextControl::ignoreUnusedNavigationEvents() const { - Q_D(const QTextControl); + Q_D(const QWidgetTextControl); return d->ignoreUnusedNavigationEvents; } -void QTextControl::setIgnoreUnusedNavigationEvents(bool ignore) +void QWidgetTextControl::setIgnoreUnusedNavigationEvents(bool ignore) { - Q_D(QTextControl); + Q_D(QWidgetTextControl); d->ignoreUnusedNavigationEvents = ignore; } -void QTextControl::moveCursor(QTextCursor::MoveOperation op, QTextCursor::MoveMode mode) +void QWidgetTextControl::moveCursor(QTextCursor::MoveOperation op, QTextCursor::MoveMode mode) { - Q_D(QTextControl); + Q_D(QWidgetTextControl); const QTextCursor oldSelection = d->cursor; const bool moved = d->cursor.movePosition(op, mode); d->_q_updateCurrentCharFormatAndSelection(); @@ -2373,10 +2373,10 @@ void QTextControl::moveCursor(QTextCursor::MoveOperation op, QTextCursor::MoveMo emit cursorPositionChanged(); } -bool QTextControl::canPaste() const +bool QWidgetTextControl::canPaste() const { #ifndef QT_NO_CLIPBOARD - Q_D(const QTextControl); + Q_D(const QWidgetTextControl); if (d->interactionFlags & Qt::TextEditable) { const QMimeData *md = QApplication::clipboard()->mimeData(); return md && canInsertFromMimeData(md); @@ -2385,49 +2385,49 @@ bool QTextControl::canPaste() const return false; } -void QTextControl::setCursorIsFocusIndicator(bool b) +void QWidgetTextControl::setCursorIsFocusIndicator(bool b) { - Q_D(QTextControl); + Q_D(QWidgetTextControl); d->cursorIsFocusIndicator = b; d->repaintCursor(); } -bool QTextControl::cursorIsFocusIndicator() const +bool QWidgetTextControl::cursorIsFocusIndicator() const { - Q_D(const QTextControl); + Q_D(const QWidgetTextControl); return d->cursorIsFocusIndicator; } -void QTextControl::setDragEnabled(bool enabled) +void QWidgetTextControl::setDragEnabled(bool enabled) { - Q_D(QTextControl); + Q_D(QWidgetTextControl); d->dragEnabled = enabled; } -bool QTextControl::isDragEnabled() const +bool QWidgetTextControl::isDragEnabled() const { - Q_D(const QTextControl); + Q_D(const QWidgetTextControl); return d->dragEnabled; } -void QTextControl::setWordSelectionEnabled(bool enabled) +void QWidgetTextControl::setWordSelectionEnabled(bool enabled) { - Q_D(QTextControl); + Q_D(QWidgetTextControl); d->wordSelectionEnabled = enabled; } -bool QTextControl::isWordSelectionEnabled() const +bool QWidgetTextControl::isWordSelectionEnabled() const { - Q_D(const QTextControl); + Q_D(const QWidgetTextControl); return d->wordSelectionEnabled; } #ifndef QT_NO_PRINTER -void QTextControl::print(QPrinter *printer) const +void QWidgetTextControl::print(QPrinter *printer) const { #ifndef QT_NO_PRINTER - Q_D(const QTextControl); + Q_D(const QWidgetTextControl); if (!printer || !printer->isValid()) return; QTextDocument *tempDoc = 0; @@ -2452,16 +2452,16 @@ void QTextControl::print(QPrinter *printer) const } #endif // QT_NO_PRINTER -QMimeData *QTextControl::createMimeDataFromSelection() const +QMimeData *QWidgetTextControl::createMimeDataFromSelection() const { - Q_D(const QTextControl); + Q_D(const QWidgetTextControl); const QTextDocumentFragment fragment(d->cursor); return new QTextEditMimeData(fragment); } -bool QTextControl::canInsertFromMimeData(const QMimeData *source) const +bool QWidgetTextControl::canInsertFromMimeData(const QMimeData *source) const { - Q_D(const QTextControl); + Q_D(const QWidgetTextControl); if (d->acceptRichText) return (source->hasText() && !source->text().isEmpty()) || source->hasHtml() @@ -2471,9 +2471,9 @@ bool QTextControl::canInsertFromMimeData(const QMimeData *source) const return source->hasText() && !source->text().isEmpty(); } -void QTextControl::insertFromMimeData(const QMimeData *source) +void QWidgetTextControl::insertFromMimeData(const QMimeData *source) { - Q_D(QTextControl); + Q_D(QWidgetTextControl); if (!(d->interactionFlags & Qt::TextEditable) || !source) return; @@ -2505,9 +2505,9 @@ void QTextControl::insertFromMimeData(const QMimeData *source) ensureCursorVisible(); } -bool QTextControl::findNextPrevAnchor(const QTextCursor &startCursor, bool next, QTextCursor &newAnchor) +bool QWidgetTextControl::findNextPrevAnchor(const QTextCursor &startCursor, bool next, QTextCursor &newAnchor) { - Q_D(QTextControl); + Q_D(QWidgetTextControl); int anchorStart = -1; QString anchorHref; @@ -2647,7 +2647,7 @@ bool QTextControl::findNextPrevAnchor(const QTextCursor &startCursor, bool next, return false; } -void QTextControlPrivate::activateLinkUnderCursor(QString href) +void QWidgetTextControlPrivate::activateLinkUnderCursor(QString href) { QTextCursor oldCursor = cursor; @@ -2717,7 +2717,7 @@ void QTextControlPrivate::activateLinkUnderCursor(QString href) } #ifndef QT_NO_TOOLTIP -void QTextControlPrivate::showToolTip(const QPoint &globalPos, const QPointF &pos, QWidget *contextWidget) +void QWidgetTextControlPrivate::showToolTip(const QPoint &globalPos, const QPointF &pos, QWidget *contextWidget) { const QString toolTip = q_func()->cursorForPosition(pos).charFormat().toolTip(); if (toolTip.isEmpty()) @@ -2726,9 +2726,9 @@ void QTextControlPrivate::showToolTip(const QPoint &globalPos, const QPointF &po } #endif // QT_NO_TOOLTIP -bool QTextControl::setFocusToNextOrPreviousAnchor(bool next) +bool QWidgetTextControl::setFocusToNextOrPreviousAnchor(bool next) { - Q_D(QTextControl); + Q_D(QWidgetTextControl); if (!(d->interactionFlags & Qt::LinksAccessibleByKeyboard)) return false; @@ -2763,9 +2763,9 @@ bool QTextControl::setFocusToNextOrPreviousAnchor(bool next) } } -bool QTextControl::setFocusToAnchor(const QTextCursor &newCursor) +bool QWidgetTextControl::setFocusToAnchor(const QTextCursor &newCursor) { - Q_D(QTextControl); + Q_D(QWidgetTextControl); if (!(d->interactionFlags & Qt::LinksAccessibleByKeyboard)) return false; @@ -2789,9 +2789,9 @@ bool QTextControl::setFocusToAnchor(const QTextCursor &newCursor) return true; } -void QTextControl::setTextInteractionFlags(Qt::TextInteractionFlags flags) +void QWidgetTextControl::setTextInteractionFlags(Qt::TextInteractionFlags flags) { - Q_D(QTextControl); + Q_D(QWidgetTextControl); if (flags == d->interactionFlags) return; d->interactionFlags = flags; @@ -2800,49 +2800,49 @@ void QTextControl::setTextInteractionFlags(Qt::TextInteractionFlags flags) d->setBlinkingCursorEnabled(flags & Qt::TextEditable); } -Qt::TextInteractionFlags QTextControl::textInteractionFlags() const +Qt::TextInteractionFlags QWidgetTextControl::textInteractionFlags() const { - Q_D(const QTextControl); + Q_D(const QWidgetTextControl); return d->interactionFlags; } -void QTextControl::mergeCurrentCharFormat(const QTextCharFormat &modifier) +void QWidgetTextControl::mergeCurrentCharFormat(const QTextCharFormat &modifier) { - Q_D(QTextControl); + Q_D(QWidgetTextControl); d->cursor.mergeCharFormat(modifier); d->updateCurrentCharFormat(); } -void QTextControl::setCurrentCharFormat(const QTextCharFormat &format) +void QWidgetTextControl::setCurrentCharFormat(const QTextCharFormat &format) { - Q_D(QTextControl); + Q_D(QWidgetTextControl); d->cursor.setCharFormat(format); d->updateCurrentCharFormat(); } -QTextCharFormat QTextControl::currentCharFormat() const +QTextCharFormat QWidgetTextControl::currentCharFormat() const { - Q_D(const QTextControl); + Q_D(const QWidgetTextControl); return d->cursor.charFormat(); } -void QTextControl::insertPlainText(const QString &text) +void QWidgetTextControl::insertPlainText(const QString &text) { - Q_D(QTextControl); + Q_D(QWidgetTextControl); d->cursor.insertText(text); } #ifndef QT_NO_TEXTHTMLPARSER -void QTextControl::insertHtml(const QString &text) +void QWidgetTextControl::insertHtml(const QString &text) { - Q_D(QTextControl); + Q_D(QWidgetTextControl); d->cursor.insertHtml(text); } #endif // QT_NO_TEXTHTMLPARSER -QPointF QTextControl::anchorPosition(const QString &name) const +QPointF QWidgetTextControl::anchorPosition(const QString &name) const { - Q_D(const QTextControl); + Q_D(const QWidgetTextControl); if (name.isEmpty()) return QPointF(); @@ -2869,15 +2869,15 @@ QPointF QTextControl::anchorPosition(const QString &name) const return QPointF(0, r.top()); } -void QTextControl::adjustSize() +void QWidgetTextControl::adjustSize() { - Q_D(QTextControl); + Q_D(QWidgetTextControl); d->doc->adjustSize(); } -bool QTextControl::find(const QString &exp, QTextDocument::FindFlags options) +bool QWidgetTextControl::find(const QString &exp, QTextDocument::FindFlags options) { - Q_D(QTextControl); + Q_D(QWidgetTextControl); QTextCursor search = d->doc->find(exp, d->cursor, options); if (search.isNull()) return false; @@ -2888,7 +2888,7 @@ bool QTextControl::find(const QString &exp, QTextDocument::FindFlags options) -void QTextControlPrivate::append(const QString &text, Qt::TextFormat format) +void QWidgetTextControlPrivate::append(const QString &text, Qt::TextFormat format) { QTextCursor tmp(doc); tmp.beginEditBlock(); @@ -2917,48 +2917,48 @@ void QTextControlPrivate::append(const QString &text, Qt::TextFormat format) tmp.endEditBlock(); } -void QTextControl::append(const QString &text) +void QWidgetTextControl::append(const QString &text) { - Q_D(QTextControl); + Q_D(QWidgetTextControl); d->append(text, Qt::AutoText); } -void QTextControl::appendHtml(const QString &html) +void QWidgetTextControl::appendHtml(const QString &html) { - Q_D(QTextControl); + Q_D(QWidgetTextControl); d->append(html, Qt::RichText); } -void QTextControl::appendPlainText(const QString &text) +void QWidgetTextControl::appendPlainText(const QString &text) { - Q_D(QTextControl); + Q_D(QWidgetTextControl); d->append(text, Qt::PlainText); } -void QTextControl::ensureCursorVisible() +void QWidgetTextControl::ensureCursorVisible() { - Q_D(QTextControl); + Q_D(QWidgetTextControl); QRectF crect = d->rectForPosition(d->cursor.position()).adjusted(-5, 0, 5, 0); emit visibilityRequest(crect); emit microFocusChanged(); } -QPalette QTextControl::palette() const +QPalette QWidgetTextControl::palette() const { - Q_D(const QTextControl); + Q_D(const QWidgetTextControl); return d->palette; } -void QTextControl::setPalette(const QPalette &pal) +void QWidgetTextControl::setPalette(const QPalette &pal) { - Q_D(QTextControl); + Q_D(QWidgetTextControl); d->palette = pal; } -QAbstractTextDocumentLayout::PaintContext QTextControl::getPaintContext(QWidget *widget) const +QAbstractTextDocumentLayout::PaintContext QWidgetTextControl::getPaintContext(QWidget *widget) const { - Q_D(const QTextControl); + Q_D(const QWidgetTextControl); QAbstractTextDocumentLayout::PaintContext ctx; @@ -3009,9 +3009,9 @@ QAbstractTextDocumentLayout::PaintContext QTextControl::getPaintContext(QWidget return ctx; } -void QTextControl::drawContents(QPainter *p, const QRectF &rect, QWidget *widget) +void QWidgetTextControl::drawContents(QPainter *p, const QRectF &rect, QWidget *widget) { - Q_D(QTextControl); + Q_D(QWidgetTextControl); p->save(); QAbstractTextDocumentLayout::PaintContext ctx = getPaintContext(widget); if (rect.isValid()) @@ -3022,7 +3022,7 @@ void QTextControl::drawContents(QPainter *p, const QRectF &rect, QWidget *widget p->restore(); } -void QTextControlPrivate::_q_copyLink() +void QWidgetTextControlPrivate::_q_copyLink() { #ifndef QT_NO_CLIPBOARD QMimeData *md = new QMimeData; @@ -3031,7 +3031,7 @@ void QTextControlPrivate::_q_copyLink() #endif } -QInputContext *QTextControlPrivate::inputContext() +QInputContext *QWidgetTextControlPrivate::inputContext() { QInputContext *ctx = contextWidget->inputContext(); if (!ctx && contextWidget->parentWidget()) @@ -3039,15 +3039,15 @@ QInputContext *QTextControlPrivate::inputContext() return ctx; } -int QTextControl::hitTest(const QPointF &point, Qt::HitTestAccuracy accuracy) const +int QWidgetTextControl::hitTest(const QPointF &point, Qt::HitTestAccuracy accuracy) const { - Q_D(const QTextControl); + Q_D(const QWidgetTextControl); return d->doc->documentLayout()->hitTest(point, accuracy); } -QRectF QTextControl::blockBoundingRect(const QTextBlock &block) const +QRectF QWidgetTextControl::blockBoundingRect(const QTextBlock &block) const { - Q_D(const QTextControl); + Q_D(const QWidgetTextControl); return d->doc->documentLayout()->blockBoundingRect(block); } @@ -3093,7 +3093,7 @@ void QUnicodeControlCharacterMenu::menuActionTriggered() return; } #endif - if (QTextControl *control = qobject_cast<QTextControl *>(editWidget)) { + if (QWidgetTextControl *control = qobject_cast<QWidgetTextControl *>(editWidget)) { control->insertPlainText(str); } #ifndef QT_NO_LINEEDIT @@ -3145,6 +3145,6 @@ void QTextEditMimeData::setup() const QT_END_NAMESPACE -#include "moc_qtextcontrol_p.cpp" +#include "moc_qwidgettextcontrol_p.cpp" #endif // QT_NO_TEXTCONTROL diff --git a/src/widgets/to_be_moved/qtextcontrol_p.h b/src/widgets/widgets/qwidgettextcontrol_p.h index 5a5215e1c6..4c38163906 100644 --- a/src/widgets/to_be_moved/qtextcontrol_p.h +++ b/src/widgets/widgets/qwidgettextcontrol_p.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QTEXTCONTROL_P_H -#define QTEXTCONTROL_P_H +#ifndef QWIDGETTEXTCONTROL_P_H +#define QWIDGETTEXTCONTROL_P_H // // W A R N I N G @@ -73,16 +73,16 @@ QT_MODULE(Gui) class QStyleSheet; class QTextDocument; class QMenu; -class QTextControlPrivate; +class QWidgetTextControlPrivate; class QMimeData; class QAbstractScrollArea; class QEvent; class QTimerEvent; -class Q_WIDGETS_EXPORT QTextControl : public QObject +class Q_WIDGETS_EXPORT QWidgetTextControl : public QObject { Q_OBJECT - Q_DECLARE_PRIVATE(QTextControl) + Q_DECLARE_PRIVATE(QWidgetTextControl) #ifndef QT_NO_TEXTHTMLPARSER Q_PROPERTY(QString html READ toHtml WRITE setHtml NOTIFY textChanged USER true) #endif @@ -93,10 +93,10 @@ class Q_WIDGETS_EXPORT QTextControl : public QObject Q_PROPERTY(bool openExternalLinks READ openExternalLinks WRITE setOpenExternalLinks) Q_PROPERTY(bool ignoreUnusedNavigationEvents READ ignoreUnusedNavigationEvents WRITE setIgnoreUnusedNavigationEvents) public: - explicit QTextControl(QObject *parent = 0); - explicit QTextControl(const QString &text, QObject *parent = 0); - explicit QTextControl(QTextDocument *doc, QObject *parent = 0); - virtual ~QTextControl(); + explicit QWidgetTextControl(QObject *parent = 0); + explicit QWidgetTextControl(const QString &text, QObject *parent = 0); + explicit QWidgetTextControl(QTextDocument *doc, QObject *parent = 0); + virtual ~QWidgetTextControl(); void setDocument(QTextDocument *document); QTextDocument *document() const; @@ -259,7 +259,7 @@ protected: virtual bool event(QEvent *e); private: - Q_DISABLE_COPY(QTextControl) + Q_DISABLE_COPY(QWidgetTextControl) Q_PRIVATE_SLOT(d_func(), void _q_updateCurrentCharFormatAndSelection()) Q_PRIVATE_SLOT(d_func(), void _q_emitCursorPosChanged(const QTextCursor &)) Q_PRIVATE_SLOT(d_func(), void _q_deleteSelected()) @@ -304,4 +304,4 @@ QT_END_NAMESPACE QT_END_HEADER -#endif // QTEXTCONTROL_H +#endif // QWidgetTextControl_H diff --git a/src/widgets/to_be_moved/qtextcontrol_p_p.h b/src/widgets/widgets/qwidgettextcontrol_p_p.h index 1b707eeef3..7cc3026dec 100644 --- a/src/widgets/to_be_moved/qtextcontrol_p_p.h +++ b/src/widgets/widgets/qwidgettextcontrol_p_p.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QTEXTCONTROL_P_P_H -#define QTEXTCONTROL_P_P_H +#ifndef QWIDGETTEXTCONTROL_P_P_H +#define QWIDGETTEXTCONTROL_P_P_H // // W A R N I N G @@ -69,11 +69,11 @@ class QMimeData; class QAbstractScrollArea; class QInputContext; -class QTextControlPrivate : public QObjectPrivate +class QWidgetTextControlPrivate : public QObjectPrivate { - Q_DECLARE_PUBLIC(QTextControl) + Q_DECLARE_PUBLIC(QWidgetTextControl) public: - QTextControlPrivate(); + QWidgetTextControlPrivate(); bool cursorMoveKeyEvent(QKeyEvent *e); @@ -235,4 +235,4 @@ public: QT_END_NAMESPACE -#endif // QTEXTCONTROL_P_H +#endif // QWidgetTextControl_P_H diff --git a/src/widgets/widgets/widgets.pri b/src/widgets/widgets/widgets.pri index a991ff1fac..1a4b49ce0d 100644 --- a/src/widgets/widgets/widgets.pri +++ b/src/widgets/widgets/widgets.pri @@ -76,6 +76,9 @@ HEADERS += \ widgets/qscrollarea.h \ widgets/qworkspace.h \ widgets/qwidgetanimator_p.h \ + widgets/qwidgettextcontrol_p.h \ + widgets/qwidgettextcontrol_p_p.h \ + widgets/qwidgetlinecontrol_p.h \ widgets/qtoolbararealayout_p.h \ widgets/qplaintextedit.h \ widgets/qplaintextedit_p.h \ @@ -136,6 +139,8 @@ SOURCES += \ widgets/qscrollarea.cpp \ widgets/qworkspace.cpp \ widgets/qwidgetanimator.cpp \ + widgets/qwidgettextcontrol.cpp \ + widgets/qwidgetlinecontrol.cpp \ widgets/qtoolbararealayout.cpp \ widgets/qplaintextedit.cpp \ widgets/qprintpreviewwidget.cpp |