diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
| commit | a86c5f7cae7ec9a3398300555a0b644689d946a1 (patch) | |
| tree | 39fe4b107c71174fd1e8a8ceb9a4d2aa14116248 /ui/qt/glib_mainloop_on_qeventloop.h | |
| parent | Releasing progress-linux version 4.2.6-1~progress7.99u1. (diff) | |
| download | wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.tar.xz wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.zip | |
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'ui/qt/glib_mainloop_on_qeventloop.h')
| -rw-r--r-- | ui/qt/glib_mainloop_on_qeventloop.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ui/qt/glib_mainloop_on_qeventloop.h b/ui/qt/glib_mainloop_on_qeventloop.h index 9f66c681..9a641e04 100644 --- a/ui/qt/glib_mainloop_on_qeventloop.h +++ b/ui/qt/glib_mainloop_on_qeventloop.h @@ -11,7 +11,6 @@ #include <QThread> #include <QMutex> #include <QWaitCondition> -#include <glib.h> class GLibPoller : public QThread { @@ -26,9 +25,9 @@ protected: QMutex mutex_; QWaitCondition dispatched_; GMainContext *ctx_; - gint priority_; + int priority_; GPollFD *fds_; - gint allocated_fds_, nfds_; + int allocated_fds_, nfds_; signals: void polled(void); |