From 7507c80524e486c22242928b99b9e6340464a617 Mon Sep 17 00:00:00 2001 From: Michael Goddard Date: Mon, 5 Sep 2011 11:24:06 +1000 Subject: 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 Reviewed-by: Jonas Rabbe --- src/plugins/fakeradio/fakeradioserviceplugin.cpp | 3 +++ src/plugins/gstreamer/gstvideoconnector.c | 4 ++++ src/plugins/gstreamer/mediaplayer/qgstappsrc.cpp | 3 +++ src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp | 5 ++++- src/plugins/gstreamer/qgstcodecsinfo.cpp | 3 ++- src/plugins/pulseaudio/qaudioinput_pulse.cpp | 2 +- 6 files changed, 17 insertions(+), 3 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/fakeradio/fakeradioserviceplugin.cpp b/src/plugins/fakeradio/fakeradioserviceplugin.cpp index 805941022..d4881195c 100644 --- a/src/plugins/fakeradio/fakeradioserviceplugin.cpp +++ b/src/plugins/fakeradio/fakeradioserviceplugin.cpp @@ -71,11 +71,14 @@ void FakeRadioServicePlugin::release(QMediaService *service) QList FakeRadioServicePlugin::devices(const QByteArray &service) const { + Q_UNUSED(service); return QList(); } QString FakeRadioServicePlugin::deviceDescription(const QByteArray &service, const QByteArray &device) { + Q_UNUSED(service); + Q_UNUSED(device); return QString(); } diff --git a/src/plugins/gstreamer/gstvideoconnector.c b/src/plugins/gstreamer/gstvideoconnector.c index c3f969fa5..d5b56c7c9 100644 --- a/src/plugins/gstreamer/gstvideoconnector.c +++ b/src/plugins/gstreamer/gstvideoconnector.c @@ -131,6 +131,7 @@ static void gst_video_connector_init (GstVideoConnector *element, GstVideoConnectorClass *g_class) { + (void) g_class; element->sinkpad = gst_pad_new_from_static_template (&gst_video_connector_sink_factory, "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) { + (void) pad; + (void) buffer; + GstVideoConnector *element = GST_VIDEO_CONNECTOR (object); /* diff --git a/src/plugins/gstreamer/mediaplayer/qgstappsrc.cpp b/src/plugins/gstreamer/mediaplayer/qgstappsrc.cpp index ba36f560b..dc1f21ea2 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstappsrc.cpp +++ b/src/plugins/gstreamer/mediaplayer/qgstappsrc.cpp @@ -182,6 +182,7 @@ bool QGstAppSrc::doSeek(qint64 value) gboolean QGstAppSrc::on_seek_data(GstAppSrc *element, guint64 arg0, gpointer userdata) { + Q_UNUSED(element); QGstAppSrc *self = reinterpret_cast(userdata); if (self && self->isStreamValid()) { 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) { + Q_UNUSED(element); QGstAppSrc *self = reinterpret_cast(userdata); if (self) 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) { + Q_UNUSED(element); QGstAppSrc *self = reinterpret_cast(userdata); if (self) { self->dataRequested() = true; diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp index 9e4e8bc69..d3d582332 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp +++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp @@ -103,8 +103,8 @@ QGstreamerPlayerSession::QGstreamerPlayerSession(QObject *parent) m_lastPosition(0), m_duration(-1), m_durationQueries(0), - m_everPlayed(false) , m_sourceType(UnknownSrc), + m_everPlayed(false), m_isLiveSource(false) { #ifdef USE_PLAYBIN2 @@ -195,6 +195,9 @@ GstElement *QGstreamerPlayerSession::playbin() const #if defined(HAVE_GST_APPSRC) void QGstreamerPlayerSession::configureAppSrcElement(GObject* object, GObject *orig, GParamSpec *pspec, QGstreamerPlayerSession* self) { + Q_UNUSED(object); + Q_UNUSED(pspec); + if (self->appsrc()->isReady()) return; diff --git a/src/plugins/gstreamer/qgstcodecsinfo.cpp b/src/plugins/gstreamer/qgstcodecsinfo.cpp index f823281d5..34c18a18a 100644 --- a/src/plugins/gstreamer/qgstcodecsinfo.cpp +++ b/src/plugins/gstreamer/qgstcodecsinfo.cpp @@ -93,7 +93,8 @@ QGstCodecsInfo::QGstCodecsInfo(QGstCodecsInfo::ElementType elementType) gst_caps_remove_structure(caps, 0); } - +#else + Q_UNUSED(elementType); #endif // GST_CHECK_VERSION(0,10,31) } diff --git a/src/plugins/pulseaudio/qaudioinput_pulse.cpp b/src/plugins/pulseaudio/qaudioinput_pulse.cpp index d528cb106..d2ee31679 100644 --- a/src/plugins/pulseaudio/qaudioinput_pulse.cpp +++ b/src/plugins/pulseaudio/qaudioinput_pulse.cpp @@ -359,7 +359,7 @@ qint64 QPulseAudioInput::read(char *data, qint64 len) emit stateChanged(m_deviceState); } - size_t readBytes = 0; + int readBytes = 0; if (!m_pullMode && !m_tempBuffer.isEmpty()) { readBytes = qMin(static_cast(len), m_tempBuffer.size()); -- cgit v1.2.3