From f56a36d771bb71fe6d0f7025ae427a76a1d22324 Mon Sep 17 00:00:00 2001
From: Nicholas Young <nicholas.young@nokia.com>
Date: Tue, 23 Feb 2010 13:32:23 +1000
Subject: Added QNetworkRequest constructor to QMediaContent.

Now consistent with QMediaResource.

Reviewed-by: Dmytro Poplavskiy
---
 src/multimedia/base/qmediacontent.cpp          | 13 +++++++++++++
 src/multimedia/base/qmediacontent.h            |  2 ++
 tests/auto/qmediacontent/tst_qmediacontent.cpp | 13 +++++++++++++
 3 files changed, 28 insertions(+)

diff --git a/src/multimedia/base/qmediacontent.cpp b/src/multimedia/base/qmediacontent.cpp
index 3e32af0..fd519c6 100644
--- a/src/multimedia/base/qmediacontent.cpp
+++ b/src/multimedia/base/qmediacontent.cpp
@@ -109,6 +109,19 @@ QMediaContent::QMediaContent(const QUrl &url):
 }
 
 /*!
+    Constructs a media content with \a request providing a reference to the content.
+
+    This constructor can be used to reference media content via network protocols such as HTTP.
+    This may include additional information required to obtain the resource, such as Cookies or HTTP headers.
+*/
+
+QMediaContent::QMediaContent(const QNetworkRequest &request):
+    d(new QMediaContentPrivate)
+{
+    d->resources << QMediaResource(request);
+}
+
+/*!
     Constructs a media content with \a resource providing a reference to the content.
 */
 
diff --git a/src/multimedia/base/qmediacontent.h b/src/multimedia/base/qmediacontent.h
index 1ea4898..b6f3017 100644
--- a/src/multimedia/base/qmediacontent.h
+++ b/src/multimedia/base/qmediacontent.h
@@ -46,6 +46,7 @@
 #include <QtCore/qshareddata.h>
 
 #include <QtMultimedia/qmediaresource.h>
+#include <QtNetwork/qnetworkrequest.h>
 
 
 QT_BEGIN_HEADER
@@ -60,6 +61,7 @@ class Q_MULTIMEDIA_EXPORT QMediaContent
 public:
     QMediaContent();
     QMediaContent(const QUrl &contentUrl);
+    QMediaContent(const QNetworkRequest &contentRequest);
     QMediaContent(const QMediaResource &contentResource);
     QMediaContent(const QMediaResourceList &resources);
     QMediaContent(const QMediaContent &other);
diff --git a/tests/auto/qmediacontent/tst_qmediacontent.cpp b/tests/auto/qmediacontent/tst_qmediacontent.cpp
index 35dd0a9..8987241 100644
--- a/tests/auto/qmediacontent/tst_qmediacontent.cpp
+++ b/tests/auto/qmediacontent/tst_qmediacontent.cpp
@@ -51,6 +51,7 @@ class tst_QMediaContent : public QObject
 private slots:
     void testNull();
     void testUrlCtor();
+    void testRequestCtor();
     void testResourceCtor();
     void testResourceListCtor();
     void testCopy();
@@ -77,6 +78,18 @@ void tst_QMediaContent::testUrlCtor()
     QCOMPARE(media.canonicalResource().url(), QUrl("http://example.com/movie.mov"));
 }
 
+void tst_QMediaContent::testRequestCtor()
+{
+    QNetworkRequest request(QUrl("http://example.com/movie.mov"));
+    request.setAttribute(QNetworkRequest::User, QVariant(1234));
+
+    QMediaContent media(request);
+
+    QCOMPARE(media.canonicalUrl(), QUrl("http://example.com/movie.mov"));
+    QCOMPARE(media.canonicalResource().request(), request);
+    QCOMPARE(media.canonicalResource().url(), QUrl("http://example.com/movie.mov"));
+}
+
 void tst_QMediaContent::testResourceCtor()
 {
     QMediaContent media(QMediaResource(QUrl("http://example.com/movie.mov")));
-- 
cgit v0.12