diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-27 09:19:58 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-28 23:21:21 +0100 |
| commit | 157f4f982bd3b78a3471f0a22652c3d32d89df70 (patch) | |
| tree | bffb9b62fd9c5ad70f7bfed0a5c8b80958a0400d /src/multimedia/camera | |
| parent | f462bb9177d550f16f2ec768571b9076eb489dfa (diff) | |
Remove QT_{BEGIN,END}_HEADER macro usage
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>
Diffstat (limited to 'src/multimedia/camera')
| -rw-r--r-- | src/multimedia/camera/qcamera.h | 4 | ||||
| -rw-r--r-- | src/multimedia/camera/qcameraexposure.h | 4 | ||||
| -rw-r--r-- | src/multimedia/camera/qcamerafocus.h | 4 | ||||
| -rw-r--r-- | src/multimedia/camera/qcameraimagecapture.h | 4 | ||||
| -rw-r--r-- | src/multimedia/camera/qcameraimageprocessing.h | 4 |
5 files changed, 0 insertions, 20 deletions
diff --git a/src/multimedia/camera/qcamera.h b/src/multimedia/camera/qcamera.h index 7a6cf2ea5..5cda4551d 100644 --- a/src/multimedia/camera/qcamera.h +++ b/src/multimedia/camera/qcamera.h @@ -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 diff --git a/src/multimedia/camera/qcameraexposure.h b/src/multimedia/camera/qcameraexposure.h index 31be78719..4be10f25f 100644 --- a/src/multimedia/camera/qcameraexposure.h +++ b/src/multimedia/camera/qcameraexposure.h @@ -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 diff --git a/src/multimedia/camera/qcamerafocus.h b/src/multimedia/camera/qcamerafocus.h index 7f50170a0..9f1dfb73b 100644 --- a/src/multimedia/camera/qcamerafocus.h +++ b/src/multimedia/camera/qcamerafocus.h @@ -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 diff --git a/src/multimedia/camera/qcameraimagecapture.h b/src/multimedia/camera/qcameraimagecapture.h index fafffcbf3..91099ab7b 100644 --- a/src/multimedia/camera/qcameraimagecapture.h +++ b/src/multimedia/camera/qcameraimagecapture.h @@ -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 diff --git a/src/multimedia/camera/qcameraimageprocessing.h b/src/multimedia/camera/qcameraimageprocessing.h index ee3975dd5..e2fa4d58f 100644 --- a/src/multimedia/camera/qcameraimageprocessing.h +++ b/src/multimedia/camera/qcameraimageprocessing.h @@ -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 |