slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove QT_{BEGIN,END}_HEADER macro usage

Browse Source 
The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb
and is no longer necessary or used.

Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html
Change-Id: Id95d10f5d9c146d9eb496119af6a8b8501ffcb17
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
This commit is contained in:
Sergio Ahumada
2013-01-27 09:19:58 +01:00
committed by The Qt Project
parent f462bb9177
commit 157f4f982b
156 changed files with 0 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/multimedia/camera/qcamera.h
View File

@@ -58,8 +58,6 @@
#include <QtMultimedia/qmediaenumdebug.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@@ -234,6 +232,4 @@ Q_MEDIA_ENUM_DEBUG(QCamera, LockType)
Q_MEDIA_ENUM_DEBUG(QCamera, LockStatus)
Q_MEDIA_ENUM_DEBUG(QCamera, LockChangeReason)
QT_END_HEADER
#endif // QCAMERA_H

4
src/multimedia/camera/qcameraexposure.h
View File

@@ -45,8 +45,6 @@
#include <QtMultimedia/qmediaobject.h>
#include <QtMultimedia/qmediaenumdebug.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@@ -183,6 +181,4 @@ Q_MEDIA_ENUM_DEBUG(QCameraExposure, ExposureMode)
Q_MEDIA_ENUM_DEBUG(QCameraExposure, FlashMode)
Q_MEDIA_ENUM_DEBUG(QCameraExposure, MeteringMode)
QT_END_HEADER
#endif // QCAMERAEXPOSURE_H

4
src/multimedia/camera/qcamerafocus.h
View File

@@ -52,8 +52,6 @@
#include <QtMultimedia/qmediaobject.h>
#include <QtMultimedia/qmediaenumdebug.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@@ -176,6 +174,4 @@ Q_DECLARE_METATYPE(QCameraFocus::FocusPointMode)
Q_MEDIA_ENUM_DEBUG(QCameraFocus, FocusMode)
Q_MEDIA_ENUM_DEBUG(QCameraFocus, FocusPointMode)
QT_END_HEADER
#endif // QCAMERAFOCUS_H

4
src/multimedia/camera/qcameraimagecapture.h
View File

@@ -49,8 +49,6 @@
#include <QtMultimedia/qmediaenumdebug.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QSize;
@@ -161,7 +159,5 @@ Q_DECLARE_METATYPE(QCameraImageCapture::CaptureDestinations)
Q_MEDIA_ENUM_DEBUG(QCameraImageCapture, Error)
Q_MEDIA_ENUM_DEBUG(QCameraImageCapture, CaptureDestination)
QT_END_HEADER
#endif

4
src/multimedia/camera/qcameraimageprocessing.h
View File

@@ -53,8 +53,6 @@
#include <QtMultimedia/qmediaservice.h>
#include <QtMultimedia/qmediaenumdebug.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@@ -116,6 +114,4 @@ Q_DECLARE_METATYPE(QCameraImageProcessing::WhiteBalanceMode)
Q_MEDIA_ENUM_DEBUG(QCameraImageProcessing, WhiteBalanceMode)
QT_END_HEADER
#endif // QCAMERAIMAGEPROCESSING_H