[Telepathy-commits] [telepathy-qt4/master] Added undef IN_TELEPATHY_QT4_INTERNALS to all fancy headers.

Andre Moreira Magalhaes (andrunko) andre.magalhaes at collabora.co.uk
Mon Jan 5 07:07:23 PST 2009 

Added undef IN_TELEPATHY_QT4_INTERNALS to all fancy headers so users are not
allowed to include a fancy header and then include a normal header.
---
 TelepathyQt4/Client/Account                        |    2 ++
 TelepathyQt4/Client/AccountInterface               |    2 ++
 TelepathyQt4/Client/AccountManager                 |    2 ++
 TelepathyQt4/Client/AccountManagerInterface        |    2 ++
 TelepathyQt4/Client/Channel                        |    2 ++
 TelepathyQt4/Client/ChannelInterface               |    2 ++
 .../Client/ChannelInterfaceCallStateInterface      |    2 ++
 .../Client/ChannelInterfaceChatStateInterface      |    2 ++
 TelepathyQt4/Client/ChannelInterfaceDTMFInterface  |    2 ++
 TelepathyQt4/Client/ChannelInterfaceGroupInterface |    2 ++
 TelepathyQt4/Client/ChannelInterfaceHoldInterface  |    2 ++
 .../ChannelInterfaceMediaSignallingInterface       |    2 ++
 .../Client/ChannelInterfacePasswordInterface       |    2 ++
 .../Client/ChannelTypeContactListInterface         |    2 ++
 TelepathyQt4/Client/ChannelTypeRoomListInterface   |    2 ++
 .../Client/ChannelTypeStreamedMediaInterface       |    2 ++
 TelepathyQt4/Client/ChannelTypeTextInterface       |    2 ++
 TelepathyQt4/Client/ChannelTypeTubesInterface      |    2 ++
 TelepathyQt4/Client/Connection                     |    2 ++
 TelepathyQt4/Client/ConnectionInterface            |    2 ++
 .../Client/ConnectionInterfaceAliasingInterface    |    2 ++
 .../Client/ConnectionInterfaceAvatarsInterface     |    2 ++
 .../ConnectionInterfaceCapabilitiesInterface       |    2 ++
 .../Client/ConnectionInterfaceContactsInterface    |    2 ++
 .../Client/ConnectionInterfacePresenceInterface    |    2 ++
 .../Client/ConnectionInterfaceRequestsInterface    |    2 ++
 .../ConnectionInterfaceSimplePresenceInterface     |    2 ++
 TelepathyQt4/Client/ConnectionManager              |    2 ++
 TelepathyQt4/Client/ConnectionManagerInterface     |    2 ++
 TelepathyQt4/Client/DBus                           |    2 ++
 TelepathyQt4/Client/DBusDaemonInterface            |    2 ++
 TelepathyQt4/Client/DBusProxy                      |    2 ++
 TelepathyQt4/Client/IntrospectableInterface        |    2 ++
 TelepathyQt4/Client/MediaSessionHandler            |    2 ++
 TelepathyQt4/Client/MediaSessionHandlerInterface   |    2 ++
 TelepathyQt4/Client/MediaStreamHandler             |    2 ++
 TelepathyQt4/Client/MediaStreamHandlerInterface    |    2 ++
 TelepathyQt4/Client/OptionalInterfaceFactory       |    2 ++
 TelepathyQt4/Client/PeerInterface                  |    2 ++
 TelepathyQt4/Client/PendingChannel                 |    2 ++
 TelepathyQt4/Client/PendingFailure                 |    2 ++
 TelepathyQt4/Client/PendingOperation               |    2 ++
 TelepathyQt4/Client/PendingSuccess                 |    2 ++
 TelepathyQt4/Client/PendingVoidMethodCall          |    2 ++
 TelepathyQt4/Client/Properties                     |    2 ++
 TelepathyQt4/Client/PropertiesInterface            |    2 ++
 TelepathyQt4/Client/PropertiesInterfaceInterface   |    2 ++
 TelepathyQt4/Client/StatefulDBusProxy              |    2 ++
 TelepathyQt4/Client/StatelessDBusProxy             |    2 ++
 TelepathyQt4/Constants                             |    2 ++
 TelepathyQt4/Debug                                 |    2 ++
 TelepathyQt4/KeyFile                               |    2 ++
 TelepathyQt4/ManagerFile                           |    2 ++
 TelepathyQt4/Types                                 |    2 ++
 TelepathyQt4/debug-internal.h                      |    4 ----
 55 files changed, 108 insertions(+), 4 deletions(-)

