Fix some compiler warnings.

Mostly about deprecated ASCII casts.

Change-Id: I70428913799c15f20a1a5f80be57848e1072e058
Reviewed-on: http://codereview.qt.nokia.com/4158
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
Michael Goddard
2011-09-05 11:24:06 +10:00
committed by Qt by Nokia
parent 123ffbd783
commit 7507c80524
12 changed files with 32 additions and 15 deletions

View File

@@ -83,6 +83,7 @@ public:
void initializeEngine(QDeclarativeEngine *engine, const char *uri) void initializeEngine(QDeclarativeEngine *engine, const char *uri)
{ {
Q_UNUSED(uri); Q_UNUSED(uri);
Q_UNUSED(engine);
#if 0 #if 0
engine->addImageProvider("camera", new QDeclarativeCameraPreviewProvider); engine->addImageProvider("camera", new QDeclarativeCameraPreviewProvider);
#endif #endif

View File

@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
QAudioPluginLoader::QAudioPluginLoader(const char *iid, const QString &location, Qt::CaseSensitivity): QAudioPluginLoader::QAudioPluginLoader(const char *iid, const QString &location, Qt::CaseSensitivity):
m_iid(iid) m_iid(iid)
{ {
m_location = location + "/"; m_location = location + QLatin1Char('/');
load(); load();
} }

View File

@@ -297,7 +297,7 @@ void QSample::addRef()
// Called in loading thread // Called in loading thread
void QSample::readSample() void QSample::readSample()
{ {
Q_ASSERT(QThread::currentThread()->objectName() == "QSampleCache::LoadingThread"); Q_ASSERT(QThread::currentThread()->objectName() == QLatin1String("QSampleCache::LoadingThread"));
QMutexLocker m(&m_mutex); QMutexLocker m(&m_mutex);
#ifdef QT_SAMPLECACHE_DEBUG #ifdef QT_SAMPLECACHE_DEBUG
qDebug() << "QSample: readSample"; qDebug() << "QSample: readSample";
@@ -316,7 +316,7 @@ void QSample::readSample()
// Called in loading thread // Called in loading thread
void QSample::decoderReady() void QSample::decoderReady()
{ {
Q_ASSERT(QThread::currentThread()->objectName() == "QSampleCache::LoadingThread"); Q_ASSERT(QThread::currentThread()->objectName() == QLatin1String("QSampleCache::LoadingThread"));
QMutexLocker m(&m_mutex); QMutexLocker m(&m_mutex);
#ifdef QT_SAMPLECACHE_DEBUG #ifdef QT_SAMPLECACHE_DEBUG
qDebug() << "QSample: decoder ready"; qDebug() << "QSample: decoder ready";
@@ -343,7 +343,7 @@ QSample::State QSample::state() const
// Essentially a second ctor, doesn't need locks (?) // Essentially a second ctor, doesn't need locks (?)
void QSample::load() void QSample::load()
{ {
Q_ASSERT(QThread::currentThread()->objectName() == "QSampleCache::LoadingThread"); Q_ASSERT(QThread::currentThread()->objectName() == QLatin1String("QSampleCache::LoadingThread"));
#ifdef QT_SAMPLECACHE_DEBUG #ifdef QT_SAMPLECACHE_DEBUG
qDebug() << "QSample: load [" << m_url << "]"; qDebug() << "QSample: load [" << m_url << "]";
#endif #endif
@@ -358,7 +358,7 @@ void QSample::load()
// Called in loading thread // Called in loading thread
void QSample::decoderError() void QSample::decoderError()
{ {
Q_ASSERT(QThread::currentThread()->objectName() == "QSampleCache::LoadingThread"); Q_ASSERT(QThread::currentThread()->objectName() == QLatin1String("QSampleCache::LoadingThread"));
QMutexLocker m(&m_mutex); QMutexLocker m(&m_mutex);
#ifdef QT_SAMPLECACHE_DEBUG #ifdef QT_SAMPLECACHE_DEBUG
qDebug() << "QSample: decoder error"; qDebug() << "QSample: decoder error";
@@ -371,7 +371,7 @@ void QSample::decoderError()
// Called in loading thread from decoder when sample is done. Locked already. // Called in loading thread from decoder when sample is done. Locked already.
void QSample::onReady() void QSample::onReady()
{ {
Q_ASSERT(QThread::currentThread()->objectName() == "QSampleCache::LoadingThread"); Q_ASSERT(QThread::currentThread()->objectName() == QLatin1String("QSampleCache::LoadingThread"));
#ifdef QT_SAMPLECACHE_DEBUG #ifdef QT_SAMPLECACHE_DEBUG
qDebug() << "QSample: load ready"; qDebug() << "QSample: load ready";
#endif #endif

View File

@@ -359,6 +359,8 @@ void QSoundEffectPrivate::setSource(const QUrl &url)
case QSample::Error: case QSample::Error:
decoderError(); decoderError();
break; break;
default:
break;
} }
} }

View File

@@ -363,7 +363,7 @@ QCamera::QCamera(const QByteArray& device, QObject *parent):
if (d->service != 0) { if (d->service != 0) {
//pass device name to service //pass device name to service
if (d->deviceControl) { if (d->deviceControl) {
QString deviceName(device); QString deviceName = QString::fromLatin1(device);
for (int i=0; i<d->deviceControl->deviceCount(); i++) { for (int i=0; i<d->deviceControl->deviceCount(); i++) {
if (d->deviceControl->deviceName(i) == deviceName) { if (d->deviceControl->deviceName(i) == deviceName) {

View File

@@ -292,7 +292,7 @@ class QPluginServiceProvider : public QMediaServiceProvider
public: public:
QMediaService* requestService(const QByteArray &type, const QMediaServiceProviderHint &hint) QMediaService* requestService(const QByteArray &type, const QMediaServiceProviderHint &hint)
{ {
QString key(type); QString key(QLatin1String(type.constData()));
QList<QMediaServiceProviderPlugin *>plugins; QList<QMediaServiceProviderPlugin *>plugins;
foreach (QObject *obj, loader()->instances(key)) { foreach (QObject *obj, loader()->instances(key)) {
@@ -407,7 +407,7 @@ public:
const QStringList& codecs, const QStringList& codecs,
int flags) const int flags) const
{ {
QList<QObject*> instances = loader()->instances(serviceType); QList<QObject*> instances = loader()->instances(QLatin1String(serviceType));
if (instances.isEmpty()) if (instances.isEmpty())
return QtMultimediaKit::NotSupported; return QtMultimediaKit::NotSupported;
@@ -459,7 +459,7 @@ public:
QStringList supportedMimeTypes(const QByteArray &serviceType, int flags) const QStringList supportedMimeTypes(const QByteArray &serviceType, int flags) const
{ {
QList<QObject*> instances = loader()->instances(serviceType); QList<QObject*> instances = loader()->instances(QLatin1String(serviceType));
QStringList supportedTypes; QStringList supportedTypes;
@@ -508,7 +508,7 @@ public:
{ {
QList<QByteArray> res; QList<QByteArray> res;
foreach(QObject *obj, loader()->instances(serviceType)) { foreach (QObject *obj, loader()->instances(QLatin1String(serviceType))) {
QMediaServiceSupportedDevicesInterface *iface = QMediaServiceSupportedDevicesInterface *iface =
qobject_cast<QMediaServiceSupportedDevicesInterface*>(obj); qobject_cast<QMediaServiceSupportedDevicesInterface*>(obj);
@@ -522,7 +522,7 @@ public:
QString deviceDescription(const QByteArray &serviceType, const QByteArray &device) QString deviceDescription(const QByteArray &serviceType, const QByteArray &device)
{ {
foreach(QObject *obj, loader()->instances(serviceType)) { foreach (QObject *obj, loader()->instances(QLatin1String(serviceType))) {
QMediaServiceSupportedDevicesInterface *iface = QMediaServiceSupportedDevicesInterface *iface =
qobject_cast<QMediaServiceSupportedDevicesInterface*>(obj); qobject_cast<QMediaServiceSupportedDevicesInterface*>(obj);

View File

@@ -71,11 +71,14 @@ void FakeRadioServicePlugin::release(QMediaService *service)
QList<QByteArray> FakeRadioServicePlugin::devices(const QByteArray &service) const QList<QByteArray> FakeRadioServicePlugin::devices(const QByteArray &service) const
{ {
Q_UNUSED(service);
return QList<QByteArray>(); return QList<QByteArray>();
} }
QString FakeRadioServicePlugin::deviceDescription(const QByteArray &service, const QByteArray &device) QString FakeRadioServicePlugin::deviceDescription(const QByteArray &service, const QByteArray &device)
{ {
Q_UNUSED(service);
Q_UNUSED(device);
return QString(); return QString();
} }

View File

@@ -131,6 +131,7 @@ static void
gst_video_connector_init (GstVideoConnector *element, gst_video_connector_init (GstVideoConnector *element,
GstVideoConnectorClass *g_class) GstVideoConnectorClass *g_class)
{ {
(void) g_class;
element->sinkpad = element->sinkpad =
gst_pad_new_from_static_template (&gst_video_connector_sink_factory, gst_pad_new_from_static_template (&gst_video_connector_sink_factory,
"sink"); "sink");
@@ -269,6 +270,9 @@ gst_video_connector_resend_new_segment(GstElement * element, gboolean emitFailed
static gboolean gst_video_connector_new_buffer_probe(GstObject *pad, GstBuffer *buffer, guint * object) static gboolean gst_video_connector_new_buffer_probe(GstObject *pad, GstBuffer *buffer, guint * object)
{ {
(void) pad;
(void) buffer;
GstVideoConnector *element = GST_VIDEO_CONNECTOR (object); GstVideoConnector *element = GST_VIDEO_CONNECTOR (object);
/* /*

View File

@@ -182,6 +182,7 @@ bool QGstAppSrc::doSeek(qint64 value)
gboolean QGstAppSrc::on_seek_data(GstAppSrc *element, guint64 arg0, gpointer userdata) gboolean QGstAppSrc::on_seek_data(GstAppSrc *element, guint64 arg0, gpointer userdata)
{ {
Q_UNUSED(element);
QGstAppSrc *self = reinterpret_cast<QGstAppSrc*>(userdata); QGstAppSrc *self = reinterpret_cast<QGstAppSrc*>(userdata);
if (self && self->isStreamValid()) { if (self && self->isStreamValid()) {
if (!self->stream()->isSequential()) if (!self->stream()->isSequential())
@@ -195,6 +196,7 @@ gboolean QGstAppSrc::on_seek_data(GstAppSrc *element, guint64 arg0, gpointer use
void QGstAppSrc::on_enough_data(GstAppSrc *element, gpointer userdata) void QGstAppSrc::on_enough_data(GstAppSrc *element, gpointer userdata)
{ {
Q_UNUSED(element);
QGstAppSrc *self = reinterpret_cast<QGstAppSrc*>(userdata); QGstAppSrc *self = reinterpret_cast<QGstAppSrc*>(userdata);
if (self) if (self)
self->enoughData() = true; self->enoughData() = true;
@@ -202,6 +204,7 @@ void QGstAppSrc::on_enough_data(GstAppSrc *element, gpointer userdata)
void QGstAppSrc::on_need_data(GstAppSrc *element, guint arg0, gpointer userdata) void QGstAppSrc::on_need_data(GstAppSrc *element, guint arg0, gpointer userdata)
{ {
Q_UNUSED(element);
QGstAppSrc *self = reinterpret_cast<QGstAppSrc*>(userdata); QGstAppSrc *self = reinterpret_cast<QGstAppSrc*>(userdata);
if (self) { if (self) {
self->dataRequested() = true; self->dataRequested() = true;

View File

@@ -103,8 +103,8 @@ QGstreamerPlayerSession::QGstreamerPlayerSession(QObject *parent)
m_lastPosition(0), m_lastPosition(0),
m_duration(-1), m_duration(-1),
m_durationQueries(0), m_durationQueries(0),
m_everPlayed(false) ,
m_sourceType(UnknownSrc), m_sourceType(UnknownSrc),
m_everPlayed(false),
m_isLiveSource(false) m_isLiveSource(false)
{ {
#ifdef USE_PLAYBIN2 #ifdef USE_PLAYBIN2
@@ -195,6 +195,9 @@ GstElement *QGstreamerPlayerSession::playbin() const
#if defined(HAVE_GST_APPSRC) #if defined(HAVE_GST_APPSRC)
void QGstreamerPlayerSession::configureAppSrcElement(GObject* object, GObject *orig, GParamSpec *pspec, QGstreamerPlayerSession* self) void QGstreamerPlayerSession::configureAppSrcElement(GObject* object, GObject *orig, GParamSpec *pspec, QGstreamerPlayerSession* self)
{ {
Q_UNUSED(object);
Q_UNUSED(pspec);
if (self->appsrc()->isReady()) if (self->appsrc()->isReady())
return; return;

View File

@@ -93,7 +93,8 @@ QGstCodecsInfo::QGstCodecsInfo(QGstCodecsInfo::ElementType elementType)
gst_caps_remove_structure(caps, 0); gst_caps_remove_structure(caps, 0);
} }
#else
Q_UNUSED(elementType);
#endif // GST_CHECK_VERSION(0,10,31) #endif // GST_CHECK_VERSION(0,10,31)
} }

View File

@@ -359,7 +359,7 @@ qint64 QPulseAudioInput::read(char *data, qint64 len)
emit stateChanged(m_deviceState); emit stateChanged(m_deviceState);
} }
size_t readBytes = 0; int readBytes = 0;
if (!m_pullMode && !m_tempBuffer.isEmpty()) { if (!m_pullMode && !m_tempBuffer.isEmpty()) {
readBytes = qMin(static_cast<int>(len), m_tempBuffer.size()); readBytes = qMin(static_cast<int>(len), m_tempBuffer.size());