diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2012-09-05 12:40:51 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-09 08:50:48 +0200 |
| commit | 15eeb0e7dc300877a80b34eb4764502df85901ed (patch) | |
| tree | 64e4274bc0013f078466b700570d636567621e69 /src/dbus | |
| parent | f67d23d4fc4bc6d915f8b2c085998ddc2f6365fe (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/dbus')
| -rw-r--r-- | src/dbus/qdbusabstractadaptor_p.h | 6 | ||||
| -rw-r--r-- | src/dbus/qdbusabstractinterface_p.h | 4 | ||||
| -rw-r--r-- | src/dbus/qdbusconnectioninterface.h | 4 | ||||
| -rw-r--r-- | src/dbus/qdbusinterface_p.h | 4 | ||||
| -rw-r--r-- | src/dbus/qdbusintrospection_p.h | 4 | ||||
| -rw-r--r-- | src/dbus/qdbusmetaobject_p.h | 4 | ||||
| -rw-r--r-- | src/dbus/qdbusutil_p.h | 4 | ||||
| -rw-r--r-- | src/dbus/qdbusvirtualobject.h | 4 | ||||
| -rw-r--r-- | src/dbus/qdbusxmlparser_p.h | 4 |
9 files changed, 19 insertions, 19 deletions
diff --git a/src/dbus/qdbusabstractadaptor_p.h b/src/dbus/qdbusabstractadaptor_p.h index 9b10f03eda..e406d51d43 100644 --- a/src/dbus/qdbusabstractadaptor_p.h +++ b/src/dbus/qdbusabstractadaptor_p.h @@ -51,8 +51,8 @@ // // -#ifndef QDBUSABSTRACTADAPTORPRIVATE_H -#define QDBUSABSTRACTADAPTORPRIVATE_H +#ifndef QDBUSABSTRACTADAPTOR_P_H +#define QDBUSABSTRACTADAPTOR_P_H #include <qdbusabstractadaptor.h> @@ -138,4 +138,4 @@ extern QDBusAdaptorConnector *qDBusCreateAdaptorConnector(QObject *object); QT_END_NAMESPACE #endif // QT_NO_DBUS -#endif // QDBUSABSTRACTADAPTORPRIVATE_H +#endif // QDBUSABSTRACTADAPTOR_P_H diff --git a/src/dbus/qdbusabstractinterface_p.h b/src/dbus/qdbusabstractinterface_p.h index 4324302cf3..e2d3b10510 100644 --- a/src/dbus/qdbusabstractinterface_p.h +++ b/src/dbus/qdbusabstractinterface_p.h @@ -51,8 +51,8 @@ // // -#ifndef QDBUSABSTRACTINTERFACEPRIVATE_H -#define QDBUSABSTRACTINTERFACEPRIVATE_H +#ifndef QDBUSABSTRACTINTERFACE_P_H +#define QDBUSABSTRACTINTERFACE_P_H #include <qdbusabstractinterface.h> #include <qdbusconnection.h> diff --git a/src/dbus/qdbusconnectioninterface.h b/src/dbus/qdbusconnectioninterface.h index 1f11d8c882..a50b97d691 100644 --- a/src/dbus/qdbusconnectioninterface.h +++ b/src/dbus/qdbusconnectioninterface.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QDBUSBUS_H -#define QDBUSBUS_H +#ifndef QDBUSCONNECTIONINTERFACE_H +#define QDBUSCONNECTIONINTERFACE_H #include <QtCore/qstringlist.h> diff --git a/src/dbus/qdbusinterface_p.h b/src/dbus/qdbusinterface_p.h index e9254d03dd..95c14fa7a6 100644 --- a/src/dbus/qdbusinterface_p.h +++ b/src/dbus/qdbusinterface_p.h @@ -51,8 +51,8 @@ // // -#ifndef QDBUSINTERFACEPRIVATE_H -#define QDBUSINTERFACEPRIVATE_H +#ifndef QDBUSINTERFACE_P_H +#define QDBUSINTERFACE_P_H #include "qdbusabstractinterface_p.h" #include "qdbusmetaobject_p.h" diff --git a/src/dbus/qdbusintrospection_p.h b/src/dbus/qdbusintrospection_p.h index 62a2d14f42..382c30c131 100644 --- a/src/dbus/qdbusintrospection_p.h +++ b/src/dbus/qdbusintrospection_p.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QDBUSINTROSPECTION_H -#define QDBUSINTROSPECTION_H +#ifndef QDBUSINTROSPECTION_P_H +#define QDBUSINTROSPECTION_P_H // // W A R N I N G diff --git a/src/dbus/qdbusmetaobject_p.h b/src/dbus/qdbusmetaobject_p.h index 98d6105c72..e1d0141166 100644 --- a/src/dbus/qdbusmetaobject_p.h +++ b/src/dbus/qdbusmetaobject_p.h @@ -51,8 +51,8 @@ // // -#ifndef QDBUSMETAOBJECTPRIVATE_H -#define QDBUSMETAOBJECTPRIVATE_H +#ifndef QDBUSMETAOBJECT_P_H +#define QDBUSMETAOBJECT_P_H #include <QtCore/qmetaobject.h> #include <qdbusmacros.h> diff --git a/src/dbus/qdbusutil_p.h b/src/dbus/qdbusutil_p.h index 3374d5fa86..04bf75c46b 100644 --- a/src/dbus/qdbusutil_p.h +++ b/src/dbus/qdbusutil_p.h @@ -50,8 +50,8 @@ // We mean it. // -#ifndef QDBUSUTIL_H -#define QDBUSUTIL_H +#ifndef QDBUSUTIL_P_H +#define QDBUSUTIL_P_H #include <QtCore/qstring.h> #include <QtCore/qvariant.h> diff --git a/src/dbus/qdbusvirtualobject.h b/src/dbus/qdbusvirtualobject.h index 90d4e75d16..8725fd664b 100644 --- a/src/dbus/qdbusvirtualobject.h +++ b/src/dbus/qdbusvirtualobject.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QDBUSTREENODE_H -#define QDBUSTREENODE_H +#ifndef QDBUSVIRTUALOBJECT_H +#define QDBUSVIRTUALOBJECT_H #include <QtDBus/qdbusmacros.h> #include <QtCore/qstring.h> diff --git a/src/dbus/qdbusxmlparser_p.h b/src/dbus/qdbusxmlparser_p.h index fe82eaf2cf..5d3635c28c 100644 --- a/src/dbus/qdbusxmlparser_p.h +++ b/src/dbus/qdbusxmlparser_p.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QDBUSXMLPARSER_H -#define QDBUSXMLPARSER_H +#ifndef QDBUSXMLPARSER_P_H +#define QDBUSXMLPARSER_P_H // // W A R N I N G |