summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@nokia.com>2012-09-05 12:40:51 +0200
committerQt by Nokia <qt-info@nokia.com>2012-09-09 08:50:48 +0200
commit15eeb0e7dc300877a80b34eb4764502df85901ed (patch)
tree64e4274bc0013f078466b700570d636567621e69 /src/corelib/tools
parentf67d23d4fc4bc6d915f8b2c085998ddc2f6365fe (diff)
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. Change-Id: Icf7d7d4bed91443b3b21ef5d4219dbd260dffef3 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/tools')
-rw-r--r--src/corelib/tools/qbytedata_p.h6
-rw-r--r--src/corelib/tools/qcollator_p.h6
-rw-r--r--src/corelib/tools/qcryptographichash.h4
3 files changed, 8 insertions, 8 deletions
diff --git a/src/corelib/tools/qbytedata_p.h b/src/corelib/tools/qbytedata_p.h
index 2deff997d2..a606f6067a 100644
--- a/src/corelib/tools/qbytedata_p.h
+++ b/src/corelib/tools/qbytedata_p.h
@@ -39,8 +39,8 @@
**
****************************************************************************/
-#ifndef QBYTEDATA_H
-#define QBYTEDATA_H
+#ifndef QBYTEDATA_P_H
+#define QBYTEDATA_P_H
//
// W A R N I N G
@@ -217,4 +217,4 @@ public:
QT_END_NAMESPACE
-#endif // QBYTEDATA_H
+#endif // QBYTEDATA_P_H
diff --git a/src/corelib/tools/qcollator_p.h b/src/corelib/tools/qcollator_p.h
index 7677180424..7339927065 100644
--- a/src/corelib/tools/qcollator_p.h
+++ b/src/corelib/tools/qcollator_p.h
@@ -39,8 +39,8 @@
**
****************************************************************************/
-#ifndef QCOLLATOR_H
-#define QCOLLATOR_H
+#ifndef QCOLLATOR_P_H
+#define QCOLLATOR_P_H
#include <QString>
#include <QLocale>
@@ -121,4 +121,4 @@ QT_END_NAMESPACE
QT_END_HEADER
-#endif // QCOLLATOR_H
+#endif // QCOLLATOR_P_H
diff --git a/src/corelib/tools/qcryptographichash.h b/src/corelib/tools/qcryptographichash.h
index 6ebe389faf..31293accac 100644
--- a/src/corelib/tools/qcryptographichash.h
+++ b/src/corelib/tools/qcryptographichash.h
@@ -39,8 +39,8 @@
**
****************************************************************************/
-#ifndef QCRYPTOGRAPHICSHASH_H
-#define QCRYPTOGRAPHICSHASH_H
+#ifndef QCRYPTOGRAPHICHASH_H
+#define QCRYPTOGRAPHICHASH_H
#include <QtCore/qbytearray.h>