diff options
| -rw-r--r-- | src/corelib/global/qglobal.h | 12 | ||||
| -rw-r--r-- | src/corelib/io/qfileinfo.cpp | 5 | ||||
| -rw-r--r-- | src/corelib/kernel/qtranslator.cpp | 6 | ||||
| -rw-r--r-- | src/corelib/plugin/qlibrary.cpp | 12 | ||||
| -rw-r--r-- | src/corelib/tools/qstringbuilder.cpp | 6 | ||||
| -rw-r--r-- | src/gui/accessible/qaccessible.cpp | 4 | ||||
| -rw-r--r-- | src/gui/image/qbitmap.cpp | 18 | ||||
| -rw-r--r-- | src/gui/image/qpicture.cpp | 6 | ||||
| -rw-r--r-- | src/gui/image/qpixmap.cpp | 287 | ||||
| -rw-r--r-- | src/gui/kernel/qevent.cpp | 150 | ||||
| -rw-r--r-- | src/gui/kernel/qpalette.cpp | 7 | ||||
| -rw-r--r-- | src/gui/painting/qpaintdevice.qdoc | 12 | ||||
| -rw-r--r-- | src/gui/painting/qpainter.cpp | 588 | ||||
| -rw-r--r-- | src/gui/painting/qregion.cpp | 7 | ||||
| -rw-r--r-- | src/gui/util/qvalidator.cpp | 4 | ||||
| -rw-r--r-- | src/network/access/qftp.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/accessible/widgets/complexwidgets.cpp | 27 | ||||
| -rw-r--r-- | src/plugins/accessible/widgets/qaccessiblewidgets.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/accessible/widgets/simplewidgets.cpp | 23 |
19 files changed, 16 insertions, 1165 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index b079e317d7..a2290f0241 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1154,11 +1154,23 @@ Q_DECL_CONSTEXPR inline int qRound(double d) { return d >= 0.0 ? int(d + 0.5) : int(d - int(d-1) + 0.5) + int(d-1); } Q_DECL_CONSTEXPR inline int qRound(float d) { return d >= 0.0f ? int(d + 0.5f) : int(d - int(d-1) + 0.5f) + int(d-1); } +#ifdef Q_QDOC +/* + Just for documentation generation +*/ +int qRound(qreal d); +#endif Q_DECL_CONSTEXPR inline qint64 qRound64(double d) { return d >= 0.0 ? qint64(d + 0.5) : qint64(d - double(qint64(d-1)) + 0.5) + qint64(d-1); } Q_DECL_CONSTEXPR inline qint64 qRound64(float d) { return d >= 0.0f ? qint64(d + 0.5f) : qint64(d - float(qint64(d-1)) + 0.5f) + qint64(d-1); } +#ifdef Q_QDOC +/* + Just for documentation generation +*/ +qint64 qRound64(qreal d); +#endif template <typename T> Q_DECL_CONSTEXPR inline const T &qMin(const T &a, const T &b) { return (a < b) ? a : b; } diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp index 0ee851fd14..7d925f380b 100644 --- a/src/corelib/io/qfileinfo.cpp +++ b/src/corelib/io/qfileinfo.cpp @@ -375,11 +375,6 @@ QFileInfo::~QFileInfo() */ /*! - \overload - \fn bool QFileInfo::operator!=(const QFileInfo &fileinfo) const -*/ - -/*! Returns true if this QFileInfo object refers to a file in the same location as \a fileinfo; otherwise returns false. diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp index 6a3a463f6b..2796902590 100644 --- a/src/corelib/kernel/qtranslator.cpp +++ b/src/corelib/kernel/qtranslator.cpp @@ -939,12 +939,6 @@ bool QTranslator::isEmpty() const !d->offsetArray && !d->contextArray; } -/*! - \fn QString QTranslator::find(const char *context, const char *sourceText, const char * comment = 0) const - - Use translate(\a context, \a sourceText, \a comment) instead. -*/ - QT_END_NAMESPACE #endif // QT_NO_TRANSLATION diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp index 580dc37bd2..9eeb783b60 100644 --- a/src/corelib/plugin/qlibrary.cpp +++ b/src/corelib/plugin/qlibrary.cpp @@ -1121,18 +1121,6 @@ QFunctionPointer QLibrary::resolve(const QString &fileName, const QString &versi } /*! - \fn QString QLibrary::library() const - - Use fileName() instead. -*/ - -/*! - \fn void QLibrary::setAutoUnload( bool b ) - - Use load(), isLoaded(), and unload() as necessary instead. -*/ - -/*! \since 4.2 Returns a text string with the description of the last error that occurred. diff --git a/src/corelib/tools/qstringbuilder.cpp b/src/corelib/tools/qstringbuilder.cpp index 7c1bde4ac7..2b40a68e0b 100644 --- a/src/corelib/tools/qstringbuilder.cpp +++ b/src/corelib/tools/qstringbuilder.cpp @@ -101,12 +101,6 @@ QT_BEGIN_NAMESPACE characters. */ -/*! - \fn operator QStringBuilder::QString() const - - Converts the \c QLatin1String into a \c QString object. -*/ - /*! \internal */ void QAbstractConcatenable::convertFromAscii(const char *a, int len, QChar *&out) diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp index e5ed9b8976..2785ff5db4 100644 --- a/src/gui/accessible/qaccessible.cpp +++ b/src/gui/accessible/qaccessible.cpp @@ -905,7 +905,7 @@ QVector<QPair<QAccessibleInterface*, QAccessible::Relation> > QAccessibleInterfa */ /*! - \fn QAccessibleInterface *parent() const + \fn QAccessibleInterface* QAccessibleInterface::parent() const Returns the QAccessibleInterface of the parent in the accessible object hierarchy. @@ -915,7 +915,7 @@ QVector<QPair<QAccessibleInterface*, QAccessible::Relation> > QAccessibleInterfa */ /*! - \fn QAccessibleInterface *child(int index) const + \fn QAccessibleInterface* QAccessibleInterface::child(int index) const Returns the accessible child with index \a index. 0-based index. The number of children of an object can be checked with childCount. diff --git a/src/gui/image/qbitmap.cpp b/src/gui/image/qbitmap.cpp index f32c517f17..4c03379550 100644 --- a/src/gui/image/qbitmap.cpp +++ b/src/gui/image/qbitmap.cpp @@ -153,14 +153,6 @@ QBitmap::QBitmap(const QPixmap &pixmap) } /*! - \fn QBitmap::QBitmap(const QImage &image) - - Constructs a bitmap that is a copy of the given \a image. - - Use the static fromImage() function instead. -*/ - -/*! Constructs a bitmap from the file specified by the given \a fileName. If the file does not exist, or has an unknown format, the bitmap becomes a null bitmap. @@ -229,16 +221,6 @@ QBitmap::operator QVariant() const } /*! - \fn QBitmap &QBitmap::operator=(const QImage &image) - \overload - - Converts the given \a image to a bitmap, and assigns the result to - this bitmap. Returns a reference to the bitmap. - - Use the static fromImage() function instead. -*/ - -/*! Returns a copy of the given \a image converted to a bitmap using the specified image conversion \a flags. diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp index 418393a1b8..5d79f3fe22 100644 --- a/src/gui/image/qpicture.cpp +++ b/src/gui/image/qpicture.cpp @@ -1978,12 +1978,6 @@ bool QPictureIO::write() } #endif //QT_NO_PICTUREIO -/*! - \fn QPicture QPicture::copy() const - - Use simple assignment instead. -*/ - QT_END_NAMESPACE #endif // QT_NO_PICTURE diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index 00451268f3..35b9ae33ec 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -102,22 +102,6 @@ void QPixmap::doInit(int w, int h, int type) } /*! - \enum QPixmap::ColorMode - - \compat - - This enum type defines the color modes that exist for converting - QImage objects to QPixmap. It is provided here for compatibility - with earlier versions of Qt. - - Use Qt::ImageConversionFlags instead. - - \value Auto Select \c Color or \c Mono on a case-by-case basis. - \value Color Always create colored pixmaps. - \value Mono Always create bitmaps. -*/ - -/*! Constructs a null pixmap. \sa isNull() @@ -434,14 +418,6 @@ QPixmap::operator QVariant() const */ /*! - \fn QPixmap::operator QImage() const - - Returns the pixmap as a QImage. - - Use the toImage() function instead. -*/ - -/*! Converts the pixmap to a QImage. Returns a null image if the conversion fails. @@ -589,43 +565,6 @@ int QPixmap::depth() const } /*! - \fn void QPixmap::resize(const QSize &size) - \overload - \compat - - Use QPixmap::copy() instead to get the pixmap with the new size. - - \oldcode - pixmap.resize(size); - \newcode - pixmap = pixmap.copy(QRect(QPoint(0, 0), size)); - \endcode -*/ - -/*! - \fn void QPixmap::resize(int width, int height) - \compat - - Use QPixmap::copy() instead to get the pixmap with the new size. - - \oldcode - pixmap.resize(10, 20); - \newcode - pixmap = pixmap.copy(0, 0, 10, 20); - \endcode -*/ - -/*! - \fn bool QPixmap::selfMask() const - \compat - - Returns whether the pixmap is its own mask or not. - - This function is no longer relevant since the concept of self - masking doesn't exists anymore. -*/ - -/*! Sets a mask bitmap. This function merges the \a mask with the pixmap's alpha channel. A pixel @@ -999,36 +938,6 @@ static void sendResizeEvents(QWidget *target) } #endif -/*! - \fn QPixmap QPixmap::grabWidget(QPaintDevice * widget, const QRect &rectangle) - - Creates a pixmap and paints the given \a widget, restricted by the - given \a rectangle, in it. If the \a widget has any children, then - they are also painted in the appropriate positions. - - If no rectangle is specified (the default) the entire widget is - painted. - - If \a widget is 0, the specified rectangle doesn't overlap the - widget's rectangle, or an error occurs, the function will return a - null QPixmap. If the rectangle is a superset of the given \a - widget, the areas outside the \a widget are covered with the - widget's background. - - This function actually asks \a widget to paint itself (and its - children to paint themselves) by calling paintEvent() with painter - redirection turned on. But QPixmap also provides the grabWindow() - function which is a bit faster by grabbing pixels directly off the - screen. In addition, if there are overlaying windows, - grabWindow(), unlike grabWidget(), will see them. - - \warning Do not grab a widget from its QWidget::paintEvent(). - However, it is safe to grab a widget from another widget's - \l {QWidget::}{paintEvent()}. - - \sa grabWindow() -*/ - QPixmap QPixmap::grabWidget(QObject *widget, const QRect &rectangle) { QPixmap pixmap; @@ -1043,62 +952,6 @@ QPixmap QPixmap::grabWidget(QObject *widget, const QRect &rectangle) return pixmap; } -/*! - \fn QPixmap QPixmap::grabWidget(QWidget *widget, int x, int y, int - width, int height) - - \overload - - Creates a pixmap and paints the given \a widget, restricted by - QRect(\a x, \a y, \a width, \a height), in it. - - \warning Do not grab a widget from its QWidget::paintEvent(). - However, it is safe to grab a widget from another widget's - \l {QWidget::}{paintEvent()}. -*/ - - -/*! - \since 4.5 - - \enum QPixmap::ShareMode - - This enum type defines the share modes that are available when - creating a QPixmap object from a raw X11 Pixmap handle. - - \value ImplicitlyShared This mode will cause the QPixmap object to - create a copy of the internal data before it is modified, thus - keeping the original X11 pixmap intact. - - \value ExplicitlyShared In this mode, the pixmap data will \e not be - copied before it is modified, which in effect will change the - original X11 pixmap. - - \warning This enum is only used for X11 specific functions; using - it is non-portable. - - \sa QPixmap::fromX11Pixmap() -*/ - -/*! - \since 4.5 - - \fn QPixmap QPixmap::fromX11Pixmap(Qt::HANDLE pixmap, QPixmap::ShareMode mode) - - Creates a QPixmap from the native X11 Pixmap handle \a pixmap, - using \a mode as the share mode. The default share mode is - QPixmap::ImplicitlyShared, which means that a copy of the pixmap is - made if someone tries to modify it by e.g. drawing onto it. - - QPixmap does \e not take ownership of the \a pixmap handle, and - have to be deleted by the user. - - \warning This function is X11 specific; using it is non-portable. - - \sa QPixmap::ShareMode -*/ - - /***************************************************************************** QPixmap stream functions *****************************************************************************/ @@ -1161,12 +1014,6 @@ void QPixmap::deref() } /*! - \fn QImage QPixmap::convertToImage() const - - Use the toImage() function instead. -*/ - -/*! Replaces this pixmap's data with the given \a image using the specified \a flags to control the conversion. The \a flags argument is a bitwise-OR of the \l{Qt::ImageConversionFlags}. @@ -1190,12 +1037,6 @@ bool QPixmap::convertFromImage(const QImage &image, Qt::ImageConversionFlags fla } /*! - \fn QPixmap QPixmap::xForm(const QMatrix &matrix) const - - Use transformed() instead. -*/ - -/*! \fn QPixmap QPixmap::scaled(int width, int height, Qt::AspectRatioMode aspectRatioMode, Qt::TransformationMode transformMode) const @@ -1792,132 +1633,4 @@ QPlatformPixmap* QPixmap::handle() const return data.data(); } - -/*! - \enum QPixmap::HBitmapFormat - - \bold{Win32 only:} This enum defines how the conversion between \c - HBITMAP and QPixmap is performed. - - \warning This enum is only available on Windows. - - \value NoAlpha The alpha channel is ignored and always treated as - being set to fully opaque. This is preferred if the \c HBITMAP is - used with standard GDI calls, such as \c BitBlt(). - - \value PremultipliedAlpha The \c HBITMAP is treated as having an - alpha channel and premultiplied colors. This is preferred if the - \c HBITMAP is accessed through the \c AlphaBlend() GDI function. - - \value Alpha The \c HBITMAP is treated as having a plain alpha - channel. This is the preferred format if the \c HBITMAP is going - to be used as an application icon or systray icon. - - \sa fromWinHBITMAP(), toWinHBITMAP() -*/ - -/*! \fn HBITMAP QPixmap::toWinHBITMAP(HBitmapFormat format) const - \bold{Win32 only:} Creates a \c HBITMAP equivalent to the QPixmap, - based on the given \a format. Returns the \c HBITMAP handle. - - It is the caller's responsibility to free the \c HBITMAP data - after use. - - \warning This function is only available on Windows. - - \sa fromWinHBITMAP(), {QPixmap#Pixmap Conversion}{Pixmap Conversion} -*/ - -/*! \fn QPixmap QPixmap::fromWinHBITMAP(HBITMAP bitmap, HBitmapFormat format) - \bold{Win32 only:} Returns a QPixmap that is equivalent to the - given \a bitmap. The conversion is based on the specified \a - format. - - \warning This function is only available on Windows. - - \sa toWinHBITMAP(), {QPixmap#Pixmap Conversion}{Pixmap Conversion} - -*/ - -/*! \fn HICON QPixmap::toWinHICON() const - \since 4.6 - - \bold{Win32 only:} Creates a \c HICON equivalent to the QPixmap. - Returns the \c HICON handle. - - It is the caller's responsibility to free the \c HICON data after use. - - \warning This function is only available on Windows. - - \sa fromWinHICON(), {QPixmap#Pixmap Conversion}{Pixmap Conversion} -*/ - -/*! \fn QPixmap QPixmap::fromWinHICON(HICON icon) - \since 4.6 - - \bold{Win32 only:} Returns a QPixmap that is equivalent to the given - \a icon. - - \warning This function is only available on Windows. - - \sa toWinHICON(), {QPixmap#Pixmap Conversion}{Pixmap Conversion} - -*/ - -/*! \fn const QX11Info &QPixmap::x11Info() const - \bold{X11 only:} Returns information about the configuration of - the X display used by the screen to which the pixmap currently belongs. - - \warning This function is only available on X11. - - \sa {QPixmap#Pixmap Information}{Pixmap Information} -*/ - -/*! \fn Qt::HANDLE QPixmap::x11PictureHandle() const - \bold{X11 only:} Returns the X11 Picture handle of the pixmap for - XRender support. - - 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. Use of this - function is not portable. - - \warning This function is only available on X11. - - \sa {QPixmap#Pixmap Information}{Pixmap Information} -*/ - -/*! \fn int QPixmap::x11SetDefaultScreen(int screen) - \internal -*/ - -/*! \fn void QPixmap::x11SetScreen(int screen) - \internal -*/ - -/*! \fn QRgb* QPixmap::clut() const - \internal -*/ - -/*! \fn int QPixmap::numCols() const - \obsolete - \internal - \sa colorCount() -*/ - -/*! \fn int QPixmap::colorCount() const - \since 4.6 - \internal -*/ - -/*! \fn const uchar* QPixmap::qwsBits() const - \internal - \since 4.1 -*/ - -/*! \fn int QPixmap::qwsBytesPerLine() const - \internal - \since 4.1 -*/ - QT_END_NAMESPACE diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index 7acb5f7ce5..ed22ffe148 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -353,28 +353,6 @@ QMouseEvent::~QMouseEvent() \sa button() Qt::MouseButton */ - -/*! - \fn Qt::ButtonState QMouseEvent::state() const - - Returns the button state immediately before the event was - generated. The button state is a combination of mouse buttons - (see Qt::ButtonState) and keyboard modifiers (Qt::MouseButtons). - - Use buttons() and/or modifiers() instead. Be aware that buttons() - return the state immediately \e after the event was generated. -*/ - -/*! - \fn Qt::ButtonState QMouseEvent::stateAfter() const - - Returns the button state immediately after the event was - generated. The button state is a combination of mouse buttons - (see Qt::ButtonState) and keyboard modifiers (Qt::MouseButtons). - - Use buttons() and/or modifiers() instead. -*/ - /*! \class QHoverEvent \ingroup events @@ -641,18 +619,6 @@ QWheelEvent::QWheelEvent(const QPointF &pos, const QPointF& globalPos, int delta \sa globalX() globalPos() */ - -/*! \obsolete - \fn Qt::ButtonState QWheelEvent::state() const - - Returns the keyboard modifier flags at the time of the event. - - The returned value is a selection of the following values, - combined using the OR operator: Qt::ShiftButton, - Qt::ControlButton, and Qt::AltButton. -*/ - - /*! \class QKeyEvent \brief The QKeyEvent class describes a key event. @@ -1051,26 +1017,6 @@ Qt::FocusReason QFocusEvent::reason() const */ /*! - \fn bool QPaintEvent::erased() const - \compat - - Returns true if the paint event region (or rectangle) has been - erased with the widget's background; otherwise returns false. - - Qt 4 \e always erases regions that require painting. The exception - to this rule is if the widget sets the Qt::WA_OpaquePaintEvent or - Qt::WA_NoSystemBackground attributes. If either one of those - attributes is set \e and the window system does not make use of - subwidget alpha composition (currently X11 and Windows, but this - may change), then the region is not erased. -*/ - -/*! - \fn void QPaintEvent::setErased(bool b) { m_erased = b; } - \internal -*/ - -/*! Constructs a paint event object with the region that needs to be updated. The region is specified by \a paintRegion. */ @@ -1457,19 +1403,6 @@ QContextMenuEvent::QContextMenuEvent(Reason reason, const QPoint &pos) #endif // QT_NO_CONTEXTMENU /*! - \fn Qt::ButtonState QContextMenuEvent::state() const - - Returns the button state (a combination of mouse buttons - and keyboard modifiers) immediately before the event was - generated. - - The returned value is a selection of the following values, - combined with the OR operator: - Qt::LeftButton, Qt::RightButton, Qt::MidButton, - Qt::ShiftButton, Qt::ControlButton, and Qt::AltButton. -*/ - -/*! \enum QContextMenuEvent::Reason This enum describes the reason why the event was sent. @@ -1818,28 +1751,6 @@ QVariant QInputMethodQueryEvent::value(Qt::InputMethodQuery q) const return QVariant(); } -/*! - \fn Qt::InputMethodQuery QInputMethodQueryEvent::query() const - - returns the type of data queried. -*/ - -/*! - \fn QVariant QInputMethodQueryEvent::value() const - - returns the value set by the receiving object. Mainly used by the input method. - - \sa setValue() -*/ - -/*! - \fn QVariant QInputMethodQueryEvent::setValue() - - Used by the receiving object to set the value requested by query(). - - \sa setValue() -*/ - #ifndef QT_NO_TABLETEVENT /*! @@ -2185,12 +2096,6 @@ QDragMoveEvent::~QDragMoveEvent() } /*! - \fn void QDragMoveEvent::accept(bool y) - - Calls setAccepted(\a y) instead. -*/ - -/*! \fn void QDragMoveEvent::accept(const QRect &rectangle) The same as accept(), but also notifies that future moves will @@ -2349,51 +2254,6 @@ void QDropEvent::setDropAction(Qt::DropAction action) */ /*! - \fn void QDropEvent::accept() - \internal -*/ - -/*! - \fn void QDropEvent::accept(bool accept) - - Call setAccepted(\a accept) instead. -*/ - -/*! - \fn void QDropEvent::acceptAction(bool accept = true) - - Call this to indicate that the action described by action() is - accepted (i.e. if \a accept is true, which is the default), not merely - the default copy action. If you call acceptAction(true), there is - no need to also call accept(true). -*/ - -/*! - \enum QDropEvent::Action - \compat - - When a drag and drop action is completed, the target is expected - to perform an action on the data provided by the source. This - will be one of the following: - - \value Copy The default action. The source simply uses the data - provided in the operation. - \value Link The source should somehow create a link to the - location specified by the data. - \value Move The source should somehow move the object from the - location specified by the data to a new location. - \value Private The target has special knowledge of the MIME type, - which the source should respond to in a similar way to - a Copy. - \value UserAction The source and target can co-operate using - special actions. This feature is not currently - supported. - - The Link and Move actions only makes sense if the data is a - reference, for example, text/uri-list file lists (see QUriDrag). -*/ - -/*! \fn void QDropEvent::setDropAction(Qt::DropAction action) Sets the \a action to be performed on the data by the target. @@ -2444,16 +2304,6 @@ void QDropEvent::setDropAction(Qt::DropAction action) */ /*! - \fn void QDropEvent::setPoint(const QPoint &point) - \compat - - Sets the drop to happen at the given \a point. You do not normally - need to use this as it will be set internally before your widget - receives the drop event. -*/ // ### here too - what coordinate system? - - -/*! \class QDragEnterEvent \brief The QDragEnterEvent class provides an event which is sent to a widget when a drag and drop action enters it. diff --git a/src/gui/kernel/qpalette.cpp b/src/gui/kernel/qpalette.cpp index 404faea25f..f84a366781 100644 --- a/src/gui/kernel/qpalette.cpp +++ b/src/gui/kernel/qpalette.cpp @@ -1081,11 +1081,4 @@ void QPalette::setColorGroup(ColorGroup cg, const QBrush &foreground, const QBru setBrush(cg, ToolTipText, toolTipText); } -/*! - \fn QPalette QPalette::copy() const - - Use simple assignment instead. -*/ - - QT_END_NAMESPACE diff --git a/src/gui/painting/qpaintdevice.qdoc b/src/gui/painting/qpaintdevice.qdoc index 4f940349d9..8d7e86f424 100644 --- a/src/gui/painting/qpaintdevice.qdoc +++ b/src/gui/painting/qpaintdevice.qdoc @@ -205,18 +205,6 @@ */ /*! - \fn int QPaintDevice::numColors() const - \deprecated - - Use colorCount() instead. - - Returns the number of different colors available for the paint - device. Since this value is an int, it will not be sufficient to - represent the number of colors on 32 bit displays, in this case - INT_MAX is returned instead. - */ - -/*! \fn int QPaintDevice::colorCount() const Returns the number of different colors available for the paint diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index fe9914bd8f..2cd601f2c7 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -3785,29 +3785,6 @@ void QPainter::drawPoints(const QPoint *points, int pointCount) */ /*! - \fn void QPainter::drawPoints(const QPolygon &polygon, int index, - int count) - - \overload - \compat - - Draws \a count points in the vector \a polygon starting on \a index - using the current pen. - - Use drawPoints() combined with QPolygon::constData() instead. - - \oldcode - QPainter painter(this); - painter.drawPoints(polygon, index, count); - \newcode - int pointCount = (count == -1) ? polygon.size() - index : count; - - QPainter painter(this); - painter.drawPoints(polygon.constData() + index, pointCount); - \endcode -*/ - -/*! Sets the background mode of the painter to the given \a mode Qt::TransparentMode (the default) draws stippled lines and text @@ -4808,29 +4785,6 @@ void QPainter::drawPolyline(const QPoint *points, int pointCount) } /*! - \fn void QPainter::drawPolyline(const QPolygon &polygon, int index, int - count) - - \overload - \compat - - Draws the polyline defined by the \a count lines of the given \a - polygon starting at \a index (\a index defaults to 0). - - Use drawPolyline() combined with QPolygon::constData() instead. - - \oldcode - QPainter painter(this); - painter.drawPolyline(polygon, index, count); - \newcode - int pointCount = (count == -1) ? polygon.size() - index : count; - - QPainter painter(this); - painter.drawPolyline(polygon.constData() + index, pointCount); - \endcode -*/ - -/*! \fn void QPainter::drawPolyline(const QPolygonF &points) \overload @@ -4943,45 +4897,6 @@ void QPainter::drawPolygon(const QPoint *points, int pointCount, Qt::FillRule fi d->engine->drawPolygon(points, pointCount, QPaintEngine::PolygonDrawMode(fillRule)); } -/*! \fn void QPainter::drawPolygon(const QPolygonF &polygon, bool winding, int index = 0, - int count = -1) - \compat - \overload - - Use drawPolygon() combined with QPolygonF::constData() instead. - - \oldcode - QPainter painter(this); - painter.drawPolygon(polygon, winding, index, count); - \newcode - int pointCount = (count == -1) ? polygon.size() - index : count; - int fillRule = winding ? Qt::WindingFill : Qt::OddEvenFill; - - QPainter painter(this); - painter.drawPolygon( polygon.constData() + index, pointCount, fillRule); - \endcode -*/ - -/*! \fn void QPainter::drawPolygon(const QPolygon &polygon, bool winding, - int index = 0, int count = -1) - - \compat - \overload - - Use drawPolygon() combined with QPolygon::constData() instead. - - \oldcode - QPainter painter(this); - painter.drawPolygon(polygon, winding, index, count); - \newcode - int pointCount = (count == -1) ? polygon.size() - index : count; - int fillRule = winding ? Qt::WindingFill : Qt::OddEvenFill; - - QPainter painter(this); - painter.drawPolygon( polygon.constData() + index, pointCount, fillRule); - \endcode -*/ - /*! \fn void QPainter::drawPolygon(const QPolygonF &points, Qt::FillRule fillRule) \overload @@ -5047,48 +4962,6 @@ void QPainter::drawPolygon(const QPoint *points, int pointCount, Qt::FillRule fi pen and brush. */ -/*! - \fn void QPainter::drawConvexPolygon(const QPolygonF &polygon, int - index, int count) - - \compat - \overload - - Use drawConvexPolygon() combined with QPolygonF::constData() - instead. - - \oldcode - QPainter painter(this); - painter.drawConvexPolygon(polygon, index, count); - \newcode - int pointCount = (count == -1) ? polygon.size() - index : count; - - QPainter painter(this); - painter.drawConvexPolygon(polygon.constData() + index, pointCount); - \endcode -*/ - -/*! - \fn void QPainter::drawConvexPolygon(const QPolygon &polygon, int - index, int count) - - \compat - \overload - - Use drawConvexPolygon() combined with QPolygon::constData() - instead. - - \oldcode - QPainter painter(this); - painter.drawConvexPolygon(polygon, index, count); - \newcode - int pointCount = (count == -1) ? polygon.size() - index : count; - - QPainter painter(this); - painter.drawConvexPolygon(polygon.constData() + index, pointCount); - \endcode -*/ - void QPainter::drawConvexPolygon(const QPoint *points, int pointCount) { #ifdef QT_DEBUG_DRAW @@ -7334,35 +7207,6 @@ QRect QPainter::viewport() const return QRect(d->state->vx, d->state->vy, d->state->vw, d->state->vh); } -/*! \fn bool QPainter::hasViewXForm() const - \compat - - Use viewTransformEnabled() instead. -*/ - -/*! \fn bool QPainter::hasWorldXForm() const - \compat - - Use worldMatrixEnabled() instead. -*/ - -/*! \fn void QPainter::resetXForm() - \compat - - Use resetTransform() instead. -*/ - -/*! \fn void QPainter::setViewXForm(bool enabled) - \compat - - Use setViewTransformEnabled() instead. -*/ - -/*! \fn void QPainter::setWorldXForm(bool enabled) - \compat - - Use setWorldMatrixEnabled() instead. -*/ /*! Enables view transformations if \a enable is true, or disables view transformations if \a enable is false. @@ -7823,108 +7667,6 @@ void QPainterState::init(QPainter *p) { } /*! - \fn void QPainter::setBackgroundColor(const QColor &color) - - Use setBackground() instead. -*/ - -/*! - \fn const QColor &QPainter::backgroundColor() const - - Use background() and QBrush::color() instead. - - \oldcode - QColor myColor = backgroundColor(); - \newcode - QColor myColor = background().color(); - \endcode - - Note that the background can be a complex brush such as a texture - or a gradient. -*/ - -/*! - \fn void QPainter::drawText(int x, int y, const QString &text, int pos, int length) - \compat - - Use drawText() combined with QString::mid() instead. - - \oldcode - QPainter painter(this); - painter.drawText(x, y, text, pos, length); - \newcode - QPainter painter(this); - painter.drawText(x, y, text.mid(pos, length)); - \endcode -*/ - -/*! - \fn void QPainter::drawText(const QPoint &point, const QString &text, int pos, int length) - \compat - - Use drawText() combined with QString::mid() instead. - - \oldcode - QPainter painter(this); - painter.drawText(point, text, pos, length); - \newcode - QPainter painter(this); - painter.drawText(point, text.mid(pos, length)); - \endcode -*/ - -/*! - \fn void QPainter::drawText(int x, int y, const QString &text, int length) - \compat - - Use drawText() combined with QString::left() instead. - - \oldcode - QPainter painter(this); - painter.drawText(x, y, text, length); - \newcode - QPainter painter(this); - painter.drawText(x, y, text.left(length)); - \endcode -*/ - -/*! - \fn void QPainter::drawText(const QPoint &point, const QString &text, int length) - \compat - - Use drawText() combined with QString::left() instead. - - \oldcode - QPainter painter(this); - painter.drawText(point, text, length); - \newcode - QPainter painter(this); - painter.drawText(point, text.left(length)); - \endcode -*/ - -/*! - \fn bool QPainter::begin(QPaintDevice *device, const QWidget *init) - \compat - - Use begin() instead. - - If the paint \a device is a QWidget, QPainter is initialized after - the widget's settings automatically. Otherwise, you must call the - initFrom() function to initialize the painters pen, background and - font to the same as any given widget. - - \oldcode - QPainter painter(this); - painter.begin(device, init); - \newcode - QPainter painter(this); - painter.begin(device); - painter.initFrom(init); - \endcode -*/ - -/*! \fn void QPainter::drawImage(const QRectF &target, const QImage &image, const QRectF &source, Qt::ImageConversionFlags flags) @@ -8031,88 +7773,6 @@ void QPainterState::init(QPainter *p) { */ /*! - \fn void QPainter::redirect(QPaintDevice *pdev, QPaintDevice *replacement) - - Use setRedirected() instead. -*/ - -/*! - \fn QPaintDevice *QPainter::redirect(QPaintDevice *pdev) - - Use redirected() instead. -*/ - -/*! - \fn QRect QPainter::boundingRect(const QRect &rectangle, int flags, - const QString &text, int length) - \compat - - Returns the bounding rectangle for the given \a length of the \a - text constrained by the provided \a rectangle. - - Use boundingRect() combined with QString::left() instead. - - \oldcode - QRect rectangle = boundingRect(rect, flags, text, length); - \newcode - QRect rectangle = boundingRect(rect, flags, text.left(length)); - \endcode -*/ - -/*! - \fn void QPainter::drawText(const QRect &rectangle, int flags, const QString &text, - int length, QRect *br) - \compat - - Use drawText() combined with QString::left() instead. - - \oldcode - QPainter painter(this); - painter.drawText(rectangle, flags, text, length, br ); - \newcode - QPainter painter(this); - painter.drawText(rectangle, flags, text.left(length), br ); - \endcode -*/ - -/*! - \fn QRect QPainter::boundingRect(int x, int y, int width, int height, int flags, - const QString &text, int length); - - \compat - - Returns the bounding rectangle for the given \a length of the \a - text constrained by the rectangle that begins at point (\a{x}, - \a{y}) with the given \a width and \a height. - - Use boundingRect() combined with QString::left() instead. - - \oldcode - QRect rectangle = boundingRect(x, y, width, height, flags, text, length); - \newcode - QRect rectangle = boundingRect(x, y, width, height, flags, text.left(length)); - \endcode -*/ - -/*! - \fn void QPainter::drawText(int x, int y, int width, int height, int flags, - const QString &text, int length, QRect *br) - - \compat - - Use drawText() combined with QString::left() instead. - - \oldcode - QPainter painter(this); - painter.drawText(x, y, width, height, flags, text, length, br ); - \newcode - QPainter painter(this); - painter.drawText(x, y, width, height, flags, text.left(length), br ); - \endcode -*/ - - -/*! \class QPaintEngineState \since 4.1 @@ -8765,252 +8425,4 @@ void qt_draw_helper(QPainterPrivate *p, const QPainterPath &path, QPainterPrivat p->draw_helper(path, operation); } -/*! \fn Display *QPaintDevice::x11Display() const - Use QX11Info::display() instead. - - \oldcode - Display *display = widget->x11Display(); - \newcode - Display *display = QX11Info::display(); - \endcode - - \sa QWidget::x11Info(), QX11Info::display() -*/ - -/*! \fn int QPaintDevice::x11Screen() const - Use QX11Info::screen() instead. - - \oldcode - int screen = widget->x11Screen(); - \newcode - int screen = widget->x11Info().screen(); - \endcode - - \sa QWidget::x11Info(), QPixmap::x11Info() -*/ - -/*! \fn void *QPaintDevice::x11Visual() const - Use QX11Info::visual() instead. - - \oldcode - void *visual = widget->x11Visual(); - \newcode - void *visual = widget->x11Info().visual(); - \endcode - - \sa QWidget::x11Info(), QPixmap::x11Info() -*/ - -/*! \fn int QPaintDevice::x11Depth() const - Use QX11Info::depth() instead. - - \oldcode - int depth = widget->x11Depth(); - \newcode - int depth = widget->x11Info().depth(); - \endcode - - \sa QWidget::x11Info(), QPixmap::x11Info() -*/ - -/*! \fn int QPaintDevice::x11Cells() const - Use QX11Info::cells() instead. - - \oldcode - int cells = widget->x11Cells(); - \newcode - int cells = widget->x11Info().cells(); - \endcode - - \sa QWidget::x11Info(), QPixmap::x11Info() -*/ - -/*! \fn Qt::HANDLE QPaintDevice::x11Colormap() const - Use QX11Info::colormap() instead. - - \oldcode - unsigned long screen = widget->x11Colormap(); - \newcode - unsigned long screen = widget->x11Info().colormap(); - \endcode - - \sa QWidget::x11Info(), QPixmap::x11Info() -*/ - -/*! \fn bool QPaintDevice::x11DefaultColormap() const - Use QX11Info::defaultColormap() instead. - - \oldcode - bool isDefault = widget->x11DefaultColormap(); - \newcode - bool isDefault = widget->x11Info().defaultColormap(); - \endcode - - \sa QWidget::x11Info(), QPixmap::x11Info() -*/ - -/*! \fn bool QPaintDevice::x11DefaultVisual() const - Use QX11Info::defaultVisual() instead. - - \oldcode - bool isDefault = widget->x11DefaultVisual(); - \newcode - bool isDefault = widget->x11Info().defaultVisual(); - \endcode - - \sa QWidget::x11Info(), QPixmap::x11Info() -*/ - -/*! \fn void *QPaintDevice::x11AppVisual(int screen) - Use QX11Info::visual() instead. - - \oldcode - void *visual = QPaintDevice::x11AppVisual(screen); - \newcode - void *visual = qApp->x11Info(screen).visual(); - \endcode - - \sa QWidget::x11Info(), QPixmap::x11Info() -*/ - -/*! \fn Qt::HANDLE QPaintDevice::x11AppColormap(int screen) - Use QX11Info::colormap() instead. - - \oldcode - unsigned long colormap = QPaintDevice::x11AppColormap(screen); - \newcode - unsigned long colormap = qApp->x11Info(screen).colormap(); - \endcode - - \sa QWidget::x11Info(), QPixmap::x11Info() -*/ - -/*! \fn Display *QPaintDevice::x11AppDisplay() - Use QX11Info::display() instead. - - \oldcode - Display *display = QPaintDevice::x11AppDisplay(); - \newcode - Display *display = qApp->x11Info().display(); - \endcode - - \sa QWidget::x11Info(), QPixmap::x11Info() -*/ - -/*! \fn int QPaintDevice::x11AppScreen() - Use QX11Info::screen() instead. - - \oldcode - int screen = QPaintDevice::x11AppScreen(); - \newcode - int screen = qApp->x11Info().screen(); - \endcode - - \sa QWidget::x11Info(), QPixmap::x11Info() -*/ - -/*! \fn int QPaintDevice::x11AppDepth(int screen) - Use QX11Info::depth() instead. - - \oldcode - int depth = QPaintDevice::x11AppDepth(screen); - \newcode - int depth = qApp->x11Info(screen).depth(); - \endcode - - \sa QWidget::x11Info(), QPixmap::x11Info() -*/ - -/*! \fn int QPaintDevice::x11AppCells(int screen) - Use QX11Info::cells() instead. - - \oldcode - int cells = QPaintDevice::x11AppCells(screen); - \newcode - int cells = qApp->x11Info(screen).cells(); - \endcode - - \sa QWidget::x11Info(), QPixmap::x11Info() -*/ - -/*! \fn Qt::HANDLE QPaintDevice::x11AppRootWindow(int screen) - Use QX11Info::appRootWindow() instead. - - \oldcode - unsigned long window = QPaintDevice::x11AppRootWindow(screen); - \newcode - unsigned long window = qApp->x11Info(screen).appRootWindow(); - \endcode - - \sa QWidget::x11Info(), QPixmap::x11Info() -*/ - -/*! \fn bool QPaintDevice::x11AppDefaultColormap(int screen) - Use QX11Info::defaultColormap() instead. - - \oldcode - bool isDefault = QPaintDevice::x11AppDefaultColormap(screen); - \newcode - bool isDefault = qApp->x11Info(screen).defaultColormap(); - \endcode - - \sa QWidget::x11Info(), QPixmap::x11Info() -*/ - -/*! \fn bool QPaintDevice::x11AppDefaultVisual(int screen) - Use QX11Info::defaultVisual() instead. - - \oldcode - bool isDefault = QPaintDevice::x11AppDefaultVisual(screen); - \newcode - bool isDefault = qApp->x11Info(screen).defaultVisual(); - \endcode - - \sa QWidget::x11Info(), QPixmap::x11Info() -*/ - -/*! \fn void QPaintDevice::x11SetAppDpiX(int dpi, int screen) - Use QX11Info::setAppDpiX() instead. -*/ - -/*! \fn void QPaintDevice::x11SetAppDpiY(int dpi, int screen) - Use QX11Info::setAppDpiY() instead. -*/ - -/*! \fn int QPaintDevice::x11AppDpiX(int screen) - Use QX11Info::appDpiX() instead. - - \oldcode - bool isDefault = QPaintDevice::x11AppDpiX(screen); - \newcode - bool isDefault = qApp->x11Info(screen).appDpiX(); - \endcode - - \sa QWidget::x11Info(), QPixmap::x11Info() -*/ - -/*! \fn int QPaintDevice::x11AppDpiY(int screen) - Use QX11Info::appDpiY() instead. - - \oldcode - bool isDefault = QPaintDevice::x11AppDpiY(screen); - \newcode - bool isDefault = qApp->x11Info(screen).appDpiY(); - \endcode - - \sa QWidget::x11Info(), QPixmap::x11Info() -*/ - -/*! \fn HDC QPaintDevice::getDC() const - \internal -*/ - -/*! \fn void QPaintDevice::releaseDC(HDC) const - \internal -*/ - -/*! \fn QWSDisplay *QPaintDevice::qwsDisplay() - \internal -*/ - QT_END_NAMESPACE diff --git a/src/gui/painting/qregion.cpp b/src/gui/painting/qregion.cpp index 3f8e80c13d..9d9534bee9 100644 --- a/src/gui/painting/qregion.cpp +++ b/src/gui/painting/qregion.cpp @@ -622,13 +622,6 @@ QRegion::operator QVariant() const */ /*! - \fn bool QRegion::isNull() const - - Use isEmpty() instead. -*/ - - -/*! \fn void QRegion::translate(int dx, int dy) Translates (moves) the region \a dx along the X axis and \a dy diff --git a/src/gui/util/qvalidator.cpp b/src/gui/util/qvalidator.cpp index 4420163866..fa3493b59a 100644 --- a/src/gui/util/qvalidator.cpp +++ b/src/gui/util/qvalidator.cpp @@ -151,7 +151,7 @@ QT_BEGIN_NAMESPACE */ /*! - \fn void QDoubleValidator::topChanged(int top) + \fn void QDoubleValidator::topChanged(double top) This signal is emitted after the top property changed. @@ -160,7 +160,7 @@ QT_BEGIN_NAMESPACE */ /*! - \fn void QDoubleValidator::bottomChanged(int bottom) + \fn void QDoubleValidator::bottomChanged(double bottom) This signal is emitted after the bottom property changed. diff --git a/src/network/access/qftp.cpp b/src/network/access/qftp.cpp index a7f96fa463..49b7e3f10d 100644 --- a/src/network/access/qftp.cpp +++ b/src/network/access/qftp.cpp @@ -2010,11 +2010,6 @@ qint64 QFtp::bytesAvailable() const return d_func()->pi.dtp.bytesAvailable(); } -/*! \fn qint64 QFtp::readBlock(char *data, quint64 maxlen) - - Use read() instead. -*/ - /*! Reads \a maxlen bytes from the data socket into \a data and returns the number of bytes read. Returns -1 if an error occurred. diff --git a/src/plugins/accessible/widgets/complexwidgets.cpp b/src/plugins/accessible/widgets/complexwidgets.cpp index c193fe863c..b0014e3e75 100644 --- a/src/plugins/accessible/widgets/complexwidgets.cpp +++ b/src/plugins/accessible/widgets/complexwidgets.cpp @@ -1367,7 +1367,6 @@ QHeaderView *QAccessibleHeader::header() const return qobject_cast<QHeaderView*>(object()); } -/*! \reimp */ QRect QAccessibleHeader::rect(int child) const { if (!child) @@ -1382,13 +1381,11 @@ QRect QAccessibleHeader::rect(int child) const : QRect(zero.x(), zero.y() + sectionPos, h->width(), sectionSize); } -/*! \reimp */ int QAccessibleHeader::childCount() const { return header()->count(); } -/*! \reimp */ QString QAccessibleHeader::text(Text t, int child) const { QString str; @@ -1417,13 +1414,11 @@ QString QAccessibleHeader::text(Text t, int child) const return str; } -/*! \reimp */ QAccessible::Role QAccessibleHeader::role(int) const { return (header()->orientation() == Qt::Horizontal) ? ColumnHeader : RowHeader; } -/*! \reimp */ QAccessible::State QAccessibleHeader::state(int child) const { State state = QAccessibleWidget::state(child); @@ -1453,10 +1448,6 @@ QAccessible::State QAccessibleHeader::state(int child) const \ingroup accessibility */ -/*! - \brief Implements a tab button - \internal - */ class QAccessibleTabButton: public QAccessibleInterface, public QAccessibleActionInterface { Q_ACCESSIBLE_OBJECT @@ -1613,14 +1604,12 @@ int QAccessibleTabBar::indexOfChild(const QAccessibleInterface *child) const return 0; } -/*! \reimp */ int QAccessibleTabBar::childCount() const { // tabs + scroll buttons return tabBar()->count() + 2; } -/*! \reimp */ QString QAccessibleTabBar::text(Text t, int child) const { Q_ASSERT(child == 0); @@ -1677,17 +1666,6 @@ QVector<int> QAccessibleTabBar::selection() const */ /*! - \enum QAccessibleComboBox::ComboBoxElements - - \internal - - \value ComboBoxSelf - \value CurrentText - \value OpenList - \value PopupList -*/ - -/*! Constructs a QAccessibleComboBox object for \a w. */ QAccessibleComboBox::QAccessibleComboBox(QWidget *w) @@ -1717,14 +1695,12 @@ QAccessibleInterface* QAccessibleComboBox::child(int index) const return 0; } -/*! \reimp */ int QAccessibleComboBox::childCount() const { // list and text edit return comboBox()->isEditable() ? 2 : 1; } -/*! \reimp */ int QAccessibleComboBox::childAt(int x, int y) const { if (comboBox()->isEditable() && comboBox()->lineEdit()->rect().contains(x, y)) @@ -1732,7 +1708,6 @@ int QAccessibleComboBox::childAt(int x, int y) const return 0; } -/*! \reimp */ int QAccessibleComboBox::indexOfChild(const QAccessibleInterface *child) const { if (comboBox()->view() == child->object()) @@ -1742,7 +1717,6 @@ int QAccessibleComboBox::indexOfChild(const QAccessibleInterface *child) const return -1; } -/*! \reimp */ QString QAccessibleComboBox::text(Text t, int child) const { QString str; @@ -1772,7 +1746,6 @@ QString QAccessibleComboBox::text(Text t, int child) const return str; } -/*! \reimp */ bool QAccessibleComboBox::doAction(int action, int, const QVariantList &) { if (action == DefaultAction || action == Press) { diff --git a/src/plugins/accessible/widgets/qaccessiblewidgets.cpp b/src/plugins/accessible/widgets/qaccessiblewidgets.cpp index 676d140eb0..1849fe1095 100644 --- a/src/plugins/accessible/widgets/qaccessiblewidgets.cpp +++ b/src/plugins/accessible/widgets/qaccessiblewidgets.cpp @@ -262,7 +262,6 @@ QTextEdit *QAccessibleTextEdit::textEdit() const return static_cast<QTextEdit *>(widget()); } -/*! \reimp */ QString QAccessibleTextEdit::text(Text t, int) const { if (t == Value) @@ -271,7 +270,6 @@ QString QAccessibleTextEdit::text(Text t, int) const return QAccessibleWidget::text(t, 0); } -/*! \reimp */ void QAccessibleTextEdit::setText(Text t, int, const QString &text) { if (t != Value) { diff --git a/src/plugins/accessible/widgets/simplewidgets.cpp b/src/plugins/accessible/widgets/simplewidgets.cpp index b8d8a9dbc8..15f2355407 100644 --- a/src/plugins/accessible/widgets/simplewidgets.cpp +++ b/src/plugins/accessible/widgets/simplewidgets.cpp @@ -104,7 +104,6 @@ QAbstractButton *QAccessibleButton::button() const return qobject_cast<QAbstractButton*>(object()); } -/*! \reimp */ QString QAccessibleButton::actionText(int action, Text text, int child) const { Q_ASSERT(child == 0); @@ -135,7 +134,6 @@ QString QAccessibleButton::actionText(int action, Text text, int child) const return QAccessibleWidget::actionText(action, text, child); } -/*! \reimp */ bool QAccessibleButton::doAction(int action, int child, const QVariantList ¶ms) { Q_ASSERT(child == 0); @@ -159,7 +157,6 @@ bool QAccessibleButton::doAction(int action, int child, const QVariantList ¶ return QAccessibleWidget::doAction(action, child, params); } -/*! \reimp */ QString QAccessibleButton::text(Text t, int child) const { Q_ASSERT(child == 0); @@ -189,7 +186,6 @@ QString QAccessibleButton::text(Text t, int child) const return qt_accStripAmp(str); } -/*! \reimp */ QAccessible::State QAccessibleButton::state(int child) const { Q_ASSERT(child == 0); @@ -299,16 +295,6 @@ QStringList QAccessibleButton::keyBindings(int actionIndex) */ /*! - \enum QAccessibleToolButton::ToolButtonElements - - This enum identifies the components of the tool button. - - \value ToolButtonSelf The tool button as a whole. - \value ButtonExecute The button. - \value ButtonDropMenu The drop down menu. -*/ - -/*! Creates a QAccessibleToolButton object for \a w. \a role is propagated to the QAccessibleWidget constructor. */ @@ -336,7 +322,6 @@ bool QAccessibleToolButton::isSplitButton() const #endif } -/*! \reimp */ QAccessible::State QAccessibleToolButton::state(int) const { QAccessible::State st = QAccessibleButton::state(); @@ -349,7 +334,6 @@ QAccessible::State QAccessibleToolButton::state(int) const return st; } -/*! \reimp */ int QAccessibleToolButton::childCount() const { return isSplitButton() ? 1 : 0; @@ -532,7 +516,6 @@ QAccessibleDisplay::QAccessibleDisplay(QWidget *w, Role role) { } -/*! \reimp */ QAccessible::Role QAccessibleDisplay::role(int child) const { Q_ASSERT(child == 0); @@ -556,7 +539,6 @@ QAccessible::Role QAccessibleDisplay::role(int child) const return QAccessibleWidget::role(child); } -/*! \reimp */ QString QAccessibleDisplay::text(Text t, int child) const { Q_ASSERT(child == 0); @@ -596,7 +578,6 @@ QString QAccessibleDisplay::text(Text t, int child) const return qt_accStripAmp(str); } -/*! \reimp */ QAccessible::Relation QAccessibleDisplay::relationTo(int child, const QAccessibleInterface *other, int otherChild) const { @@ -623,7 +604,6 @@ QAccessible::Relation QAccessibleDisplay::relationTo(int child, const QAccessibl return relation; } -/*! \reimp */ int QAccessibleDisplay::navigate(RelationFlag rel, int entry, QAccessibleInterface **target) const { *target = 0; @@ -717,7 +697,6 @@ QLineEdit *QAccessibleLineEdit::lineEdit() const return qobject_cast<QLineEdit*>(object()); } -/*! \reimp */ QString QAccessibleLineEdit::text(Text t, int child) const { Q_ASSERT(child == 0); @@ -735,7 +714,6 @@ QString QAccessibleLineEdit::text(Text t, int child) const return qt_accStripAmp(str); } -/*! \reimp */ void QAccessibleLineEdit::setText(Text t, int control, const QString &text) { if (t != Value || control) { @@ -752,7 +730,6 @@ void QAccessibleLineEdit::setText(Text t, int control, const QString &text) lineEdit()->setText(newText); } -/*! \reimp */ QAccessible::State QAccessibleLineEdit::state(int child) const { Q_ASSERT(child == 0); |