Reduce the usage of QAbstractVideoBufferPrivate.

Move the handle type to the base class (since it's always needed) and
don't allocate the private class in the default paths.

Change-Id: I870a315310ce740f07b1d43cedecfce21feae505
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>

src/multimedia/video/qabstractvideobuffer.cpp

@@ -122,11 +122,9 @@ namespace
     Constructs an abstract video buffer of the given \a type.
 */
 QAbstractVideoBuffer::QAbstractVideoBuffer(HandleType type)
-    : d_ptr(new QAbstractVideoBufferPrivate)
+    : d_ptr(0)
+    , m_type(type)
 {
-    Q_D(QAbstractVideoBuffer);
-
-    d->handleType = type;
 }
 
 /*!
@@ -134,10 +132,8 @@ QAbstractVideoBuffer::QAbstractVideoBuffer(HandleType type)
 */
 QAbstractVideoBuffer::QAbstractVideoBuffer(QAbstractVideoBufferPrivate &dd, HandleType type)
     : d_ptr(&dd)
+    , m_type(type)
 {
-    Q_D(QAbstractVideoBuffer);
-
-    d->handleType = type;
 }
 
 /*!
@@ -168,7 +164,7 @@ void QAbstractVideoBuffer::release()
 */
 QAbstractVideoBuffer::HandleType QAbstractVideoBuffer::handleType() const
 {
-    return d_func()->handleType;
+    return m_type;
 }
 
 /*!

src/multimedia/video/qabstractvideobuffer.h

@@ -96,7 +96,8 @@ public:
 protected:
     QAbstractVideoBuffer(QAbstractVideoBufferPrivate &dd, HandleType type);
 
-    QAbstractVideoBufferPrivate *d_ptr;
+    QAbstractVideoBufferPrivate *d_ptr;  // For expansion, not used currently
+    HandleType m_type;
 
 private:
     Q_DECLARE_PRIVATE(QAbstractVideoBuffer)

src/multimedia/video/qabstractvideobuffer_p.h

@@ -66,18 +66,14 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Multimedia)
 
-
 class QAbstractVideoBufferPrivate
 {
 public:
     QAbstractVideoBufferPrivate()
-        : handleType(QAbstractVideoBuffer::NoHandle)
     {}
 
     virtual ~QAbstractVideoBufferPrivate()
     {}
-
-    QAbstractVideoBuffer::HandleType handleType;
 };
 
 QT_END_NAMESPACE