whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Doc:added doc to undocumented functions 

Task-number: QTBUG-36985
Change-Id: Ic358682b276d67ef804f727bcf14191718613469
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
bb10
Nico Vertriest 2015-05-19 15:03:12 +02:00
parent 9499cf33b7
commit e6ddae07e1
27 changed files with 376 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/corelib/codecs/qtextcodec.cpp
View File

@ -1153,17 +1153,8 @@ QTextCodec *QTextCodec::codecForUtfText(const QByteArray &ba)
Returns the codec used by QObject::tr() on its argument. If this
function returns 0 (the default), tr() assumes Latin-1.
\sa setCodecForTr()
*/
/*!
\fn QTextCodec::setCodecForTr ( QTextCodec * c )
\obsolete
Sets the codec used by QObject::tr() on its argument to c. If c
is 0 (the default), tr() assumes Latin-1.
*/
/*!
\internal

8
src/corelib/itemmodels/qitemselectionmodel.cpp
View File

@ -1736,13 +1736,19 @@ const QItemSelection QItemSelectionModel::selection() const
\property QItemSelectionModel::selectedIndexes
*/
/*!
\since 5.5
\property QItemSelectionModel::selection
\internal
*/
/*!
\since 5.5
\property QItemSelectionModel::model
\internal
*/
/*!
\since 5.5

23
src/corelib/kernel/qmetaobject.cpp
View File

@ -1533,6 +1533,29 @@ bool QMetaObject::invokeMethod(QObject *obj,
ignores return values.
*/
/*!
\fn QMetaObject::Connection::Connection(const Connection &other)
Constructs a copy of \a other.
*/
/*!
\fn QMetaObject::Connection::Connection &operator=(const Connection &other)
Assigns \a other to this connection and returns a reference to this connection.
*/
/*!
\fn QMetaObject::Connection &QMetaObject::Connection::operator=(Connection &&other)
Move-assigns \a other to this object.
*/
/*!
\fn QMetaObject::Connection::Connection(Connection &&o)
Move-constructs a Connection instance, making it point to the same object that \a o was pointing to.
*/
/*!
\class QMetaMethod
\inmodule QtCore

13
src/corelib/kernel/qmetatype.cpp
View File

@ -420,6 +420,16 @@ struct DefinedTypesFilter {
\sa QMetaType::create()
*/
/*!
\fn void *QMetaType::construct(int type, const void *copy)
\deprecated
Constructs a value of the given type which is a copy of \a copy.
The default value for \a copy is 0.
Deprecated, use the static function QMetaType::create(int type,
const void *copy) instead.
*/
/*!
\fn void *QMetaType::construct(void *where, const void *copy = 0) const
\since 5.0
@ -1179,10 +1189,7 @@ bool QMetaType::isRegistered(int type)
}
/*!
\fn int qMetaTypeTypeImpl(const char *typeName, int length)
\internal
Implementation of QMetaType::type().
*/
template <bool tryNormalizedType>
static inline int qMetaTypeTypeImpl(const char *typeName, int length)

7
src/corelib/kernel/qobject.cpp
View File

