diff options
Diffstat (limited to 'src/widgets/widgets/qtextedit.h')
| -rw-r--r-- | src/widgets/widgets/qtextedit.h | 70 |
1 files changed, 16 insertions, 54 deletions
diff --git a/src/widgets/widgets/qtextedit.h b/src/widgets/widgets/qtextedit.h index 51d6c2ccba..421eb9136b 100644 --- a/src/widgets/widgets/qtextedit.h +++ b/src/widgets/widgets/qtextedit.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWidgets module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2019 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTEXTEDIT_H #define QTEXTEDIT_H @@ -57,6 +21,7 @@ class QMenu; class QTextEditPrivate; class QMimeData; class QPagedPaintDevice; +class QRegularExpression; class Q_WIDGETS_EXPORT QTextEdit : public QAbstractScrollArea { @@ -70,18 +35,19 @@ class Q_WIDGETS_EXPORT QTextEdit : public QAbstractScrollArea QDOC_PROPERTY(QTextOption::WrapMode wordWrapMode READ wordWrapMode WRITE setWordWrapMode) Q_PROPERTY(int lineWrapColumnOrWidth READ lineWrapColumnOrWidth WRITE setLineWrapColumnOrWidth) Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly) +#if QT_CONFIG(textmarkdownreader) && QT_CONFIG(textmarkdownwriter) + Q_PROPERTY(QString markdown READ toMarkdown WRITE setMarkdown NOTIFY textChanged) +#endif #ifndef QT_NO_TEXTHTMLPARSER Q_PROPERTY(QString html READ toHtml WRITE setHtml NOTIFY textChanged USER true) #endif Q_PROPERTY(QString plainText READ toPlainText WRITE setPlainText DESIGNABLE false) Q_PROPERTY(bool overwriteMode READ overwriteMode WRITE setOverwriteMode) -#if QT_DEPRECATED_SINCE(5, 10) - Q_PROPERTY(int tabStopWidth READ tabStopWidth WRITE setTabStopWidth) -#endif Q_PROPERTY(qreal tabStopDistance READ tabStopDistance WRITE setTabStopDistance) 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(Qt::TextInteractionFlags textInteractionFlags READ textInteractionFlags + WRITE setTextInteractionFlags) Q_PROPERTY(QTextDocument *document READ document WRITE setDocument DESIGNABLE false) Q_PROPERTY(QString placeholderText READ placeholderText WRITE setPlaceholderText) public: @@ -162,14 +128,17 @@ public: void setWordWrapMode(QTextOption::WrapMode policy); bool find(const QString &exp, QTextDocument::FindFlags options = QTextDocument::FindFlags()); -#ifndef QT_NO_REGEXP - bool find(const QRegExp &exp, QTextDocument::FindFlags options = QTextDocument::FindFlags()); +#if QT_CONFIG(regularexpression) + bool find(const QRegularExpression &exp, QTextDocument::FindFlags options = QTextDocument::FindFlags()); #endif QString toPlainText() const; #ifndef QT_NO_TEXTHTMLPARSER QString toHtml() const; #endif +#if QT_CONFIG(textmarkdownwriter) + QString toMarkdown(QTextDocument::MarkdownFeatures features = QTextDocument::MarkdownDialectGitHub) const; +#endif void ensureCursorVisible(); @@ -188,11 +157,6 @@ public: bool overwriteMode() const; void setOverwriteMode(bool overwrite); -#if QT_DEPRECATED_SINCE(5, 10) - QT_DEPRECATED int tabStopWidth() const; - QT_DEPRECATED void setTabStopWidth(int width); -#endif - qreal tabStopDistance() const; void setTabStopDistance(qreal distance); @@ -234,6 +198,9 @@ public Q_SLOTS: #ifndef QT_NO_TEXTHTMLPARSER void setHtml(const QString &text); #endif +#if QT_CONFIG(textmarkdownreader) + void setMarkdown(const QString &markdown); +#endif void setText(const QString &text); #ifndef QT_NO_CLIPBOARD @@ -313,11 +280,6 @@ protected: private: Q_DISABLE_COPY(QTextEdit) - Q_PRIVATE_SLOT(d_func(), void _q_repaintContents(const QRectF &r)) - Q_PRIVATE_SLOT(d_func(), void _q_currentCharFormatChanged(const QTextCharFormat &)) - Q_PRIVATE_SLOT(d_func(), void _q_adjustScrollbars()) - Q_PRIVATE_SLOT(d_func(), void _q_ensureVisible(const QRectF &)) - Q_PRIVATE_SLOT(d_func(), void _q_cursorPositionChanged()) friend class QTextEditControl; friend class QTextDocument; friend class QWidgetTextControl; |