From 2f29860320796ad6f94f51daf6af84515c288ec8 Mon Sep 17 00:00:00 2001
From: Kurt Korbatits <kurt.korbatits@nokia.com>
Date: Tue, 16 Feb 2010 12:33:05 +1000
Subject: Fixed compile error in pulseaudio soundeffect implementation

---
 src/multimedia/qml/qsoundeffect_pulse_p.cpp | 4 ++--
 src/multimedia/qml/qsoundeffect_pulse_p.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/multimedia/qml/qsoundeffect_pulse_p.cpp b/src/multimedia/qml/qsoundeffect_pulse_p.cpp
index 6d7b222..b1e5982 100644
--- a/src/multimedia/qml/qsoundeffect_pulse_p.cpp
+++ b/src/multimedia/qml/qsoundeffect_pulse_p.cpp
@@ -151,7 +151,7 @@ private:
         m_mainLoopApi = pa_threaded_mainloop_get_api(m_mainLoop);
 
         lock();
-        m_context = pa_context_new(m_mainLoopApi, QString("QtPulseAudio:%1").arg(::getpid()).toAscii().constData());
+        m_context = pa_context_new(m_mainLoopApi, QString(QLatin1String("QtPulseAudio:%1")).arg(::getpid()).toAscii().constData());
 
 #if(Q_WS_MAEMO_5)
         pa_context_set_state_callback(m_context, context_state_callback, this);
@@ -362,7 +362,7 @@ void QSoundEffectPrivate::decoderReady()
     }
 
     if (m_name.isNull())
-        m_name = QString("QtPulseSample-%1-%2").arg(::getpid()).arg(int(this)).toUtf8();
+        m_name = QString(QLatin1String("QtPulseSample-%1-%2")).arg(::getpid()).arg(int(this)).toUtf8();
 
     pa_sample_spec spec = audioFormatToSampleSpec(m_waveDecoder->audioFormat());
 
diff --git a/src/multimedia/qml/qsoundeffect_pulse_p.h b/src/multimedia/qml/qsoundeffect_pulse_p.h
index 155d7fc..58a05d2 100644
--- a/src/multimedia/qml/qsoundeffect_pulse_p.h
+++ b/src/multimedia/qml/qsoundeffect_pulse_p.h
@@ -57,7 +57,7 @@
 #include "qsoundeffect_p.h"
 
 #include <QtCore/qobject.h>
-#include <QtCore/qtime.h>
+#include <QtCore/qdatetime.h>
 #include <QtMultimedia/qmediaplayer.h>
 #include <pulse/pulseaudio.h>
 
-- 
cgit v0.12