diff options
author | Sergio Ahumada <[email protected]> | 2012-09-15 17:31:44 +0200 |
---|---|---|
committer | Qt by Nokia <[email protected]> | 2012-09-15 23:54:29 +0200 |
commit | 4eab96732eda458f75efdea99ecea388d0ffbb4a (patch) | |
tree | 182900ca00fb74c1b0754723ead1f834d01edd09 | |
parent | 9bedada232fb821f1fba2c1bdbd24702947dcaed (diff) |
concurrent: Fix missing or improper include guard in headers
Use an include guard in headers to ensure the header is not included
more than once. Make the header guard match its file name.
Also, cpp files should include their own headers first (but below config.h)
Change-Id: I902c8936382f5c1a8e0de7dbf49e5423f9b72bbe
Reviewed-by: Lars Knoll <[email protected]>
-rw-r--r-- | src/concurrent/qfutureinterface.cpp | 4 | ||||
-rw-r--r-- | src/concurrent/qfuturesynchronizer.h | 6 | ||||
-rw-r--r-- | src/concurrent/qfuturewatcher.cpp | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/concurrent/qfutureinterface.cpp b/src/concurrent/qfutureinterface.cpp index 9a273a10766..0836ad029ac 100644 --- a/src/concurrent/qfutureinterface.cpp +++ b/src/concurrent/qfutureinterface.cpp @@ -44,13 +44,13 @@ #ifndef QT_NO_QFUTURE +#include "qfutureinterface_p.h" + #include <QtCore/qatomic.h> #include <QtCore/qthread.h> #include <QtCore/qthreadpool.h> #include <private/qthreadpool_p.h> -#include "qfutureinterface_p.h" - QT_BEGIN_NAMESPACE enum { diff --git a/src/concurrent/qfuturesynchronizer.h b/src/concurrent/qfuturesynchronizer.h index 3106dd44acd..36208d7a35e 100644 --- a/src/concurrent/qfuturesynchronizer.h +++ b/src/concurrent/qfuturesynchronizer.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QFUTRUESYNCHRONIZER_H -#define QFUTRUESYNCHRONIZER_H +#ifndef QFUTURESYNCHRONIZER_H +#define QFUTURESYNCHRONIZER_H #include <QtConcurrent/qtconcurrent_global.h> @@ -119,4 +119,4 @@ QT_END_HEADER #endif // QT_NO_CONCURRENT -#endif // QFUTRUESYNCHRONIZER_H +#endif // QFUTURESYNCHRONIZER_H diff --git a/src/concurrent/qfuturewatcher.cpp b/src/concurrent/qfuturewatcher.cpp index eb5fb0e18d5..081b21cdd30 100644 --- a/src/concurrent/qfuturewatcher.cpp +++ b/src/concurrent/qfuturewatcher.cpp @@ -43,13 +43,13 @@ #ifndef QT_NO_QFUTURE +#include "qfuturewatcher_p.h" + #include <QtCore/qcoreevent.h> #include <QtCore/qcoreapplication.h> #include <QtCore/qmetaobject.h> #include <QtCore/qthread.h> -#include "qfuturewatcher_p.h" - QT_BEGIN_NAMESPACE /*! \class QFutureWatcher |