@ -4898,8 +4898,15 @@ QMetaObject::Connection& QMetaObject::Connection::operator=(const QMetaObject::C
return *this;
}
/*!
Creates a Connection instance.
*/
QMetaObject::Connection::Connection() : d_ptr(0) {}
/*!
Destructor for QMetaObject::Connection.
*/
QMetaObject::Connection::~Connection()
{
if (d_ptr)

2
src/corelib/tools/qcollator.cpp
View File

@ -87,7 +87,7 @@ QCollator::QCollator(const QCollator &other)
}
/*!
Destructor for QCollator.
Destroys the collator.
*/
QCollator::~QCollator()
{

5
src/corelib/tools/qpair.qdoc
View File

@ -109,7 +109,7 @@
\endcode
Swap overloads are found in namespace \c std as well as via
argument-dependent lookup (ADL) in \c{T}'s namespace.
argument-dependent lookup (ADL) in the namespace of \c{T} .
*/
/*!
@ -136,8 +136,7 @@
\fn QPair::QPair(QPair<TT1, TT2> &&p)
\since 5.2
Move-constructs a QPair instance, making it point to the same object that
\a p was pointing to.
Move-constructs a QPair instance, making it point to the same object that \a p was pointing to.
*/
/*!

3
src/corelib/tools/qset.qdoc
View File

@ -129,7 +129,8 @@
/*!
\fn QSet::QSet(QSet && other)
Move-constructs a QSet instance, making it point to the same object that \a other was pointing to.
Move-constructs a QSet instance, making it point to the same object that
\a other was pointing to.
*/

6
src/corelib/xml/qxmlstream.cpp
View File

@ -2395,6 +2395,12 @@ QXmlStreamAttribute& QXmlStreamAttribute::operator=(const QXmlStreamAttribute &o
\ingroup xml-tools
*/
/*!
\fn QXmlStreamAttributes::QXmlStreamAttributes()
A constructor for QXmlStreamAttributes.
*/
/*!
\typedef QXmlStreamNotationDeclarations
\relates QXmlStreamNotationDeclaration

2
src/dbus/qdbusunixfiledescriptor.cpp
View File

@ -174,7 +174,7 @@ QDBusUnixFileDescriptor &QDBusUnixFileDescriptor::operator=(const QDBusUnixFileD
}
/*!
\fn QDBusUnixFileDescriptor &operator=(QDBusUnixFileDescriptor &&other)
\fn QDBusUnixFileDescriptor &QDBusUnixFileDescriptor::operator=(QDBusUnixFileDescriptor &&other)
Move-assigns \a other to this QDBusUnixFileDescriptor.
*/

133
src/gui/accessible/qaccessible.cpp
View File

@ -1381,10 +1381,18 @@ QAccessible::Id QAccessibleEvent::uniqueId() const
*/
/*! \fn QAccessibleValueChangeEvent::QAccessibleValueChangeEvent(QObject *object, const QVariant &value)
Constructs a new QAccessibleValueChangeEvent for \a object.
The event contains the new \a value.
*/
/*! \fn QAccessibleValueChangeEvent::QAccessibleValueChangeEvent(QAccessibleInterface *iface, const QVariant &val)
Constructs a new QAccessibleValueChangeEvent for \a iface.
The event contains the new value \a val.
*/
/*! \fn void QAccessibleValueChangeEvent::setValue(const QVariant & value)
Sets the new \a value for this event.
*/
/*!
@ -1406,11 +1414,13 @@ QAccessible::Id QAccessibleEvent::uniqueId() const
\sa QAccessibleInterface::state()
*/
/*! \fn QAccessibleStateChangeEvent::QAccessibleStateChangeEvent(QObject *object, QAccessible::State state)
Constructs a new QAccessibleStateChangeEvent for \a object.
The difference to the object's previous state is in \a state.
*/
/*!
\fn QAccessibleStateChangeEvent::QAccessibleStateChangeEvent(QAccessibleInterface *iface, QAccessible::State state)
Constructs a new QAccessibleStateChangeEvent.
\a iface is the interface associated with the event
\a state is the state of the accessible object.
@ -1419,8 +1429,8 @@ QAccessible::Id QAccessibleEvent::uniqueId() const
\fn QAccessible::State QAccessibleStateChangeEvent::changedStates() const
\brief Returns the states that have been changed.
Be aware that the returned states are the ones that have changed,
to find out about the state of an object, use QAccessibleInterface::state().
Keep in mind that the returned states are the ones that have changed.
To find out about the state of an object, use QAccessibleInterface::state().
For example, if an object used to have the focus but loses it,
the object's state will have focused set to \c false. This event on the
@ -1443,7 +1453,7 @@ QAccessible::Id QAccessibleEvent::uniqueId() const
*/
/*! \enum QAccessibleTableModelChangeEvent::ModelChangeType
This enum describes different types of changes in the table model.
This enum describes the different types of changes in the table model.
\value ModelReset The model has been reset, all previous knowledge about the model is now invalid.
\value DataChanged No cells have been added or removed, but the data of the specified cell range is invalid.
\value RowsInserted New rows have been inserted.
@ -1452,42 +1462,57 @@ QAccessible::Id QAccessibleEvent::uniqueId() const
\value ColumnsRemoved Columns have been removed.
*/
/*! \fn QAccessibleTableModelChangeEvent::QAccessibleTableModelChangeEvent(QObject *object, ModelChangeType changeType)
Constructs a new QAccessibleTableModelChangeEvent for \a object of with \a changeType.
*/
/*! \fn int QAccessibleTableModelChangeEvent::firstColumn() const
Returns the first changed column.
*/
/*! \fn int QAccessibleTableModelChangeEvent::firstRow() const
Returns the first changed row.
*/
/*! \fn int QAccessibleTableModelChangeEvent::lastColumn() const
Returns the last changed column.
*/
/*! \fn int QAccessibleTableModelChangeEvent::lastRow() const
Returns the last changed row.
*/
/*! \fn QAccessibleTableModelChangeEvent::ModelChangeType QAccessibleTableModelChangeEvent::modelChangeType() const
Returns the type of change.
*/
/*! \fn void QAccessibleTableModelChangeEvent::setFirstColumn(int column)
Sets the first changed \a column.
*/
/*! \fn void QAccessibleTableModelChangeEvent::setFirstRow(int row)
Sets the first changed \a row.
*/
/*! \fn void QAccessibleTableModelChangeEvent::setLastColumn(int column)
Sets the last changed \a column.
*/
/*! \fn void QAccessibleTableModelChangeEvent::setLastRow(int row)
Sets the last changed \a row.
*/
/*! \fn void QAccessibleTableModelChangeEvent::setModelChangeType(ModelChangeType changeType)
Sets the type of change to \a changeType.
*/
/*!
\class QAccessibleTextCursorEvent
\fn QAccessibleTableModelChangeEvent::QAccessibleTableModelChangeEvent(QAccessibleInterface *iface, ModelChangeType changeType)
Constructs a new QAccessibleTableModelChangeEvent for interface \a iface with a model
change type \a changeType.
*/
/*!
\class QAccessibleTextCursorEvent
\ingroup accessibility
\inmodule QtGui
@ -1495,17 +1520,27 @@ QAccessible::Id QAccessibleEvent::uniqueId() const
This class is used with \l QAccessible::updateAccessibility().
*/
/*! \fn QAccessibleTextCursorEvent::QAccessibleTextCursorEvent(QObject *object, int cursorPosition)
/*! \fn QAccessibleTextCursorEvent::QAccessibleTextCursorEvent(QObject *object, int cursorPos)
Create a new QAccessibleTextCursorEvent for \a object.
The \a cursorPosition is the new cursor position.
The \a cursorPos is the new cursor position.
*/
/*! \fn int QAccessibleTextCursorEvent::cursorPosition() const
Returns the cursor position.
*/
/*! \fn void QAccessibleTextCursorEvent::setCursorPosition(int position)
Sets the cursor \a position for this event.
*/
/*!
\fn QAccessibleTextCursorEvent(QAccessibleInterface *iface, int cursorPos)
Create a new QAccessibleTextCursorEvent for \a iface,
The \a cursorPos is the new cursor position.
*/
/*!
\class QAccessibleTextInsertEvent
\ingroup accessibility
@ -1516,6 +1551,7 @@ QAccessible::Id QAccessibleEvent::uniqueId() const
This class is used with \l QAccessible::updateAccessibility().
*/
/*! \fn QAccessibleTextInsertEvent::QAccessibleTextInsertEvent(QObject *object, int position, const QString &text)
Constructs a new QAccessibleTextInsertEvent event for \a object.
The \a text has been inserted at \a position.
By default, it is assumed that the cursor has moved to the end
@ -1523,9 +1559,11 @@ QAccessible::Id QAccessibleEvent::uniqueId() const
set it with \l QAccessibleTextCursorEvent::setCursorPosition() for this event.
*/
/*! \fn int QAccessibleTextInsertEvent::changePosition() const
Returns the position where the text was inserted.
*/
/*! \fn QString QAccessibleTextInsertEvent::textInserted() const
Returns the text that has been inserted.
*/
@ -1539,19 +1577,54 @@ QAccessible::Id QAccessibleEvent::uniqueId() const
This class is used with \l QAccessible::updateAccessibility().
*/
/*! \fn QAccessibleTextRemoveEvent::QAccessibleTextRemoveEvent(QObject *object, int position, const QString &text)
Constructs a new QAccessibleTextRemoveEvent event for \a object.
The \a text has been removed at \a position.
By default it is assumed that the cursor has moved to \a position.
If that is not the case, one needs to manually
set it with \l QAccessibleTextCursorEvent::setCursorPosition() for this event.
*/
/*! \fn QAccessibleTextRemoveEvent::QAccessibleTextRemoveEvent(QAccessibleInterface *iface, int position, const QString &text)
Constructs a new QAccessibleTextRemoveEvent event for \a iface.
The \a text has been removed at \a position.
By default it is assumed that the cursor has moved to \a position.
If that is not the case, one needs to manually
set it with \l QAccessibleTextCursorEvent::setCursorPosition() for this event.
*/
/*! \fn int QAccessibleTextRemoveEvent::changePosition() const
Returns the position where the text was removed.
*/
/*! \fn QString QAccessibleTextRemoveEvent::textRemoved() const
Returns the text that has been removed.
*/
/*!
\fn QAccessibleTextSelectionEvent::QAccessibleTextSelectionEvent(QAccessibleInterface *iface, int start, int end)
Constructs a new QAccessibleTextSelectionEvent for \a iface. The new selection this
event notifies about is from position \a start to \a end.
*/
/*!
\fn QAccessibleTextInsertEvent::QAccessibleTextInsertEvent(QAccessibleInterface *iface, int position, const QString &text)
Constructs a new QAccessibleTextInsertEvent event for \a iface. The text has been inserted at
\a position.
*/
/*!
\fn inline QAccessibleTextUpdateEvent::QAccessibleTextUpdateEvent(QAccessibleInterface *iface, int position, const QString &oldText,
const QString &text)
Constructs a new QAccessibleTextUpdateEvent for \a iface. The text change takes place at
\a position where the \a oldText was removed and \a text inserted instead.
*/
/*!
\class QAccessibleTextUpdateEvent
@ -1566,16 +1639,20 @@ QAccessible::Id QAccessibleEvent::uniqueId() const
This class is used with \l QAccessible::updateAccessibility().
*/
/*! \fn QAccessibleTextUpdateEvent::QAccessibleTextUpdateEvent(QObject *object, int position, const QString &oldText, const QString &text)
Constructs a new QAccessibleTextUpdateEvent for \a object.
The text change takes place at \a position where the \a oldText was removed and \a text inserted instead.
*/
/*! \fn int QAccessibleTextUpdateEvent::changePosition() const
Returns where the change took place.
*/
/*! \fn QString QAccessibleTextUpdateEvent::textInserted() const
Returns the inserted text.
*/
/*! \fn QString QAccessibleTextUpdateEvent::textRemoved() const
Returns the removed text.
*/
@ -1589,16 +1666,20 @@ QAccessible::Id QAccessibleEvent::uniqueId() const
This class is used with \l QAccessible::updateAccessibility().
*/
/*! \fn QAccessibleTextSelectionEvent::QAccessibleTextSelectionEvent(QObject *object, int start, int end)
Constructs a new QAccessibleTextSelectionEvent for \a object.
The new selection this event notifies about is from position \a start to \a end.
*/
/*! \fn int QAccessibleTextSelectionEvent::selectionEnd() const
Returns the position of the last selected character.
*/
/*! \fn int QAccessibleTextSelectionEvent::selectionStart() const
Returns the position of the first selected character.
*/
/*! \fn void QAccessibleTextSelectionEvent::setSelection(int start, int end)
Sets the selection for this event from position \a start to \a end.
*/
@ -1840,11 +1921,13 @@ QDebug operator<<(QDebug d, const QAccessibleEvent &ev)
/*!
\fn QAccessibleTextInterface::~QAccessibleTextInterface()
Destroys the QAccessibleTextInterface.
*/
/*!
\fn void QAccessibleTextInterface::addSelection(int startOffset, int endOffset)
Select the text from \a startOffset to \a endOffset.
The \a startOffset is the first character that will be selected.
The \a endOffset is the first character that will not be selected.
@ -1857,6 +1940,7 @@ QDebug operator<<(QDebug d, const QAccessibleEvent &ev)
/*!
\fn QString QAccessibleTextInterface::attributes(int offset, int *startOffset, int *endOffset) const
Returns the text attributes at the position \a offset.
In addition the range of the attributes is returned in \a startOffset and \a endOffset.
*/
@ -1869,6 +1953,7 @@ QDebug operator<<(QDebug d, const QAccessibleEvent &ev)
/*!
\fn QRect QAccessibleTextInterface::characterRect(int offset) const
Returns the position and size of the character at position \a offset in screen coordinates.
*/
@ -2222,6 +2307,7 @@ QString QAccessibleTextInterface::textAtOffset(int offset, QAccessible::TextBoun
/*!
\fn QAccessibleEditableTextInterface::~QAccessibleEditableTextInterface()
Destroys the QAccessibleEditableTextInterface.
*/
@ -2263,6 +2349,7 @@ QString QAccessibleTextInterface::textAtOffset(int offset, QAccessible::TextBoun
/*!
\fn QAccessibleValueInterface::~QAccessibleValueInterface()
Destructor.
*/
@ -2335,46 +2422,55 @@ QString QAccessibleTextInterface::textAtOffset(int offset, QAccessible::TextBoun
/*!
\fn virtual QAccessibleTableCellInterface::~QAccessibleTableCellInterface()
Destroys the QAccessibleTableCellInterface.
*/
/*!
\fn virtual int QAccessibleTableCellInterface::columnExtent() const
Returns the number of columns occupied by this cell accessible.
*/
/*!
\fn virtual QList<QAccessibleInterface*> QAccessibleTableCellInterface::columnHeaderCells() const
Returns the column headers as an array of cell accessibles.
*/
/*!
\fn virtual int QAccessibleTableCellInterface::columnIndex() const
Translates this cell accessible into the corresponding column index.
*/
/*!
\fn virtual int QAccessibleTableCellInterface::rowExtent() const
Returns the number of rows occupied by this cell accessible.
*/
/*!
\fn virtual QList<QAccessibleInterface*> QAccessibleTableCellInterface::rowHeaderCells() const
Returns the row headers as an array of cell accessibles.
*/
/*!
\fn virtual int QAccessibleTableCellInterface::rowIndex() const
Translates this cell accessible into the corresponding row index.
*/
/*!
\fn virtual bool QAccessibleTableCellInterface::isSelected() const
Returns a boolean value indicating whether this cell is selected.
*/
/*!
\fn virtual QAccessibleInterface *QAccessibleTableCellInterface::table() const
Returns the QAccessibleInterface of the table containing this cell.
*/
@ -2391,105 +2487,125 @@ QString QAccessibleTextInterface::textAtOffset(int offset, QAccessible::TextBoun
/*!
\fn virtual QAccessibleTableInterface::~QAccessibleTableInterface()
Destroys the QAccessibleTableInterface.
*/
/*!
\fn virtual QAccessibleInterface *QAccessibleTableInterface::cellAt(int row, int column) const
Returns the cell at the specified \a row and \a column in the table.
*/
/*!
\fn virtual QAccessibleInterface *QAccessibleTableInterface::caption() const
Returns the caption for the table.
*/
/*!
\fn virtual QString QAccessibleTableInterface::columnDescription(int column) const
Returns the description text of the specified \a column in the table.
*/
/*!
\fn virtual int QAccessibleTableInterface::columnCount() const
Returns the total number of columns in table.
*/
/*!
\fn virtual int QAccessibleTableInterface::rowCount() const
Returns the total number of rows in table.
*/
/*!
\fn virtual int QAccessibleTableInterface::selectedCellCount() const
Returns the total number of selected cells.
*/
/*!
\fn virtual int QAccessibleTableInterface::selectedColumnCount() const
Returns the total number of selected columns.
*/
/*!
\fn virtual int QAccessibleTableInterface::selectedRowCount() const
Returns the total number of selected rows.
*/
/*!
\fn virtual QString QAccessibleTableInterface::rowDescription(int row) const
Returns the description text of the specified \a row in the table.
*/
/*!
\fn virtual QList<int> QAccessibleTableInterface::selectedCells() const
Returns the list of selected cell (by their index as \l QAccessibleInterface::child() accepts).
*/
/*!
\fn virtual QList<int> QAccessibleTableInterface::selectedColumns() const
Returns the list of currently selected columns.
*/
/*!
\fn virtual QList<int> QAccessibleTableInterface::selectedRows() const
Returns the list of currently selected columns.
*/
/*!
\fn virtual QAccessibleInterface *QAccessibleTableInterface::summary() const
Returns a QAccessibleInterface that represents a summary of the table.
This function may return 0 if no such interface exists.
*/
/*!
\fn virtual bool QAccessibleTableInterface::isColumnSelected(int column) const
Returns a boolean value indicating whether the specified \a column is completely selected.
*/
/*!
\fn virtual bool QAccessibleTableInterface::isRowSelected(int row) const
Returns a boolean value indicating whether the specified \a row is completely selected.
*/
/*!
\fn virtual bool QAccessibleTableInterface::selectRow(int row)
Selects \a row. This function might unselect all previously selected rows.
Returns \c true if the selection was successful.
*/
/*!
\fn virtual bool QAccessibleTableInterface::selectColumn(int column)
Selects \a column. This function might unselect all previously selected columns.
Returns \c true if the selection was successful.
*/
/*!
\fn virtual bool QAccessibleTableInterface::unselectRow(int row)
Unselects \a row, leaving other selected rows selected (if any).
Returns \c true if the selection was successful.
*/
/*!
\fn virtual bool QAccessibleTableInterface::unselectColumn(int column)
Unselects \a column, leaving other selected columns selected (if any).
Returns \c true if the selection was successful.
*/
@ -2544,6 +2660,7 @@ QString QAccessibleTextInterface::textAtOffset(int offset, QAccessible::TextBoun
/*!
\fn QAccessibleActionInterface::~QAccessibleActionInterface()
Destroys the QAccessibleActionInterface.
*/

7
src/gui/image/qicon.cpp
View File

@ -630,6 +630,13 @@ QIcon::QIcon(const QIcon &other)
d->ref.ref();
}
/*!
\fn QIcon::QIcon(QIcon &&other)
Move-constructs a QIcon instance, making it point to the same object
that \a other was pointing to.
*/
/*!
Constructs an icon from the file with the given \a fileName. The
file will be loaded on demand.

4
src/gui/image/qimage.cpp
View File

@ -4256,6 +4256,10 @@ int QImage::bitPlaneCount() const
return bpc;
}
/*!
Returns a smoothly scaled copy of the image. The returned image has a size
of width \a w by height \a h pixels.
*/
QImage QImage::smoothScaled(int w, int h) const {
QImage src = *this;
switch (src.format()) {

14
src/gui/image/qpixmapcache.cpp
View File

@ -660,5 +660,19 @@ QList< QPair<QString,QPixmap> > QPixmapCache::allPixmaps()
{
return pm_cache()->allPixmaps();
}
/*!
\fn QPixmapCache::KeyData::KeyData()
\internal
*/
/*!
\fn QPixmapCache::KeyData::KeyData(const KeyData &other)
\internal
*/
/*!
\fn QPixmapCache::KeyData::~KeyData()
\internal
*/
QT_END_NAMESPACE

56
src/gui/kernel/qevent.cpp
View File

@ -82,6 +82,52 @@ QEnterEvent::~QEnterEvent()
{
}
/*!
\fn QPoint QEnterEvent::globalPos() const
Returns the global position of the widget \e{at the time of the event}.
*/
/*!
\fn int QEnterEvent::globalX() const
Returns the global position on the X-axis of the mouse cursor relative to the the widget.
*/
/*!
\fn int QEnterEvent::globalY() const
Returns the global position on the Y-axis of the mouse cursor relative to the the widget.
*/
/*!
\fn QPoint QEnterEvent::localPos() const
Returns the mouse cursor's position relative to the receiving widget.
*/
/*!
\fn QPoint QEnterEvent::pos() const
Returns the position of the mouse cursor in global screen coordinates.
*/
/*!
\fn QPoint QEnterEvent::screenPos() const
Returns the position of the mouse cursor relative to the receiving screen.
*/
/*!
\fn QPoint QEnterEvent::windowPos() const
Returns the position of the mouse cursor relative to the receiving window.
*/
/*!
\fn int QEnterEvent::x() const
Returns the x position of the mouse cursor relative to the receiving widget.
*/
/*!
\fn int QEnterEvent::y() const
Returns the y position of the mouse cursor relative to the receiving widget.
*/
/*!
\class QInputEvent
\ingroup events
@ -4161,6 +4207,12 @@ QTouchEvent::~QTouchEvent()
\sa QTouchDevice::type(), QTouchEvent::device()
*/
/*! \fn QTouchEvent::TouchPoint::TouchPoint(TouchPoint &&other)
Move-constructs a TouchPoint instance, making it point to the same
object that \a other was pointing to.
*/
/*! \fn Qt::TouchPointStates QTouchEvent::touchPointStates() const
Returns a bitwise OR of all the touch point states for this event.
@ -4687,6 +4739,10 @@ void QTouchEvent::TouchPoint::setFlags(InfoFlags flags)
\internal
*/
/*!
\fn TouchPoint &TouchPoint::operator=(TouchPoint &&other)
\internal
*/
/*!
\fn void QTouchEvent::TouchPoint::swap(TouchPoint &other);
\internal

6
src/gui/math3d/qgenericmatrix.cpp
View File

@ -68,12 +68,6 @@ QT_BEGIN_NAMESPACE
Constructs a NxM matrix without initializing the contents.
*/
/*!
\fn QGenericMatrix::QGenericMatrix(const QGenericMatrix<N, M, T>& other)
Constructs a copy of \a other.
*/
/*!
\fn QGenericMatrix::QGenericMatrix(const T *values)

6
src/gui/opengl/qopengldebug.cpp
View File

@ -915,6 +915,12 @@ QOpenGLDebugMessage &QOpenGLDebugMessage::operator=(const QOpenGLDebugMessage &d
return *this;
}
/*!
\fn QOpenGLDebugMessage &QOpenGLDebugMessage::operator=(QOpenGLDebugMessage &&debugMessage)
Move-assigns \a debugMessage to this object.
*/
/*!
\fn void QOpenGLDebugMessage::swap(QOpenGLDebugMessage &debugMessage)

10
src/gui/opengl/qopenglversionfunctions.cpp
View File

@ -186,11 +186,17 @@ void QAbstractOpenGLFunctionsPrivate::removeExternalFunctions(QOpenGLContext *co
\sa QOpenGLContext::versionFunctions()
*/
/*!
Constructs a QAbstractOpenGLFunctions object.
*/
QAbstractOpenGLFunctions::QAbstractOpenGLFunctions()
: d_ptr(new QAbstractOpenGLFunctionsPrivate)
{
}
/*!
Destroys a QAbstractOpenGLFunctions object.
*/
QAbstractOpenGLFunctions::~QAbstractOpenGLFunctions()
{
Q_D(QAbstractOpenGLFunctions);
@ -228,12 +234,16 @@ bool QAbstractOpenGLFunctions::isInitialized() const
return d->initialized;
}
/*! \internal
*/
void QAbstractOpenGLFunctions::setOwningContext(const QOpenGLContext *context)
{
Q_D(QAbstractOpenGLFunctions);
d->owningContext = const_cast<QOpenGLContext*>(context);
}
/*! \internal
*/
QOpenGLContext *QAbstractOpenGLFunctions::owningContext() const
{
Q_D(const QAbstractOpenGLFunctions);

14
src/gui/painting/qbackingstore.cpp
View File

@ -197,16 +197,27 @@ bool QBackingStore::scroll(const QRegion &area, int dx, int dy)
return d_ptr->platformBackingStore->scroll(area, dx, dy);
}
/*!
Set \a region as the static contents of this window.
*/
void QBackingStore::setStaticContents(const QRegion &region)
{
d_ptr->staticContents = region;
}
/*!
Returns a pointer to the QRegion that has the static contents
of this window.
*/
QRegion QBackingStore::staticContents() const
{
return d_ptr->staticContents;
}
/*!
Returns a boolean indicating if this window
has static contents or not.
*/
bool QBackingStore::hasStaticContents() const
{
return !d_ptr->staticContents.isEmpty();
@ -259,6 +270,9 @@ void Q_GUI_EXPORT qt_scrollRectInImage(QImage &img, const QRect &rect, const QPo
}
}
/*!
Returns a pointer to the QPlatformBackingStore implementation
*/
QPlatformBackingStore *QBackingStore::handle() const
{
return d_ptr->platformBackingStore;

4
src/gui/painting/qpaintengine_raster.cpp
View File

@ -3281,6 +3281,10 @@ bool QRasterPaintEngine::requiresPretransformedGlyphPositions(QFontEngine *fontE
return QPaintEngineEx::requiresPretransformedGlyphPositions(fontEngine, m);
}
/*!
Indicates whether glyph caching is supported by the font engine
\a fontEngine with the given transform \a m applied.
*/
bool QRasterPaintEngine::shouldDrawCachedGlyphs(QFontEngine *fontEngine, const QTransform &m) const
{
// The raster engine does not support projected cached glyph drawing

5
src/gui/text/qfontmetrics.cpp
View File

@ -208,6 +208,11 @@ QFontMetrics &QFontMetrics::operator=(const QFontMetrics &fm)
\since 5.2
*/
/*!
\fn QFontMetricsF &QFontMetricsF::operator=(QFontMetricsF &&other)
Move-assigns \a other to this QFontMetricsF instance.
*/
/*!
\fn void QFontMetrics::swap(QFontMetrics &other)

3
src/gui/text/qtextdocument.cpp
View File

@ -135,9 +135,8 @@ bool Qt::mightBeRichText(const QString& text)
return false;
}
/*!
\fn QString Qt::convertFromPlainText(const QString &plain, WhiteSpaceMode mode)
/*!
Converts the plain text string \a plain to an HTML-formatted
paragraph while preserving most of its look.

8
src/opengl/qgl.cpp
View File

@ -2168,6 +2168,9 @@ QGLContext::QGLContext(QOpenGLContext *context)
d->setupSharing();
}
/*!
Returns the OpenGL context handle.
*/
QOpenGLContext *QGLContext::contextHandle() const
{
Q_D(const QGLContext);
@ -2175,7 +2178,7 @@ QOpenGLContext *QGLContext::contextHandle() const
}
/*!
Returns a OpenGL context for the window context specified by the \a context
Returns an OpenGL context for the window context specified by the \a context
parameter.
*/
QGLContext *QGLContext::fromOpenGLContext(QOpenGLContext *context)
@ -4354,6 +4357,9 @@ void QGLWidget::resizeOverlayGL(int, int)
{
}
/*!
Handles the event \a e passed as a parameter.
*/
bool QGLWidget::event(QEvent *e)
{
Q_D(QGLWidget);

1
src/platformheaders/xcbfunctions/qxcbwindowfunctions.qdoc
View File

@ -81,3 +81,4 @@
This is a convenience function that can be used directly instead of resolving the function pointer.
\a window and \a type will be relayed to the function retrieved by QGuiApplication
*/

10
src/printsupport/kernel/qprinter.cpp
View File

@ -1092,11 +1092,19 @@ void QPrinter::setCreator(const QString &creator)
To obtain the current page margins use pageLayout().pageMargins().
Returns true if the page margins was successfully set to \a margins.
Returns \c true if the page margins was successfully set to \a margins.
\sa pageLayout(), setPageLayout()
*/
/*!
\fn bool QPrinter::setPageMargins(const QMarginsF &margins)
Set the page margins to \a margins using the current units.
Returns \c true if the page margins were set successfully.
\sa pageLayout(), setPageLayout()
*/
/*!
\fn QPageLayout QPrinter::pageLayout() const
\since 5.3

49
src/widgets/kernel/qwidget.cpp
View File

@ -12658,11 +12658,21 @@ void QWidget::initPainter(QPainter *painter) const
painter->d_func()->state->font = f;
}
/*!
\internal
Do PaintDevice rendering with the specified \a offset.
*/
QPaintDevice *QWidget::redirected(QPoint *offset) const
{
return d_func()->redirected(offset);
}
/*!
\internal
A painter that is shared among other instances of QPainter.
*/
QPainter *QWidget::sharedPainter() const
{
// Someone sent a paint event directly to the widget
@ -12805,6 +12815,45 @@ void QWidgetPrivate::setWidgetParentHelper(QObject *widgetAsObject, QObject *new
widget->setParent(static_cast<QWidget*>(newParent));
}
/*! \fn Qt::HANDLE QWidget::macCGHandle() const
\internal
Returns the CoreGraphics handle of the widget. Use of this function is not portable.
This function will return 0 if no painter context can be established, or if the handle
could not be created.
\warning This function is only available on OS X.
*/
/*! \fn Qt::HANDLE QWidget::macQDHandle() const
\internal
Returns the QuickDraw handle of the widget. Use of this function is not portable.
This function will return 0 if QuickDraw is not supported, or if the handle could
not be created.
\warning This function is only available on OS X.
*/
/*! \fn const QX11Info &QWidget::x11Info() const
\internal
Returns information about the configuration of the X display used to display
the widget.
\warning This function is only available on X11.
*/
/*! \fn Qt::HANDLE QWidget::x11PictureHandle() const
\internal
Returns the X11 picture handle of the widget for XRender
support. Use of this function is not portable. This function will
return 0 if XRender support is not compiled into Qt, if the
XRender extension is not supported on the X11 display, or if the
handle could not be created.
\warning This function is only available on X11.
*/
QT_END_NAMESPACE
#include "moc_qwidget.cpp"

5
src/widgets/widgets/qmacnativewidget_mac.mm
View File

@ -142,6 +142,11 @@ QSize QMacNativeWidget::sizeHint() const
return QWidget::sizeHint();
}
/*! \fn NSView *QMacNativeWidget::nativeView() const
Returns the native view backing the QMacNativeWidget.
*/
NSView *QMacNativeWidget::nativeView() const
{
winId();