diff -r 2b40d63a9c3d -r 90517678cc4f qtmobility/plugins/multimedia/symbian/camera/s60mediacontainercontrol.h
--- a/qtmobility/plugins/multimedia/symbian/camera/s60mediacontainercontrol.h	Fri Apr 16 15:51:22 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +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$
-**
-****************************************************************************/
-
-#ifndef S60MEDIAFORMATCONTROL_H
-#define S60MEDIAFORMATCONTROL_H
-
-#include "QMediaContainerControl"
-#include <QtCore/qstringlist.h>
-#include <QMap>
-
-QTM_USE_NAMESPACE
-
-class S60CameraSession;
-
-class S60MediaContainerControl : public QMediaContainerControl
-{
-Q_OBJECT
-public:
-    S60MediaContainerControl(QObject *parent = 0);
-    S60MediaContainerControl(QObject *session, QObject *parent = 0);
-    virtual ~S60MediaContainerControl() {};
-
-    QStringList supportedContainers() const;
-    QString containerMimeType() const;
-    void setContainerMimeType(const QString &containerMimeType);
-
-    QString containerDescription(const QString &containerMimeType) const;
-
-private:
-    S60CameraSession* m_session;
-
-    QString m_containerMimeType;
-    QStringList m_supportedContainers;
-    QMap<QString, QString> m_containerDescriptions;
-};
-
-#endif // S60MEDIAFORMATCONTROL_H