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.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.h')
-rw-r--r-- | src/quick/items/qquicktextcontrol_p.h | 45 |
1 files changed, 1 insertions, 44 deletions
diff --git a/src/quick/items/qquicktextcontrol_p.h b/src/quick/items/qquicktextcontrol_p.h index 2e42625fdc..7768bd1230 100644 --- a/src/quick/items/qquicktextcontrol_p.h +++ b/src/quick/items/qquicktextcontrol_p.h @@ -84,22 +84,16 @@ class Q_AUTOTEST_EXPORT QQuickTextControl : public QObject #ifndef QT_NO_TEXTHTMLPARSER Q_PROPERTY(QString html READ toHtml WRITE setHtml NOTIFY textChanged USER true) #endif - Q_PROPERTY(bool overwriteMode READ overwriteMode WRITE setOverwriteMode) Q_PROPERTY(bool acceptRichText READ acceptRichText WRITE setAcceptRichText) Q_PROPERTY(int cursorWidth READ cursorWidth WRITE setCursorWidth) Q_PROPERTY(Qt::TextInteractionFlags textInteractionFlags READ textInteractionFlags WRITE setTextInteractionFlags) - Q_PROPERTY(bool openExternalLinks READ openExternalLinks WRITE setOpenExternalLinks) - Q_PROPERTY(bool ignoreUnusedNavigationEvents READ ignoreUnusedNavigationEvents WRITE setIgnoreUnusedNavigationEvents) public: - explicit QQuickTextControl(QObject *parent = 0); - explicit QQuickTextControl(const QString &text, QObject *parent = 0); explicit QQuickTextControl(QTextDocument *doc, QObject *parent = 0); virtual ~QQuickTextControl(); void setView(QObject *view); QObject *view() const; - void setDocument(QTextDocument *document); QTextDocument *document() const; void setTextCursor(const QTextCursor &cursor); @@ -108,22 +102,14 @@ public: void setTextInteractionFlags(Qt::TextInteractionFlags flags); Qt::TextInteractionFlags textInteractionFlags() const; - void mergeCurrentCharFormat(const QTextCharFormat &modifier); - - void setCurrentCharFormat(const QTextCharFormat &format); - QTextCharFormat currentCharFormat() const; - - bool find(const QString &exp, QTextDocument::FindFlags options = 0); - QString toPlainText() const; + #ifndef QT_NO_TEXTHTMLPARSER QString toHtml() const; #endif virtual void ensureCursorVisible(); - virtual QVariant loadResource(int type, const QUrl &name); - QTextCursor cursorForPosition(const QPointF &pos) const; QRectF cursorRect(const QTextCursor &cursor) const; QRectF cursorRect() const; @@ -131,29 +117,19 @@ public: QRectF selectionRect() const; QString anchorAt(const QPointF &pos) const; - QPointF anchorPosition(const QString &name) const; QString anchorAtCursor() const; - bool overwriteMode() const; - void setOverwriteMode(bool overwrite); - int cursorWidth() const; void setCursorWidth(int width); bool acceptRichText() const; void setAcceptRichText(bool accept); - void setExtraSelections(const QVector<QAbstractTextDocumentLayout::Selection> &selections); - QVector<QAbstractTextDocumentLayout::Selection> extraSelections() const; - void setTextWidth(qreal width); qreal textWidth() const; QSizeF size() const; - void setOpenExternalLinks(bool open); - bool openExternalLinks() const; - void setIgnoreUnusedNavigationEvents(bool ignore); bool ignoreUnusedNavigationEvents() const; @@ -164,9 +140,6 @@ public: void setCursorIsFocusIndicator(bool b); bool cursorIsFocusIndicator() const; - void setDragEnabled(bool enabled); - bool isDragEnabled() const; - bool isWordSelectionEnabled() const; void setWordSelectionEnabled(bool enabled); @@ -190,17 +163,6 @@ public Q_SLOTS: void clear(); void selectAll(); - void insertPlainText(const QString &text); -#ifndef QT_NO_TEXTHTMLPARSER - void insertHtml(const QString &text); -#endif - - void append(const QString &text); - void appendHtml(const QString &html); - void appendPlainText(const QString &text); - - void adjustSize(); - Q_SIGNALS: void textChanged(); void undoAvailable(bool b); @@ -240,10 +202,6 @@ public: virtual bool canInsertFromMimeData(const QMimeData *source) const; virtual void insertFromMimeData(const QMimeData *source); - bool setFocusToAnchor(const QTextCursor &newCursor); - bool setFocusToNextOrPreviousAnchor(bool next); - bool findNextPrevAnchor(const QTextCursor& from, bool next, QTextCursor& newAnchor); - bool cursorOn() const; protected: @@ -256,7 +214,6 @@ private: 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()) - Q_PRIVATE_SLOT(d_func(), void _q_copyLink()) Q_PRIVATE_SLOT(d_func(), void _q_updateBlock(const QTextBlock &)) Q_PRIVATE_SLOT(d_func(), void _q_documentLayoutChanged()) }; |