Multimedia: Compile on Windows.

MSVC is more strict about #include <> and #include "".

Reviewed-by: Ling Hu <ling.hu@nokia.com>

Change-Id: I8973d7b2717d892407ad93785f92a64b05bdb6b5
Reviewed-on: http://codereview.qt-project.org/6134
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

25 files changed, 60 insertions, 58 deletions

diff --git a/src/imports/multimedia/qdeclarativecamera_p.h b/src/imports/multimedia/qdeclarativecamera_p.h
index a96dd6e67..7004f7e58 100644
--- a/src/imports/multimedia/qdeclarativecamera_p.h
+++ b/src/imports/multimedia/qdeclarativecamera_p.h
@@ -53,16 +53,17 @@
 // We mean it.
 //
 
-#include <QtCore/qbasictimer.h>
-#include <QtCore/qdatetime.h>
-#include <QtDeclarative/qdeclarative.h>
-#include <QtDeclarative/qdeclarativeparserstatus.h>
+#include "qdeclarativecameracapture_p.h"
+#include "qdeclarativecamerarecorder_p.h"
 
 #include <qcamera.h>
 #include <qcameraimageprocessing.h>
 #include <qcameraimagecapture.h>
-#include <qdeclarativecameracapture_p.h>
-#include <qdeclarativecamerarecorder_p.h>
+
+#include <QtCore/qbasictimer.h>
+#include <QtCore/qdatetime.h>
+#include <QtDeclarative/qdeclarative.h>
+#include <QtDeclarative/qdeclarativeparserstatus.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/imports/multimedia/qdeclarativecameracapture_p.h b/src/imports/multimedia/qdeclarativecameracapture_p.h
index ec464a098..6effa74e2 100644
--- a/src/imports/multimedia/qdeclarativecameracapture_p.h
+++ b/src/imports/multimedia/qdeclarativecameracapture_p.h
@@ -57,6 +57,8 @@
 #include <qcameraimagecapture.h>
 #include <qmediaencodersettings.h>
 
+#include <QtDeclarative/qdeclarative.h>
+
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
diff --git a/src/imports/multimedia/qdeclarativecameraexposure_p.h b/src/imports/multimedia/qdeclarativecameraexposure_p.h
index d4411ad54..677d963c3 100644
--- a/src/imports/multimedia/qdeclarativecameraexposure_p.h
+++ b/src/imports/multimedia/qdeclarativecameraexposure_p.h
@@ -53,9 +53,9 @@
 // We mean it.
 //
 
+#include "qdeclarativecamera_p.h"
 #include <qcamera.h>
 #include <qcameraexposure.h>
-#include <qdeclarativecamera_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/multimedia/qcamera.cpp b/src/multimedia/qcamera.cpp
index 2b187262b..fd1fe5b3c 100644
--- a/src/multimedia/qcamera.cpp
+++ b/src/multimedia/qcamera.cpp
@@ -39,11 +39,10 @@
 **
 ****************************************************************************/
 
-#include <QDebug>
+#include "qvideosurfaceoutput_p.h"
+#include "qmediaobject_p.h"
 
 #include <qcamera.h>
-
-#include <qmediaobject_p.h>
 #include <qcameracontrol.h>
 #include <qcameralockscontrol.h>
 #include <qcameraexposurecontrol.h>
@@ -52,7 +51,8 @@
 #include <qcameraimageprocessingcontrol.h>
 #include <qcameraimagecapturecontrol.h>
 #include <qvideodevicecontrol.h>
-#include <qvideosurfaceoutput_p.h>
+
+#include <QDebug>
 
 QT_USE_NAMESPACE
 
diff --git a/src/multimedia/qcameraexposure.cpp b/src/multimedia/qcameraexposure.cpp
index 580b1cad9..5c75ad9e2 100644
--- a/src/multimedia/qcameraexposure.cpp
+++ b/src/multimedia/qcameraexposure.cpp
@@ -39,15 +39,15 @@
 **
 ****************************************************************************/
 
