diff options
Diffstat (limited to 'src/widgets/widgets/qwidgettextcontrol_p_p.h')
| -rw-r--r-- | src/widgets/widgets/qwidgettextcontrol_p_p.h | 54 |
1 files changed, 11 insertions, 43 deletions
diff --git a/src/widgets/widgets/qwidgettextcontrol_p_p.h b/src/widgets/widgets/qwidgettextcontrol_p_p.h index 232dab180f..955a70ecad 100644 --- a/src/widgets/widgets/qwidgettextcontrol_p_p.h +++ b/src/widgets/widgets/qwidgettextcontrol_p_p.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 QWIDGETTEXTCONTROL_P_P_H #define QWIDGETTEXTCONTROL_P_P_H @@ -55,6 +19,7 @@ #include "QtGui/qtextdocumentfragment.h" #include "QtGui/qtextcursor.h" #include "QtGui/qtextformat.h" +#include "QtGui/qtextobject.h" #if QT_CONFIG(menu) #include "QtWidgets/qmenu.h" #endif @@ -72,8 +37,9 @@ class QAbstractScrollArea; class QWidgetTextControlPrivate : public QObjectPrivate { - Q_DECLARE_PUBLIC(QWidgetTextControl) public: + Q_DECLARE_PUBLIC(QWidgetTextControl) + QWidgetTextControlPrivate(); bool cursorMoveKeyEvent(QKeyEvent *e); @@ -89,9 +55,9 @@ public: void createAutoBulletList(); void init(Qt::TextFormat format = Qt::RichText, const QString &text = QString(), - QTextDocument *document = 0); + QTextDocument *document = nullptr); void setContent(Qt::TextFormat format = Qt::RichText, const QString &text = QString(), - QTextDocument *document = 0); + QTextDocument *document = nullptr); void startDrag(); void paste(const QMimeData *source); @@ -170,13 +136,14 @@ public: void activateLinkUnderCursor(QString href = QString()); -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) void showToolTip(const QPoint &globalPos, const QPointF &pos, QWidget *contextWidget); #endif bool isPreediting() const; void commitPreedit(); + void insertParagraphSeparator(); void append(const QString &text, Qt::TextFormat format = Qt::AutoText); QTextDocument *doc; @@ -216,7 +183,7 @@ public: int preeditCursor; bool hideCursor; // used to hide the cursor in the preedit area - QVector<QAbstractTextDocumentLayout::Selection> extraSelections; + QList<QAbstractTextDocumentLayout::Selection> extraSelections; QPalette palette; bool hasFocus; @@ -227,6 +194,7 @@ public: QString highlightedAnchor; // Anchor below cursor QString anchorOnMousePress; + QTextBlock blockWithMarkerUnderMouse; bool hadSelectionOnMousePress; bool ignoreUnusedNavigationEvents; |