From b939bc6300d79862340ff35dc8910663bda5744f Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Thu, 21 Feb 2013 13:13:04 +0100 Subject: Typos: tripple->triple This enables grepping. Change-Id: Ibf85800b998a02645c50b1b84d42088d16091378 Reviewed-by: Pierre Rossi --- src/quick/items/qquicktextcontrol.cpp | 36 ++++++++++++++++----------------- src/quick/items/qquicktextcontrol_p_p.h | 6 +++--- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/quick/items/qquicktextcontrol.cpp b/src/quick/items/qquicktextcontrol.cpp index 02aeaa7e35..6cce3cc25a 100644 --- a/src/quick/items/qquicktextcontrol.cpp +++ b/src/quick/items/qquicktextcontrol.cpp @@ -359,7 +359,7 @@ void QQuickTextControlPrivate::setCursorPosition(int pos, QTextCursor::MoveMode if (mode != QTextCursor::KeepAnchor) { selectedWordOnDoubleClick = QTextCursor(); - selectedBlockOnTrippleClick = QTextCursor(); + selectedBlockOnTripleClick = QTextCursor(); } } @@ -527,18 +527,18 @@ void QQuickTextControlPrivate::extendBlockwiseSelection(int suggestedNewPosition Q_Q(QQuickTextControl); // if inside the initial selected line keep that - if (suggestedNewPosition >= selectedBlockOnTrippleClick.selectionStart() - && suggestedNewPosition <= selectedBlockOnTrippleClick.selectionEnd()) { - q->setTextCursor(selectedBlockOnTrippleClick); + if (suggestedNewPosition >= selectedBlockOnTripleClick.selectionStart() + && suggestedNewPosition <= selectedBlockOnTripleClick.selectionEnd()) { + q->setTextCursor(selectedBlockOnTripleClick); return; } - if (suggestedNewPosition < selectedBlockOnTrippleClick.position()) { - cursor.setPosition(selectedBlockOnTrippleClick.selectionEnd()); + if (suggestedNewPosition < selectedBlockOnTripleClick.position()) { + cursor.setPosition(selectedBlockOnTripleClick.selectionEnd()); cursor.setPosition(suggestedNewPosition, QTextCursor::KeepAnchor); cursor.movePosition(QTextCursor::StartOfBlock, QTextCursor::KeepAnchor); } else { - cursor.setPosition(selectedBlockOnTrippleClick.selectionStart()); + cursor.setPosition(selectedBlockOnTripleClick.selectionStart()); cursor.setPosition(suggestedNewPosition, QTextCursor::KeepAnchor); cursor.movePosition(QTextCursor::EndOfBlock, QTextCursor::KeepAnchor); cursor.movePosition(QTextCursor::NextCharacter, QTextCursor::KeepAnchor); @@ -791,8 +791,8 @@ void QQuickTextControl::timerEvent(QTimerEvent *e) d->cursorOn = !d->cursorOn; d->repaintCursor(); - } else if (e->timerId() == d->trippleClickTimer.timerId()) { - d->trippleClickTimer.stop(); + } else if (e->timerId() == d->tripleClickTimer.timerId()) { + d->tripleClickTimer.stop(); } } @@ -1022,17 +1022,17 @@ void QQuickTextControlPrivate::mousePressEvent(QMouseEvent *e, const QPointF &po commitPreedit(); #endif - if (trippleClickTimer.isActive() - && ((pos - trippleClickPoint).toPoint().manhattanLength() < qApp->styleHints()->startDragDistance())) { + if (tripleClickTimer.isActive() + && ((pos - tripleClickPoint).toPoint().manhattanLength() < qApp->styleHints()->startDragDistance())) { cursor.movePosition(QTextCursor::StartOfBlock); cursor.movePosition(QTextCursor::EndOfBlock, QTextCursor::KeepAnchor); cursor.movePosition(QTextCursor::NextCharacter, QTextCursor::KeepAnchor); - selectedBlockOnTrippleClick = cursor; + selectedBlockOnTripleClick = cursor; anchorOnMousePress = QString(); - trippleClickTimer.stop(); + tripleClickTimer.stop(); } else { int cursorPos = q->hitTest(pos, Qt::FuzzyHit); if (cursorPos == -1) { @@ -1046,7 +1046,7 @@ void QQuickTextControlPrivate::mousePressEvent(QMouseEvent *e, const QPointF &po selectedWordOnDoubleClick.select(QTextCursor::WordUnderCursor); } - if (selectedBlockOnTrippleClick.hasSelection()) + if (selectedBlockOnTripleClick.hasSelection()) extendBlockwiseSelection(cursorPos); else if (selectedWordOnDoubleClick.hasSelection()) extendWordwiseSelection(cursorPos, pos.x()); @@ -1079,7 +1079,7 @@ void QQuickTextControlPrivate::mouseMoveEvent(QMouseEvent *e, const QPointF &mou if (!(mousePressed || editable || selectedWordOnDoubleClick.hasSelection() - || selectedBlockOnTrippleClick.hasSelection())) + || selectedBlockOnTripleClick.hasSelection())) return; const QTextCursor oldSelection = cursor; @@ -1114,7 +1114,7 @@ void QQuickTextControlPrivate::mouseMoveEvent(QMouseEvent *e, const QPointF &mou selectedWordOnDoubleClick.select(QTextCursor::WordUnderCursor); } - if (selectedBlockOnTrippleClick.hasSelection()) + if (selectedBlockOnTripleClick.hasSelection()) extendBlockwiseSelection(newCursorPos); else if (selectedWordOnDoubleClick.hasSelection()) extendWordwiseSelection(newCursorPos, mouseX); @@ -1219,8 +1219,8 @@ void QQuickTextControlPrivate::mouseDoubleClickEvent(QMouseEvent *e, const QPoin cursorIsFocusIndicator = false; selectedWordOnDoubleClick = cursor; - trippleClickPoint = pos; - trippleClickTimer.start(qApp->styleHints()->mouseDoubleClickInterval(), q); + tripleClickPoint = pos; + tripleClickTimer.start(qApp->styleHints()->mouseDoubleClickInterval(), q); if (doEmit) { selectionChanged(); #ifndef QT_NO_CLIPBOARD diff --git a/src/quick/items/qquicktextcontrol_p_p.h b/src/quick/items/qquicktextcontrol_p_p.h index 059ccd36bf..a0727c7a71 100644 --- a/src/quick/items/qquicktextcontrol_p_p.h +++ b/src/quick/items/qquicktextcontrol_p_p.h @@ -126,7 +126,7 @@ public: void cancelPreedit(); #endif - QPointF trippleClickPoint; + QPointF tripleClickPoint; QPointF mousePressPos; QTextCharFormat lastCharFormat; @@ -134,12 +134,12 @@ public: QTextDocument *doc; QTextCursor cursor; QTextCursor selectedWordOnDoubleClick; - QTextCursor selectedBlockOnTrippleClick; + QTextCursor selectedBlockOnTripleClick; QString anchorOnMousePress; QString linkToCopy; QBasicTimer cursorBlinkTimer; - QBasicTimer trippleClickTimer; + QBasicTimer tripleClickTimer; #ifndef QT_NO_IM int preeditCursor; -- cgit v1.2.3