diff options
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/image/qimage.cpp | 207 | ||||
| -rw-r--r-- | src/gui/image/qmovie.cpp | 56 | ||||
| -rw-r--r-- | src/gui/kernel/qplatformcursor_qpa.cpp | 6 | ||||
| -rw-r--r-- | src/gui/kernel/qplatformcursor_qpa.h | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qplatformintegration_qpa.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qscreen.cpp | 2 | ||||
| -rw-r--r-- | src/gui/painting/qbackingstore.cpp | 34 | ||||
| -rw-r--r-- | src/gui/painting/qbrush.cpp | 8 | ||||
| -rw-r--r-- | src/gui/painting/qcolor.cpp | 33 | ||||
| -rw-r--r-- | src/gui/painting/qmatrix.cpp | 20 | ||||
| -rw-r--r-- | src/gui/painting/qplatformbackingstore_qpa.cpp | 32 | ||||
| -rw-r--r-- | src/gui/text/qfontmetrics.cpp | 68 | ||||
| -rw-r--r-- | src/gui/text/qplatformfontdatabase_qpa.cpp | 5 |
13 files changed, 31 insertions, 444 deletions
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index 67facafade..2a6b22c2d1 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -628,23 +628,6 @@ bool QImageData::checkForAlphaPixels() const */ /*! - \enum QImage::Endian - \compat - - This enum type is used to describe the endianness of the CPU and - graphics hardware. It is provided here for compatibility with earlier versions of Qt. - - Use the \l Format enum instead. The \l Format enum specify the - endianess for monchrome formats, but for other formats the - endianess is not relevant. - - \value IgnoreEndian Endianness does not matter. Useful for some - operations that are independent of endianness. - \value BigEndian Most significant bit first or network byte order, as on SPARC, PowerPC, and Motorola CPUs. - \value LittleEndian Least significant bit first or little endian byte order, as on Intel x86. -*/ - -/*! \enum QImage::InvertMode This enum type is used to describe how pixel values should be @@ -999,23 +982,6 @@ QImage::QImage(const char * const xpm[]) #endif // QT_NO_IMAGEFORMAT_XPM /*! - \fn QImage::QImage(const QByteArray &data) - - Use the static fromData() function instead. - - \oldcode - QByteArray data; - ... - QImage image(data); - \newcode - QByteArray data; - ... - QImage image = QImage::fromData(data); - \endcode -*/ - - -/*! Constructs a shallow copy of the given \a image. For more information about shallow copies, see the \l {Implicit @@ -1419,14 +1385,6 @@ QVector<QRgb> QImage::colorTable() const return d ? d->colortable : QVector<QRgb>(); } - -/*! - \obsolete - Returns the number of bytes occupied by the image data. - - \sa byteCount() -*/ - /*! \since 4.6 Returns the number of bytes occupied by the image data. @@ -1619,22 +1577,6 @@ const uchar *QImage::constBits() const } /*! - \fn void QImage::reset() - - Resets all image parameters and deallocates the image data. - - Assign a null image instead. - - \oldcode - QImage image; - image.reset(); - \newcode - QImage image; - image = QImage(); - \endcode -*/ - -/*! \fn void QImage::fill(uint pixelValue) Fills the entire image with the given \a pixelValue. @@ -1825,22 +1767,6 @@ void QImage::invertPixels(InvertMode mode) } } -/*! - \fn void QImage::invertPixels(bool invertAlpha) - - Use the invertPixels() function that takes a QImage::InvertMode - parameter instead. -*/ - -/*! \fn QImage::Endian QImage::systemByteOrder() - - Determines the host computer byte order. Returns - QImage::LittleEndian (LSB first) or QImage::BigEndian (MSB first). - - This function is no longer relevant for QImage. Use QSysInfo - instead. -*/ - // Windows defines these #if defined(write) # undef write @@ -1853,14 +1779,6 @@ void QImage::invertPixels(InvertMode mode) #endif /*! - \obsolete - Resizes the color table to contain \a numColors entries. - - \sa setColorCount() -*/ - - -/*! \since 4.6 Resizes the color table to contain \a colorCount entries. @@ -3889,36 +3807,6 @@ bool QImage::isGrayscale() const return false; } - -/*! - \fn QImage QImage::smoothScale(int width, int height, Qt::AspectRatioMode mode) const - - Use scaled() instead. - - \oldcode - QImage image; - image.smoothScale(width, height, mode); - \newcode - QImage image; - image.scaled(width, height, mode, Qt::SmoothTransformation); - \endcode -*/ - -/*! - \fn QImage QImage::smoothScale(const QSize &size, Qt::AspectRatioMode mode) const - \overload - - Use scaled() instead. - - \oldcode - QImage image; - image.smoothScale(size, mode); - \newcode - QImage image; - image.scaled(size, mode, Qt::SmoothTransformation); - \endcode -*/ - /*! \fn QImage QImage::scaled(int width, int height, Qt::AspectRatioMode aspectRatioMode, Qt::TransformationMode transformMode) const @@ -4276,12 +4164,6 @@ QImage QImage::createMaskFromColor(QRgb color, Qt::MaskMode mode) const */ /*! - \fn QImage QImage::mirror(bool horizontal, bool vertical) const - - Use mirrored() instead. -*/ - -/*! Returns a mirror of the image, mirrored in the horizontal and/or the vertical direction depending on whether \a horizontal and \a vertical are set to true or false. @@ -4397,18 +4279,6 @@ QImage QImage::mirrored(bool horizontal, bool vertical) const } /*! - \fn QImage QImage::swapRGB() const - - Use rgbSwapped() instead. - - \omit - Returns a QImage in which the values of the red and blue - components of all pixels have been swapped, effectively converting - an RGB image to an BGR image. The original QImage is not changed. - \endomit -*/ - -/*! Returns a QImage in which the values of the red and blue components of all pixels have been swapped, effectively converting an RGB image to an BGR image. @@ -5092,29 +4962,6 @@ void QImage::setText(const QString &key, const QString &value) */ /*! - \obsolete - - Returns the language identifiers for which some texts are - recorded. Note that if you want to iterate over the list, you - should iterate over a copy. - - The language the text is recorded in is no longer relevant since - the text is always set using QString and UTF-8 representation. -*/ - -/*! - \obsolete - - Returns a list of QImageTextKeyLang objects that enumerate all the - texts key/language pairs set for this image. - - Use textKeys() instead. - - The language the text is recorded in is no longer relevant since - the text is always set using QString and UTF-8 representation. -*/ - -/*! \fn void QImage::setText(const char* key, const char* language, const QString& text) \obsolete @@ -5150,16 +4997,6 @@ void QImage::setText(const QString &key, const QString &value) Makes a call to QPixmap::convertToImage(). */ -/*! \fn QImage::Endian QImage::systemBitOrder() - - Determines the bit order of the display hardware. Returns - QImage::LittleEndian (LSB first) or QImage::BigEndian (MSB first). - - This function is no longer relevant for QImage. Use QSysInfo - instead. -*/ - - /*! \internal @@ -5404,22 +5241,6 @@ bool qt_xForm_helper(const QTransform &trueMat, int xoffset, int type, int depth #undef IWX_LSB #undef IWX_PIX -/*! - \fn QImage QImage::xForm(const QMatrix &matrix) const - - Use transformed() instead. - - \oldcode - QImage image; - ... - image.xForm(matrix); - \newcode - QImage image; - ... - image.transformed(matrix); - \endcode -*/ - /*! \obsolete Returns a number that identifies the contents of this QImage object. Distinct QImage objects can only have the same @@ -5703,34 +5524,6 @@ int QImage::bitPlaneCount() const return bpc; } -/*! - \fn QImage QImage::copy(const QRect &rect, Qt::ImageConversionFlags flags) const - \compat - - Use copy() instead. -*/ - -/*! - \fn QImage QImage::copy(int x, int y, int w, int h, Qt::ImageConversionFlags flags) const - \compat - - Use copy() instead. -*/ - -/*! - \fn QImage QImage::scaleWidth(int w) const - \compat - - Use scaledToWidth() instead. -*/ - -/*! - \fn QImage QImage::scaleHeight(int h) const - \compat - - Use scaledToHeight() instead. -*/ - static QImage smoothScaled(const QImage &source, int w, int h) { QImage src = source; if (src.format() == QImage::Format_ARGB32) diff --git a/src/gui/image/qmovie.cpp b/src/gui/image/qmovie.cpp index 2a6104dc19..ff00059f51 100644 --- a/src/gui/image/qmovie.cpp +++ b/src/gui/image/qmovie.cpp @@ -754,21 +754,6 @@ QRect QMovie::frameRect() const return d->frameRect; } -/*! \fn QImage QMovie::framePixmap() const - - Use currentPixmap() instead. -*/ - -/*! \fn void QMovie::pause() - - Use setPaused(true) instead. -*/ - -/*! \fn void QMovie::unpause() - - Use setPaused(false) instead. -*/ - /*! Returns the current frame as a QPixmap. @@ -780,11 +765,6 @@ QPixmap QMovie::currentPixmap() const return d->currentPixmap; } -/*! \fn QImage QMovie::frameImage() const - - Use currentImage() instead. -*/ - /*! Returns the current frame as a QImage. @@ -806,42 +786,6 @@ bool QMovie::isValid() const return d->isValid(); } -/*! \fn bool QMovie::running() const - - Use state() instead. -*/ - -/*! \fn bool QMovie::isNull() const - - Use isValid() instead. -*/ - -/*! \fn int QMovie::frameNumber() const - - Use currentFrameNumber() instead. -*/ - -/*! \fn bool QMovie::paused() const - - Use state() instead. -*/ - -/*! \fn bool QMovie::finished() const - - Use state() instead. -*/ - -/*! \fn void QMovie::restart() - - Use stop() and start() instead. -*/ - -/*! - \fn void QMovie::step() - - Use jumpToNextFrame() instead. -*/ - /*! Returns the number of frames in the movie. diff --git a/src/gui/kernel/qplatformcursor_qpa.cpp b/src/gui/kernel/qplatformcursor_qpa.cpp index 56d2847cfb..752de18969 100644 --- a/src/gui/kernel/qplatformcursor_qpa.cpp +++ b/src/gui/kernel/qplatformcursor_qpa.cpp @@ -74,15 +74,15 @@ QList <QWeakPointer<QPlatformCursor> > QPlatformCursorPrivate::instances; */ /*! - \fn virtual void QPlatformCursor::changeCursor(QCursor * widgetCursor, QWidget * widget) + \fn virtual void QPlatformCursor::changeCursor(QCursor * windowCursor, QWindow * window) \brief This method is called by Qt whenever the cursor graphic should be changed. Implementation of this method is mandatory for a subclass of QPlatformCursor. - \a widgetCursor is a pointer to the QCursor that should be displayed. + \a windowCursor is a pointer to the QCursor that should be displayed. - \a widget is a pointer to the widget currently displayed at QCursor::pos(). Note + \a window is a pointer to the window currently displayed at QCursor::pos(). Note that this may be 0 if the current position is not occupied by a displayed widget. \sa QCursor::pos() diff --git a/src/gui/kernel/qplatformcursor_qpa.h b/src/gui/kernel/qplatformcursor_qpa.h index af40c7d1c0..da3c4752a0 100644 --- a/src/gui/kernel/qplatformcursor_qpa.h +++ b/src/gui/kernel/qplatformcursor_qpa.h @@ -85,7 +85,7 @@ public: // input methods virtual void pointerEvent(const QMouseEvent & event) { Q_UNUSED(event); } - virtual void changeCursor(QCursor * widgetCursor, QWindow * widget) = 0; + virtual void changeCursor(QCursor * windowCursor, QWindow * window) = 0; virtual QPoint pos() const; virtual void setPos(const QPoint &pos); diff --git a/src/gui/kernel/qplatformintegration_qpa.cpp b/src/gui/kernel/qplatformintegration_qpa.cpp index 7c72ab43aa..97c2445529 100644 --- a/src/gui/kernel/qplatformintegration_qpa.cpp +++ b/src/gui/kernel/qplatformintegration_qpa.cpp @@ -172,7 +172,7 @@ QPlatformNativeInterface * QPlatformIntegration::nativeInterface() const /*! - \fn QAbstractEventDispatcher *guiThreadEventDispatcher() const = 0 + \fn QAbstractEventDispatcher *QPlatformIntegration::guiThreadEventDispatcher() const = 0 Accessor function for the event dispatcher. The platform plugin should create an instance of the QAbstractEventDispatcher in its constructor and set it diff --git a/src/gui/kernel/qscreen.cpp b/src/gui/kernel/qscreen.cpp index 1f0d2f9fe6..b6cf78c5a6 100644 --- a/src/gui/kernel/qscreen.cpp +++ b/src/gui/kernel/qscreen.cpp @@ -386,7 +386,7 @@ QRect QScreen::mapBetween(Qt::ScreenOrientation a, Qt::ScreenOrientation b, cons } /*! - \fn QScreen::currentOrientationChanged() + \fn QScreen::currentOrientationChanged(Qt::ScreenOrientation orientation) This signal is emitted when the current orientation of the screen changes. The current orientation is a hint to the application saying diff --git a/src/gui/painting/qbackingstore.cpp b/src/gui/painting/qbackingstore.cpp index f69a2e4ff6..fa29589508 100644 --- a/src/gui/painting/qbackingstore.cpp +++ b/src/gui/painting/qbackingstore.cpp @@ -71,29 +71,7 @@ public: \brief The QBackingStore class provides the drawing area for top-level windows. */ - -/*! - \fn void QBackingStore::beginPaint(const QRegion ®ion) - - This function is called before painting onto the surface begins, - with the \a region in which the painting will occur. - - \sa endPaint(), paintDevice() -*/ - /*! - \fn void QBackingStore::endPaint(const QRegion ®ion) - - This function is called after painting onto the surface has ended, - with the \a region in which the painting was performed. - - \sa beginPaint(), paintDevice() -*/ - -/*! - \fn void QBackingStore::flush(QWindow *window, const QRegion ®ion, - const QPoint &offset) - Flushes the given \a region from the specified \a window onto the screen. @@ -142,11 +120,23 @@ QWindow* QBackingStore::window() const return d_ptr->window; } +/*! + This function is called before painting onto the surface begins, + with the \a region in which the painting will occur. + + \sa endPaint(), paintDevice() +*/ + void QBackingStore::beginPaint(const QRegion ®ion) { d_ptr->platformBackingStore->beginPaint(region); } +/*! + This function is called after painting onto the surface has ended. + + \sa beginPaint(), paintDevice() +*/ void QBackingStore::endPaint() { d_ptr->platformBackingStore->endPaint(); diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp index 05f191dac6..d1130a8812 100644 --- a/src/gui/painting/qbrush.cpp +++ b/src/gui/painting/qbrush.cpp @@ -951,14 +951,6 @@ bool QBrush::operator==(const QBrush &b) const } } -/*! - \fn QBrush::operator const QColor&() const - - Returns the brush's color. - - Use color() instead. -*/ - #ifndef QT_NO_DEBUG_STREAM /*! \internal diff --git a/src/gui/painting/qcolor.cpp b/src/gui/painting/qcolor.cpp index 8234fa19f6..df2aa1ffe8 100644 --- a/src/gui/painting/qcolor.cpp +++ b/src/gui/painting/qcolor.cpp @@ -863,13 +863,6 @@ void QColor::getRgb(int *r, int *g, int *b, int *a) const } /*! - \obsolete - \fn void QColor::getRgba(int *r, int *g, int *b, int *a) const - - Use getRgb() instead. -*/ - -/*! \fn void QColor::setRgbF(qreal r, qreal g, qreal b, qreal a) Sets the color channels of this color to \a r (red), \a g (green), @@ -922,13 +915,6 @@ void QColor::setRgb(int r, int g, int b, int a) } /*! - \obsolete - \fn void QColor::setRgba(int r, int g, int b, int a) - - Use setRgb() instead. -*/ - -/*! \fn QRgb QColor::rgba() const Returns the RGB value of the color, including its alpha. @@ -2597,25 +2583,6 @@ QDataStream &operator>>(QDataStream &stream, QColor &color) */ /*! - \fn QColor::QColor(int x, int y, int z, Spec colorSpec) - - Use one of the other QColor constructors, or one of the static convenience - functions, instead. -*/ - -/*! - \fn QColor::rgb(int *r, int *g, int *b) const - - Use getRgb() instead. -*/ - -/*! - \fn QColor::hsv(int *h, int *s, int *v) const - - Use getHsv() instead. -*/ - -/*! \fn QColor QColor::convertTo(Spec colorSpec) const Creates a copy of \e this color in the format specified by \a colorSpec. diff --git a/src/gui/painting/qmatrix.cpp b/src/gui/painting/qmatrix.cpp index 767706a5bc..41278920cb 100644 --- a/src/gui/painting/qmatrix.cpp +++ b/src/gui/painting/qmatrix.cpp @@ -939,14 +939,6 @@ QMatrix &QMatrix::rotate(qreal a) */ /*! - \fn QMatrix QMatrix::invert(bool *invertible) const - - Returns an inverted copy of this matrix. - - Use the inverted() function instead. -*/ - -/*! Returns an inverted copy of this matrix. If the matrix is singular (not invertible), the returned matrix is @@ -1166,18 +1158,6 @@ QDebug operator<<(QDebug dbg, const QMatrix &m) #endif /*! - \fn QRect QMatrix::map(const QRect &rect) const - \compat - - Creates and returns a QRect object that is a copy of the given - rectangle, mapped into the coordinate system defined by this - matrix. - - Use the mapRect() function instead. -*/ - - -/*! \fn bool qFuzzyCompare(const QMatrix& m1, const QMatrix& m2) \relates QMatrix diff --git a/src/gui/painting/qplatformbackingstore_qpa.cpp b/src/gui/painting/qplatformbackingstore_qpa.cpp index fa85661f31..2c0053af86 100644 --- a/src/gui/painting/qplatformbackingstore_qpa.cpp +++ b/src/gui/painting/qplatformbackingstore_qpa.cpp @@ -69,25 +69,6 @@ public: windows. */ - -/*! - \fn void QPlatformBackingStore::beginPaint(const QRegion ®ion) - - This function is called before painting onto the surface begins, - with the \a region in which the painting will occur. - - \sa endPaint(), paintDevice() -*/ - -/*! - \fn void QPlatformBackingStore::endPaint(const QRegion ®ion) - - This function is called after painting onto the surface has ended, - with the \a region in which the painting was performed. - - \sa beginPaint(), paintDevice() -*/ - /*! \fn void QPlatformBackingStore::flush(QWindow *window, const QRegion ®ion, const QPoint &offset) @@ -129,10 +110,23 @@ QWindow* QPlatformBackingStore::window() const return d_ptr->window; } +/*! + This function is called before painting onto the surface begins, + with the \a region in which the painting will occur. + + \sa endPaint(), paintDevice() +*/ + void QPlatformBackingStore::beginPaint(const QRegion &) { } +/*! + This function is called after painting onto the surface has ended. + + \sa beginPaint(), paintDevice() +*/ + void QPlatformBackingStore::endPaint() { } diff --git a/src/gui/text/qfontmetrics.cpp b/src/gui/text/qfontmetrics.cpp index 012e9f300b..1d80e316fd 100644 --- a/src/gui/text/qfontmetrics.cpp +++ b/src/gui/text/qfontmetrics.cpp @@ -228,18 +228,6 @@ bool QFontMetrics::operator ==(const QFontMetrics &other) const } /*! - \fn bool QFontMetrics::operator!=(const QFontMetrics &other) - - Returns true if \a other is not equal to this object; otherwise returns false. - - Two font metrics are considered equal if they were constructed - from the same QFont and the paint devices they were constructed - for are considered compatible. - - \sa operator==() -*/ - -/*! \fn bool QFontMetrics::operator !=(const QFontMetrics &other) const Returns true if \a other is not equal to this object; otherwise returns false. @@ -1099,15 +1087,6 @@ bool QFontMetricsF::operator ==(const QFontMetricsF &other) const } /*! - \fn bool QFontMetricsF::operator!=(const QFontMetricsF &other) - - Returns true if the font metrics are not equal to the \a other font - metrics; otherwise returns false. - - \sa operator==() -*/ - -/*! \fn bool QFontMetricsF::operator !=(const QFontMetricsF &other) const \overload @@ -1725,51 +1704,4 @@ qreal QFontMetricsF::lineWidth() const return engine->lineThickness().toReal(); } -/*! - \fn QSize QFontMetrics::size(int flags, const QString &text, int len, - int tabStops, int *tabArray) const - \compat - - Use the size() function in combination with QString::left() - instead. - - \oldcode - QSize size = size(flags, str, len, tabstops, tabarray); - \newcode - QSize size = size(flags, str.left(len), tabstops, tabarray); - \endcode -*/ - -/*! - \fn QRect QFontMetrics::boundingRect(int x, int y, int w, int h, int flags, - const QString& text, int len, int tabStops, int *tabArray) const - \compat - - Use the boundingRect() function in combination with - QString::left() and a QRect constructor instead. - - \oldcode - QRect rect = boundingRect(x, y, w, h , flags, text, len, - tabStops, tabArray); - \newcode - QRect rect = boundingRect(QRect(x, y, w, h), flags, text.left(len), - tabstops, tabarray); - \endcode - -*/ - -/*! - \fn QRect QFontMetrics::boundingRect(const QString &text, int len) const - \compat - - Use the boundingRect() function in combination with - QString::left() instead. - - \oldcode - QRect rect = boundingRect(text, len); - \newcode - QRect rect = boundingRect(text.left(len)); - \endcode -*/ - QT_END_NAMESPACE diff --git a/src/gui/text/qplatformfontdatabase_qpa.cpp b/src/gui/text/qplatformfontdatabase_qpa.cpp index 89bc05985d..80ad31cea3 100644 --- a/src/gui/text/qplatformfontdatabase_qpa.cpp +++ b/src/gui/text/qplatformfontdatabase_qpa.cpp @@ -97,11 +97,6 @@ void QPlatformFontDatabase::registerQPF2Font(const QByteArray &dataArray, void * } /*! - \fn void QPlatformFontDatabase::registerFont(const QString &familyName, - const QString &foundryName, QFont::Weight weight, QFont::Style style, - QFont::Stretch stretch, bool antialiased, bool scalable, int pixelSize, - const QSupportedWritingSystems &writingSystems, void *usrPtr) - Registers a font with the given set of attributes describing the font's foundry, family name, style and stretch information, pixel size, and supported writing systems. Additional information about whether the font |