[Telepathy-commits] [telepathy-qt4/master] Add additional header guards to the pretty include headers for clarity

Olli Salli olli.salli at collabora.co.uk
Mon Sep 29 14:01:11 PDT 2008 

---
 TelepathyQt4/Client/Channel                   |    5 +++++
 TelepathyQt4/Client/Connection                |    5 +++++
 TelepathyQt4/Client/ConnectionManager         |    5 +++++
 TelepathyQt4/Client/DBus                      |    5 +++++
 TelepathyQt4/Client/MediaSessionHandler       |    5 +++++
 TelepathyQt4/Client/MediaStreamHandler        |    5 +++++
 TelepathyQt4/Client/OptionalInterfaceFactory  |    5 +++++
 TelepathyQt4/Client/Properties                |    5 +++++
 TelepathyQt4/Constants                        |    5 +++++
 TelepathyQt4/Debug                            |    5 +++++
 TelepathyQt4/Types                            |    5 +++++
 TelepathyQt4/cli-channel.h                    |    4 ++--
 TelepathyQt4/cli-connection-manager.h         |    4 ++--
 TelepathyQt4/cli-connection.h                 |    4 ++--
 TelepathyQt4/cli-dbus.h                       |    4 ++--
 TelepathyQt4/cli-media-session-handler.h      |    4 ++--
 TelepathyQt4/cli-media-stream-handler.h       |    4 ++--
 TelepathyQt4/cli-optional-interface-factory.h |    4 ++--
 TelepathyQt4/cli-properties.h                 |    4 ++--
 TelepathyQt4/constants.h                      |    4 ++--
 TelepathyQt4/debug.h                          |    4 ++--
 TelepathyQt4/types.h                          |    4 ++--
 22 files changed, 77 insertions(+), 22 deletions(-)

diff --git a/TelepathyQt4/Client/Channel b/TelepathyQt4/Client/Channel
index 4aa29bb..f804921 100644
--- a/TelepathyQt4/Client/Channel
+++ b/TelepathyQt4/Client/Channel
@@ -1 +1,6 @@
+#ifndef _TelepathyQt4_Client_Channel_HEADER_GUARD_
+#define _TelepathyQt4_Client_Channel_HEADER_GUARD_
+
 #include <TelepathyQt4/cli-channel.h>
+
+#endif
diff --git a/TelepathyQt4/Client/Connection b/TelepathyQt4/Client/Connection
index 623297c..6c22f58 100644
--- a/TelepathyQt4/Client/Connection
+++ b/TelepathyQt4/Client/Connection
@@ -1 +1,6 @@
+#ifndef _TelepathyQt4_Client_Connection_HEADER_GUARD_
+#define _TelepathyQt4_Client_Connection_HEADER_GUARD_
+
 #include <TelepathyQt4/cli-connection.h>
+
+#endif
diff --git a/TelepathyQt4/Client/ConnectionManager b/TelepathyQt4/Client/ConnectionManager
index 740e3d9..262aa8b 100644
--- a/TelepathyQt4/Client/ConnectionManager
+++ b/TelepathyQt4/Client/ConnectionManager
@@ -1 +1,6 @@
+#ifndef _TelepathyQt4_Client_ConnectionManager_HEADER_GUARD_
+#define _TelepathyQt4_Client_ConnectionManager_HEADER_GUARD_
+
 #include <TelepathyQt4/cli-connection-manager.h>
+
+#endif
diff --git a/TelepathyQt4/Client/DBus b/TelepathyQt4/Client/DBus
index 27ba184..1b9ba3e 100644
--- a/TelepathyQt4/Client/DBus
+++ b/TelepathyQt4/Client/DBus
@@ -1 +1,6 @@
+#ifndef _TelepathyQt4_Client_DBus_HEADER_GUARD_
+#define _TelepathyQt4_Client_DBus_HEADER_GUARD_
+
 #include <TelepathyQt4/cli-dbus.h>
+
+#endif
diff --git a/TelepathyQt4/Client/MediaSessionHandler b/TelepathyQt4/Client/MediaSessionHandler
index 6d4a006..c7fe9f2 100644
--- a/TelepathyQt4/Client/MediaSessionHandler
+++ b/TelepathyQt4/Client/MediaSessionHandler
@@ -1 +1,6 @@
+#ifndef _TelepathyQt4_Client_MediaSessionHandler_HEADER_GUARD_
+#define _TelepathyQt4_Client_MediaSessionHandler_HEADER_GUARD_
+
 #include <TelepathyQt4/cli-media-session-handler.h>
+
+#endif
diff --git a/TelepathyQt4/Client/MediaStreamHandler b/TelepathyQt4/Client/MediaStreamHandler
index cb5021f..edd1dd6 100644
--- a/TelepathyQt4/Client/MediaStreamHandler
+++ b/TelepathyQt4/Client/MediaStreamHandler
@@ -1 +1,6 @@
+#ifndef _TelepathyQt4_Client_MediaStreamHandler_HEADER_GUARD_
+#define _TelepathyQt4_Client_MediaStreamHandler_HEADER_GUARD_
+
 #include <TelepathyQt4/cli-media-stream-handler.h>
