diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-12-06 20:22:35 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-12-06 20:22:35 -0600 |
| commit | 85b3c5d0ec2280393e1c5ac7af6a56abf9fc2e9a (patch) | |
| tree | db276d33ff6b61a36fea225c6b7fc5bd88f9b605 | |
| parent | caf80d88243aaa00e8f1baeaa6b7e4c3aca75f63 (diff) | |
| download | qt3-85b3c5d0.tar.gz qt3-85b3c5d0.zip | |
Maintain binary compatibility when switching between glib event loop and standard event loop
| -rw-r--r-- | src/kernel/qeventloop.h | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/src/kernel/qeventloop.h b/src/kernel/qeventloop.h index 25f80cd..a3ee01d 100644 --- a/src/kernel/qeventloop.h +++ b/src/kernel/qeventloop.h @@ -102,25 +102,6 @@ public: virtual void wakeUp(); -#ifdef Q_QDOC -#else // Q_QDOC -#if defined(QT_USE_GLIBMAINLOOP) - - // glib main loop support - - /* internal: used to fit glib-main-loop gsource concept */ - - bool gsourcePrepare(GSource *gs, int * timeout); - bool gsourceCheck(GSource * gs); - bool gsourceDispatch(GSource * gs); - - bool processX11Events(); - - // end glib main loop support - -#endif //QT_USE_GLIBMAINLOOP -#endif // Q_QDOC - void setSingleToolkitEventHandling(bool enabled); signals: @@ -145,6 +126,24 @@ private: QEventLoopPrivate *d; friend class QApplication; + +#ifdef Q_QDOC +#else // Q_QDOC +#if defined(QT_USE_GLIBMAINLOOP) + + // glib main loop support + /* internal: used to fit glib-main-loop gsource concept */ +public: + bool gsourcePrepare(GSource *gs, int * timeout); + bool gsourceCheck(GSource * gs); + bool gsourceDispatch(GSource * gs); + + bool processX11Events(); + + // end glib main loop support + +#endif //QT_USE_GLIBMAINLOOP +#endif // Q_QDOC }; #endif // QEVENTLOOP_H |