diff options
author | Yoann Lopes <yoann.lopes@digia.com> | 2014-04-03 15:17:49 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-07 11:50:29 +0200 |
commit | d3ba2d6f3f7cbdd8a4e41a7967874f53a2caaec3 (patch) | |
tree | 53529d761162fc454de57481cbc01ad89e04dd5f /src/gsttools | |
parent | b0c68a1a07f546fe22a7d76b1a15bb2b39aa550f (diff) |
GStreamer: cleanup system includes.
Replaced some linux includes with <private/qcore_unix_p.h> to be more
portable.
Use qt_safe_open() and qt_safe_close() instead of ::open() and
::close().
Task-number: QTBUG-38061
Change-Id: Idb3f50d070ec1701cafba98e79e2e85824653a3a
Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Diffstat (limited to 'src/gsttools')
-rw-r--r-- | src/gsttools/gsttools.pro | 2 | ||||
-rw-r--r-- | src/gsttools/qgstreamervideoinputdevicecontrol.cpp | 15 |
2 files changed, 4 insertions, 13 deletions
diff --git a/src/gsttools/gsttools.pro b/src/gsttools/gsttools.pro index 46184965c..2a0933bb3 100644 --- a/src/gsttools/gsttools.pro +++ b/src/gsttools/gsttools.pro @@ -2,7 +2,7 @@ TEMPLATE = lib TARGET = qgsttools_p QPRO_PWD = $$PWD -QT = core multimedia-private gui-private +QT = core-private multimedia-private gui-private !static:DEFINES += QT_MAKEDLL diff --git a/src/gsttools/qgstreamervideoinputdevicecontrol.cpp b/src/gsttools/qgstreamervideoinputdevicecontrol.cpp index ad61aefad..e4e202caf 100644 --- a/src/gsttools/qgstreamervideoinputdevicecontrol.cpp +++ b/src/gsttools/qgstreamervideoinputdevicecontrol.cpp @@ -44,16 +44,7 @@ #include <QtCore/QDir> #include <QtCore/QDebug> -#include <linux/types.h> -#include <sys/time.h> -#include <sys/ioctl.h> -#include <sys/poll.h> -#include <unistd.h> -#include <fcntl.h> -#include <errno.h> -#include <string.h> -#include <stdlib.h> -#include <sys/mman.h> +#include <private/qcore_unix_p.h> #include <linux/videodev2.h> QGstreamerVideoInputDeviceControl::QGstreamerVideoInputDeviceControl(QObject *parent) @@ -135,7 +126,7 @@ void QGstreamerVideoInputDeviceControl::update() foreach( const QFileInfo &entryInfo, entries ) { //qDebug() << "Try" << entryInfo.filePath(); - int fd = ::open(entryInfo.filePath().toLatin1().constData(), O_RDWR ); + int fd = qt_safe_open(entryInfo.filePath().toLatin1().constData(), O_RDWR ); if (fd == -1) continue; @@ -165,6 +156,6 @@ void QGstreamerVideoInputDeviceControl::update() m_names.append(entryInfo.filePath()); m_descriptions.append(name); } - ::close(fd); + qt_safe_close(fd); } } |