[Development] Header diff for QtMultimediaWidgets

[Knoll Lars]

Nothing to see here :)

Cheers,
Lars

On 6/26/13 10:49 PM, "Thiago Macieira" <thiago.macieira at intel.com> wrote:

>diff --git a/src/multimediawidgets/qcameraviewfinder.h
>b/src/multimediawidgets/qcameraviewfinder.h
>index 134ec41..4b3f7d08 100644
>--- a/src/multimediawidgets/qcameraviewfinder.h
>+++ b/src/multimediawidgets/qcameraviewfinder.h
>@@ -1,6 +1,6 @@
> 
>/*************************************************************************
>***
> **
>-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
>+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
> ** Contact: http://www.qt-project.org/legal
> **
> ** This file is part of the Qt Toolkit.
>@@ -53,8 +53,6 @@
> #include <QtMultimedia/qmediaservice.h>
> #include <QtMultimediaWidgets/qvideowidget.h>
> 
>-QT_BEGIN_HEADER
>-
> QT_BEGIN_NAMESPACE
> 
> 
>@@ -80,7 +78,5 @@ private:
> 
> QT_END_NAMESPACE
> 
>-QT_END_HEADER
>-
> 
> #endif  // QCAMERA_H
>diff --git a/src/multimediawidgets/qgraphicsvideoitem.h
>b/src/multimediawidgets/qgraphicsvideoitem.h
>index 6137846..6db81a5 100644
>--- a/src/multimediawidgets/qgraphicsvideoitem.h
>+++ b/src/multimediawidgets/qgraphicsvideoitem.h
>@@ -1,6 +1,6 @@
> 
>/*************************************************************************
>***
> **
>-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
>+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
> ** Contact: http://www.qt-project.org/legal
> **
> ** This file is part of the Qt Toolkit.
>@@ -47,8 +47,6 @@
> #include <QtMultimediaWidgets/qvideowidget.h>
> #include <QtMultimedia/qmediabindableinterface.h>
> 
>-QT_BEGIN_HEADER
>-
> QT_BEGIN_NAMESPACE
> 
> class QVideoSurfaceFormat;
>@@ -107,7 +105,5 @@ private:
> 
> QT_END_NAMESPACE
> 
>-QT_END_HEADER
>-
> 
> #endif
>diff --git a/src/multimediawidgets/qtmultimediawidgetdefs.h
>b/src/multimediawidgets/qtmultimediawidgetdefs.h
>index b5da320..73b8b50 100644
>--- a/src/multimediawidgets/qtmultimediawidgetdefs.h
>+++ b/src/multimediawidgets/qtmultimediawidgetdefs.h
>@@ -1,6 +1,6 @@
> 
>/*************************************************************************
>***
> **
>-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
>+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
> ** Contact: http://www.qt-project.org/legal
> **
> ** This file is part of the Qt Toolkit.
>@@ -55,7 +55,6 @@
> 
> #include <QtCore/qglobal.h>
> 
>-QT_BEGIN_HEADER
> QT_BEGIN_NAMESPACE
> 
> #ifndef QT_STATIC
>@@ -69,7 +68,6 @@ QT_BEGIN_NAMESPACE
> #endif
> 
> QT_END_NAMESPACE
>-QT_END_HEADER
> 
> #endif // QMULTIMEDIAWIDGETS_P_H
> 
>diff --git a/src/multimediawidgets/qvideowidget.h
>b/src/multimediawidgets/qvideowidget.h
>index 8ffaffb..ec71bb6 100644
>--- a/src/multimediawidgets/qvideowidget.h
>+++ b/src/multimediawidgets/qvideowidget.h
>@@ -1,6 +1,6 @@
> 
>/*************************************************************************
>***
> **
>-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
>+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
> ** Contact: http://www.qt-project.org/legal
> **
> ** This file is part of the Qt Toolkit.
>@@ -47,8 +47,6 @@
> #include <QtMultimediaWidgets/qtmultimediawidgetdefs.h>
> #include <QtMultimedia/qmediabindableinterface.h>
> 
>-QT_BEGIN_HEADER
>-
> QT_BEGIN_NAMESPACE
> 
> 
>@@ -131,7 +129,5 @@ private:
> 
> QT_END_NAMESPACE
> 
>-QT_END_HEADER
>-
> 
> #endif
>diff --git a/src/multimediawidgets/qvideowidgetcontrol.h
>b/src/multimediawidgets/qvideowidgetcontrol.h
>index 8726210..b5c1306 100644
>--- a/src/multimediawidgets/qvideowidgetcontrol.h
>+++ b/src/multimediawidgets/qvideowidgetcontrol.h
>@@ -1,6 +1,6 @@
> 
>/*************************************************************************
>***
> **
>-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
>+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
> ** Contact: http://www.qt-project.org/legal
> **
> ** This file is part of the Qt Toolkit.
>@@ -47,8 +47,6 @@
> 
> #include <QtWidgets/qwidget.h>
> 
>-QT_BEGIN_HEADER
>-
> QT_BEGIN_NAMESPACE
> 
> 
>@@ -97,7 +95,5 @@ Q_MEDIA_DECLARE_CONTROL(QVideoWidgetControl,
>QVideoWidgetControl_iid)
> 
> QT_END_NAMESPACE
> 
>-QT_END_HEADER
>-
> 
> #endif
>_______________________________________________
>Development mailing list
>Development at qt-project.org
>http://lists.qt-project.org/mailman/listinfo/development