diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-04-22 21:25:32 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-04-22 21:25:32 -0500 |
| commit | 83d39cad274f592a43a3262926d215493caea0bc (patch) | |
| tree | 05fefa97bd40200c6b7a1a184cd4df2610cc1091 /src/kernel/qeventloop_glib_p.h | |
| parent | 7abfc2a181531c769d50bcb1c0bff1fc08c66de2 (diff) | |
| download | qt3-83d39cad274f592a43a3262926d215493caea0bc.tar.gz qt3-83d39cad274f592a43a3262926d215493caea0bc.zip | |
Fix a number of threading problems and crashes
This partially resolves Bug 1467
Diffstat (limited to 'src/kernel/qeventloop_glib_p.h')
| -rw-r--r-- | src/kernel/qeventloop_glib_p.h | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/src/kernel/qeventloop_glib_p.h b/src/kernel/qeventloop_glib_p.h index 4dfc02c..d8fa15d 100644 --- a/src/kernel/qeventloop_glib_p.h +++ b/src/kernel/qeventloop_glib_p.h @@ -75,8 +75,8 @@ class QSocketNotifier; struct QSockNotGPollFD { - QSocketNotifier *obj; - GPollFD gPollFD; + QSocketNotifier *obj; + GPollFD gPollFD; gushort events; // save events bool pending; }; @@ -84,25 +84,10 @@ struct QSockNotGPollFD class QEventLoopPrivate { public: - QEventLoopPrivate() - { -#if defined(Q_WS_X11) - xfd = -1; - x_gPollFD.fd = -1; -#endif // Q_WS_X11 - singletoolkit = TRUE; - ctx = 0; - ctx_is_default = false; - reset(); - } - - void reset() { - looplevel = 0; - quitcode = 0; - quitnow = FALSE; - exitloop = FALSE; - shortcut = FALSE; - } + QEventLoopPrivate(); + ~QEventLoopPrivate(); + + void reset(); int looplevel; int quitcode; |