diff options
| author | Louai Al-Khanji <louai.al-khanji@theqtcompany.com> | 2016-02-03 19:09:00 -0800 |
|---|---|---|
| committer | Louai Al-Khanji <louai.al-khanji@theqtcompany.com> | 2016-02-04 22:34:38 +0000 |
| commit | bb747268ed89af8f034132fa46e30998b72a7ba9 (patch) | |
| tree | 3516c7edfb90c3aab4a832945d8a8b8e12dfffe8 /src/corelib/kernel/qeventdispatcher_unix.cpp | |
| parent | e9802a10730345f734adff31a6c023690878c883 (diff) | |
Clean up new poll code slightly
Change-Id: I046126ff69a77a50e79efb1b6ebb0fffef67ac8e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/kernel/qeventdispatcher_unix.cpp')
| -rw-r--r-- | src/corelib/kernel/qeventdispatcher_unix.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp index 1faeb7dc39..64b813bb13 100644 --- a/src/corelib/kernel/qeventdispatcher_unix.cpp +++ b/src/corelib/kernel/qeventdispatcher_unix.cpp @@ -89,12 +89,6 @@ static const char *socketType(QSocketNotifier::Type type) Q_UNREACHABLE(); } -static pollfd make_pollfd(int fd, short events) -{ - pollfd pfd = { fd, events, 0 }; - return pfd; -} - QThreadPipe::QThreadPipe() { fds[0] = -1; @@ -173,7 +167,7 @@ bool QThreadPipe::init() pollfd QThreadPipe::prepare() const { - return make_pollfd(fds[0], POLLIN); + return qt_make_pollfd(fds[0], POLLIN); } void QThreadPipe::wakeUp() @@ -491,7 +485,7 @@ bool QEventDispatcherUNIX::processEvents(QEventLoop::ProcessEventsFlags flags) if (include_notifiers) for (auto it = d->socketNotifiers.cbegin(); it != d->socketNotifiers.cend(); ++it) - d->pollfds.append(make_pollfd(it.key(), it.value().events())); + d->pollfds.append(qt_make_pollfd(it.key(), it.value().events())); // This must be last, as it's popped off the end below d->pollfds.append(d->threadPipe.prepare()); |