diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2012-09-15 18:29:50 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-15 23:54:45 +0200 |
| commit | 1e3269c0863bfac26be9e9239b6427ea77c6175b (patch) | |
| tree | 6e2bb2ddf977954fa59d178160d7ea4c244fcb59 /src/network/kernel | |
| parent | 4eab96732eda458f75efdea99ecea388d0ffbb4a (diff) | |
network: 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: Iecf5da23c0f8e6d457f67657b88ef7557bde9669
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/network/kernel')
| -rw-r--r-- | src/network/kernel/qnetworkfunctions_wince.h | 8 | ||||
| -rw-r--r-- | src/network/kernel/qnetworkinterface_win.cpp | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/network/kernel/qnetworkfunctions_wince.h b/src/network/kernel/qnetworkfunctions_wince.h index 1181788564..17a9f45c2c 100644 --- a/src/network/kernel/qnetworkfunctions_wince.h +++ b/src/network/kernel/qnetworkfunctions_wince.h @@ -38,8 +38,10 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef Q_NETWORK_FUNCTIONS_WCE_H -#define Q_NETWORK_FUNCTIONS_WCE_H + +#ifndef QNETWORKFUNCTIONS_WINCE_H +#define QNETWORKFUNCTIONS_WINCE_H + #ifdef Q_OS_WINCE #include <qt_windows.h> @@ -93,4 +95,4 @@ QT_END_NAMESPACE QT_END_HEADER #endif // Q_OS_WINCE -#endif // Q_NETWORK_FUNCTIONS_WCE_H +#endif // QNETWORKFUNCTIONS_WINCE_H diff --git a/src/network/kernel/qnetworkinterface_win.cpp b/src/network/kernel/qnetworkinterface_win.cpp index 1f4ac7ff7a..3c83241451 100644 --- a/src/network/kernel/qnetworkinterface_win.cpp +++ b/src/network/kernel/qnetworkinterface_win.cpp @@ -39,12 +39,13 @@ ** ****************************************************************************/ +#include "qnetworkinterface_win_p.h" + #include "qnetworkinterface.h" #include "qnetworkinterface_p.h" #ifndef QT_NO_NETWORKINTERFACE -#include "qnetworkinterface_win_p.h" #include <qhostinfo.h> #include <qhash.h> #include <qurl.h> |