diff options
author | Andrew den Exter <andrew.den-exter@nokia.com> | 2011-12-15 13:18:27 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-15 07:03:53 +0100 |
commit | c00cab34e5ee940f9559679025ea660a62ee4134 (patch) | |
tree | e95852daaa12b6b2689b6c06fb9467a9d78924e9 /src/quick/items/qquicktextcontrol_p_p.h | |
parent | 7e2c152089e5f54b254d8dae7cbfe0f3bbd68293 (diff) |
Remove unused code from QQuickTextControl.
QTextControl included a lot of functionality that was unused by
TextEdit. Anything that is unused and therefore untested should
go.
Task-number: QTBUG-22627
Change-Id: Ie68b279cb8618bec0af76287c7c4db34d0642a0a
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/quick/items/qquicktextcontrol_p_p.h')
-rw-r--r-- | src/quick/items/qquicktextcontrol_p_p.h | 60 |
1 files changed, 6 insertions, 54 deletions
diff --git a/src/quick/items/qquicktextcontrol_p_p.h b/src/quick/items/qquicktextcontrol_p_p.h index 2b2e9cb35a..1e9bdbbe61 100644 --- a/src/quick/items/qquicktextcontrol_p_p.h +++ b/src/quick/items/qquicktextcontrol_p_p.h @@ -76,19 +76,10 @@ public: void updateCurrentCharFormat(); - void indent(); - void outdent(); - - void gotoNextTableCell(); - void gotoPreviousTableCell(); - - void createAutoBulletList(); - void init(Qt::TextFormat format = Qt::RichText, const QString &text = QString(), QTextDocument *document = 0); void setContent(Qt::TextFormat format = Qt::RichText, const QString &text = QString(), QTextDocument *document = 0); - void startDrag(); void paste(const QMimeData *source); @@ -128,37 +119,12 @@ public: QString anchorForCursor(const QTextCursor &anchor) const; void keyPressEvent(QKeyEvent *e); - void mousePressEvent(QEvent *e, Qt::MouseButton button, const QPointF &pos, - Qt::KeyboardModifiers modifiers, - Qt::MouseButtons buttons, - const QPoint &globalPos); - void mouseMoveEvent(QEvent *e, Qt::MouseButton button, const QPointF &pos, - Qt::KeyboardModifiers modifiers, - Qt::MouseButtons buttons, - const QPoint &globalPos); - void mouseReleaseEvent(QEvent *e, Qt::MouseButton button, const QPointF &pos, - Qt::KeyboardModifiers modifiers, - Qt::MouseButtons buttons, - const QPoint &globalPos); - void mouseDoubleClickEvent(QEvent *e, Qt::MouseButton button, const QPointF &pos, - Qt::KeyboardModifiers modifiers, - Qt::MouseButtons buttons, - const QPoint &globalPos); - bool sendMouseEventToInputContext(QEvent *e, QEvent::Type eventType, Qt::MouseButton button, - const QPointF &pos, - Qt::KeyboardModifiers modifiers, - Qt::MouseButtons buttons, - const QPoint &globalPos); - void contextMenuEvent(const QPoint &screenPos, const QPointF &docPos, QWidget *contextWidget); + void mousePressEvent(QMouseEvent *event, const QPointF &pos); + void mouseMoveEvent(QMouseEvent *event, const QPointF &pos); + void mouseReleaseEvent(QMouseEvent *event, const QPointF &pos); + void mouseDoubleClickEvent(QMouseEvent *event, const QPointF &pos); + bool sendMouseEventToInputContext(QMouseEvent *event, const QPointF &pos); void focusEvent(QFocusEvent *e); -#ifdef QT_KEYPAD_NAVIGATION - void editFocusEvent(QEvent *e); -#endif - bool dragEnterEvent(QEvent *e, const QMimeData *mimeData); - void dragLeaveEvent(); - bool dragMoveEvent(QEvent *e, const QMimeData *mimeData, const QPointF &pos); - bool dropEvent(const QMimeData *mimeData, const QPointF &pos, Qt::DropAction dropAction, QObject *source); - void inputMethodEvent(QInputMethodEvent *); void activateLinkUnderCursor(QString href = QString()); @@ -166,28 +132,22 @@ public: bool isPreediting() const; void commitPreedit(); - void append(const QString &text, Qt::TextFormat format = Qt::AutoText); - QTextDocument *doc; bool cursorOn; QTextCursor cursor; bool cursorIsFocusIndicator; QTextCharFormat lastCharFormat; - QTextCursor dndFeedbackCursor; - Qt::TextInteractionFlags interactionFlags; QBasicTimer cursorBlinkTimer; QBasicTimer trippleClickTimer; QPointF trippleClickPoint; - bool dragEnabled; - bool mousePressed; - bool mightStartDrag; QPoint mousePressPos; + QPointer<QObject> contextObject; bool lastSelectionState; @@ -204,22 +164,14 @@ public: bool hideCursor; // used to hide the cursor in the preedit area QString tentativeCommit; - QVector<QAbstractTextDocumentLayout::Selection> extraSelections; - QPalette palette; bool hasFocus; -#ifdef QT_KEYPAD_NAVIGATION - bool hasEditFocus; -#endif bool isEnabled; QString highlightedAnchor; // Anchor below cursor QString anchorOnMousePress; bool hadSelectionOnMousePress; - bool ignoreUnusedNavigationEvents; - bool openExternalLinks; - bool wordSelectionEnabled; QString linkToCopy; |