diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2011-09-05 11:24:06 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-05 04:53:14 +0200 |
| commit | 7507c80524e486c22242928b99b9e6340464a617 (patch) | |
| tree | a312b0970fe60e2fe8f5cd1b488de499584e8dbe /src/multimediakit/effects | |
| parent | 123ffbd783b3ab8d0b8d4576bd7ee9cffe242d1d (diff) | |
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>
Diffstat (limited to 'src/multimediakit/effects')
| -rw-r--r-- | src/multimediakit/effects/qsamplecache_p.cpp | 10 | ||||
| -rw-r--r-- | src/multimediakit/effects/qsoundeffect_pulse_p.cpp | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/multimediakit/effects/qsamplecache_p.cpp b/src/multimediakit/effects/qsamplecache_p.cpp index da550e8ae..1610a4382 100644 --- a/src/multimediakit/effects/qsamplecache_p.cpp +++ b/src/multimediakit/effects/qsamplecache_p.cpp @@ -297,7 +297,7 @@ void QSample::addRef() // Called in loading thread void QSample::readSample() { - Q_ASSERT(QThread::currentThread()->objectName() == "QSampleCache::LoadingThread"); + Q_ASSERT(QThread::currentThread()->objectName() == QLatin1String("QSampleCache::LoadingThread")); QMutexLocker m(&m_mutex); #ifdef QT_SAMPLECACHE_DEBUG qDebug() << "QSample: readSample"; @@ -316,7 +316,7 @@ void QSample::readSample() // Called in loading thread void QSample::decoderReady() { - Q_ASSERT(QThread::currentThread()->objectName() == "QSampleCache::LoadingThread"); + Q_ASSERT(QThread::currentThread()->objectName() == QLatin1String("QSampleCache::LoadingThread")); QMutexLocker m(&m_mutex); #ifdef QT_SAMPLECACHE_DEBUG qDebug() << "QSample: decoder ready"; @@ -343,7 +343,7 @@ QSample::State QSample::state() const // Essentially a second ctor, doesn't need locks (?) void QSample::load() { - Q_ASSERT(QThread::currentThread()->objectName() == "QSampleCache::LoadingThread"); + Q_ASSERT(QThread::currentThread()->objectName() == QLatin1String("QSampleCache::LoadingThread")); #ifdef QT_SAMPLECACHE_DEBUG qDebug() << "QSample: load [" << m_url << "]"; #endif @@ -358,7 +358,7 @@ void QSample::load() // Called in loading thread void QSample::decoderError() { - Q_ASSERT(QThread::currentThread()->objectName() == "QSampleCache::LoadingThread"); + Q_ASSERT(QThread::currentThread()->objectName() == QLatin1String("QSampleCache::LoadingThread")); QMutexLocker m(&m_mutex); #ifdef QT_SAMPLECACHE_DEBUG qDebug() << "QSample: decoder error"; @@ -371,7 +371,7 @@ void QSample::decoderError() // Called in loading thread from decoder when sample is done. Locked already. void QSample::onReady() { - Q_ASSERT(QThread::currentThread()->objectName() == "QSampleCache::LoadingThread"); + Q_ASSERT(QThread::currentThread()->objectName() == QLatin1String("QSampleCache::LoadingThread")); #ifdef QT_SAMPLECACHE_DEBUG qDebug() << "QSample: load ready"; #endif diff --git a/src/multimediakit/effects/qsoundeffect_pulse_p.cpp b/src/multimediakit/effects/qsoundeffect_pulse_p.cpp index f65fd9995..4570f8fd5 100644 --- a/src/multimediakit/effects/qsoundeffect_pulse_p.cpp +++ b/src/multimediakit/effects/qsoundeffect_pulse_p.cpp @@ -359,6 +359,8 @@ void QSoundEffectPrivate::setSource(const QUrl &url) case QSample::Error: decoderError(); break; + default: + break; } } |