-#include <QDebug>
+#include "qcameraexposure.h"
+#include "qmediaobject_p.h"
 
-#include <qcameraexposure.h>
 #include <qcamera.h>
-
-#include <qmediaobject_p.h>
 #include <qcameraexposurecontrol.h>
 #include <qcameraflashcontrol.h>
-#include <qmetaobject.h>
+
+#include <QtCore/QMetaObject>
+#include <QtCore/QDebug>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/multimedia/qcamerafocus.cpp b/src/multimedia/qcamerafocus.cpp
index 22a0bbcc9..9b9caed9e 100644
--- a/src/multimedia/qcamerafocus.cpp
+++ b/src/multimedia/qcamerafocus.cpp
@@ -39,12 +39,10 @@
 **
 ****************************************************************************/
 
-#include <QDebug>
+#include "qcamerafocus.h"
+#include "qmediaobject_p.h"
 
 #include <qcamera.h>
-#include <qcamerafocus.h>
-
-#include <qmediaobject_p.h>
 #include <qcameracontrol.h>
 #include <qcameraexposurecontrol.h>
 #include <qcamerafocuscontrol.h>
@@ -52,6 +50,8 @@
 #include <qcameraimagecapturecontrol.h>
 #include <qvideodevicecontrol.h>
 
+#include <QtCore/QDebug>
+
 QT_BEGIN_NAMESPACE
 
 namespace
diff --git a/src/multimedia/qcameraimagecapture.cpp b/src/multimedia/qcameraimagecapture.cpp
index 6b399b684..f49531e20 100644
--- a/src/multimedia/qcameraimagecapture.cpp
+++ b/src/multimedia/qcameraimagecapture.cpp
@@ -45,7 +45,7 @@
 #include <qcameracapturebufferformatcontrol.h>
 
 #include <qimageencodercontrol.h>
-#include <qmediaobject_p.h>
+#include "qmediaobject_p.h"
 #include <qmediaservice.h>
 #include <qcamera.h>
 #include <qcameracontrol.h>
diff --git a/src/multimedia/qcameraimageprocessing.cpp b/src/multimedia/qcameraimageprocessing.cpp
index 600dfd885..4286afcd1 100644
--- a/src/multimedia/qcameraimageprocessing.cpp
+++ b/src/multimedia/qcameraimageprocessing.cpp
@@ -39,11 +39,9 @@
 **
 ****************************************************************************/
 
-#include <QDebug>
+#include "qcameraimageprocessing.h"
+#include "qmediaobject_p.h"
 
-#include <qcameraimageprocessing.h>
-
-#include <qmediaobject_p.h>
 #include <qcameracontrol.h>
 #include <qcameraexposurecontrol.h>
 #include <qcamerafocuscontrol.h>
@@ -52,6 +50,8 @@
 #include <qcameraimagecapturecontrol.h>
 #include <qvideodevicecontrol.h>
 
+#include <QtCore/QDebug>
+
 QT_BEGIN_NAMESPACE
 
 /*!
diff --git a/src/multimedia/qmediaimageviewer.cpp b/src/multimedia/qmediaimageviewer.cpp
index 01265dc2f..9a9a65695 100644
--- a/src/multimedia/qmediaimageviewer.cpp
+++ b/src/multimedia/qmediaimageviewer.cpp
@@ -48,7 +48,7 @@
 #include <qmediaplaylistsourcecontrol.h>
 #include <qmediacontent.h>
 #include <qmediaresource.h>
-#include <qvideosurfaceoutput_p.h>
+#include "qvideosurfaceoutput_p.h"
 
 #include <QtCore/qcoreevent.h>
 #include <QtCore/qdatetime.h>
diff --git a/src/multimedia/qmediaimageviewerservice.cpp b/src/multimedia/qmediaimageviewerservice.cpp
index 65de7a81b..94c6d2eef 100644
--- a/src/multimedia/qmediaimageviewerservice.cpp
+++ b/src/multimedia/qmediaimageviewerservice.cpp
@@ -46,7 +46,7 @@
 
 #include <qmediacontent.h>
 #include <qmediaresource.h>
-#include <qmediaobject_p.h>
+#include "qmediaobject_p.h"
 #include <qvideorenderercontrol.h>
 
 #include <QtCore/qdebug.h>
diff --git a/src/multimedia/qmediaplayer.cpp b/src/multimedia/qmediaplayer.cpp
index 5d5a7a7a3..312122d56 100644
--- a/src/multimedia/qmediaplayer.cpp
+++ b/src/multimedia/qmediaplayer.cpp
@@ -39,25 +39,25 @@
 **
 ****************************************************************************/
 
