slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

QtMultimedia: Fix deprecation warnings.

Browse Source 
Use QVariant::canConvert instead qVariantCanConvert.

Change-Id: I3c924a0bb508a451623da250fb9d410cf70a91f0
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Friedemann Kleint
2012-04-30 15:05:31 +02:00
committed by Qt by Nokia
parent 641474ab10
commit 4be845d092
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/multimedia/video/qvideosurfaceformat.cpp
View File

@@ -535,7 +535,7 @@ void QVideoSurfaceFormat::setProperty(const char *name, const QVariant &value)
} else if (qstrcmp(name, "pixelFormat") == 0) { } else if (qstrcmp(name, "pixelFormat") == 0) {
// read only. // read only.
} else if (qstrcmp(name, "frameSize") == 0) { } else if (qstrcmp(name, "frameSize") == 0) {
if (qVariantCanConvert<QSize>(value)) { if (value.canConvert<QSize>()) {
d->frameSize = qvariant_cast<QSize>(value); d->frameSize = qvariant_cast<QSize>(value);
d->viewport = QRect(QPoint(0, 0), d->frameSize); d->viewport = QRect(QPoint(0, 0), d->frameSize);
} }
@@ -544,21 +544,21 @@ void QVideoSurfaceFormat::setProperty(const char *name, const QVariant &value)
} else if (qstrcmp(name, "frameHeight") == 0) { } else if (qstrcmp(name, "frameHeight") == 0) {
// read only. // read only.
} else if (qstrcmp(name, "viewport") == 0) { } else if (qstrcmp(name, "viewport") == 0) {
if (qVariantCanConvert<QRect>(value)) if (value.canConvert<QRect>())
d->viewport = qvariant_cast<QRect>(value); d->viewport = qvariant_cast<QRect>(value);
} else if (qstrcmp(name, "scanLineDirection") == 0) { } else if (qstrcmp(name, "scanLineDirection") == 0) {
if (qVariantCanConvert<Direction>(value)) if (value.canConvert<Direction>())
d->scanLineDirection = qvariant_cast<Direction>(value); d->scanLineDirection = qvariant_cast<Direction>(value);
} else if (qstrcmp(name, "frameRate") == 0) { } else if (qstrcmp(name, "frameRate") == 0) {
if (qVariantCanConvert<qreal>(value)) if (value.canConvert<qreal>())
d->frameRate = qvariant_cast<qreal>(value); d->frameRate = qvariant_cast<qreal>(value);
} else if (qstrcmp(name, "pixelAspectRatio") == 0) { } else if (qstrcmp(name, "pixelAspectRatio") == 0) {
if (qVariantCanConvert<QSize>(value)) if (value.canConvert<QSize>())
d->pixelAspectRatio = qvariant_cast<QSize>(value); d->pixelAspectRatio = qvariant_cast<QSize>(value);
} else if (qstrcmp(name, "sizeHint") == 0) { } else if (qstrcmp(name, "sizeHint") == 0) {
// read only. // read only.
} else if (qstrcmp(name, "yCbCrColorSpace") == 0) { } else if (qstrcmp(name, "yCbCrColorSpace") == 0) {
if (qVariantCanConvert<YCbCrColorSpace>(value)) if (value.canConvert<YCbCrColorSpace>())
d->ycbcrColorSpace = qvariant_cast<YCbCrColorSpace>(value); d->ycbcrColorSpace = qvariant_cast<YCbCrColorSpace>(value);
} else { } else {
int id = 0; int id = 0;