summaryrefslogtreecommitdiffstats
path: root/src/kernel/qeventloop_glib_p.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-12-07 20:06:25 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-12-07 20:06:25 -0600
commita7865cf6918fc3457d0141522e791a92bcf62810 (patch)
tree6cd840a44b85c401b4640be655ac536cb3d1ffa9 /src/kernel/qeventloop_glib_p.h
parent9bff9eeefc262c8509b2db7c1120f6001d65e64c (diff)
downloadqt3-a7865cf6918fc3457d0141522e791a92bcf62810.tar.gz
qt3-a7865cf6918fc3457d0141522e791a92bcf62810.zip
Fix glib event loop threading
Diffstat (limited to 'src/kernel/qeventloop_glib_p.h')
-rw-r--r--src/kernel/qeventloop_glib_p.h58
1 files changed, 29 insertions, 29 deletions
diff --git a/src/kernel/qeventloop_glib_p.h b/src/kernel/qeventloop_glib_p.h
index 7de324d..ef0e6ac 100644
--- a/src/kernel/qeventloop_glib_p.h
+++ b/src/kernel/qeventloop_glib_p.h
@@ -84,49 +84,49 @@ struct QSockNotGPollFD
class QEventLoopPrivate
{
public:
- QEventLoopPrivate()
- {
- reset();
- }
-
- void reset() {
- looplevel = 0;
- quitcode = 0;
- quitnow = FALSE;
- exitloop = FALSE;
- shortcut = FALSE;
- singletoolkit = TRUE;
- }
-
- int looplevel;
- int quitcode;
- unsigned int quitnow : 1;
- unsigned int exitloop : 1;
- unsigned int shortcut : 1;
+ QEventLoopPrivate()
+ {
+ reset();
+ }
+
+ void reset() {
+ looplevel = 0;
+ quitcode = 0;
+ quitnow = FALSE;
+ exitloop = FALSE;
+ shortcut = FALSE;
+ singletoolkit = TRUE;
+ }
+
+ int looplevel;
+ int quitcode;
+ unsigned int quitnow : 1;
+ unsigned int exitloop : 1;
+ unsigned int shortcut : 1;
#if defined(Q_WS_X11)
- int xfd;
+ int xfd;
GPollFD x_gPollFD;
#endif // Q_WS_X11
- int thread_pipe[2];
-
+ int thread_pipe[2];
GPollFD threadPipe_gPollFD;
-
- QPtrList<QSockNotGPollFD> sn_list;
- // pending socket notifiers list
- QPtrList<QSockNotGPollFD> sn_pending_list;
-
+ QPtrList<QSockNotGPollFD> sn_list;
+
+ // pending socket notifiers list
+ QPtrList<QSockNotGPollFD> sn_pending_list;
+
// store flags for one iteration
uint pev_flags;
-
+
// My GSource
-
GSource * gSource;
bool singletoolkit;
+ // main context
+ GMainContext *ctx;
};
#endif // QEVENTLOOP_GLIB_P_H