+
+#endif
diff --git a/TelepathyQt4/Client/OptionalInterfaceFactory b/TelepathyQt4/Client/OptionalInterfaceFactory
index c60b34c..00c06e5 100644
--- a/TelepathyQt4/Client/OptionalInterfaceFactory
+++ b/TelepathyQt4/Client/OptionalInterfaceFactory
@@ -1 +1,6 @@
+#ifndef _TelepathyQt4_Client_OptionalInterfaceFactory_HEADER_GUARD_
+#define _TelepathyQt4_Client_OptionalInterfaceFactory_HEADER_GUARD_
+
 #include <TelepathyQt4/cli-optional-interface-factory.h>
+
+#endif
diff --git a/TelepathyQt4/Client/Properties b/TelepathyQt4/Client/Properties
index 5c70bb8..788ba2a 100644
--- a/TelepathyQt4/Client/Properties
+++ b/TelepathyQt4/Client/Properties
@@ -1 +1,6 @@
+#ifndef _TelepathyQt4_Client_Properties_HEADER_GUARD_
+#define _TelepathyQt4_Client_Properties_HEADER_GUARD_
+
 #include <TelepathyQt4/cli-properties.h>
+
+#endif
diff --git a/TelepathyQt4/Constants b/TelepathyQt4/Constants
index aee4491..a7c46f3 100644
--- a/TelepathyQt4/Constants
+++ b/TelepathyQt4/Constants
@@ -1 +1,6 @@
+#ifndef _TelepathyQt4_Constants_HEADER_GUARD_
+#define _TelepathyQt4_Constants_HEADER_GUARD_
+
 #include <TelepathyQt4/constants.h>
+
+#endif
diff --git a/TelepathyQt4/Debug b/TelepathyQt4/Debug
index 5549699..52d9490 100644
--- a/TelepathyQt4/Debug
+++ b/TelepathyQt4/Debug
@@ -1 +1,6 @@
+#ifndef _TelepathyQt4_Debug_HEADER_GUARD_
+#define _TelepathyQt4_Debug_HEADER_GUARD_
+
 #include <TelepathyQt4/debug.h>
+
+#endif
diff --git a/TelepathyQt4/Types b/TelepathyQt4/Types
index 7417408..23da39b 100644
--- a/TelepathyQt4/Types
+++ b/TelepathyQt4/Types
@@ -1 +1,6 @@
+#ifndef _TelepathyQt4_Types_HEADER_GUARD_
+#define _TelepathyQt4_Types_HEADER_GUARD_
+
 #include <TelepathyQt4/types.h>
