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/bearer | |
| 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/bearer')
| -rw-r--r-- | src/network/bearer/qnetworkconfigmanager.h | 6 | ||||
| -rw-r--r-- | src/network/bearer/qnetworkconfigmanager_p.h | 6 | ||||
| -rw-r--r-- | src/network/bearer/qnetworksession.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/network/bearer/qnetworkconfigmanager.h b/src/network/bearer/qnetworkconfigmanager.h index 6c160404d1..81f5d44472 100644 --- a/src/network/bearer/qnetworkconfigmanager.h +++ b/src/network/bearer/qnetworkconfigmanager.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QNETWORKCONFIGURATIONMANAGER_H -#define QNETWORKCONFIGURATIONMANAGER_H +#ifndef QNETWORKCONFIGMANAGER_H +#define QNETWORKCONFIGMANAGER_H #include <QtCore/qobject.h> #include <QtNetwork/qnetworkconfiguration.h> @@ -102,4 +102,4 @@ QT_END_HEADER #endif // QT_NO_BEARERMANAGEMENT -#endif // QNETWORKCONFIGURATIONMANAGER_H +#endif // QNETWORKCONFIGMANAGER_H diff --git a/src/network/bearer/qnetworkconfigmanager_p.h b/src/network/bearer/qnetworkconfigmanager_p.h index 92406ae8f0..73458f131d 100644 --- a/src/network/bearer/qnetworkconfigmanager_p.h +++ b/src/network/bearer/qnetworkconfigmanager_p.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QNETWORKCONFIGURATIONMANAGERPRIVATE_H -#define QNETWORKCONFIGURATIONMANAGERPRIVATE_H +#ifndef QNETWORKCONFIGMANAGER_P_H +#define QNETWORKCONFIGMANAGER_P_H // // W A R N I N G @@ -137,4 +137,4 @@ QT_END_NAMESPACE #endif // QT_NO_BEARERMANAGEMENT -#endif // QNETWORKCONFIGURATIONMANAGERPRIVATE_H +#endif // QNETWORKCONFMANAGER_P_H diff --git a/src/network/bearer/qnetworksession.cpp b/src/network/bearer/qnetworksession.cpp index ee21dffc94..21535e700b 100644 --- a/src/network/bearer/qnetworksession.cpp +++ b/src/network/bearer/qnetworksession.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ #include "qnetworksession.h" +#include "qnetworksession_p.h" #include "qbearerengine_p.h" #include <QEventLoop> @@ -48,7 +49,6 @@ #include <QThread> #include "qnetworkconfigmanager_p.h" -#include "qnetworksession_p.h" #ifndef QT_NO_BEARERMANAGEMENT |