Changeset 561 for trunk/src/gui/text/qtextobject.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/text/qtextobject.cpp (modified) (15 diffs)

trunk/src/gui/text/qtextobject.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -62 +62 @@
     of objects that can group parts of a QTextDocument together.
 
-    \ingroup text
+    \ingroup richtext-processing
 
     The common grouping text objects are lists (QTextList), frames
@@ -77 +77 @@
     which acts as a factory method for creating text objects.
 
-    \sa QTextDocument
+    \sa QTextDocument, {Text Object Example}
 */
 
@@ -184 +184 @@
     a QTextDocument.
 
-    \ingroup text
+    \ingroup richtext-processing
 
     Block groups can be used to organize blocks of text within a document.
@@ -306 +306 @@
     \brief The QTextFrame class represents a frame in a QTextDocument.
 
-    \ingroup text
+    \ingroup richtext-processing
 
     Text frames provide structure for the text in a document. They are used
@@ -413 +413 @@
     : QTextObject(*new QTextFramePrivate(doc), doc)
 {
-    Q_D(QTextFrame);
-    d->fragment_start = 0;
-    d->fragment_end = 0;
-    d->parentFrame = 0;
-    d->layoutData = 0;
 }
 
@@ -436 +431 @@
     : QTextObject(p, doc)
 {
-    Q_D(QTextFrame);
-    d->fragment_start = 0;
-    d->fragment_end = 0;
-    d->parentFrame = 0;
-    d->layoutData = 0;
 }
 
@@ -610 +600 @@
     the contents of a QTextFrame.
 
-    \ingroup text
+    \ingroup richtext-processing
 
     A frame consists of an arbitrary sequence of \l{QTextBlock}s and
@@ -810 +800 @@
     \since 4.1
 
-    \ingroup text
+    \ingroup richtext-processing
 
     QTextBlockUserData provides an abstract interface for container classes that are used
@@ -840 +830 @@
     QTextDocument.
 
-    \ingroup text
+    \ingroup richtext-processing
 
     A text block encapsulates a block or paragraph of text in a QTextDocument.
@@ -935 +925 @@
     the contents of a QTextBlock.
 
-    \ingroup text
+    \ingroup richtext-processing
 
     A block consists of a sequence of text fragments. This class provides
@@ -1381 +1371 @@
 Sets the line count to \a count.
 
-/sa lineCount()
+\sa lineCount()
 */
 void QTextBlock::setLineCount(int count)
@@ -1536 +1526 @@
     QTextDocument with a single QTextCharFormat.
 
-    \ingroup text
+    \ingroup richtext-processing
 
     A text fragment describes a piece of text that is stored with a single