[telepathy-qt4/master] Removed cli/Client from header guards.
Andre Moreira Magalhaes (andrunko)
andre.magalhaes at collabora.co.uk
Thu Aug 6 04:44:34 PDT 2009
---
TelepathyQt4/AbstractClient | 4 ++--
TelepathyQt4/AbstractClientApprover | 4 ++--
TelepathyQt4/AbstractClientHandler | 4 ++--
TelepathyQt4/AbstractClientObserver | 4 ++--
TelepathyQt4/AbstractInterface | 4 ++--
TelepathyQt4/Account | 4 ++--
TelepathyQt4/AccountInterface | 4 ++--
TelepathyQt4/AccountManager | 4 ++--
TelepathyQt4/AccountManagerInterface | 4 ++--
TelepathyQt4/Channel | 4 ++--
TelepathyQt4/ChannelDispatchOperation | 4 ++--
TelepathyQt4/ChannelDispatchOperationInterface | 4 ++--
TelepathyQt4/ChannelDispatcher | 4 ++--
TelepathyQt4/ChannelDispatcherInterface | 4 ++--
TelepathyQt4/ChannelInterface | 4 ++--
TelepathyQt4/ChannelInterfaceCallStateInterface | 4 ++--
TelepathyQt4/ChannelInterfaceChatStateInterface | 4 ++--
TelepathyQt4/ChannelInterfaceDTMFInterface | 4 ++--
TelepathyQt4/ChannelInterfaceGroupInterface | 4 ++--
TelepathyQt4/ChannelInterfaceHoldInterface | 4 ++--
.../ChannelInterfaceMediaSignallingInterface | 4 ++--
TelepathyQt4/ChannelInterfacePasswordInterface | 4 ++--
TelepathyQt4/ChannelRequest | 4 ++--
TelepathyQt4/ChannelRequestInterface | 4 ++--
TelepathyQt4/ChannelTypeContactListInterface | 4 ++--
TelepathyQt4/ChannelTypeRoomListInterface | 4 ++--
TelepathyQt4/ChannelTypeStreamedMediaInterface | 4 ++--
TelepathyQt4/ChannelTypeTextInterface | 4 ++--
TelepathyQt4/ChannelTypeTubesInterface | 4 ++--
TelepathyQt4/Client | 4 ++--
TelepathyQt4/ClientApproverInterface | 4 ++--
TelepathyQt4/ClientHandlerInterface | 4 ++--
TelepathyQt4/ClientInterface | 4 ++--
TelepathyQt4/ClientInterfaceRequestsInterface | 4 ++--
TelepathyQt4/ClientObserverInterface | 4 ++--
TelepathyQt4/ClientRegistrar | 4 ++--
TelepathyQt4/Connection | 4 ++--
TelepathyQt4/ConnectionInterface | 4 ++--
TelepathyQt4/ConnectionInterfaceAliasingInterface | 4 ++--
TelepathyQt4/ConnectionInterfaceAvatarsInterface | 4 ++--
.../ConnectionInterfaceCapabilitiesInterface | 4 ++--
TelepathyQt4/ConnectionInterfaceContactsInterface | 4 ++--
TelepathyQt4/ConnectionInterfacePresenceInterface | 4 ++--
TelepathyQt4/ConnectionInterfaceRequestsInterface | 4 ++--
.../ConnectionInterfaceSimplePresenceInterface | 4 ++--
TelepathyQt4/ConnectionManager | 4 ++--
TelepathyQt4/ConnectionManagerInterface | 4 ++--
TelepathyQt4/Contact | 4 ++--
TelepathyQt4/ContactManager | 4 ++--
TelepathyQt4/DBus | 4 ++--
TelepathyQt4/DBusDaemonInterface | 4 ++--
TelepathyQt4/DBusProxy | 4 ++--
TelepathyQt4/Feature | 4 ++--
TelepathyQt4/FileTransferChannel | 4 ++--
TelepathyQt4/IntrospectableInterface | 4 ++--
TelepathyQt4/MediaSessionHandler | 4 ++--
TelepathyQt4/MediaSessionHandlerInterface | 4 ++--
TelepathyQt4/MediaStreamHandler | 4 ++--
TelepathyQt4/MediaStreamHandlerInterface | 4 ++--
TelepathyQt4/Message | 4 ++--
TelepathyQt4/MethodInvocationContext | 4 ++--
TelepathyQt4/OptionalInterfaceFactory | 4 ++--
TelepathyQt4/PeerInterface | 4 ++--
TelepathyQt4/PendingAccount | 4 ++--
TelepathyQt4/PendingChannel | 4 ++--
TelepathyQt4/PendingChannelRequest | 4 ++--
TelepathyQt4/PendingConnection | 4 ++--
TelepathyQt4/PendingContactAttributes | 4 ++--
TelepathyQt4/PendingContacts | 4 ++--
TelepathyQt4/PendingFailure | 4 ++--
TelepathyQt4/PendingHandles | 4 ++--
TelepathyQt4/PendingOperation | 4 ++--
TelepathyQt4/PendingReady | 4 ++--
TelepathyQt4/PendingStringList | 4 ++--
TelepathyQt4/PendingSuccess | 4 ++--
TelepathyQt4/PendingVoidMethodCall | 4 ++--
TelepathyQt4/Properties | 4 ++--
TelepathyQt4/PropertiesInterface | 4 ++--
TelepathyQt4/PropertiesInterfaceInterface | 4 ++--
TelepathyQt4/ReadinessHelper | 4 ++--
TelepathyQt4/ReadyObject | 4 ++--
TelepathyQt4/ReceivedMessage | 4 ++--
TelepathyQt4/ReferencedHandles | 4 ++--
TelepathyQt4/ReferencedHandlesIterator | 4 ++--
TelepathyQt4/RoomListChannel | 4 ++--
TelepathyQt4/StatefulDBusProxy | 4 ++--
TelepathyQt4/StatelessDBusProxy | 4 ++--
TelepathyQt4/StreamedMediaChannel | 4 ++--
TelepathyQt4/TextChannel | 4 ++--
TelepathyQt4/abstract-client.h | 4 ++--
TelepathyQt4/abstract-interface.h | 4 ++--
TelepathyQt4/account-manager.h | 4 ++--
TelepathyQt4/account.h | 4 ++--
TelepathyQt4/channel-dispatch-operation.h | 4 ++--
TelepathyQt4/channel-dispatcher.h | 4 ++--
TelepathyQt4/channel-factory.h | 4 ++--
TelepathyQt4/channel-request.h | 4 ++--
TelepathyQt4/channel.h | 4 ++--
TelepathyQt4/client-registrar-internal.h | 4 ++--
TelepathyQt4/client-registrar.h | 4 ++--
TelepathyQt4/client.h | 4 ++--
TelepathyQt4/connection-internal.h | 4 ++--
TelepathyQt4/connection-manager-internal.h | 4 ++--
TelepathyQt4/connection-manager.h | 4 ++--
TelepathyQt4/connection.h | 4 ++--
TelepathyQt4/contact-manager-internal.h | 4 ++--
TelepathyQt4/contact-manager.h | 4 ++--
TelepathyQt4/contact.h | 4 ++--
TelepathyQt4/dbus-proxy.h | 4 ++--
TelepathyQt4/dbus.h | 4 ++--
TelepathyQt4/feature.h | 4 ++--
TelepathyQt4/file-transfer-channel.h | 4 ++--
TelepathyQt4/media-session-handler.h | 4 ++--
TelepathyQt4/media-stream-handler.h | 4 ++--
TelepathyQt4/message.h | 4 ++--
TelepathyQt4/method-invocation-context.h | 4 ++--
TelepathyQt4/optional-interface-factory.h | 4 ++--
TelepathyQt4/pending-account.h | 4 ++--
TelepathyQt4/pending-channel-request-internal.h | 4 ++--
TelepathyQt4/pending-channel-request.h | 4 ++--
TelepathyQt4/pending-channel.h | 4 ++--
TelepathyQt4/pending-connection.h | 4 ++--
TelepathyQt4/pending-contact-attributes.h | 4 ++--
TelepathyQt4/pending-contacts.h | 4 ++--
TelepathyQt4/pending-handles.h | 4 ++--
TelepathyQt4/pending-operation.h | 4 ++--
TelepathyQt4/pending-ready.h | 4 ++--
TelepathyQt4/pending-string-list.h | 4 ++--
TelepathyQt4/properties.h | 4 ++--
TelepathyQt4/readiness-helper.h | 4 ++--
TelepathyQt4/ready-object.h | 4 ++--
TelepathyQt4/referenced-handles.h | 4 ++--
TelepathyQt4/room-list-channel.h | 4 ++--
TelepathyQt4/simple-pending-operations.h | 4 ++--
TelepathyQt4/streamed-media-channel.h | 4 ++--
TelepathyQt4/text-channel.h | 4 ++--
136 files changed, 272 insertions(+), 272 deletions(-)
diff --git a/TelepathyQt4/AbstractClient b/TelepathyQt4/AbstractClient
index c06bc99..20eff9b 100644
--- a/TelepathyQt4/AbstractClient
+++ b/TelepathyQt4/AbstractClient
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_AbstractClient_HEADER_GUARD_
-#define _TelepathyQt4_Client_AbstractClient_HEADER_GUARD_
+#ifndef _TelepathyQt4_AbstractClient_HEADER_GUARD_
+#define _TelepathyQt4_AbstractClient_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/AbstractClientApprover b/TelepathyQt4/AbstractClientApprover
index 2f1ead7..cb08beb 100644
--- a/TelepathyQt4/AbstractClientApprover
+++ b/TelepathyQt4/AbstractClientApprover
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_AbstractClientApprover_HEADER_GUARD_
-#define _TelepathyQt4_Client_AbstractClientApprover_HEADER_GUARD_
+#ifndef _TelepathyQt4_AbstractClientApprover_HEADER_GUARD_
+#define _TelepathyQt4_AbstractClientApprover_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/AbstractClientHandler b/TelepathyQt4/AbstractClientHandler
index b5d7108..9df1d6b 100644
--- a/TelepathyQt4/AbstractClientHandler
+++ b/TelepathyQt4/AbstractClientHandler
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_AbstractClientHandler_HEADER_GUARD_
-#define _TelepathyQt4_Client_AbstractClientHandler_HEADER_GUARD_
+#ifndef _TelepathyQt4_AbstractClientHandler_HEADER_GUARD_
+#define _TelepathyQt4_AbstractClientHandler_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/AbstractClientObserver b/TelepathyQt4/AbstractClientObserver
index 273128c..5ecdfde 100644
--- a/TelepathyQt4/AbstractClientObserver
+++ b/TelepathyQt4/AbstractClientObserver
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_AbstractClientObserver_HEADER_GUARD_
-#define _TelepathyQt4_Client_AbstractClientObserver_HEADER_GUARD_
+#ifndef _TelepathyQt4_AbstractClientObserver_HEADER_GUARD_
+#define _TelepathyQt4_AbstractClientObserver_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/AbstractInterface b/TelepathyQt4/AbstractInterface
index 91b20d4..0050367 100644
--- a/TelepathyQt4/AbstractInterface
+++ b/TelepathyQt4/AbstractInterface
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_AbstractInterface_HEADER_GUARD_
-#define _TelepathyQt4_Client_AbstractInterface_HEADER_GUARD_
+#ifndef _TelepathyQt4_AbstractInterface_HEADER_GUARD_
+#define _TelepathyQt4_AbstractInterface_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Account b/TelepathyQt4/Account
index 11b684b..ed84b84 100644
--- a/TelepathyQt4/Account
+++ b/TelepathyQt4/Account
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_Account_HEADER_GUARD_
-#define _TelepathyQt4_Client_Account_HEADER_GUARD_
+#ifndef _TelepathyQt4_Account_HEADER_GUARD_
+#define _TelepathyQt4_Account_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/AccountInterface b/TelepathyQt4/AccountInterface
index d592a9b..98c0810 100644
--- a/TelepathyQt4/AccountInterface
+++ b/TelepathyQt4/AccountInterface
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_AccountInterface_HEADER_GUARD_
-#define _TelepathyQt4_Client_AccountInterface_HEADER_GUARD_
+#ifndef _TelepathyQt4_AccountInterface_HEADER_GUARD_
+#define _TelepathyQt4_AccountInterface_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/AccountManager b/TelepathyQt4/AccountManager
index 7944bc5..e52538c 100644
--- a/TelepathyQt4/AccountManager
+++ b/TelepathyQt4/AccountManager
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_AccountManager_HEADER_GUARD_
-#define _TelepathyQt4_Client_AccountManager_HEADER_GUARD_
+#ifndef _TelepathyQt4_AccountManager_HEADER_GUARD_
+#define _TelepathyQt4_AccountManager_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/AccountManagerInterface b/TelepathyQt4/AccountManagerInterface
index 057abc4..b8101e5 100644
--- a/TelepathyQt4/AccountManagerInterface
+++ b/TelepathyQt4/AccountManagerInterface
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_AccountManagerInterface_HEADER_GUARD_
-#define _TelepathyQt4_Client_AccountManagerInterface_HEADER_GUARD_
+#ifndef _TelepathyQt4_AccountManagerInterface_HEADER_GUARD_
+#define _TelepathyQt4_AccountManagerInterface_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Channel b/TelepathyQt4/Channel
index de507e9..21b13c0 100644
--- a/TelepathyQt4/Channel
+++ b/TelepathyQt4/Channel
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_Channel_HEADER_GUARD_
-#define _TelepathyQt4_Client_Channel_HEADER_GUARD_
+#ifndef _TelepathyQt4_Channel_HEADER_GUARD_
+#define _TelepathyQt4_Channel_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ChannelDispatchOperation b/TelepathyQt4/ChannelDispatchOperation
index dc85b75..e897f20 100644
--- a/TelepathyQt4/ChannelDispatchOperation
+++ b/TelepathyQt4/ChannelDispatchOperation
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_ChannelDispatchOperation_HEADER_GUARD_
-#define _TelepathyQt4_Client_ChannelDispatchOperation_HEADER_GUARD_
+#ifndef _TelepathyQt4_ChannelDispatchOperation_HEADER_GUARD_
+#define _TelepathyQt4_ChannelDispatchOperation_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ChannelDispatchOperationInterface b/TelepathyQt4/ChannelDispatchOperationInterface
index b45e4fc..1c1ca52 100644
--- a/TelepathyQt4/ChannelDispatchOperationInterface
+++ b/TelepathyQt4/ChannelDispatchOperationInterface
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_ChannelDispatchOperationInterface_HEADER_GUARD_
-#define _TelepathyQt4_Client_ChannelDispatchOperationInterface_HEADER_GUARD_
+#ifndef _TelepathyQt4_ChannelDispatchOperationInterface_HEADER_GUARD_
+#define _TelepathyQt4_ChannelDispatchOperationInterface_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ChannelDispatcher b/TelepathyQt4/ChannelDispatcher
index 1b60a99..8ae6f01 100644
--- a/TelepathyQt4/ChannelDispatcher
+++ b/TelepathyQt4/ChannelDispatcher
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_ChannelDispatcher_HEADER_GUARD_
-#define _TelepathyQt4_Client_ChannelDispatcher_HEADER_GUARD_
+#ifndef _TelepathyQt4_ChannelDispatcher_HEADER_GUARD_
+#define _TelepathyQt4_ChannelDispatcher_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ChannelDispatcherInterface b/TelepathyQt4/ChannelDispatcherInterface
index 99d951c..0a795de 100644
--- a/TelepathyQt4/ChannelDispatcherInterface
+++ b/TelepathyQt4/ChannelDispatcherInterface
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_ChannelDispatcherInterface_HEADER_GUARD_
-#define _TelepathyQt4_Client_ChannelDispatcherInterface_HEADER_GUARD_
+#ifndef _TelepathyQt4_ChannelDispatcherInterface_HEADER_GUARD_
+#define _TelepathyQt4_ChannelDispatcherInterface_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ChannelInterface b/TelepathyQt4/ChannelInterface
index 4c61264..1425366 100644
--- a/TelepathyQt4/ChannelInterface
+++ b/TelepathyQt4/ChannelInterface
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_ChannelInterface_HEADER_GUARD_
-#define _TelepathyQt4_Client_ChannelInterface_HEADER_GUARD_
+#ifndef _TelepathyQt4_ChannelInterface_HEADER_GUARD_
+#define _TelepathyQt4_ChannelInterface_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ChannelInterfaceCallStateInterface b/TelepathyQt4/ChannelInterfaceCallStateInterface
index d035c25..8bdcbf2 100644
--- a/TelepathyQt4/ChannelInterfaceCallStateInterface
+++ b/TelepathyQt4/ChannelInterfaceCallStateInterface
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_ChannelInterfaceCallStateInterface_HEADER_GUARD_
-#define _TelepathyQt4_Client_ChannelInterfaceCallStateInterface_HEADER_GUARD_
+#ifndef _TelepathyQt4_ChannelInterfaceCallStateInterface_HEADER_GUARD_
+#define _TelepathyQt4_ChannelInterfaceCallStateInterface_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ChannelInterfaceChatStateInterface b/TelepathyQt4/ChannelInterfaceChatStateInterface
index 6511af4..25435ac 100644
--- a/TelepathyQt4/ChannelInterfaceChatStateInterface
+++ b/TelepathyQt4/ChannelInterfaceChatStateInterface
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_ChannelInterfaceChatStateInterface_HEADER_GUARD_
-#define _TelepathyQt4_Client_ChannelInterfaceChatStateInterface_HEADER_GUARD_
+#ifndef _TelepathyQt4_ChannelInterfaceChatStateInterface_HEADER_GUARD_
+#define _TelepathyQt4_ChannelInterfaceChatStateInterface_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ChannelInterfaceDTMFInterface b/TelepathyQt4/ChannelInterfaceDTMFInterface
index 846f7f0..2e2f1b5 100644
--- a/TelepathyQt4/ChannelInterfaceDTMFInterface
+++ b/TelepathyQt4/ChannelInterfaceDTMFInterface
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_ChannelInterfaceDTMFInterface_HEADER_GUARD_
-#define _TelepathyQt4_Client_ChannelInterfaceDTMFInterface_HEADER_GUARD_
+#ifndef _TelepathyQt4_ChannelInterfaceDTMFInterface_HEADER_GUARD_
+#define _TelepathyQt4_ChannelInterfaceDTMFInterface_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ChannelInterfaceGroupInterface b/TelepathyQt4/ChannelInterfaceGroupInterface
index 4a9c48e..0f01d77 100644
--- a/TelepathyQt4/ChannelInterfaceGroupInterface
+++ b/TelepathyQt4/ChannelInterfaceGroupInterface
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_ChannelInterfaceGroupInterface_HEADER_GUARD_
-#define _TelepathyQt4_Client_ChannelInterfaceGroupInterface_HEADER_GUARD_
+#ifndef _TelepathyQt4_ChannelInterfaceGroupInterface_HEADER_GUARD_
+#define _TelepathyQt4_ChannelInterfaceGroupInterface_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ChannelInterfaceHoldInterface b/TelepathyQt4/ChannelInterfaceHoldInterface
index 17d81b5..b75296e 100644
--- a/TelepathyQt4/ChannelInterfaceHoldInterface
+++ b/TelepathyQt4/ChannelInterfaceHoldInterface
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_ChannelInterfaceHoldInterface_HEADER_GUARD_
-#define _TelepathyQt4_Client_ChannelInterfaceHoldInterface_HEADER_GUARD_
+#ifndef _TelepathyQt4_ChannelInterfaceHoldInterface_HEADER_GUARD_
+#define _TelepathyQt4_ChannelInterfaceHoldInterface_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ChannelInterfaceMediaSignallingInterface b/TelepathyQt4/ChannelInterfaceMediaSignallingInterface
index 07f52f2..f42fe5e 100644
--- a/TelepathyQt4/ChannelInterfaceMediaSignallingInterface
+++ b/TelepathyQt4/ChannelInterfaceMediaSignallingInterface
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_ChannelInterfaceMediaSignallingInterface_HEADER_GUARD_
-#define _TelepathyQt4_Client_ChannelInterfaceMediaSignallingInterface_HEADER_GUARD_
+#ifndef _TelepathyQt4_ChannelInterfaceMediaSignallingInterface_HEADER_GUARD_
+#define _TelepathyQt4_ChannelInterfaceMediaSignallingInterface_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ChannelInterfacePasswordInterface b/TelepathyQt4/ChannelInterfacePasswordInterface
index a0b23dd..e54034a 100644
--- a/TelepathyQt4/ChannelInterfacePasswordInterface
+++ b/TelepathyQt4/ChannelInterfacePasswordInterface
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_ChannelInterfacePasswordInterface_HEADER_GUARD_
-#define _TelepathyQt4_Client_ChannelInterfacePasswordInterface_HEADER_GUARD_
+#ifndef _TelepathyQt4_ChannelInterfacePasswordInterface_HEADER_GUARD_
+#define _TelepathyQt4_ChannelInterfacePasswordInterface_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ChannelRequest b/TelepathyQt4/ChannelRequest
index 9fb2379..7878fec 100644
--- a/TelepathyQt4/ChannelRequest
+++ b/TelepathyQt4/ChannelRequest
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_ChannelRequest_HEADER_GUARD_
-#define _TelepathyQt4_Client_ChannelRequest_HEADER_GUARD_
+#ifndef _TelepathyQt4_ChannelRequest_HEADER_GUARD_
+#define _TelepathyQt4_ChannelRequest_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ChannelRequestInterface b/TelepathyQt4/ChannelRequestInterface
index cfa2d2d..67c059e 100644
--- a/TelepathyQt4/ChannelRequestInterface
+++ b/TelepathyQt4/ChannelRequestInterface
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_ChannelRequestInterface_HEADER_GUARD_
-#define _TelepathyQt4_Client_ChannelRequestInterface_HEADER_GUARD_
+#ifndef _TelepathyQt4_ChannelRequestInterface_HEADER_GUARD_
+#define _TelepathyQt4_ChannelRequestInterface_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ChannelTypeContactListInterface b/TelepathyQt4/ChannelTypeContactListInterface
index eb870d9..794da77 100644
--- a/TelepathyQt4/ChannelTypeContactListInterface
+++ b/TelepathyQt4/ChannelTypeContactListInterface
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_ChannelTypeContactListInterface_HEADER_GUARD_
-#define _TelepathyQt4_Client_ChannelTypeContactListInterface_HEADER_GUARD_
+#ifndef _TelepathyQt4_ChannelTypeContactListInterface_HEADER_GUARD_
+#define _TelepathyQt4_ChannelTypeContactListInterface_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ChannelTypeRoomListInterface b/TelepathyQt4/ChannelTypeRoomListInterface
index be71301..45dbf0b 100644
--- a/TelepathyQt4/ChannelTypeRoomListInterface
+++ b/TelepathyQt4/ChannelTypeRoomListInterface
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_ChannelTypeRoomListInterface_HEADER_GUARD_
-#define _TelepathyQt4_Client_ChannelTypeRoomListInterface_HEADER_GUARD_
+#ifndef _TelepathyQt4_ChannelTypeRoomListInterface_HEADER_GUARD_
+#define _TelepathyQt4_ChannelTypeRoomListInterface_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ChannelTypeStreamedMediaInterface b/TelepathyQt4/ChannelTypeStreamedMediaInterface
index 7a18cad..be065b9 100644
--- a/TelepathyQt4/ChannelTypeStreamedMediaInterface
+++ b/TelepathyQt4/ChannelTypeStreamedMediaInterface
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_ChannelTypeStreamedMediaInterface_HEADER_GUARD_
-#define _TelepathyQt4_Client_ChannelTypeStreamedMediaInterface_HEADER_GUARD_
+#ifndef _TelepathyQt4_ChannelTypeStreamedMediaInterface_HEADER_GUARD_
+#define _TelepathyQt4_ChannelTypeStreamedMediaInterface_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ChannelTypeTextInterface b/TelepathyQt4/ChannelTypeTextInterface
index dd15f3e..bf35946 100644
--- a/TelepathyQt4/ChannelTypeTextInterface
+++ b/TelepathyQt4/ChannelTypeTextInterface
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_ChannelTypeTextInterface_HEADER_GUARD_
-#define _TelepathyQt4_Client_ChannelTypeTextInterface_HEADER_GUARD_
+#ifndef _TelepathyQt4_ChannelTypeTextInterface_HEADER_GUARD_
+#define _TelepathyQt4_ChannelTypeTextInterface_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ChannelTypeTubesInterface b/TelepathyQt4/ChannelTypeTubesInterface
index a1f2fbc..982f9e3 100644
--- a/TelepathyQt4/ChannelTypeTubesInterface
+++ b/TelepathyQt4/ChannelTypeTubesInterface
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_ChannelTypeTubesInterface_HEADER_GUARD_
-#define _TelepathyQt4_Client_ChannelTypeTubesInterface_HEADER_GUARD_
+#ifndef _TelepathyQt4_ChannelTypeTubesInterface_HEADER_GUARD_
+#define _TelepathyQt4_ChannelTypeTubesInterface_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client b/TelepathyQt4/Client
index df1577c..a819fef 100644
--- a/TelepathyQt4/Client
+++ b/TelepathyQt4/Client
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_Client_HEADER_GUARD_
-#define _TelepathyQt4_Client_Client_HEADER_GUARD_
+#ifndef _TelepathyQt4_Client_HEADER_GUARD_
+#define _TelepathyQt4_Client_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ClientApproverInterface b/TelepathyQt4/ClientApproverInterface
index 45fd8b1..2b89b41 100644
--- a/TelepathyQt4/ClientApproverInterface
+++ b/TelepathyQt4/ClientApproverInterface
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_ClientApproverInterface_HEADER_GUARD_
-#define _TelepathyQt4_Client_ClientApproverInterface_HEADER_GUARD_
+#ifndef _TelepathyQt4_ClientApproverInterface_HEADER_GUARD_
+#define _TelepathyQt4_ClientApproverInterface_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ClientHandlerInterface b/TelepathyQt4/ClientHandlerInterface
index cc62506..e6f8b50 100644
--- a/TelepathyQt4/ClientHandlerInterface
+++ b/TelepathyQt4/ClientHandlerInterface
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_ClientHandlerInterface_HEADER_GUARD_
-#define _TelepathyQt4_Client_ClientHandlerInterface_HEADER_GUARD_
+#ifndef _TelepathyQt4_ClientHandlerInterface_HEADER_GUARD_
+#define _TelepathyQt4_ClientHandlerInterface_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ClientInterface b/TelepathyQt4/ClientInterface
index 966b5e5..edc41a2 100644
--- a/TelepathyQt4/ClientInterface
+++ b/TelepathyQt4/ClientInterface
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_ClientInterface_HEADER_GUARD_
-#define _TelepathyQt4_Client_ClientInterface_HEADER_GUARD_
+#ifndef _TelepathyQt4_ClientInterface_HEADER_GUARD_
+#define _TelepathyQt4_ClientInterface_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ClientInterfaceRequestsInterface b/TelepathyQt4/ClientInterfaceRequestsInterface
index bc18d4b..7f77444 100644
--- a/TelepathyQt4/ClientInterfaceRequestsInterface
+++ b/TelepathyQt4/ClientInterfaceRequestsInterface
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_ClientInterfaceRequestsInterface_HEADER_GUARD_
-#define _TelepathyQt4_Client_ClientInterfaceRequestsInterface_HEADER_GUARD_
+#ifndef _TelepathyQt4_ClientInterfaceRequestsInterface_HEADER_GUARD_
+#define _TelepathyQt4_ClientInterfaceRequestsInterface_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ClientObserverInterface b/TelepathyQt4/ClientObserverInterface
index eeb66fe..737a61b 100644
--- a/TelepathyQt4/ClientObserverInterface
+++ b/TelepathyQt4/ClientObserverInterface
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_ClientObserverInterface_HEADER_GUARD_
-#define _TelepathyQt4_Client_ClientObserverInterface_HEADER_GUARD_
+#ifndef _TelepathyQt4_ClientObserverInterface_HEADER_GUARD_
+#define _TelepathyQt4_ClientObserverInterface_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ClientRegistrar b/TelepathyQt4/ClientRegistrar
index cfd9a2c..bde9672 100644
--- a/TelepathyQt4/ClientRegistrar
+++ b/TelepathyQt4/ClientRegistrar
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_ClientRegistrar_HEADER_GUARD_
-#define _TelepathyQt4_Client_ClientRegistrar_HEADER_GUARD_
+#ifndef _TelepathyQt4_ClientRegistrar_HEADER_GUARD_
+#define _TelepathyQt4_ClientRegistrar_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Connection b/TelepathyQt4/Connection
index 50a4096..1d2d6ba 100644
--- a/TelepathyQt4/Connection
+++ b/TelepathyQt4/Connection
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_Connection_HEADER_GUARD_
-#define _TelepathyQt4_Client_Connection_HEADER_GUARD_
+#ifndef _TelepathyQt4_Connection_HEADER_GUARD_
+#define _TelepathyQt4_Connection_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ConnectionInterface b/TelepathyQt4/ConnectionInterface
index 6956671..8db3896 100644
--- a/TelepathyQt4/ConnectionInterface
+++ b/TelepathyQt4/ConnectionInterface
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_ConnectionInterface_HEADER_GUARD_
-#define _TelepathyQt4_Client_ConnectionInterface_HEADER_GUARD_
+#ifndef _TelepathyQt4_ConnectionInterface_HEADER_GUARD_
+#define _TelepathyQt4_ConnectionInterface_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ConnectionInterfaceAliasingInterface b/TelepathyQt4/ConnectionInterfaceAliasingInterface
index 990e22e..d02ef37 100644
--- a/TelepathyQt4/ConnectionInterfaceAliasingInterface
+++ b/TelepathyQt4/ConnectionInterfaceAliasingInterface
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_ConnectionInterfaceAliasingInterface_HEADER_GUARD_
-#define _TelepathyQt4_Client_ConnectionInterfaceAliasingInterface_HEADER_GUARD_
+#ifndef _TelepathyQt4_ConnectionInterfaceAliasingInterface_HEADER_GUARD_
+#define _TelepathyQt4_ConnectionInterfaceAliasingInterface_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ConnectionInterfaceAvatarsInterface b/TelepathyQt4/ConnectionInterfaceAvatarsInterface
index 2033f92..7aad818 100644
--- a/TelepathyQt4/ConnectionInterfaceAvatarsInterface
+++ b/TelepathyQt4/ConnectionInterfaceAvatarsInterface
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_ConnectionInterfaceAvatarsInterface_HEADER_GUARD_
-#define _TelepathyQt4_Client_ConnectionInterfaceAvatarsInterface_HEADER_GUARD_
+#ifndef _TelepathyQt4_ConnectionInterfaceAvatarsInterface_HEADER_GUARD_
+#define _TelepathyQt4_ConnectionInterfaceAvatarsInterface_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ConnectionInterfaceCapabilitiesInterface b/TelepathyQt4/ConnectionInterfaceCapabilitiesInterface
index 1cfbbb1..09c69ac 100644
--- a/TelepathyQt4/ConnectionInterfaceCapabilitiesInterface
+++ b/TelepathyQt4/ConnectionInterfaceCapabilitiesInterface
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_ConnectionInterfaceCapabilitiesInterface_HEADER_GUARD_
-#define _TelepathyQt4_Client_ConnectionInterfaceCapabilitiesInterface_HEADER_GUARD_
+#ifndef _TelepathyQt4_ConnectionInterfaceCapabilitiesInterface_HEADER_GUARD_
+#define _TelepathyQt4_ConnectionInterfaceCapabilitiesInterface_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ConnectionInterfaceContactsInterface b/TelepathyQt4/ConnectionInterfaceContactsInterface
index 285008a..1aaf814 100644
--- a/TelepathyQt4/ConnectionInterfaceContactsInterface
+++ b/TelepathyQt4/ConnectionInterfaceContactsInterface
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_ConnectionInterfaceContactsInterface_HEADER_GUARD_
-#define _TelepathyQt4_Client_ConnectionInterfaceContactsInterface_HEADER_GUARD_
+#ifndef _TelepathyQt4_ConnectionInterfaceContactsInterface_HEADER_GUARD_
+#define _TelepathyQt4_ConnectionInterfaceContactsInterface_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ConnectionInterfacePresenceInterface b/TelepathyQt4/ConnectionInterfacePresenceInterface
index 46867c0..7f3c7d3 100644
--- a/TelepathyQt4/ConnectionInterfacePresenceInterface
+++ b/TelepathyQt4/ConnectionInterfacePresenceInterface
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_ConnectionInterfacePresenceInterface_HEADER_GUARD_
-#define _TelepathyQt4_Client_ConnectionInterfacePresenceInterface_HEADER_GUARD_
+#ifndef _TelepathyQt4_ConnectionInterfacePresenceInterface_HEADER_GUARD_
+#define _TelepathyQt4_ConnectionInterfacePresenceInterface_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ConnectionInterfaceRequestsInterface b/TelepathyQt4/ConnectionInterfaceRequestsInterface
index b6f1ac9..b2e9105 100644
--- a/TelepathyQt4/ConnectionInterfaceRequestsInterface
+++ b/TelepathyQt4/ConnectionInterfaceRequestsInterface
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_ConnectionInterfaceRequestsInterface_HEADER_GUARD_
-#define _TelepathyQt4_Client_ConnectionInterfaceRequestsInterface_HEADER_GUARD_
+#ifndef _TelepathyQt4_ConnectionInterfaceRequestsInterface_HEADER_GUARD_
+#define _TelepathyQt4_ConnectionInterfaceRequestsInterface_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ConnectionInterfaceSimplePresenceInterface b/TelepathyQt4/ConnectionInterfaceSimplePresenceInterface
index 59a7e3e..5a8ecf8 100644
--- a/TelepathyQt4/ConnectionInterfaceSimplePresenceInterface
+++ b/TelepathyQt4/ConnectionInterfaceSimplePresenceInterface
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_ConnectionInterfaceSimplePresenceInterface_HEADER_GUARD_
-#define _TelepathyQt4_Client_ConnectionInterfaceSimplePresenceInterface_HEADER_GUARD_
+#ifndef _TelepathyQt4_ConnectionInterfaceSimplePresenceInterface_HEADER_GUARD_
+#define _TelepathyQt4_ConnectionInterfaceSimplePresenceInterface_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ConnectionManager b/TelepathyQt4/ConnectionManager
index acf11dd..40a3cca 100644
--- a/TelepathyQt4/ConnectionManager
+++ b/TelepathyQt4/ConnectionManager
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_ConnectionManager_HEADER_GUARD_
-#define _TelepathyQt4_Client_ConnectionManager_HEADER_GUARD_
+#ifndef _TelepathyQt4_ConnectionManager_HEADER_GUARD_
+#define _TelepathyQt4_ConnectionManager_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ConnectionManagerInterface b/TelepathyQt4/ConnectionManagerInterface
index ab1812b..ac3eb34 100644
--- a/TelepathyQt4/ConnectionManagerInterface
+++ b/TelepathyQt4/ConnectionManagerInterface
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_ConnectionManagerInterface_HEADER_GUARD_
-#define _TelepathyQt4_Client_ConnectionManagerInterface_HEADER_GUARD_
+#ifndef _TelepathyQt4_ConnectionManagerInterface_HEADER_GUARD_
+#define _TelepathyQt4_ConnectionManagerInterface_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Contact b/TelepathyQt4/Contact
index 5f6a7b0..78b2d4b 100644
--- a/TelepathyQt4/Contact
+++ b/TelepathyQt4/Contact
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_Contact_HEADER_GUARD_
-#define _TelepathyQt4_Client_Contact_HEADER_GUARD_
+#ifndef _TelepathyQt4_Contact_HEADER_GUARD_
+#define _TelepathyQt4_Contact_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ContactManager b/TelepathyQt4/ContactManager
index 79aef9c..dfd1723 100644
--- a/TelepathyQt4/ContactManager
+++ b/TelepathyQt4/ContactManager
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_ContactManager_HEADER_GUARD_
-#define _TelepathyQt4_Client_ContactManager_HEADER_GUARD_
+#ifndef _TelepathyQt4_ContactManager_HEADER_GUARD_
+#define _TelepathyQt4_ContactManager_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/DBus b/TelepathyQt4/DBus
index c9537e3..f449e60 100644
--- a/TelepathyQt4/DBus
+++ b/TelepathyQt4/DBus
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_DBus_HEADER_GUARD_
-#define _TelepathyQt4_Client_DBus_HEADER_GUARD_
+#ifndef _TelepathyQt4_DBus_HEADER_GUARD_
+#define _TelepathyQt4_DBus_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/DBusDaemonInterface b/TelepathyQt4/DBusDaemonInterface
index 2da332e..7164d1d 100644
--- a/TelepathyQt4/DBusDaemonInterface
+++ b/TelepathyQt4/DBusDaemonInterface
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_DBusDaemonInterface_HEADER_GUARD_
-#define _TelepathyQt4_Client_DBusDaemonInterface_HEADER_GUARD_
+#ifndef _TelepathyQt4_DBusDaemonInterface_HEADER_GUARD_
+#define _TelepathyQt4_DBusDaemonInterface_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/DBusProxy b/TelepathyQt4/DBusProxy
index d77da33..ab4f5aa 100644
--- a/TelepathyQt4/DBusProxy
+++ b/TelepathyQt4/DBusProxy
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_DBusProxy_HEADER_GUARD_
-#define _TelepathyQt4_Client_DBusProxy_HEADER_GUARD_
+#ifndef _TelepathyQt4_DBusProxy_HEADER_GUARD_
+#define _TelepathyQt4_DBusProxy_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Feature b/TelepathyQt4/Feature
index 0a5e3f6..fa80e07 100644
--- a/TelepathyQt4/Feature
+++ b/TelepathyQt4/Feature
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_Feature_HEADER_GUARD_
-#define _TelepathyQt4_Client_Feature_HEADER_GUARD_
+#ifndef _TelepathyQt4_Feature_HEADER_GUARD_
+#define _TelepathyQt4_Feature_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/FileTransferChannel b/TelepathyQt4/FileTransferChannel
index 8554983..57f6b94 100644
--- a/TelepathyQt4/FileTransferChannel
+++ b/TelepathyQt4/FileTransferChannel
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_FileTransferChannel_HEADER_GUARD_
-#define _TelepathyQt4_Client_FileTransferChannel_HEADER_GUARD_
+#ifndef _TelepathyQt4_FileTransferChannel_HEADER_GUARD_
+#define _TelepathyQt4_FileTransferChannel_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/IntrospectableInterface b/TelepathyQt4/IntrospectableInterface
index 0baa397..f5cb393 100644
--- a/TelepathyQt4/IntrospectableInterface
+++ b/TelepathyQt4/IntrospectableInterface
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_IntrospectableInterface_HEADER_GUARD_
-#define _TelepathyQt4_Client_IntrospectableInterface_HEADER_GUARD_
+#ifndef _TelepathyQt4_IntrospectableInterface_HEADER_GUARD_
+#define _TelepathyQt4_IntrospectableInterface_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/MediaSessionHandler b/TelepathyQt4/MediaSessionHandler
index 97a821e..9c7a919 100644
--- a/TelepathyQt4/MediaSessionHandler
+++ b/TelepathyQt4/MediaSessionHandler
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_MediaSessionHandler_HEADER_GUARD_
-#define _TelepathyQt4_Client_MediaSessionHandler_HEADER_GUARD_
+#ifndef _TelepathyQt4_MediaSessionHandler_HEADER_GUARD_
+#define _TelepathyQt4_MediaSessionHandler_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/MediaSessionHandlerInterface b/TelepathyQt4/MediaSessionHandlerInterface
index d0188d7..21f7fd0 100644
--- a/TelepathyQt4/MediaSessionHandlerInterface
+++ b/TelepathyQt4/MediaSessionHandlerInterface
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_MediaSessionHandlerInterface_HEADER_GUARD_
-#define _TelepathyQt4_Client_MediaSessionHandlerInterface_HEADER_GUARD_
+#ifndef _TelepathyQt4_MediaSessionHandlerInterface_HEADER_GUARD_
+#define _TelepathyQt4_MediaSessionHandlerInterface_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/MediaStreamHandler b/TelepathyQt4/MediaStreamHandler
index 325898e..472d6d2 100644
--- a/TelepathyQt4/MediaStreamHandler
+++ b/TelepathyQt4/MediaStreamHandler
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_MediaStreamHandler_HEADER_GUARD_
-#define _TelepathyQt4_Client_MediaStreamHandler_HEADER_GUARD_
+#ifndef _TelepathyQt4_MediaStreamHandler_HEADER_GUARD_
+#define _TelepathyQt4_MediaStreamHandler_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/MediaStreamHandlerInterface b/TelepathyQt4/MediaStreamHandlerInterface
index 8f150e0..e1ef8c5 100644
--- a/TelepathyQt4/MediaStreamHandlerInterface
+++ b/TelepathyQt4/MediaStreamHandlerInterface
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_MediaStreamHandlerInterface_HEADER_GUARD_
-#define _TelepathyQt4_Client_MediaStreamHandlerInterface_HEADER_GUARD_
+#ifndef _TelepathyQt4_MediaStreamHandlerInterface_HEADER_GUARD_
+#define _TelepathyQt4_MediaStreamHandlerInterface_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Message b/TelepathyQt4/Message
index d26fd08..80d1519 100644
--- a/TelepathyQt4/Message
+++ b/TelepathyQt4/Message
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_Message_HEADER_GUARD_
-#define _TelepathyQt4_Client_Message_HEADER_GUARD_
+#ifndef _TelepathyQt4_Message_HEADER_GUARD_
+#define _TelepathyQt4_Message_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/MethodInvocationContext b/TelepathyQt4/MethodInvocationContext
index fbb425a..aa4ae9b 100644
--- a/TelepathyQt4/MethodInvocationContext
+++ b/TelepathyQt4/MethodInvocationContext
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_MethodInvocationContext_HEADER_GUARD_
-#define _TelepathyQt4_Client_MethodInvocationContext_HEADER_GUARD_
+#ifndef _TelepathyQt4_MethodInvocationContext_HEADER_GUARD_
+#define _TelepathyQt4_MethodInvocationContext_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/OptionalInterfaceFactory b/TelepathyQt4/OptionalInterfaceFactory
index 3565349..d376c1c 100644
--- a/TelepathyQt4/OptionalInterfaceFactory
+++ b/TelepathyQt4/OptionalInterfaceFactory
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_OptionalInterfaceFactory_HEADER_GUARD_
-#define _TelepathyQt4_Client_OptionalInterfaceFactory_HEADER_GUARD_
+#ifndef _TelepathyQt4_OptionalInterfaceFactory_HEADER_GUARD_
+#define _TelepathyQt4_OptionalInterfaceFactory_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/PeerInterface b/TelepathyQt4/PeerInterface
index 407ceba..17165aa 100644
--- a/TelepathyQt4/PeerInterface
+++ b/TelepathyQt4/PeerInterface
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_PeerInterface_HEADER_GUARD_
-#define _TelepathyQt4_Client_PeerInterface_HEADER_GUARD_
+#ifndef _TelepathyQt4_PeerInterface_HEADER_GUARD_
+#define _TelepathyQt4_PeerInterface_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/PendingAccount b/TelepathyQt4/PendingAccount
index 2c88f79..d1569eb 100644
--- a/TelepathyQt4/PendingAccount
+++ b/TelepathyQt4/PendingAccount
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_PendingAccount_HEADER_GUARD_
-#define _TelepathyQt4_Client_PendingAccount_HEADER_GUARD_
+#ifndef _TelepathyQt4_PendingAccount_HEADER_GUARD_
+#define _TelepathyQt4_PendingAccount_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/PendingChannel b/TelepathyQt4/PendingChannel
index 30c734e..6f1bc90 100644
--- a/TelepathyQt4/PendingChannel
+++ b/TelepathyQt4/PendingChannel
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_PendingChannel_HEADER_GUARD_
-#define _TelepathyQt4_Client_PendingChannel_HEADER_GUARD_
+#ifndef _TelepathyQt4_PendingChannel_HEADER_GUARD_
+#define _TelepathyQt4_PendingChannel_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/PendingChannelRequest b/TelepathyQt4/PendingChannelRequest
index 862acc4..567129a 100644
--- a/TelepathyQt4/PendingChannelRequest
+++ b/TelepathyQt4/PendingChannelRequest
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_PendingChannelRequest_HEADER_GUARD_
-#define _TelepathyQt4_Client_PendingChannelRequest_HEADER_GUARD_
+#ifndef _TelepathyQt4_PendingChannelRequest_HEADER_GUARD_
+#define _TelepathyQt4_PendingChannelRequest_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/PendingConnection b/TelepathyQt4/PendingConnection
index 21a39b8..db1f046 100644
--- a/TelepathyQt4/PendingConnection
+++ b/TelepathyQt4/PendingConnection
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_PendingConnection_HEADER_GUARD_
-#define _TelepathyQt4_Client_PendingConnection_HEADER_GUARD_
+#ifndef _TelepathyQt4_PendingConnection_HEADER_GUARD_
+#define _TelepathyQt4_PendingConnection_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/PendingContactAttributes b/TelepathyQt4/PendingContactAttributes
index 9bbb839..be05ad7 100644
--- a/TelepathyQt4/PendingContactAttributes
+++ b/TelepathyQt4/PendingContactAttributes
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_PendingContactAttributes_HEADER_GUARD_
-#define _TelepathyQt4_Client_PendingContactAttributes_HEADER_GUARD_
+#ifndef _TelepathyQt4_PendingContactAttributes_HEADER_GUARD_
+#define _TelepathyQt4_PendingContactAttributes_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/PendingContacts b/TelepathyQt4/PendingContacts
index 37d746b..a6b1fb6 100644
--- a/TelepathyQt4/PendingContacts
+++ b/TelepathyQt4/PendingContacts
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_PendingContacts_HEADER_GUARD_
-#define _TelepathyQt4_Client_PendingContacts_HEADER_GUARD_
+#ifndef _TelepathyQt4_PendingContacts_HEADER_GUARD_
+#define _TelepathyQt4_PendingContacts_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/PendingFailure b/TelepathyQt4/PendingFailure
index 0c92583..6be7653 100644
--- a/TelepathyQt4/PendingFailure
+++ b/TelepathyQt4/PendingFailure
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_PendingFailure_HEADER_GUARD_
-#define _TelepathyQt4_Client_PendingFailure_HEADER_GUARD_
+#ifndef _TelepathyQt4_PendingFailure_HEADER_GUARD_
+#define _TelepathyQt4_PendingFailure_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/PendingHandles b/TelepathyQt4/PendingHandles
index 1a5fbd5..4697f60 100644
--- a/TelepathyQt4/PendingHandles
+++ b/TelepathyQt4/PendingHandles
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_PendingHandles_HEADER_GUARD_
-#define _TelepathyQt4_Client_PendingHandles_HEADER_GUARD_
+#ifndef _TelepathyQt4_PendingHandles_HEADER_GUARD_
+#define _TelepathyQt4_PendingHandles_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/PendingOperation b/TelepathyQt4/PendingOperation
index 915fedd..cbcd995 100644
--- a/TelepathyQt4/PendingOperation
+++ b/TelepathyQt4/PendingOperation
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_PendingOperation_HEADER_GUARD_
-#define _TelepathyQt4_Client_PendingOperation_HEADER_GUARD_
+#ifndef _TelepathyQt4_PendingOperation_HEADER_GUARD_
+#define _TelepathyQt4_PendingOperation_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/PendingReady b/TelepathyQt4/PendingReady
index e4fe2fa..befae01 100644
--- a/TelepathyQt4/PendingReady
+++ b/TelepathyQt4/PendingReady
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_PendingReady_HEADER_GUARD_
-#define _TelepathyQt4_Client_PendingReady_HEADER_GUARD_
+#ifndef _TelepathyQt4_PendingReady_HEADER_GUARD_
+#define _TelepathyQt4_PendingReady_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/PendingStringList b/TelepathyQt4/PendingStringList
index 8db445e..529835a 100644
--- a/TelepathyQt4/PendingStringList
+++ b/TelepathyQt4/PendingStringList
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_PendingStringList_HEADER_GUARD_
-#define _TelepathyQt4_Client_PendingStringList_HEADER_GUARD_
+#ifndef _TelepathyQt4_PendingStringList_HEADER_GUARD_
+#define _TelepathyQt4_PendingStringList_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/PendingSuccess b/TelepathyQt4/PendingSuccess
index 598ee94..473f176 100644
--- a/TelepathyQt4/PendingSuccess
+++ b/TelepathyQt4/PendingSuccess
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_PendingSuccess_HEADER_GUARD_
-#define _TelepathyQt4_Client_PendingSuccess_HEADER_GUARD_
+#ifndef _TelepathyQt4_PendingSuccess_HEADER_GUARD_
+#define _TelepathyQt4_PendingSuccess_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/PendingVoidMethodCall b/TelepathyQt4/PendingVoidMethodCall
index f0af6b3..28df0c9 100644
--- a/TelepathyQt4/PendingVoidMethodCall
+++ b/TelepathyQt4/PendingVoidMethodCall
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_PendingVoidMethodCall_HEADER_GUARD_
-#define _TelepathyQt4_Client_PendingVoidMethodCall_HEADER_GUARD_
+#ifndef _TelepathyQt4_PendingVoidMethodCall_HEADER_GUARD_
+#define _TelepathyQt4_PendingVoidMethodCall_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Properties b/TelepathyQt4/Properties
index f9ed265..e9f1581 100644
--- a/TelepathyQt4/Properties
+++ b/TelepathyQt4/Properties
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_Properties_HEADER_GUARD_
-#define _TelepathyQt4_Client_Properties_HEADER_GUARD_
+#ifndef _TelepathyQt4_Properties_HEADER_GUARD_
+#define _TelepathyQt4_Properties_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/PropertiesInterface b/TelepathyQt4/PropertiesInterface
index c627292..bebc229 100644
--- a/TelepathyQt4/PropertiesInterface
+++ b/TelepathyQt4/PropertiesInterface
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_PropertiesInterface_HEADER_GUARD_
-#define _TelepathyQt4_Client_PropertiesInterface_HEADER_GUARD_
+#ifndef _TelepathyQt4_PropertiesInterface_HEADER_GUARD_
+#define _TelepathyQt4_PropertiesInterface_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/PropertiesInterfaceInterface b/TelepathyQt4/PropertiesInterfaceInterface
index 66cc1f3..eb47f94 100644
--- a/TelepathyQt4/PropertiesInterfaceInterface
+++ b/TelepathyQt4/PropertiesInterfaceInterface
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_PropertiesInterfaceInterface_HEADER_GUARD_
-#define _TelepathyQt4_Client_PropertiesInterfaceInterface_HEADER_GUARD_
+#ifndef _TelepathyQt4_PropertiesInterfaceInterface_HEADER_GUARD_
+#define _TelepathyQt4_PropertiesInterfaceInterface_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ReadinessHelper b/TelepathyQt4/ReadinessHelper
index 1d16096..368a8a5 100644
--- a/TelepathyQt4/ReadinessHelper
+++ b/TelepathyQt4/ReadinessHelper
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_ReadinessHelper_HEADER_GUARD_
-#define _TelepathyQt4_Client_ReadinessHelper_HEADER_GUARD_
+#ifndef _TelepathyQt4_ReadinessHelper_HEADER_GUARD_
+#define _TelepathyQt4_ReadinessHelper_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ReadyObject b/TelepathyQt4/ReadyObject
index 30ac559..ad6b261 100644
--- a/TelepathyQt4/ReadyObject
+++ b/TelepathyQt4/ReadyObject
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_ReadyObject_HEADER_GUARD_
-#define _TelepathyQt4_Client_ReadyObject_HEADER_GUARD_
+#ifndef _TelepathyQt4_ReadyObject_HEADER_GUARD_
+#define _TelepathyQt4_ReadyObject_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ReceivedMessage b/TelepathyQt4/ReceivedMessage
index 6ea9887..c8119c1 100644
--- a/TelepathyQt4/ReceivedMessage
+++ b/TelepathyQt4/ReceivedMessage
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_ReceivedMessage_HEADER_GUARD_
-#define _TelepathyQt4_Client_ReceivedMessage_HEADER_GUARD_
+#ifndef _TelepathyQt4_ReceivedMessage_HEADER_GUARD_
+#define _TelepathyQt4_ReceivedMessage_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ReferencedHandles b/TelepathyQt4/ReferencedHandles
index 040459b..53285af 100644
--- a/TelepathyQt4/ReferencedHandles
+++ b/TelepathyQt4/ReferencedHandles
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_ReferencedHandles_HEADER_GUARD_
-#define _TelepathyQt4_Client_ReferencedHandles_HEADER_GUARD_
+#ifndef _TelepathyQt4_ReferencedHandles_HEADER_GUARD_
+#define _TelepathyQt4_ReferencedHandles_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ReferencedHandlesIterator b/TelepathyQt4/ReferencedHandlesIterator
index 56d510a..2e49aab 100644
--- a/TelepathyQt4/ReferencedHandlesIterator
+++ b/TelepathyQt4/ReferencedHandlesIterator
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_ReferencedHandlesIterator_HEADER_GUARD_
-#define _TelepathyQt4_Client_ReferencedHandlesIterator_HEADER_GUARD_
+#ifndef _TelepathyQt4_ReferencedHandlesIterator_HEADER_GUARD_
+#define _TelepathyQt4_ReferencedHandlesIterator_HEADER_GUARD_
#include <TelepathyQt4/referenced-handles.h>
diff --git a/TelepathyQt4/RoomListChannel b/TelepathyQt4/RoomListChannel
index cfaf82e..4b953b6 100644
--- a/TelepathyQt4/RoomListChannel
+++ b/TelepathyQt4/RoomListChannel
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_RoomListChannel_HEADER_GUARD_
-#define _TelepathyQt4_Client_RoomListChannel_HEADER_GUARD_
+#ifndef _TelepathyQt4_RoomListChannel_HEADER_GUARD_
+#define _TelepathyQt4_RoomListChannel_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/StatefulDBusProxy b/TelepathyQt4/StatefulDBusProxy
index ee0270f..cafcb85 100644
--- a/TelepathyQt4/StatefulDBusProxy
+++ b/TelepathyQt4/StatefulDBusProxy
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_StatefulDBusProxy_HEADER_GUARD_
-#define _TelepathyQt4_Client_StatefulDBusProxy_HEADER_GUARD_
+#ifndef _TelepathyQt4_StatefulDBusProxy_HEADER_GUARD_
+#define _TelepathyQt4_StatefulDBusProxy_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/StatelessDBusProxy b/TelepathyQt4/StatelessDBusProxy
index 384d9f5..be9465f 100644
--- a/TelepathyQt4/StatelessDBusProxy
+++ b/TelepathyQt4/StatelessDBusProxy
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_StatelessDBusProxy_HEADER_GUARD_
-#define _TelepathyQt4_Client_StatelessDBusProxy_HEADER_GUARD_
+#ifndef _TelepathyQt4_StatelessDBusProxy_HEADER_GUARD_
+#define _TelepathyQt4_StatelessDBusProxy_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/StreamedMediaChannel b/TelepathyQt4/StreamedMediaChannel
index 39a3d27..f64c403 100644
--- a/TelepathyQt4/StreamedMediaChannel
+++ b/TelepathyQt4/StreamedMediaChannel
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_StreamedMediaChannel_HEADER_GUARD_
-#define _TelepathyQt4_Client_StreamedMediaChannel_HEADER_GUARD_
+#ifndef _TelepathyQt4_StreamedMediaChannel_HEADER_GUARD_
+#define _TelepathyQt4_StreamedMediaChannel_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/TextChannel b/TelepathyQt4/TextChannel
index 1c36b03..3f76400 100644
--- a/TelepathyQt4/TextChannel
+++ b/TelepathyQt4/TextChannel
@@ -1,5 +1,5 @@
-#ifndef _TelepathyQt4_Client_TextChannel_HEADER_GUARD_
-#define _TelepathyQt4_Client_TextChannel_HEADER_GUARD_
+#ifndef _TelepathyQt4_TextChannel_HEADER_GUARD_
+#define _TelepathyQt4_TextChannel_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#define IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/abstract-client.h b/TelepathyQt4/abstract-client.h
index d45eaef..d2bdd02 100644
--- a/TelepathyQt4/abstract-client.h
+++ b/TelepathyQt4/abstract-client.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_abstract_client_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_abstract_client_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_abstract_client_h_HEADER_GUARD_
+#define _TelepathyQt4_abstract_client_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/abstract-interface.h b/TelepathyQt4/abstract-interface.h
index 5652fee..8bf4254 100644
--- a/TelepathyQt4/abstract-interface.h
+++ b/TelepathyQt4/abstract-interface.h
@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_abstract_interface_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_abstract_interface_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_abstract_interface_h_HEADER_GUARD_
+#define _TelepathyQt4_abstract_interface_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/account-manager.h b/TelepathyQt4/account-manager.h
index 1751ffa..a530733 100644
--- a/TelepathyQt4/account-manager.h
+++ b/TelepathyQt4/account-manager.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_account_manager_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_account_manager_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_account_manager_h_HEADER_GUARD_
+#define _TelepathyQt4_account_manager_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/account.h b/TelepathyQt4/account.h
index 19c167d..3630540 100644
--- a/TelepathyQt4/account.h
+++ b/TelepathyQt4/account.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_account_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_account_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_account_h_HEADER_GUARD_
+#define _TelepathyQt4_account_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/channel-dispatch-operation.h b/TelepathyQt4/channel-dispatch-operation.h
index cf8058d..fdfcbfd 100644
--- a/TelepathyQt4/channel-dispatch-operation.h
+++ b/TelepathyQt4/channel-dispatch-operation.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_channel_dispatch_operation_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_channel_dispatch_operation_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_channel_dispatch_operation_h_HEADER_GUARD_
+#define _TelepathyQt4_channel_dispatch_operation_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/channel-dispatcher.h b/TelepathyQt4/channel-dispatcher.h
index 5546de9..acdc8fa 100644
--- a/TelepathyQt4/channel-dispatcher.h
+++ b/TelepathyQt4/channel-dispatcher.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_channel_dispatcher_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_channel_dispatcher_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_channel_dispatcher_h_HEADER_GUARD_
+#define _TelepathyQt4_channel_dispatcher_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/channel-factory.h b/TelepathyQt4/channel-factory.h
index 6b4604d..74e03c4 100644
--- a/TelepathyQt4/channel-factory.h
+++ b/TelepathyQt4/channel-factory.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_channel_factory_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_channel_factory_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_channel_factory_h_HEADER_GUARD_
+#define _TelepathyQt4_channel_factory_h_HEADER_GUARD_
#include <TelepathyQt4/Types>
diff --git a/TelepathyQt4/channel-request.h b/TelepathyQt4/channel-request.h
index fda4afc..751cff0 100644
--- a/TelepathyQt4/channel-request.h
+++ b/TelepathyQt4/channel-request.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_channel_request_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_channel_request_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_channel_request_h_HEADER_GUARD_
+#define _TelepathyQt4_channel_request_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/channel.h b/TelepathyQt4/channel.h
index 7eca198..2161957 100644
--- a/TelepathyQt4/channel.h
+++ b/TelepathyQt4/channel.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_channel_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_channel_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_channel_h_HEADER_GUARD_
+#define _TelepathyQt4_channel_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/client-registrar-internal.h b/TelepathyQt4/client-registrar-internal.h
index b47524c..3fedf98 100644
--- a/TelepathyQt4/client-registrar-internal.h
+++ b/TelepathyQt4/client-registrar-internal.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_client_registrar_internal_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_client_registrar_internal_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_client_registrar_internal_h_HEADER_GUARD_
+#define _TelepathyQt4_client_registrar_internal_h_HEADER_GUARD_
#include <QtCore/QObject>
#include <QtDBus/QtDBus>
diff --git a/TelepathyQt4/client-registrar.h b/TelepathyQt4/client-registrar.h
index bf896ee..dce7d02 100644
--- a/TelepathyQt4/client-registrar.h
+++ b/TelepathyQt4/client-registrar.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_client_registrar_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_client_registrar_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_client_registrar_h_HEADER_GUARD_
+#define _TelepathyQt4_client_registrar_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/client.h b/TelepathyQt4/client.h
index 221acc0..e5cf94a 100644
--- a/TelepathyQt4/client.h
+++ b/TelepathyQt4/client.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_client_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_client_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_client_h_HEADER_GUARD_
+#define _TelepathyQt4_client_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/connection-internal.h b/TelepathyQt4/connection-internal.h
index 3e6a6b1..b343b97 100644
--- a/TelepathyQt4/connection-internal.h
+++ b/TelepathyQt4/connection-internal.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_connection_internal_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_connection_internal_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_connection_internal_h_HEADER_GUARD_
+#define _TelepathyQt4_connection_internal_h_HEADER_GUARD_
#include <TelepathyQt4/Connection>
diff --git a/TelepathyQt4/connection-manager-internal.h b/TelepathyQt4/connection-manager-internal.h
index a919c36..7783841 100644
--- a/TelepathyQt4/connection-manager-internal.h
+++ b/TelepathyQt4/connection-manager-internal.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_connection_manager_internal_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_connection_manager_internal_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_connection_manager_internal_h_HEADER_GUARD_
+#define _TelepathyQt4_connection_manager_internal_h_HEADER_GUARD_
#include <TelepathyQt4/PendingStringList>
diff --git a/TelepathyQt4/connection-manager.h b/TelepathyQt4/connection-manager.h
index 0a2bc06..1606cbc 100644
--- a/TelepathyQt4/connection-manager.h
+++ b/TelepathyQt4/connection-manager.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_connection_manager_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_connection_manager_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_connection_manager_h_HEADER_GUARD_
+#define _TelepathyQt4_connection_manager_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/connection.h b/TelepathyQt4/connection.h
index b79a6a6..6382b67 100644
--- a/TelepathyQt4/connection.h
+++ b/TelepathyQt4/connection.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_connection_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_connection_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_connection_h_HEADER_GUARD_
+#define _TelepathyQt4_connection_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/contact-manager-internal.h b/TelepathyQt4/contact-manager-internal.h
index c94a043..8f309eb 100644
--- a/TelepathyQt4/contact-manager-internal.h
+++ b/TelepathyQt4/contact-manager-internal.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_contact_manager_internal_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_contact_manager_internal_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_contact_manager_internal_h_HEADER_GUARD_
+#define _TelepathyQt4_contact_manager_internal_h_HEADER_GUARD_
#include <TelepathyQt4/Types>
#include <TelepathyQt4/PendingOperation>
diff --git a/TelepathyQt4/contact-manager.h b/TelepathyQt4/contact-manager.h
index 87c02ba..86b4cce 100644
--- a/TelepathyQt4/contact-manager.h
+++ b/TelepathyQt4/contact-manager.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_contact_manager_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_contact_manager_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_contact_manager_h_HEADER_GUARD_
+#define _TelepathyQt4_contact_manager_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/contact.h b/TelepathyQt4/contact.h
index 54cb5ca..a0ea274 100644
--- a/TelepathyQt4/contact.h
+++ b/TelepathyQt4/contact.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_contact_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_contact_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_contact_h_HEADER_GUARD_
+#define _TelepathyQt4_contact_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/dbus-proxy.h b/TelepathyQt4/dbus-proxy.h
index 8a775cc..5471260 100644
--- a/TelepathyQt4/dbus-proxy.h
+++ b/TelepathyQt4/dbus-proxy.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_dbus_proxy_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_dbus_proxy_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_dbus_proxy_h_HEADER_GUARD_
+#define _TelepathyQt4_dbus_proxy_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/dbus.h b/TelepathyQt4/dbus.h
index edcc0e7..9e8f17b 100644
--- a/TelepathyQt4/dbus.h
+++ b/TelepathyQt4/dbus.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_dbus_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_dbus_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_dbus_h_HEADER_GUARD_
+#define _TelepathyQt4_dbus_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/feature.h b/TelepathyQt4/feature.h
index 645c9bc..06c4c87 100644
--- a/TelepathyQt4/feature.h
+++ b/TelepathyQt4/feature.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_feature_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_feature_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_feature_h_HEADER_GUARD_
+#define _TelepathyQt4_feature_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/file-transfer-channel.h b/TelepathyQt4/file-transfer-channel.h
index 19e3c5f..956f409 100644
--- a/TelepathyQt4/file-transfer-channel.h
+++ b/TelepathyQt4/file-transfer-channel.h
@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_Client_file_transfer_channel_h_HEADER_GUARD_
-#define _TelepathyQt4_Client_file_transfer_channel_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_file_transfer_channel_h_HEADER_GUARD_
+#define _TelepathyQt4_file_transfer_channel_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/media-session-handler.h b/TelepathyQt4/media-session-handler.h
index e09f1cc..cfd62bd 100644
--- a/TelepathyQt4/media-session-handler.h
+++ b/TelepathyQt4/media-session-handler.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_media_session_handler_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_media_session_handler_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_media_session_handler_h_HEADER_GUARD_
+#define _TelepathyQt4_media_session_handler_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/media-stream-handler.h b/TelepathyQt4/media-stream-handler.h
index b8ace47..3a57cb9 100644
--- a/TelepathyQt4/media-stream-handler.h
+++ b/TelepathyQt4/media-stream-handler.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_media_stream_handler_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_media_stream_handler_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_media_stream_handler_h_HEADER_GUARD_
+#define _TelepathyQt4_media_stream_handler_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/message.h b/TelepathyQt4/message.h
index 180746f..ce651d9 100644
--- a/TelepathyQt4/message.h
+++ b/TelepathyQt4/message.h
@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_Client_message_h_HEADER_GUARD_
-#define _TelepathyQt4_Client_message_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_message_h_HEADER_GUARD_
+#define _TelepathyQt4_message_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/method-invocation-context.h b/TelepathyQt4/method-invocation-context.h
index 98cb6c5..04726f1 100644
--- a/TelepathyQt4/method-invocation-context.h
+++ b/TelepathyQt4/method-invocation-context.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_method_invocation_context_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_method_invocation_context_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_method_invocation_context_h_HEADER_GUARD_
+#define _TelepathyQt4_method_invocation_context_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/optional-interface-factory.h b/TelepathyQt4/optional-interface-factory.h
index 5c0154e..4b89108 100644
--- a/TelepathyQt4/optional-interface-factory.h
+++ b/TelepathyQt4/optional-interface-factory.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_optional_interface_factory_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_optional_interface_factory_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_optional_interface_factory_h_HEADER_GUARD_
+#define _TelepathyQt4_optional_interface_factory_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/pending-account.h b/TelepathyQt4/pending-account.h
index ac21772..b0904be 100644
--- a/TelepathyQt4/pending-account.h
+++ b/TelepathyQt4/pending-account.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_pending_account_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_pending_account_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_pending_account_h_HEADER_GUARD_
+#define _TelepathyQt4_pending_account_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/pending-channel-request-internal.h b/TelepathyQt4/pending-channel-request-internal.h
index e5ddaa7..56bfa9e 100644
--- a/TelepathyQt4/pending-channel-request-internal.h
+++ b/TelepathyQt4/pending-channel-request-internal.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_pending_channel_request_internal_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_pending_channel_request_internal_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_pending_channel_request_internal_h_HEADER_GUARD_
+#define _TelepathyQt4_pending_channel_request_internal_h_HEADER_GUARD_
#include <TelepathyQt4/ChannelRequest>
#include <TelepathyQt4/PendingOperation>
diff --git a/TelepathyQt4/pending-channel-request.h b/TelepathyQt4/pending-channel-request.h
index 5393766..584ac4a 100644
--- a/TelepathyQt4/pending-channel-request.h
+++ b/TelepathyQt4/pending-channel-request.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_pending_channel_request_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_pending_channel_request_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_pending_channel_request_h_HEADER_GUARD_
+#define _TelepathyQt4_pending_channel_request_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/pending-channel.h b/TelepathyQt4/pending-channel.h
index 963fae5..0ff770a 100644
--- a/TelepathyQt4/pending-channel.h
+++ b/TelepathyQt4/pending-channel.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_pending_channel_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_pending_channel_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_pending_channel_h_HEADER_GUARD_
+#define _TelepathyQt4_pending_channel_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/pending-connection.h b/TelepathyQt4/pending-connection.h
index e1dea66..e034e9b 100644
--- a/TelepathyQt4/pending-connection.h
+++ b/TelepathyQt4/pending-connection.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_pending_connection_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_pending_connection_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_pending_connection_h_HEADER_GUARD_
+#define _TelepathyQt4_pending_connection_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/pending-contact-attributes.h b/TelepathyQt4/pending-contact-attributes.h
index 35e0155..63c3495 100644
--- a/TelepathyQt4/pending-contact-attributes.h
+++ b/TelepathyQt4/pending-contact-attributes.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_pending_contact_attributes_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_pending_contact_attributes_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_pending_contact_attributes_h_HEADER_GUARD_
+#define _TelepathyQt4_pending_contact_attributes_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/pending-contacts.h b/TelepathyQt4/pending-contacts.h
index fec6bd6..5f92fa8 100644
--- a/TelepathyQt4/pending-contacts.h
+++ b/TelepathyQt4/pending-contacts.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_pending_contacts_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_pending_contacts_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_pending_contacts_h_HEADER_GUARD_
+#define _TelepathyQt4_pending_contacts_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/pending-handles.h b/TelepathyQt4/pending-handles.h
index 282dd87..3a5a1a5 100644
--- a/TelepathyQt4/pending-handles.h
+++ b/TelepathyQt4/pending-handles.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_pending_handles_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_pending_handles_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_pending_handles_h_HEADER_GUARD_
+#define _TelepathyQt4_pending_handles_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/pending-operation.h b/TelepathyQt4/pending-operation.h
index dea3ea5..f7bf77b 100644
--- a/TelepathyQt4/pending-operation.h
+++ b/TelepathyQt4/pending-operation.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_pending_operation_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_pending_operation_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_pending_operation_h_HEADER_GUARD_
+#define _TelepathyQt4_pending_operation_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/pending-ready.h b/TelepathyQt4/pending-ready.h
index 5436f41..a6c416f 100644
--- a/TelepathyQt4/pending-ready.h
+++ b/TelepathyQt4/pending-ready.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_pending_ready_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_pending_ready_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_pending_ready_h_HEADER_GUARD_
+#define _TelepathyQt4_pending_ready_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/pending-string-list.h b/TelepathyQt4/pending-string-list.h
index c86714e..a054bab 100644
--- a/TelepathyQt4/pending-string-list.h
+++ b/TelepathyQt4/pending-string-list.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_pending_string_list_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_pending_string_list_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_pending_string_list_h_HEADER_GUARD_
+#define _TelepathyQt4_pending_string_list_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/properties.h b/TelepathyQt4/properties.h
index 1062619..d13d98c 100644
--- a/TelepathyQt4/properties.h
+++ b/TelepathyQt4/properties.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_properties_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_properties_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_properties_h_HEADER_GUARD_
+#define _TelepathyQt4_properties_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/readiness-helper.h b/TelepathyQt4/readiness-helper.h
index 16887d0..6b14184 100644
--- a/TelepathyQt4/readiness-helper.h
+++ b/TelepathyQt4/readiness-helper.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_readiness_helper_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_readiness_helper_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_readiness_helper_h_HEADER_GUARD_
+#define _TelepathyQt4_readiness_helper_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/ready-object.h b/TelepathyQt4/ready-object.h
index 8af66a5..4035392 100644
--- a/TelepathyQt4/ready-object.h
+++ b/TelepathyQt4/ready-object.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_ready_object_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_ready_object_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_ready_object_h_HEADER_GUARD_
+#define _TelepathyQt4_ready_object_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/referenced-handles.h b/TelepathyQt4/referenced-handles.h
index ea33d7c..613d2f0 100644
--- a/TelepathyQt4/referenced-handles.h
+++ b/TelepathyQt4/referenced-handles.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_referenced_handles_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_referenced_handles_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_referenced_handles_h_HEADER_GUARD_
+#define _TelepathyQt4_referenced_handles_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/room-list-channel.h b/TelepathyQt4/room-list-channel.h
index 55c4d54..d5b0c17 100644
--- a/TelepathyQt4/room-list-channel.h
+++ b/TelepathyQt4/room-list-channel.h
@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_Client_room_list_channel_h_HEADER_GUARD_
-#define _TelepathyQt4_Client_room_list_channel_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_room_list_channel_h_HEADER_GUARD_
+#define _TelepathyQt4_room_list_channel_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/simple-pending-operations.h b/TelepathyQt4/simple-pending-operations.h
index 36bb509..2071f7f 100644
--- a/TelepathyQt4/simple-pending-operations.h
+++ b/TelepathyQt4/simple-pending-operations.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_cli_pending_operations_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_pending_operations_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_pending_operations_h_HEADER_GUARD_
+#define _TelepathyQt4_pending_operations_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/streamed-media-channel.h b/TelepathyQt4/streamed-media-channel.h
index 573389e..7b369c7 100644
--- a/TelepathyQt4/streamed-media-channel.h
+++ b/TelepathyQt4/streamed-media-channel.h
@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_Client_streamed_media_channel_h_HEADER_GUARD_
-#define _TelepathyQt4_Client_streamed_media_channel_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_streamed_media_channel_h_HEADER_GUARD_
+#define _TelepathyQt4_streamed_media_channel_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/text-channel.h b/TelepathyQt4/text-channel.h
index 25666bd..0a8bfad 100644
--- a/TelepathyQt4/text-channel.h
+++ b/TelepathyQt4/text-channel.h
@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4_Client_text_channel_h_HEADER_GUARD_
-#define _TelepathyQt4_Client_text_channel_h_HEADER_GUARD_
+#ifndef _TelepathyQt4_text_channel_h_HEADER_GUARD_
+#define _TelepathyQt4_text_channel_h_HEADER_GUARD_
#ifndef IN_TELEPATHY_QT4_HEADER
#error IN_TELEPATHY_QT4_HEADER
--
1.5.6.5
More information about the telepathy-commits
mailing list