diff options
Diffstat (limited to 'src/gui/text/qtextobject.cpp')
-rw-r--r-- | src/gui/text/qtextobject.cpp | 60 |
1 files changed, 13 insertions, 47 deletions
diff --git a/src/gui/text/qtextobject.cpp b/src/gui/text/qtextobject.cpp index 45e07ac5b5..6aafdc1a25 100644 --- a/src/gui/text/qtextobject.cpp +++ b/src/gui/text/qtextobject.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtGui 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) 2016 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 #include "qtextobject.h" #include "qtextobject_p.h" @@ -78,7 +42,7 @@ QT_BEGIN_NAMESPACE objects, you will also need to reimplement QTextDocument::createObject() which acts as a factory method for creating text objects. - \sa QTextDocument, {Text Object Example} + \sa QTextDocument */ /*! @@ -201,7 +165,7 @@ QTextDocument *QTextObject::document() const void QTextBlockGroupPrivate::markBlocksDirty() { - for (int i = 0; i < blocks.count(); ++i) { + for (int i = 0; i < blocks.size(); ++i) { const QTextBlock &block = blocks.at(i); pieceTable->documentChange(block.position(), block.length()); } @@ -210,7 +174,7 @@ void QTextBlockGroupPrivate::markBlocksDirty() /*! \fn QTextBlockGroup::QTextBlockGroup(QTextDocument *document) - Creates a new new block group for the given \a document. + Creates a new block group for the given \a document. \warning This function should only be called from QTextDocument::createObject(). @@ -359,28 +323,28 @@ QTextFrameLayoutData::~QTextFrameLayoutData() /*! \fn bool QTextFrame::iterator::operator==(const iterator &other) const - Retuns true if the iterator is the same as the \a other iterator; + Returns true if the iterator is the same as the \a other iterator; otherwise returns \c false. */ /*! \fn bool QTextFrame::iterator::operator!=(const iterator &other) const - Retuns true if the iterator is different from the \a other iterator; + Returns true if the iterator is different from the \a other iterator; otherwise returns \c false. */ /*! \fn QTextFrame::iterator QTextFrame::iterator::operator++(int) - The postfix ++ operator (\c{i++}) advances the iterator to the + The postfix \c{++} operator (\c{i++}) advances the iterator to the next item in the text frame, and returns an iterator to the old item. */ /*! \fn QTextFrame::iterator QTextFrame::iterator::operator--(int) - The postfix -- operator (\c{i--}) makes the preceding item in the + The postfix \c{--} operator (\c{i--}) makes the preceding item in the current frame, and returns an iterator to the old item. */ @@ -922,14 +886,14 @@ bool QTextBlock::isValid() const /*! \fn bool QTextBlock::iterator::operator==(const iterator &other) const - Retuns true if this iterator is the same as the \a other iterator; + Returns true if this iterator is the same as the \a other iterator; otherwise returns \c false. */ /*! \fn bool QTextBlock::iterator::operator!=(const iterator &other) const - Retuns true if this iterator is different from the \a other iterator; + Returns true if this iterator is different from the \a other iterator; otherwise returns \c false. */ @@ -1792,3 +1756,5 @@ QString QTextFragment::text() const } QT_END_NAMESPACE + +#include "moc_qtextobject.cpp" |