Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/qt3

1 files changed, 35 insertions, 33 deletions

diff --git a/src/kernel/qeventloop_glib_p.h b/src/kernel/qeventloop_glib_p.h
index 7de324d..663f20e 100644
--- a/src/kernel/qeventloop_glib_p.h
+++ b/src/kernel/qeventloop_glib_p.h
@@ -84,49 +84,51 @@ 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()
+	{
 #if defined(Q_WS_X11)
-    int xfd;
-	
-	GPollFD x_gPollFD; 
-	
+		xfd = -1;
+		x_gPollFD.fd = -1;
 #endif // Q_WS_X11
+		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;
 
-    int thread_pipe[2];
+#if defined(Q_WS_X11)
+	int xfd;
+	GPollFD x_gPollFD;
+#endif // Q_WS_X11
 
+	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;  	
-	
+	uint pev_flags;
+
 	// My GSource
-	
 	GSource * gSource;
 	bool singletoolkit;
 
+	// main context
+	GMainContext *ctx;
 };
 
 #endif // QEVENTLOOP_GLIB_P_H