diff -r 2b40d63a9c3d -r 90517678cc4f qtmobility/plugins/multimedia/symbian/s60mediaserviceplugin.cpp
--- a/qtmobility/plugins/multimedia/symbian/s60mediaserviceplugin.cpp	Fri Apr 16 15:51:22 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,140 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtCore/qstring.h>
-#include <QtCore/qdebug.h>
-
-#include "s60mediaserviceplugin.h"
-#if defined(TUNERLIBUSED) || defined(RADIOUTILITYLIBUSED) 
-#include "s60radiotunerservice.h"
-#endif
-#ifdef HAS_MEDIA_PLAYER
-#include "s60mediaplayerservice.h"
-#endif
-#include "s60audiocaptureservice.h"
-#ifdef QMEDIA_SYMBIAN_CAMERA
-#include "s60cameraservice.h"
-#endif
-
-
-QStringList S60MediaServicePlugin::keys() const
-{
-    QStringList list;
-#if defined(TUNERLIBUSED) || defined(RADIOUTILITYLIBUSED)
-    list << QLatin1String(Q_MEDIASERVICE_RADIO);
-#endif
-#ifdef QMEDIA_SYMBIAN_CAMERA
-    list << QLatin1String(Q_MEDIASERVICE_CAMERA);
-#endif
-#ifdef HAS_MEDIA_PLAYER  
-    list << QLatin1String(Q_MEDIASERVICE_MEDIAPLAYER);
-#endif
-    list << QLatin1String(Q_MEDIASERVICE_AUDIOSOURCE);
-    return list;
-}
-
-QMediaService* S60MediaServicePlugin::create(QString const& key)
-{
-#ifdef QMEDIA_SYMBIAN_CAMERA
-    if (key == QLatin1String(Q_MEDIASERVICE_CAMERA))
-        return new S60CameraService;
-#endif
-#ifdef HAS_MEDIA_PLAYER
-    if (key == QLatin1String(Q_MEDIASERVICE_MEDIAPLAYER))
-        return new S60MediaPlayerService;
-#endif
-    if (key == QLatin1String(Q_MEDIASERVICE_AUDIOSOURCE))
-        return new S60AudioCaptureService;
-    
-#if defined(TUNERLIBUSED) || defined(RADIOUTILITYLIBUSED) 
-    if (key == QLatin1String(Q_MEDIASERVICE_RADIO)) 
-        return new S60RadioTunerService;
-#endif
-    
-    return 0;
-}
-
-void S60MediaServicePlugin::release(QMediaService *service)
-{
-    delete service;
-}
-
-QList<QByteArray> S60MediaServicePlugin::devices(const QByteArray &service) const
-{
-#ifdef QMEDIA_SYMBIAN_CAMERA
-    if (service == Q_MEDIASERVICE_CAMERA) {
-        if (m_cameraDevices.isEmpty())
-            updateDevices();
-
-        return m_cameraDevices;
-    }
-#endif
-    return QList<QByteArray>();
-}
-
-QString S60MediaServicePlugin::deviceDescription(const QByteArray &service, const QByteArray &device)
-{
-#ifdef QMEDIA_SYMBIAN_CAMERA
-    if (service == Q_MEDIASERVICE_CAMERA) {
-        if (m_cameraDevices.isEmpty())
-            updateDevices();
-
-        for (int i=0; i<m_cameraDevices.count(); i++)
-            if (m_cameraDevices[i] == device)
-                return m_cameraDescriptions[i];
-    }
-#endif
-    return QString();
-}
-
-void S60MediaServicePlugin::updateDevices() const
-{
-#ifdef QMEDIA_SYMBIAN_CAMERA
-    m_cameraDevices.clear();
-    m_cameraDescriptions.clear();
-    for (int i=0; i < S60CameraService::deviceCount(); i ++) {
-        m_cameraDevices.append(S60CameraService::deviceName(i).toUtf8());
-        m_cameraDescriptions.append(S60CameraService::deviceDescription(i));
-    }
-#endif
-}
-
-Q_EXPORT_PLUGIN2(QtMobilityMultimediaEngine, S60MediaServicePlugin);