+
+#endif
diff --git a/TelepathyQt4/cli-channel.h b/TelepathyQt4/cli-channel.h
index 7fdd6b8..2bb7283 100644
--- a/TelepathyQt4/cli-channel.h
+++ b/TelepathyQt4/cli-channel.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TelepathyQt4_Client_Channel_HEADER_GUARD_
-#define _TelepathyQt4_Client_Channel_HEADER_GUARD_
+#ifndef _TelepathyQt4_cli_channel_h_HEADER_GUARD_
+#define _TelepathyQt4_cli_channel_h_HEADER_GUARD_
 
 /**
  * \addtogroup clientsideproxies Client-side proxies
diff --git a/TelepathyQt4/cli-connection-manager.h b/TelepathyQt4/cli-connection-manager.h
index 6b9cb15..97b8095 100644
--- a/TelepathyQt4/cli-connection-manager.h
+++ b/TelepathyQt4/cli-connection-manager.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TelepathyQt4_Client_ConnectionManager_HEADER_GUARD_
-#define _TelepathyQt4_Client_ConnectionManager_HEADER_GUARD_
+#ifndef _TelepathyQt4_cli_connection_manager_h_HEADER_GUARD_
+#define _TelepathyQt4_cli_connection_manager_h_HEADER_GUARD_
 
 /**
  * \addtogroup clientsideproxies Client-side proxies
diff --git a/TelepathyQt4/cli-connection.h b/TelepathyQt4/cli-connection.h
index ea8961d..5180203 100644
--- a/TelepathyQt4/cli-connection.h
+++ b/TelepathyQt4/cli-connection.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TelepathyQt4_Client_Connection_HEADER_GUARD_
-#define _TelepathyQt4_Client_Connection_HEADER_GUARD_
+#ifndef _TelepathyQt4_cli_connection_h_HEADER_GUARD_
+#define _TelepathyQt4_cli_connection_h_HEADER_GUARD_
 
 /**
  * \addtogroup clientsideproxies Client-side proxies
diff --git a/TelepathyQt4/cli-dbus.h b/TelepathyQt4/cli-dbus.h
index bc2e640..f6bc513 100644
--- a/TelepathyQt4/cli-dbus.h
+++ b/TelepathyQt4/cli-dbus.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TelepathyQt4_Client_DBus_HEADER_GUARD_
-#define _TelepathyQt4_Client_DBus_HEADER_GUARD_
+#ifndef _TelepathyQt4_cli_dbus_h_HEADER_GUARD_
+#define _TelepathyQt4_cli_dbus_h_HEADER_GUARD_
 
 /**
  * \addtogroup clientsideproxies Client-side proxies
diff --git a/TelepathyQt4/cli-media-session-handler.h b/TelepathyQt4/cli-media-session-handler.h
index 6b0e877..e566c60 100644
--- a/TelepathyQt4/cli-media-session-handler.h
+++ b/TelepathyQt4/cli-media-session-handler.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TelepathyQt4_Client_MediaSessionHandler_HEADER_GUARD_
-#define _TelepathyQt4_Client_MediaSessionHandler_HEADER_GUARD_
+#ifndef _TelepathyQt4_cli_media_session_handler_h_HEADER_GUARD_
+#define _TelepathyQt4_cli_media_session_handler_h_HEADER_GUARD_
 
 /**
  * \addtogroup clientsideproxies Client-side proxies
diff --git a/TelepathyQt4/cli-media-stream-handler.h b/TelepathyQt4/cli-media-stream-handler.h
index 020b6d5..58903b7 100644
--- a/TelepathyQt4/cli-media-stream-handler.h
+++ b/TelepathyQt4/cli-media-stream-handler.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TelepathyQt4_Client_MediaStreamHandler_HEADER_GUARD_
-#define _TelepathyQt4_Client_MediaStreamHandler_HEADER_GUARD_
+#ifndef _TelepathyQt4_cli_media_stream_handler_h_HEADER_GUARD_
+#define _TelepathyQt4_cli_media_stream_handler_h_HEADER_GUARD_
 
 /**
  * \addtogroup clientsideproxies Client-side proxies
diff --git a/TelepathyQt4/cli-optional-interface-factory.h b/TelepathyQt4/cli-optional-interface-factory.h
index df734f1..ce6256c 100644
--- a/TelepathyQt4/cli-optional-interface-factory.h
+++ b/TelepathyQt4/cli-optional-interface-factory.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TelepathyQt4_Client_OptionalInterfaceFactory_HEADER_GUARD_
-#define _TelepathyQt4_Client_OptionalInterfaceFactory_HEADER_GUARD_
+#ifndef _TelepathyQt4_cli_optional_interface_factory_h_HEADER_GUARD_
+#define _TelepathyQt4_cli_optional_interface_factory_h_HEADER_GUARD_
 
 /**
  * \addtogroup clientsideproxies Client-side proxies
diff --git a/TelepathyQt4/cli-properties.h b/TelepathyQt4/cli-properties.h
index 1caedd0..23c85ac 100644
--- a/TelepathyQt4/cli-properties.h
+++ b/TelepathyQt4/cli-properties.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TelepathyQt4_Client_Properties_HEADER_GUARD_
-#define _TelepathyQt4_Client_Properties_HEADER_GUARD_
+#ifndef _TelepathyQt4_cli_properties_h_HEADER_GUARD_
+#define _TelepathyQt4_cli_properties_h_HEADER_GUARD_
 
 /**
  * \addtogroup clientsideproxies Client-side proxies
diff --git a/TelepathyQt4/constants.h b/TelepathyQt4/constants.h
index 554e116..56b0152 100644
--- a/TelepathyQt4/constants.h
+++ b/TelepathyQt4/constants.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TelepathyQt4_Constants_HEADER_GUARD_
-#define _TelepathyQt4_Constants_HEADER_GUARD_
+#ifndef _TelepathyQt4_constants_h_HEADER_GUARD_
+#define _TelepathyQt4_constants_h_HEADER_GUARD_
 
 /**
  * \addtogroup typesconstants Types and constants
diff --git a/TelepathyQt4/debug.h b/TelepathyQt4/debug.h
index 22063a8..de32404 100644
--- a/TelepathyQt4/debug.h
+++ b/TelepathyQt4/debug.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TelepathyQt4_Debug_HEADER_GUARD_
-#define _TelepathyQt4_Debug_HEADER_GUARD_
+#ifndef _TelepathyQt4_debug_h_HEADER_GUARD_
+#define _TelepathyQt4_debug_h_HEADER_GUARD_
 
 /**
  * \defgroup debug Common debug support
diff --git a/TelepathyQt4/types.h b/TelepathyQt4/types.h
index 4db274a..2ab1d9d 100644
--- a/TelepathyQt4/types.h
+++ b/TelepathyQt4/types.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TelepathyQt4_Types_HEADER_GUARD_
-#define _TelepathyQt4_Types_HEADER_GUARD_
+#ifndef _TelepathyQt4_types_h_HEADER_GUARD_
+#define _TelepathyQt4_types_h_HEADER_GUARD_
 
 #include <TelepathyQt4/_gen/types.h>
 
-- 
1.5.6.5

More information about the Telepathy-commits mailing list