diff -r 3b7506f63335 -r f3d2589f22d6 qtms/src/qtmsclientsourceimpl.cpp
--- a/qtms/src/qtmsclientsourceimpl.cpp	Wed Jun 16 16:05:08 2010 +0100
+++ b/qtms/src/qtmsclientsourceimpl.cpp	Thu Jul 22 16:38:21 2010 +0100
@@ -16,6 +16,7 @@
  */
 
 #include <qtms.h>
+#include <qtmsbuffer.h>
 #include <tmsbuffer.h>
 #include <tmsclientsource.h>
 #include "qtmsclientsourceimpl.h"
@@ -32,8 +33,7 @@
     RemoveObserver(*this);
     }
 
-gint QTMSClientSourceImpl::Create(QTMSSource*& qsource,
-        TMS::TMSSource*& tmssource)
+gint QTMSClientSourceImpl::Create(QTMSSource*& qsource, TMSSource*& tmssource)
     {
     gint ret(QTMS_RESULT_INSUFFICIENT_MEMORY);
     QTMSClientSourceImpl* self = new QTMSClientSourceImpl();
@@ -70,7 +70,8 @@
     return ret;
     }
 
-gint QTMSClientSourceImpl::RemoveObserver(TMS::TMSClientSourceObserver& obsrvr)
+gint QTMSClientSourceImpl::RemoveObserver(
+        TMS::TMSClientSourceObserver& obsrvr)
     {
     gint ret(QTMS_RESULT_UNINITIALIZED_OBJECT);
     if (iSource)
@@ -94,13 +95,15 @@
 
 void QTMSClientSourceImpl::FillBuffer(TMS::TMSBuffer& buffer)
     {
-    emit QTMS::QTMSClientSource::FillBuffer(buffer);
+    emit QTMSClientSource::FillBuffer(reinterpret_cast<QTMSBuffer&> (buffer));
     }
 
 void QTMSClientSourceImpl::BufferProcessed(const TMS::TMSBuffer* buffer,
         gint reason)
     {
-    emit QTMS::QTMSClientSource::BufferProcessed(buffer, reason);
+    TMSBuffer* buf(const_cast<TMSBuffer*> (buffer));
+    emit QTMSClientSource::BufferProcessed(
+            reinterpret_cast<QTMSBuffer*> (buf), reason);
     }
 
 // End of file