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>

4 files changed, 9 insertions, 5 deletions

diff --git a/src/network/ssl/qsslcertificateextension_p.h b/src/network/ssl/qsslcertificateextension_p.h
index ccd95655b0..1b63af11d2 100644
--- a/src/network/ssl/qsslcertificateextension_p.h
+++ b/src/network/ssl/qsslcertificateextension_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QSSLCERTIFICATEEXTESNION_P_H
-#define QSSLCERTIFICATEEXTESNION_P_H
+#ifndef QSSLCERTIFICATEEXTENSION_P_H
+#define QSSLCERTIFICATEEXTENSION_P_H
 
 #include "qsslcertificateextension.h"
 
@@ -64,5 +64,5 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QSSLCERTIFICATEEXTESNION_P_H
+#endif // QSSLCERTIFICATEEXTENSION_P_H
 
diff --git a/src/network/ssl/qsslcipher_p.h b/src/network/ssl/qsslcipher_p.h
index eadb4eacf3..4d451d031e 100644
--- a/src/network/ssl/qsslcipher_p.h
+++ b/src/network/ssl/qsslcipher_p.h
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+#ifndef QSSLCIPHER_P_H
+#define QSSLCIPHER_P_H
 
 #include "qsslcipher.h"
 
@@ -76,3 +78,5 @@ public:
 };
 
 QT_END_NAMESPACE
+
+#endif // QSSLCIPHER_P_H
diff --git a/src/network/ssl/qsslkey.cpp b/src/network/ssl/qsslkey.cpp
index 31f211c3e7..b7f3c96b30 100644
--- a/src/network/ssl/qsslkey.cpp
+++ b/src/network/ssl/qsslkey.cpp
@@ -55,9 +55,9 @@
     \sa QSslSocket, QSslCertificate, QSslCipher
 */
 
-#include "qsslsocket_openssl_symbols_p.h"
 #include "qsslkey.h"
 #include "qsslkey_p.h"
+#include "qsslsocket_openssl_symbols_p.h"
 #include "qsslsocket.h"
 #include "qsslsocket_p.h"
 
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
index b2547487ba..7d7655a8ad 100644
--- a/src/network/ssl/qsslsocket.cpp
+++ b/src/network/ssl/qsslsocket.cpp
@@ -288,8 +288,8 @@
     \sa peerVerifyError()
 */
 
-#include "qsslcipher.h"
 #include "qsslsocket.h"
+#include "qsslcipher.h"
 #include "qsslsocket_openssl_p.h"
 #include "qsslconfiguration_p.h"