summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2009-09-21 13:29:38 (GMT)
committerMartin Smith <msmith@trolltech.com>2009-09-21 13:30:53 (GMT)
commitec76b17145c6449a5d90a1052635f30971e7fa4d (patch)
tree5815c51562bf4070b1710754292aff2ed34bc4da /src/gui
parent00a8d21fff66cd2aec5ea0b6158a4f9923a6732f (diff)
downloadQt-ec76b17145c6449a5d90a1052635f30971e7fa4d.zip
Qt-ec76b17145c6449a5d90a1052635f30971e7fa4d.tar.gz
Qt-ec76b17145c6449a5d90a1052635f30971e7fa4d.tar.bz2
qdoc: Added \brief texts to all the since 4.6 functions.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/kernel/qevent.cpp2
-rw-r--r--src/gui/kernel/qwidget.cpp28
-rw-r--r--src/gui/painting/qdrawutil.cpp3
-rw-r--r--src/gui/painting/qmatrix.cpp3
4 files changed, 26 insertions, 10 deletions
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index 9cb2090..ce64c68 100644
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
@@ -3776,7 +3776,7 @@ QTouchEvent::~QTouchEvent()
*/
/*! \class QTouchEvent::TouchPoint
- \brief The QTouchEvent::TouchPoint class provides information about a touch point in a QTouchEvent.
+ \brief The TouchPoint class provides information about a touch point in a QTouchEvent.
\since 4.6
*/
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 00ad430..ac25435 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -4973,7 +4973,10 @@ void QWidget::render(QPainter *painter, const QPoint &targetOffset,
}
/*!
- Returns a pointer to this widget's effect if it has one; otherwise 0.
+ \brief The graphicsEffect function returns a pointer to the
+ widget's graphics effect.
+
+ If the widget has no graphics effect, 0 is returned.
\since 4.6
@@ -4986,6 +4989,9 @@ QGraphicsEffect *QWidget::graphicsEffect() const
}
/*!
+
+ \brief The setGraphicsEffect function is for setting the widget's graphics effect.
+
Sets \a effect as the widget's effect. If there already is an effect installed
on this widget, QWidget will delete the existing effect before installing
the new \a effect.
@@ -6205,7 +6211,8 @@ QWidget *QWidget::nextInFocusChain() const
}
/*!
- Returns the previous widget in this widget's focus chain.
+ \brief The previousInFocusChain function returns the previous
+ widget in this widget's focus chain.
\sa nextInFocusChain()
@@ -6708,14 +6715,14 @@ bool QWidget::restoreGeometry(const QByteArray &geometry)
*/
/*!
- Sets the margins around the contents of the widget to have the
- sizes \a left, \a top, \a right, and \a bottom. The margins are
- used by the layout system, and may be used by subclasses to
- specify the area to draw in (e.g. excluding the frame).
+ Sets the margins around the contents of the widget to have the sizes
+ \a left, \a top, \a right, and \a bottom. The margins are used by
+ the layout system, and may be used by subclasses to specify the area
+ to draw in (e.g. excluding the frame).
- Changing the margins will trigger a resizeEvent().
+ Changing the margins will trigger a resizeEvent().
- \sa contentsRect(), getContentsMargins()
+ \sa contentsRect(), getContentsMargins()
*/
void QWidget::setContentsMargins(int left, int top, int right, int bottom)
{
@@ -6750,6 +6757,9 @@ void QWidget::setContentsMargins(int left, int top, int right, int bottom)
\overload
\since 4.6
+ \brief The setContentsMargins function sets the margins around the
+ widget's contents.
+
Sets the margins around the contents of the widget to have the
sizes determined by \a margins. The margins are
used by the layout system, and may be used by subclasses to
@@ -6787,7 +6797,7 @@ void QWidget::getContentsMargins(int *left, int *top, int *right, int *bottom) c
/*!
\since 4.6
- Returns the widget's contents margins.
+ \brief The contentsMargins function returns the widget's contents margins.
\sa getContentsMargins(), setContentsMargins(), contentsRect()
*/
diff --git a/src/gui/painting/qdrawutil.cpp b/src/gui/painting/qdrawutil.cpp
index 0a82a9f..716300e 100644
--- a/src/gui/painting/qdrawutil.cpp
+++ b/src/gui/painting/qdrawutil.cpp
@@ -1070,6 +1070,9 @@ void qDrawItem(QPainter *p, Qt::GUIStyle gs,
\since 4.6
\overload
+ \brief The qDrawBorderPixmap function is for drawing a pixmap into
+ the margins of a rectangle.
+
Draws the given \a pixmap into the given \a target rectangle, using the
given \a painter. The pixmap will be split into nine segments and drawn
according to the \a margins structure.
diff --git a/src/gui/painting/qmatrix.cpp b/src/gui/painting/qmatrix.cpp
index 0f0d405..88b2b7a 100644
--- a/src/gui/painting/qmatrix.cpp
+++ b/src/gui/painting/qmatrix.cpp
@@ -1209,6 +1209,9 @@ QDebug operator<<(QDebug dbg, const QMatrix &m)
\relates QMatrix
\since 4.6
+ \brief The qFuzzyCompare function is for comparing two matrices
+ using a fuzziness factor.
+
Returns true if \a m1 and \a m2 are equal, allowing for a small
fuzziness factor for floating-point comparisons; false otherwise.
*/