-#include <QtCore/qcoreevent.h>
-#include <QtCore/qmetaobject.h>
-#include <QtCore/qtimer.h>
-#include <QtCore/qdebug.h>
-#include <QtCore/qpointer.h>
-
-
 #include "qmediaplayer.h"
+#include "qvideosurfaceoutput_p.h"
 
-#include <qmediaobject_p.h>
+#include "qmediaobject_p.h"
 #include <qmediaservice.h>
 #include <qmediaplayercontrol.h>
 #include <qmediaserviceprovider.h>
 #include <qmediaplaylist.h>
 #include <qmediaplaylistcontrol.h>
 #include <qmediaplaylistsourcecontrol.h>
-#include <qvideosurfaceoutput_p.h>
+
 #include <qmedianetworkaccesscontrol.h>
 
+#include <QtCore/qcoreevent.h>
+#include <QtCore/qmetaobject.h>
+#include <QtCore/qtimer.h>
+#include <QtCore/qdebug.h>
+#include <QtCore/qpointer.h>
+
 QT_BEGIN_NAMESPACE
 
 /*!
diff --git a/src/multimedia/qmediaplaylistsourcecontrol.cpp b/src/multimedia/qmediaplaylistsourcecontrol.cpp
index ca90feda2..2ab8aee2c 100644
--- a/src/multimedia/qmediaplaylistsourcecontrol.cpp
+++ b/src/multimedia/qmediaplaylistsourcecontrol.cpp
@@ -40,8 +40,8 @@
 ****************************************************************************/
 
 
-#include <qmediaplaylistsourcecontrol.h>
-#include <qmediacontrol_p.h>
+#include "qmediaplaylistsourcecontrol.h"
+#include "qmediacontrol_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/multimedia/qmediarecorder.cpp b/src/multimedia/qmediarecorder.cpp
index bcbae5708..6be462df8 100644
--- a/src/multimedia/qmediarecorder.cpp
+++ b/src/multimedia/qmediarecorder.cpp
@@ -42,7 +42,7 @@
 #include "qmediarecorder.h"
 
 #include <qmediarecordercontrol.h>
-#include <qmediaobject_p.h>
+#include "qmediaobject_p.h"
 #include <qmediaservice.h>
 #include <qmediaserviceprovider.h>
 #include <qmetadatawritercontrol.h>
diff --git a/src/multimedia/qmetadatareadercontrol.cpp b/src/multimedia/qmetadatareadercontrol.cpp
index a15cf6d7e..63dd375b0 100644
--- a/src/multimedia/qmetadatareadercontrol.cpp
+++ b/src/multimedia/qmetadatareadercontrol.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <qmediacontrol_p.h>
+#include "qmediacontrol_p.h"
 #include <qmetadatareadercontrol.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/multimedia/qmetadatawritercontrol.cpp b/src/multimedia/qmetadatawritercontrol.cpp
index 0888bcfae..9d01662d7 100644
--- a/src/multimedia/qmetadatawritercontrol.cpp
+++ b/src/multimedia/qmetadatawritercontrol.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <qmediacontrol_p.h>
+#include "qmediacontrol_p.h"
 #include <qmetadatawritercontrol.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/multimediawidgets/qcameraviewfinder.cpp b/src/multimediawidgets/qcameraviewfinder.cpp
