diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-12-19 14:03:14 -0600 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-12-19 14:03:14 -0600 |
| commit | f8224f3a623495e4e1dbf852554d7601a6b7c4c4 (patch) | |
| tree | d5583114ba48669960c9f7d68927687ea652a0b8 /src/kernel/ntqeventloop.h | |
| parent | 25240579092616b09d28705ac84e13e49b744707 (diff) | |
| parent | e8cbbedf46da493d2c206444a7e18e5777402905 (diff) | |
| download | tqt-f8224f3a623495e4e1dbf852554d7601a6b7c4c4.tar.gz tqt-f8224f3a623495e4e1dbf852554d7601a6b7c4c4.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/kernel/ntqeventloop.h')
| -rw-r--r-- | src/kernel/ntqeventloop.h | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/src/kernel/ntqeventloop.h b/src/kernel/ntqeventloop.h index 214101231..f4d78bf20 100644 --- a/src/kernel/ntqeventloop.h +++ b/src/kernel/ntqeventloop.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: TQEventLoopPrivate *d; friend class TQApplication; + +#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 // TQEVENTLOOP_H |