diff options
| author | Jeremy Whiting <jeremy.whiting@collabora.com> | 2011-11-07 11:32:08 -0700 |
|---|---|---|
| committer | Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk> | 2011-11-22 17:17:28 -0200 |
| commit | e514b7c360d0672593c38f30c89234b00cef7b7d (patch) | |
| tree | a066824401dd2576d60f366fa7bd30dfa664c46c | |
| parent | 6f0c193354cbfb572ad39577ef52c3ae2b73c48c (diff) | |
Rename IN_TELEPATHY_QT4_HEADER to IN_TP_QT_HEADER.
301 files changed, 797 insertions, 797 deletions
diff --git a/TelepathyQt4/AbstractClient b/TelepathyQt4/AbstractClient index 20eff9be..d316a086 100644 --- a/TelepathyQt4/AbstractClient +++ b/TelepathyQt4/AbstractClient @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_AbstractClient_HEADER_GUARD_ #define _TelepathyQt4_AbstractClient_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/abstract-client.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/AbstractClientApprover b/TelepathyQt4/AbstractClientApprover index cb08beb3..669120f4 100644 --- a/TelepathyQt4/AbstractClientApprover +++ b/TelepathyQt4/AbstractClientApprover @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_AbstractClientApprover_HEADER_GUARD_ #define _TelepathyQt4_AbstractClientApprover_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/abstract-client.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/AbstractClientHandler b/TelepathyQt4/AbstractClientHandler index 9df1d6b2..29c338ec 100644 --- a/TelepathyQt4/AbstractClientHandler +++ b/TelepathyQt4/AbstractClientHandler @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_AbstractClientHandler_HEADER_GUARD_ #define _TelepathyQt4_AbstractClientHandler_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/abstract-client.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/AbstractClientObserver b/TelepathyQt4/AbstractClientObserver index 5ecdfde7..f4866173 100644 --- a/TelepathyQt4/AbstractClientObserver +++ b/TelepathyQt4/AbstractClientObserver @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_AbstractClientObserver_HEADER_GUARD_ #define _TelepathyQt4_AbstractClientObserver_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/abstract-client.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/AbstractInterface b/TelepathyQt4/AbstractInterface index 0050367c..0097ed6a 100644 --- a/TelepathyQt4/AbstractInterface +++ b/TelepathyQt4/AbstractInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_AbstractInterface_HEADER_GUARD_ #define _TelepathyQt4_AbstractInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/abstract-interface.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/Account b/TelepathyQt4/Account index ed84b84b..9c151233 100644 --- a/TelepathyQt4/Account +++ b/TelepathyQt4/Account @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_Account_HEADER_GUARD_ #define _TelepathyQt4_Account_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/account.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/AccountCapabilityFilter b/TelepathyQt4/AccountCapabilityFilter index f53bb2df..4123202c 100644 --- a/TelepathyQt4/AccountCapabilityFilter +++ b/TelepathyQt4/AccountCapabilityFilter @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_AccountCapabilityFilter_HEADER_GUARD_ #define _TelepathyQt4_AccountCapabilityFilter_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/account-capability-filter.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/AccountFactory b/TelepathyQt4/AccountFactory index 63ab1cb4..80c5fdb2 100644 --- a/TelepathyQt4/AccountFactory +++ b/TelepathyQt4/AccountFactory @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_AccountFactory_HEADER_GUARD_ #define _TelepathyQt4_AccountFactory_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/account-factory.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/AccountFilter b/TelepathyQt4/AccountFilter index 485d7f50..0f5683c9 100644 --- a/TelepathyQt4/AccountFilter +++ b/TelepathyQt4/AccountFilter @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_AccountFilter_HEADER_GUARD_ #define _TelepathyQt4_AccountFilter_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/account-filter.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/AccountInterface b/TelepathyQt4/AccountInterface index 98c0810a..8b70bc16 100644 --- a/TelepathyQt4/AccountInterface +++ b/TelepathyQt4/AccountInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_AccountInterface_HEADER_GUARD_ #define _TelepathyQt4_AccountInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/account.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/AccountInterfaceAddressingInterface b/TelepathyQt4/AccountInterfaceAddressingInterface index ad499d99..29fe0c1a 100644 --- a/TelepathyQt4/AccountInterfaceAddressingInterface +++ b/TelepathyQt4/AccountInterfaceAddressingInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_AccountInterfaceAddressingInterface_HEADER_GUARD_ #define _TelepathyQt4_AccountInterfaceAddressingInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/account.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/AccountInterfaceAvatarInterface b/TelepathyQt4/AccountInterfaceAvatarInterface index 5b30df45..fd110ce9 100644 --- a/TelepathyQt4/AccountInterfaceAvatarInterface +++ b/TelepathyQt4/AccountInterfaceAvatarInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_AccountInterfaceAvatarInterface_HEADER_GUARD_ #define _TelepathyQt4_AccountInterfaceAvatarInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/account.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/AccountManager b/TelepathyQt4/AccountManager index e52538c1..370c28ba 100644 --- a/TelepathyQt4/AccountManager +++ b/TelepathyQt4/AccountManager @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_AccountManager_HEADER_GUARD_ #define _TelepathyQt4_AccountManager_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/account-manager.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/AccountManagerInterface b/TelepathyQt4/AccountManagerInterface index b8101e57..ca98a7ee 100644 --- a/TelepathyQt4/AccountManagerInterface +++ b/TelepathyQt4/AccountManagerInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_AccountManagerInterface_HEADER_GUARD_ #define _TelepathyQt4_AccountManagerInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/account-manager.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/AccountPropertyFilter b/TelepathyQt4/AccountPropertyFilter index 647e4c0d..a8508fed 100644 --- a/TelepathyQt4/AccountPropertyFilter +++ b/TelepathyQt4/AccountPropertyFilter @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_AccountPropertyFilter_HEADER_GUARD_ #define _TelepathyQt4_AccountPropertyFilter_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/account-property-filter.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/AccountSet b/TelepathyQt4/AccountSet index a6cf10f6..8cfe23bb 100644 --- a/TelepathyQt4/AccountSet +++ b/TelepathyQt4/AccountSet @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_AccountSet_HEADER_GUARD_ #define _TelepathyQt4_AccountSet_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/account-set.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/AndFilter b/TelepathyQt4/AndFilter index a9591e6a..b65e4dda 100644 --- a/TelepathyQt4/AndFilter +++ b/TelepathyQt4/AndFilter @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_AndFilter_HEADER_GUARD_ #define _TelepathyQt4_AndFilter_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/and-filter.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/AuthenticationTLSCertificateInterface b/TelepathyQt4/AuthenticationTLSCertificateInterface index d167259d..e3f1c676 100644 --- a/TelepathyQt4/AuthenticationTLSCertificateInterface +++ b/TelepathyQt4/AuthenticationTLSCertificateInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_AuthenticationTLSCertificateInterface_HEADER_GUARD_ #define _TelepathyQt4_AuthenticationTLSCertificateInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/tls-certificate.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/AvatarData b/TelepathyQt4/AvatarData index 17dba112..c968d112 100644 --- a/TelepathyQt4/AvatarData +++ b/TelepathyQt4/AvatarData @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_AvatarData_HEADER_GUARD_ #define _TelepathyQt4_AvatarData_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/avatar.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/AvatarSpec b/TelepathyQt4/AvatarSpec index 72335550..d91672ae 100644 --- a/TelepathyQt4/AvatarSpec +++ b/TelepathyQt4/AvatarSpec @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_AvatarSpec_HEADER_GUARD_ #define _TelepathyQt4_AvatarSpec_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/avatar.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/CMakeLists.txt b/TelepathyQt4/CMakeLists.txt index 372df95c..d69b7dbd 100644 --- a/TelepathyQt4/CMakeLists.txt +++ b/TelepathyQt4/CMakeLists.txt @@ -530,7 +530,7 @@ tpqt4_constants_gen(stable-constants ${gen_stable_spec_xml} ${CMAKE_CURRENT_BINA --namespace=Tp --str-constant-prefix=TELEPATHY_ --define-prefix=TP_QT4_ - --must-define=IN_TELEPATHY_QT4_HEADER + --must-define=IN_TP_QT_HEADER DEPENDS stable-ifaces-includator) tpqt4_constants_gen(future-constants ${gen_future_spec_xml} ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-constants.h --namespace=TpFuture @@ -541,7 +541,7 @@ tpqt4_constants_gen(future-constants ${gen_future_spec_xml} ${CMAKE_CURRENT_BINA tpqt4_types_gen(stable-typesgen ${gen_stable_spec_xml} ${CMAKE_CURRENT_BINARY_DIR}/_gen/types.h ${CMAKE_CURRENT_BINARY_DIR}/_gen/types-body.hpp Tp TelepathyQt4/types.h TelepathyQt4/Types - --must-define=IN_TELEPATHY_QT4_HEADER + --must-define=IN_TP_QT_HEADER --visibility=TELEPATHY_QT4_EXPORT DEPENDS stable-constants) tpqt4_types_gen(future-typesgen ${gen_future_spec_xml} diff --git a/TelepathyQt4/CapabilitiesBase b/TelepathyQt4/CapabilitiesBase index 22cd2585..bedf6180 100644 --- a/TelepathyQt4/CapabilitiesBase +++ b/TelepathyQt4/CapabilitiesBase @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_CapabilitiesBase_HEADER_GUARD_ #define _TelepathyQt4_CapabilitiesBase_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/capabilities-base.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/Channel b/TelepathyQt4/Channel index 21b13c0b..21af6f22 100644 --- a/TelepathyQt4/Channel +++ b/TelepathyQt4/Channel @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_Channel_HEADER_GUARD_ #define _TelepathyQt4_Channel_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelClassFeatures b/TelepathyQt4/ChannelClassFeatures index 714e4d7b..085b896c 100644 --- a/TelepathyQt4/ChannelClassFeatures +++ b/TelepathyQt4/ChannelClassFeatures @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ChannelClassFeatures_HEADER_GUARD_ #define _TelepathyQt4_ChannelClassFeatures_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/channel-class-features.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelClassSpec b/TelepathyQt4/ChannelClassSpec index 1e27a148..b4ca267e 100644 --- a/TelepathyQt4/ChannelClassSpec +++ b/TelepathyQt4/ChannelClassSpec @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ChannelClassSpec_HEADER_GUARD_ #define _TelepathyQt4_ChannelClassSpec_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/channel-class-spec.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelClassSpecList b/TelepathyQt4/ChannelClassSpecList index 4f3b2db5..cc139cef 100644 --- a/TelepathyQt4/ChannelClassSpecList +++ b/TelepathyQt4/ChannelClassSpecList @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ChannelClassSpecList_HEADER_GUARD_ #define _TelepathyQt4_ChannelClassSpecList_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/channel-class-spec.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelDispatchOperation b/TelepathyQt4/ChannelDispatchOperation index e897f207..68bb543b 100644 --- a/TelepathyQt4/ChannelDispatchOperation +++ b/TelepathyQt4/ChannelDispatchOperation @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ChannelDispatchOperation_HEADER_GUARD_ #define _TelepathyQt4_ChannelDispatchOperation_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/channel-dispatch-operation.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelDispatchOperationInterface b/TelepathyQt4/ChannelDispatchOperationInterface index 1c1ca52d..5846dab3 100644 --- a/TelepathyQt4/ChannelDispatchOperationInterface +++ b/TelepathyQt4/ChannelDispatchOperationInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ChannelDispatchOperationInterface_HEADER_GUARD_ #define _TelepathyQt4_ChannelDispatchOperationInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/channel-dispatch-operation.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelDispatcher b/TelepathyQt4/ChannelDispatcher index 8ae6f01c..f56a47b8 100644 --- a/TelepathyQt4/ChannelDispatcher +++ b/TelepathyQt4/ChannelDispatcher @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ChannelDispatcher_HEADER_GUARD_ #define _TelepathyQt4_ChannelDispatcher_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/channel-dispatcher.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelDispatcherInterface b/TelepathyQt4/ChannelDispatcherInterface index 0a795de0..e3dfba81 100644 --- a/TelepathyQt4/ChannelDispatcherInterface +++ b/TelepathyQt4/ChannelDispatcherInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ChannelDispatcherInterface_HEADER_GUARD_ #define _TelepathyQt4_ChannelDispatcherInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/channel-dispatcher.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelFactory b/TelepathyQt4/ChannelFactory index ee1b5d24..70811248 100644 --- a/TelepathyQt4/ChannelFactory +++ b/TelepathyQt4/ChannelFactory @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ChannelFactory_HEADER_GUARD_ #define _TelepathyQt4_ChannelFactory_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/channel-factory.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelInterface b/TelepathyQt4/ChannelInterface index 14253665..dbabbce8 100644 --- a/TelepathyQt4/ChannelInterface +++ b/TelepathyQt4/ChannelInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ChannelInterface_HEADER_GUARD_ #define _TelepathyQt4_ChannelInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelInterfaceAnonymityInterface b/TelepathyQt4/ChannelInterfaceAnonymityInterface index 27fa9808..a6a6b7e5 100644 --- a/TelepathyQt4/ChannelInterfaceAnonymityInterface +++ b/TelepathyQt4/ChannelInterfaceAnonymityInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ChannelInterfaceAnonymityInterface_HEADER_GUARD_ #define _TelepathyQt4_ChannelInterfaceAnonymityInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelInterfaceCallStateInterface b/TelepathyQt4/ChannelInterfaceCallStateInterface index 8bdcbf2f..75a413fb 100644 --- a/TelepathyQt4/ChannelInterfaceCallStateInterface +++ b/TelepathyQt4/ChannelInterfaceCallStateInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ChannelInterfaceCallStateInterface_HEADER_GUARD_ #define _TelepathyQt4_ChannelInterfaceCallStateInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelInterfaceChatStateInterface b/TelepathyQt4/ChannelInterfaceChatStateInterface index 25435ac5..8d94773b 100644 --- a/TelepathyQt4/ChannelInterfaceChatStateInterface +++ b/TelepathyQt4/ChannelInterfaceChatStateInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ChannelInterfaceChatStateInterface_HEADER_GUARD_ #define _TelepathyQt4_ChannelInterfaceChatStateInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelInterfaceConferenceInterface b/TelepathyQt4/ChannelInterfaceConferenceInterface index e3d70058..cf6146ec 100644 --- a/TelepathyQt4/ChannelInterfaceConferenceInterface +++ b/TelepathyQt4/ChannelInterfaceConferenceInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ChannelInterfaceConferenceInterface_HEADER_GUARD_ #define _TelepathyQt4_ChannelInterfaceConferenceInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelInterfaceDTMFInterface b/TelepathyQt4/ChannelInterfaceDTMFInterface index 2e2f1b52..dea8d43f 100644 --- a/TelepathyQt4/ChannelInterfaceDTMFInterface +++ b/TelepathyQt4/ChannelInterfaceDTMFInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ChannelInterfaceDTMFInterface_HEADER_GUARD_ #define _TelepathyQt4_ChannelInterfaceDTMFInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelInterfaceGroupInterface b/TelepathyQt4/ChannelInterfaceGroupInterface index 0f01d775..63f57715 100644 --- a/TelepathyQt4/ChannelInterfaceGroupInterface +++ b/TelepathyQt4/ChannelInterfaceGroupInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ChannelInterfaceGroupInterface_HEADER_GUARD_ #define _TelepathyQt4_ChannelInterfaceGroupInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelInterfaceHoldInterface b/TelepathyQt4/ChannelInterfaceHoldInterface index b75296e2..05becd54 100644 --- a/TelepathyQt4/ChannelInterfaceHoldInterface +++ b/TelepathyQt4/ChannelInterfaceHoldInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ChannelInterfaceHoldInterface_HEADER_GUARD_ #define _TelepathyQt4_ChannelInterfaceHoldInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelInterfaceMediaSignallingInterface b/TelepathyQt4/ChannelInterfaceMediaSignallingInterface index f42fe5ef..f11d5502 100644 --- a/TelepathyQt4/ChannelInterfaceMediaSignallingInterface +++ b/TelepathyQt4/ChannelInterfaceMediaSignallingInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ChannelInterfaceMediaSignallingInterface_HEADER_GUARD_ #define _TelepathyQt4_ChannelInterfaceMediaSignallingInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelInterfaceMessagesInterface b/TelepathyQt4/ChannelInterfaceMessagesInterface index 187737ee..e89e6405 100644 --- a/TelepathyQt4/ChannelInterfaceMessagesInterface +++ b/TelepathyQt4/ChannelInterfaceMessagesInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ChannelInterfaceMessagesInterface_HEADER_GUARD_ #define _TelepathyQt4_ChannelInterfaceMessagesInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelInterfacePasswordInterface b/TelepathyQt4/ChannelInterfacePasswordInterface index e54034a2..a18f6c91 100644 --- a/TelepathyQt4/ChannelInterfacePasswordInterface +++ b/TelepathyQt4/ChannelInterfacePasswordInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ChannelInterfacePasswordInterface_HEADER_GUARD_ #define _TelepathyQt4_ChannelInterfacePasswordInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelInterfaceSASLAuthenticationInterface b/TelepathyQt4/ChannelInterfaceSASLAuthenticationInterface index 7f5fde3b..eaf77846 100644 --- a/TelepathyQt4/ChannelInterfaceSASLAuthenticationInterface +++ b/TelepathyQt4/ChannelInterfaceSASLAuthenticationInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ChannelInterfaceSASLConnectionInterface_HEADER_GUARD_ #define _TelepathyQt4_ChannelInterfaceSASLConnectionInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelInterfaceSecurableInterface b/TelepathyQt4/ChannelInterfaceSecurableInterface index 00af1f3b..88bad983 100644 --- a/TelepathyQt4/ChannelInterfaceSecurableInterface +++ b/TelepathyQt4/ChannelInterfaceSecurableInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ChannelInterfaceSecurableInterface_HEADER_GUARD_ #define _TelepathyQt4_ChannelInterfaceSecurableInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelInterfaceServicePointInterface b/TelepathyQt4/ChannelInterfaceServicePointInterface index 3a4e15cd..ca764456 100644 --- a/TelepathyQt4/ChannelInterfaceServicePointInterface +++ b/TelepathyQt4/ChannelInterfaceServicePointInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ChannelInterfaceServicePointInterface_HEADER_GUARD_ #define _TelepathyQt4_ChannelInterfaceServicePointInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelInterfaceTubeInterface b/TelepathyQt4/ChannelInterfaceTubeInterface index 6a2499b0..b3883266 100644 --- a/TelepathyQt4/ChannelInterfaceTubeInterface +++ b/TelepathyQt4/ChannelInterfaceTubeInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ChannelInterfaceTubeInterface_HEADER_GUARD_ #define _TelepathyQt4_ChannelInterfaceTubeInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelRequest b/TelepathyQt4/ChannelRequest index 7878fec2..bba75d29 100644 --- a/TelepathyQt4/ChannelRequest +++ b/TelepathyQt4/ChannelRequest @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ChannelRequest_HEADER_GUARD_ #define _TelepathyQt4_ChannelRequest_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/channel-request.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelRequestHints b/TelepathyQt4/ChannelRequestHints index 8292b9b0..50f37c9d 100644 --- a/TelepathyQt4/ChannelRequestHints +++ b/TelepathyQt4/ChannelRequestHints @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ChannelRequestHints_HEADER_GUARD_ #define _TelepathyQt4_ChannelRequestHints_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/channel-request.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelRequestInterface b/TelepathyQt4/ChannelRequestInterface index 67c059ef..c8af7460 100644 --- a/TelepathyQt4/ChannelRequestInterface +++ b/TelepathyQt4/ChannelRequestInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ChannelRequestInterface_HEADER_GUARD_ #define _TelepathyQt4_ChannelRequestInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/channel-request.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelTypeContactListInterface b/TelepathyQt4/ChannelTypeContactListInterface index 794da773..1f06d762 100644 --- a/TelepathyQt4/ChannelTypeContactListInterface +++ b/TelepathyQt4/ChannelTypeContactListInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ChannelTypeContactListInterface_HEADER_GUARD_ #define _TelepathyQt4_ChannelTypeContactListInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelTypeContactSearchInterface b/TelepathyQt4/ChannelTypeContactSearchInterface index 89989f24..b4da0c58 100644 --- a/TelepathyQt4/ChannelTypeContactSearchInterface +++ b/TelepathyQt4/ChannelTypeContactSearchInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ChannelTypeContactSearchInterface_HEADER_GUARD_ #define _TelepathyQt4_ChannelTypeContactSearchInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelTypeFileTransferInterface b/TelepathyQt4/ChannelTypeFileTransferInterface index 23227e03..7b27302f 100644 --- a/TelepathyQt4/ChannelTypeFileTransferInterface +++ b/TelepathyQt4/ChannelTypeFileTransferInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ChannelTypeFileTransferInterface_HEADER_GUARD_ #define _TelepathyQt4_ChannelTypeFileTransferInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelTypeRoomListInterface b/TelepathyQt4/ChannelTypeRoomListInterface index 45dbf0b6..4eb281e7 100644 --- a/TelepathyQt4/ChannelTypeRoomListInterface +++ b/TelepathyQt4/ChannelTypeRoomListInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ChannelTypeRoomListInterface_HEADER_GUARD_ #define _TelepathyQt4_ChannelTypeRoomListInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelTypeServerAuthenticationInterface b/TelepathyQt4/ChannelTypeServerAuthenticationInterface index 47ea8e68..7b762413 100644 --- a/TelepathyQt4/ChannelTypeServerAuthenticationInterface +++ b/TelepathyQt4/ChannelTypeServerAuthenticationInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ChannelTypeServerAuthenticationInterface_HEADER_GUARD_ #define _TelepathyQt4_ChannelTypeServerAuthenticationInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelTypeServerTLSConnectionInterface b/TelepathyQt4/ChannelTypeServerTLSConnectionInterface index d4b7de93..8483b075 100644 --- a/TelepathyQt4/ChannelTypeServerTLSConnectionInterface +++ b/TelepathyQt4/ChannelTypeServerTLSConnectionInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ChannelTypeServerTLSConnectionInterface_HEADER_GUARD_ #define _TelepathyQt4_ChannelTypeServerTLSConnectionInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelTypeStreamTubeInterface b/TelepathyQt4/ChannelTypeStreamTubeInterface index f11605f9..0799d583 100644 --- a/TelepathyQt4/ChannelTypeStreamTubeInterface +++ b/TelepathyQt4/ChannelTypeStreamTubeInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_Client_ChannelTypeStreamTubeInterface_HEADER_GUARD_ #define _TelepathyQt4_Client_ChannelTypeStreamTubeInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelTypeStreamedMediaInterface b/TelepathyQt4/ChannelTypeStreamedMediaInterface index be065b9b..701845f5 100644 --- a/TelepathyQt4/ChannelTypeStreamedMediaInterface +++ b/TelepathyQt4/ChannelTypeStreamedMediaInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ChannelTypeStreamedMediaInterface_HEADER_GUARD_ #define _TelepathyQt4_ChannelTypeStreamedMediaInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelTypeTextInterface b/TelepathyQt4/ChannelTypeTextInterface index bf35946f..1a8b21cc 100644 --- a/TelepathyQt4/ChannelTypeTextInterface +++ b/TelepathyQt4/ChannelTypeTextInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ChannelTypeTextInterface_HEADER_GUARD_ #define _TelepathyQt4_ChannelTypeTextInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelTypeTubeInterface b/TelepathyQt4/ChannelTypeTubeInterface index 163a1133..673a3f06 100644 --- a/TelepathyQt4/ChannelTypeTubeInterface +++ b/TelepathyQt4/ChannelTypeTubeInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_Client_ChannelTypeTubeInterface_HEADER_GUARD_ #define _TelepathyQt4_Client_ChannelTypeTubeInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelTypeTubesInterface b/TelepathyQt4/ChannelTypeTubesInterface index 982f9e32..13a5da9e 100644 --- a/TelepathyQt4/ChannelTypeTubesInterface +++ b/TelepathyQt4/ChannelTypeTubesInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ChannelTypeTubesInterface_HEADER_GUARD_ #define _TelepathyQt4_ChannelTypeTubesInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/Client b/TelepathyQt4/Client index a819fef8..9678a2ec 100644 --- a/TelepathyQt4/Client +++ b/TelepathyQt4/Client @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_Client_HEADER_GUARD_ #define _TelepathyQt4_Client_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/client.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ClientApproverInterface b/TelepathyQt4/ClientApproverInterface index 2b89b410..c1aa0569 100644 --- a/TelepathyQt4/ClientApproverInterface +++ b/TelepathyQt4/ClientApproverInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ClientApproverInterface_HEADER_GUARD_ #define _TelepathyQt4_ClientApproverInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/client.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ClientHandlerInterface b/TelepathyQt4/ClientHandlerInterface index e6f8b509..f4e32865 100644 --- a/TelepathyQt4/ClientHandlerInterface +++ b/TelepathyQt4/ClientHandlerInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ClientHandlerInterface_HEADER_GUARD_ #define _TelepathyQt4_ClientHandlerInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/client.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ClientInterface b/TelepathyQt4/ClientInterface index edc41a22..5a8fb1bc 100644 --- a/TelepathyQt4/ClientInterface +++ b/TelepathyQt4/ClientInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ClientInterface_HEADER_GUARD_ #define _TelepathyQt4_ClientInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/client.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ClientInterfaceRequestsInterface b/TelepathyQt4/ClientInterfaceRequestsInterface index 7f77444d..f276aee2 100644 --- a/TelepathyQt4/ClientInterfaceRequestsInterface +++ b/TelepathyQt4/ClientInterfaceRequestsInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ClientInterfaceRequestsInterface_HEADER_GUARD_ #define _TelepathyQt4_ClientInterfaceRequestsInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/client.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ClientObserverInterface b/TelepathyQt4/ClientObserverInterface index 737a61b1..6c5bb41d 100644 --- a/TelepathyQt4/ClientObserverInterface +++ b/TelepathyQt4/ClientObserverInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ClientObserverInterface_HEADER_GUARD_ #define _TelepathyQt4_ClientObserverInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/client.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ClientRegistrar b/TelepathyQt4/ClientRegistrar index bde96724..7c1d20ed 100644 --- a/TelepathyQt4/ClientRegistrar +++ b/TelepathyQt4/ClientRegistrar @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ClientRegistrar_HEADER_GUARD_ #define _TelepathyQt4_ClientRegistrar_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/client-registrar.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/Connection b/TelepathyQt4/Connection index 1d2d6ba6..0f21fabc 100644 --- a/TelepathyQt4/Connection +++ b/TelepathyQt4/Connection @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_Connection_HEADER_GUARD_ #define _TelepathyQt4_Connection_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/connection.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionCapabilities b/TelepathyQt4/ConnectionCapabilities index b8044d55..36a35ffa 100644 --- a/TelepathyQt4/ConnectionCapabilities +++ b/TelepathyQt4/ConnectionCapabilities @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ConnectionCapabilities_HEADER_GUARD_ #define _TelepathyQt4_ConnectionCapabilities_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/connection-capabilities.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionFactory b/TelepathyQt4/ConnectionFactory index 21857821..166f92f5 100644 --- a/TelepathyQt4/ConnectionFactory +++ b/TelepathyQt4/ConnectionFactory @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ConnectionFactory_HEADER_GUARD_ #define _TelepathyQt4_ConnectionFactory_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/connection-factory.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterface b/TelepathyQt4/ConnectionInterface index 8db3896e..96d4cad4 100644 --- a/TelepathyQt4/ConnectionInterface +++ b/TelepathyQt4/ConnectionInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ConnectionInterface_HEADER_GUARD_ #define _TelepathyQt4_ConnectionInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/connection.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceAliasingInterface b/TelepathyQt4/ConnectionInterfaceAliasingInterface index d02ef370..510a029d 100644 --- a/TelepathyQt4/ConnectionInterfaceAliasingInterface +++ b/TelepathyQt4/ConnectionInterfaceAliasingInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ConnectionInterfaceAliasingInterface_HEADER_GUARD_ #define _TelepathyQt4_ConnectionInterfaceAliasingInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/connection.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceAnonymityInterface b/TelepathyQt4/ConnectionInterfaceAnonymityInterface index 9ed6a66c..1ecea332 100644 --- a/TelepathyQt4/ConnectionInterfaceAnonymityInterface +++ b/TelepathyQt4/ConnectionInterfaceAnonymityInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ConnectionInterfaceAnonymityInterface_HEADER_GUARD_ #define _TelepathyQt4_ConnectionInterfaceAnonymityInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/connection.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceAvatarsInterface b/TelepathyQt4/ConnectionInterfaceAvatarsInterface index 7aad818d..ea5af17b 100644 --- a/TelepathyQt4/ConnectionInterfaceAvatarsInterface +++ b/TelepathyQt4/ConnectionInterfaceAvatarsInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ConnectionInterfaceAvatarsInterface_HEADER_GUARD_ #define _TelepathyQt4_ConnectionInterfaceAvatarsInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/connection.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceBalanceInterface b/TelepathyQt4/ConnectionInterfaceBalanceInterface index 927a04ee..5e02d1a3 100644 --- a/TelepathyQt4/ConnectionInterfaceBalanceInterface +++ b/TelepathyQt4/ConnectionInterfaceBalanceInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ConnectionInterfaceBalanceInterface_HEADER_GUARD_ #define _TelepathyQt4_ConnectionInterfaceBalanceInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/connection.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceCapabilitiesInterface b/TelepathyQt4/ConnectionInterfaceCapabilitiesInterface index 09c69ac9..b7ad45a0 100644 --- a/TelepathyQt4/ConnectionInterfaceCapabilitiesInterface +++ b/TelepathyQt4/ConnectionInterfaceCapabilitiesInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ConnectionInterfaceCapabilitiesInterface_HEADER_GUARD_ #define _TelepathyQt4_ConnectionInterfaceCapabilitiesInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/connection.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceCellularInterface b/TelepathyQt4/ConnectionInterfaceCellularInterface index 7d769c8d..3379adf2 100644 --- a/TelepathyQt4/ConnectionInterfaceCellularInterface +++ b/TelepathyQt4/ConnectionInterfaceCellularInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ConnectionInterfaceCellularInterface_HEADER_GUARD_ #define _TelepathyQt4_ConnectionInterfaceCellularInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/connection.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceClientTypes b/TelepathyQt4/ConnectionInterfaceClientTypes index c4823271..b91fe7bc 100644 --- a/TelepathyQt4/ConnectionInterfaceClientTypes +++ b/TelepathyQt4/ConnectionInterfaceClientTypes @@ -1,8 +1,8 @@ #ifndef _TelepathyQt4_ConnectionInterfaceClientTyes_HEADER_GUARD_ #define _TelepathyQt4_ConnectionInterfaceClientTyes_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #ifdef TELEPATHY_QT4_DEPRECATED_WARNINGS @@ -11,7 +11,7 @@ #include <TelepathyQt4/connection.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceClientTypesInterface b/TelepathyQt4/ConnectionInterfaceClientTypesInterface index 657c2887..f157c47d 100644 --- a/TelepathyQt4/ConnectionInterfaceClientTypesInterface +++ b/TelepathyQt4/ConnectionInterfaceClientTypesInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ConnectionInterfaceClientTypesInterface_HEADER_GUARD_ #define _TelepathyQt4_ConnectionInterfaceClientTypesInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/connection.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceContactBlockingInterface b/TelepathyQt4/ConnectionInterfaceContactBlockingInterface index e6e5b60f..2ff8e2ab 100644 --- a/TelepathyQt4/ConnectionInterfaceContactBlockingInterface +++ b/TelepathyQt4/ConnectionInterfaceContactBlockingInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ConnectionInterfaceContactBlockingInterface_HEADER_GUARD_ #define _TelepathyQt4_ConnectionInterfaceContactBlockingInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/connection.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceContactCapabilitiesInterface b/TelepathyQt4/ConnectionInterfaceContactCapabilitiesInterface index 96d94a71..11e77a76 100644 --- a/TelepathyQt4/ConnectionInterfaceContactCapabilitiesInterface +++ b/TelepathyQt4/ConnectionInterfaceContactCapabilitiesInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ConnectionInterfaceContactCapabilitiesInterface_HEADER_GUARD_ #define _TelepathyQt4_ConnectionInterfaceContactCapabilitiesInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/connection.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceContactGroups b/TelepathyQt4/ConnectionInterfaceContactGroups index a09fa221..a723a04d 100644 --- a/TelepathyQt4/ConnectionInterfaceContactGroups +++ b/TelepathyQt4/ConnectionInterfaceContactGroups @@ -1,8 +1,8 @@ #ifndef _TelepathyQt4_ConnectionInterfaceContactGroups_HEADER_GUARD_ #define _TelepathyQt4_ConnectionInterfaceContactGroups_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #ifdef TELEPATHY_QT4_DEPRECATED_WARNINGS @@ -11,7 +11,7 @@ #include <TelepathyQt4/connection.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceContactGroupsInterface b/TelepathyQt4/ConnectionInterfaceContactGroupsInterface index ac3eb759..9e7ca09f 100644 --- a/TelepathyQt4/ConnectionInterfaceContactGroupsInterface +++ b/TelepathyQt4/ConnectionInterfaceContactGroupsInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ConnectionInterfaceContactGroupsInterface_HEADER_GUARD_ #define _TelepathyQt4_ConnectionInterfaceContactGroupsInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/connection.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceContactInfoInterface b/TelepathyQt4/ConnectionInterfaceContactInfoInterface index e4a6c0a8..eb62168d 100644 --- a/TelepathyQt4/ConnectionInterfaceContactInfoInterface +++ b/TelepathyQt4/ConnectionInterfaceContactInfoInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ConnectionInterfaceContactInfoInterface_HEADER_GUARD_ #define _TelepathyQt4_ConnectionInterfaceContactInfoInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/connection.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceContactList b/TelepathyQt4/ConnectionInterfaceContactList index 9f0aaf4f..671d42fe 100644 --- a/TelepathyQt4/ConnectionInterfaceContactList +++ b/TelepathyQt4/ConnectionInterfaceContactList @@ -1,8 +1,8 @@ #ifndef _TelepathyQt4_ConnectionInterfaceContactList_HEADER_GUARD_ #define _TelepathyQt4_ConnectionInterfaceContactList_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #ifdef TELEPATHY_QT4_DEPRECATED_WARNINGS @@ -11,7 +11,7 @@ #include <TelepathyQt4/connection.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceContactListInterface b/TelepathyQt4/ConnectionInterfaceContactListInterface index 43f67562..cef792d9 100644 --- a/TelepathyQt4/ConnectionInterfaceContactListInterface +++ b/TelepathyQt4/ConnectionInterfaceContactListInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ConnectionInterfaceContactListInterface_HEADER_GUARD_ #define _TelepathyQt4_ConnectionInterfaceContactListInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/connection.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceContactsInterface b/TelepathyQt4/ConnectionInterfaceContactsInterface index 1aaf814f..965afbf4 100644 --- a/TelepathyQt4/ConnectionInterfaceContactsInterface +++ b/TelepathyQt4/ConnectionInterfaceContactsInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ConnectionInterfaceContactsInterface_HEADER_GUARD_ #define _TelepathyQt4_ConnectionInterfaceContactsInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/connection.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceLocationInterface b/TelepathyQt4/ConnectionInterfaceLocationInterface index 20c948f4..33af2e50 100644 --- a/TelepathyQt4/ConnectionInterfaceLocationInterface +++ b/TelepathyQt4/ConnectionInterfaceLocationInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ConnectionInterfaceLocationInterface_HEADER_GUARD_ #define _TelepathyQt4_ConnectionInterfaceLocationInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/connection.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceMailNotificationInterface b/TelepathyQt4/ConnectionInterfaceMailNotificationInterface index b34b3f48..4d981b51 100644 --- a/TelepathyQt4/ConnectionInterfaceMailNotificationInterface +++ b/TelepathyQt4/ConnectionInterfaceMailNotificationInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ConnectionInterfaceMailNotificationInterface_HEADER_GUARD_ #define _TelepathyQt4_ConnectionInterfaceMailNotificationInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/connection.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfacePowerSaving b/TelepathyQt4/ConnectionInterfacePowerSaving index 2bfaa186..2b5f18ba 100644 --- a/TelepathyQt4/ConnectionInterfacePowerSaving +++ b/TelepathyQt4/ConnectionInterfacePowerSaving @@ -1,8 +1,8 @@ #ifndef _TelepathyQt4_ConnectionInterfacePowerSaving_HEADER_GUARD_ #define _TelepathyQt4_ConnectionInterfacePowerSaving_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #ifdef TELEPATHY_QT4_DEPRECATED_WARNINGS @@ -11,7 +11,7 @@ #include <TelepathyQt4/connection.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfacePowerSavingInterface b/TelepathyQt4/ConnectionInterfacePowerSavingInterface index 179ce896..bf8c552f 100644 --- a/TelepathyQt4/ConnectionInterfacePowerSavingInterface +++ b/TelepathyQt4/ConnectionInterfacePowerSavingInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ConnectionInterfacePowerSavingInterface_HEADER_GUARD_ #define _TelepathyQt4_ConnectionInterfacePowerSavingInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/connection.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfacePresenceInterface b/TelepathyQt4/ConnectionInterfacePresenceInterface index 7f3c7d37..85f1a213 100644 --- a/TelepathyQt4/ConnectionInterfacePresenceInterface +++ b/TelepathyQt4/ConnectionInterfacePresenceInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ConnectionInterfacePresenceInterface_HEADER_GUARD_ #define _TelepathyQt4_ConnectionInterfacePresenceInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/connection.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceRequestsInterface b/TelepathyQt4/ConnectionInterfaceRequestsInterface index b2e91056..e8cc4af8 100644 --- a/TelepathyQt4/ConnectionInterfaceRequestsInterface +++ b/TelepathyQt4/ConnectionInterfaceRequestsInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ConnectionInterfaceRequestsInterface_HEADER_GUARD_ #define _TelepathyQt4_ConnectionInterfaceRequestsInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/connection.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceServicePointInterface b/TelepathyQt4/ConnectionInterfaceServicePointInterface index 1d82d878..4e7b07e6 100644 --- a/TelepathyQt4/ConnectionInterfaceServicePointInterface +++ b/TelepathyQt4/ConnectionInterfaceServicePointInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ConnectionInterfaceServicePointInterface_HEADER_GUARD_ #define _TelepathyQt4_ConnectionInterfaceServicePointInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/connection.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceSimplePresenceInterface b/TelepathyQt4/ConnectionInterfaceSimplePresenceInterface index 5a8ecf89..4e3fc77f 100644 --- a/TelepathyQt4/ConnectionInterfaceSimplePresenceInterface +++ b/TelepathyQt4/ConnectionInterfaceSimplePresenceInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ConnectionInterfaceSimplePresenceInterface_HEADER_GUARD_ #define _TelepathyQt4_ConnectionInterfaceSimplePresenceInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/connection.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionLowlevel b/TelepathyQt4/ConnectionLowlevel index 3e771e06..87e9e82c 100644 --- a/TelepathyQt4/ConnectionLowlevel +++ b/TelepathyQt4/ConnectionLowlevel @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ConnectionLowlevel_HEADER_GUARD #define _TelepathyQt4_ConnectionLowlevel_HEADER_GUARD -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/connection-lowlevel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionManager b/TelepathyQt4/ConnectionManager index 40a3cca7..513b1240 100644 --- a/TelepathyQt4/ConnectionManager +++ b/TelepathyQt4/ConnectionManager @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ConnectionManager_HEADER_GUARD_ #define _TelepathyQt4_ConnectionManager_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/connection-manager.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionManagerInterface b/TelepathyQt4/ConnectionManagerInterface index ac3eb34c..81868b07 100644 --- a/TelepathyQt4/ConnectionManagerInterface +++ b/TelepathyQt4/ConnectionManagerInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ConnectionManagerInterface_HEADER_GUARD_ #define _TelepathyQt4_ConnectionManagerInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/connection-manager.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionManagerLowlevel b/TelepathyQt4/ConnectionManagerLowlevel index 60a82b87..ab316996 100644 --- a/TelepathyQt4/ConnectionManagerLowlevel +++ b/TelepathyQt4/ConnectionManagerLowlevel @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ConnectionManagerLowlevel_HEADER_GUARD #define _TelepathyQt4_ConnectionManagerLowlevel_HEADER_GUARD -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/connection-manager-lowlevel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/Constants b/TelepathyQt4/Constants index 11be2eeb..64cacb26 100644 --- a/TelepathyQt4/Constants +++ b/TelepathyQt4/Constants @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_Constants_HEADER_GUARD_ #define _TelepathyQt4_Constants_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/constants.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/Contact b/TelepathyQt4/Contact index 78b2d4b2..a12e59fe 100644 --- a/TelepathyQt4/Contact +++ b/TelepathyQt4/Contact @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_Contact_HEADER_GUARD_ #define _TelepathyQt4_Contact_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/contact.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ContactCapabilities b/TelepathyQt4/ContactCapabilities index 758bdbb7..a000bcac 100644 --- a/TelepathyQt4/ContactCapabilities +++ b/TelepathyQt4/ContactCapabilities @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ContactCapabilities_HEADER_GUARD_ #define _TelepathyQt4_ContactCapabilities_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/contact-capabilities.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ContactFactory b/TelepathyQt4/ContactFactory index 4df4372b..ed5a79cf 100644 --- a/TelepathyQt4/ContactFactory +++ b/TelepathyQt4/ContactFactory @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ContactFactory_HEADER_GUARD_ #define _TelepathyQt4_ContactFactory_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/contact-factory.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ContactManager b/TelepathyQt4/ContactManager index dfd1723a..08045dcf 100644 --- a/TelepathyQt4/ContactManager +++ b/TelepathyQt4/ContactManager @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ContactManager_HEADER_GUARD_ #define _TelepathyQt4_ContactManager_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/contact-manager.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ContactMessenger b/TelepathyQt4/ContactMessenger index d57668bd..daa78076 100644 --- a/TelepathyQt4/ContactMessenger +++ b/TelepathyQt4/ContactMessenger @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ContactMessenger_HEADER_GUARD_ #define _TelepathyQt4_ContactMessenger_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/contact-messenger.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ContactSearchChannel b/TelepathyQt4/ContactSearchChannel index a5e6fa22..df6085b6 100644 --- a/TelepathyQt4/ContactSearchChannel +++ b/TelepathyQt4/ContactSearchChannel @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ContactSearchChannel_HEADER_GUARD_ #define _TelepathyQt4_ContactSearchChannel_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/contact-search-channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/DBus b/TelepathyQt4/DBus index f449e60e..b807569f 100644 --- a/TelepathyQt4/DBus +++ b/TelepathyQt4/DBus @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_DBus_HEADER_GUARD_ #define _TelepathyQt4_DBus_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/dbus.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/DBusDaemonInterface b/TelepathyQt4/DBusDaemonInterface index 7164d1dd..1ffa1a9c 100644 --- a/TelepathyQt4/DBusDaemonInterface +++ b/TelepathyQt4/DBusDaemonInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_DBusDaemonInterface_HEADER_GUARD_ #define _TelepathyQt4_DBusDaemonInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/dbus.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/DBusProxy b/TelepathyQt4/DBusProxy index ab4f5aa2..534387ee 100644 --- a/TelepathyQt4/DBusProxy +++ b/TelepathyQt4/DBusProxy @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_DBusProxy_HEADER_GUARD_ #define _TelepathyQt4_DBusProxy_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/dbus-proxy.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/DBusProxyFactory b/TelepathyQt4/DBusProxyFactory index 4af3cdf6..edd8801f 100644 --- a/TelepathyQt4/DBusProxyFactory +++ b/TelepathyQt4/DBusProxyFactory @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_DBusProxyFactory_HEADER_GUARD_ #define _TelepathyQt4_DBusProxyFactory_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/dbus-proxy-factory.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/Debug b/TelepathyQt4/Debug index fe5aab66..d13f75ac 100644 --- a/TelepathyQt4/Debug +++ b/TelepathyQt4/Debug @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_Debug_HEADER_GUARD_ #define _TelepathyQt4_Debug_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/debug.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/Farsight/Channel b/TelepathyQt4/Farsight/Channel index aa4c93ef..19fd9562 100644 --- a/TelepathyQt4/Farsight/Channel +++ b/TelepathyQt4/Farsight/Channel @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_Farsight_Channel_HEADER_GUARD_ #define _TelepathyQt4_Farsight_Channel_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/Farsight/channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/Farsight/channel.h b/TelepathyQt4/Farsight/channel.h index 8476d0d7..7b0afd08 100644 --- a/TelepathyQt4/Farsight/channel.h +++ b/TelepathyQt4/Farsight/channel.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_Farsight_channel_h_HEADER_GUARD_ #define _TelepathyQt4_Farsight_channel_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Farsight/global.h> diff --git a/TelepathyQt4/Farsight/global.h b/TelepathyQt4/Farsight/global.h index f3754ae3..82f58ecb 100644 --- a/TelepathyQt4/Farsight/global.h +++ b/TelepathyQt4/Farsight/global.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_Farsight_global_h_HEADER_GUARD_ #define _TelepathyQt4_Farsight_global_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <QtGlobal> diff --git a/TelepathyQt4/Feature b/TelepathyQt4/Feature index fa80e07f..8e8bebb6 100644 --- a/TelepathyQt4/Feature +++ b/TelepathyQt4/Feature @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_Feature_HEADER_GUARD_ #define _TelepathyQt4_Feature_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/feature.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/Features b/TelepathyQt4/Features index 0e864c79..72e9966e 100644 --- a/TelepathyQt4/Features +++ b/TelepathyQt4/Features @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_Features_HEADER_GUARD_ #define _TelepathyQt4_Features_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/feature.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/FileTransferChannel b/TelepathyQt4/FileTransferChannel index 57f6b944..dfca8a47 100644 --- a/TelepathyQt4/FileTransferChannel +++ b/TelepathyQt4/FileTransferChannel @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_FileTransferChannel_HEADER_GUARD_ #define _TelepathyQt4_FileTransferChannel_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/file-transfer-channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/FileTransferChannelCreationProperties b/TelepathyQt4/FileTransferChannelCreationProperties index c6aaad71..362d8670 100644 --- a/TelepathyQt4/FileTransferChannelCreationProperties +++ b/TelepathyQt4/FileTransferChannelCreationProperties @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_FileTransferChannelCreationProperties_HEADER_GUARD_ #define _TelepathyQt4_FileTransferChannelCreationProperties_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/file-transfer-channel-creation-properties.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/Filter b/TelepathyQt4/Filter index 29151464..2775dc11 100644 --- a/TelepathyQt4/Filter +++ b/TelepathyQt4/Filter @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_Filter_HEADER_GUARD_ #define _TelepathyQt4_Filter_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/filter.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/FixedFeatureFactory b/TelepathyQt4/FixedFeatureFactory index 555301c3..c958c98e 100644 --- a/TelepathyQt4/FixedFeatureFactory +++ b/TelepathyQt4/FixedFeatureFactory @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_FixedFeatureFactory_HEADER_GUARD_ #define _TelepathyQt4_FixedFeatureFactory_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/fixed-feature-factory.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/GenericCapabilityFilter b/TelepathyQt4/GenericCapabilityFilter index 074f5953..9bda825c 100644 --- a/TelepathyQt4/GenericCapabilityFilter +++ b/TelepathyQt4/GenericCapabilityFilter @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_GenericCapabilityFilter_HEADER_GUARD_ #define _TelepathyQt4_GenericCapabilityFilter_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/generic-capability-filter.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/GenericPropertyFilter b/TelepathyQt4/GenericPropertyFilter index 57f3235d..110f00fe 100644 --- a/TelepathyQt4/GenericPropertyFilter +++ b/TelepathyQt4/GenericPropertyFilter @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_GenericPropertyFilter_HEADER_GUARD_ #define _TelepathyQt4_GenericPropertyFilter_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/generic-property-filter.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/Global b/TelepathyQt4/Global index 3456c70b..d4fb7f21 100644 --- a/TelepathyQt4/Global +++ b/TelepathyQt4/Global @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_Global_HEADER_GUARD_ #define _TelepathyQt4_Global_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/global.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/HandledChannelNotifier b/TelepathyQt4/HandledChannelNotifier index 1f99c8cd..541071ec 100644 --- a/TelepathyQt4/HandledChannelNotifier +++ b/TelepathyQt4/HandledChannelNotifier @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_HandledChannelNotifier_HEADER_GUARD_ #define _TelepathyQt4_HandledChannelNotifier_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/handled-channel-notifier.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/IncomingFileTransferChannel b/TelepathyQt4/IncomingFileTransferChannel index 4392d3e3..7f606fbb 100644 --- a/TelepathyQt4/IncomingFileTransferChannel +++ b/TelepathyQt4/IncomingFileTransferChannel @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_IncomingFileTransferChannel_HEADER_GUARD_ #define _TelepathyQt4_IncomingFileTransferChannel_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/incoming-file-transfer-channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/IncomingStreamTubeChannel b/TelepathyQt4/IncomingStreamTubeChannel index eb573bbc..a7bfb033 100644 --- a/TelepathyQt4/IncomingStreamTubeChannel +++ b/TelepathyQt4/IncomingStreamTubeChannel @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_IncomingStreamTubeChannel_HEADER_GUARD_ #define _TelepathyQt4_IncomingStreamTubeChannel_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/incoming-stream-tube-channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/IntrospectableInterface b/TelepathyQt4/IntrospectableInterface index f5cb393f..ddb0c1b1 100644 --- a/TelepathyQt4/IntrospectableInterface +++ b/TelepathyQt4/IntrospectableInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_IntrospectableInterface_HEADER_GUARD_ #define _TelepathyQt4_IntrospectableInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/dbus.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/KeyFile b/TelepathyQt4/KeyFile index 0839310e..206a83f4 100644 --- a/TelepathyQt4/KeyFile +++ b/TelepathyQt4/KeyFile @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_KeyFile_HEADER_GUARD_ #define _TelepathyQt4_KeyFile_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/key-file.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/LocationInfo b/TelepathyQt4/LocationInfo index 0e3977c7..7069d0e7 100644 --- a/TelepathyQt4/LocationInfo +++ b/TelepathyQt4/LocationInfo @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_LocationInfo_HEADER_GUARD_ #define _TelepathyQt4_LocationInfo_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/location-info.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ManagerFile b/TelepathyQt4/ManagerFile index 11b4601f..32953004 100644 --- a/TelepathyQt4/ManagerFile +++ b/TelepathyQt4/ManagerFile @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ManagerFile_HEADER_GUARD_ #define _TelepathyQt4_ManagerFile_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/manager-file.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/MediaSessionHandler b/TelepathyQt4/MediaSessionHandler index 9c7a9196..c5502d08 100644 --- a/TelepathyQt4/MediaSessionHandler +++ b/TelepathyQt4/MediaSessionHandler @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_MediaSessionHandler_HEADER_GUARD_ #define _TelepathyQt4_MediaSessionHandler_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/media-session-handler.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/MediaSessionHandlerInterface b/TelepathyQt4/MediaSessionHandlerInterface index 21f7fd05..78b1066c 100644 --- a/TelepathyQt4/MediaSessionHandlerInterface +++ b/TelepathyQt4/MediaSessionHandlerInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_MediaSessionHandlerInterface_HEADER_GUARD_ #define _TelepathyQt4_MediaSessionHandlerInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/media-session-handler.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/MediaStreamHandler b/TelepathyQt4/MediaStreamHandler index 472d6d28..3868220d 100644 --- a/TelepathyQt4/MediaStreamHandler +++ b/TelepathyQt4/MediaStreamHandler @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_MediaStreamHandler_HEADER_GUARD_ #define _TelepathyQt4_MediaStreamHandler_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/media-stream-handler.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/MediaStreamHandlerInterface b/TelepathyQt4/MediaStreamHandlerInterface index e1ef8c54..3ce2ad9b 100644 --- a/TelepathyQt4/MediaStreamHandlerInterface +++ b/TelepathyQt4/MediaStreamHandlerInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_MediaStreamHandlerInterface_HEADER_GUARD_ #define _TelepathyQt4_MediaStreamHandlerInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/media-stream-handler.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/Message b/TelepathyQt4/Message index 80d1519c..b790dad5 100644 --- a/TelepathyQt4/Message +++ b/TelepathyQt4/Message @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_Message_HEADER_GUARD_ #define _TelepathyQt4_Message_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/message.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/MessageContentPart b/TelepathyQt4/MessageContentPart index bcaa64a0..b46a2a70 100644 --- a/TelepathyQt4/MessageContentPart +++ b/TelepathyQt4/MessageContentPart @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_MessageContentPart_HEADER_GUARD_ #define _TelepathyQt4_MessageContentPart_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/message-content-part.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/MessageContentPartList b/TelepathyQt4/MessageContentPartList index a05fe647..73a0a2e7 100644 --- a/TelepathyQt4/MessageContentPartList +++ b/TelepathyQt4/MessageContentPartList @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_MessageContentPartList_HEADER_GUARD_ #define _TelepathyQt4_MessageContentPartList_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/message-content-part.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/MethodInvocationContext b/TelepathyQt4/MethodInvocationContext index aa4ae9bb..9072c238 100644 --- a/TelepathyQt4/MethodInvocationContext +++ b/TelepathyQt4/MethodInvocationContext @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_MethodInvocationContext_HEADER_GUARD_ #define _TelepathyQt4_MethodInvocationContext_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/method-invocation-context.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/NotFilter b/TelepathyQt4/NotFilter index 2019f179..fe0d8224 100644 --- a/TelepathyQt4/NotFilter +++ b/TelepathyQt4/NotFilter @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_NotFilter_HEADER_GUARD_ #define _TelepathyQt4_NotFilter_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/not-filter.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/Object b/TelepathyQt4/Object index 65a86c69..1abdf34e 100644 --- a/TelepathyQt4/Object +++ b/TelepathyQt4/Object @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_Object_HEADER_GUARD_ #define _TelepathyQt4_Object_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/object.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/OptionalInterfaceFactory b/TelepathyQt4/OptionalInterfaceFactory index d376c1c0..09c49e4a 100644 --- a/TelepathyQt4/OptionalInterfaceFactory +++ b/TelepathyQt4/OptionalInterfaceFactory @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_OptionalInterfaceFactory_HEADER_GUARD_ #define _TelepathyQt4_OptionalInterfaceFactory_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/optional-interface-factory.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/OrFilter b/TelepathyQt4/OrFilter index 3ef0a2f5..ca2ab990 100644 --- a/TelepathyQt4/OrFilter +++ b/TelepathyQt4/OrFilter @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_OrFilter_HEADER_GUARD_ #define _TelepathyQt4_OrFilter_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/or-filter.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/OutgoingFileTransferChannel b/TelepathyQt4/OutgoingFileTransferChannel index 792225b0..6f31c74d 100644 --- a/TelepathyQt4/OutgoingFileTransferChannel +++ b/TelepathyQt4/OutgoingFileTransferChannel @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_OutgoingFileTransferChannel_HEADER_GUARD_ #define _TelepathyQt4_OutgoingFileTransferChannel_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/outgoing-file-transfer-channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/OutgoingStreamTubeChannel b/TelepathyQt4/OutgoingStreamTubeChannel index 5fd21af5..b5e68d67 100644 --- a/TelepathyQt4/OutgoingStreamTubeChannel +++ b/TelepathyQt4/OutgoingStreamTubeChannel @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_OutgoingStreamTubeChannel_HEADER_GUARD_ #define _TelepathyQt4_OutgoingStreamTubeChannel_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/outgoing-stream-tube-channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/PeerInterface b/TelepathyQt4/PeerInterface index 17165aaa..90192e5c 100644 --- a/TelepathyQt4/PeerInterface +++ b/TelepathyQt4/PeerInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_PeerInterface_HEADER_GUARD_ #define _TelepathyQt4_PeerInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/dbus.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/PendingAccount b/TelepathyQt4/PendingAccount index d1569ebc..7168ea87 100644 --- a/TelepathyQt4/PendingAccount +++ b/TelepathyQt4/PendingAccount @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_PendingAccount_HEADER_GUARD_ #define _TelepathyQt4_PendingAccount_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/pending-account.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/PendingChannel b/TelepathyQt4/PendingChannel index 6f1bc904..2d565451 100644 --- a/TelepathyQt4/PendingChannel +++ b/TelepathyQt4/PendingChannel @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_PendingChannel_HEADER_GUARD_ #define _TelepathyQt4_PendingChannel_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/pending-channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/PendingChannelRequest b/TelepathyQt4/PendingChannelRequest index 567129ac..42a0ea4a 100644 --- a/TelepathyQt4/PendingChannelRequest +++ b/TelepathyQt4/PendingChannelRequest @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_PendingChannelRequest_HEADER_GUARD_ #define _TelepathyQt4_PendingChannelRequest_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/pending-channel-request.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/PendingComposite b/TelepathyQt4/PendingComposite index ea06ff64..691604cf 100644 --- a/TelepathyQt4/PendingComposite +++ b/TelepathyQt4/PendingComposite @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_PendingComposite_HEADER_GUARD_ #define _TelepathyQt4_PendingComposite_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/simple-pending-operations.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/PendingConnection b/TelepathyQt4/PendingConnection index db1f046c..b6d4c6d5 100644 --- a/TelepathyQt4/PendingConnection +++ b/TelepathyQt4/PendingConnection @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_PendingConnection_HEADER_GUARD_ #define _TelepathyQt4_PendingConnection_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/pending-connection.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/PendingContactAttributes b/TelepathyQt4/PendingContactAttributes index be05ad77..5f37b436 100644 --- a/TelepathyQt4/PendingContactAttributes +++ b/TelepathyQt4/PendingContactAttributes @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_PendingContactAttributes_HEADER_GUARD_ #define _TelepathyQt4_PendingContactAttributes_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/pending-contact-attributes.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/PendingContactInfo b/TelepathyQt4/PendingContactInfo index e2ace1d4..9f3c7a3e 100644 --- a/TelepathyQt4/PendingContactInfo +++ b/TelepathyQt4/PendingContactInfo @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_PendingContactInfo_HEADER_GUARD_ #define _TelepathyQt4_PendingContactInfo_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/pending-contact-info.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/PendingContacts b/TelepathyQt4/PendingContacts index a6b1fb69..40b8e042 100644 --- a/TelepathyQt4/PendingContacts +++ b/TelepathyQt4/PendingContacts @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_PendingContacts_HEADER_GUARD_ #define _TelepathyQt4_PendingContacts_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/pending-contacts.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/PendingFailure b/TelepathyQt4/PendingFailure index 6be76537..eb4ead7c 100644 --- a/TelepathyQt4/PendingFailure +++ b/TelepathyQt4/PendingFailure @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_PendingFailure_HEADER_GUARD_ #define _TelepathyQt4_PendingFailure_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/simple-pending-operations.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/PendingHandles b/TelepathyQt4/PendingHandles index 4697f604..aaad3c4d 100644 --- a/TelepathyQt4/PendingHandles +++ b/TelepathyQt4/PendingHandles @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_PendingHandles_HEADER_GUARD_ #define _TelepathyQt4_PendingHandles_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/pending-handles.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/PendingOperation b/TelepathyQt4/PendingOperation index cbcd995c..fdffc4fc 100644 --- a/TelepathyQt4/PendingOperation +++ b/TelepathyQt4/PendingOperation @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_PendingOperation_HEADER_GUARD_ #define _TelepathyQt4_PendingOperation_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/pending-operation.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/PendingReady b/TelepathyQt4/PendingReady index befae018..e7adfc52 100644 --- a/TelepathyQt4/PendingReady +++ b/TelepathyQt4/PendingReady @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_PendingReady_HEADER_GUARD_ #define _TelepathyQt4_PendingReady_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/pending-ready.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/PendingSendMessage b/TelepathyQt4/PendingSendMessage index 5a4c2caf..98b91d8f 100644 --- a/TelepathyQt4/PendingSendMessage +++ b/TelepathyQt4/PendingSendMessage @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_PendingSendMessage_HEADER_GUARD_ #define _TelepathyQt4_PendingSendMessage_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/pending-send-message.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/PendingStreamTubeConnection b/TelepathyQt4/PendingStreamTubeConnection index dc87287f..7a094cae 100644 --- a/TelepathyQt4/PendingStreamTubeConnection +++ b/TelepathyQt4/PendingStreamTubeConnection @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_PendingStreamTubeConnection_HEADER_GUARD_ #define _TelepathyQt4_PendingStreamTubeConnection_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/pending-stream-tube-connection.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/PendingStreamedMediaStreams b/TelepathyQt4/PendingStreamedMediaStreams index 4db0fbac..7c162936 100644 --- a/TelepathyQt4/PendingStreamedMediaStreams +++ b/TelepathyQt4/PendingStreamedMediaStreams @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_PendingStreamedMediaStreams_HEADER_GUARD_ #define _TelepathyQt4_PendingStreamedMediaStreams_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/streamed-media-channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/PendingStringList b/TelepathyQt4/PendingStringList index 529835a6..0e45b6a7 100644 --- a/TelepathyQt4/PendingStringList +++ b/TelepathyQt4/PendingStringList @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_PendingStringList_HEADER_GUARD_ #define _TelepathyQt4_PendingStringList_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/pending-string-list.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/PendingSuccess b/TelepathyQt4/PendingSuccess index 473f1767..bd3c7a28 100644 --- a/TelepathyQt4/PendingSuccess +++ b/TelepathyQt4/PendingSuccess @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_PendingSuccess_HEADER_GUARD_ #define _TelepathyQt4_PendingSuccess_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/simple-pending-operations.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/PendingVariant b/TelepathyQt4/PendingVariant index d2473d35..c3146dd0 100644 --- a/TelepathyQt4/PendingVariant +++ b/TelepathyQt4/PendingVariant @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_PendingVariant_HEADER_GUARD_ #define _TelepathyQt4_PendingVariant_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/pending-variant.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/PendingVariantMap b/TelepathyQt4/PendingVariantMap index da08bd94..2cccb0f9 100644 --- a/TelepathyQt4/PendingVariantMap +++ b/TelepathyQt4/PendingVariantMap @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_PendingVariantMap_HEADER_GUARD_ #define _TelepathyQt4_PendingVariantMap_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/pending-variant-map.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/PendingVoid b/TelepathyQt4/PendingVoid index 624e4776..7e21623f 100644 --- a/TelepathyQt4/PendingVoid +++ b/TelepathyQt4/PendingVoid @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_PendingVoid_HEADER_GUARD_ #define _TelepathyQt4_PendingVoid_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/simple-pending-operations.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/Presence b/TelepathyQt4/Presence index 928954a7..83d97022 100644 --- a/TelepathyQt4/Presence +++ b/TelepathyQt4/Presence @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_Presence_HEADER_GUARD_ #define _TelepathyQt4_Presence_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/presence.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/PresenceSpec b/TelepathyQt4/PresenceSpec index b50fc2f4..3d87b7c4 100644 --- a/TelepathyQt4/PresenceSpec +++ b/TelepathyQt4/PresenceSpec @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_PresenceSpec_HEADER_GUARD_ #define _TelepathyQt4_PresenceSpec_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/presence.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/PresenceSpecList b/TelepathyQt4/PresenceSpecList index d9cd9d50..ff7448e9 100644 --- a/TelepathyQt4/PresenceSpecList +++ b/TelepathyQt4/PresenceSpecList @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_PresenceSpecList_HEADER_GUARD_ #define _TelepathyQt4_PresenceSpecList_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/presence.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/Profile b/TelepathyQt4/Profile index b4fb51aa..161c0bfd 100644 --- a/TelepathyQt4/Profile +++ b/TelepathyQt4/Profile @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_Profile_HEADER_GUARD_ #define _TelepathyQt4_Profile_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/profile.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ProfileManager b/TelepathyQt4/ProfileManager index d244b96d..44db4deb 100644 --- a/TelepathyQt4/ProfileManager +++ b/TelepathyQt4/ProfileManager @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ProfileManager_HEADER_GUARD_ #define _TelepathyQt4_ProfileManager_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/profile-manager.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/Properties b/TelepathyQt4/Properties index e9f1581c..1caa85cb 100644 --- a/TelepathyQt4/Properties +++ b/TelepathyQt4/Properties @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_Properties_HEADER_GUARD_ #define _TelepathyQt4_Properties_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/properties.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/PropertiesInterface b/TelepathyQt4/PropertiesInterface index bebc2299..34f66bf7 100644 --- a/TelepathyQt4/PropertiesInterface +++ b/TelepathyQt4/PropertiesInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_PropertiesInterface_HEADER_GUARD_ #define _TelepathyQt4_PropertiesInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/dbus.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/PropertiesInterfaceInterface b/TelepathyQt4/PropertiesInterfaceInterface index eb47f947..348bf457 100644 --- a/TelepathyQt4/PropertiesInterfaceInterface +++ b/TelepathyQt4/PropertiesInterfaceInterface @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_PropertiesInterfaceInterface_HEADER_GUARD_ #define _TelepathyQt4_PropertiesInterfaceInterface_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/properties.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ProtocolInfo b/TelepathyQt4/ProtocolInfo index 93c98a4b..1d9b16a8 100644 --- a/TelepathyQt4/ProtocolInfo +++ b/TelepathyQt4/ProtocolInfo @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ProtocolInfo_HEADER_GUARD_ #define _TelepathyQt4_ProtocolInfo_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/protocol-info.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ProtocolParameter b/TelepathyQt4/ProtocolParameter index f63cf4a1..8b020afa 100644 --- a/TelepathyQt4/ProtocolParameter +++ b/TelepathyQt4/ProtocolParameter @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ProtocolParameter_HEADER_GUARD_ #define _TelepathyQt4_ProtocolParameter_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/protocol-parameter.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ReadinessHelper b/TelepathyQt4/ReadinessHelper index 368a8a52..91f61159 100644 --- a/TelepathyQt4/ReadinessHelper +++ b/TelepathyQt4/ReadinessHelper @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ReadinessHelper_HEADER_GUARD_ #define _TelepathyQt4_ReadinessHelper_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/readiness-helper.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ReadyObject b/TelepathyQt4/ReadyObject index ad6b261a..6415fbc4 100644 --- a/TelepathyQt4/ReadyObject +++ b/TelepathyQt4/ReadyObject @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ReadyObject_HEADER_GUARD_ #define _TelepathyQt4_ReadyObject_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/ready-object.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ReceivedMessage b/TelepathyQt4/ReceivedMessage index c8119c19..379956f8 100644 --- a/TelepathyQt4/ReceivedMessage +++ b/TelepathyQt4/ReceivedMessage @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_ReceivedMessage_HEADER_GUARD_ #define _TelepathyQt4_ReceivedMessage_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/message.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/RefCounted b/TelepathyQt4/RefCounted index 7a6d6e4b..995cabe9 100644 --- a/TelepathyQt4/RefCounted +++ b/TelepathyQt4/RefCounted @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_RefCounted_HEADER_GUARD_ #define _TelepathyQt4_RefCounted_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/shared-ptr.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/ReferencedHandles b/TelepathyQt4/ReferencedHandles index 53285afe..8c910f01 100644 --- a/TelepathyQt4/ReferencedHandles +++ b/TelepathyQt4/ReferencedHandles @@ -1,12 +1,12 @@ #ifndef _TelepathyQt4_ReferencedHandles_HEADER_GUARD_ #define _TelepathyQt4_ReferencedHandles_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/referenced-handles.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif diff --git a/TelepathyQt4/RequestableChannelClassSpec b/TelepathyQt4/RequestableChannelClassSpec index 692ead68..1c9ac06f 100644 --- a/TelepathyQt4/RequestableChannelClassSpec +++ b/TelepathyQt4/RequestableChannelClassSpec @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_RequestableChannelClassSpec_HEADER_GUARD_ #define _TelepathyQt4_RequestableChannelClassSpec_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/requestable-channel-class-spec.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/RequestableChannelClassSpecList b/TelepathyQt4/RequestableChannelClassSpecList index e86ac7c7..c15fa006 100644 --- a/TelepathyQt4/RequestableChannelClassSpecList +++ b/TelepathyQt4/RequestableChannelClassSpecList @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_RequestableChannelClassSpecList_HEADER_GUARD_ #define _TelepathyQt4_RequestableChannelClassSpecList_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/requestable-channel-class-spec.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/RoomListChannel b/TelepathyQt4/RoomListChannel index 4b953b69..164e7170 100644 --- a/TelepathyQt4/RoomListChannel +++ b/TelepathyQt4/RoomListChannel @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_RoomListChannel_HEADER_GUARD_ #define _TelepathyQt4_RoomListChannel_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/room-list-channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/SharedPtr b/TelepathyQt4/SharedPtr index 0ff96a43..ef92feb6 100644 --- a/TelepathyQt4/SharedPtr +++ b/TelepathyQt4/SharedPtr @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_SharedPtr_HEADER_GUARD_ #define _TelepathyQt4_SharedPtr_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/shared-ptr.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/SimpleCallObserver b/TelepathyQt4/SimpleCallObserver index e12dbea3..afc05ab5 100644 --- a/TelepathyQt4/SimpleCallObserver +++ b/TelepathyQt4/SimpleCallObserver @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_SimpleCallObserver_HEADER_GUARD_ #define _TelepathyQt4_SimpleCallObserver_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/simple-call-observer.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/SimpleObserver b/TelepathyQt4/SimpleObserver index 7b42ac28..8f2a56d8 100644 --- a/TelepathyQt4/SimpleObserver +++ b/TelepathyQt4/SimpleObserver @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_SimpleObserver_HEADER_GUARD_ #define _TelepathyQt4_SimpleObserver_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/simple-observer.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/SimpleTextObserver b/TelepathyQt4/SimpleTextObserver index 2817bc4c..81696508 100644 --- a/TelepathyQt4/SimpleTextObserver +++ b/TelepathyQt4/SimpleTextObserver @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_SimpleTextObserver_HEADER_GUARD_ #define _TelepathyQt4_SimpleTextObserver_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/simple-text-observer.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/StatefulDBusProxy b/TelepathyQt4/StatefulDBusProxy index cafcb85d..07ecdbe3 100644 --- a/TelepathyQt4/StatefulDBusProxy +++ b/TelepathyQt4/StatefulDBusProxy @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_StatefulDBusProxy_HEADER_GUARD_ #define _TelepathyQt4_StatefulDBusProxy_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/dbus-proxy.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/StatelessDBusProxy b/TelepathyQt4/StatelessDBusProxy index be9465f8..1b6459a2 100644 --- a/TelepathyQt4/StatelessDBusProxy +++ b/TelepathyQt4/StatelessDBusProxy @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_StatelessDBusProxy_HEADER_GUARD_ #define _TelepathyQt4_StatelessDBusProxy_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/dbus-proxy.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/StreamTubeChannel b/TelepathyQt4/StreamTubeChannel index 0e538bd1..208436d4 100644 --- a/TelepathyQt4/StreamTubeChannel +++ b/TelepathyQt4/StreamTubeChannel @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_StreamTubeChannel_HEADER_GUARD_ #define _TelepathyQt4_StreamTubeChannel_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/stream-tube-channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/StreamTubeClient b/TelepathyQt4/StreamTubeClient index 51f74c43..d28611d3 100644 --- a/TelepathyQt4/StreamTubeClient +++ b/TelepathyQt4/StreamTubeClient @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_StreamTubeClient_HEADER_GUARD_ #define _TelepathyQt4_StreamTubeClient_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/stream-tube-client.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/StreamTubeServer b/TelepathyQt4/StreamTubeServer index 53361110..0d8ea7dc 100644 --- a/TelepathyQt4/StreamTubeServer +++ b/TelepathyQt4/StreamTubeServer @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_StreamTubeServer_HEADER_GUARD_ #define _TelepathyQt4_StreamTubeServer_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/stream-tube-server.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/StreamedMediaChannel b/TelepathyQt4/StreamedMediaChannel index f64c4038..9abfbb50 100644 --- a/TelepathyQt4/StreamedMediaChannel +++ b/TelepathyQt4/StreamedMediaChannel @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_StreamedMediaChannel_HEADER_GUARD_ #define _TelepathyQt4_StreamedMediaChannel_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/streamed-media-channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/StreamedMediaStream b/TelepathyQt4/StreamedMediaStream index 704afc23..3140c529 100644 --- a/TelepathyQt4/StreamedMediaStream +++ b/TelepathyQt4/StreamedMediaStream @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_StreamedMediaStream_HEADER_GUARD_ #define _TelepathyQt4_StreamedMediaStream_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/streamed-media-channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/TextChannel b/TelepathyQt4/TextChannel index 3f76400d..ccea3b2f 100644 --- a/TelepathyQt4/TextChannel +++ b/TelepathyQt4/TextChannel @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_TextChannel_HEADER_GUARD_ #define _TelepathyQt4_TextChannel_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/text-channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/TubeChannel b/TelepathyQt4/TubeChannel index c4c6c363..0121a55f 100644 --- a/TelepathyQt4/TubeChannel +++ b/TelepathyQt4/TubeChannel @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_TubeChannel_HEADER_GUARD_ #define _TelepathyQt4_TubeChannel_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/tube-channel.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif -// vim:set ft=cpp:
\ No newline at end of file +// vim:set ft=cpp: diff --git a/TelepathyQt4/Types b/TelepathyQt4/Types index 0bd48cc4..cac95c87 100644 --- a/TelepathyQt4/Types +++ b/TelepathyQt4/Types @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_Types_HEADER_GUARD_ #define _TelepathyQt4_Types_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/types.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/Utils b/TelepathyQt4/Utils index 4b84a6fb..5bd64320 100644 --- a/TelepathyQt4/Utils +++ b/TelepathyQt4/Utils @@ -1,13 +1,13 @@ #ifndef _TelepathyQt4_Utils_HEADER_GUARD_ #define _TelepathyQt4_Utils_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#define IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER #endif #include <TelepathyQt4/utils.h> -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #endif // vim:set ft=cpp: diff --git a/TelepathyQt4/abstract-client.h b/TelepathyQt4/abstract-client.h index 00eb1ef4..7a928b97 100644 --- a/TelepathyQt4/abstract-client.h +++ b/TelepathyQt4/abstract-client.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_abstract_client_h_HEADER_GUARD_ #define _TelepathyQt4_abstract_client_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Constants> diff --git a/TelepathyQt4/abstract-interface.h b/TelepathyQt4/abstract-interface.h index 42337d73..b4be2510 100644 --- a/TelepathyQt4/abstract-interface.h +++ b/TelepathyQt4/abstract-interface.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_abstract_interface_h_HEADER_GUARD_ #define _TelepathyQt4_abstract_interface_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Global> diff --git a/TelepathyQt4/account-capability-filter.h b/TelepathyQt4/account-capability-filter.h index ac00f22a..649d5bd1 100644 --- a/TelepathyQt4/account-capability-filter.h +++ b/TelepathyQt4/account-capability-filter.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_account_capability_filter_h_HEADER_GUARD_ #define _TelepathyQt4_account_capability_filter_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/GenericCapabilityFilter> diff --git a/TelepathyQt4/account-factory.h b/TelepathyQt4/account-factory.h index c6f9f061..35e4e999 100644 --- a/TelepathyQt4/account-factory.h +++ b/TelepathyQt4/account-factory.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_account_factory_h_HEADER_GUARD_ #define _TelepathyQt4_account_factory_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Global> diff --git a/TelepathyQt4/account-filter.h b/TelepathyQt4/account-filter.h index 903a7137..59cf43f4 100644 --- a/TelepathyQt4/account-filter.h +++ b/TelepathyQt4/account-filter.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_account_filter_h_HEADER_GUARD_ #define _TelepathyQt4_account_filter_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Filter> diff --git a/TelepathyQt4/account-manager.h b/TelepathyQt4/account-manager.h index 7f5a7b25..b0396b9f 100644 --- a/TelepathyQt4/account-manager.h +++ b/TelepathyQt4/account-manager.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_account_manager_h_HEADER_GUARD_ #define _TelepathyQt4_account_manager_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/_gen/cli-account-manager.h> diff --git a/TelepathyQt4/account-property-filter.h b/TelepathyQt4/account-property-filter.h index 31cc2398..35690a28 100644 --- a/TelepathyQt4/account-property-filter.h +++ b/TelepathyQt4/account-property-filter.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_account_property_filter_h_HEADER_GUARD_ #define _TelepathyQt4_account_property_filter_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Account> diff --git a/TelepathyQt4/account-set.h b/TelepathyQt4/account-set.h index 713ed525..b36adcea 100644 --- a/TelepathyQt4/account-set.h +++ b/TelepathyQt4/account-set.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_account_set_h_HEADER_GUARD_ #define _TelepathyQt4_account_set_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Filter> diff --git a/TelepathyQt4/account.h b/TelepathyQt4/account.h index 3a8df411..ca3c78c2 100644 --- a/TelepathyQt4/account.h +++ b/TelepathyQt4/account.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_account_h_HEADER_GUARD_ #define _TelepathyQt4_account_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/_gen/cli-account.h> diff --git a/TelepathyQt4/and-filter.h b/TelepathyQt4/and-filter.h index db22170f..3e25bb21 100644 --- a/TelepathyQt4/and-filter.h +++ b/TelepathyQt4/and-filter.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_and_filter_h_HEADER_GUARD_ #define _TelepathyQt4_and_filter_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Filter> diff --git a/TelepathyQt4/avatar.h b/TelepathyQt4/avatar.h index a229ae68..2cba49c9 100644 --- a/TelepathyQt4/avatar.h +++ b/TelepathyQt4/avatar.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_avatar_h_HEADER_GUARD_ #define _TelepathyQt4_avatar_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Global> diff --git a/TelepathyQt4/capabilities-base.h b/TelepathyQt4/capabilities-base.h index e36b6750..1ff6a339 100644 --- a/TelepathyQt4/capabilities-base.h +++ b/TelepathyQt4/capabilities-base.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_capabilities_base_h_HEADER_GUARD_ #define _TelepathyQt4_capabilities_base_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/RequestableChannelClassSpec> diff --git a/TelepathyQt4/channel-class-features.h b/TelepathyQt4/channel-class-features.h index ecbdd74a..87c283ce 100644 --- a/TelepathyQt4/channel-class-features.h +++ b/TelepathyQt4/channel-class-features.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_channel_class_features_h_HEADER_GUARD_ #define _TelepathyQt4_channel_class_features_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/ChannelClassSpec> diff --git a/TelepathyQt4/channel-class-spec.h b/TelepathyQt4/channel-class-spec.h index 5a959552..75764cfb 100644 --- a/TelepathyQt4/channel-class-spec.h +++ b/TelepathyQt4/channel-class-spec.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_channel_class_spec_h_HEADER_GUARD_ #define _TelepathyQt4_channel_class_spec_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Constants> diff --git a/TelepathyQt4/channel-dispatch-operation.h b/TelepathyQt4/channel-dispatch-operation.h index 249bff4d..12ef3c3d 100644 --- a/TelepathyQt4/channel-dispatch-operation.h +++ b/TelepathyQt4/channel-dispatch-operation.h @@ -23,8 +23,8 @@ #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 +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/_gen/cli-channel-dispatch-operation.h> diff --git a/TelepathyQt4/channel-dispatcher.h b/TelepathyQt4/channel-dispatcher.h index 2afa78bd..db03c2e9 100644 --- a/TelepathyQt4/channel-dispatcher.h +++ b/TelepathyQt4/channel-dispatcher.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_channel_dispatcher_h_HEADER_GUARD_ #define _TelepathyQt4_channel_dispatcher_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/_gen/cli-channel-dispatcher.h> diff --git a/TelepathyQt4/channel-factory.h b/TelepathyQt4/channel-factory.h index fa98dae8..b78e322a 100644 --- a/TelepathyQt4/channel-factory.h +++ b/TelepathyQt4/channel-factory.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_channel_factory_h_HEADER_GUARD_ #define _TelepathyQt4_channel_factory_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/DBusProxyFactory> diff --git a/TelepathyQt4/channel-request.h b/TelepathyQt4/channel-request.h index 7018803f..ec38e950 100644 --- a/TelepathyQt4/channel-request.h +++ b/TelepathyQt4/channel-request.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_channel_request_h_HEADER_GUARD_ #define _TelepathyQt4_channel_request_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/_gen/cli-channel-request.h> diff --git a/TelepathyQt4/channel.h b/TelepathyQt4/channel.h index 025addd8..54cc1234 100644 --- a/TelepathyQt4/channel.h +++ b/TelepathyQt4/channel.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_channel_h_HEADER_GUARD_ #define _TelepathyQt4_channel_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/_gen/cli-channel.h> diff --git a/TelepathyQt4/client-registrar.h b/TelepathyQt4/client-registrar.h index a31de207..3428f300 100644 --- a/TelepathyQt4/client-registrar.h +++ b/TelepathyQt4/client-registrar.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_client_registrar_h_HEADER_GUARD_ #define _TelepathyQt4_client_registrar_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/AccountFactory> diff --git a/TelepathyQt4/client.h b/TelepathyQt4/client.h index 835bea9b..890e9d1e 100644 --- a/TelepathyQt4/client.h +++ b/TelepathyQt4/client.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_client_h_HEADER_GUARD_ #define _TelepathyQt4_client_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/_gen/cli-client.h> diff --git a/TelepathyQt4/connection-capabilities.h b/TelepathyQt4/connection-capabilities.h index 0f05443a..40d63ac4 100644 --- a/TelepathyQt4/connection-capabilities.h +++ b/TelepathyQt4/connection-capabilities.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_connection_capabilities_h_HEADER_GUARD_ #define _TelepathyQt4_connection_capabilities_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/CapabilitiesBase> diff --git a/TelepathyQt4/connection-factory.h b/TelepathyQt4/connection-factory.h index 3308d1b1..f2b328bc 100644 --- a/TelepathyQt4/connection-factory.h +++ b/TelepathyQt4/connection-factory.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_connection_factory_h_HEADER_GUARD_ #define _TelepathyQt4_connection_factory_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Global> diff --git a/TelepathyQt4/connection-lowlevel.h b/TelepathyQt4/connection-lowlevel.h index 30f1bc80..caea693e 100644 --- a/TelepathyQt4/connection-lowlevel.h +++ b/TelepathyQt4/connection-lowlevel.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_connection_lowlevel_h_HEADER_GUARD_ #define _TelepathyQt4_connection_lowlevel_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Constants> diff --git a/TelepathyQt4/connection-manager-lowlevel.h b/TelepathyQt4/connection-manager-lowlevel.h index d55e53e7..0bcada29 100644 --- a/TelepathyQt4/connection-manager-lowlevel.h +++ b/TelepathyQt4/connection-manager-lowlevel.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_connection_manager_lowlevel_h_HEADER_GUARD_ #define _TelepathyQt4_connection_manager_lowlevel_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Constants> diff --git a/TelepathyQt4/connection-manager.h b/TelepathyQt4/connection-manager.h index 36e0e7a1..d484d958 100644 --- a/TelepathyQt4/connection-manager.h +++ b/TelepathyQt4/connection-manager.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_connection_manager_h_HEADER_GUARD_ #define _TelepathyQt4_connection_manager_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/_gen/cli-connection-manager.h> diff --git a/TelepathyQt4/connection.h b/TelepathyQt4/connection.h index 14278773..127e00ee 100644 --- a/TelepathyQt4/connection.h +++ b/TelepathyQt4/connection.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_connection_h_HEADER_GUARD_ #define _TelepathyQt4_connection_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/_gen/cli-connection.h> diff --git a/TelepathyQt4/constants.h b/TelepathyQt4/constants.h index 4bd9a54b..0541267b 100644 --- a/TelepathyQt4/constants.h +++ b/TelepathyQt4/constants.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_constants_h_HEADER_GUARD_ #define _TelepathyQt4_constants_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif /** diff --git a/TelepathyQt4/contact-capabilities.h b/TelepathyQt4/contact-capabilities.h index ae923c38..c9d999a3 100644 --- a/TelepathyQt4/contact-capabilities.h +++ b/TelepathyQt4/contact-capabilities.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_contact_capabilities_h_HEADER_GUARD_ #define _TelepathyQt4_contact_capabilities_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/CapabilitiesBase> diff --git a/TelepathyQt4/contact-factory.h b/TelepathyQt4/contact-factory.h index 5329fab9..66b6b1af 100644 --- a/TelepathyQt4/contact-factory.h +++ b/TelepathyQt4/contact-factory.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_contact_factory_h_HEADER_GUARD_ #define _TelepathyQt4_contact_factory_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Contact> diff --git a/TelepathyQt4/contact-manager.h b/TelepathyQt4/contact-manager.h index 68b7f5ca..9950c6ae 100644 --- a/TelepathyQt4/contact-manager.h +++ b/TelepathyQt4/contact-manager.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_contact_manager_h_HEADER_GUARD_ #define _TelepathyQt4_contact_manager_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Channel> diff --git a/TelepathyQt4/contact-messenger.h b/TelepathyQt4/contact-messenger.h index 41e9578d..3d2b8f5e 100644 --- a/TelepathyQt4/contact-messenger.h +++ b/TelepathyQt4/contact-messenger.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_contact_messenger_h_HEADER_GUARD_ #define _TelepathyQt4_contact_messenger_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Constants> diff --git a/TelepathyQt4/contact-search-channel.h b/TelepathyQt4/contact-search-channel.h index f70f9d22..731aa8e6 100644 --- a/TelepathyQt4/contact-search-channel.h +++ b/TelepathyQt4/contact-search-channel.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_contact_search_channel_h_HEADER_GUARD_ #define _TelepathyQt4_contact_search_channel_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Channel> diff --git a/TelepathyQt4/contact.h b/TelepathyQt4/contact.h index ec2e5e95..8e1e9d2d 100644 --- a/TelepathyQt4/contact.h +++ b/TelepathyQt4/contact.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_contact_h_HEADER_GUARD_ #define _TelepathyQt4_contact_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Channel> diff --git a/TelepathyQt4/dbus-proxy-factory.h b/TelepathyQt4/dbus-proxy-factory.h index 77e3d4ec..c79d7ea7 100644 --- a/TelepathyQt4/dbus-proxy-factory.h +++ b/TelepathyQt4/dbus-proxy-factory.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_dbus_proxy_factory_h_HEADER_GUARD_ #define _TelepathyQt4_dbus_proxy_factory_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Global> diff --git a/TelepathyQt4/dbus-proxy.h b/TelepathyQt4/dbus-proxy.h index 72d7dc29..a2bbcdc4 100644 --- a/TelepathyQt4/dbus-proxy.h +++ b/TelepathyQt4/dbus-proxy.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_dbus_proxy_h_HEADER_GUARD_ #define _TelepathyQt4_dbus_proxy_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Global> diff --git a/TelepathyQt4/dbus.h b/TelepathyQt4/dbus.h index 2f7ca043..72104e38 100644 --- a/TelepathyQt4/dbus.h +++ b/TelepathyQt4/dbus.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_dbus_h_HEADER_GUARD_ #define _TelepathyQt4_dbus_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif /** diff --git a/TelepathyQt4/debug.cpp b/TelepathyQt4/debug.cpp index f8e37171..6126210b 100644 --- a/TelepathyQt4/debug.cpp +++ b/TelepathyQt4/debug.cpp @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#define IN_TELEPATHY_QT4_HEADER +#define IN_TP_QT_HEADER #include "debug.h" #include "debug-internal.h" diff --git a/TelepathyQt4/debug.h b/TelepathyQt4/debug.h index 31e72317..b2968fdd 100644 --- a/TelepathyQt4/debug.h +++ b/TelepathyQt4/debug.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_debug_h_HEADER_GUARD_ #define _TelepathyQt4_debug_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Global> diff --git a/TelepathyQt4/feature.h b/TelepathyQt4/feature.h index 7a9e3cf7..343e8fca 100644 --- a/TelepathyQt4/feature.h +++ b/TelepathyQt4/feature.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_feature_h_HEADER_GUARD_ #define _TelepathyQt4_feature_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Global> diff --git a/TelepathyQt4/file-transfer-channel-creation-properties.h b/TelepathyQt4/file-transfer-channel-creation-properties.h index 1d759acc..ac42b49b 100644 --- a/TelepathyQt4/file-transfer-channel-creation-properties.h +++ b/TelepathyQt4/file-transfer-channel-creation-properties.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_file_transfer_channel_creation_properties_h_HEADER_GUARD_ #define _TelepathyQt4_file_transfer_channel_creation_properties_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Constants> diff --git a/TelepathyQt4/file-transfer-channel.h b/TelepathyQt4/file-transfer-channel.h index 1e27e587..c3bdad77 100644 --- a/TelepathyQt4/file-transfer-channel.h +++ b/TelepathyQt4/file-transfer-channel.h @@ -23,8 +23,8 @@ #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 +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Channel> diff --git a/TelepathyQt4/filter.h b/TelepathyQt4/filter.h index e81eafc7..099663b2 100644 --- a/TelepathyQt4/filter.h +++ b/TelepathyQt4/filter.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_filter_h_HEADER_GUARD_ #define _TelepathyQt4_filter_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/SharedPtr> diff --git a/TelepathyQt4/fixed-feature-factory.h b/TelepathyQt4/fixed-feature-factory.h index 00dd027b..5f01f5cf 100644 --- a/TelepathyQt4/fixed-feature-factory.h +++ b/TelepathyQt4/fixed-feature-factory.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_fixed_feature_factory_h_HEADER_GUARD_ #define _TelepathyQt4_fixed_feature_factory_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Global> diff --git a/TelepathyQt4/generic-capability-filter.h b/TelepathyQt4/generic-capability-filter.h index ed22b3be..10a6784e 100644 --- a/TelepathyQt4/generic-capability-filter.h +++ b/TelepathyQt4/generic-capability-filter.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_generic_capability_filter_h_HEADER_GUARD_ #define _TelepathyQt4_generic_capability_filter_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/ConnectionCapabilities> diff --git a/TelepathyQt4/generic-property-filter.h b/TelepathyQt4/generic-property-filter.h index f25e5405..bd69ec9b 100644 --- a/TelepathyQt4/generic-property-filter.h +++ b/TelepathyQt4/generic-property-filter.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_generic_property_filter_h_HEADER_GUARD_ #define _TelepathyQt4_generic_property_filter_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Filter> diff --git a/TelepathyQt4/global.h b/TelepathyQt4/global.h index 69de68b4..5c85596e 100644 --- a/TelepathyQt4/global.h +++ b/TelepathyQt4/global.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2009 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2009 Nokia Corporation @@ -20,11 +20,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_global_h_HEADER_GUARD_ -#define _TelepathyQt4_global_h_HEADER_GUARD_ +#ifndef _TelepathyQt_global_h_HEADER_GUARD_ +#define _TelepathyQt_global_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <QtGlobal> diff --git a/TelepathyQt4/handled-channel-notifier.h b/TelepathyQt4/handled-channel-notifier.h index 223c29c7..f1bb3063 100644 --- a/TelepathyQt4/handled-channel-notifier.h +++ b/TelepathyQt4/handled-channel-notifier.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_handled_channel_notifier_h_HEADER_GUARD_ #define _TelepathyQt4_handled_channel_notifier_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Channel> diff --git a/TelepathyQt4/incoming-file-transfer-channel.h b/TelepathyQt4/incoming-file-transfer-channel.h index cd53b5f0..c0683509 100644 --- a/TelepathyQt4/incoming-file-transfer-channel.h +++ b/TelepathyQt4/incoming-file-transfer-channel.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_incoming_file_transfer_channel_h_HEADER_GUARD_ #define _TelepathyQt4_incoming_file_transfer_channel_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/FileTransferChannel> diff --git a/TelepathyQt4/incoming-stream-tube-channel.h b/TelepathyQt4/incoming-stream-tube-channel.h index 5406410b..112c44a1 100644 --- a/TelepathyQt4/incoming-stream-tube-channel.h +++ b/TelepathyQt4/incoming-stream-tube-channel.h @@ -22,8 +22,8 @@ #ifndef _TelepathyQt4_incoming_stream_tube_channel_h_HEADER_GUARD_ #define _TelepathyQt4_incoming_stream_tube_channel_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/StreamTubeChannel> diff --git a/TelepathyQt4/key-file.h b/TelepathyQt4/key-file.h index 14f45cb8..a8388cb5 100644 --- a/TelepathyQt4/key-file.h +++ b/TelepathyQt4/key-file.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_key_file_h_HEADER_GUARD_ #define _TelepathyQt4_key_file_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Global> diff --git a/TelepathyQt4/location-info.h b/TelepathyQt4/location-info.h index 0917fbf9..ad9bbe6f 100644 --- a/TelepathyQt4/location-info.h +++ b/TelepathyQt4/location-info.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_location_info_h_HEADER_GUARD_ #define _TelepathyQt4_location_info_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Global> diff --git a/TelepathyQt4/manager-file.h b/TelepathyQt4/manager-file.h index 3f67350e..5fdd6795 100644 --- a/TelepathyQt4/manager-file.h +++ b/TelepathyQt4/manager-file.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_manager_file_h_HEADER_GUARD_ #define _TelepathyQt4_manager_file_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/AvatarSpec> diff --git a/TelepathyQt4/media-session-handler.h b/TelepathyQt4/media-session-handler.h index b2c789ef..27765a8c 100644 --- a/TelepathyQt4/media-session-handler.h +++ b/TelepathyQt4/media-session-handler.h @@ -23,8 +23,8 @@ #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 +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif /** diff --git a/TelepathyQt4/media-stream-handler.h b/TelepathyQt4/media-stream-handler.h index 8833a442..dd9a04ca 100644 --- a/TelepathyQt4/media-stream-handler.h +++ b/TelepathyQt4/media-stream-handler.h @@ -23,8 +23,8 @@ #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 +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif /** diff --git a/TelepathyQt4/message-content-part.h b/TelepathyQt4/message-content-part.h index 9ffe3fca..08b727fd 100644 --- a/TelepathyQt4/message-content-part.h +++ b/TelepathyQt4/message-content-part.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_message_content_part_h_HEADER_GUARD_ #define _TelepathyQt4_message_content_part_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Constants> diff --git a/TelepathyQt4/message.h b/TelepathyQt4/message.h index 8324b242..8e45cb02 100644 --- a/TelepathyQt4/message.h +++ b/TelepathyQt4/message.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_message_h_HEADER_GUARD_ #define _TelepathyQt4_message_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <QSharedDataPointer> diff --git a/TelepathyQt4/method-invocation-context.h b/TelepathyQt4/method-invocation-context.h index 53082c54..c1ee2fde 100644 --- a/TelepathyQt4/method-invocation-context.h +++ b/TelepathyQt4/method-invocation-context.h @@ -23,8 +23,8 @@ #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 +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <QtDBus> diff --git a/TelepathyQt4/not-filter.h b/TelepathyQt4/not-filter.h index 3e4ceae0..09068005 100644 --- a/TelepathyQt4/not-filter.h +++ b/TelepathyQt4/not-filter.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_not_filter_h_HEADER_GUARD_ #define _TelepathyQt4_not_filter_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Filter> diff --git a/TelepathyQt4/object.h b/TelepathyQt4/object.h index 191f7d5f..12f5ed63 100644 --- a/TelepathyQt4/object.h +++ b/TelepathyQt4/object.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_object_h_HEADER_GUARD_ #define _TelepathyQt4_object_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Global> diff --git a/TelepathyQt4/optional-interface-factory.h b/TelepathyQt4/optional-interface-factory.h index 598d521b..69eaf142 100644 --- a/TelepathyQt4/optional-interface-factory.h +++ b/TelepathyQt4/optional-interface-factory.h @@ -23,8 +23,8 @@ #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 +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Global> diff --git a/TelepathyQt4/or-filter.h b/TelepathyQt4/or-filter.h index 0f864363..534fecc0 100644 --- a/TelepathyQt4/or-filter.h +++ b/TelepathyQt4/or-filter.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_or_filter_h_HEADER_GUARD_ #define _TelepathyQt4_or_filter_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Filter> diff --git a/TelepathyQt4/outgoing-file-transfer-channel.h b/TelepathyQt4/outgoing-file-transfer-channel.h index 6f738704..616c83cd 100644 --- a/TelepathyQt4/outgoing-file-transfer-channel.h +++ b/TelepathyQt4/outgoing-file-transfer-channel.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_outgoing_file_transfer_channel_h_HEADER_GUARD_ #define _TelepathyQt4_outgoing_file_transfer_channel_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/FileTransferChannel> diff --git a/TelepathyQt4/outgoing-stream-tube-channel.h b/TelepathyQt4/outgoing-stream-tube-channel.h index 36c17247..8dc9e9e1 100644 --- a/TelepathyQt4/outgoing-stream-tube-channel.h +++ b/TelepathyQt4/outgoing-stream-tube-channel.h @@ -22,8 +22,8 @@ #ifndef _TelepathyQt4_outgoing_stream_tube_channel_h_HEADER_GUARD_ #define _TelepathyQt4_outgoing_stream_tube_channel_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/StreamTubeChannel> diff --git a/TelepathyQt4/pending-account.h b/TelepathyQt4/pending-account.h index 49ac68c6..0305dd99 100644 --- a/TelepathyQt4/pending-account.h +++ b/TelepathyQt4/pending-account.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_pending_account_h_HEADER_GUARD_ #define _TelepathyQt4_pending_account_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Account> diff --git a/TelepathyQt4/pending-channel-request.h b/TelepathyQt4/pending-channel-request.h index 753ebb99..d3e02a4c 100644 --- a/TelepathyQt4/pending-channel-request.h +++ b/TelepathyQt4/pending-channel-request.h @@ -23,8 +23,8 @@ #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 +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Global> diff --git a/TelepathyQt4/pending-channel.h b/TelepathyQt4/pending-channel.h index 93781efa..43450335 100644 --- a/TelepathyQt4/pending-channel.h +++ b/TelepathyQt4/pending-channel.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_pending_channel_h_HEADER_GUARD_ #define _TelepathyQt4_pending_channel_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Channel> diff --git a/TelepathyQt4/pending-connection.h b/TelepathyQt4/pending-connection.h index eca3e730..f0faffaf 100644 --- a/TelepathyQt4/pending-connection.h +++ b/TelepathyQt4/pending-connection.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_pending_connection_h_HEADER_GUARD_ #define _TelepathyQt4_pending_connection_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Connection> diff --git a/TelepathyQt4/pending-contact-attributes.h b/TelepathyQt4/pending-contact-attributes.h index e44a3693..fdbf07d6 100644 --- a/TelepathyQt4/pending-contact-attributes.h +++ b/TelepathyQt4/pending-contact-attributes.h @@ -23,8 +23,8 @@ #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 +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/PendingOperation> diff --git a/TelepathyQt4/pending-contact-info.h b/TelepathyQt4/pending-contact-info.h index fb2e2362..edfa0961 100644 --- a/TelepathyQt4/pending-contact-info.h +++ b/TelepathyQt4/pending-contact-info.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_pending_contact_info_h_HEADER_GUARD_ #define _TelepathyQt4_pending_contact_info_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Contact> diff --git a/TelepathyQt4/pending-contacts.h b/TelepathyQt4/pending-contacts.h index 2ea8a4e7..3015630e 100644 --- a/TelepathyQt4/pending-contacts.h +++ b/TelepathyQt4/pending-contacts.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_pending_contacts_h_HEADER_GUARD_ #define _TelepathyQt4_pending_contacts_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/PendingOperation> diff --git a/TelepathyQt4/pending-handles.h b/TelepathyQt4/pending-handles.h index 5541511f..0806e0e5 100644 --- a/TelepathyQt4/pending-handles.h +++ b/TelepathyQt4/pending-handles.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_pending_handles_h_HEADER_GUARD_ #define _TelepathyQt4_pending_handles_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Constants> diff --git a/TelepathyQt4/pending-operation.cpp b/TelepathyQt4/pending-operation.cpp index 288247a3..ee36a352 100644 --- a/TelepathyQt4/pending-operation.cpp +++ b/TelepathyQt4/pending-operation.cpp @@ -22,9 +22,9 @@ #include <TelepathyQt4/PendingOperation> -#define IN_TELEPATHY_QT4_HEADER +#define IN_TP_QT_HEADER #include "simple-pending-operations.h" -#undef IN_TELEPATHY_QT4_HEADER +#undef IN_TP_QT_HEADER #include "TelepathyQt4/_gen/pending-operation.moc.hpp" #include "TelepathyQt4/_gen/simple-pending-operations.moc.hpp" diff --git a/TelepathyQt4/pending-operation.h b/TelepathyQt4/pending-operation.h index 5e0bf737..d4456da2 100644 --- a/TelepathyQt4/pending-operation.h +++ b/TelepathyQt4/pending-operation.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_pending_operation_h_HEADER_GUARD_ #define _TelepathyQt4_pending_operation_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Global> diff --git a/TelepathyQt4/pending-ready.h b/TelepathyQt4/pending-ready.h index af6d63ba..13c94ffe 100644 --- a/TelepathyQt4/pending-ready.h +++ b/TelepathyQt4/pending-ready.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_pending_ready_h_HEADER_GUARD_ #define _TelepathyQt4_pending_ready_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/DBusProxyFactory> diff --git a/TelepathyQt4/pending-send-message.h b/TelepathyQt4/pending-send-message.h index 96d39500..1e9561ce 100644 --- a/TelepathyQt4/pending-send-message.h +++ b/TelepathyQt4/pending-send-message.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_pending_send_message_h_HEADER_GUARD_ #define _TelepathyQt4_pending_send_message_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/PendingOperation> diff --git a/TelepathyQt4/pending-stream-tube-connection.h b/TelepathyQt4/pending-stream-tube-connection.h index 6f968b1d..ff13a461 100644 --- a/TelepathyQt4/pending-stream-tube-connection.h +++ b/TelepathyQt4/pending-stream-tube-connection.h @@ -22,8 +22,8 @@ #ifndef _TelepathyQt4_pending_stream_tube_connection_h_HEADER_GUARD_ #define _TelepathyQt4_pending_stream_tube_connection_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Constants> diff --git a/TelepathyQt4/pending-string-list.h b/TelepathyQt4/pending-string-list.h index be458960..1e3af84a 100644 --- a/TelepathyQt4/pending-string-list.h +++ b/TelepathyQt4/pending-string-list.h @@ -23,8 +23,8 @@ #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 +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/PendingOperation> diff --git a/TelepathyQt4/pending-variant-map.h b/TelepathyQt4/pending-variant-map.h index fbe30c4f..f8cc8105 100644 --- a/TelepathyQt4/pending-variant-map.h +++ b/TelepathyQt4/pending-variant-map.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_pending_variant_map_h_HEADER_GUARD_ #define _TelepathyQt4_pending_variant_map_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Global> diff --git a/TelepathyQt4/pending-variant.h b/TelepathyQt4/pending-variant.h index 4cab528e..d85cea8e 100644 --- a/TelepathyQt4/pending-variant.h +++ b/TelepathyQt4/pending-variant.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_pending_variant_h_HEADER_GUARD_ #define _TelepathyQt4_pending_variant_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Global> diff --git a/TelepathyQt4/presence.h b/TelepathyQt4/presence.h index d12fb5ec..587adad8 100644 --- a/TelepathyQt4/presence.h +++ b/TelepathyQt4/presence.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_presence_h_HEADER_GUARD_ #define _TelepathyQt4_presence_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Constants> diff --git a/TelepathyQt4/profile-manager.h b/TelepathyQt4/profile-manager.h index 450c3d71..807b4760 100644 --- a/TelepathyQt4/profile-manager.h +++ b/TelepathyQt4/profile-manager.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_profile_manager_h_HEADER_GUARD_ #define _TelepathyQt4_profile_manager_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Object> diff --git a/TelepathyQt4/profile.h b/TelepathyQt4/profile.h index cb4661b8..210ec33a 100644 --- a/TelepathyQt4/profile.h +++ b/TelepathyQt4/profile.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_profile_h_HEADER_GUARD_ #define _TelepathyQt4_profile_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/RequestableChannelClassSpec> diff --git a/TelepathyQt4/properties.h b/TelepathyQt4/properties.h index 32b33848..08edc618 100644 --- a/TelepathyQt4/properties.h +++ b/TelepathyQt4/properties.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_properties_h_HEADER_GUARD_ #define _TelepathyQt4_properties_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif /** diff --git a/TelepathyQt4/protocol-info.h b/TelepathyQt4/protocol-info.h index 7eb652c3..dcd432f4 100644 --- a/TelepathyQt4/protocol-info.h +++ b/TelepathyQt4/protocol-info.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_protocol_info_h_HEADER_GUARD_ #define _TelepathyQt4_protocol_info_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/AvatarSpec> diff --git a/TelepathyQt4/protocol-parameter.h b/TelepathyQt4/protocol-parameter.h index 2750413b..24bdb011 100644 --- a/TelepathyQt4/protocol-parameter.h +++ b/TelepathyQt4/protocol-parameter.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_protocol_parameter_h_HEADER_GUARD_ #define _TelepathyQt4_protocol_parameter_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Constants> diff --git a/TelepathyQt4/readiness-helper.h b/TelepathyQt4/readiness-helper.h index 003d51f7..27ce4bcb 100644 --- a/TelepathyQt4/readiness-helper.h +++ b/TelepathyQt4/readiness-helper.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_readiness_helper_h_HEADER_GUARD_ #define _TelepathyQt4_readiness_helper_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Feature> diff --git a/TelepathyQt4/ready-object.h b/TelepathyQt4/ready-object.h index aa43a1ce..ccdd4742 100644 --- a/TelepathyQt4/ready-object.h +++ b/TelepathyQt4/ready-object.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_ready_object_h_HEADER_GUARD_ #define _TelepathyQt4_ready_object_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Feature> diff --git a/TelepathyQt4/referenced-handles.h b/TelepathyQt4/referenced-handles.h index 94237ea1..369dc734 100644 --- a/TelepathyQt4/referenced-handles.h +++ b/TelepathyQt4/referenced-handles.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_referenced_handles_h_HEADER_GUARD_ #define _TelepathyQt4_referenced_handles_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Constants> diff --git a/TelepathyQt4/requestable-channel-class-spec.h b/TelepathyQt4/requestable-channel-class-spec.h index 0e274eee..97a81f78 100644 --- a/TelepathyQt4/requestable-channel-class-spec.h +++ b/TelepathyQt4/requestable-channel-class-spec.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_requestable_channel_class_spec_h_HEADER_GUARD_ #define _TelepathyQt4_requestable_channel_class_spec_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Constants> diff --git a/TelepathyQt4/room-list-channel.h b/TelepathyQt4/room-list-channel.h index 2cd4eea5..88f8906f 100644 --- a/TelepathyQt4/room-list-channel.h +++ b/TelepathyQt4/room-list-channel.h @@ -23,8 +23,8 @@ #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 +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Channel> diff --git a/TelepathyQt4/shared-ptr.h b/TelepathyQt4/shared-ptr.h index 11c76c13..a8067caf 100644 --- a/TelepathyQt4/shared-ptr.h +++ b/TelepathyQt4/shared-ptr.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_shared_ptr_h_HEADER_GUARD_ #define _TelepathyQt4_shared_ptr_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Global> diff --git a/TelepathyQt4/simple-pending-operations.h b/TelepathyQt4/simple-pending-operations.h index 09620055..14d36135 100644 --- a/TelepathyQt4/simple-pending-operations.h +++ b/TelepathyQt4/simple-pending-operations.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_pending_operations_h_HEADER_GUARD_ #define _TelepathyQt4_pending_operations_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <QObject> diff --git a/TelepathyQt4/stream-tube-channel.h b/TelepathyQt4/stream-tube-channel.h index 65d20b46..c44b7635 100644 --- a/TelepathyQt4/stream-tube-channel.h +++ b/TelepathyQt4/stream-tube-channel.h @@ -22,8 +22,8 @@ #ifndef _TelepathyQt4_stream_tube_channel_h_HEADER_GUARD_ #define _TelepathyQt4_stream_tube_channel_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/TubeChannel> diff --git a/TelepathyQt4/streamed-media-channel.h b/TelepathyQt4/streamed-media-channel.h index 811cd9aa..edca8815 100644 --- a/TelepathyQt4/streamed-media-channel.h +++ b/TelepathyQt4/streamed-media-channel.h @@ -23,8 +23,8 @@ #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 +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Channel> diff --git a/TelepathyQt4/test-backdoors.h b/TelepathyQt4/test-backdoors.h index 79e7d6bb..27fabab5 100644 --- a/TelepathyQt4/test-backdoors.h +++ b/TelepathyQt4/test-backdoors.h @@ -23,7 +23,7 @@ #ifndef _TelepathyQt4_test_backdoors_h_HEADER_GUARD_ #define _TelepathyQt4_test_backdoors_h_HEADER_GUARD_ -#ifdef IN_TELEPATHY_QT4_HEADER +#ifdef IN_TP_QT_HEADER #error "This file is an internal header and should never be included by a public one" #endif diff --git a/TelepathyQt4/text-channel.h b/TelepathyQt4/text-channel.h index 71a46266..149825ae 100644 --- a/TelepathyQt4/text-channel.h +++ b/TelepathyQt4/text-channel.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_text_channel_h_HEADER_GUARD_ #define _TelepathyQt4_text_channel_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Channel> diff --git a/TelepathyQt4/tls-certificate.cpp b/TelepathyQt4/tls-certificate.cpp index 80f874a0..b772e169 100644 --- a/TelepathyQt4/tls-certificate.cpp +++ b/TelepathyQt4/tls-certificate.cpp @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#define IN_TELEPATHY_QT4_HEADER +#define IN_TP_QT_HEADER #include <TelepathyQt4/tls-certificate.h> #include "TelepathyQt4/_gen/cli-tls-certificate-body.hpp" diff --git a/TelepathyQt4/tls-certificate.h b/TelepathyQt4/tls-certificate.h index eb6d81d2..8a8f825c 100644 --- a/TelepathyQt4/tls-certificate.h +++ b/TelepathyQt4/tls-certificate.h @@ -22,8 +22,8 @@ #ifndef _TelepathyQt4_tls_certificate_h_HEADER_GUARD_ #define _TelepathyQt4_tls_certificate_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/_gen/cli-tls-certificate.h> diff --git a/TelepathyQt4/tube-channel.h b/TelepathyQt4/tube-channel.h index 876ef55d..16c40262 100644 --- a/TelepathyQt4/tube-channel.h +++ b/TelepathyQt4/tube-channel.h @@ -22,8 +22,8 @@ #ifndef _TelepathyQt4_tube_channel_h_HEADER_GUARD_ #define _TelepathyQt4_tube_channel_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Channel> diff --git a/TelepathyQt4/types.h b/TelepathyQt4/types.h index 039302ce..2f6c159b 100644 --- a/TelepathyQt4/types.h +++ b/TelepathyQt4/types.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_types_h_HEADER_GUARD_ #define _TelepathyQt4_types_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/_gen/types.h> diff --git a/TelepathyQt4/utils.h b/TelepathyQt4/utils.h index 9bfe0a8c..84785226 100644 --- a/TelepathyQt4/utils.h +++ b/TelepathyQt4/utils.h @@ -23,8 +23,8 @@ #ifndef _TelepathyQt4_utils_h_HEADER_GUARD_ #define _TelepathyQt4_utils_h_HEADER_GUARD_ -#ifndef IN_TELEPATHY_QT4_HEADER -#error IN_TELEPATHY_QT4_HEADER +#ifndef IN_TP_QT_HEADER +#error IN_TP_QT_HEADER #endif #include <TelepathyQt4/Global> diff --git a/cmake/modules/TpQt4Macros.cmake b/cmake/modules/TpQt4Macros.cmake index 20bb399a..59dca7d1 100644 --- a/cmake/modules/TpQt4Macros.cmake +++ b/cmake/modules/TpQt4Macros.cmake @@ -198,7 +198,7 @@ function(tpqt4_client_generator spec group pretty_include namespace) --specxml=${CMAKE_CURRENT_BINARY_DIR}/_gen/stable-spec.xml --ifacexml=${CMAKE_CURRENT_BINARY_DIR}/_gen/spec-${spec}.xml --extraincludes=${TYPES_INCLUDE} - --must-define=IN_TELEPATHY_QT4_HEADER + --must-define=IN_TP_QT_HEADER --visibility=TELEPATHY_QT4_EXPORT ${client_generator_args}) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}.h ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}-body.hpp |