diff options
Diffstat (limited to 'ACE/ace/QtReactor/QtReactor.h')
-rw-r--r-- | ACE/ace/QtReactor/QtReactor.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/ACE/ace/QtReactor/QtReactor.h b/ACE/ace/QtReactor/QtReactor.h index 9d34c8d58b8..037198dadb9 100644 --- a/ACE/ace/QtReactor/QtReactor.h +++ b/ACE/ace/QtReactor/QtReactor.h @@ -26,23 +26,14 @@ #include "ace/Map_Manager.h" #if defined (ACE_HAS_QT4) -# include "Qt/qglobal.h" -#else -# include "qglobal.h" +# include "QtCore/qglobal.h" #endif // QT toolkit specific includes. -#if QT_VERSION < 0x040000 -#include /**/ <qapplication.h> -#include /**/ <qobject.h> -#include /**/ <qsocketnotifier.h> -#include /**/ <qtimer.h> -#else #include /**/ <QtGui/QApplication> #include /**/ <QtCore/QObject> #include /**/ <QtCore/QSocketNotifier> #include /**/ <QtCore/QTimer> -#endif ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -225,7 +216,7 @@ private slots: /// Dispatch an exception event void exception_event (int FD); - /// Dispach a timeout event + /// Dispatch a timeout event void timeout_event (void); }; |