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/socket | |
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/socket')
-rw-r--r-- | src/network/socket/qnativesocketengine.cpp | 3 | ||||
-rw-r--r-- | src/network/socket/qtcpserver.cpp | 2 | ||||
-rw-r--r-- | src/network/socket/qtcpsocket.cpp | 4 | ||||
-rw-r--r-- | src/network/socket/qudpsocket.cpp | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/src/network/socket/qnativesocketengine.cpp b/src/network/socket/qnativesocketengine.cpp index 3dca7aa9ee..7b2fdc8f96 100644 --- a/src/network/socket/qnativesocketengine.cpp +++ b/src/network/socket/qnativesocketengine.cpp @@ -96,11 +96,12 @@ errorString() can be called to determine the cause of the error. */ +#include "qnativesocketengine_p.h" + #include <qabstracteventdispatcher.h> #include <qsocketnotifier.h> #include <qnetworkinterface.h> -#include "qnativesocketengine_p.h" #include <private/qthread_p.h> #include <private/qobject_p.h> diff --git a/src/network/socket/qtcpserver.cpp b/src/network/socket/qtcpserver.cpp index 7955928727..90540a2a47 100644 --- a/src/network/socket/qtcpserver.cpp +++ b/src/network/socket/qtcpserver.cpp @@ -90,13 +90,13 @@ \sa hasPendingConnections(), nextPendingConnection() */ +#include "qtcpserver.h" #include "private/qobject_p.h" #include "qalgorithms.h" #include "qhostaddress.h" #include "qlist.h" #include "qpointer.h" #include "qabstractsocketengine_p.h" -#include "qtcpserver.h" #include "qtcpsocket.h" #include "qnetworkproxy.h" diff --git a/src/network/socket/qtcpsocket.cpp b/src/network/socket/qtcpsocket.cpp index dff8b5efb5..ccd4a76f97 100644 --- a/src/network/socket/qtcpsocket.cpp +++ b/src/network/socket/qtcpsocket.cpp @@ -66,9 +66,9 @@ {Loopback Example}, {Torrent Example} */ -#include "qlist.h" -#include "qtcpsocket_p.h" #include "qtcpsocket.h" +#include "qtcpsocket_p.h" +#include "qlist.h" #include "qhostaddress.h" QT_BEGIN_NAMESPACE diff --git a/src/network/socket/qudpsocket.cpp b/src/network/socket/qudpsocket.cpp index 8e3c427d45..925b1e72df 100644 --- a/src/network/socket/qudpsocket.cpp +++ b/src/network/socket/qudpsocket.cpp @@ -98,10 +98,10 @@ \sa QTcpSocket */ +#include "qudpsocket.h" #include "qhostaddress.h" #include "qnetworkinterface.h" #include "qabstractsocket_p.h" -#include "qudpsocket.h" QT_BEGIN_NAMESPACE |