diff --git a/TelepathyQt4/Client/Account b/TelepathyQt4/Client/Account
index a3ff026..6cbfb8e 100644
--- a/TelepathyQt4/Client/Account
+++ b/TelepathyQt4/Client/Account
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/account.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/AccountInterface b/TelepathyQt4/Client/AccountInterface
index 1d91eae..6edbc84 100644
--- a/TelepathyQt4/Client/AccountInterface
+++ b/TelepathyQt4/Client/AccountInterface
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/account.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/AccountManager b/TelepathyQt4/Client/AccountManager
index af2ebf1..5e0437b 100644
--- a/TelepathyQt4/Client/AccountManager
+++ b/TelepathyQt4/Client/AccountManager
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/account-manager.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/AccountManagerInterface b/TelepathyQt4/Client/AccountManagerInterface
index b67f45f..11e1f07 100644
--- a/TelepathyQt4/Client/AccountManagerInterface
+++ b/TelepathyQt4/Client/AccountManagerInterface
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/account-manager.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/Channel b/TelepathyQt4/Client/Channel
index 9770724..c1f6008 100644
--- a/TelepathyQt4/Client/Channel
+++ b/TelepathyQt4/Client/Channel
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/channel.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ChannelInterface b/TelepathyQt4/Client/ChannelInterface
index 6349a76..15b6d56 100644
--- a/TelepathyQt4/Client/ChannelInterface
+++ b/TelepathyQt4/Client/ChannelInterface
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/channel.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ChannelInterfaceCallStateInterface b/TelepathyQt4/Client/ChannelInterfaceCallStateInterface
index 2b4c3f9..cab9e2f 100644
--- a/TelepathyQt4/Client/ChannelInterfaceCallStateInterface
+++ b/TelepathyQt4/Client/ChannelInterfaceCallStateInterface
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/channel.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ChannelInterfaceChatStateInterface b/TelepathyQt4/Client/ChannelInterfaceChatStateInterface
index 87dab8f..3283f9f 100644
--- a/TelepathyQt4/Client/ChannelInterfaceChatStateInterface
+++ b/TelepathyQt4/Client/ChannelInterfaceChatStateInterface
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/channel.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ChannelInterfaceDTMFInterface b/TelepathyQt4/Client/ChannelInterfaceDTMFInterface
index a84d133..aaf4337 100644
--- a/TelepathyQt4/Client/ChannelInterfaceDTMFInterface
+++ b/TelepathyQt4/Client/ChannelInterfaceDTMFInterface
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/channel.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ChannelInterfaceGroupInterface b/TelepathyQt4/Client/ChannelInterfaceGroupInterface
index 7db89ba..ea51693 100644
--- a/TelepathyQt4/Client/ChannelInterfaceGroupInterface
+++ b/TelepathyQt4/Client/ChannelInterfaceGroupInterface
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/channel.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ChannelInterfaceHoldInterface b/TelepathyQt4/Client/ChannelInterfaceHoldInterface
index c1518a2..ff6d9f5 100644
--- a/TelepathyQt4/Client/ChannelInterfaceHoldInterface
+++ b/TelepathyQt4/Client/ChannelInterfaceHoldInterface
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/channel.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ChannelInterfaceMediaSignallingInterface b/TelepathyQt4/Client/ChannelInterfaceMediaSignallingInterface
index 19391e0..b8dce7d 100644
--- a/TelepathyQt4/Client/ChannelInterfaceMediaSignallingInterface
+++ b/TelepathyQt4/Client/ChannelInterfaceMediaSignallingInterface
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/channel.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ChannelInterfacePasswordInterface b/TelepathyQt4/Client/ChannelInterfacePasswordInterface
index f06dfe8..5c32b6b 100644
--- a/TelepathyQt4/Client/ChannelInterfacePasswordInterface
+++ b/TelepathyQt4/Client/ChannelInterfacePasswordInterface
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/channel.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ChannelTypeContactListInterface b/TelepathyQt4/Client/ChannelTypeContactListInterface
index 0fea75d..6cb00bc 100644
--- a/TelepathyQt4/Client/ChannelTypeContactListInterface
+++ b/TelepathyQt4/Client/ChannelTypeContactListInterface
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/channel.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ChannelTypeRoomListInterface b/TelepathyQt4/Client/ChannelTypeRoomListInterface
index 61c885f..46903fc 100644
--- a/TelepathyQt4/Client/ChannelTypeRoomListInterface
+++ b/TelepathyQt4/Client/ChannelTypeRoomListInterface
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/channel.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ChannelTypeStreamedMediaInterface b/TelepathyQt4/Client/ChannelTypeStreamedMediaInterface
index 169466a..d0baad1 100644
--- a/TelepathyQt4/Client/ChannelTypeStreamedMediaInterface
+++ b/TelepathyQt4/Client/ChannelTypeStreamedMediaInterface
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/channel.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ChannelTypeTextInterface b/TelepathyQt4/Client/ChannelTypeTextInterface
index d7e1c2f..195d6ce 100644
--- a/TelepathyQt4/Client/ChannelTypeTextInterface
+++ b/TelepathyQt4/Client/ChannelTypeTextInterface
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/channel.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ChannelTypeTubesInterface b/TelepathyQt4/Client/ChannelTypeTubesInterface
index f392161..892fb8f 100644
--- a/TelepathyQt4/Client/ChannelTypeTubesInterface
+++ b/TelepathyQt4/Client/ChannelTypeTubesInterface
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/channel.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/Connection b/TelepathyQt4/Client/Connection
index d14a542..48ad0b7 100644
--- a/TelepathyQt4/Client/Connection
+++ b/TelepathyQt4/Client/Connection
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/connection.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ConnectionInterface b/TelepathyQt4/Client/ConnectionInterface
index 29fe0a5..f604070 100644
--- a/TelepathyQt4/Client/ConnectionInterface
+++ b/TelepathyQt4/Client/ConnectionInterface
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/connection.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ConnectionInterfaceAliasingInterface b/TelepathyQt4/Client/ConnectionInterfaceAliasingInterface
index 5b4e5ce..82d9434 100644
--- a/TelepathyQt4/Client/ConnectionInterfaceAliasingInterface
+++ b/TelepathyQt4/Client/ConnectionInterfaceAliasingInterface
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/connection.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ConnectionInterfaceAvatarsInterface b/TelepathyQt4/Client/ConnectionInterfaceAvatarsInterface
index d23207d..3cb23f5 100644
--- a/TelepathyQt4/Client/ConnectionInterfaceAvatarsInterface
+++ b/TelepathyQt4/Client/ConnectionInterfaceAvatarsInterface
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/connection.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ConnectionInterfaceCapabilitiesInterface b/TelepathyQt4/Client/ConnectionInterfaceCapabilitiesInterface
index ac3f450..62dce3e 100644
--- a/TelepathyQt4/Client/ConnectionInterfaceCapabilitiesInterface
+++ b/TelepathyQt4/Client/ConnectionInterfaceCapabilitiesInterface
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/connection.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ConnectionInterfaceContactsInterface b/TelepathyQt4/Client/ConnectionInterfaceContactsInterface
index 0885d78..05369ff 100644
--- a/TelepathyQt4/Client/ConnectionInterfaceContactsInterface
+++ b/TelepathyQt4/Client/ConnectionInterfaceContactsInterface
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/connection.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ConnectionInterfacePresenceInterface b/TelepathyQt4/Client/ConnectionInterfacePresenceInterface
index a7c6326..976a831 100644
--- a/TelepathyQt4/Client/ConnectionInterfacePresenceInterface
+++ b/TelepathyQt4/Client/ConnectionInterfacePresenceInterface
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/connection.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ConnectionInterfaceRequestsInterface b/TelepathyQt4/Client/ConnectionInterfaceRequestsInterface
index b3d14b1..cef0178 100644
--- a/TelepathyQt4/Client/ConnectionInterfaceRequestsInterface
+++ b/TelepathyQt4/Client/ConnectionInterfaceRequestsInterface
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/connection.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ConnectionInterfaceSimplePresenceInterface b/TelepathyQt4/Client/ConnectionInterfaceSimplePresenceInterface
index 78ec2e0..80fee4a 100644
--- a/TelepathyQt4/Client/ConnectionInterfaceSimplePresenceInterface
+++ b/TelepathyQt4/Client/ConnectionInterfaceSimplePresenceInterface
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/connection.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ConnectionManager b/TelepathyQt4/Client/ConnectionManager
index f335224..06fd6ae 100644
--- a/TelepathyQt4/Client/ConnectionManager
+++ b/TelepathyQt4/Client/ConnectionManager
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/connection-manager.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ConnectionManagerInterface b/TelepathyQt4/Client/ConnectionManagerInterface
index 3d869fb..771ab4b 100644
--- a/TelepathyQt4/Client/ConnectionManagerInterface
+++ b/TelepathyQt4/Client/ConnectionManagerInterface
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/connection-manager.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/DBus b/TelepathyQt4/Client/DBus
index a4beffc..f0efc91 100644
--- a/TelepathyQt4/Client/DBus
+++ b/TelepathyQt4/Client/DBus
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/dbus.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/DBusDaemonInterface b/TelepathyQt4/Client/DBusDaemonInterface
index ee48ce9..7c96f44 100644
--- a/TelepathyQt4/Client/DBusDaemonInterface
+++ b/TelepathyQt4/Client/DBusDaemonInterface
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/dbus.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/DBusProxy b/TelepathyQt4/Client/DBusProxy
index b6939e3..2c5ad05 100644
--- a/TelepathyQt4/Client/DBusProxy
+++ b/TelepathyQt4/Client/DBusProxy
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/dbus-proxy.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/IntrospectableInterface b/TelepathyQt4/Client/IntrospectableInterface
index 5af81fc..9adeab3 100644
--- a/TelepathyQt4/Client/IntrospectableInterface
+++ b/TelepathyQt4/Client/IntrospectableInterface
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/dbus.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/MediaSessionHandler b/TelepathyQt4/Client/MediaSessionHandler
index e1b6408..35a4ce0 100644
--- a/TelepathyQt4/Client/MediaSessionHandler
+++ b/TelepathyQt4/Client/MediaSessionHandler
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/media-session-handler.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/MediaSessionHandlerInterface b/TelepathyQt4/Client/MediaSessionHandlerInterface
index 42a0bb7..a7f235d 100644
--- a/TelepathyQt4/Client/MediaSessionHandlerInterface
+++ b/TelepathyQt4/Client/MediaSessionHandlerInterface
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/media-session-handler.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/MediaStreamHandler b/TelepathyQt4/Client/MediaStreamHandler
index afd0658..8fc1bd8 100644
--- a/TelepathyQt4/Client/MediaStreamHandler
+++ b/TelepathyQt4/Client/MediaStreamHandler
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/media-stream-handler.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/MediaStreamHandlerInterface b/TelepathyQt4/Client/MediaStreamHandlerInterface
index a5e08ca..359026f 100644
--- a/TelepathyQt4/Client/MediaStreamHandlerInterface
+++ b/TelepathyQt4/Client/MediaStreamHandlerInterface
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/media-stream-handler.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/OptionalInterfaceFactory b/TelepathyQt4/Client/OptionalInterfaceFactory
index af42dc1..5f2dca2 100644
--- a/TelepathyQt4/Client/OptionalInterfaceFactory
+++ b/TelepathyQt4/Client/OptionalInterfaceFactory
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/optional-interface-factory.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/PeerInterface b/TelepathyQt4/Client/PeerInterface
index a694862..c4baf05 100644
--- a/TelepathyQt4/Client/PeerInterface
+++ b/TelepathyQt4/Client/PeerInterface
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/dbus.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/PendingChannel b/TelepathyQt4/Client/PendingChannel
index 5ff4ea0..0556a46 100644
--- a/TelepathyQt4/Client/PendingChannel
+++ b/TelepathyQt4/Client/PendingChannel
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/pending-channel.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/PendingFailure b/TelepathyQt4/Client/PendingFailure
index 38f5bcc..0964605 100644
--- a/TelepathyQt4/Client/PendingFailure
+++ b/TelepathyQt4/Client/PendingFailure
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/simple-pending-operations.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/PendingOperation b/TelepathyQt4/Client/PendingOperation
index a520ba7..db0797c 100644
--- a/TelepathyQt4/Client/PendingOperation
+++ b/TelepathyQt4/Client/PendingOperation
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/pending-operation.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/PendingSuccess b/TelepathyQt4/Client/PendingSuccess
index 3bf64f5..25e5bf5 100644
--- a/TelepathyQt4/Client/PendingSuccess
+++ b/TelepathyQt4/Client/PendingSuccess
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/simple-pending-operations.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/PendingVoidMethodCall b/TelepathyQt4/Client/PendingVoidMethodCall
index 37cabd4..4856232 100644
--- a/TelepathyQt4/Client/PendingVoidMethodCall
+++ b/TelepathyQt4/Client/PendingVoidMethodCall
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/simple-pending-operations.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/Properties b/TelepathyQt4/Client/Properties
index cb93cda..d1045c2 100644
--- a/TelepathyQt4/Client/Properties
+++ b/TelepathyQt4/Client/Properties
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/properties.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/PropertiesInterface b/TelepathyQt4/Client/PropertiesInterface
index cb43059..aca78ea 100644
--- a/TelepathyQt4/Client/PropertiesInterface
+++ b/TelepathyQt4/Client/PropertiesInterface
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/dbus.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/PropertiesInterfaceInterface b/TelepathyQt4/Client/PropertiesInterfaceInterface
index 30f6039..fc84fcf 100644
--- a/TelepathyQt4/Client/PropertiesInterfaceInterface
+++ b/TelepathyQt4/Client/PropertiesInterfaceInterface
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/properties.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/StatefulDBusProxy b/TelepathyQt4/Client/StatefulDBusProxy
index 1f4ac5c..4180189 100644
--- a/TelepathyQt4/Client/StatefulDBusProxy
+++ b/TelepathyQt4/Client/StatefulDBusProxy
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/dbus-proxy.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/StatelessDBusProxy b/TelepathyQt4/Client/StatelessDBusProxy
index f8046b3..716c4be 100644
--- a/TelepathyQt4/Client/StatelessDBusProxy
+++ b/TelepathyQt4/Client/StatelessDBusProxy
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/Client/dbus-proxy.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Constants b/TelepathyQt4/Constants
index 74cc5db..b48723d 100644
--- a/TelepathyQt4/Constants
+++ b/TelepathyQt4/Constants
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/constants.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Debug b/TelepathyQt4/Debug
index ec1c3db..bebb057 100644
--- a/TelepathyQt4/Debug
+++ b/TelepathyQt4/Debug
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/debug.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/KeyFile b/TelepathyQt4/KeyFile
index b27c0bd..3e4c9da 100644
--- a/TelepathyQt4/KeyFile
+++ b/TelepathyQt4/KeyFile
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/key-file.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/ManagerFile b/TelepathyQt4/ManagerFile
index 6d07b59..9fbc9ca 100644
--- a/TelepathyQt4/ManagerFile
+++ b/TelepathyQt4/ManagerFile
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/manager-file.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Types b/TelepathyQt4/Types
index d9afb1d..5600bc8 100644
--- a/TelepathyQt4/Types
+++ b/TelepathyQt4/Types
@@ -7,5 +7,7 @@
 
 #include <TelepathyQt4/types.h>
 
+#undef IN_TELEPATHY_QT4_INTERNALS
+
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/debug-internal.h b/TelepathyQt4/debug-internal.h
index 506a3ad..9e755cf 100644
--- a/TelepathyQt4/debug-internal.h
+++ b/TelepathyQt4/debug-internal.h
@@ -22,10 +22,6 @@
 #ifndef _TelepathyQt4_debug_HEADER_GUARD_
 #define _TelepathyQt4_debug_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#error IN_TELEPATHY_QT4_INTERNALS
-#endif
-
 #include <QDebug>
 
 #include <config.h>
-- 
1.5.6.5

More information about the Telepathy-commits mailing list