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>
// 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
#include <qcameraimagecapture.h>
#include <qmediaencodersettings.h>
+#include <QtDeclarative/qdeclarative.h>
+
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
// We mean it.
//
+#include "qdeclarativecamera_p.h"
#include <qcamera.h>
#include <qcameraexposure.h>
-#include <qdeclarativecamera_p.h>
QT_BEGIN_HEADER
**
****************************************************************************/
-#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>
#include <qcameraimageprocessingcontrol.h>
#include <qcameraimagecapturecontrol.h>
#include <qvideodevicecontrol.h>
-#include <qvideosurfaceoutput_p.h>
+
+#include <QDebug>
QT_USE_NAMESPACE
**
****************************************************************************/
-#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
**
****************************************************************************/
-#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>
#include <qcameraimagecapturecontrol.h>
#include <qvideodevicecontrol.h>
+#include <QtCore/QDebug>
+
QT_BEGIN_NAMESPACE
namespace
#include <qcameracapturebufferformatcontrol.h>
#include <qimageencodercontrol.h>
-#include <qmediaobject_p.h>
+#include "qmediaobject_p.h"
#include <qmediaservice.h>
#include <qcamera.h>
#include <qcameracontrol.h>
**
****************************************************************************/
-#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>
#include <qcameraimagecapturecontrol.h>
#include <qvideodevicecontrol.h>
+#include <QtCore/QDebug>
+
QT_BEGIN_NAMESPACE
/*!
#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>
#include <qmediacontent.h>
#include <qmediaresource.h>
-#include <qmediaobject_p.h>
+#include "qmediaobject_p.h"
#include <qvideorenderercontrol.h>
#include <QtCore/qdebug.h>
**
****************************************************************************/
-#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
/*!
****************************************************************************/
-#include <qmediaplaylistsourcecontrol.h>
-#include <qmediacontrol_p.h>
+#include "qmediaplaylistsourcecontrol.h"
+#include "qmediacontrol_p.h"
QT_BEGIN_NAMESPACE
#include "qmediarecorder.h"
#include <qmediarecordercontrol.h>
-#include <qmediaobject_p.h>
+#include "qmediaobject_p.h"
#include <qmediaservice.h>
#include <qmediaserviceprovider.h>
#include <qmetadatawritercontrol.h>
**
****************************************************************************/
-#include <qmediacontrol_p.h>
+#include "qmediacontrol_p.h"
#include <qmetadatareadercontrol.h>
QT_BEGIN_NAMESPACE
**
****************************************************************************/
-#include <qmediacontrol_p.h>
+#include "qmediacontrol_p.h"
#include <qmetadatawritercontrol.h>
QT_BEGIN_NAMESPACE
**
****************************************************************************/
-#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
class QCamera;
class QCameraViewfinderPrivate;
-class Q_MULTIMEDIA_EXPORT QCameraViewfinder : public QVideoWidget
+class Q_MULTIMEDIAWIDGETS_EXPORT QCameraViewfinder : public QVideoWidget
{
Q_OBJECT
public:
****************************************************************************/
#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
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)
**
****************************************************************************/
-#include <qpaintervideosurface_p.h>
-#include <qpaintervideosurface_mac_p.h>
+#include "qpaintervideosurface_p.h"
+#include "qpaintervideosurface_mac_p.h"
#include <qmath.h>
# 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
****************************************************************************/
#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>
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)
class QVideoWidgetControlPrivate;
-class Q_MULTIMEDIA_EXPORT QVideoWidgetControl : public QMediaControl
+class Q_MULTIMEDIAWIDGETS_EXPORT QVideoWidgetControl : public QMediaControl
{
Q_OBJECT
QT_MODULE(Multimedia)
-class Q_MULTIMEDIA_EXPORT QVideoWindowControl : public QMediaControl
+class Q_MULTIMEDIAWIDGETS_EXPORT QVideoWindowControl : public QMediaControl
{
Q_OBJECT