1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QPlainTextEdit: clean up private slot definitions

Browse Source 
Private slots connections have been migrated to QObjectPrivate::connect
by 2f3f3eb0d4d77743c135d95c792f66a4272903f7.

Remove redundant _q_ prefix and Q_PRIVATE_SLOT declarations.

Change-Id: I74075e6a822ecd5b2861aee29a65a5c93e6472a8
Reviewed-by: Santhosh Kumar <santhosh.kumar.selvaraj@qt.io>
(cherry picked from commit 214016835f198ce5150862d97288760820d9e494)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Axel Spoerl 2023-08-10 11:28:49 +02:00 committed by Qt Cherry-pick Bot
parent 194848c5fd
commit 8442b05bdd
3 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/widgets/widgets/qplaintextedit.cpp
View File

@ -418,7 +418,7 @@ QPlainTextEditControl::QPlainTextEditControl(QPlainTextEdit *parent)
setAcceptRichText(false); setAcceptRichText(false);
} }
void QPlainTextEditPrivate::_q_cursorPositionChanged() void QPlainTextEditPrivate::cursorPositionChanged()
{ {
pageUpDownLastCursorYIsValid = false; pageUpDownLastCursorYIsValid = false;
Q_Q(QPlainTextEdit); Q_Q(QPlainTextEdit);
@ -429,7 +429,7 @@ void QPlainTextEditPrivate::_q_cursorPositionChanged()
emit q->cursorPositionChanged(); emit q->cursorPositionChanged();
} }
void QPlainTextEditPrivate::_q_verticalScrollbarActionTriggered(int action) { void QPlainTextEditPrivate::verticalScrollbarActionTriggered(int action) {
const auto a = static_cast<QAbstractSlider::SliderAction>(action); const auto a = static_cast<QAbstractSlider::SliderAction>(action);
switch (a) { switch (a) {
@ -744,15 +744,15 @@ void QPlainTextEditPrivate::init(const QString &txt)
control->setPalette(q->palette()); control->setPalette(q->palette());
QObjectPrivate::connect(vbar, &QAbstractSlider::actionTriggered, QObjectPrivate::connect(vbar, &QAbstractSlider::actionTriggered,
this, &QPlainTextEditPrivate::_q_verticalScrollbarActionTriggered); this, &QPlainTextEditPrivate::verticalScrollbarActionTriggered);
QObject::connect(control, &QWidgetTextControl::microFocusChanged, q, QObject::connect(control, &QWidgetTextControl::microFocusChanged, q,
[q](){q->updateMicroFocus(); }); [q](){q->updateMicroFocus(); });
QObjectPrivate::connect(control, &QWidgetTextControl::documentSizeChanged, QObjectPrivate::connect(control, &QWidgetTextControl::documentSizeChanged,
this, &QPlainTextEditPrivate::_q_adjustScrollbars); this, &QPlainTextEditPrivate::adjustScrollbars);
QObject::connect(control, &QWidgetTextControl::blockCountChanged, QObject::connect(control, &QWidgetTextControl::blockCountChanged,
q, &QPlainTextEdit::blockCountChanged); q, &QPlainTextEdit::blockCountChanged);
QObjectPrivate::connect(control, &QWidgetTextControl::updateRequest, QObjectPrivate::connect(control, &QWidgetTextControl::updateRequest,
this, &QPlainTextEditPrivate::_q_repaintContents); this, &QPlainTextEditPrivate::repaintContents);
QObject::connect(control, &QWidgetTextControl::modificationChanged, QObject::connect(control, &QWidgetTextControl::modificationChanged,
q, &QPlainTextEdit::modificationChanged); q, &QPlainTextEdit::modificationChanged);
QObject::connect(control, &QWidgetTextControl::textChanged, q, &QPlainTextEdit::textChanged); QObject::connect(control, &QWidgetTextControl::textChanged, q, &QPlainTextEdit::textChanged);
@ -761,9 +761,9 @@ void QPlainTextEditPrivate::init(const QString &txt)
QObject::connect(control, &QWidgetTextControl::copyAvailable, q, &QPlainTextEdit::copyAvailable); QObject::connect(control, &QWidgetTextControl::copyAvailable, q, &QPlainTextEdit::copyAvailable);
QObject::connect(control, &QWidgetTextControl::selectionChanged, q, &QPlainTextEdit::selectionChanged); QObject::connect(control, &QWidgetTextControl::selectionChanged, q, &QPlainTextEdit::selectionChanged);
QObjectPrivate::connect(control, &QWidgetTextControl::cursorPositionChanged, QObjectPrivate::connect(control, &QWidgetTextControl::cursorPositionChanged,
this, &QPlainTextEditPrivate::_q_cursorPositionChanged); this, &QPlainTextEditPrivate::cursorPositionChanged);
QObjectPrivate::connect(control, &QWidgetTextControl::textChanged, QObjectPrivate::connect(control, &QWidgetTextControl::textChanged,
this, &QPlainTextEditPrivate::_q_updatePlaceholderVisibility); this, &QPlainTextEditPrivate::updatePlaceholderVisibility);
QObject::connect(control, &QWidgetTextControl::textChanged, q, [q](){q->updateMicroFocus(); }); QObject::connect(control, &QWidgetTextControl::textChanged, q, [q](){q->updateMicroFocus(); });
// set a null page size initially to avoid any relayouting until the textedit // set a null page size initially to avoid any relayouting until the textedit
@ -792,12 +792,12 @@ void QPlainTextEditPrivate::init(const QString &txt)
#endif #endif
} }
void QPlainTextEditPrivate::_q_updatePlaceholderVisibility() void QPlainTextEditPrivate::updatePlaceholderVisibility()
{ {
Q_Q(QPlainTextEdit); Q_Q(QPlainTextEdit);
// We normally only repaint the part of view that contains text in the // We normally only repaint the part of view that contains text in the
// document that has changed (in _q_repaintContents). But the placeholder // document that has changed (in repaintContents). But the placeholder
// text is not a part of the document, but is drawn on separately. So whenever // text is not a part of the document, but is drawn on separately. So whenever
// we either show or hide the placeholder text, we issue a full update. // we either show or hide the placeholder text, we issue a full update.
bool placeholderCurrentyVisible = placeholderVisible; bool placeholderCurrentyVisible = placeholderVisible;
@ -811,7 +811,7 @@ void QPlainTextEditPrivate::_q_updatePlaceholderVisibility()
viewport->update(); viewport->update();
} }
void QPlainTextEditPrivate::_q_repaintContents(const QRectF &contentsRect) void QPlainTextEditPrivate::repaintContents(const QRectF &contentsRect)
{ {
Q_Q(QPlainTextEdit); Q_Q(QPlainTextEdit);
if (!contentsRect.isValid()) { if (!contentsRect.isValid()) {
@ -944,7 +944,7 @@ void QPlainTextEditPrivate::pageUpDown(QTextCursor::MoveOperation op, QTextCurso
#if QT_CONFIG(scrollbar) #if QT_CONFIG(scrollbar)
void QPlainTextEditPrivate::_q_adjustScrollbars() void QPlainTextEditPrivate::adjustScrollbars()
{ {
Q_Q(QPlainTextEdit); Q_Q(QPlainTextEdit);
QTextDocument *doc = control->document(); QTextDocument *doc = control->document();
@ -1299,7 +1299,7 @@ void QPlainTextEdit::setDocument(QTextDocument *document)
d->documentLayoutPtr = documentLayout; d->documentLayoutPtr = documentLayout;
d->updateDefaultTextOption(); d->updateDefaultTextOption();
d->relayoutDocument(); d->relayoutDocument();
d->_q_adjustScrollbars(); d->adjustScrollbars();
} }
/*! /*!
@ -1331,7 +1331,7 @@ void QPlainTextEdit::setPlaceholderText(const QString &placeholderText)
Q_D(QPlainTextEdit); Q_D(QPlainTextEdit);
if (d->placeholderText != placeholderText) { if (d->placeholderText != placeholderText) {
d->placeholderText = placeholderText; d->placeholderText = placeholderText;
d->_q_updatePlaceholderVisibility(); d->updatePlaceholderVisibility();
} }
} }
@ -1844,7 +1844,7 @@ void QPlainTextEdit::resizeEvent(QResizeEvent *e)
Q_D(QPlainTextEdit); Q_D(QPlainTextEdit);
if (e->oldSize().width() != e->size().width()) if (e->oldSize().width() != e->size().width())
d->relayoutDocument(); d->relayoutDocument();
d->_q_adjustScrollbars(); d->adjustScrollbars();
} }
void QPlainTextEditPrivate::relayoutDocument() void QPlainTextEditPrivate::relayoutDocument()
@ -2284,7 +2284,7 @@ void QPlainTextEdit::showEvent(QShowEvent *)
d->showCursorOnInitialShow = false; d->showCursorOnInitialShow = false;
ensureCursorVisible(); ensureCursorVisible();
} }
d->_q_adjustScrollbars(); d->adjustScrollbars();
} }
/*! \reimp /*! \reimp
@ -2787,7 +2787,7 @@ void QPlainTextEdit::setLineWrapMode(LineWrapMode wrap)
d->lineWrap = wrap; d->lineWrap = wrap;
d->updateDefaultTextOption(); d->updateDefaultTextOption();
d->relayoutDocument(); d->relayoutDocument();
d->_q_adjustScrollbars(); d->adjustScrollbars();
ensureCursorVisible(); ensureCursorVisible();
} }
@ -2873,7 +2873,7 @@ void QPlainTextEdit::setCenterOnScroll(bool enabled)
if (enabled == d->centerOnScroll) if (enabled == d->centerOnScroll)
return; return;
d->centerOnScroll = enabled; d->centerOnScroll = enabled;
d->_q_adjustScrollbars(); d->adjustScrollbars();
} }
@ -3033,7 +3033,7 @@ void QPlainTextEditPrivate::append(const QString &text, Qt::TextFormat format)
} }
documentLayout->priv()->blockDocumentSizeChanged = documentSizeChangedBlocked; documentLayout->priv()->blockDocumentSizeChanged = documentSizeChangedBlocked;
_q_adjustScrollbars(); adjustScrollbars();
if (atBottom) { if (atBottom) {

5
src/widgets/widgets/qplaintextedit.h
View File

@ -240,11 +240,6 @@ protected:
private: private:
Q_DISABLE_COPY(QPlainTextEdit) Q_DISABLE_COPY(QPlainTextEdit)
Q_PRIVATE_SLOT(d_func(), void _q_repaintContents(const QRectF &r))
Q_PRIVATE_SLOT(d_func(), void _q_updatePlaceholderVisibility())
Q_PRIVATE_SLOT(d_func(), void _q_adjustScrollbars())
Q_PRIVATE_SLOT(d_func(), void _q_verticalScrollbarActionTriggered(int))
Q_PRIVATE_SLOT(d_func(), void _q_cursorPositionChanged())
friend class QPlainTextEditControl; friend class QPlainTextEditControl;
}; };

12
src/widgets/widgets/qplaintextedit_p.h
View File

@ -84,14 +84,14 @@ public:
QPlainTextEditPrivate(); QPlainTextEditPrivate();
void init(const QString &txt = QString()); void init(const QString &txt = QString());
void _q_repaintContents(const QRectF &contentsRect); void repaintContents(const QRectF &contentsRect);
void _q_updatePlaceholderVisibility(); void updatePlaceholderVisibility();
inline QPoint mapToContents(const QPoint &point) const inline QPoint mapToContents(const QPoint &point) const
{ return QPoint(point.x() + horizontalOffset(), point.y() + verticalOffset()); } { return QPoint(point.x() + horizontalOffset(), point.y() + verticalOffset()); }
void _q_adjustScrollbars(); void adjustScrollbars();
void _q_verticalScrollbarActionTriggered(int action); void verticalScrollbarActionTriggered(int action);
void ensureViewportLayouted(); void ensureViewportLayouted();
void relayoutDocument(); void relayoutDocument();
@ -142,8 +142,8 @@ public:
void append(const QString &text, Qt::TextFormat format = Qt::AutoText); void append(const QString &text, Qt::TextFormat format = Qt::AutoText);
void _q_cursorPositionChanged(); void cursorPositionChanged();
void _q_modificationChanged(bool); void modificationChanged(bool);
}; };
QT_END_NAMESPACE QT_END_NAMESPACE