index 1d3f18549..91a90830d 100644
--- a/src/multimediawidgets/qcameraviewfinder.cpp
+++ b/src/multimediawidgets/qcameraviewfinder.cpp
@@ -39,14 +39,14 @@
 **
 ****************************************************************************/
 
-#include <QDebug>
-
-#include <private/qmediaobject_p.h>
+#include "qcameraviewfinder.h"
+#include "qvideowidget_p.h"
 
 #include <qcamera.h>
-#include <qcameraviewfinder.h>
-#include <qvideowidget_p.h>
 #include <qvideodevicecontrol.h>
+#include <private/qmediaobject_p.h>
+
+#include <QtCore/QDebug>
 
 QT_USE_NAMESPACE
 
diff --git a/src/multimediawidgets/qcameraviewfinder.h b/src/multimediawidgets/qcameraviewfinder.h
index 4ac39ebb9..f1ab3f29e 100644
--- a/src/multimediawidgets/qcameraviewfinder.h
+++ b/src/multimediawidgets/qcameraviewfinder.h
@@ -65,7 +65,7 @@ QT_MODULE(Multimedia)
 class QCamera;
 
 class QCameraViewfinderPrivate;
-class Q_MULTIMEDIA_EXPORT QCameraViewfinder : public QVideoWidget
+class Q_MULTIMEDIAWIDGETS_EXPORT QCameraViewfinder : public QVideoWidget
 {
     Q_OBJECT
 public:
diff --git a/src/multimediawidgets/qgraphicsvideoitem.cpp b/src/multimediawidgets/qgraphicsvideoitem.cpp
index 120a24f26..c92fb1ef5 100644
--- a/src/multimediawidgets/qgraphicsvideoitem.cpp
+++ b/src/multimediawidgets/qgraphicsvideoitem.cpp
@@ -40,17 +40,16 @@
 ****************************************************************************/
 
 #include "qgraphicsvideoitem.h"
+#include "qpaintervideosurface_p.h"
 
 #include <qmediaobject.h>
 #include <qmediaservice.h>
-#include <qpaintervideosurface_p.h>
 #include <qvideorenderercontrol.h>
+#include <qvideosurfaceformat.h>
 
 #include <QtCore/qcoreevent.h>
 #include <QtCore/qpointer.h>
 
-#include <qvideosurfaceformat.h>
-
 #if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_1_CL) && !defined(QT_OPENGL_ES_1)
 #include <QtOpenGL/qgl.h>
 #endif
diff --git a/src/multimediawidgets/qgraphicsvideoitem.h b/src/multimediawidgets/qgraphicsvideoitem.h
index cf8913417..c92d42d31 100644
--- a/src/multimediawidgets/qgraphicsvideoitem.h
+++ b/src/multimediawidgets/qgraphicsvideoitem.h
@@ -59,7 +59,7 @@ QT_END_NAMESPACE
 QT_BEGIN_NAMESPACE
 
 class QGraphicsVideoItemPrivate;
-class Q_MULTIMEDIA_EXPORT QGraphicsVideoItem : public QGraphicsObject, public QMediaBindableInterface
+class Q_MULTIMEDIAWIDGETS_EXPORT QGraphicsVideoItem : public QGraphicsObject, public QMediaBindableInterface
 {
     Q_OBJECT
     Q_INTERFACES(QMediaBindableInterface)
diff --git a/src/multimediawidgets/qpaintervideosurface.cpp b/src/multimediawidgets/qpaintervideosurface.cpp
index bd82f7841..8c31dd5d9 100644
--- a/src/multimediawidgets/qpaintervideosurface.cpp
+++ b/src/multimediawidgets/qpaintervideosurface.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include <qpaintervideosurface_p.h>
-#include <qpaintervideosurface_mac_p.h>
+#include "qpaintervideosurface_p.h"
+#include "qpaintervideosurface_mac_p.h"
 
 #include <qmath.h>
 
diff --git a/src/multimediawidgets/qtmultimediawidgetdefs.h b/src/multimediawidgets/qtmultimediawidgetdefs.h
index 57ce226a1..0816d472a 100644
--- a/src/multimediawidgets/qtmultimediawidgetdefs.h
+++ b/src/multimediawidgets/qtmultimediawidgetdefs.h
@@ -65,7 +65,7 @@ QT_BEGIN_HEADER
 #    if defined(QT_DLL)
 #      undef QT_DLL
 #    endif
-#    if defined(QT_BUILD_MULTIMEDIA_LIB)
+#    if defined(QT_BUILD_MULTIMEDIAWIDGETS_LIB)
 #        define Q_MULTIMEDIAWIDGETS_EXPORT Q_DECL_EXPORT
 #    else
 #        define Q_MULTIMEDIAWIDGETS_EXPORT Q_DECL_IMPORT
diff --git a/src/multimediawidgets/qvideowidget.cpp b/src/multimediawidgets/qvideowidget.cpp
index f31144cb0..919ed1fac 100644
--- a/src/multimediawidgets/qvideowidget.cpp
+++ b/src/multimediawidgets/qvideowidget.cpp
@@ -40,13 +40,13 @@
 ****************************************************************************/
 
 #include "qvideowidget_p.h"
+#include "qpaintervideosurface_p.h"
 
 #include <qmediaobject.h>
 #include <qmediaservice.h>
 #include <qvideowindowcontrol.h>
 #include <qvideowidgetcontrol.h>
 
-#include <qpaintervideosurface_p.h>
 #include <qvideorenderercontrol.h>
 #include <qvideosurfaceformat.h>
 #include <qpainter.h>
diff --git a/src/multimediawidgets/qvideowidget.h b/src/multimediawidgets/qvideowidget.h
index c4c6f8d3f..b9d2cfed6 100644
--- a/src/multimediawidgets/qvideowidget.h
+++ b/src/multimediawidgets/qvideowidget.h
@@ -57,7 +57,7 @@ QT_MODULE(Multimedia)
 class QMediaObject;
 
 class QVideoWidgetPrivate;
-class Q_MULTIMEDIA_EXPORT QVideoWidget : public QWidget, public QMediaBindableInterface
+class Q_MULTIMEDIAWIDGETS_EXPORT QVideoWidget : public QWidget, public QMediaBindableInterface
 {
     Q_OBJECT
     Q_INTERFACES(QMediaBindableInterface)
diff --git a/src/multimediawidgets/qvideowidgetcontrol.h b/src/multimediawidgets/qvideowidgetcontrol.h
index c5ac880fa..41a02ddfd 100644
--- a/src/multimediawidgets/qvideowidgetcontrol.h
+++ b/src/multimediawidgets/qvideowidgetcontrol.h
@@ -56,7 +56,7 @@ QT_MODULE(Multimedia)
 
 class QVideoWidgetControlPrivate;
 
-class Q_MULTIMEDIA_EXPORT QVideoWidgetControl : public QMediaControl
+class Q_MULTIMEDIAWIDGETS_EXPORT QVideoWidgetControl : public QMediaControl
 {
     Q_OBJECT
 
diff --git a/src/multimediawidgets/qvideowindowcontrol.h b/src/multimediawidgets/qvideowindowcontrol.h
index 590ce64be..f8e1c6378 100644
--- a/src/multimediawidgets/qvideowindowcontrol.h
+++ b/src/multimediawidgets/qvideowindowcontrol.h
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Multimedia)
 
 
-class Q_MULTIMEDIA_EXPORT QVideoWindowControl : public QMediaControl
+class Q_MULTIMEDIAWIDGETS_EXPORT QVideoWindowControl : public QMediaControl
 {
     Q_OBJECT