diff options
| author | Jeremy Whiting <jeremy.whiting@collabora.com> | 2011-11-10 15:21:06 -0700 |
|---|---|---|
| committer | Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk> | 2011-11-24 14:45:44 -0200 |
| commit | be40b6f313c8d7b1f0fb59fd06ea87b0934e4bad (patch) | |
| tree | ed66d713ce0d85acf0bcb65d3145693e4d150dae | |
| parent | aafde57c570a56bb98df4103a4ee38ed25b91897 (diff) | |
Renamed TelepathyQt4 directory to TelepathyQt.
748 files changed, 4769 insertions, 4769 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e8a0164..e739f297 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -project(TelepathyQt4) +project(TelepathyQt) cmake_minimum_required(VERSION 2.6) @@ -173,7 +173,7 @@ macro_log_feature(GSTREAMER_FOUND "GStreamer" "Needed, together with Tp-Farsight, to build telepathy-qt4-farsight and some additional examples" "http://www.gstreamer.net/" FALSE) -# Build TelepathyQt4-Farsight only if GStreamer, TelepathyFarsight and all of their dependencies were found +# Build TelepathyQt-Farsight only if GStreamer, TelepathyFarsight and all of their dependencies were found if (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND) set (FARSIGHT_COMPONENTS_FOUND 1) else (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND) @@ -204,7 +204,7 @@ else(QT4_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND) endif(QT4_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND) # Add the source subdirectories -add_subdirectory(TelepathyQt4) +add_subdirectory(TelepathyQt) add_subdirectory(examples) add_subdirectory(tests) add_subdirectory(tools) @@ -29,7 +29,7 @@ Coding style For C++ code: ------------- -TelepathyQt4 uses the standard Qt4 coding style for the Qt/C++ code, as also +TelepathyQt uses the standard Qt4 coding style for the Qt/C++ code, as also followed by eg. KDELibs. The coding style is described in more detail in the KDE TechBase at <http://techbase.kde.org/Policies/Kdelibs_Coding_Style>; in short, it amounts to: diff --git a/TelepathyQt/AbstractClient b/TelepathyQt/AbstractClient new file mode 100644 index 00000000..7f0c94af --- /dev/null +++ b/TelepathyQt/AbstractClient @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_AbstractClient_HEADER_GUARD_ +#define _TelepathyQt_AbstractClient_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/abstract-client.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/AbstractClientApprover b/TelepathyQt/AbstractClientApprover new file mode 100644 index 00000000..d264aae9 --- /dev/null +++ b/TelepathyQt/AbstractClientApprover @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_AbstractClientApprover_HEADER_GUARD_ +#define _TelepathyQt_AbstractClientApprover_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/abstract-client.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/AbstractClientHandler b/TelepathyQt/AbstractClientHandler new file mode 100644 index 00000000..0bec382e --- /dev/null +++ b/TelepathyQt/AbstractClientHandler @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_AbstractClientHandler_HEADER_GUARD_ +#define _TelepathyQt_AbstractClientHandler_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/abstract-client.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/AbstractClientObserver b/TelepathyQt/AbstractClientObserver new file mode 100644 index 00000000..ae779798 --- /dev/null +++ b/TelepathyQt/AbstractClientObserver @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_AbstractClientObserver_HEADER_GUARD_ +#define _TelepathyQt_AbstractClientObserver_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/abstract-client.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/AbstractInterface b/TelepathyQt/AbstractInterface new file mode 100644 index 00000000..fd780b61 --- /dev/null +++ b/TelepathyQt/AbstractInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_AbstractInterface_HEADER_GUARD_ +#define _TelepathyQt_AbstractInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/abstract-interface.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/Account b/TelepathyQt/Account new file mode 100644 index 00000000..9c2387e9 --- /dev/null +++ b/TelepathyQt/Account @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_Account_HEADER_GUARD_ +#define _TelepathyQt_Account_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/account.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/AccountCapabilityFilter b/TelepathyQt/AccountCapabilityFilter new file mode 100644 index 00000000..29a7253f --- /dev/null +++ b/TelepathyQt/AccountCapabilityFilter @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_AccountCapabilityFilter_HEADER_GUARD_ +#define _TelepathyQt_AccountCapabilityFilter_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/account-capability-filter.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/AccountFactory b/TelepathyQt/AccountFactory new file mode 100644 index 00000000..e8a23acf --- /dev/null +++ b/TelepathyQt/AccountFactory @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_AccountFactory_HEADER_GUARD_ +#define _TelepathyQt_AccountFactory_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/account-factory.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/AccountFilter b/TelepathyQt/AccountFilter new file mode 100644 index 00000000..643d92e4 --- /dev/null +++ b/TelepathyQt/AccountFilter @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_AccountFilter_HEADER_GUARD_ +#define _TelepathyQt_AccountFilter_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/account-filter.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/AccountInterface b/TelepathyQt/AccountInterface new file mode 100644 index 00000000..f9f45617 --- /dev/null +++ b/TelepathyQt/AccountInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_AccountInterface_HEADER_GUARD_ +#define _TelepathyQt_AccountInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/account.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/AccountInterfaceAddressingInterface b/TelepathyQt/AccountInterfaceAddressingInterface new file mode 100644 index 00000000..c5fc153a --- /dev/null +++ b/TelepathyQt/AccountInterfaceAddressingInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_AccountInterfaceAddressingInterface_HEADER_GUARD_ +#define _TelepathyQt_AccountInterfaceAddressingInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/account.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/AccountInterfaceAvatarInterface b/TelepathyQt/AccountInterfaceAvatarInterface new file mode 100644 index 00000000..b1d9e2e7 --- /dev/null +++ b/TelepathyQt/AccountInterfaceAvatarInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_AccountInterfaceAvatarInterface_HEADER_GUARD_ +#define _TelepathyQt_AccountInterfaceAvatarInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/account.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/AccountManager b/TelepathyQt/AccountManager new file mode 100644 index 00000000..2ca7a6e5 --- /dev/null +++ b/TelepathyQt/AccountManager @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_AccountManager_HEADER_GUARD_ +#define _TelepathyQt_AccountManager_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/account-manager.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/AccountManagerInterface b/TelepathyQt/AccountManagerInterface new file mode 100644 index 00000000..0266ec43 --- /dev/null +++ b/TelepathyQt/AccountManagerInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_AccountManagerInterface_HEADER_GUARD_ +#define _TelepathyQt_AccountManagerInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/account-manager.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/AccountPropertyFilter b/TelepathyQt/AccountPropertyFilter new file mode 100644 index 00000000..7f493242 --- /dev/null +++ b/TelepathyQt/AccountPropertyFilter @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_AccountPropertyFilter_HEADER_GUARD_ +#define _TelepathyQt_AccountPropertyFilter_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/account-property-filter.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/AccountSet b/TelepathyQt/AccountSet new file mode 100644 index 00000000..a60e4a40 --- /dev/null +++ b/TelepathyQt/AccountSet @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_AccountSet_HEADER_GUARD_ +#define _TelepathyQt_AccountSet_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/account-set.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/AndFilter b/TelepathyQt/AndFilter new file mode 100644 index 00000000..f9f8eef8 --- /dev/null +++ b/TelepathyQt/AndFilter @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_AndFilter_HEADER_GUARD_ +#define _TelepathyQt_AndFilter_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/and-filter.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/AuthenticationTLSCertificateInterface b/TelepathyQt/AuthenticationTLSCertificateInterface new file mode 100644 index 00000000..613f93cb --- /dev/null +++ b/TelepathyQt/AuthenticationTLSCertificateInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_AuthenticationTLSCertificateInterface_HEADER_GUARD_ +#define _TelepathyQt_AuthenticationTLSCertificateInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/tls-certificate.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/AvatarData b/TelepathyQt/AvatarData new file mode 100644 index 00000000..1615d6f2 --- /dev/null +++ b/TelepathyQt/AvatarData @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_AvatarData_HEADER_GUARD_ +#define _TelepathyQt_AvatarData_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/avatar.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/AvatarSpec b/TelepathyQt/AvatarSpec new file mode 100644 index 00000000..838f9192 --- /dev/null +++ b/TelepathyQt/AvatarSpec @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_AvatarSpec_HEADER_GUARD_ +#define _TelepathyQt_AvatarSpec_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/avatar.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt4/CMakeLists.txt b/TelepathyQt/CMakeLists.txt index 3f003c15..69f127ca 100644 --- a/TelepathyQt4/CMakeLists.txt +++ b/TelepathyQt/CMakeLists.txt @@ -540,13 +540,13 @@ tpqt_constants_gen(future-constants ${gen_future_spec_xml} ${CMAKE_CURRENT_BINAR tpqt_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 + Tp TelepathyQt/types.h TelepathyQt/Types --must-define=IN_TP_QT_HEADER --visibility=TP_QT_EXPORT DEPENDS stable-constants) tpqt_types_gen(future-typesgen ${gen_future_spec_xml} ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-types.h ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-types-body.hpp - TpFuture TelepathyQt4/future-internal.h TelepathyQt4/future-internal.h + TpFuture TelepathyQt/future-internal.h TelepathyQt/future-internal.h DEPENDS future-constants) # Add the generated types to the library's sources @@ -601,9 +601,9 @@ endforeach(spec ${FUTURE_SPECS}) # The escape character in MSVC is ^ if(MSVC) - set(TYPES_INCLUDE ^<TelepathyQt4/Types^> ) + set(TYPES_INCLUDE ^<TelepathyQt/Types^> ) else(MSVC) - set(TYPES_INCLUDE '<TelepathyQt4/Types>' ) + set(TYPES_INCLUDE '<TelepathyQt/Types>' ) endif(MSVC) # Use the client generator for generating headers out of specs @@ -666,8 +666,8 @@ set_target_properties(telepathy-qt4 PROPERTIES # Install header files -install(FILES ${telepathy_qt4_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/telepathy-1.0/TelepathyQt4 COMPONENT headers) -install(FILES ${telepathy_qt4_gen_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/telepathy-1.0/TelepathyQt4/_gen COMPONENT headers) +install(FILES ${telepathy_qt4_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/telepathy-1.0/TelepathyQt COMPONENT headers) +install(FILES ${telepathy_qt4_gen_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/telepathy-1.0/TelepathyQt/_gen COMPONENT headers) # Install the library - watch out for the correct components if (WIN32) @@ -679,15 +679,15 @@ else (WIN32) endif (WIN32) # pkg-config file -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/TelepathyQt4.pc.in ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt4.pc) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/TelepathyQt4-uninstalled.pc.in ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt4-uninstalled.pc) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt4.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig COMPONENT headers) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/TelepathyQt.pc.in ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt.pc) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/TelepathyQt-uninstalled.pc.in ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt-uninstalled.pc) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig COMPONENT headers) # If Farsight was found, install its pkg-config files as well, and go into the subdirectory if(FARSIGHT_COMPONENTS_FOUND) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/TelepathyQt4Farsight.pc.in ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt4Farsight.pc) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/TelepathyQt4Farsight-uninstalled.pc.in ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt4Farsight-uninstalled.pc) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt4Farsight.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig COMPONENT farsight_headers) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/TelepathyQtFarsight.pc.in ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQtFarsight.pc) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/TelepathyQtFarsight-uninstalled.pc.in ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQtFarsight-uninstalled.pc) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQtFarsight.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig COMPONENT farsight_headers) endif(FARSIGHT_COMPONENTS_FOUND) add_subdirectory(Farsight) diff --git a/TelepathyQt/CapabilitiesBase b/TelepathyQt/CapabilitiesBase new file mode 100644 index 00000000..c31c2e06 --- /dev/null +++ b/TelepathyQt/CapabilitiesBase @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_CapabilitiesBase_HEADER_GUARD_ +#define _TelepathyQt_CapabilitiesBase_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/capabilities-base.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/Channel b/TelepathyQt/Channel new file mode 100644 index 00000000..d928dc41 --- /dev/null +++ b/TelepathyQt/Channel @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_Channel_HEADER_GUARD_ +#define _TelepathyQt_Channel_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ChannelClassFeatures b/TelepathyQt/ChannelClassFeatures new file mode 100644 index 00000000..76d561ee --- /dev/null +++ b/TelepathyQt/ChannelClassFeatures @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ChannelClassFeatures_HEADER_GUARD_ +#define _TelepathyQt_ChannelClassFeatures_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel-class-features.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ChannelClassSpec b/TelepathyQt/ChannelClassSpec new file mode 100644 index 00000000..7ea7c105 --- /dev/null +++ b/TelepathyQt/ChannelClassSpec @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ChannelClassSpec_HEADER_GUARD_ +#define _TelepathyQt_ChannelClassSpec_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel-class-spec.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ChannelClassSpecList b/TelepathyQt/ChannelClassSpecList new file mode 100644 index 00000000..7e9bf67a --- /dev/null +++ b/TelepathyQt/ChannelClassSpecList @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ChannelClassSpecList_HEADER_GUARD_ +#define _TelepathyQt_ChannelClassSpecList_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel-class-spec.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ChannelDispatchOperation b/TelepathyQt/ChannelDispatchOperation new file mode 100644 index 00000000..2753db02 --- /dev/null +++ b/TelepathyQt/ChannelDispatchOperation @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ChannelDispatchOperation_HEADER_GUARD_ +#define _TelepathyQt_ChannelDispatchOperation_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel-dispatch-operation.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ChannelDispatchOperationInterface b/TelepathyQt/ChannelDispatchOperationInterface new file mode 100644 index 00000000..8d056b9e --- /dev/null +++ b/TelepathyQt/ChannelDispatchOperationInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ChannelDispatchOperationInterface_HEADER_GUARD_ +#define _TelepathyQt_ChannelDispatchOperationInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel-dispatch-operation.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ChannelDispatcher b/TelepathyQt/ChannelDispatcher new file mode 100644 index 00000000..3d63b2a0 --- /dev/null +++ b/TelepathyQt/ChannelDispatcher @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ChannelDispatcher_HEADER_GUARD_ +#define _TelepathyQt_ChannelDispatcher_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel-dispatcher.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ChannelDispatcherInterface b/TelepathyQt/ChannelDispatcherInterface new file mode 100644 index 00000000..6b03037f --- /dev/null +++ b/TelepathyQt/ChannelDispatcherInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ChannelDispatcherInterface_HEADER_GUARD_ +#define _TelepathyQt_ChannelDispatcherInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel-dispatcher.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ChannelFactory b/TelepathyQt/ChannelFactory new file mode 100644 index 00000000..7e56a397 --- /dev/null +++ b/TelepathyQt/ChannelFactory @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ChannelFactory_HEADER_GUARD_ +#define _TelepathyQt_ChannelFactory_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel-factory.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ChannelInterface b/TelepathyQt/ChannelInterface new file mode 100644 index 00000000..20db0895 --- /dev/null +++ b/TelepathyQt/ChannelInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ChannelInterface_HEADER_GUARD_ +#define _TelepathyQt_ChannelInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ChannelInterfaceAnonymityInterface b/TelepathyQt/ChannelInterfaceAnonymityInterface new file mode 100644 index 00000000..dfafd9e9 --- /dev/null +++ b/TelepathyQt/ChannelInterfaceAnonymityInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ChannelInterfaceAnonymityInterface_HEADER_GUARD_ +#define _TelepathyQt_ChannelInterfaceAnonymityInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ChannelInterfaceCallStateInterface b/TelepathyQt/ChannelInterfaceCallStateInterface new file mode 100644 index 00000000..794aa5b1 --- /dev/null +++ b/TelepathyQt/ChannelInterfaceCallStateInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ChannelInterfaceCallStateInterface_HEADER_GUARD_ +#define _TelepathyQt_ChannelInterfaceCallStateInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ChannelInterfaceChatStateInterface b/TelepathyQt/ChannelInterfaceChatStateInterface new file mode 100644 index 00000000..84469132 --- /dev/null +++ b/TelepathyQt/ChannelInterfaceChatStateInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ChannelInterfaceChatStateInterface_HEADER_GUARD_ +#define _TelepathyQt_ChannelInterfaceChatStateInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ChannelInterfaceConferenceInterface b/TelepathyQt/ChannelInterfaceConferenceInterface new file mode 100644 index 00000000..dcb0eb98 --- /dev/null +++ b/TelepathyQt/ChannelInterfaceConferenceInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ChannelInterfaceConferenceInterface_HEADER_GUARD_ +#define _TelepathyQt_ChannelInterfaceConferenceInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ChannelInterfaceDTMFInterface b/TelepathyQt/ChannelInterfaceDTMFInterface new file mode 100644 index 00000000..f72e4908 --- /dev/null +++ b/TelepathyQt/ChannelInterfaceDTMFInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ChannelInterfaceDTMFInterface_HEADER_GUARD_ +#define _TelepathyQt_ChannelInterfaceDTMFInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ChannelInterfaceGroupInterface b/TelepathyQt/ChannelInterfaceGroupInterface new file mode 100644 index 00000000..87a26a5a --- /dev/null +++ b/TelepathyQt/ChannelInterfaceGroupInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ChannelInterfaceGroupInterface_HEADER_GUARD_ +#define _TelepathyQt_ChannelInterfaceGroupInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ChannelInterfaceHoldInterface b/TelepathyQt/ChannelInterfaceHoldInterface new file mode 100644 index 00000000..a99ee042 --- /dev/null +++ b/TelepathyQt/ChannelInterfaceHoldInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ChannelInterfaceHoldInterface_HEADER_GUARD_ +#define _TelepathyQt_ChannelInterfaceHoldInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ChannelInterfaceMediaSignallingInterface b/TelepathyQt/ChannelInterfaceMediaSignallingInterface new file mode 100644 index 00000000..4747f68e --- /dev/null +++ b/TelepathyQt/ChannelInterfaceMediaSignallingInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ChannelInterfaceMediaSignallingInterface_HEADER_GUARD_ +#define _TelepathyQt_ChannelInterfaceMediaSignallingInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ChannelInterfaceMessagesInterface b/TelepathyQt/ChannelInterfaceMessagesInterface new file mode 100644 index 00000000..342ab11d --- /dev/null +++ b/TelepathyQt/ChannelInterfaceMessagesInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ChannelInterfaceMessagesInterface_HEADER_GUARD_ +#define _TelepathyQt_ChannelInterfaceMessagesInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ChannelInterfacePasswordInterface b/TelepathyQt/ChannelInterfacePasswordInterface new file mode 100644 index 00000000..804d836c --- /dev/null +++ b/TelepathyQt/ChannelInterfacePasswordInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ChannelInterfacePasswordInterface_HEADER_GUARD_ +#define _TelepathyQt_ChannelInterfacePasswordInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ChannelInterfaceSASLAuthenticationInterface b/TelepathyQt/ChannelInterfaceSASLAuthenticationInterface new file mode 100644 index 00000000..67e07552 --- /dev/null +++ b/TelepathyQt/ChannelInterfaceSASLAuthenticationInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ChannelInterfaceSASLConnectionInterface_HEADER_GUARD_ +#define _TelepathyQt_ChannelInterfaceSASLConnectionInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ChannelInterfaceSecurableInterface b/TelepathyQt/ChannelInterfaceSecurableInterface new file mode 100644 index 00000000..05a80b19 --- /dev/null +++ b/TelepathyQt/ChannelInterfaceSecurableInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ChannelInterfaceSecurableInterface_HEADER_GUARD_ +#define _TelepathyQt_ChannelInterfaceSecurableInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ChannelInterfaceServicePointInterface b/TelepathyQt/ChannelInterfaceServicePointInterface new file mode 100644 index 00000000..6d5ffd36 --- /dev/null +++ b/TelepathyQt/ChannelInterfaceServicePointInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ChannelInterfaceServicePointInterface_HEADER_GUARD_ +#define _TelepathyQt_ChannelInterfaceServicePointInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ChannelInterfaceTubeInterface b/TelepathyQt/ChannelInterfaceTubeInterface new file mode 100644 index 00000000..65ae6845 --- /dev/null +++ b/TelepathyQt/ChannelInterfaceTubeInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ChannelInterfaceTubeInterface_HEADER_GUARD_ +#define _TelepathyQt_ChannelInterfaceTubeInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ChannelRequest b/TelepathyQt/ChannelRequest new file mode 100644 index 00000000..fec50cbe --- /dev/null +++ b/TelepathyQt/ChannelRequest @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ChannelRequest_HEADER_GUARD_ +#define _TelepathyQt_ChannelRequest_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel-request.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ChannelRequestHints b/TelepathyQt/ChannelRequestHints new file mode 100644 index 00000000..2264d95b --- /dev/null +++ b/TelepathyQt/ChannelRequestHints @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ChannelRequestHints_HEADER_GUARD_ +#define _TelepathyQt_ChannelRequestHints_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel-request.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ChannelRequestInterface b/TelepathyQt/ChannelRequestInterface new file mode 100644 index 00000000..1de5b515 --- /dev/null +++ b/TelepathyQt/ChannelRequestInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ChannelRequestInterface_HEADER_GUARD_ +#define _TelepathyQt_ChannelRequestInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel-request.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ChannelTypeContactListInterface b/TelepathyQt/ChannelTypeContactListInterface new file mode 100644 index 00000000..2bedccf9 --- /dev/null +++ b/TelepathyQt/ChannelTypeContactListInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ChannelTypeContactListInterface_HEADER_GUARD_ +#define _TelepathyQt_ChannelTypeContactListInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ChannelTypeContactSearchInterface b/TelepathyQt/ChannelTypeContactSearchInterface new file mode 100644 index 00000000..1f7b7afd --- /dev/null +++ b/TelepathyQt/ChannelTypeContactSearchInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ChannelTypeContactSearchInterface_HEADER_GUARD_ +#define _TelepathyQt_ChannelTypeContactSearchInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ChannelTypeFileTransferInterface b/TelepathyQt/ChannelTypeFileTransferInterface new file mode 100644 index 00000000..8d6692c6 --- /dev/null +++ b/TelepathyQt/ChannelTypeFileTransferInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ChannelTypeFileTransferInterface_HEADER_GUARD_ +#define _TelepathyQt_ChannelTypeFileTransferInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ChannelTypeRoomListInterface b/TelepathyQt/ChannelTypeRoomListInterface new file mode 100644 index 00000000..ba763a51 --- /dev/null +++ b/TelepathyQt/ChannelTypeRoomListInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ChannelTypeRoomListInterface_HEADER_GUARD_ +#define _TelepathyQt_ChannelTypeRoomListInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ChannelTypeServerAuthenticationInterface b/TelepathyQt/ChannelTypeServerAuthenticationInterface new file mode 100644 index 00000000..f03cd149 --- /dev/null +++ b/TelepathyQt/ChannelTypeServerAuthenticationInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ChannelTypeServerAuthenticationInterface_HEADER_GUARD_ +#define _TelepathyQt_ChannelTypeServerAuthenticationInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ChannelTypeServerTLSConnectionInterface b/TelepathyQt/ChannelTypeServerTLSConnectionInterface new file mode 100644 index 00000000..e69a6542 --- /dev/null +++ b/TelepathyQt/ChannelTypeServerTLSConnectionInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ChannelTypeServerTLSConnectionInterface_HEADER_GUARD_ +#define _TelepathyQt_ChannelTypeServerTLSConnectionInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ChannelTypeStreamTubeInterface b/TelepathyQt/ChannelTypeStreamTubeInterface new file mode 100644 index 00000000..390b9774 --- /dev/null +++ b/TelepathyQt/ChannelTypeStreamTubeInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_Client_ChannelTypeStreamTubeInterface_HEADER_GUARD_ +#define _TelepathyQt_Client_ChannelTypeStreamTubeInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ChannelTypeStreamedMediaInterface b/TelepathyQt/ChannelTypeStreamedMediaInterface new file mode 100644 index 00000000..965d664e --- /dev/null +++ b/TelepathyQt/ChannelTypeStreamedMediaInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ChannelTypeStreamedMediaInterface_HEADER_GUARD_ +#define _TelepathyQt_ChannelTypeStreamedMediaInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ChannelTypeTextInterface b/TelepathyQt/ChannelTypeTextInterface new file mode 100644 index 00000000..291690fd --- /dev/null +++ b/TelepathyQt/ChannelTypeTextInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ChannelTypeTextInterface_HEADER_GUARD_ +#define _TelepathyQt_ChannelTypeTextInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ChannelTypeTubeInterface b/TelepathyQt/ChannelTypeTubeInterface new file mode 100644 index 00000000..54b4ddb9 --- /dev/null +++ b/TelepathyQt/ChannelTypeTubeInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_Client_ChannelTypeTubeInterface_HEADER_GUARD_ +#define _TelepathyQt_Client_ChannelTypeTubeInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ChannelTypeTubesInterface b/TelepathyQt/ChannelTypeTubesInterface new file mode 100644 index 00000000..2fc367a5 --- /dev/null +++ b/TelepathyQt/ChannelTypeTubesInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ChannelTypeTubesInterface_HEADER_GUARD_ +#define _TelepathyQt_ChannelTypeTubesInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/Client b/TelepathyQt/Client new file mode 100644 index 00000000..4df3c82e --- /dev/null +++ b/TelepathyQt/Client @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_Client_HEADER_GUARD_ +#define _TelepathyQt_Client_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/client.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ClientApproverInterface b/TelepathyQt/ClientApproverInterface new file mode 100644 index 00000000..f69f9d82 --- /dev/null +++ b/TelepathyQt/ClientApproverInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ClientApproverInterface_HEADER_GUARD_ +#define _TelepathyQt_ClientApproverInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/client.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ClientHandlerInterface b/TelepathyQt/ClientHandlerInterface new file mode 100644 index 00000000..1ddc9062 --- /dev/null +++ b/TelepathyQt/ClientHandlerInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ClientHandlerInterface_HEADER_GUARD_ +#define _TelepathyQt_ClientHandlerInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/client.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ClientInterface b/TelepathyQt/ClientInterface new file mode 100644 index 00000000..4a6b2cc5 --- /dev/null +++ b/TelepathyQt/ClientInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ClientInterface_HEADER_GUARD_ +#define _TelepathyQt_ClientInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/client.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ClientInterfaceRequestsInterface b/TelepathyQt/ClientInterfaceRequestsInterface new file mode 100644 index 00000000..cef1cabc --- /dev/null +++ b/TelepathyQt/ClientInterfaceRequestsInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ClientInterfaceRequestsInterface_HEADER_GUARD_ +#define _TelepathyQt_ClientInterfaceRequestsInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/client.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ClientObserverInterface b/TelepathyQt/ClientObserverInterface new file mode 100644 index 00000000..ace48ff4 --- /dev/null +++ b/TelepathyQt/ClientObserverInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ClientObserverInterface_HEADER_GUARD_ +#define _TelepathyQt_ClientObserverInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/client.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ClientRegistrar b/TelepathyQt/ClientRegistrar new file mode 100644 index 00000000..eac9e94e --- /dev/null +++ b/TelepathyQt/ClientRegistrar @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ClientRegistrar_HEADER_GUARD_ +#define _TelepathyQt_ClientRegistrar_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/client-registrar.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/Connection b/TelepathyQt/Connection new file mode 100644 index 00000000..1f108be6 --- /dev/null +++ b/TelepathyQt/Connection @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_Connection_HEADER_GUARD_ +#define _TelepathyQt_Connection_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/connection.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ConnectionCapabilities b/TelepathyQt/ConnectionCapabilities new file mode 100644 index 00000000..3d5a9b1d --- /dev/null +++ b/TelepathyQt/ConnectionCapabilities @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ConnectionCapabilities_HEADER_GUARD_ +#define _TelepathyQt_ConnectionCapabilities_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/connection-capabilities.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ConnectionFactory b/TelepathyQt/ConnectionFactory new file mode 100644 index 00000000..8af15eed --- /dev/null +++ b/TelepathyQt/ConnectionFactory @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ConnectionFactory_HEADER_GUARD_ +#define _TelepathyQt_ConnectionFactory_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/connection-factory.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ConnectionInterface b/TelepathyQt/ConnectionInterface new file mode 100644 index 00000000..4f4fd3f8 --- /dev/null +++ b/TelepathyQt/ConnectionInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ConnectionInterface_HEADER_GUARD_ +#define _TelepathyQt_ConnectionInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/connection.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ConnectionInterfaceAliasingInterface b/TelepathyQt/ConnectionInterfaceAliasingInterface new file mode 100644 index 00000000..08d44a08 --- /dev/null +++ b/TelepathyQt/ConnectionInterfaceAliasingInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ConnectionInterfaceAliasingInterface_HEADER_GUARD_ +#define _TelepathyQt_ConnectionInterfaceAliasingInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/connection.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ConnectionInterfaceAnonymityInterface b/TelepathyQt/ConnectionInterfaceAnonymityInterface new file mode 100644 index 00000000..5bd148ed --- /dev/null +++ b/TelepathyQt/ConnectionInterfaceAnonymityInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ConnectionInterfaceAnonymityInterface_HEADER_GUARD_ +#define _TelepathyQt_ConnectionInterfaceAnonymityInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/connection.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ConnectionInterfaceAvatarsInterface b/TelepathyQt/ConnectionInterfaceAvatarsInterface new file mode 100644 index 00000000..deebb8cc --- /dev/null +++ b/TelepathyQt/ConnectionInterfaceAvatarsInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ConnectionInterfaceAvatarsInterface_HEADER_GUARD_ +#define _TelepathyQt_ConnectionInterfaceAvatarsInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/connection.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ConnectionInterfaceBalanceInterface b/TelepathyQt/ConnectionInterfaceBalanceInterface new file mode 100644 index 00000000..8a6fbfd3 --- /dev/null +++ b/TelepathyQt/ConnectionInterfaceBalanceInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ConnectionInterfaceBalanceInterface_HEADER_GUARD_ +#define _TelepathyQt_ConnectionInterfaceBalanceInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/connection.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ConnectionInterfaceCapabilitiesInterface b/TelepathyQt/ConnectionInterfaceCapabilitiesInterface new file mode 100644 index 00000000..7129834b --- /dev/null +++ b/TelepathyQt/ConnectionInterfaceCapabilitiesInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ConnectionInterfaceCapabilitiesInterface_HEADER_GUARD_ +#define _TelepathyQt_ConnectionInterfaceCapabilitiesInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/connection.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ConnectionInterfaceCellularInterface b/TelepathyQt/ConnectionInterfaceCellularInterface new file mode 100644 index 00000000..8fb1b72a --- /dev/null +++ b/TelepathyQt/ConnectionInterfaceCellularInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ConnectionInterfaceCellularInterface_HEADER_GUARD_ +#define _TelepathyQt_ConnectionInterfaceCellularInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/connection.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ConnectionInterfaceClientTypes b/TelepathyQt/ConnectionInterfaceClientTypes new file mode 100644 index 00000000..4d829532 --- /dev/null +++ b/TelepathyQt/ConnectionInterfaceClientTypes @@ -0,0 +1,17 @@ +#ifndef _TelepathyQt_ConnectionInterfaceClientTyes_HEADER_GUARD_ +#define _TelepathyQt_ConnectionInterfaceClientTyes_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#ifdef TP_QT_DEPRECATED_WARNINGS +#warning "This file will be removed in a future tp-qt4 release, use #include <TelepathyQt/ConnectionInterfaceClientTypesInterface> instead" +#endif + +#include <TelepathyQt/connection.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ConnectionInterfaceClientTypesInterface b/TelepathyQt/ConnectionInterfaceClientTypesInterface new file mode 100644 index 00000000..9fba41f3 --- /dev/null +++ b/TelepathyQt/ConnectionInterfaceClientTypesInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ConnectionInterfaceClientTypesInterface_HEADER_GUARD_ +#define _TelepathyQt_ConnectionInterfaceClientTypesInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/connection.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ConnectionInterfaceContactBlockingInterface b/TelepathyQt/ConnectionInterfaceContactBlockingInterface new file mode 100644 index 00000000..57acbebe --- /dev/null +++ b/TelepathyQt/ConnectionInterfaceContactBlockingInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ConnectionInterfaceContactBlockingInterface_HEADER_GUARD_ +#define _TelepathyQt_ConnectionInterfaceContactBlockingInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/connection.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelTypeStreamTubeInterface b/TelepathyQt/ConnectionInterfaceContactCapabilitiesInterface index 0799d583..a30c4b22 100644 --- a/TelepathyQt4/ChannelTypeStreamTubeInterface +++ b/TelepathyQt/ConnectionInterfaceContactCapabilitiesInterface @@ -1,11 +1,11 @@ -#ifndef _TelepathyQt4_Client_ChannelTypeStreamTubeInterface_HEADER_GUARD_ -#define _TelepathyQt4_Client_ChannelTypeStreamTubeInterface_HEADER_GUARD_ +#ifndef _TelepathyQt_ConnectionInterfaceContactCapabilitiesInterface_HEADER_GUARD_ +#define _TelepathyQt_ConnectionInterfaceContactCapabilitiesInterface_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #define IN_TP_QT_HEADER #endif -#include <TelepathyQt4/channel.h> +#include <TelepathyQt/connection.h> #undef IN_TP_QT_HEADER diff --git a/TelepathyQt/ConnectionInterfaceContactGroups b/TelepathyQt/ConnectionInterfaceContactGroups new file mode 100644 index 00000000..48800391 --- /dev/null +++ b/TelepathyQt/ConnectionInterfaceContactGroups @@ -0,0 +1,17 @@ +#ifndef _TelepathyQt_ConnectionInterfaceContactGroups_HEADER_GUARD_ +#define _TelepathyQt_ConnectionInterfaceContactGroups_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#ifdef TP_QT_DEPRECATED_WARNINGS +#warning "This file will be removed in a future tp-qt4 release, use #include <TelepathyQt/ConnectionInterfaceContactGroupsInterface> instead" +#endif + +#include <TelepathyQt/connection.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ConnectionInterfaceContactGroupsInterface b/TelepathyQt/ConnectionInterfaceContactGroupsInterface new file mode 100644 index 00000000..8891d430 --- /dev/null +++ b/TelepathyQt/ConnectionInterfaceContactGroupsInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ConnectionInterfaceContactGroupsInterface_HEADER_GUARD_ +#define _TelepathyQt_ConnectionInterfaceContactGroupsInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/connection.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ConnectionInterfaceContactInfoInterface b/TelepathyQt/ConnectionInterfaceContactInfoInterface new file mode 100644 index 00000000..1b465d2b --- /dev/null +++ b/TelepathyQt/ConnectionInterfaceContactInfoInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ConnectionInterfaceContactInfoInterface_HEADER_GUARD_ +#define _TelepathyQt_ConnectionInterfaceContactInfoInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/connection.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ConnectionInterfaceContactList b/TelepathyQt/ConnectionInterfaceContactList new file mode 100644 index 00000000..674ab4f1 --- /dev/null +++ b/TelepathyQt/ConnectionInterfaceContactList @@ -0,0 +1,17 @@ +#ifndef _TelepathyQt_ConnectionInterfaceContactList_HEADER_GUARD_ +#define _TelepathyQt_ConnectionInterfaceContactList_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#ifdef TP_QT_DEPRECATED_WARNINGS +#warning "This file will be removed in a future tp-qt4 release, use #include <TelepathyQt/ConnectionInterfaceContactListInterface> instead" +#endif + +#include <TelepathyQt/connection.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ConnectionInterfaceContactListInterface b/TelepathyQt/ConnectionInterfaceContactListInterface new file mode 100644 index 00000000..3f80a62a --- /dev/null +++ b/TelepathyQt/ConnectionInterfaceContactListInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ConnectionInterfaceContactListInterface_HEADER_GUARD_ +#define _TelepathyQt_ConnectionInterfaceContactListInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/connection.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ConnectionInterfaceContactsInterface b/TelepathyQt/ConnectionInterfaceContactsInterface new file mode 100644 index 00000000..ed8e3e2e --- /dev/null +++ b/TelepathyQt/ConnectionInterfaceContactsInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ConnectionInterfaceContactsInterface_HEADER_GUARD_ +#define _TelepathyQt_ConnectionInterfaceContactsInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/connection.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ConnectionInterfaceLocationInterface b/TelepathyQt/ConnectionInterfaceLocationInterface new file mode 100644 index 00000000..158efea3 --- /dev/null +++ b/TelepathyQt/ConnectionInterfaceLocationInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ConnectionInterfaceLocationInterface_HEADER_GUARD_ +#define _TelepathyQt_ConnectionInterfaceLocationInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/connection.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ConnectionInterfaceMailNotificationInterface b/TelepathyQt/ConnectionInterfaceMailNotificationInterface new file mode 100644 index 00000000..43cd102a --- /dev/null +++ b/TelepathyQt/ConnectionInterfaceMailNotificationInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ConnectionInterfaceMailNotificationInterface_HEADER_GUARD_ +#define _TelepathyQt_ConnectionInterfaceMailNotificationInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/connection.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ConnectionInterfacePowerSaving b/TelepathyQt/ConnectionInterfacePowerSaving new file mode 100644 index 00000000..5a9d6d09 --- /dev/null +++ b/TelepathyQt/ConnectionInterfacePowerSaving @@ -0,0 +1,17 @@ +#ifndef _TelepathyQt_ConnectionInterfacePowerSaving_HEADER_GUARD_ +#define _TelepathyQt_ConnectionInterfacePowerSaving_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#ifdef TP_QT_DEPRECATED_WARNINGS +#warning "This file will be removed in a future tp-qt4 release, use #include <TelepathyQt/ConnectionInterfacePowerSavingInterface> instead" +#endif + +#include <TelepathyQt/connection.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ConnectionInterfacePowerSavingInterface b/TelepathyQt/ConnectionInterfacePowerSavingInterface new file mode 100644 index 00000000..ed0a01c7 --- /dev/null +++ b/TelepathyQt/ConnectionInterfacePowerSavingInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ConnectionInterfacePowerSavingInterface_HEADER_GUARD_ +#define _TelepathyQt_ConnectionInterfacePowerSavingInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/connection.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ConnectionInterfacePresenceInterface b/TelepathyQt/ConnectionInterfacePresenceInterface new file mode 100644 index 00000000..7626a27c --- /dev/null +++ b/TelepathyQt/ConnectionInterfacePresenceInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ConnectionInterfacePresenceInterface_HEADER_GUARD_ +#define _TelepathyQt_ConnectionInterfacePresenceInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/connection.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ConnectionInterfaceRequestsInterface b/TelepathyQt/ConnectionInterfaceRequestsInterface new file mode 100644 index 00000000..ece2c7c2 --- /dev/null +++ b/TelepathyQt/ConnectionInterfaceRequestsInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ConnectionInterfaceRequestsInterface_HEADER_GUARD_ +#define _TelepathyQt_ConnectionInterfaceRequestsInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/connection.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ConnectionInterfaceServicePointInterface b/TelepathyQt/ConnectionInterfaceServicePointInterface new file mode 100644 index 00000000..19f7bfbd --- /dev/null +++ b/TelepathyQt/ConnectionInterfaceServicePointInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ConnectionInterfaceServicePointInterface_HEADER_GUARD_ +#define _TelepathyQt_ConnectionInterfaceServicePointInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/connection.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ConnectionInterfaceSimplePresenceInterface b/TelepathyQt/ConnectionInterfaceSimplePresenceInterface new file mode 100644 index 00000000..47dddb9e --- /dev/null +++ b/TelepathyQt/ConnectionInterfaceSimplePresenceInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ConnectionInterfaceSimplePresenceInterface_HEADER_GUARD_ +#define _TelepathyQt_ConnectionInterfaceSimplePresenceInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/connection.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ConnectionLowlevel b/TelepathyQt/ConnectionLowlevel new file mode 100644 index 00000000..25a53129 --- /dev/null +++ b/TelepathyQt/ConnectionLowlevel @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ConnectionLowlevel_HEADER_GUARD +#define _TelepathyQt_ConnectionLowlevel_HEADER_GUARD + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/connection-lowlevel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ConnectionManager b/TelepathyQt/ConnectionManager new file mode 100644 index 00000000..3ae63f6f --- /dev/null +++ b/TelepathyQt/ConnectionManager @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ConnectionManager_HEADER_GUARD_ +#define _TelepathyQt_ConnectionManager_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/connection-manager.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ConnectionManagerInterface b/TelepathyQt/ConnectionManagerInterface new file mode 100644 index 00000000..2f829012 --- /dev/null +++ b/TelepathyQt/ConnectionManagerInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ConnectionManagerInterface_HEADER_GUARD_ +#define _TelepathyQt_ConnectionManagerInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/connection-manager.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ConnectionManagerLowlevel b/TelepathyQt/ConnectionManagerLowlevel new file mode 100644 index 00000000..d75e427f --- /dev/null +++ b/TelepathyQt/ConnectionManagerLowlevel @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ConnectionManagerLowlevel_HEADER_GUARD +#define _TelepathyQt_ConnectionManagerLowlevel_HEADER_GUARD + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/connection-manager-lowlevel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/Constants b/TelepathyQt/Constants new file mode 100644 index 00000000..c7ddc806 --- /dev/null +++ b/TelepathyQt/Constants @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_Constants_HEADER_GUARD_ +#define _TelepathyQt_Constants_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/constants.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/Contact b/TelepathyQt/Contact new file mode 100644 index 00000000..ae1a9c8d --- /dev/null +++ b/TelepathyQt/Contact @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_Contact_HEADER_GUARD_ +#define _TelepathyQt_Contact_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/contact.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ContactCapabilities b/TelepathyQt/ContactCapabilities new file mode 100644 index 00000000..c012e0dd --- /dev/null +++ b/TelepathyQt/ContactCapabilities @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ContactCapabilities_HEADER_GUARD_ +#define _TelepathyQt_ContactCapabilities_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/contact-capabilities.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ContactFactory b/TelepathyQt/ContactFactory new file mode 100644 index 00000000..957f2e41 --- /dev/null +++ b/TelepathyQt/ContactFactory @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ContactFactory_HEADER_GUARD_ +#define _TelepathyQt_ContactFactory_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/contact-factory.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ContactManager b/TelepathyQt/ContactManager new file mode 100644 index 00000000..6f5fae54 --- /dev/null +++ b/TelepathyQt/ContactManager @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ContactManager_HEADER_GUARD_ +#define _TelepathyQt_ContactManager_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/contact-manager.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ContactMessenger b/TelepathyQt/ContactMessenger new file mode 100644 index 00000000..58cb7e10 --- /dev/null +++ b/TelepathyQt/ContactMessenger @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ContactMessenger_HEADER_GUARD_ +#define _TelepathyQt_ContactMessenger_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/contact-messenger.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ContactSearchChannel b/TelepathyQt/ContactSearchChannel new file mode 100644 index 00000000..e4b8bf0d --- /dev/null +++ b/TelepathyQt/ContactSearchChannel @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ContactSearchChannel_HEADER_GUARD_ +#define _TelepathyQt_ContactSearchChannel_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/contact-search-channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/DBus b/TelepathyQt/DBus new file mode 100644 index 00000000..9a72aa46 --- /dev/null +++ b/TelepathyQt/DBus @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_DBus_HEADER_GUARD_ +#define _TelepathyQt_DBus_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/dbus.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/DBusDaemonInterface b/TelepathyQt/DBusDaemonInterface new file mode 100644 index 00000000..e003fd6a --- /dev/null +++ b/TelepathyQt/DBusDaemonInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_DBusDaemonInterface_HEADER_GUARD_ +#define _TelepathyQt_DBusDaemonInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/dbus.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/DBusProxy b/TelepathyQt/DBusProxy new file mode 100644 index 00000000..a26c1c2e --- /dev/null +++ b/TelepathyQt/DBusProxy @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_DBusProxy_HEADER_GUARD_ +#define _TelepathyQt_DBusProxy_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/dbus-proxy.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/DBusProxyFactory b/TelepathyQt/DBusProxyFactory new file mode 100644 index 00000000..c40af4ef --- /dev/null +++ b/TelepathyQt/DBusProxyFactory @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_DBusProxyFactory_HEADER_GUARD_ +#define _TelepathyQt_DBusProxyFactory_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/dbus-proxy-factory.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/Debug b/TelepathyQt/Debug new file mode 100644 index 00000000..f67ec73b --- /dev/null +++ b/TelepathyQt/Debug @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_Debug_HEADER_GUARD_ +#define _TelepathyQt_Debug_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/debug.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt4/Farsight/CMakeLists.txt b/TelepathyQt/Farsight/CMakeLists.txt index 9a8368a4..0deba3c2 100644 --- a/TelepathyQt4/Farsight/CMakeLists.txt +++ b/TelepathyQt/Farsight/CMakeLists.txt @@ -47,6 +47,6 @@ if(FARSIGHT_COMPONENTS_FOUND) endif (WIN32) # Install headers - install(FILES ${telepathy_qt4_farsight_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/telepathy-1.0/TelepathyQt4/Farsight + install(FILES ${telepathy_qt4_farsight_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/telepathy-1.0/TelepathyQt/Farsight COMPONENT farsight_headers) endif(FARSIGHT_COMPONENTS_FOUND) diff --git a/TelepathyQt/Farsight/Channel b/TelepathyQt/Farsight/Channel new file mode 100644 index 00000000..ea05f89d --- /dev/null +++ b/TelepathyQt/Farsight/Channel @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_Farsight_Channel_HEADER_GUARD_ +#define _TelepathyQt_Farsight_Channel_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/Farsight/channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt4/Farsight/channel.cpp b/TelepathyQt/Farsight/channel.cpp index 069fb804..d920176e 100644 --- a/TelepathyQt4/Farsight/channel.cpp +++ b/TelepathyQt/Farsight/channel.cpp @@ -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,13 +20,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/Farsight/Channel> +#include <TelepathyQt/Farsight/Channel> -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/Channel> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/StreamedMediaChannel> +#include <TelepathyQt/Channel> +#include <TelepathyQt/Connection> +#include <TelepathyQt/StreamedMediaChannel> #include <telepathy-glib/channel.h> #include <telepathy-glib/connection.h> diff --git a/TelepathyQt4/Farsight/channel.h b/TelepathyQt/Farsight/channel.h index ddec59b8..1dffb940 100644 --- a/TelepathyQt4/Farsight/channel.h +++ b/TelepathyQt/Farsight/channel.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,16 +20,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_Farsight_channel_h_HEADER_GUARD_ -#define _TelepathyQt4_Farsight_channel_h_HEADER_GUARD_ +#ifndef _TelepathyQt_Farsight_channel_h_HEADER_GUARD_ +#define _TelepathyQt_Farsight_channel_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Farsight/global.h> +#include <TelepathyQt/Farsight/global.h> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Types> #include <telepathy-farsight/channel.h> diff --git a/TelepathyQt4/Farsight/global.h b/TelepathyQt/Farsight/global.h index 4ec58713..2d5c1100 100644 --- a/TelepathyQt4/Farsight/global.h +++ b/TelepathyQt/Farsight/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,8 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_Farsight_global_h_HEADER_GUARD_ -#define _TelepathyQt4_Farsight_global_h_HEADER_GUARD_ +#ifndef _TelepathyQt_Farsight_global_h_HEADER_GUARD_ +#define _TelepathyQt_Farsight_global_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER diff --git a/TelepathyQt/Feature b/TelepathyQt/Feature new file mode 100644 index 00000000..20d307a4 --- /dev/null +++ b/TelepathyQt/Feature @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_Feature_HEADER_GUARD_ +#define _TelepathyQt_Feature_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/feature.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/Features b/TelepathyQt/Features new file mode 100644 index 00000000..d2e6f515 --- /dev/null +++ b/TelepathyQt/Features @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_Features_HEADER_GUARD_ +#define _TelepathyQt_Features_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/feature.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/FileTransferChannel b/TelepathyQt/FileTransferChannel new file mode 100644 index 00000000..fc506226 --- /dev/null +++ b/TelepathyQt/FileTransferChannel @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_FileTransferChannel_HEADER_GUARD_ +#define _TelepathyQt_FileTransferChannel_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/file-transfer-channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/FileTransferChannelCreationProperties b/TelepathyQt/FileTransferChannelCreationProperties new file mode 100644 index 00000000..5908db7b --- /dev/null +++ b/TelepathyQt/FileTransferChannelCreationProperties @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_FileTransferChannelCreationProperties_HEADER_GUARD_ +#define _TelepathyQt_FileTransferChannelCreationProperties_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/file-transfer-channel-creation-properties.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/Filter b/TelepathyQt/Filter new file mode 100644 index 00000000..c14e4eaf --- /dev/null +++ b/TelepathyQt/Filter @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_Filter_HEADER_GUARD_ +#define _TelepathyQt_Filter_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/filter.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/FixedFeatureFactory b/TelepathyQt/FixedFeatureFactory new file mode 100644 index 00000000..4fc90138 --- /dev/null +++ b/TelepathyQt/FixedFeatureFactory @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_FixedFeatureFactory_HEADER_GUARD_ +#define _TelepathyQt_FixedFeatureFactory_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/fixed-feature-factory.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/GenericCapabilityFilter b/TelepathyQt/GenericCapabilityFilter new file mode 100644 index 00000000..f6c41e90 --- /dev/null +++ b/TelepathyQt/GenericCapabilityFilter @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_GenericCapabilityFilter_HEADER_GUARD_ +#define _TelepathyQt_GenericCapabilityFilter_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/generic-capability-filter.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/GenericPropertyFilter b/TelepathyQt/GenericPropertyFilter new file mode 100644 index 00000000..1dc535cd --- /dev/null +++ b/TelepathyQt/GenericPropertyFilter @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_GenericPropertyFilter_HEADER_GUARD_ +#define _TelepathyQt_GenericPropertyFilter_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/generic-property-filter.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/Global b/TelepathyQt/Global new file mode 100644 index 00000000..6d227ae5 --- /dev/null +++ b/TelepathyQt/Global @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_Global_HEADER_GUARD_ +#define _TelepathyQt_Global_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/global.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/HandledChannelNotifier b/TelepathyQt/HandledChannelNotifier new file mode 100644 index 00000000..987cb8e8 --- /dev/null +++ b/TelepathyQt/HandledChannelNotifier @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_HandledChannelNotifier_HEADER_GUARD_ +#define _TelepathyQt_HandledChannelNotifier_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/handled-channel-notifier.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/IncomingFileTransferChannel b/TelepathyQt/IncomingFileTransferChannel new file mode 100644 index 00000000..092bd683 --- /dev/null +++ b/TelepathyQt/IncomingFileTransferChannel @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_IncomingFileTransferChannel_HEADER_GUARD_ +#define _TelepathyQt_IncomingFileTransferChannel_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/incoming-file-transfer-channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/IncomingStreamTubeChannel b/TelepathyQt/IncomingStreamTubeChannel new file mode 100644 index 00000000..36e32486 --- /dev/null +++ b/TelepathyQt/IncomingStreamTubeChannel @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_IncomingStreamTubeChannel_HEADER_GUARD_ +#define _TelepathyQt_IncomingStreamTubeChannel_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/incoming-stream-tube-channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/IntrospectableInterface b/TelepathyQt/IntrospectableInterface new file mode 100644 index 00000000..1b11a4d4 --- /dev/null +++ b/TelepathyQt/IntrospectableInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_IntrospectableInterface_HEADER_GUARD_ +#define _TelepathyQt_IntrospectableInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/dbus.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt4/FixedFeatureFactory b/TelepathyQt/KeyFile index c958c98e..1bbb3cd0 100644 --- a/TelepathyQt4/FixedFeatureFactory +++ b/TelepathyQt/KeyFile @@ -1,11 +1,11 @@ -#ifndef _TelepathyQt4_FixedFeatureFactory_HEADER_GUARD_ -#define _TelepathyQt4_FixedFeatureFactory_HEADER_GUARD_ +#ifndef _TelepathyQt_KeyFile_HEADER_GUARD_ +#define _TelepathyQt_KeyFile_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #define IN_TP_QT_HEADER #endif -#include <TelepathyQt4/fixed-feature-factory.h> +#include <TelepathyQt/key-file.h> #undef IN_TP_QT_HEADER diff --git a/TelepathyQt/LocationInfo b/TelepathyQt/LocationInfo new file mode 100644 index 00000000..c924e9aa --- /dev/null +++ b/TelepathyQt/LocationInfo @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_LocationInfo_HEADER_GUARD_ +#define _TelepathyQt_LocationInfo_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/location-info.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ManagerFile b/TelepathyQt/ManagerFile new file mode 100644 index 00000000..0765484b --- /dev/null +++ b/TelepathyQt/ManagerFile @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ManagerFile_HEADER_GUARD_ +#define _TelepathyQt_ManagerFile_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/manager-file.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/MediaSessionHandler b/TelepathyQt/MediaSessionHandler new file mode 100644 index 00000000..bdabd07c --- /dev/null +++ b/TelepathyQt/MediaSessionHandler @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_MediaSessionHandler_HEADER_GUARD_ +#define _TelepathyQt_MediaSessionHandler_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/media-session-handler.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/MediaSessionHandlerInterface b/TelepathyQt/MediaSessionHandlerInterface new file mode 100644 index 00000000..25760fa5 --- /dev/null +++ b/TelepathyQt/MediaSessionHandlerInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_MediaSessionHandlerInterface_HEADER_GUARD_ +#define _TelepathyQt_MediaSessionHandlerInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/media-session-handler.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/MediaStreamHandler b/TelepathyQt/MediaStreamHandler new file mode 100644 index 00000000..3ead065c --- /dev/null +++ b/TelepathyQt/MediaStreamHandler @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_MediaStreamHandler_HEADER_GUARD_ +#define _TelepathyQt_MediaStreamHandler_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/media-stream-handler.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/MediaStreamHandlerInterface b/TelepathyQt/MediaStreamHandlerInterface new file mode 100644 index 00000000..760eb087 --- /dev/null +++ b/TelepathyQt/MediaStreamHandlerInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_MediaStreamHandlerInterface_HEADER_GUARD_ +#define _TelepathyQt_MediaStreamHandlerInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/media-stream-handler.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/Message b/TelepathyQt/Message new file mode 100644 index 00000000..2ebdbf6a --- /dev/null +++ b/TelepathyQt/Message @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_Message_HEADER_GUARD_ +#define _TelepathyQt_Message_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/message.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/MessageContentPart b/TelepathyQt/MessageContentPart new file mode 100644 index 00000000..94a45e74 --- /dev/null +++ b/TelepathyQt/MessageContentPart @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_MessageContentPart_HEADER_GUARD_ +#define _TelepathyQt_MessageContentPart_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/message-content-part.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/MessageContentPartList b/TelepathyQt/MessageContentPartList new file mode 100644 index 00000000..b15e5aca --- /dev/null +++ b/TelepathyQt/MessageContentPartList @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_MessageContentPartList_HEADER_GUARD_ +#define _TelepathyQt_MessageContentPartList_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/message-content-part.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/MethodInvocationContext b/TelepathyQt/MethodInvocationContext new file mode 100644 index 00000000..5c9bfd66 --- /dev/null +++ b/TelepathyQt/MethodInvocationContext @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_MethodInvocationContext_HEADER_GUARD_ +#define _TelepathyQt_MethodInvocationContext_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/method-invocation-context.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/NotFilter b/TelepathyQt/NotFilter new file mode 100644 index 00000000..9947d99b --- /dev/null +++ b/TelepathyQt/NotFilter @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_NotFilter_HEADER_GUARD_ +#define _TelepathyQt_NotFilter_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/not-filter.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/Object b/TelepathyQt/Object new file mode 100644 index 00000000..077c9317 --- /dev/null +++ b/TelepathyQt/Object @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_Object_HEADER_GUARD_ +#define _TelepathyQt_Object_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/object.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/OptionalInterfaceFactory b/TelepathyQt/OptionalInterfaceFactory new file mode 100644 index 00000000..910a65a8 --- /dev/null +++ b/TelepathyQt/OptionalInterfaceFactory @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_OptionalInterfaceFactory_HEADER_GUARD_ +#define _TelepathyQt_OptionalInterfaceFactory_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/optional-interface-factory.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/OrFilter b/TelepathyQt/OrFilter new file mode 100644 index 00000000..a54ceb89 --- /dev/null +++ b/TelepathyQt/OrFilter @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_OrFilter_HEADER_GUARD_ +#define _TelepathyQt_OrFilter_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/or-filter.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/OutgoingFileTransferChannel b/TelepathyQt/OutgoingFileTransferChannel new file mode 100644 index 00000000..f04a4336 --- /dev/null +++ b/TelepathyQt/OutgoingFileTransferChannel @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_OutgoingFileTransferChannel_HEADER_GUARD_ +#define _TelepathyQt_OutgoingFileTransferChannel_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/outgoing-file-transfer-channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/OutgoingStreamTubeChannel b/TelepathyQt/OutgoingStreamTubeChannel new file mode 100644 index 00000000..18a0b147 --- /dev/null +++ b/TelepathyQt/OutgoingStreamTubeChannel @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_OutgoingStreamTubeChannel_HEADER_GUARD_ +#define _TelepathyQt_OutgoingStreamTubeChannel_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/outgoing-stream-tube-channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/PeerInterface b/TelepathyQt/PeerInterface new file mode 100644 index 00000000..3acee4af --- /dev/null +++ b/TelepathyQt/PeerInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_PeerInterface_HEADER_GUARD_ +#define _TelepathyQt_PeerInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/dbus.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/PendingAccount b/TelepathyQt/PendingAccount new file mode 100644 index 00000000..66cba3cd --- /dev/null +++ b/TelepathyQt/PendingAccount @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_PendingAccount_HEADER_GUARD_ +#define _TelepathyQt_PendingAccount_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/pending-account.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/PendingChannel b/TelepathyQt/PendingChannel new file mode 100644 index 00000000..1b023c8d --- /dev/null +++ b/TelepathyQt/PendingChannel @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_PendingChannel_HEADER_GUARD_ +#define _TelepathyQt_PendingChannel_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/pending-channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/PendingChannelRequest b/TelepathyQt/PendingChannelRequest new file mode 100644 index 00000000..22e8bbb3 --- /dev/null +++ b/TelepathyQt/PendingChannelRequest @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_PendingChannelRequest_HEADER_GUARD_ +#define _TelepathyQt_PendingChannelRequest_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/pending-channel-request.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/PendingComposite b/TelepathyQt/PendingComposite new file mode 100644 index 00000000..d6c281e1 --- /dev/null +++ b/TelepathyQt/PendingComposite @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_PendingComposite_HEADER_GUARD_ +#define _TelepathyQt_PendingComposite_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/simple-pending-operations.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/PendingConnection b/TelepathyQt/PendingConnection new file mode 100644 index 00000000..6f4ab9ac --- /dev/null +++ b/TelepathyQt/PendingConnection @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_PendingConnection_HEADER_GUARD_ +#define _TelepathyQt_PendingConnection_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/pending-connection.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/PendingContactAttributes b/TelepathyQt/PendingContactAttributes new file mode 100644 index 00000000..e67e2055 --- /dev/null +++ b/TelepathyQt/PendingContactAttributes @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_PendingContactAttributes_HEADER_GUARD_ +#define _TelepathyQt_PendingContactAttributes_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/pending-contact-attributes.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/PendingContactInfo b/TelepathyQt/PendingContactInfo new file mode 100644 index 00000000..95cc7933 --- /dev/null +++ b/TelepathyQt/PendingContactInfo @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_PendingContactInfo_HEADER_GUARD_ +#define _TelepathyQt_PendingContactInfo_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/pending-contact-info.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/PendingContacts b/TelepathyQt/PendingContacts new file mode 100644 index 00000000..d74e6cee --- /dev/null +++ b/TelepathyQt/PendingContacts @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_PendingContacts_HEADER_GUARD_ +#define _TelepathyQt_PendingContacts_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/pending-contacts.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/PendingFailure b/TelepathyQt/PendingFailure new file mode 100644 index 00000000..ccc62b3e --- /dev/null +++ b/TelepathyQt/PendingFailure @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_PendingFailure_HEADER_GUARD_ +#define _TelepathyQt_PendingFailure_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/simple-pending-operations.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/PendingHandles b/TelepathyQt/PendingHandles new file mode 100644 index 00000000..27d0e197 --- /dev/null +++ b/TelepathyQt/PendingHandles @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_PendingHandles_HEADER_GUARD_ +#define _TelepathyQt_PendingHandles_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/pending-handles.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/PendingOperation b/TelepathyQt/PendingOperation new file mode 100644 index 00000000..b56e8d42 --- /dev/null +++ b/TelepathyQt/PendingOperation @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_PendingOperation_HEADER_GUARD_ +#define _TelepathyQt_PendingOperation_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/pending-operation.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/PendingReady b/TelepathyQt/PendingReady new file mode 100644 index 00000000..f2f67e94 --- /dev/null +++ b/TelepathyQt/PendingReady @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_PendingReady_HEADER_GUARD_ +#define _TelepathyQt_PendingReady_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/pending-ready.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/PendingSendMessage b/TelepathyQt/PendingSendMessage new file mode 100644 index 00000000..9b6f3496 --- /dev/null +++ b/TelepathyQt/PendingSendMessage @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_PendingSendMessage_HEADER_GUARD_ +#define _TelepathyQt_PendingSendMessage_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/pending-send-message.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/PendingStreamTubeConnection b/TelepathyQt/PendingStreamTubeConnection new file mode 100644 index 00000000..36abeaa1 --- /dev/null +++ b/TelepathyQt/PendingStreamTubeConnection @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_PendingStreamTubeConnection_HEADER_GUARD_ +#define _TelepathyQt_PendingStreamTubeConnection_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/pending-stream-tube-connection.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/PendingStreamedMediaStreams b/TelepathyQt/PendingStreamedMediaStreams new file mode 100644 index 00000000..6373fe6c --- /dev/null +++ b/TelepathyQt/PendingStreamedMediaStreams @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_PendingStreamedMediaStreams_HEADER_GUARD_ +#define _TelepathyQt_PendingStreamedMediaStreams_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/streamed-media-channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/PendingStringList b/TelepathyQt/PendingStringList new file mode 100644 index 00000000..cab8b464 --- /dev/null +++ b/TelepathyQt/PendingStringList @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_PendingStringList_HEADER_GUARD_ +#define _TelepathyQt_PendingStringList_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/pending-string-list.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/PendingSuccess b/TelepathyQt/PendingSuccess new file mode 100644 index 00000000..80876b72 --- /dev/null +++ b/TelepathyQt/PendingSuccess @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_PendingSuccess_HEADER_GUARD_ +#define _TelepathyQt_PendingSuccess_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/simple-pending-operations.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/PendingVariant b/TelepathyQt/PendingVariant new file mode 100644 index 00000000..42228800 --- /dev/null +++ b/TelepathyQt/PendingVariant @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_PendingVariant_HEADER_GUARD_ +#define _TelepathyQt_PendingVariant_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/pending-variant.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/PendingVariantMap b/TelepathyQt/PendingVariantMap new file mode 100644 index 00000000..32dae3ce --- /dev/null +++ b/TelepathyQt/PendingVariantMap @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_PendingVariantMap_HEADER_GUARD_ +#define _TelepathyQt_PendingVariantMap_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/pending-variant-map.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/PendingVoid b/TelepathyQt/PendingVoid new file mode 100644 index 00000000..56d82372 --- /dev/null +++ b/TelepathyQt/PendingVoid @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_PendingVoid_HEADER_GUARD_ +#define _TelepathyQt_PendingVoid_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/simple-pending-operations.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/Presence b/TelepathyQt/Presence new file mode 100644 index 00000000..74638b30 --- /dev/null +++ b/TelepathyQt/Presence @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_Presence_HEADER_GUARD_ +#define _TelepathyQt_Presence_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/presence.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/PresenceSpec b/TelepathyQt/PresenceSpec new file mode 100644 index 00000000..b8ec4448 --- /dev/null +++ b/TelepathyQt/PresenceSpec @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_PresenceSpec_HEADER_GUARD_ +#define _TelepathyQt_PresenceSpec_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/presence.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/PresenceSpecList b/TelepathyQt/PresenceSpecList new file mode 100644 index 00000000..71600307 --- /dev/null +++ b/TelepathyQt/PresenceSpecList @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_PresenceSpecList_HEADER_GUARD_ +#define _TelepathyQt_PresenceSpecList_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/presence.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt4/SimpleObserver b/TelepathyQt/Profile index 8f2a56d8..536856bf 100644 --- a/TelepathyQt4/SimpleObserver +++ b/TelepathyQt/Profile @@ -1,11 +1,11 @@ -#ifndef _TelepathyQt4_SimpleObserver_HEADER_GUARD_ -#define _TelepathyQt4_SimpleObserver_HEADER_GUARD_ +#ifndef _TelepathyQt_Profile_HEADER_GUARD_ +#define _TelepathyQt_Profile_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #define IN_TP_QT_HEADER #endif -#include <TelepathyQt4/simple-observer.h> +#include <TelepathyQt/profile.h> #undef IN_TP_QT_HEADER diff --git a/TelepathyQt/ProfileManager b/TelepathyQt/ProfileManager new file mode 100644 index 00000000..711d5dc0 --- /dev/null +++ b/TelepathyQt/ProfileManager @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ProfileManager_HEADER_GUARD_ +#define _TelepathyQt_ProfileManager_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/profile-manager.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/Properties b/TelepathyQt/Properties new file mode 100644 index 00000000..111f1ad1 --- /dev/null +++ b/TelepathyQt/Properties @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_Properties_HEADER_GUARD_ +#define _TelepathyQt_Properties_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/properties.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/PropertiesInterface b/TelepathyQt/PropertiesInterface new file mode 100644 index 00000000..a34d9109 --- /dev/null +++ b/TelepathyQt/PropertiesInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_PropertiesInterface_HEADER_GUARD_ +#define _TelepathyQt_PropertiesInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/dbus.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/PropertiesInterfaceInterface b/TelepathyQt/PropertiesInterfaceInterface new file mode 100644 index 00000000..4b11dc0c --- /dev/null +++ b/TelepathyQt/PropertiesInterfaceInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_PropertiesInterfaceInterface_HEADER_GUARD_ +#define _TelepathyQt_PropertiesInterfaceInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/properties.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ProtocolInfo b/TelepathyQt/ProtocolInfo new file mode 100644 index 00000000..02398b47 --- /dev/null +++ b/TelepathyQt/ProtocolInfo @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ProtocolInfo_HEADER_GUARD_ +#define _TelepathyQt_ProtocolInfo_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/protocol-info.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ProtocolParameter b/TelepathyQt/ProtocolParameter new file mode 100644 index 00000000..93db0dc4 --- /dev/null +++ b/TelepathyQt/ProtocolParameter @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ProtocolParameter_HEADER_GUARD_ +#define _TelepathyQt_ProtocolParameter_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/protocol-parameter.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ReadinessHelper b/TelepathyQt/ReadinessHelper new file mode 100644 index 00000000..7e3339bd --- /dev/null +++ b/TelepathyQt/ReadinessHelper @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ReadinessHelper_HEADER_GUARD_ +#define _TelepathyQt_ReadinessHelper_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/readiness-helper.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ReadyObject b/TelepathyQt/ReadyObject new file mode 100644 index 00000000..699a7c54 --- /dev/null +++ b/TelepathyQt/ReadyObject @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ReadyObject_HEADER_GUARD_ +#define _TelepathyQt_ReadyObject_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/ready-object.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ReceivedMessage b/TelepathyQt/ReceivedMessage new file mode 100644 index 00000000..ad43afed --- /dev/null +++ b/TelepathyQt/ReceivedMessage @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ReceivedMessage_HEADER_GUARD_ +#define _TelepathyQt_ReceivedMessage_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/message.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/RefCounted b/TelepathyQt/RefCounted new file mode 100644 index 00000000..879d287d --- /dev/null +++ b/TelepathyQt/RefCounted @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_RefCounted_HEADER_GUARD_ +#define _TelepathyQt_RefCounted_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/shared-ptr.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ReferencedHandles b/TelepathyQt/ReferencedHandles new file mode 100644 index 00000000..14c8a125 --- /dev/null +++ b/TelepathyQt/ReferencedHandles @@ -0,0 +1,12 @@ +#ifndef _TelepathyQt_ReferencedHandles_HEADER_GUARD_ +#define _TelepathyQt_ReferencedHandles_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/referenced-handles.h> + +#undef IN_TP_QT_HEADER + +#endif diff --git a/TelepathyQt/ReferencedHandlesIterator b/TelepathyQt/ReferencedHandlesIterator new file mode 100644 index 00000000..7c4eb994 --- /dev/null +++ b/TelepathyQt/ReferencedHandlesIterator @@ -0,0 +1,6 @@ +#ifndef _TelepathyQt_ReferencedHandlesIterator_HEADER_GUARD_ +#define _TelepathyQt_ReferencedHandlesIterator_HEADER_GUARD_ + +#include <TelepathyQt/referenced-handles.h> + +#endif diff --git a/TelepathyQt/RequestableChannelClassSpec b/TelepathyQt/RequestableChannelClassSpec new file mode 100644 index 00000000..404372cd --- /dev/null +++ b/TelepathyQt/RequestableChannelClassSpec @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_RequestableChannelClassSpec_HEADER_GUARD_ +#define _TelepathyQt_RequestableChannelClassSpec_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/requestable-channel-class-spec.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/RequestableChannelClassSpecList b/TelepathyQt/RequestableChannelClassSpecList new file mode 100644 index 00000000..1ab34cb8 --- /dev/null +++ b/TelepathyQt/RequestableChannelClassSpecList @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_RequestableChannelClassSpecList_HEADER_GUARD_ +#define _TelepathyQt_RequestableChannelClassSpecList_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/requestable-channel-class-spec.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt4/AccountManager b/TelepathyQt/RoomListChannel index 370c28ba..b8a66b97 100644 --- a/TelepathyQt4/AccountManager +++ b/TelepathyQt/RoomListChannel @@ -1,11 +1,11 @@ -#ifndef _TelepathyQt4_AccountManager_HEADER_GUARD_ -#define _TelepathyQt4_AccountManager_HEADER_GUARD_ +#ifndef _TelepathyQt_RoomListChannel_HEADER_GUARD_ +#define _TelepathyQt_RoomListChannel_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #define IN_TP_QT_HEADER #endif -#include <TelepathyQt4/account-manager.h> +#include <TelepathyQt/room-list-channel.h> #undef IN_TP_QT_HEADER diff --git a/TelepathyQt/SharedPtr b/TelepathyQt/SharedPtr new file mode 100644 index 00000000..9ecff90c --- /dev/null +++ b/TelepathyQt/SharedPtr @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_SharedPtr_HEADER_GUARD_ +#define _TelepathyQt_SharedPtr_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/shared-ptr.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/SimpleCallObserver b/TelepathyQt/SimpleCallObserver new file mode 100644 index 00000000..e46c423c --- /dev/null +++ b/TelepathyQt/SimpleCallObserver @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_SimpleCallObserver_HEADER_GUARD_ +#define _TelepathyQt_SimpleCallObserver_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/simple-call-observer.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/SimpleObserver b/TelepathyQt/SimpleObserver new file mode 100644 index 00000000..7b984380 --- /dev/null +++ b/TelepathyQt/SimpleObserver @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_SimpleObserver_HEADER_GUARD_ +#define _TelepathyQt_SimpleObserver_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/simple-observer.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/SimpleTextObserver b/TelepathyQt/SimpleTextObserver new file mode 100644 index 00000000..85ffc6ce --- /dev/null +++ b/TelepathyQt/SimpleTextObserver @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_SimpleTextObserver_HEADER_GUARD_ +#define _TelepathyQt_SimpleTextObserver_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/simple-text-observer.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/StatefulDBusProxy b/TelepathyQt/StatefulDBusProxy new file mode 100644 index 00000000..beb6dec7 --- /dev/null +++ b/TelepathyQt/StatefulDBusProxy @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_StatefulDBusProxy_HEADER_GUARD_ +#define _TelepathyQt_StatefulDBusProxy_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/dbus-proxy.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/StatelessDBusProxy b/TelepathyQt/StatelessDBusProxy new file mode 100644 index 00000000..ca5bd535 --- /dev/null +++ b/TelepathyQt/StatelessDBusProxy @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_StatelessDBusProxy_HEADER_GUARD_ +#define _TelepathyQt_StatelessDBusProxy_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/dbus-proxy.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/StreamTubeChannel b/TelepathyQt/StreamTubeChannel new file mode 100644 index 00000000..c541efff --- /dev/null +++ b/TelepathyQt/StreamTubeChannel @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_StreamTubeChannel_HEADER_GUARD_ +#define _TelepathyQt_StreamTubeChannel_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/stream-tube-channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/StreamTubeClient b/TelepathyQt/StreamTubeClient new file mode 100644 index 00000000..8e768358 --- /dev/null +++ b/TelepathyQt/StreamTubeClient @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_StreamTubeClient_HEADER_GUARD_ +#define _TelepathyQt_StreamTubeClient_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/stream-tube-client.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/StreamTubeServer b/TelepathyQt/StreamTubeServer new file mode 100644 index 00000000..f83908f8 --- /dev/null +++ b/TelepathyQt/StreamTubeServer @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_StreamTubeServer_HEADER_GUARD_ +#define _TelepathyQt_StreamTubeServer_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/stream-tube-server.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/StreamedMediaChannel b/TelepathyQt/StreamedMediaChannel new file mode 100644 index 00000000..ea74bd75 --- /dev/null +++ b/TelepathyQt/StreamedMediaChannel @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_StreamedMediaChannel_HEADER_GUARD_ +#define _TelepathyQt_StreamedMediaChannel_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/streamed-media-channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/StreamedMediaStream b/TelepathyQt/StreamedMediaStream new file mode 100644 index 00000000..81f1e6fc --- /dev/null +++ b/TelepathyQt/StreamedMediaStream @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_StreamedMediaStream_HEADER_GUARD_ +#define _TelepathyQt_StreamedMediaStream_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/streamed-media-channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt4/TelepathyQt4-uninstalled.pc.in b/TelepathyQt/TelepathyQt-uninstalled.pc.in index cc8336a0..a1d00985 100644 --- a/TelepathyQt4/TelepathyQt4-uninstalled.pc.in +++ b/TelepathyQt/TelepathyQt-uninstalled.pc.in @@ -3,9 +3,9 @@ exec_prefix=/nonexistent abs_top_builddir=${CMAKE_BINARY_DIR} abs_top_srcdir=${CMAKE_SOURCE_DIR} -Name: Telepathy-Qt4 (uninstalled copy) -Description: Qt4 utility library for the Telepathy framework +Name: Telepathy-Qt (uninstalled copy) +Description: Qt utility library for the Telepathy framework Version: ${PACKAGE_VERSION} Requires.private: QtCore >= 4.5, QtDBus >= 4.5, QtNetwork >= 4.5 -Libs: ${CMAKE_BINARY_DIR}/TelepathyQt4/libtelepathy-qt4.so +Libs: ${CMAKE_BINARY_DIR}/TelepathyQt/libtelepathy-qt.so Cflags: -I${CMAKE_SOURCE_DIR} -I${CMAKE_BINARY_DIR} diff --git a/TelepathyQt4/TelepathyQt4.pc.in b/TelepathyQt/TelepathyQt.pc.in index d3fb6518..a61d6a37 100644 --- a/TelepathyQt4/TelepathyQt4.pc.in +++ b/TelepathyQt/TelepathyQt.pc.in @@ -3,9 +3,9 @@ exec_prefix=${CMAKE_INSTALL_PREFIX} libdir=${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR} includedir=${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR} -Name: Telepathy-Qt4 -Description: Qt4 utility library for the Telepathy framework +Name: Telepathy-Qt +Description: Qt utility library for the Telepathy framework Version: ${PACKAGE_VERSION} Requires.private: QtCore >= 4.5, QtDBus >= 4.5, QtNetwork >= 4.5 -Libs: -L${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR} -ltelepathy-qt4 +Libs: -L${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR} -ltelepathy-qt Cflags: -I${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}/telepathy-1.0 diff --git a/TelepathyQt/TelepathyQtFarsight-uninstalled.pc.in b/TelepathyQt/TelepathyQtFarsight-uninstalled.pc.in new file mode 100644 index 00000000..679ded95 --- /dev/null +++ b/TelepathyQt/TelepathyQtFarsight-uninstalled.pc.in @@ -0,0 +1,11 @@ +prefix=/nonexistent +exec_prefix=/nonexistent +abs_top_builddir=${CMAKE_BINARY_DIR} +abs_top_srcdir=${CMAKE_SOURCE_DIR} + +Name: Telepathy-Qt-Farsight (uninstalled copy) +Description: Qt Telepathy Farsight utility library for the Telepathy framework +Version: ${PACKAGE_VERSION} +Requires.private: QtCore >= 4.5, QtDBus >= 4.5, telepathy-glib >= 0.7.28, telepathy-farsight >= 0.0.4, TelepathyQt = ${PACKAGE_VERSION} +Libs: ${CMAKE_BINARY_DIR}/TelepathyQt/Farsight/libtelepathy-qt-farsight.so +Cflags: -I${CMAKE_SOURCE_DIR} -I${CMAKE_BINARY_DIR} diff --git a/TelepathyQt4/TelepathyQt4Farsight.pc.in b/TelepathyQt/TelepathyQtFarsight.pc.in index 48ef6780..476504cd 100644 --- a/TelepathyQt4/TelepathyQt4Farsight.pc.in +++ b/TelepathyQt/TelepathyQtFarsight.pc.in @@ -3,9 +3,9 @@ exec_prefix=${CMAKE_INSTALL_PREFIX} libdir=${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR} includedir=${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR} -Name: Telepathy-Qt4-Farsight -Description: Qt4 Telepathy Farsight utility library for the Telepathy framework +Name: Telepathy-Qt-Farsight +Description: Qt Telepathy Farsight utility library for the Telepathy framework Version: ${PACKAGE_VERSION} -Requires.private: QtCore >= 4.5, QtDBus >= 4.5, telepathy-glib >= 0.7.28, telepathy-farsight >= 0.0.4, TelepathyQt4 = ${PACKAGE_VERSION} -Libs: -L${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR} -ltelepathy-qt4-farsight +Requires.private: QtCore >= 4.5, QtDBus >= 4.5, telepathy-glib >= 0.7.28, telepathy-farsight >= 0.0.4, TelepathyQt = ${PACKAGE_VERSION} +Libs: -L${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR} -ltelepathy-qt-farsight Cflags: -I${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}/telepathy-1.0 diff --git a/TelepathyQt/TextChannel b/TelepathyQt/TextChannel new file mode 100644 index 00000000..de71a775 --- /dev/null +++ b/TelepathyQt/TextChannel @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_TextChannel_HEADER_GUARD_ +#define _TelepathyQt_TextChannel_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/text-channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/TubeChannel b/TelepathyQt/TubeChannel new file mode 100644 index 00000000..e98f80bb --- /dev/null +++ b/TelepathyQt/TubeChannel @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_TubeChannel_HEADER_GUARD_ +#define _TelepathyQt_TubeChannel_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/tube-channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/Types b/TelepathyQt/Types new file mode 100644 index 00000000..ec49c2d6 --- /dev/null +++ b/TelepathyQt/Types @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_Types_HEADER_GUARD_ +#define _TelepathyQt_Types_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/types.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/Utils b/TelepathyQt/Utils new file mode 100644 index 00000000..6c3283d6 --- /dev/null +++ b/TelepathyQt/Utils @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_Utils_HEADER_GUARD_ +#define _TelepathyQt_Utils_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/utils.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt4/abstract-client.cpp b/TelepathyQt/abstract-client.cpp index 89c6fa01..11a0d74e 100644 --- a/TelepathyQt4/abstract-client.cpp +++ b/TelepathyQt/abstract-client.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2009-2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2009-2010 Nokia Corporation @@ -20,12 +20,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/AbstractClient> +#include <TelepathyQt/AbstractClient> #include <QSharedData> #include <QString> -#include <TelepathyQt4/ChannelClassSpecList> +#include <TelepathyQt/ChannelClassSpecList> namespace Tp { @@ -33,7 +33,7 @@ namespace Tp /** * \class AbstractClient * \ingroup clientclient - * \headerfile TelepathyQt4/abstract-client.h <TelepathyQt4/AbstractClient> + * \headerfile TelepathyQt/abstract-client.h <TelepathyQt/AbstractClient> * * \brief The AbstractClient class represents a Telepathy client. * @@ -105,7 +105,7 @@ struct TP_QT_NO_EXPORT AbstractClientObserver::Private /** * \class AbstractClientObserver * \ingroup clientclient - * \headerfile TelepathyQt4/abstract-client.h <TelepathyQt4/AbstractClientObserver> + * \headerfile TelepathyQt/abstract-client.h <TelepathyQt/AbstractClientObserver> * * \brief The AbstractClientObserver class represents a Telepathy observer. * @@ -200,7 +200,7 @@ struct TP_QT_NO_EXPORT AbstractClientObserver::Private /** * \class AbstractClientObserver::ObserverInfo * \ingroup clientclient - * \headerfile TelepathyQt4/abstract-client.h <TelepathyQt4/AbstractClientObserver> + * \headerfile TelepathyQt/abstract-client.h <TelepathyQt/AbstractClientObserver> * * \brief The AbstractClientObserver::ObserverInfo class provides a wrapper * around the additional info about the channels passed to observeChannels(). @@ -380,7 +380,7 @@ struct TP_QT_NO_EXPORT AbstractClientApprover::Private /** * \class AbstractClientApprover * \ingroup clientclient - * \headerfile TelepathyQt4/abstract-client.h <TelepathyQt4/AbstractClientApprover> + * \headerfile TelepathyQt/abstract-client.h <TelepathyQt/AbstractClientApprover> * * \brief The AbstractClientApprover class represents a Telepathy approver. * @@ -564,7 +564,7 @@ struct TP_QT_NO_EXPORT AbstractClientHandler::Private /** * \class AbstractClientHandler * \ingroup clientclient - * \headerfile TelepathyQt4/abstract-client.h <TelepathyQt4/AbstractClientHandler> + * \headerfile TelepathyQt/abstract-client.h <TelepathyQt/AbstractClientHandler> * * \brief The AbstractClientHandler class represents a Telepathy handler. * @@ -663,7 +663,7 @@ struct TP_QT_NO_EXPORT AbstractClientHandler::Private /** * \class AbstractClientHandler::Capabilities * \ingroup clientclient - * \headerfile TelepathyQt4/abstract-client.h <TelepathyQt4/AbstractClientHandler> + * \headerfile TelepathyQt/abstract-client.h <TelepathyQt/AbstractClientHandler> * * \brief The AbstractClientHandler::Capabilities class provides a wrapper * around the capabilities of a handler. @@ -674,7 +674,7 @@ struct TP_QT_NO_EXPORT AbstractClientHandler::Private /** * \class AbstractClientHandler::HandlerInfo * \ingroup clientclient - * \headerfile TelepathyQt4/abstract-client.h <TelepathyQt4/AbstractClientHandler> + * \headerfile TelepathyQt/abstract-client.h <TelepathyQt/AbstractClientHandler> * * \brief The AbstractClientHandler::HandlerInfo class provides a wrapper * around the additional info about the channels passed to handleChannels(). diff --git a/TelepathyQt4/abstract-client.h b/TelepathyQt/abstract-client.h index 60016117..aef615f6 100644 --- a/TelepathyQt4/abstract-client.h +++ b/TelepathyQt/abstract-client.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2009-2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2009-2010 Nokia Corporation @@ -20,16 +20,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_abstract_client_h_HEADER_GUARD_ -#define _TelepathyQt4_abstract_client_h_HEADER_GUARD_ +#ifndef _TelepathyQt_abstract_client_h_HEADER_GUARD_ +#define _TelepathyQt_abstract_client_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/SharedPtr> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Constants> +#include <TelepathyQt/SharedPtr> +#include <TelepathyQt/Types> #include <QList> #include <QObject> diff --git a/TelepathyQt4/abstract-interface.cpp b/TelepathyQt/abstract-interface.cpp index a93bf3b5..bdaf677b 100644 --- a/TelepathyQt4/abstract-interface.cpp +++ b/TelepathyQt/abstract-interface.cpp @@ -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,18 +20,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/AbstractInterface> +#include <TelepathyQt/AbstractInterface> -#include "TelepathyQt4/_gen/abstract-interface.moc.hpp" +#include "TelepathyQt/_gen/abstract-interface.moc.hpp" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/DBusProxy> -#include <TelepathyQt4/PendingVariant> -#include <TelepathyQt4/PendingVariantMap> -#include <TelepathyQt4/PendingVoid> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Constants> +#include <TelepathyQt/DBusProxy> +#include <TelepathyQt/PendingVariant> +#include <TelepathyQt/PendingVariantMap> +#include <TelepathyQt/PendingVoid> +#include <TelepathyQt/Types> #include <QDBusPendingCall> #include <QDBusVariant> @@ -48,7 +48,7 @@ struct TP_QT_NO_EXPORT AbstractInterface::Private /** * \class AbstractInterface * \ingroup clientsideproxies - * \headerfile TelepathyQt4/abstract-interface.h <TelepathyQt4/AbstractInterface> + * \headerfile TelepathyQt/abstract-interface.h <TelepathyQt/AbstractInterface> * * \brief The AbstractInterface class is the base class for all client side * D-Bus interfaces, allowing access to remote methods/properties/signals. diff --git a/TelepathyQt4/abstract-interface.h b/TelepathyQt/abstract-interface.h index 29f4d36a..53205e07 100644 --- a/TelepathyQt4/abstract-interface.h +++ b/TelepathyQt/abstract-interface.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,14 +20,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_abstract_interface_h_HEADER_GUARD_ -#define _TelepathyQt4_abstract_interface_h_HEADER_GUARD_ +#ifndef _TelepathyQt_abstract_interface_h_HEADER_GUARD_ +#define _TelepathyQt_abstract_interface_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Global> +#include <TelepathyQt/Global> #include <QDBusAbstractInterface> diff --git a/TelepathyQt4/account-capability-filter.dox b/TelepathyQt/account-capability-filter.dox index c4805b88..7148993e 100644 --- a/TelepathyQt4/account-capability-filter.dox +++ b/TelepathyQt/account-capability-filter.dox @@ -1,5 +1,5 @@ /* - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2011 Nokia Corporation @@ -23,7 +23,7 @@ /** * \class Tp::AccountCapabilityFilter * \ingroup utils - * \headerfile TelepathyQt4/account-capability-filter.h <TelepathyQt4/AccountCapabilityFilter> + * \headerfile TelepathyQt/account-capability-filter.h <TelepathyQt/AccountCapabilityFilter> * * \brief The AccountCapabilityFilter class provides a filter object to be used * to filter accounts by capabilities. diff --git a/TelepathyQt4/account-capability-filter.h b/TelepathyQt/account-capability-filter.h index 649d5bd1..b5d3cdaa 100644 --- a/TelepathyQt4/account-capability-filter.h +++ b/TelepathyQt/account-capability-filter.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,14 +20,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_account_capability_filter_h_HEADER_GUARD_ -#define _TelepathyQt4_account_capability_filter_h_HEADER_GUARD_ +#ifndef _TelepathyQt_account_capability_filter_h_HEADER_GUARD_ +#define _TelepathyQt_account_capability_filter_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/GenericCapabilityFilter> +#include <TelepathyQt/GenericCapabilityFilter> namespace Tp { diff --git a/TelepathyQt4/account-factory.cpp b/TelepathyQt/account-factory.cpp index 12efd65c..4f76278e 100644 --- a/TelepathyQt4/account-factory.cpp +++ b/TelepathyQt/account-factory.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,11 +20,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/AccountFactory> +#include <TelepathyQt/AccountFactory> -#include "TelepathyQt4/_gen/account-factory.moc.hpp" +#include "TelepathyQt/_gen/account-factory.moc.hpp" -#include <TelepathyQt4/Account> +#include <TelepathyQt/Account> namespace Tp { @@ -32,7 +32,7 @@ namespace Tp /** * \class AccountFactory * \ingroup utils - * \headerfile TelepathyQt4/account-factory.h <TelepathyQt4/AccountFactory> + * \headerfile TelepathyQt/account-factory.h <TelepathyQt/AccountFactory> * * \brief The AccountFactory class is responsible for constructing Account * objects according to application-defined settings. diff --git a/TelepathyQt4/account-factory.h b/TelepathyQt/account-factory.h index 10826892..cb59f129 100644 --- a/TelepathyQt4/account-factory.h +++ b/TelepathyQt/account-factory.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,20 +20,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_account_factory_h_HEADER_GUARD_ -#define _TelepathyQt4_account_factory_h_HEADER_GUARD_ +#ifndef _TelepathyQt_account_factory_h_HEADER_GUARD_ +#define _TelepathyQt_account_factory_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Global> -#include <TelepathyQt4/SharedPtr> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Global> +#include <TelepathyQt/SharedPtr> +#include <TelepathyQt/Types> -#include <TelepathyQt4/Account> -#include <TelepathyQt4/Feature> -#include <TelepathyQt4/FixedFeatureFactory> +#include <TelepathyQt/Account> +#include <TelepathyQt/Feature> +#include <TelepathyQt/FixedFeatureFactory> class QDBusConnection; diff --git a/TelepathyQt4/account-filter.h b/TelepathyQt/account-filter.h index 59cf43f4..cc13c52e 100644 --- a/TelepathyQt4/account-filter.h +++ b/TelepathyQt/account-filter.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,14 +20,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_account_filter_h_HEADER_GUARD_ -#define _TelepathyQt4_account_filter_h_HEADER_GUARD_ +#ifndef _TelepathyQt_account_filter_h_HEADER_GUARD_ +#define _TelepathyQt_account_filter_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Filter> +#include <TelepathyQt/Filter> namespace Tp { diff --git a/TelepathyQt4/account-manager.cpp b/TelepathyQt/account-manager.cpp index 87ee732f..025301ab 100644 --- a/TelepathyQt4/account-manager.cpp +++ b/TelepathyQt/account-manager.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008-2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008-2010 Nokia Corporation @@ -20,22 +20,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/AccountManager> +#include <TelepathyQt/AccountManager> -#include "TelepathyQt4/_gen/account-manager.moc.hpp" -#include "TelepathyQt4/_gen/cli-account-manager.moc.hpp" -#include "TelepathyQt4/_gen/cli-account-manager-body.hpp" +#include "TelepathyQt/_gen/account-manager.moc.hpp" +#include "TelepathyQt/_gen/cli-account-manager.moc.hpp" +#include "TelepathyQt/_gen/cli-account-manager-body.hpp" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/AccountCapabilityFilter> -#include <TelepathyQt4/AccountFilter> -#include <TelepathyQt4/AccountSet> -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/PendingAccount> -#include <TelepathyQt4/PendingComposite> -#include <TelepathyQt4/PendingReady> -#include <TelepathyQt4/ReadinessHelper> +#include <TelepathyQt/AccountCapabilityFilter> +#include <TelepathyQt/AccountFilter> +#include <TelepathyQt/AccountSet> +#include <TelepathyQt/Constants> +#include <TelepathyQt/PendingAccount> +#include <TelepathyQt/PendingComposite> +#include <TelepathyQt/PendingReady> +#include <TelepathyQt/ReadinessHelper> #include <QQueue> #include <QSet> @@ -232,7 +232,7 @@ void AccountManager::Private::addAccountForPath(const QString &path) /** * \class AccountManager * \ingroup clientam - * \headerfile TelepathyQt4/account-manager.h <TelepathyQt4/AccountManager> + * \headerfile TelepathyQt/account-manager.h <TelepathyQt/AccountManager> * * \brief The AccountManager class represents a Telepathy account manager. * diff --git a/TelepathyQt4/account-manager.h b/TelepathyQt/account-manager.h index 69a3c24d..53ab2cd7 100644 --- a/TelepathyQt4/account-manager.h +++ b/TelepathyQt/account-manager.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008-2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008-2010 Nokia Corporation @@ -20,25 +20,25 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_account_manager_h_HEADER_GUARD_ -#define _TelepathyQt4_account_manager_h_HEADER_GUARD_ +#ifndef _TelepathyQt_account_manager_h_HEADER_GUARD_ +#define _TelepathyQt_account_manager_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/_gen/cli-account-manager.h> - -#include <TelepathyQt4/Account> -#include <TelepathyQt4/AccountFactory> -#include <TelepathyQt4/ChannelFactory> -#include <TelepathyQt4/ConnectionFactory> -#include <TelepathyQt4/ContactFactory> -#include <TelepathyQt4/StatelessDBusProxy> -#include <TelepathyQt4/Filter> -#include <TelepathyQt4/OptionalInterfaceFactory> -#include <TelepathyQt4/SharedPtr> -#include <TelepathyQt4/Types> +#include <TelepathyQt/_gen/cli-account-manager.h> + +#include <TelepathyQt/Account> +#include <TelepathyQt/AccountFactory> +#include <TelepathyQt/ChannelFactory> +#include <TelepathyQt/ConnectionFactory> +#include <TelepathyQt/ContactFactory> +#include <TelepathyQt/StatelessDBusProxy> +#include <TelepathyQt/Filter> +#include <TelepathyQt/OptionalInterfaceFactory> +#include <TelepathyQt/SharedPtr> +#include <TelepathyQt/Types> #include <QDBusObjectPath> #include <QSet> diff --git a/TelepathyQt4/account-manager.xml b/TelepathyQt/account-manager.xml index 278f4276..278f4276 100644 --- a/TelepathyQt4/account-manager.xml +++ b/TelepathyQt/account-manager.xml diff --git a/TelepathyQt4/account-property-filter.cpp b/TelepathyQt/account-property-filter.cpp index f4eec408..10c5ba77 100644 --- a/TelepathyQt4/account-property-filter.cpp +++ b/TelepathyQt/account-property-filter.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,9 +20,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/AccountPropertyFilter> +#include <TelepathyQt/AccountPropertyFilter> -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" #include <QLatin1String> #include <QStringList> @@ -52,7 +52,7 @@ QStringList AccountPropertyFilter::Private::supportedAccountProperties; /** * \class Tp::AccountPropertyFilter * \ingroup utils - * \headerfile TelepathyQt4/account-property-filter.h <TelepathyQt4/AccountPropertyFilter> + * \headerfile TelepathyQt/account-property-filter.h <TelepathyQt/AccountPropertyFilter> * * \brief The AccountPropertyFilter class provides a filter object to be used * to filter accounts by properties. diff --git a/TelepathyQt4/account-property-filter.h b/TelepathyQt/account-property-filter.h index 97864cb1..5694831e 100644 --- a/TelepathyQt4/account-property-filter.h +++ b/TelepathyQt/account-property-filter.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,16 +20,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_account_property_filter_h_HEADER_GUARD_ -#define _TelepathyQt4_account_property_filter_h_HEADER_GUARD_ +#ifndef _TelepathyQt_account_property_filter_h_HEADER_GUARD_ +#define _TelepathyQt_account_property_filter_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Account> -#include <TelepathyQt4/GenericPropertyFilter> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Account> +#include <TelepathyQt/GenericPropertyFilter> +#include <TelepathyQt/Types> namespace Tp { diff --git a/TelepathyQt4/account-set-internal.h b/TelepathyQt/account-set-internal.h index 44f44512..f7dbf9e0 100644 --- a/TelepathyQt4/account-set-internal.h +++ b/TelepathyQt/account-set-internal.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/AccountPropertyFilter> +#include <TelepathyQt/AccountPropertyFilter> namespace Tp { diff --git a/TelepathyQt4/account-set.cpp b/TelepathyQt/account-set.cpp index c6fc086e..fce92a39 100644 --- a/TelepathyQt4/account-set.cpp +++ b/TelepathyQt/account-set.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,19 +20,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/AccountSet> -#include "TelepathyQt4/account-set-internal.h" +#include <TelepathyQt/AccountSet> +#include "TelepathyQt/account-set-internal.h" -#include "TelepathyQt4/_gen/account-set.moc.hpp" -#include "TelepathyQt4/_gen/account-set-internal.moc.hpp" +#include "TelepathyQt/_gen/account-set.moc.hpp" +#include "TelepathyQt/_gen/account-set-internal.moc.hpp" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/Account> -#include <TelepathyQt4/AccountFilter> -#include <TelepathyQt4/AccountManager> -#include <TelepathyQt4/ConnectionCapabilities> -#include <TelepathyQt4/ConnectionManager> +#include <TelepathyQt/Account> +#include <TelepathyQt/AccountFilter> +#include <TelepathyQt/AccountManager> +#include <TelepathyQt/ConnectionCapabilities> +#include <TelepathyQt/ConnectionManager> namespace Tp { @@ -196,7 +196,7 @@ void AccountSet::Private::AccountWrapper::onAccountCapalitiesChanged( /** * \class AccountSet * \ingroup clientaccount - * \headerfile TelepathyQt4/account-set.h <TelepathyQt4/AccountSet> + * \headerfile TelepathyQt/account-set.h <TelepathyQt/AccountSet> * * \brief The AccountSet class represents a set of Telepathy accounts * filtered by a given criteria. diff --git a/TelepathyQt4/account-set.h b/TelepathyQt/account-set.h index d2b5652e..40dd79af 100644 --- a/TelepathyQt4/account-set.h +++ b/TelepathyQt/account-set.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,16 +20,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_account_set_h_HEADER_GUARD_ -#define _TelepathyQt4_account_set_h_HEADER_GUARD_ +#ifndef _TelepathyQt_account_set_h_HEADER_GUARD_ +#define _TelepathyQt_account_set_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Filter> -#include <TelepathyQt4/Object> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Filter> +#include <TelepathyQt/Object> +#include <TelepathyQt/Types> #include <QList> #include <QString> diff --git a/TelepathyQt4/account.cpp b/TelepathyQt/account.cpp index 009e4956..e9c864a2 100644 --- a/TelepathyQt4/account.cpp +++ b/TelepathyQt/account.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008 Nokia Corporation @@ -20,33 +20,33 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/Account> +#include <TelepathyQt/Account> -#include "TelepathyQt4/_gen/account.moc.hpp" -#include "TelepathyQt4/_gen/cli-account.moc.hpp" -#include "TelepathyQt4/_gen/cli-account-body.hpp" +#include "TelepathyQt/_gen/account.moc.hpp" +#include "TelepathyQt/_gen/cli-account.moc.hpp" +#include "TelepathyQt/_gen/cli-account-body.hpp" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" -#include "TelepathyQt4/connection-internal.h" +#include "TelepathyQt/connection-internal.h" -#include <TelepathyQt4/AccountManager> -#include <TelepathyQt4/Channel> -#include <TelepathyQt4/ChannelDispatcherInterface> -#include <TelepathyQt4/ConnectionCapabilities> -#include <TelepathyQt4/ConnectionLowlevel> -#include <TelepathyQt4/ConnectionManager> -#include <TelepathyQt4/PendingChannel> -#include <TelepathyQt4/PendingChannelRequest> -#include <TelepathyQt4/PendingFailure> -#include <TelepathyQt4/PendingReady> -#include <TelepathyQt4/PendingStringList> -#include <TelepathyQt4/PendingVariant> -#include <TelepathyQt4/PendingVoid> -#include <TelepathyQt4/Profile> -#include <TelepathyQt4/ReferencedHandles> -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/Debug> +#include <TelepathyQt/AccountManager> +#include <TelepathyQt/Channel> +#include <TelepathyQt/ChannelDispatcherInterface> +#include <TelepathyQt/ConnectionCapabilities> +#include <TelepathyQt/ConnectionLowlevel> +#include <TelepathyQt/ConnectionManager> +#include <TelepathyQt/PendingChannel> +#include <TelepathyQt/PendingChannelRequest> +#include <TelepathyQt/PendingFailure> +#include <TelepathyQt/PendingReady> +#include <TelepathyQt/PendingStringList> +#include <TelepathyQt/PendingVariant> +#include <TelepathyQt/PendingVoid> +#include <TelepathyQt/Profile> +#include <TelepathyQt/ReferencedHandles> +#include <TelepathyQt/Constants> +#include <TelepathyQt/Debug> #include <QQueue> #include <QRegExp> @@ -682,7 +682,7 @@ QMap<QString, QSharedPointer<Account::Private::DispatcherContext> > Account::Pri /** * \class Account * \ingroup clientaccount - * \headerfile TelepathyQt4/account.h <TelepathyQt4/Account> + * \headerfile TelepathyQt/account.h <TelepathyQt/Account> * * \brief The Account class represents a Telepathy account. * diff --git a/TelepathyQt4/account.h b/TelepathyQt/account.h index d514fd22..4ca2d8fe 100644 --- a/TelepathyQt4/account.h +++ b/TelepathyQt/account.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008 Nokia Corporation @@ -20,33 +20,33 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_account_h_HEADER_GUARD_ -#define _TelepathyQt4_account_h_HEADER_GUARD_ +#ifndef _TelepathyQt_account_h_HEADER_GUARD_ +#define _TelepathyQt_account_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/_gen/cli-account.h> - -#include <TelepathyQt4/ChannelRequestHints> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/ConnectionCapabilities> -#include <TelepathyQt4/ConnectionFactory> -#include <TelepathyQt4/ContactFactory> -#include <TelepathyQt4/ChannelFactory> -#include <TelepathyQt4/ChannelDispatcherInterface> -#include <TelepathyQt4/DBus> -#include <TelepathyQt4/DBusProxy> -#include <TelepathyQt4/FileTransferChannelCreationProperties> -#include <TelepathyQt4/OptionalInterfaceFactory> -#include <TelepathyQt4/Presence> -#include <TelepathyQt4/PresenceSpec> -#include <TelepathyQt4/ProtocolInfo> -#include <TelepathyQt4/ReadinessHelper> -#include <TelepathyQt4/Types> -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/SharedPtr> +#include <TelepathyQt/_gen/cli-account.h> + +#include <TelepathyQt/ChannelRequestHints> +#include <TelepathyQt/Connection> +#include <TelepathyQt/ConnectionCapabilities> +#include <TelepathyQt/ConnectionFactory> +#include <TelepathyQt/ContactFactory> +#include <TelepathyQt/ChannelFactory> +#include <TelepathyQt/ChannelDispatcherInterface> +#include <TelepathyQt/DBus> +#include <TelepathyQt/DBusProxy> +#include <TelepathyQt/FileTransferChannelCreationProperties> +#include <TelepathyQt/OptionalInterfaceFactory> +#include <TelepathyQt/Presence> +#include <TelepathyQt/PresenceSpec> +#include <TelepathyQt/ProtocolInfo> +#include <TelepathyQt/ReadinessHelper> +#include <TelepathyQt/Types> +#include <TelepathyQt/Constants> +#include <TelepathyQt/SharedPtr> #include <QSet> #include <QString> diff --git a/TelepathyQt4/account.xml b/TelepathyQt/account.xml index 1cc5b2a1..1cc5b2a1 100644 --- a/TelepathyQt4/account.xml +++ b/TelepathyQt/account.xml diff --git a/TelepathyQt4/and-filter.dox b/TelepathyQt/and-filter.dox index 47d6e52e..85e8c304 100644 --- a/TelepathyQt4/and-filter.dox +++ b/TelepathyQt/and-filter.dox @@ -1,5 +1,5 @@ /* - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2011 Nokia Corporation @@ -23,7 +23,7 @@ /** * \class Tp::AndFilter * \ingroup utils - * \headerfile TelepathyQt4/and-filter.h <TelepathyQt4/AndFilter> + * \headerfile TelepathyQt/and-filter.h <TelepathyQt/AndFilter> * * \brief The AndFilter class provides a generic filter object to be used * in conjunction of other filters. diff --git a/TelepathyQt4/and-filter.h b/TelepathyQt/and-filter.h index 3e25bb21..4e27ea18 100644 --- a/TelepathyQt4/and-filter.h +++ b/TelepathyQt/and-filter.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,15 +20,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_and_filter_h_HEADER_GUARD_ -#define _TelepathyQt4_and_filter_h_HEADER_GUARD_ +#ifndef _TelepathyQt_and_filter_h_HEADER_GUARD_ +#define _TelepathyQt_and_filter_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Filter> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Filter> +#include <TelepathyQt/Types> namespace Tp { diff --git a/TelepathyQt4/async-model.dox b/TelepathyQt/async-model.dox index f849272b..e2dac6da 100644 --- a/TelepathyQt4/async-model.dox +++ b/TelepathyQt/async-model.dox @@ -1,5 +1,5 @@ /* - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008 Nokia Corporation diff --git a/TelepathyQt4/avatar.cpp b/TelepathyQt/avatar.cpp index 1acc6e1b..f7fd17ec 100644 --- a/TelepathyQt4/avatar.cpp +++ b/TelepathyQt/avatar.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2011 Nokia Corporation @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/AvatarSpec> +#include <TelepathyQt/AvatarSpec> namespace Tp { @@ -28,7 +28,7 @@ namespace Tp /** * \class AvatarData * \ingroup wrappers - * \headerfile TelepathyQt4/avatar.h <TelepathyQt4/AvatarData> + * \headerfile TelepathyQt/avatar.h <TelepathyQt/AvatarData> * * \brief The AvatarData class represents a Telepathy avatar. */ @@ -63,7 +63,7 @@ struct TP_QT_NO_EXPORT AvatarSpec::Private : public QSharedData /** * \class AvatarSpec * \ingroup wrappers - * \headerfile TelepathyQt4/avatar.h <TelepathyQt4/AvatarSpec> + * \headerfile TelepathyQt/avatar.h <TelepathyQt/AvatarSpec> * * \brief The AvatarSpec class represents a Telepathy avatar information * supported by a protocol. diff --git a/TelepathyQt4/avatar.h b/TelepathyQt/avatar.h index 49c6645d..c48d3fd1 100644 --- a/TelepathyQt4/avatar.h +++ b/TelepathyQt/avatar.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010-2011 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010-2011 Nokia Corporation @@ -20,14 +20,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_avatar_h_HEADER_GUARD_ -#define _TelepathyQt4_avatar_h_HEADER_GUARD_ +#ifndef _TelepathyQt_avatar_h_HEADER_GUARD_ +#define _TelepathyQt_avatar_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Global> +#include <TelepathyQt/Global> #include <QSharedDataPointer> #include <QString> diff --git a/TelepathyQt4/capabilities-base.cpp b/TelepathyQt/capabilities-base.cpp index de77ceaf..c55f8850 100644 --- a/TelepathyQt4/capabilities-base.cpp +++ b/TelepathyQt/capabilities-base.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2009-2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2009-2010 Nokia Corporation @@ -20,10 +20,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/CapabilitiesBase> +#include <TelepathyQt/CapabilitiesBase> -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Constants> +#include <TelepathyQt/Types> namespace Tp { @@ -52,7 +52,7 @@ CapabilitiesBase::Private::Private(const RequestableChannelClassSpecList &rccSpe /** * \class CapabilitiesBase * \ingroup clientconn - * \headerfile TelepathyQt4/capabilities-base.h <TelepathyQt4/CapabilitiesBase> + * \headerfile TelepathyQt/capabilities-base.h <TelepathyQt/CapabilitiesBase> * * \brief The CapabilitiesBase class represents the capabilities a Connection * or a Contact supports. diff --git a/TelepathyQt4/capabilities-base.h b/TelepathyQt/capabilities-base.h index a2947839..a2af63fb 100644 --- a/TelepathyQt4/capabilities-base.h +++ b/TelepathyQt/capabilities-base.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2009-2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2009-2010 Nokia Corporation @@ -20,15 +20,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_capabilities_base_h_HEADER_GUARD_ -#define _TelepathyQt4_capabilities_base_h_HEADER_GUARD_ +#ifndef _TelepathyQt_capabilities_base_h_HEADER_GUARD_ +#define _TelepathyQt_capabilities_base_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/RequestableChannelClassSpec> -#include <TelepathyQt4/Types> +#include <TelepathyQt/RequestableChannelClassSpec> +#include <TelepathyQt/Types> namespace Tp { diff --git a/TelepathyQt4/channel-class-features.h b/TelepathyQt/channel-class-features.h index 87c283ce..bd03117e 100644 --- a/TelepathyQt4/channel-class-features.h +++ b/TelepathyQt/channel-class-features.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2011 Nokia Corporation @@ -20,15 +20,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_channel_class_features_h_HEADER_GUARD_ -#define _TelepathyQt4_channel_class_features_h_HEADER_GUARD_ +#ifndef _TelepathyQt_channel_class_features_h_HEADER_GUARD_ +#define _TelepathyQt_channel_class_features_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/ChannelClassSpec> -#include <TelepathyQt4/Features> +#include <TelepathyQt/ChannelClassSpec> +#include <TelepathyQt/Features> #include <QMetaType> #include <QPair> diff --git a/TelepathyQt4/channel-class-spec.cpp b/TelepathyQt/channel-class-spec.cpp index 3c10a261..86083727 100644 --- a/TelepathyQt4/channel-class-spec.cpp +++ b/TelepathyQt/channel-class-spec.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,11 +20,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/ChannelClassSpec> +#include <TelepathyQt/ChannelClassSpec> -#include "TelepathyQt4/_gen/future-constants.h" +#include "TelepathyQt/_gen/future-constants.h" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" namespace Tp { @@ -37,7 +37,7 @@ struct TP_QT_NO_EXPORT ChannelClassSpec::Private : public QSharedData /** * \class ChannelClassSpec * \ingroup wrappers - * \headerfile TelepathyQt4/channel-class-spec.h <TelepathyQt4/ChannelClassSpec> + * \headerfile TelepathyQt/channel-class-spec.h <TelepathyQt/ChannelClassSpec> * * \brief The ChannelClassSpec class represents a Telepathy channel class. */ @@ -547,7 +547,7 @@ ChannelClassSpec ChannelClassSpec::contactSearch(const QVariantMap &additionalPr /** * \class ChannelClassSpecList * \ingroup wrappers - * \headerfile TelepathyQt4/channel-class-spec.h <TelepathyQt4/ChannelClassSpecList> + * \headerfile TelepathyQt/channel-class-spec.h <TelepathyQt/ChannelClassSpecList> * * \brief The ChannelClassSpecList class represents a list of ChannelClassSpec. */ diff --git a/TelepathyQt4/channel-class-spec.h b/TelepathyQt/channel-class-spec.h index 49e92bc2..5b8bf357 100644 --- a/TelepathyQt4/channel-class-spec.h +++ b/TelepathyQt/channel-class-spec.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,16 +20,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_channel_class_spec_h_HEADER_GUARD_ -#define _TelepathyQt4_channel_class_spec_h_HEADER_GUARD_ +#ifndef _TelepathyQt_channel_class_spec_h_HEADER_GUARD_ +#define _TelepathyQt_channel_class_spec_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/Global> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Constants> +#include <TelepathyQt/Global> +#include <TelepathyQt/Types> #include <QSharedDataPointer> #include <QVariant> diff --git a/TelepathyQt4/channel-dispatch-operation-internal.h b/TelepathyQt/channel-dispatch-operation-internal.h index 78024ba5..7eef7253 100644 --- a/TelepathyQt4/channel-dispatch-operation-internal.h +++ b/TelepathyQt/channel-dispatch-operation-internal.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2011 Nokia Corporation @@ -20,11 +20,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_channel_dispatch_operation_internal_h_HEADER_GUARD_ -#define _TelepathyQt4_channel_dispatch_operation_internal_h_HEADER_GUARD_ +#ifndef _TelepathyQt_channel_dispatch_operation_internal_h_HEADER_GUARD_ +#define _TelepathyQt_channel_dispatch_operation_internal_h_HEADER_GUARD_ -#include <TelepathyQt4/AbstractClientHandler> -#include <TelepathyQt4/PendingOperation> +#include <TelepathyQt/AbstractClientHandler> +#include <TelepathyQt/PendingOperation> namespace Tp { diff --git a/TelepathyQt4/channel-dispatch-operation.cpp b/TelepathyQt/channel-dispatch-operation.cpp index 6c1367a8..a24dbcb3 100644 --- a/TelepathyQt4/channel-dispatch-operation.cpp +++ b/TelepathyQt/channel-dispatch-operation.cpp @@ -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,27 +20,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/ChannelDispatchOperation> -#include "TelepathyQt4/channel-dispatch-operation-internal.h" +#include <TelepathyQt/ChannelDispatchOperation> +#include "TelepathyQt/channel-dispatch-operation-internal.h" -#include "TelepathyQt4/_gen/cli-channel-dispatch-operation-body.hpp" -#include "TelepathyQt4/_gen/cli-channel-dispatch-operation.moc.hpp" -#include "TelepathyQt4/_gen/channel-dispatch-operation.moc.hpp" -#include "TelepathyQt4/_gen/channel-dispatch-operation-internal.moc.hpp" +#include "TelepathyQt/_gen/cli-channel-dispatch-operation-body.hpp" +#include "TelepathyQt/_gen/cli-channel-dispatch-operation.moc.hpp" +#include "TelepathyQt/_gen/channel-dispatch-operation.moc.hpp" +#include "TelepathyQt/_gen/channel-dispatch-operation-internal.moc.hpp" -#include "TelepathyQt4/debug-internal.h" -#include "TelepathyQt4/fake-handler-manager-internal.h" +#include "TelepathyQt/debug-internal.h" +#include "TelepathyQt/fake-handler-manager-internal.h" -#include <TelepathyQt4/Account> -#include <TelepathyQt4/AccountFactory> -#include <TelepathyQt4/Channel> -#include <TelepathyQt4/ChannelFactory> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/ConnectionFactory> -#include <TelepathyQt4/ContactFactory> -#include <TelepathyQt4/PendingComposite> -#include <TelepathyQt4/PendingReady> -#include <TelepathyQt4/PendingVoid> +#include <TelepathyQt/Account> +#include <TelepathyQt/AccountFactory> +#include <TelepathyQt/Channel> +#include <TelepathyQt/ChannelFactory> +#include <TelepathyQt/Connection> +#include <TelepathyQt/ConnectionFactory> +#include <TelepathyQt/ContactFactory> +#include <TelepathyQt/PendingComposite> +#include <TelepathyQt/PendingReady> +#include <TelepathyQt/PendingVoid> #include <QPointer> @@ -257,7 +257,7 @@ void ChannelDispatchOperation::PendingClaim::onClaimFinished( /** * \class ChannelDispatchOperation * \ingroup clientchanneldispatchoperation - * \headerfile TelepathyQt4/channel-dispatch-operation.h <TelepathyQt4/ChannelDispatchOperation> + * \headerfile TelepathyQt/channel-dispatch-operation.h <TelepathyQt/ChannelDispatchOperation> * * \brief The ChannelDispatchOperation class represents a Telepathy channel * dispatch operation. diff --git a/TelepathyQt4/channel-dispatch-operation.h b/TelepathyQt/channel-dispatch-operation.h index 59a54aac..9d319d23 100644 --- a/TelepathyQt4/channel-dispatch-operation.h +++ b/TelepathyQt/channel-dispatch-operation.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,23 +20,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_channel_dispatch_operation_h_HEADER_GUARD_ -#define _TelepathyQt4_channel_dispatch_operation_h_HEADER_GUARD_ +#ifndef _TelepathyQt_channel_dispatch_operation_h_HEADER_GUARD_ +#define _TelepathyQt_channel_dispatch_operation_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/_gen/cli-channel-dispatch-operation.h> +#include <TelepathyQt/_gen/cli-channel-dispatch-operation.h> -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/DBus> -#include <TelepathyQt4/DBusProxy> -#include <TelepathyQt4/Feature> -#include <TelepathyQt4/OptionalInterfaceFactory> -#include <TelepathyQt4/ReadinessHelper> -#include <TelepathyQt4/Types> -#include <TelepathyQt4/SharedPtr> +#include <TelepathyQt/Constants> +#include <TelepathyQt/DBus> +#include <TelepathyQt/DBusProxy> +#include <TelepathyQt/Feature> +#include <TelepathyQt/OptionalInterfaceFactory> +#include <TelepathyQt/ReadinessHelper> +#include <TelepathyQt/Types> +#include <TelepathyQt/SharedPtr> #include <QString> #include <QStringList> diff --git a/TelepathyQt4/channel-dispatch-operation.xml b/TelepathyQt/channel-dispatch-operation.xml index d7a6cdda..d7a6cdda 100644 --- a/TelepathyQt4/channel-dispatch-operation.xml +++ b/TelepathyQt/channel-dispatch-operation.xml diff --git a/TelepathyQt4/channel-dispatcher.cpp b/TelepathyQt/channel-dispatcher.cpp index 6e034410..b86b617a 100644 --- a/TelepathyQt4/channel-dispatcher.cpp +++ b/TelepathyQt/channel-dispatcher.cpp @@ -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,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/ChannelDispatcher> +#include <TelepathyQt/ChannelDispatcher> -#include "TelepathyQt4/_gen/cli-channel-dispatcher-body.hpp" -#include "TelepathyQt4/_gen/cli-channel-dispatcher.moc.hpp" +#include "TelepathyQt/_gen/cli-channel-dispatcher-body.hpp" +#include "TelepathyQt/_gen/cli-channel-dispatcher.moc.hpp" diff --git a/TelepathyQt4/channel-dispatcher.h b/TelepathyQt/channel-dispatcher.h index db03c2e9..d94284e9 100644 --- a/TelepathyQt4/channel-dispatcher.h +++ b/TelepathyQt/channel-dispatcher.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,13 +20,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_channel_dispatcher_h_HEADER_GUARD_ -#define _TelepathyQt4_channel_dispatcher_h_HEADER_GUARD_ +#ifndef _TelepathyQt_channel_dispatcher_h_HEADER_GUARD_ +#define _TelepathyQt_channel_dispatcher_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/_gen/cli-channel-dispatcher.h> +#include <TelepathyQt/_gen/cli-channel-dispatcher.h> #endif diff --git a/TelepathyQt4/channel-dispatcher.xml b/TelepathyQt/channel-dispatcher.xml index a1588a42..a1588a42 100644 --- a/TelepathyQt4/channel-dispatcher.xml +++ b/TelepathyQt/channel-dispatcher.xml diff --git a/TelepathyQt4/channel-factory.cpp b/TelepathyQt/channel-factory.cpp index 7d418b3d..10bf4cbd 100644 --- a/TelepathyQt4/channel-factory.cpp +++ b/TelepathyQt/channel-factory.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2009-2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2009-2010 Nokia Corporation @@ -20,29 +20,29 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/ChannelFactory> +#include <TelepathyQt/ChannelFactory> -#include "TelepathyQt4/_gen/channel-factory.moc.hpp" +#include "TelepathyQt/_gen/channel-factory.moc.hpp" -#include "TelepathyQt4/_gen/future-constants.h" +#include "TelepathyQt/_gen/future-constants.h" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/Channel> -#include <TelepathyQt4/ChannelClassSpec> -#include <TelepathyQt4/ChannelClassFeatures> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/ContactSearchChannel> -#include <TelepathyQt4/FileTransferChannel> -#include <TelepathyQt4/IncomingFileTransferChannel> -#include <TelepathyQt4/IncomingStreamTubeChannel> -#include <TelepathyQt4/OutgoingFileTransferChannel> -#include <TelepathyQt4/OutgoingStreamTubeChannel> -#include <TelepathyQt4/RoomListChannel> -#include <TelepathyQt4/StreamTubeChannel> -#include <TelepathyQt4/StreamedMediaChannel> -#include <TelepathyQt4/TextChannel> +#include <TelepathyQt/Channel> +#include <TelepathyQt/ChannelClassSpec> +#include <TelepathyQt/ChannelClassFeatures> +#include <TelepathyQt/Connection> +#include <TelepathyQt/Constants> +#include <TelepathyQt/ContactSearchChannel> +#include <TelepathyQt/FileTransferChannel> +#include <TelepathyQt/IncomingFileTransferChannel> +#include <TelepathyQt/IncomingStreamTubeChannel> +#include <TelepathyQt/OutgoingFileTransferChannel> +#include <TelepathyQt/OutgoingStreamTubeChannel> +#include <TelepathyQt/RoomListChannel> +#include <TelepathyQt/StreamTubeChannel> +#include <TelepathyQt/StreamedMediaChannel> +#include <TelepathyQt/TextChannel> namespace Tp { @@ -64,7 +64,7 @@ ChannelFactory::Private::Private() /** * \class ChannelFactory * \ingroup utils - * \headerfile TelepathyQt4/channel-factory.h <TelepathyQt4/ChannelFactory> + * \headerfile TelepathyQt/channel-factory.h <TelepathyQt/ChannelFactory> * * \brief The ChannelFactory class is responsible for constructing Channel * objects according to application-defined settings. @@ -73,7 +73,7 @@ ChannelFactory::Private::Private() /** * Create a new ChannelFactory object. * - * The returned factory will construct channel subclasses provided by TelepathyQt4 as appropriate + * The returned factory will construct channel subclasses provided by TelepathyQt as appropriate * for the channel immutable properties, but not make any features ready. * * \param bus The QDBusConnection the proxies constructed using this factory should use. @@ -87,7 +87,7 @@ ChannelFactoryPtr ChannelFactory::create(const QDBusConnection &bus) /** * Construct a new ChannelFactory object. * - * The constructed factory will construct channel subclasses provided by TelepathyQt4 as appropriate + * The constructed factory will construct channel subclasses provided by TelepathyQt as appropriate * for the channel immutable properties, but not make any features ready. * * \param bus The QDBusConnection the proxies constructed using this factory should use. diff --git a/TelepathyQt4/channel-factory.h b/TelepathyQt/channel-factory.h index 6ef20c6f..52503369 100644 --- a/TelepathyQt4/channel-factory.h +++ b/TelepathyQt/channel-factory.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2009-2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2009-2010 Nokia Corporation @@ -20,16 +20,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_channel_factory_h_HEADER_GUARD_ -#define _TelepathyQt4_channel_factory_h_HEADER_GUARD_ +#ifndef _TelepathyQt_channel_factory_h_HEADER_GUARD_ +#define _TelepathyQt_channel_factory_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/DBusProxyFactory> -#include <TelepathyQt4/SharedPtr> -#include <TelepathyQt4/Types> +#include <TelepathyQt/DBusProxyFactory> +#include <TelepathyQt/SharedPtr> +#include <TelepathyQt/Types> // For Q_DISABLE_COPY #include <QtGlobal> diff --git a/TelepathyQt4/channel-internal.h b/TelepathyQt/channel-internal.h index 99c6cbdb..ff5641f0 100644 --- a/TelepathyQt4/channel-internal.h +++ b/TelepathyQt/channel-internal.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,11 +20,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_channel_internal_h_HEADER_GUARD_ -#define _TelepathyQt4_channel_internal_h_HEADER_GUARD_ +#ifndef _TelepathyQt_channel_internal_h_HEADER_GUARD_ +#define _TelepathyQt_channel_internal_h_HEADER_GUARD_ -#include <TelepathyQt4/Channel> -#include <TelepathyQt4/PendingOperation> +#include <TelepathyQt/Channel> +#include <TelepathyQt/PendingOperation> namespace Tp { diff --git a/TelepathyQt4/channel-request.cpp b/TelepathyQt/channel-request.cpp index 583ce0fd..5e84f57c 100644 --- a/TelepathyQt4/channel-request.cpp +++ b/TelepathyQt/channel-request.cpp @@ -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,19 +20,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/ChannelRequest> +#include <TelepathyQt/ChannelRequest> -#include "TelepathyQt4/_gen/cli-channel-request-body.hpp" -#include "TelepathyQt4/_gen/cli-channel-request.moc.hpp" -#include "TelepathyQt4/_gen/channel-request.moc.hpp" +#include "TelepathyQt/_gen/cli-channel-request-body.hpp" +#include "TelepathyQt/_gen/cli-channel-request.moc.hpp" +#include "TelepathyQt/_gen/channel-request.moc.hpp" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/Account> -#include <TelepathyQt4/AccountFactory> -#include <TelepathyQt4/PendingFailure> -#include <TelepathyQt4/PendingReady> -#include <TelepathyQt4/PendingVoid> +#include <TelepathyQt/Account> +#include <TelepathyQt/AccountFactory> +#include <TelepathyQt/PendingFailure> +#include <TelepathyQt/PendingReady> +#include <TelepathyQt/PendingVoid> #include <QDateTime> #include <QSharedData> @@ -255,7 +255,7 @@ void ChannelRequest::Private::extractMainProps(const QVariantMap &props, bool la /** * \class ChannelRequest * \ingroup clientchannelrequest - * \headerfile TelepathyQt4/channel-request.h <TelepathyQt4/ChannelRequest> + * \headerfile TelepathyQt/channel-request.h <TelepathyQt/ChannelRequest> * * \brief The ChannelRequest class represents a Telepathy channel request. * @@ -717,7 +717,7 @@ void ChannelRequest::connectNotify(const char *signalName) /** * \class ChannelRequestHints * \ingroup clientchannelrequest - * \headerfile TelepathyQt4/channel-request.h <TelepathyQt4/ChannelRequestHints> + * \headerfile TelepathyQt/channel-request.h <TelepathyQt/ChannelRequestHints> * * \brief The ChannelRequestHints class represents a dictionary of metadata * provided by the channel requester when requesting a channel. diff --git a/TelepathyQt4/channel-request.h b/TelepathyQt/channel-request.h index eb427853..5e42154d 100644 --- a/TelepathyQt4/channel-request.h +++ b/TelepathyQt/channel-request.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,23 +20,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_channel_request_h_HEADER_GUARD_ -#define _TelepathyQt4_channel_request_h_HEADER_GUARD_ +#ifndef _TelepathyQt_channel_request_h_HEADER_GUARD_ +#define _TelepathyQt_channel_request_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/_gen/cli-channel-request.h> +#include <TelepathyQt/_gen/cli-channel-request.h> -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/DBus> -#include <TelepathyQt4/DBusProxy> -#include <TelepathyQt4/Feature> -#include <TelepathyQt4/OptionalInterfaceFactory> -#include <TelepathyQt4/ReadinessHelper> -#include <TelepathyQt4/Types> -#include <TelepathyQt4/SharedPtr> +#include <TelepathyQt/Constants> +#include <TelepathyQt/DBus> +#include <TelepathyQt/DBusProxy> +#include <TelepathyQt/Feature> +#include <TelepathyQt/OptionalInterfaceFactory> +#include <TelepathyQt/ReadinessHelper> +#include <TelepathyQt/Types> +#include <TelepathyQt/SharedPtr> #include <QSharedDataPointer> #include <QString> diff --git a/TelepathyQt4/channel-request.xml b/TelepathyQt/channel-request.xml index 92fc8817..92fc8817 100644 --- a/TelepathyQt4/channel-request.xml +++ b/TelepathyQt/channel-request.xml diff --git a/TelepathyQt4/channel.cpp b/TelepathyQt/channel.cpp index 10f3ea70..7a6872ae 100644 --- a/TelepathyQt4/channel.cpp +++ b/TelepathyQt/channel.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008 Nokia Corporation @@ -20,31 +20,31 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/Channel> -#include "TelepathyQt4/channel-internal.h" +#include <TelepathyQt/Channel> +#include "TelepathyQt/channel-internal.h" -#include "TelepathyQt4/_gen/cli-channel-body.hpp" -#include "TelepathyQt4/_gen/cli-channel.moc.hpp" -#include "TelepathyQt4/_gen/channel.moc.hpp" -#include "TelepathyQt4/_gen/channel-internal.moc.hpp" +#include "TelepathyQt/_gen/cli-channel-body.hpp" +#include "TelepathyQt/_gen/cli-channel.moc.hpp" +#include "TelepathyQt/_gen/channel.moc.hpp" +#include "TelepathyQt/_gen/channel-internal.moc.hpp" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" -#include "TelepathyQt4/future-internal.h" +#include "TelepathyQt/future-internal.h" -#include <TelepathyQt4/ChannelFactory> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/ConnectionCapabilities> -#include <TelepathyQt4/ConnectionLowlevel> -#include <TelepathyQt4/ContactManager> -#include <TelepathyQt4/PendingContacts> -#include <TelepathyQt4/PendingFailure> -#include <TelepathyQt4/PendingOperation> -#include <TelepathyQt4/PendingReady> -#include <TelepathyQt4/PendingSuccess> -#include <TelepathyQt4/StreamTubeChannel> -#include <TelepathyQt4/ReferencedHandles> -#include <TelepathyQt4/Constants> +#include <TelepathyQt/ChannelFactory> +#include <TelepathyQt/Connection> +#include <TelepathyQt/ConnectionCapabilities> +#include <TelepathyQt/ConnectionLowlevel> +#include <TelepathyQt/ContactManager> +#include <TelepathyQt/PendingContacts> +#include <TelepathyQt/PendingFailure> +#include <TelepathyQt/PendingOperation> +#include <TelepathyQt/PendingReady> +#include <TelepathyQt/PendingSuccess> +#include <TelepathyQt/StreamTubeChannel> +#include <TelepathyQt/ReferencedHandles> +#include <TelepathyQt/Constants> #include <QHash> #include <QQueue> @@ -1253,7 +1253,7 @@ struct TP_QT_NO_EXPORT Channel::GroupMemberChangeDetails::Private : public QShar /** * \class Channel::GroupMemberChangeDetails * \ingroup clientchannel - * \headerfile TelepathyQt4/channel.h <TelepathyQt4/Channel> + * \headerfile TelepathyQt/channel.h <TelepathyQt/Channel> * * \brief The Channel::GroupMemberChangeDetails class represents the details of a group membership * change. @@ -1428,7 +1428,7 @@ Channel::GroupMemberChangeDetails::GroupMemberChangeDetails(const ContactPtr &ac /** * \class Channel * \ingroup clientchannel - * \headerfile TelepathyQt4/channel.h <TelepathyQt4/Channel> + * \headerfile TelepathyQt/channel.h <TelepathyQt/Channel> * * \brief The Channel class represents a Telepathy channel. * diff --git a/TelepathyQt4/channel.h b/TelepathyQt/channel.h index f3e87963..eb7512aa 100644 --- a/TelepathyQt4/channel.h +++ b/TelepathyQt/channel.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008 Nokia Corporation @@ -20,22 +20,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_channel_h_HEADER_GUARD_ -#define _TelepathyQt4_channel_h_HEADER_GUARD_ +#ifndef _TelepathyQt_channel_h_HEADER_GUARD_ +#define _TelepathyQt_channel_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/_gen/cli-channel.h> +#include <TelepathyQt/_gen/cli-channel.h> -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/DBus> -#include <TelepathyQt4/DBusProxy> -#include <TelepathyQt4/OptionalInterfaceFactory> -#include <TelepathyQt4/ReadinessHelper> -#include <TelepathyQt4/SharedPtr> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Constants> +#include <TelepathyQt/DBus> +#include <TelepathyQt/DBusProxy> +#include <TelepathyQt/OptionalInterfaceFactory> +#include <TelepathyQt/ReadinessHelper> +#include <TelepathyQt/SharedPtr> +#include <TelepathyQt/Types> #include <QSet> #include <QSharedDataPointer> diff --git a/TelepathyQt4/channel.xml b/TelepathyQt/channel.xml index c850462e..c850462e 100644 --- a/TelepathyQt4/channel.xml +++ b/TelepathyQt/channel.xml diff --git a/TelepathyQt4/client-registrar-internal.h b/TelepathyQt/client-registrar-internal.h index cfa40154..3f0b4ec3 100644 --- a/TelepathyQt4/client-registrar-internal.h +++ b/TelepathyQt/client-registrar-internal.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2009-2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2009-2010 Nokia Corporation @@ -20,18 +20,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_client_registrar_internal_h_HEADER_GUARD_ -#define _TelepathyQt4_client_registrar_internal_h_HEADER_GUARD_ +#ifndef _TelepathyQt_client_registrar_internal_h_HEADER_GUARD_ +#define _TelepathyQt_client_registrar_internal_h_HEADER_GUARD_ #include <QtCore/QObject> #include <QtDBus/QtDBus> -#include <TelepathyQt4/AbstractClientHandler> -#include <TelepathyQt4/Channel> -#include <TelepathyQt4/ChannelClassSpecList> -#include <TelepathyQt4/Types> +#include <TelepathyQt/AbstractClientHandler> +#include <TelepathyQt/Channel> +#include <TelepathyQt/ChannelClassSpecList> +#include <TelepathyQt/Types> -#include "TelepathyQt4/fake-handler-manager-internal.h" +#include "TelepathyQt/fake-handler-manager-internal.h" namespace Tp { diff --git a/TelepathyQt4/client-registrar.cpp b/TelepathyQt/client-registrar.cpp index 30d9c4ac..1c6b7609 100644 --- a/TelepathyQt4/client-registrar.cpp +++ b/TelepathyQt/client-registrar.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2009-2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2009-2010 Nokia Corporation @@ -20,25 +20,25 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/ClientRegistrar> -#include "TelepathyQt4/client-registrar-internal.h" +#include <TelepathyQt/ClientRegistrar> +#include "TelepathyQt/client-registrar-internal.h" -#include "TelepathyQt4/_gen/client-registrar.moc.hpp" -#include "TelepathyQt4/_gen/client-registrar-internal.moc.hpp" +#include "TelepathyQt/_gen/client-registrar.moc.hpp" +#include "TelepathyQt/_gen/client-registrar-internal.moc.hpp" -#include "TelepathyQt4/channel-factory.h" -#include "TelepathyQt4/debug-internal.h" -#include "TelepathyQt4/request-temporary-handler-internal.h" +#include "TelepathyQt/channel-factory.h" +#include "TelepathyQt/debug-internal.h" +#include "TelepathyQt/request-temporary-handler-internal.h" -#include <TelepathyQt4/Account> -#include <TelepathyQt4/AccountManager> -#include <TelepathyQt4/Channel> -#include <TelepathyQt4/ChannelDispatchOperation> -#include <TelepathyQt4/ChannelRequest> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/MethodInvocationContext> -#include <TelepathyQt4/PendingComposite> -#include <TelepathyQt4/PendingReady> +#include <TelepathyQt/Account> +#include <TelepathyQt/AccountManager> +#include <TelepathyQt/Channel> +#include <TelepathyQt/ChannelDispatchOperation> +#include <TelepathyQt/ChannelRequest> +#include <TelepathyQt/Connection> +#include <TelepathyQt/MethodInvocationContext> +#include <TelepathyQt/PendingComposite> +#include <TelepathyQt/PendingReady> namespace Tp { @@ -607,7 +607,7 @@ struct TP_QT_NO_EXPORT ClientRegistrar::Private /** * \class ClientRegistrar * \ingroup serverclient - * \headerfile TelepathyQt4/client-registrar.h <TelepathyQt4/ClientRegistrar> + * \headerfile TelepathyQt/client-registrar.h <TelepathyQt/ClientRegistrar> * * \brief The ClientRegistrar class is responsible for registering Telepathy * clients (Observer, Approver, Handler). diff --git a/TelepathyQt4/client-registrar.h b/TelepathyQt/client-registrar.h index cbfd28e9..631dd454 100644 --- a/TelepathyQt4/client-registrar.h +++ b/TelepathyQt/client-registrar.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2009-2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2009-2010 Nokia Corporation @@ -20,19 +20,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_client_registrar_h_HEADER_GUARD_ -#define _TelepathyQt4_client_registrar_h_HEADER_GUARD_ +#ifndef _TelepathyQt_client_registrar_h_HEADER_GUARD_ +#define _TelepathyQt_client_registrar_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/AccountFactory> -#include <TelepathyQt4/ChannelFactory> -#include <TelepathyQt4/ConnectionFactory> -#include <TelepathyQt4/ContactFactory> -#include <TelepathyQt4/Object> -#include <TelepathyQt4/Types> +#include <TelepathyQt/AccountFactory> +#include <TelepathyQt/ChannelFactory> +#include <TelepathyQt/ConnectionFactory> +#include <TelepathyQt/ContactFactory> +#include <TelepathyQt/Object> +#include <TelepathyQt/Types> #include <QDBusConnection> #include <QString> diff --git a/TelepathyQt4/client.cpp b/TelepathyQt/client.cpp index f3dec1bd..27c1a749 100644 --- a/TelepathyQt4/client.cpp +++ b/TelepathyQt/client.cpp @@ -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,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/Client> +#include <TelepathyQt/Client> -#include "TelepathyQt4/_gen/cli-client-body.hpp" -#include "TelepathyQt4/_gen/cli-client.moc.hpp" +#include "TelepathyQt/_gen/cli-client-body.hpp" +#include "TelepathyQt/_gen/cli-client.moc.hpp" diff --git a/TelepathyQt4/client.h b/TelepathyQt/client.h index 890e9d1e..0835a8bd 100644 --- a/TelepathyQt4/client.h +++ b/TelepathyQt/client.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,13 +20,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_client_h_HEADER_GUARD_ -#define _TelepathyQt4_client_h_HEADER_GUARD_ +#ifndef _TelepathyQt_client_h_HEADER_GUARD_ +#define _TelepathyQt_client_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/_gen/cli-client.h> +#include <TelepathyQt/_gen/cli-client.h> #endif diff --git a/TelepathyQt4/client.xml b/TelepathyQt/client.xml index d4d0f6de..d4d0f6de 100644 --- a/TelepathyQt4/client.xml +++ b/TelepathyQt/client.xml diff --git a/TelepathyQt4/connection-capabilities.cpp b/TelepathyQt/connection-capabilities.cpp index 5e73fe11..c6e2526a 100644 --- a/TelepathyQt4/connection-capabilities.cpp +++ b/TelepathyQt/connection-capabilities.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2009-2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2009-2010 Nokia Corporation @@ -20,10 +20,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/ConnectionCapabilities> +#include <TelepathyQt/ConnectionCapabilities> -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Constants> +#include <TelepathyQt/Types> namespace Tp { @@ -31,7 +31,7 @@ namespace Tp /** * \class ConnectionCapabilities * \ingroup clientconn - * \headerfile TelepathyQt4/connection-capabilities.h <TelepathyQt4/ConnectionCapabilities> + * \headerfile TelepathyQt/connection-capabilities.h <TelepathyQt/ConnectionCapabilities> * * \brief The ConnectionCapabilities class represents the capabilities of a * Connection. diff --git a/TelepathyQt4/connection-capabilities.h b/TelepathyQt/connection-capabilities.h index 3c6811c5..3ffcc288 100644 --- a/TelepathyQt4/connection-capabilities.h +++ b/TelepathyQt/connection-capabilities.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2009-2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2009-2010 Nokia Corporation @@ -20,15 +20,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_connection_capabilities_h_HEADER_GUARD_ -#define _TelepathyQt4_connection_capabilities_h_HEADER_GUARD_ +#ifndef _TelepathyQt_connection_capabilities_h_HEADER_GUARD_ +#define _TelepathyQt_connection_capabilities_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/CapabilitiesBase> -#include <TelepathyQt4/Types> +#include <TelepathyQt/CapabilitiesBase> +#include <TelepathyQt/Types> namespace Tp { diff --git a/TelepathyQt4/connection-factory.cpp b/TelepathyQt/connection-factory.cpp index 2915d225..02867846 100644 --- a/TelepathyQt4/connection-factory.cpp +++ b/TelepathyQt/connection-factory.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,10 +20,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/ConnectionFactory> +#include <TelepathyQt/ConnectionFactory> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/DBusProxy> +#include <TelepathyQt/Connection> +#include <TelepathyQt/DBusProxy> namespace Tp { @@ -31,7 +31,7 @@ namespace Tp /** * \class ConnectionFactory * \ingroup utils - * \headerfile TelepathyQt4/connection-factory.h <TelepathyQt4/ConnectionFactory> + * \headerfile TelepathyQt/connection-factory.h <TelepathyQt/ConnectionFactory> * * \brief The ConnectionFactory class is responsible for constructing Connection * objects according to application-defined settings. diff --git a/TelepathyQt4/connection-factory.h b/TelepathyQt/connection-factory.h index f00dac9b..70f3b503 100644 --- a/TelepathyQt4/connection-factory.h +++ b/TelepathyQt/connection-factory.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,19 +20,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_connection_factory_h_HEADER_GUARD_ -#define _TelepathyQt4_connection_factory_h_HEADER_GUARD_ +#ifndef _TelepathyQt_connection_factory_h_HEADER_GUARD_ +#define _TelepathyQt_connection_factory_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Global> -#include <TelepathyQt4/SharedPtr> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Global> +#include <TelepathyQt/SharedPtr> +#include <TelepathyQt/Types> -#include <TelepathyQt4/Feature> -#include <TelepathyQt4/FixedFeatureFactory> +#include <TelepathyQt/Feature> +#include <TelepathyQt/FixedFeatureFactory> // For Q_DISABLE_COPY #include <QtGlobal> diff --git a/TelepathyQt4/connection-internal.h b/TelepathyQt/connection-internal.h index 2ca89d9e..2d210a5c 100644 --- a/TelepathyQt4/connection-internal.h +++ b/TelepathyQt/connection-internal.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008 Nokia Corporation @@ -20,12 +20,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_connection_internal_h_HEADER_GUARD_ -#define _TelepathyQt4_connection_internal_h_HEADER_GUARD_ +#ifndef _TelepathyQt_connection_internal_h_HEADER_GUARD_ +#define _TelepathyQt_connection_internal_h_HEADER_GUARD_ -#include <TelepathyQt4/Connection> +#include <TelepathyQt/Connection> -#include <TelepathyQt4/PendingReady> +#include <TelepathyQt/PendingReady> #include <QSet> diff --git a/TelepathyQt4/connection-lowlevel.h b/TelepathyQt/connection-lowlevel.h index 91910824..63a3429f 100644 --- a/TelepathyQt4/connection-lowlevel.h +++ b/TelepathyQt/connection-lowlevel.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008-2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008-2010 Nokia Corporation @@ -20,15 +20,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_connection_lowlevel_h_HEADER_GUARD_ -#define _TelepathyQt4_connection_lowlevel_h_HEADER_GUARD_ +#ifndef _TelepathyQt_connection_lowlevel_h_HEADER_GUARD_ +#define _TelepathyQt_connection_lowlevel_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Constants> +#include <TelepathyQt/Types> namespace Tp { diff --git a/TelepathyQt4/connection-manager-internal.h b/TelepathyQt/connection-manager-internal.h index 6a874d1e..65083237 100644 --- a/TelepathyQt4/connection-manager-internal.h +++ b/TelepathyQt/connection-manager-internal.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008-2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008-2010 Nokia Corporation @@ -20,10 +20,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_connection_manager_internal_h_HEADER_GUARD_ -#define _TelepathyQt4_connection_manager_internal_h_HEADER_GUARD_ +#ifndef _TelepathyQt_connection_manager_internal_h_HEADER_GUARD_ +#define _TelepathyQt_connection_manager_internal_h_HEADER_GUARD_ -#include <TelepathyQt4/PendingStringList> +#include <TelepathyQt/PendingStringList> #include <QDBusConnection> #include <QLatin1String> diff --git a/TelepathyQt4/connection-manager-lowlevel.h b/TelepathyQt/connection-manager-lowlevel.h index 574459a1..69c67330 100644 --- a/TelepathyQt4/connection-manager-lowlevel.h +++ b/TelepathyQt/connection-manager-lowlevel.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008-2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008-2010 Nokia Corporation @@ -20,15 +20,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_connection_manager_lowlevel_h_HEADER_GUARD_ -#define _TelepathyQt4_connection_manager_lowlevel_h_HEADER_GUARD_ +#ifndef _TelepathyQt_connection_manager_lowlevel_h_HEADER_GUARD_ +#define _TelepathyQt_connection_manager_lowlevel_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Constants> +#include <TelepathyQt/Types> namespace Tp { diff --git a/TelepathyQt4/connection-manager.cpp b/TelepathyQt/connection-manager.cpp index 547fb939..f5d2817d 100644 --- a/TelepathyQt4/connection-manager.cpp +++ b/TelepathyQt/connection-manager.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008-2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008-2010 Nokia Corporation @@ -20,25 +20,25 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/ConnectionManager> -#include <TelepathyQt4/ConnectionManagerLowlevel> -#include "TelepathyQt4/connection-manager-internal.h" +#include <TelepathyQt/ConnectionManager> +#include <TelepathyQt/ConnectionManagerLowlevel> +#include "TelepathyQt/connection-manager-internal.h" -#include "TelepathyQt4/_gen/cli-connection-manager-body.hpp" -#include "TelepathyQt4/_gen/cli-connection-manager.moc.hpp" -#include "TelepathyQt4/_gen/connection-manager.moc.hpp" -#include "TelepathyQt4/_gen/connection-manager-internal.moc.hpp" -#include "TelepathyQt4/_gen/connection-manager-lowlevel.moc.hpp" +#include "TelepathyQt/_gen/cli-connection-manager-body.hpp" +#include "TelepathyQt/_gen/cli-connection-manager.moc.hpp" +#include "TelepathyQt/_gen/connection-manager.moc.hpp" +#include "TelepathyQt/_gen/connection-manager-internal.moc.hpp" +#include "TelepathyQt/_gen/connection-manager-lowlevel.moc.hpp" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/ConnectionCapabilities> -#include <TelepathyQt4/DBus> -#include <TelepathyQt4/PendingConnection> -#include <TelepathyQt4/PendingReady> -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/ManagerFile> -#include <TelepathyQt4/Types> +#include <TelepathyQt/ConnectionCapabilities> +#include <TelepathyQt/DBus> +#include <TelepathyQt/PendingConnection> +#include <TelepathyQt/PendingReady> +#include <TelepathyQt/Constants> +#include <TelepathyQt/ManagerFile> +#include <TelepathyQt/Types> #include <QDBusConnectionInterface> #include <QQueue> @@ -574,7 +574,7 @@ QString ConnectionManager::Private::makeObjectPath(const QString &name) /** * \class ConnectionManagerLowlevel * \ingroup clientcm - * \headerfile TelepathyQt4/connection-manager-lowlevel.h <TelepathyQt4/ConnectionManagerLowlevel> + * \headerfile TelepathyQt/connection-manager-lowlevel.h <TelepathyQt/ConnectionManagerLowlevel> * * \brief The ConnectionManagerLowlevel class extends ConnectionManager with * support to low-level features. @@ -603,7 +603,7 @@ ConnectionManagerPtr ConnectionManagerLowlevel::connectionManager() const /** * \class ConnectionManager * \ingroup clientcm - * \headerfile TelepathyQt4/connection-manager.h <TelepathyQt4/ConnectionManager> + * \headerfile TelepathyQt/connection-manager.h <TelepathyQt/ConnectionManager> * * \brief The ConnectionManager class represents a Telepathy connection manager. * diff --git a/TelepathyQt4/connection-manager.h b/TelepathyQt/connection-manager.h index a87e0acf..6e7ca00b 100644 --- a/TelepathyQt4/connection-manager.h +++ b/TelepathyQt/connection-manager.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008-2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008-2010 Nokia Corporation @@ -20,27 +20,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_connection_manager_h_HEADER_GUARD_ -#define _TelepathyQt4_connection_manager_h_HEADER_GUARD_ +#ifndef _TelepathyQt_connection_manager_h_HEADER_GUARD_ +#define _TelepathyQt_connection_manager_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/_gen/cli-connection-manager.h> - -#include <TelepathyQt4/ChannelFactory> -#include <TelepathyQt4/ConnectionFactory> -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/ContactFactory> -#include <TelepathyQt4/DBus> -#include <TelepathyQt4/DBusProxy> -#include <TelepathyQt4/OptionalInterfaceFactory> -#include <TelepathyQt4/ProtocolInfo> -#include <TelepathyQt4/ProtocolParameter> -#include <TelepathyQt4/ReadinessHelper> -#include <TelepathyQt4/SharedPtr> -#include <TelepathyQt4/Types> +#include <TelepathyQt/_gen/cli-connection-manager.h> + +#include <TelepathyQt/ChannelFactory> +#include <TelepathyQt/ConnectionFactory> +#include <TelepathyQt/Constants> +#include <TelepathyQt/ContactFactory> +#include <TelepathyQt/DBus> +#include <TelepathyQt/DBusProxy> +#include <TelepathyQt/OptionalInterfaceFactory> +#include <TelepathyQt/ProtocolInfo> +#include <TelepathyQt/ProtocolParameter> +#include <TelepathyQt/ReadinessHelper> +#include <TelepathyQt/SharedPtr> +#include <TelepathyQt/Types> namespace Tp { diff --git a/TelepathyQt4/connection-manager.xml b/TelepathyQt/connection-manager.xml index 597a78df..597a78df 100644 --- a/TelepathyQt4/connection-manager.xml +++ b/TelepathyQt/connection-manager.xml diff --git a/TelepathyQt4/connection.cpp b/TelepathyQt/connection.cpp index 9ab2f75d..e7a69a8d 100644 --- a/TelepathyQt4/connection.cpp +++ b/TelepathyQt/connection.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008-2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008-2010 Nokia Corporation @@ -20,31 +20,31 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/ConnectionLowlevel> -#include "TelepathyQt4/connection-internal.h" - -#include "TelepathyQt4/_gen/cli-connection.moc.hpp" -#include "TelepathyQt4/_gen/cli-connection-body.hpp" -#include "TelepathyQt4/_gen/connection.moc.hpp" -#include "TelepathyQt4/_gen/connection-internal.moc.hpp" -#include "TelepathyQt4/_gen/connection-lowlevel.moc.hpp" - -#include "TelepathyQt4/debug-internal.h" - -#include <TelepathyQt4/ChannelFactory> -#include <TelepathyQt4/ConnectionCapabilities> -#include <TelepathyQt4/ContactFactory> -#include <TelepathyQt4/ContactManager> -#include <TelepathyQt4/PendingChannel> -#include <TelepathyQt4/PendingContactAttributes> -#include <TelepathyQt4/PendingContacts> -#include <TelepathyQt4/PendingFailure> -#include <TelepathyQt4/PendingHandles> -#include <TelepathyQt4/PendingReady> -#include <TelepathyQt4/PendingVariantMap> -#include <TelepathyQt4/PendingVoid> -#include <TelepathyQt4/ReferencedHandles> +#include <TelepathyQt/Connection> +#include <TelepathyQt/ConnectionLowlevel> +#include "TelepathyQt/connection-internal.h" + +#include "TelepathyQt/_gen/cli-connection.moc.hpp" +#include "TelepathyQt/_gen/cli-connection-body.hpp" +#include "TelepathyQt/_gen/connection.moc.hpp" +#include "TelepathyQt/_gen/connection-internal.moc.hpp" +#include "TelepathyQt/_gen/connection-lowlevel.moc.hpp" + +#include "TelepathyQt/debug-internal.h" + +#include <TelepathyQt/ChannelFactory> +#include <TelepathyQt/ConnectionCapabilities> +#include <TelepathyQt/ContactFactory> +#include <TelepathyQt/ContactManager> +#include <TelepathyQt/PendingChannel> +#include <TelepathyQt/PendingContactAttributes> +#include <TelepathyQt/PendingContacts> +#include <TelepathyQt/PendingFailure> +#include <TelepathyQt/PendingHandles> +#include <TelepathyQt/PendingReady> +#include <TelepathyQt/PendingVariantMap> +#include <TelepathyQt/PendingVoid> +#include <TelepathyQt/ReferencedHandles> #include <QMap> #include <QMetaObject> @@ -625,7 +625,7 @@ void Connection::Private::invalidateResetCaps(const QString &error, const QStrin /** * \class ConnectionLowlevel * \ingroup clientconn - * \headerfile TelepathyQt4/connection-lowlevel.h <TelepathyQt4/ConnectionLowlevel> + * \headerfile TelepathyQt/connection-lowlevel.h <TelepathyQt/ConnectionLowlevel> * * \brief The ConnectionLowlevel class extends Connection with support to * low-level features. @@ -777,7 +777,7 @@ QMutex Connection::Private::handleContextsLock; /** * \class Connection * \ingroup clientconn - * \headerfile TelepathyQt4/connection.h <TelepathyQt4/Connection> + * \headerfile TelepathyQt/connection.h <TelepathyQt/Connection> * * \brief The Connection class represents a Telepathy connection. * @@ -1127,7 +1127,7 @@ struct TP_QT_NO_EXPORT Connection::ErrorDetails::Private : public QSharedData /** * \class Connection::ErrorDetails * \ingroup clientconn - * \headerfile TelepathyQt4/connection.h <TelepathyQt4/Connection> + * \headerfile TelepathyQt/connection.h <TelepathyQt/Connection> * * \brief The Connection::ErrorDetails class represents the details of a connection error. * diff --git a/TelepathyQt4/connection.h b/TelepathyQt/connection.h index af65f0f3..0ca47a53 100644 --- a/TelepathyQt4/connection.h +++ b/TelepathyQt/connection.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008-2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008-2010 Nokia Corporation @@ -20,26 +20,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_connection_h_HEADER_GUARD_ -#define _TelepathyQt4_connection_h_HEADER_GUARD_ +#ifndef _TelepathyQt_connection_h_HEADER_GUARD_ +#define _TelepathyQt_connection_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/_gen/cli-connection.h> +#include <TelepathyQt/_gen/cli-connection.h> -#include <TelepathyQt4/ConnectionCapabilities> -#include <TelepathyQt4/Contact> -#include <TelepathyQt4/DBus> -#include <TelepathyQt4/DBusProxy> -#include <TelepathyQt4/OptionalInterfaceFactory> -#include <TelepathyQt4/ReadinessHelper> -#include <TelepathyQt4/Types> -#include <TelepathyQt4/SharedPtr> +#include <TelepathyQt/ConnectionCapabilities> +#include <TelepathyQt/Contact> +#include <TelepathyQt/DBus> +#include <TelepathyQt/DBusProxy> +#include <TelepathyQt/OptionalInterfaceFactory> +#include <TelepathyQt/ReadinessHelper> +#include <TelepathyQt/Types> +#include <TelepathyQt/SharedPtr> -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Constants> +#include <TelepathyQt/Types> #include <QSet> #include <QString> diff --git a/TelepathyQt4/connection.xml b/TelepathyQt/connection.xml index bf726f58..bf726f58 100644 --- a/TelepathyQt4/connection.xml +++ b/TelepathyQt/connection.xml diff --git a/TelepathyQt4/constants.h b/TelepathyQt/constants.h index ad847820..a3146d13 100644 --- a/TelepathyQt4/constants.h +++ b/TelepathyQt/constants.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008 Nokia Corporation @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_constants_h_HEADER_GUARD_ -#define _TelepathyQt4_constants_h_HEADER_GUARD_ +#ifndef _TelepathyQt_constants_h_HEADER_GUARD_ +#define _TelepathyQt_constants_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER @@ -110,7 +110,7 @@ * @} */ -#include <TelepathyQt4/_gen/constants.h> +#include <TelepathyQt/_gen/constants.h> /** * \ingroup errorstrconsts diff --git a/TelepathyQt4/contact-capabilities.cpp b/TelepathyQt/contact-capabilities.cpp index fb329580..7a59f254 100644 --- a/TelepathyQt4/contact-capabilities.cpp +++ b/TelepathyQt/contact-capabilities.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2009-2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2009-2010 Nokia Corporation @@ -20,9 +20,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/ContactCapabilities> +#include <TelepathyQt/ContactCapabilities> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Types> namespace Tp { @@ -30,7 +30,7 @@ namespace Tp /** * \class ContactCapabilities * \ingroup clientconn - * \headerfile TelepathyQt4/contact-capabilities.h <TelepathyQt4/ContactCapabilities> + * \headerfile TelepathyQt/contact-capabilities.h <TelepathyQt/ContactCapabilities> * * \brief The ContactCapabilities class represents the capabilities of a * Contact. diff --git a/TelepathyQt4/contact-capabilities.h b/TelepathyQt/contact-capabilities.h index aa6eb6b8..52de21e2 100644 --- a/TelepathyQt4/contact-capabilities.h +++ b/TelepathyQt/contact-capabilities.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2009-2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2009-2010 Nokia Corporation @@ -20,15 +20,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_contact_capabilities_h_HEADER_GUARD_ -#define _TelepathyQt4_contact_capabilities_h_HEADER_GUARD_ +#ifndef _TelepathyQt_contact_capabilities_h_HEADER_GUARD_ +#define _TelepathyQt_contact_capabilities_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/CapabilitiesBase> -#include <TelepathyQt4/Types> +#include <TelepathyQt/CapabilitiesBase> +#include <TelepathyQt/Types> namespace Tp { diff --git a/TelepathyQt4/contact-factory.cpp b/TelepathyQt/contact-factory.cpp index acc457fe..cd93acde 100644 --- a/TelepathyQt4/contact-factory.cpp +++ b/TelepathyQt/contact-factory.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/ContactFactory> +#include <TelepathyQt/ContactFactory> namespace Tp { @@ -33,7 +33,7 @@ struct TP_QT_NO_EXPORT ContactFactory::Private /** * \class ContactFactory * \ingroup utils - * \headerfile TelepathyQt4/contact-factory.h <TelepathyQt4/ContactFactory> + * \headerfile TelepathyQt/contact-factory.h <TelepathyQt/ContactFactory> * * \brief The ContactFactory class is responsible for constructing Contact * objects according to application-defined settings. diff --git a/TelepathyQt4/contact-factory.h b/TelepathyQt/contact-factory.h index 14f2d23d..d8355f2a 100644 --- a/TelepathyQt4/contact-factory.h +++ b/TelepathyQt/contact-factory.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,17 +20,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_contact_factory_h_HEADER_GUARD_ -#define _TelepathyQt4_contact_factory_h_HEADER_GUARD_ +#ifndef _TelepathyQt_contact_factory_h_HEADER_GUARD_ +#define _TelepathyQt_contact_factory_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Contact> -#include <TelepathyQt4/Feature> -#include <TelepathyQt4/Global> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Contact> +#include <TelepathyQt/Feature> +#include <TelepathyQt/Global> +#include <TelepathyQt/Types> #include <QSet> #include <QtGlobal> diff --git a/TelepathyQt4/contact-manager-internal.h b/TelepathyQt/contact-manager-internal.h index 164f0020..e3bba7f4 100644 --- a/TelepathyQt4/contact-manager-internal.h +++ b/TelepathyQt/contact-manager-internal.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008-2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008-2010 Nokia Corporation @@ -20,13 +20,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_contact_manager_internal_h_HEADER_GUARD_ -#define _TelepathyQt4_contact_manager_internal_h_HEADER_GUARD_ +#ifndef _TelepathyQt_contact_manager_internal_h_HEADER_GUARD_ +#define _TelepathyQt_contact_manager_internal_h_HEADER_GUARD_ -#include <TelepathyQt4/ContactManager> -#include <TelepathyQt4/Global> -#include <TelepathyQt4/PendingOperation> -#include <TelepathyQt4/Types> +#include <TelepathyQt/ContactManager> +#include <TelepathyQt/Global> +#include <TelepathyQt/PendingOperation> +#include <TelepathyQt/Types> #include <QList> #include <QMap> diff --git a/TelepathyQt4/contact-manager-roster.cpp b/TelepathyQt/contact-manager-roster.cpp index f225dafc..36fd78c3 100644 --- a/TelepathyQt4/contact-manager-roster.cpp +++ b/TelepathyQt/contact-manager-roster.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008-2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008-2010 Nokia Corporation @@ -20,23 +20,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "TelepathyQt4/contact-manager-internal.h" +#include "TelepathyQt/contact-manager-internal.h" -#include "TelepathyQt4/_gen/contact-manager-internal.moc.hpp" +#include "TelepathyQt/_gen/contact-manager-internal.moc.hpp" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/ConnectionLowlevel> -#include <TelepathyQt4/ContactFactory> -#include <TelepathyQt4/PendingChannel> -#include <TelepathyQt4/PendingContacts> -#include <TelepathyQt4/PendingFailure> -#include <TelepathyQt4/PendingHandles> -#include <TelepathyQt4/PendingVariant> -#include <TelepathyQt4/PendingVariantMap> -#include <TelepathyQt4/PendingReady> -#include <TelepathyQt4/ReferencedHandles> +#include <TelepathyQt/Connection> +#include <TelepathyQt/ConnectionLowlevel> +#include <TelepathyQt/ContactFactory> +#include <TelepathyQt/PendingChannel> +#include <TelepathyQt/PendingContacts> +#include <TelepathyQt/PendingFailure> +#include <TelepathyQt/PendingHandles> +#include <TelepathyQt/PendingVariant> +#include <TelepathyQt/PendingVariantMap> +#include <TelepathyQt/PendingReady> +#include <TelepathyQt/ReferencedHandles> namespace Tp { diff --git a/TelepathyQt4/contact-manager.cpp b/TelepathyQt/contact-manager.cpp index 704b74d2..9e4709d6 100644 --- a/TelepathyQt4/contact-manager.cpp +++ b/TelepathyQt/contact-manager.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008-2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008-2010 Nokia Corporation @@ -20,25 +20,25 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/ContactManager> -#include "TelepathyQt4/contact-manager-internal.h" +#include <TelepathyQt/ContactManager> +#include "TelepathyQt/contact-manager-internal.h" -#include "TelepathyQt4/_gen/contact-manager.moc.hpp" +#include "TelepathyQt/_gen/contact-manager.moc.hpp" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/AvatarData> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/ConnectionLowlevel> -#include <TelepathyQt4/ContactFactory> -#include <TelepathyQt4/PendingChannel> -#include <TelepathyQt4/PendingContactAttributes> -#include <TelepathyQt4/PendingContacts> -#include <TelepathyQt4/PendingFailure> -#include <TelepathyQt4/PendingHandles> -#include <TelepathyQt4/PendingVariantMap> -#include <TelepathyQt4/ReferencedHandles> -#include <TelepathyQt4/Utils> +#include <TelepathyQt/AvatarData> +#include <TelepathyQt/Connection> +#include <TelepathyQt/ConnectionLowlevel> +#include <TelepathyQt/ContactFactory> +#include <TelepathyQt/PendingChannel> +#include <TelepathyQt/PendingContactAttributes> +#include <TelepathyQt/PendingContacts> +#include <TelepathyQt/PendingFailure> +#include <TelepathyQt/PendingHandles> +#include <TelepathyQt/PendingVariantMap> +#include <TelepathyQt/ReferencedHandles> +#include <TelepathyQt/Utils> #include <QMap> #include <QWeakPointer> @@ -167,7 +167,7 @@ void ContactManager::PendingRefreshContactInfo::onRefreshInfoFinished(PendingOpe /** * \class ContactManager * \ingroup clientconn - * \headerfile TelepathyQt4/contact-manager.h <TelepathyQt4/ContactManager> + * \headerfile TelepathyQt/contact-manager.h <TelepathyQt/ContactManager> * * \brief The ContactManager class is responsible for managing contacts. * diff --git a/TelepathyQt4/contact-manager.h b/TelepathyQt/contact-manager.h index d47b4b55..6f4e76cc 100644 --- a/TelepathyQt4/contact-manager.h +++ b/TelepathyQt/contact-manager.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008-2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008-2010 Nokia Corporation @@ -20,19 +20,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_contact_manager_h_HEADER_GUARD_ -#define _TelepathyQt4_contact_manager_h_HEADER_GUARD_ +#ifndef _TelepathyQt_contact_manager_h_HEADER_GUARD_ +#define _TelepathyQt_contact_manager_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Channel> -#include <TelepathyQt4/Contact> -#include <TelepathyQt4/Feature> -#include <TelepathyQt4/Object> -#include <TelepathyQt4/ReferencedHandles> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Channel> +#include <TelepathyQt/Contact> +#include <TelepathyQt/Feature> +#include <TelepathyQt/Object> +#include <TelepathyQt/ReferencedHandles> +#include <TelepathyQt/Types> #include <QList> #include <QSet> diff --git a/TelepathyQt4/contact-messenger.cpp b/TelepathyQt/contact-messenger.cpp index 6f11b833..fdb5608c 100644 --- a/TelepathyQt4/contact-messenger.cpp +++ b/TelepathyQt/contact-messenger.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2011 Nokia Corporation @@ -20,21 +20,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/ContactMessenger> +#include <TelepathyQt/ContactMessenger> -#include "TelepathyQt4/_gen/contact-messenger.moc.hpp" +#include "TelepathyQt/_gen/contact-messenger.moc.hpp" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" -#include "TelepathyQt4/future-internal.h" +#include "TelepathyQt/future-internal.h" -#include <TelepathyQt4/Account> -#include <TelepathyQt4/ChannelDispatcher> -#include <TelepathyQt4/ClientRegistrar> -#include <TelepathyQt4/MessageContentPartList> -#include <TelepathyQt4/PendingSendMessage> -#include <TelepathyQt4/SimpleTextObserver> -#include <TelepathyQt4/TextChannel> +#include <TelepathyQt/Account> +#include <TelepathyQt/ChannelDispatcher> +#include <TelepathyQt/ClientRegistrar> +#include <TelepathyQt/MessageContentPartList> +#include <TelepathyQt/PendingSendMessage> +#include <TelepathyQt/SimpleTextObserver> +#include <TelepathyQt/TextChannel> namespace Tp { @@ -87,7 +87,7 @@ PendingSendMessage *ContactMessenger::Private::sendMessage(const Message &messag /** * \class ContactMessenger * \ingroup clientaccount - * \headerfile TelepathyQt4/contact-messenger.h <TelepathyQt4/ContactMessenger> + * \headerfile TelepathyQt/contact-messenger.h <TelepathyQt/ContactMessenger> * * \brief The ContactMessenger class provides an easy way to send text messages to a contact * and also track sent/receive text messages from the same contact. diff --git a/TelepathyQt4/contact-messenger.h b/TelepathyQt/contact-messenger.h index 16aec9d4..41b93b87 100644 --- a/TelepathyQt4/contact-messenger.h +++ b/TelepathyQt/contact-messenger.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2011 Nokia Corporation @@ -20,16 +20,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_contact_messenger_h_HEADER_GUARD_ -#define _TelepathyQt4_contact_messenger_h_HEADER_GUARD_ +#ifndef _TelepathyQt_contact_messenger_h_HEADER_GUARD_ +#define _TelepathyQt_contact_messenger_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/Message> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Constants> +#include <TelepathyQt/Message> +#include <TelepathyQt/Types> namespace Tp { diff --git a/TelepathyQt4/contact-search-channel-internal.h b/TelepathyQt/contact-search-channel-internal.h index f08d3a66..dee83147 100644 --- a/TelepathyQt4/contact-search-channel-internal.h +++ b/TelepathyQt/contact-search-channel-internal.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,10 +20,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_contact_search_channel_internal_h_HEADER_GUARD_ -#define _TelepathyQt4_contact_search_channel_internal_h_HEADER_GUARD_ +#ifndef _TelepathyQt_contact_search_channel_internal_h_HEADER_GUARD_ +#define _TelepathyQt_contact_search_channel_internal_h_HEADER_GUARD_ -#include <TelepathyQt4/PendingOperation> +#include <TelepathyQt/PendingOperation> #include <QDBusPendingCall> diff --git a/TelepathyQt4/contact-search-channel.cpp b/TelepathyQt/contact-search-channel.cpp index f1ef225a..ece89fae 100644 --- a/TelepathyQt4/contact-search-channel.cpp +++ b/TelepathyQt/contact-search-channel.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,19 +20,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/ContactSearchChannel> -#include "TelepathyQt4/contact-search-channel-internal.h" +#include <TelepathyQt/ContactSearchChannel> +#include "TelepathyQt/contact-search-channel-internal.h" -#include "TelepathyQt4/_gen/contact-search-channel.moc.hpp" -#include "TelepathyQt4/_gen/contact-search-channel-internal.moc.hpp" +#include "TelepathyQt/_gen/contact-search-channel.moc.hpp" +#include "TelepathyQt/_gen/contact-search-channel-internal.moc.hpp" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/ContactManager> -#include <TelepathyQt4/PendingContacts> -#include <TelepathyQt4/PendingFailure> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Connection> +#include <TelepathyQt/ContactManager> +#include <TelepathyQt/PendingContacts> +#include <TelepathyQt/PendingFailure> +#include <TelepathyQt/Types> namespace Tp { @@ -311,7 +311,7 @@ void ContactSearchChannel::PendingSearch::watcherFinished(QDBusPendingCallWatche /** * \class ContactSearchChannel * \ingroup clientchannel - * \headerfile TelepathyQt4/contact-search-channel.h <TelepathyQt4/ContactSearchChannel> + * \headerfile TelepathyQt/contact-search-channel.h <TelepathyQt/ContactSearchChannel> * * \brief The ContactSearchChannel class represents a Telepathy channel of type * ContactSearch. @@ -320,7 +320,7 @@ void ContactSearchChannel::PendingSearch::watcherFinished(QDBusPendingCallWatche /** * \class ContactSearchChannel::SearchStateChangeDetails * \ingroup wrappers - * \headerfile TelepathyQt4/contact-search-channel.h <TelepathyQt4/ContactSearchChannel> + * \headerfile TelepathyQt/contact-search-channel.h <TelepathyQt/ContactSearchChannel> * * \brief The ContactSearchChannel::SearchStateChangeDetails class provides * a wrapper around the details for a search state change. diff --git a/TelepathyQt4/contact-search-channel.h b/TelepathyQt/contact-search-channel.h index 5886eb6e..29c8424c 100644 --- a/TelepathyQt4/contact-search-channel.h +++ b/TelepathyQt/contact-search-channel.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,16 +20,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_contact_search_channel_h_HEADER_GUARD_ -#define _TelepathyQt4_contact_search_channel_h_HEADER_GUARD_ +#ifndef _TelepathyQt_contact_search_channel_h_HEADER_GUARD_ +#define _TelepathyQt_contact_search_channel_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Channel> -#include <TelepathyQt4/Contact> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Channel> +#include <TelepathyQt/Contact> +#include <TelepathyQt/Types> namespace Tp { diff --git a/TelepathyQt4/contact.cpp b/TelepathyQt/contact.cpp index 6e039c5f..64e6601d 100644 --- a/TelepathyQt4/contact.cpp +++ b/TelepathyQt/contact.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008-2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008-2010 Nokia Corporation @@ -20,23 +20,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/Contact> +#include <TelepathyQt/Contact> -#include "TelepathyQt4/_gen/contact.moc.hpp" +#include "TelepathyQt/_gen/contact.moc.hpp" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/AvatarData> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/ConnectionCapabilities> -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/ContactCapabilities> -#include <TelepathyQt4/ContactManager> -#include <TelepathyQt4/LocationInfo> -#include <TelepathyQt4/PendingContactInfo> -#include <TelepathyQt4/PendingVoid> -#include <TelepathyQt4/Presence> -#include <TelepathyQt4/ReferencedHandles> +#include <TelepathyQt/AvatarData> +#include <TelepathyQt/Connection> +#include <TelepathyQt/ConnectionCapabilities> +#include <TelepathyQt/Constants> +#include <TelepathyQt/ContactCapabilities> +#include <TelepathyQt/ContactManager> +#include <TelepathyQt/LocationInfo> +#include <TelepathyQt/PendingContactInfo> +#include <TelepathyQt/PendingVoid> +#include <TelepathyQt/Presence> +#include <TelepathyQt/ReferencedHandles> namespace Tp { @@ -121,7 +121,7 @@ struct TP_QT_NO_EXPORT Contact::InfoFields::Private : public QSharedData /** * \class Contact::InfoFields * \ingroup clientconn - * \headerfile TelepathyQt4/contact.h <TelepathyQt4/Contact> + * \headerfile TelepathyQt/contact.h <TelepathyQt/Contact> * * \brief The Contact::InfoFields class represents the information of a * Telepathy contact. @@ -201,7 +201,7 @@ ContactInfoFieldList Contact::InfoFields::allFields() const /** * \class Contact * \ingroup clientconn - * \headerfile TelepathyQt4/contact.h <TelepathyQt4/Contact> + * \headerfile TelepathyQt/contact.h <TelepathyQt/Contact> * * \brief The Contact class represents a Telepathy contact. * diff --git a/TelepathyQt4/contact.h b/TelepathyQt/contact.h index 28fa323e..4d50f1e8 100644 --- a/TelepathyQt4/contact.h +++ b/TelepathyQt/contact.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008-2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008-2010 Nokia Corporation @@ -20,17 +20,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_contact_h_HEADER_GUARD_ -#define _TelepathyQt4_contact_h_HEADER_GUARD_ +#ifndef _TelepathyQt_contact_h_HEADER_GUARD_ +#define _TelepathyQt_contact_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Channel> -#include <TelepathyQt4/Feature> -#include <TelepathyQt4/Object> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Channel> +#include <TelepathyQt/Feature> +#include <TelepathyQt/Object> +#include <TelepathyQt/Types> #include <QSet> #include <QVariantMap> diff --git a/TelepathyQt4/dbus-daemon.xml b/TelepathyQt/dbus-daemon.xml index 675b879c..675b879c 100644 --- a/TelepathyQt4/dbus-daemon.xml +++ b/TelepathyQt/dbus-daemon.xml diff --git a/TelepathyQt4/dbus-introspectable.xml b/TelepathyQt/dbus-introspectable.xml index 4617f407..4617f407 100644 --- a/TelepathyQt4/dbus-introspectable.xml +++ b/TelepathyQt/dbus-introspectable.xml diff --git a/TelepathyQt4/dbus-peer.xml b/TelepathyQt/dbus-peer.xml index 54b25a28..54b25a28 100644 --- a/TelepathyQt4/dbus-peer.xml +++ b/TelepathyQt/dbus-peer.xml diff --git a/TelepathyQt4/dbus-properties.xml b/TelepathyQt/dbus-properties.xml index e76b3981..e76b3981 100644 --- a/TelepathyQt4/dbus-properties.xml +++ b/TelepathyQt/dbus-properties.xml diff --git a/TelepathyQt4/dbus-proxy-factory-internal.h b/TelepathyQt/dbus-proxy-factory-internal.h index e1a23cd4..d5fbdbb8 100644 --- a/TelepathyQt4/dbus-proxy-factory-internal.h +++ b/TelepathyQt/dbus-proxy-factory-internal.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -28,7 +28,7 @@ #include <QPair> #include <QString> -#include <TelepathyQt4/SharedPtr> +#include <TelepathyQt/SharedPtr> namespace Tp { diff --git a/TelepathyQt4/dbus-proxy-factory.cpp b/TelepathyQt/dbus-proxy-factory.cpp index 5ff046da..7020c4bc 100644 --- a/TelepathyQt4/dbus-proxy-factory.cpp +++ b/TelepathyQt/dbus-proxy-factory.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,17 +20,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/DBusProxyFactory> -#include "TelepathyQt4/dbus-proxy-factory-internal.h" +#include <TelepathyQt/DBusProxyFactory> +#include "TelepathyQt/dbus-proxy-factory-internal.h" -#include "TelepathyQt4/_gen/dbus-proxy-factory.moc.hpp" -#include "TelepathyQt4/_gen/dbus-proxy-factory-internal.moc.hpp" +#include "TelepathyQt/_gen/dbus-proxy-factory.moc.hpp" +#include "TelepathyQt/_gen/dbus-proxy-factory-internal.moc.hpp" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/DBusProxy> -#include <TelepathyQt4/ReadyObject> -#include <TelepathyQt4/PendingReady> +#include <TelepathyQt/DBusProxy> +#include <TelepathyQt/ReadyObject> +#include <TelepathyQt/PendingReady> #include <QDBusConnection> @@ -57,7 +57,7 @@ struct TP_QT_NO_EXPORT DBusProxyFactory::Private /** * \class DBusProxyFactory * \ingroup utils - * \headerfile TelepathyQt4/dbus-proxy-factory.h <TelepathyQt4/DBusProxyFactory> + * \headerfile TelepathyQt/dbus-proxy-factory.h <TelepathyQt/DBusProxyFactory> * * \brief The DBusProxyFactory class is a base class for all D-Bus proxy factory * classes. Handles proxy caching and making them ready as appropriate. diff --git a/TelepathyQt4/dbus-proxy-factory.h b/TelepathyQt/dbus-proxy-factory.h index c73dd0ea..1a7eaea7 100644 --- a/TelepathyQt4/dbus-proxy-factory.h +++ b/TelepathyQt/dbus-proxy-factory.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,16 +20,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_dbus_proxy_factory_h_HEADER_GUARD_ -#define _TelepathyQt4_dbus_proxy_factory_h_HEADER_GUARD_ +#ifndef _TelepathyQt_dbus_proxy_factory_h_HEADER_GUARD_ +#define _TelepathyQt_dbus_proxy_factory_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Global> -#include <TelepathyQt4/SharedPtr> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Global> +#include <TelepathyQt/SharedPtr> +#include <TelepathyQt/Types> // For Q_DISABLE_COPY #include <QtGlobal> diff --git a/TelepathyQt4/dbus-proxy.cpp b/TelepathyQt/dbus-proxy.cpp index 8ab49140..1496c454 100644 --- a/TelepathyQt4/dbus-proxy.cpp +++ b/TelepathyQt/dbus-proxy.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008-2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008-2010 Nokia Corporation @@ -22,13 +22,13 @@ #include "config.h" -#include <TelepathyQt4/DBusProxy> +#include <TelepathyQt/DBusProxy> -#include "TelepathyQt4/_gen/dbus-proxy.moc.hpp" +#include "TelepathyQt/_gen/dbus-proxy.moc.hpp" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/Constants> +#include <TelepathyQt/Constants> #include <QDBusConnection> #include <QDBusConnectionInterface> @@ -73,7 +73,7 @@ DBusProxy::Private::Private(const QDBusConnection &dbusConnection, /** * \class DBusProxy * \ingroup clientproxies - * \headerfile TelepathyQt4/dbus-proxy.h <TelepathyQt4/DBusProxy> + * \headerfile TelepathyQt/dbus-proxy.h <TelepathyQt/DBusProxy> * * \brief The DBusProxy class is a base class representing a remote object available over D-Bus. * @@ -258,7 +258,7 @@ struct TP_QT_NO_EXPORT StatefulDBusProxy::Private /** * \class StatefulDBusProxy * \ingroup clientproxies - * \headerfile TelepathyQt4/dbus-proxy.h <TelepathyQt4/StatefulDBusProxy> + * \headerfile TelepathyQt/dbus-proxy.h <TelepathyQt/StatefulDBusProxy> * * \brief The StatefulDBusProxy class is a base class representing a remote object whose API is * stateful. @@ -353,7 +353,7 @@ void StatefulDBusProxy::onServiceOwnerChanged(const QString &name, const QString /** * \class StatelessDBusProxy * \ingroup clientproxies - * \headerfile TelepathyQt4/dbus-proxy.h <TelepathyQt4/DBusProxy> + * \headerfile TelepathyQt/dbus-proxy.h <TelepathyQt/DBusProxy> * * \brief The StatelessDBusProxy class is a base class representing a remote object whose API is * basically stateless. diff --git a/TelepathyQt4/dbus-proxy.h b/TelepathyQt/dbus-proxy.h index f9ade155..0121d722 100644 --- a/TelepathyQt4/dbus-proxy.h +++ b/TelepathyQt/dbus-proxy.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008-2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008-2010 Nokia Corporation @@ -20,16 +20,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_dbus_proxy_h_HEADER_GUARD_ -#define _TelepathyQt4_dbus_proxy_h_HEADER_GUARD_ +#ifndef _TelepathyQt_dbus_proxy_h_HEADER_GUARD_ +#define _TelepathyQt_dbus_proxy_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Global> -#include <TelepathyQt4/Object> -#include <TelepathyQt4/ReadyObject> +#include <TelepathyQt/Global> +#include <TelepathyQt/Object> +#include <TelepathyQt/ReadyObject> class QDBusConnection; class QDBusError; diff --git a/TelepathyQt4/dbus.cpp b/TelepathyQt/dbus.cpp index 158c7c84..c146414e 100644 --- a/TelepathyQt4/dbus.cpp +++ b/TelepathyQt/dbus.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008 Nokia Corporation @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/DBus> +#include <TelepathyQt/DBus> -#include "TelepathyQt4/_gen/cli-dbus-body.hpp" -#include "TelepathyQt4/_gen/cli-dbus.moc.hpp" +#include "TelepathyQt/_gen/cli-dbus-body.hpp" +#include "TelepathyQt/_gen/cli-dbus.moc.hpp" diff --git a/TelepathyQt4/dbus.h b/TelepathyQt/dbus.h index 72104e38..6e3e7176 100644 --- a/TelepathyQt4/dbus.h +++ b/TelepathyQt/dbus.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008 Nokia Corporation @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_dbus_h_HEADER_GUARD_ -#define _TelepathyQt4_dbus_h_HEADER_GUARD_ +#ifndef _TelepathyQt_dbus_h_HEADER_GUARD_ +#define _TelepathyQt_dbus_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER @@ -49,6 +49,6 @@ * of blindly using the proxy provided here. */ -#include <TelepathyQt4/_gen/cli-dbus.h> +#include <TelepathyQt/_gen/cli-dbus.h> #endif diff --git a/TelepathyQt4/dbus.xml b/TelepathyQt/dbus.xml index 99af441c..99af441c 100644 --- a/TelepathyQt4/dbus.xml +++ b/TelepathyQt/dbus.xml diff --git a/TelepathyQt4/debug-internal.h b/TelepathyQt/debug-internal.h index 5cdc7979..c0076016 100644 --- a/TelepathyQt4/debug-internal.h +++ b/TelepathyQt/debug-internal.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008 Nokia Corporation @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_debug_HEADER_GUARD_ -#define _TelepathyQt4_debug_HEADER_GUARD_ +#ifndef _TelepathyQt_debug_HEADER_GUARD_ +#define _TelepathyQt_debug_HEADER_GUARD_ #include <QDebug> diff --git a/TelepathyQt4/debug.cpp b/TelepathyQt/debug.cpp index 6126210b..783b41d9 100644 --- a/TelepathyQt4/debug.cpp +++ b/TelepathyQt/debug.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008-2009 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008-2009 Nokia Corporation @@ -29,7 +29,7 @@ /** * \defgroup debug Common debug support * - * TelepathyQt4 has an internal mechanism for displaying debugging output. It + * TelepathyQt has an internal mechanism for displaying debugging output. It * uses the Qt4 debugging subsystem, so if you want to redirect the messages, * use qInstallMsgHandler() from <QtGlobal>. * diff --git a/TelepathyQt4/debug.h b/TelepathyQt/debug.h index 3de3c86f..a6ed0d72 100644 --- a/TelepathyQt4/debug.h +++ b/TelepathyQt/debug.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008-2009 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008-2009 Nokia Corporation @@ -20,14 +20,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_debug_h_HEADER_GUARD_ -#define _TelepathyQt4_debug_h_HEADER_GUARD_ +#ifndef _TelepathyQt_debug_h_HEADER_GUARD_ +#define _TelepathyQt_debug_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Global> +#include <TelepathyQt/Global> namespace Tp { diff --git a/TelepathyQt4/examples.dox b/TelepathyQt/examples.dox index decb3c21..5f592702 100644 --- a/TelepathyQt4/examples.dox +++ b/TelepathyQt/examples.dox @@ -1,5 +1,5 @@ /* - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008 Nokia Corporation diff --git a/TelepathyQt4/fake-handler-manager-internal.cpp b/TelepathyQt/fake-handler-manager-internal.cpp index f0c59554..e18ab425 100644 --- a/TelepathyQt4/fake-handler-manager-internal.cpp +++ b/TelepathyQt/fake-handler-manager-internal.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2011 Nokia Corporation @@ -20,11 +20,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "TelepathyQt4/fake-handler-manager-internal.h" +#include "TelepathyQt/fake-handler-manager-internal.h" -#include "TelepathyQt4/_gen/fake-handler-manager-internal.moc.hpp" +#include "TelepathyQt/_gen/fake-handler-manager-internal.moc.hpp" -#include <TelepathyQt4/Channel> +#include <TelepathyQt/Channel> namespace Tp { diff --git a/TelepathyQt4/fake-handler-manager-internal.h b/TelepathyQt/fake-handler-manager-internal.h index ad73dc3d..356bac95 100644 --- a/TelepathyQt4/fake-handler-manager-internal.h +++ b/TelepathyQt/fake-handler-manager-internal.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2011 Nokia Corporation @@ -20,13 +20,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_fake_handler_manager_internal_h_HEADER_GUARD_ -#define _TelepathyQt4_fake_handler_manager_internal_h_HEADER_GUARD_ +#ifndef _TelepathyQt_fake_handler_manager_internal_h_HEADER_GUARD_ +#define _TelepathyQt_fake_handler_manager_internal_h_HEADER_GUARD_ #include <QObject> -#include <TelepathyQt4/ClientRegistrar> -#include <TelepathyQt4/Types> +#include <TelepathyQt/ClientRegistrar> +#include <TelepathyQt/Types> namespace Tp { diff --git a/TelepathyQt4/feature.cpp b/TelepathyQt/feature.cpp index 48f3b7a8..1c442e9c 100644 --- a/TelepathyQt4/feature.cpp +++ b/TelepathyQt/feature.cpp @@ -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,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/Feature> +#include <TelepathyQt/Feature> namespace Tp { @@ -35,7 +35,7 @@ struct TP_QT_NO_EXPORT Feature::Private : public QSharedData /** * \class Feature * \ingroup utils - * \headerfile TelepathyQt4/feature.h <TelepathyQt4/Feature> + * \headerfile TelepathyQt/feature.h <TelepathyQt/Feature> * * \brief The Feature class represents a feature that can be enabled * on demand. @@ -81,7 +81,7 @@ bool Feature::isCritical() const /** * \class Features * \ingroup utils - * \headerfile TelepathyQt4/feature.h <TelepathyQt4/Features> + * \headerfile TelepathyQt/feature.h <TelepathyQt/Features> * * \brief The Features class represents a list of Feature. */ diff --git a/TelepathyQt4/feature.h b/TelepathyQt/feature.h index b66141cc..07ab3a55 100644 --- a/TelepathyQt4/feature.h +++ b/TelepathyQt/feature.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,14 +20,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_feature_h_HEADER_GUARD_ -#define _TelepathyQt4_feature_h_HEADER_GUARD_ +#ifndef _TelepathyQt_feature_h_HEADER_GUARD_ +#define _TelepathyQt_feature_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Global> +#include <TelepathyQt/Global> #include <QMetaType> #include <QPair> diff --git a/TelepathyQt4/file-transfer-channel-creation-properties.cpp b/TelepathyQt/file-transfer-channel-creation-properties.cpp index 6aa693e0..e7232b05 100644 --- a/TelepathyQt4/file-transfer-channel-creation-properties.cpp +++ b/TelepathyQt/file-transfer-channel-creation-properties.cpp @@ -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 */ -#include <TelepathyQt4/FileTransferChannelCreationProperties> +#include <TelepathyQt/FileTransferChannelCreationProperties> -#include <TelepathyQt4/Global> +#include <TelepathyQt/Global> -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" #include <QSharedData> #include <QFileInfo> @@ -81,7 +81,7 @@ struct TP_QT_NO_EXPORT FileTransferChannelCreationProperties::Private : public Q /** * \class FileTransferChannelCreationProperties * \ingroup clientchannel - * \headerfile TelepathyQt4/file-transfer-channel-creation-properties.h <TelepathyQt4/FileTransferChannelCreationProperties> + * \headerfile TelepathyQt/file-transfer-channel-creation-properties.h <TelepathyQt/FileTransferChannelCreationProperties> * * \brief The FileTransferChannelCreationProperties class represents the * properties of a file transfer channel request. diff --git a/TelepathyQt4/file-transfer-channel-creation-properties.h b/TelepathyQt/file-transfer-channel-creation-properties.h index 78eabcf7..a3904b4c 100644 --- a/TelepathyQt4/file-transfer-channel-creation-properties.h +++ b/TelepathyQt/file-transfer-channel-creation-properties.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,15 +20,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_file_transfer_channel_creation_properties_h_HEADER_GUARD_ -#define _TelepathyQt4_file_transfer_channel_creation_properties_h_HEADER_GUARD_ +#ifndef _TelepathyQt_file_transfer_channel_creation_properties_h_HEADER_GUARD_ +#define _TelepathyQt_file_transfer_channel_creation_properties_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/Global> +#include <TelepathyQt/Constants> +#include <TelepathyQt/Global> #include <QDateTime> #include <QMetaType> diff --git a/TelepathyQt4/file-transfer-channel.cpp b/TelepathyQt/file-transfer-channel.cpp index a00a10ae..e81618fa 100644 --- a/TelepathyQt4/file-transfer-channel.cpp +++ b/TelepathyQt/file-transfer-channel.cpp @@ -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,14 +20,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/FileTransferChannel> +#include <TelepathyQt/FileTransferChannel> -#include "TelepathyQt4/_gen/file-transfer-channel.moc.hpp" +#include "TelepathyQt/_gen/file-transfer-channel.moc.hpp" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Connection> +#include <TelepathyQt/Types> namespace Tp { @@ -145,7 +145,7 @@ void FileTransferChannel::Private::extractProperties(const QVariantMap &props) /** * \class FileTransferChannel * \ingroup clientchannel - * \headerfile TelepathyQt4/file-transfer-channel.h <TelepathyQt4/FileTransferChannel> + * \headerfile TelepathyQt/file-transfer-channel.h <TelepathyQt/FileTransferChannel> * * \brief The FileTransferChannel class represents a Telepathy channel of type * FileTransfer. diff --git a/TelepathyQt4/file-transfer-channel.h b/TelepathyQt/file-transfer-channel.h index 13b3cc96..a904b840 100644 --- a/TelepathyQt4/file-transfer-channel.h +++ b/TelepathyQt/file-transfer-channel.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,14 +20,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_file_transfer_channel_h_HEADER_GUARD_ -#define _TelepathyQt4_file_transfer_channel_h_HEADER_GUARD_ +#ifndef _TelepathyQt_file_transfer_channel_h_HEADER_GUARD_ +#define _TelepathyQt_file_transfer_channel_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Channel> +#include <TelepathyQt/Channel> namespace Tp { diff --git a/TelepathyQt4/filter.dox b/TelepathyQt/filter.dox index d69aa87e..23aaaab1 100644 --- a/TelepathyQt4/filter.dox +++ b/TelepathyQt/filter.dox @@ -1,5 +1,5 @@ /* - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2011 Nokia Corporation @@ -23,7 +23,7 @@ /** * \class Tp::Filter * \ingroup utils - * \headerfile TelepathyQt4/filter.h <TelepathyQt4/Filter> + * \headerfile TelepathyQt/filter.h <TelepathyQt/Filter> * * \brief The Filter class provides a base class to be used by specialized * filters such as GenericCapabilityFilter, GenericPropertyFilter, etc. diff --git a/TelepathyQt4/filter.h b/TelepathyQt/filter.h index 099663b2..33a5a8ca 100644 --- a/TelepathyQt4/filter.h +++ b/TelepathyQt/filter.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,15 +20,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_filter_h_HEADER_GUARD_ -#define _TelepathyQt4_filter_h_HEADER_GUARD_ +#ifndef _TelepathyQt_filter_h_HEADER_GUARD_ +#define _TelepathyQt_filter_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/SharedPtr> -#include <TelepathyQt4/Types> +#include <TelepathyQt/SharedPtr> +#include <TelepathyQt/Types> namespace Tp { diff --git a/TelepathyQt4/fixed-feature-factory.cpp b/TelepathyQt/fixed-feature-factory.cpp index 25e74e5f..3c285c0c 100644 --- a/TelepathyQt4/fixed-feature-factory.cpp +++ b/TelepathyQt/fixed-feature-factory.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,11 +20,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/FixedFeatureFactory> +#include <TelepathyQt/FixedFeatureFactory> -#include "TelepathyQt4/_gen/fixed-feature-factory.moc.hpp" +#include "TelepathyQt/_gen/fixed-feature-factory.moc.hpp" -#include <TelepathyQt4/Feature> +#include <TelepathyQt/Feature> namespace Tp { @@ -37,7 +37,7 @@ struct TP_QT_NO_EXPORT FixedFeatureFactory::Private /** * \class FixedFeatureFactory * \ingroup utils - * \headerfile TelepathyQt4/fixed-feature-factory.h <TelepathyQt4/FixedFeatureFactory> + * \headerfile TelepathyQt/fixed-feature-factory.h <TelepathyQt/FixedFeatureFactory> * * \brief The FixedFeatureFactory class is a base class for all D-Bus proxy * factories which want the same set of features for all constructed proxies. diff --git a/TelepathyQt4/fixed-feature-factory.h b/TelepathyQt/fixed-feature-factory.h index fce9c373..62672c7c 100644 --- a/TelepathyQt4/fixed-feature-factory.h +++ b/TelepathyQt/fixed-feature-factory.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,17 +20,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_fixed_feature_factory_h_HEADER_GUARD_ -#define _TelepathyQt4_fixed_feature_factory_h_HEADER_GUARD_ +#ifndef _TelepathyQt_fixed_feature_factory_h_HEADER_GUARD_ +#define _TelepathyQt_fixed_feature_factory_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Global> -#include <TelepathyQt4/SharedPtr> +#include <TelepathyQt/Global> +#include <TelepathyQt/SharedPtr> -#include <TelepathyQt4/DBusProxyFactory> +#include <TelepathyQt/DBusProxyFactory> class QDBusConnection; diff --git a/TelepathyQt4/future-channel-dispatcher.xml b/TelepathyQt/future-channel-dispatcher.xml index 0e7f67c5..0e7f67c5 100644 --- a/TelepathyQt4/future-channel-dispatcher.xml +++ b/TelepathyQt/future-channel-dispatcher.xml diff --git a/TelepathyQt4/future-channel.xml b/TelepathyQt/future-channel.xml index 6cf1e494..6cf1e494 100644 --- a/TelepathyQt4/future-channel.xml +++ b/TelepathyQt/future-channel.xml diff --git a/TelepathyQt4/future-interfaces.xml b/TelepathyQt/future-interfaces.xml index 8cc5d753..8cc5d753 100644 --- a/TelepathyQt4/future-interfaces.xml +++ b/TelepathyQt/future-interfaces.xml diff --git a/TelepathyQt4/future-internal.h b/TelepathyQt/future-internal.h index 3636ff2d..e472a9c9 100644 --- a/TelepathyQt4/future-internal.h +++ b/TelepathyQt/future-internal.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,17 +20,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_future_internal_h_HEADER_GUARD_ -#define _TelepathyQt4_future_internal_h_HEADER_GUARD_ +#ifndef _TelepathyQt_future_internal_h_HEADER_GUARD_ +#define _TelepathyQt_future_internal_h_HEADER_GUARD_ -#include "TelepathyQt4/_gen/future-constants.h" -#include "TelepathyQt4/_gen/future-types.h" +#include "TelepathyQt/_gen/future-constants.h" +#include "TelepathyQt/_gen/future-types.h" -#include "TelepathyQt4/Channel" -#include "TelepathyQt4/ChannelDispatcher" +#include "TelepathyQt/Channel" +#include "TelepathyQt/ChannelDispatcher" -#include "TelepathyQt4/_gen/future-channel.h" -#include "TelepathyQt4/_gen/future-channel-dispatcher.h" -#include "TelepathyQt4/_gen/future-misc.h" +#include "TelepathyQt/_gen/future-channel.h" +#include "TelepathyQt/_gen/future-channel-dispatcher.h" +#include "TelepathyQt/_gen/future-misc.h" #endif diff --git a/TelepathyQt4/future-misc.xml b/TelepathyQt/future-misc.xml index b756661e..b756661e 100644 --- a/TelepathyQt4/future-misc.xml +++ b/TelepathyQt/future-misc.xml diff --git a/TelepathyQt4/future.cpp b/TelepathyQt/future.cpp index 5bbcc62b..cefe8e5f 100644 --- a/TelepathyQt4/future.cpp +++ b/TelepathyQt/future.cpp @@ -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,13 +20,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "TelepathyQt4/future-internal.h" +#include "TelepathyQt/future-internal.h" -#include "TelepathyQt4/_gen/future-channel-body.hpp" -#include "TelepathyQt4/_gen/future-channel.moc.hpp" +#include "TelepathyQt/_gen/future-channel-body.hpp" +#include "TelepathyQt/_gen/future-channel.moc.hpp" -#include "TelepathyQt4/_gen/future-channel-dispatcher-body.hpp" -#include "TelepathyQt4/_gen/future-channel-dispatcher.moc.hpp" +#include "TelepathyQt/_gen/future-channel-dispatcher-body.hpp" +#include "TelepathyQt/_gen/future-channel-dispatcher.moc.hpp" -#include "TelepathyQt4/_gen/future-misc-body.hpp" -#include "TelepathyQt4/_gen/future-misc.moc.hpp" +#include "TelepathyQt/_gen/future-misc-body.hpp" +#include "TelepathyQt/_gen/future-misc.moc.hpp" diff --git a/TelepathyQt4/generic-capability-filter.dox b/TelepathyQt/generic-capability-filter.dox index 23c13b35..53d70ae7 100644 --- a/TelepathyQt4/generic-capability-filter.dox +++ b/TelepathyQt/generic-capability-filter.dox @@ -1,5 +1,5 @@ /* - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2011 Nokia Corporation @@ -23,7 +23,7 @@ /** * \class Tp::GenericCapabilityFilter * \ingroup utils - * \headerfile TelepathyQt4/generic-capability-filter.h <TelepathyQt4/GenericCapabilityFilter> + * \headerfile TelepathyQt/generic-capability-filter.h <TelepathyQt/GenericCapabilityFilter> * * \brief The GenericCapabilityFilter class provides a generic filter object to * be used to filter objects by capabilities. diff --git a/TelepathyQt4/generic-capability-filter.h b/TelepathyQt/generic-capability-filter.h index 10a6784e..ece57895 100644 --- a/TelepathyQt4/generic-capability-filter.h +++ b/TelepathyQt/generic-capability-filter.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,16 +20,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_generic_capability_filter_h_HEADER_GUARD_ -#define _TelepathyQt4_generic_capability_filter_h_HEADER_GUARD_ +#ifndef _TelepathyQt_generic_capability_filter_h_HEADER_GUARD_ +#define _TelepathyQt_generic_capability_filter_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/ConnectionCapabilities> -#include <TelepathyQt4/Filter> -#include <TelepathyQt4/Types> +#include <TelepathyQt/ConnectionCapabilities> +#include <TelepathyQt/Filter> +#include <TelepathyQt/Types> namespace Tp { diff --git a/TelepathyQt4/generic-property-filter.dox b/TelepathyQt/generic-property-filter.dox index e25b17b0..12a42451 100644 --- a/TelepathyQt4/generic-property-filter.dox +++ b/TelepathyQt/generic-property-filter.dox @@ -1,5 +1,5 @@ /* - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2011 Nokia Corporation @@ -23,7 +23,7 @@ /** * \class Tp::GenericPropertyFilter * \ingroup utils - * \headerfile TelepathyQt4/generic-property-filter.h <TelepathyQt4/GenericPropertyFilter> + * \headerfile TelepathyQt/generic-property-filter.h <TelepathyQt/GenericPropertyFilter> * * \brief The GenericPropertyFilter class provides a generic filter object * to be used to filter objects by properties. diff --git a/TelepathyQt4/generic-property-filter.h b/TelepathyQt/generic-property-filter.h index bd69ec9b..ac56b595 100644 --- a/TelepathyQt4/generic-property-filter.h +++ b/TelepathyQt/generic-property-filter.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,15 +20,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_generic_property_filter_h_HEADER_GUARD_ -#define _TelepathyQt4_generic_property_filter_h_HEADER_GUARD_ +#ifndef _TelepathyQt_generic_property_filter_h_HEADER_GUARD_ +#define _TelepathyQt_generic_property_filter_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Filter> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Filter> +#include <TelepathyQt/Types> namespace Tp { diff --git a/TelepathyQt4/global.h b/TelepathyQt/global.h index eb2111ec..eb2111ec 100644 --- a/TelepathyQt4/global.h +++ b/TelepathyQt/global.h diff --git a/TelepathyQt4/groups.dox b/TelepathyQt/groups.dox index e56eb1e1..bf7d34b3 100644 --- a/TelepathyQt4/groups.dox +++ b/TelepathyQt/groups.dox @@ -1,5 +1,5 @@ /* - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation diff --git a/TelepathyQt4/handled-channel-notifier.cpp b/TelepathyQt/handled-channel-notifier.cpp index e49f5d13..47b2b55b 100644 --- a/TelepathyQt4/handled-channel-notifier.cpp +++ b/TelepathyQt/handled-channel-notifier.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2011 Nokia Corporation @@ -20,15 +20,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/HandledChannelNotifier> +#include <TelepathyQt/HandledChannelNotifier> -#include "TelepathyQt4/_gen/handled-channel-notifier.moc.hpp" +#include "TelepathyQt/_gen/handled-channel-notifier.moc.hpp" -#include "TelepathyQt4/debug-internal.h" -#include "TelepathyQt4/request-temporary-handler-internal.h" +#include "TelepathyQt/debug-internal.h" +#include "TelepathyQt/request-temporary-handler-internal.h" -#include <TelepathyQt4/ChannelRequestHints> -#include <TelepathyQt4/ClientRegistrar> +#include <TelepathyQt/ChannelRequestHints> +#include <TelepathyQt/ClientRegistrar> namespace Tp { @@ -51,7 +51,7 @@ struct TP_QT_NO_EXPORT HandledChannelNotifier::Private /** * \class HandledChannelNotifier * \ingroup clientchannel - * \headerfile TelepathyQt4/handled-channel-notifier.h <TelepathyQt4/HandledChannelNotifier> + * \headerfile TelepathyQt/handled-channel-notifier.h <TelepathyQt/HandledChannelNotifier> * * \brief The HandledChannelNotifier class can be used to keep track of * channel() being re-requested. diff --git a/TelepathyQt4/handled-channel-notifier.h b/TelepathyQt/handled-channel-notifier.h index 8571c245..0dab6af7 100644 --- a/TelepathyQt4/handled-channel-notifier.h +++ b/TelepathyQt/handled-channel-notifier.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2011 Nokia Corporation @@ -20,15 +20,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_handled_channel_notifier_h_HEADER_GUARD_ -#define _TelepathyQt4_handled_channel_notifier_h_HEADER_GUARD_ +#ifndef _TelepathyQt_handled_channel_notifier_h_HEADER_GUARD_ +#define _TelepathyQt_handled_channel_notifier_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Channel> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Channel> +#include <TelepathyQt/Types> #include <QObject> diff --git a/TelepathyQt4/incoming-file-transfer-channel.cpp b/TelepathyQt/incoming-file-transfer-channel.cpp index 89c1357a..3af20197 100644 --- a/TelepathyQt4/incoming-file-transfer-channel.cpp +++ b/TelepathyQt/incoming-file-transfer-channel.cpp @@ -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,17 +20,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/IncomingFileTransferChannel> +#include <TelepathyQt/IncomingFileTransferChannel> -#include "TelepathyQt4/_gen/incoming-file-transfer-channel.moc.hpp" +#include "TelepathyQt/_gen/incoming-file-transfer-channel.moc.hpp" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/PendingFailure> -#include <TelepathyQt4/PendingVariant> -#include <TelepathyQt4/Types> -#include <TelepathyQt4/types-internal.h> +#include <TelepathyQt/Connection> +#include <TelepathyQt/PendingFailure> +#include <TelepathyQt/PendingVariant> +#include <TelepathyQt/Types> +#include <TelepathyQt/types-internal.h> #include <QIODevice> #include <QTcpSocket> @@ -79,7 +79,7 @@ IncomingFileTransferChannel::Private::~Private() /** * \class IncomingFileTransferChannel * \ingroup clientchannel - * \headerfile TelepathyQt4/incoming-file-transfer-channel.h <TelepathyQt4/IncomingFileTransferChannel> + * \headerfile TelepathyQt/incoming-file-transfer-channel.h <TelepathyQt/IncomingFileTransferChannel> * * \brief The IncomingFileTransferChannel class represents a Telepathy channel * of type FileTransfer for incoming file transfers. diff --git a/TelepathyQt4/incoming-file-transfer-channel.h b/TelepathyQt/incoming-file-transfer-channel.h index 6c4e4de6..01937d3f 100644 --- a/TelepathyQt4/incoming-file-transfer-channel.h +++ b/TelepathyQt/incoming-file-transfer-channel.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,14 +20,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_incoming_file_transfer_channel_h_HEADER_GUARD_ -#define _TelepathyQt4_incoming_file_transfer_channel_h_HEADER_GUARD_ +#ifndef _TelepathyQt_incoming_file_transfer_channel_h_HEADER_GUARD_ +#define _TelepathyQt_incoming_file_transfer_channel_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/FileTransferChannel> +#include <TelepathyQt/FileTransferChannel> #include <QAbstractSocket> diff --git a/TelepathyQt4/incoming-stream-tube-channel.cpp b/TelepathyQt/incoming-stream-tube-channel.cpp index 583e925f..d73d011d 100644 --- a/TelepathyQt4/incoming-stream-tube-channel.cpp +++ b/TelepathyQt/incoming-stream-tube-channel.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010-2011 Collabora Ltd. <http://www.collabora.co.uk/> * @license LGPL 2.1 @@ -19,17 +19,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/IncomingStreamTubeChannel> +#include <TelepathyQt/IncomingStreamTubeChannel> -#include "TelepathyQt4/_gen/incoming-stream-tube-channel.moc.hpp" +#include "TelepathyQt/_gen/incoming-stream-tube-channel.moc.hpp" -#include "TelepathyQt4/types-internal.h" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/types-internal.h" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/PendingFailure> -#include <TelepathyQt4/PendingStreamTubeConnection> -#include <TelepathyQt4/PendingVariant> -#include <TelepathyQt4/Types> +#include <TelepathyQt/PendingFailure> +#include <TelepathyQt/PendingStreamTubeConnection> +#include <TelepathyQt/PendingVariant> +#include <TelepathyQt/Types> #include <QHostAddress> @@ -55,7 +55,7 @@ IncomingStreamTubeChannel::Private::Private(IncomingStreamTubeChannel *parent) /** * \class IncomingStreamTubeChannel * \ingroup clientchannel - * \headerfile TelepathyQt4/incoming-stream-tube-channel.h <TelepathyQt4/IncomingStreamTubeChannel> + * \headerfile TelepathyQt/incoming-stream-tube-channel.h <TelepathyQt/IncomingStreamTubeChannel> * * \brief The IncomingStreamTubeChannel class represents an incoming Telepathy channel * of type StreamTube. diff --git a/TelepathyQt4/incoming-stream-tube-channel.h b/TelepathyQt/incoming-stream-tube-channel.h index 4584494f..1dff19cb 100644 --- a/TelepathyQt4/incoming-stream-tube-channel.h +++ b/TelepathyQt/incoming-stream-tube-channel.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010-2011 Collabora Ltd. <http://www.collabora.co.uk/> * @license LGPL 2.1 @@ -19,14 +19,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_incoming_stream_tube_channel_h_HEADER_GUARD_ -#define _TelepathyQt4_incoming_stream_tube_channel_h_HEADER_GUARD_ +#ifndef _TelepathyQt_incoming_stream_tube_channel_h_HEADER_GUARD_ +#define _TelepathyQt_incoming_stream_tube_channel_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/StreamTubeChannel> +#include <TelepathyQt/StreamTubeChannel> #include <QtNetwork/QHostAddress> diff --git a/TelepathyQt4/key-file.cpp b/TelepathyQt/key-file.cpp index 0c95e44d..a5ca9f46 100644 --- a/TelepathyQt4/key-file.cpp +++ b/TelepathyQt/key-file.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008-2009 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008-2009 Nokia Corporation @@ -20,11 +20,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/KeyFile> +#include <TelepathyQt/KeyFile> -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/Utils> +#include <TelepathyQt/Utils> #include <QtCore/QByteArray> #include <QtCore/QFile> @@ -284,7 +284,7 @@ QStringList KeyFile::Private::valueAsStringList(const QString &key) const /** * \class KeyFile * \ingroup utils - * \headerfile TelepathyQt4/key-file.h <TelepathyQt4/KeyFile> + * \headerfile TelepathyQt/key-file.h <TelepathyQt/KeyFile> * * \brief The KeyFile class provides an easy way to read key-pair files such as * INI style files and .desktop files. diff --git a/TelepathyQt4/key-file.h b/TelepathyQt/key-file.h index 85e35e22..74d50d15 100644 --- a/TelepathyQt4/key-file.h +++ b/TelepathyQt/key-file.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008 Nokia Corporation @@ -20,14 +20,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_key_file_h_HEADER_GUARD_ -#define _TelepathyQt4_key_file_h_HEADER_GUARD_ +#ifndef _TelepathyQt_key_file_h_HEADER_GUARD_ +#define _TelepathyQt_key_file_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Global> +#include <TelepathyQt/Global> #include <QMetaType> #include <QtGlobal> diff --git a/TelepathyQt4/location-info.cpp b/TelepathyQt/location-info.cpp index e0b47c64..db7ac75b 100644 --- a/TelepathyQt4/location-info.cpp +++ b/TelepathyQt/location-info.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/LocationInfo> +#include <TelepathyQt/LocationInfo> #include <QDBusArgument> @@ -35,7 +35,7 @@ struct TP_QT_NO_EXPORT LocationInfo::Private : public QSharedData /** * \class LocationInfo * \ingroup clientconn - * \headerfile TelepathyQt4/location-info.h <TelepathyQt4/LocationInfo> + * \headerfile TelepathyQt/location-info.h <TelepathyQt/LocationInfo> * * \brief The LocationInfo class represents the location of a * Telepathy Contact. diff --git a/TelepathyQt4/location-info.h b/TelepathyQt/location-info.h index cafe63c2..221fbed2 100644 --- a/TelepathyQt4/location-info.h +++ b/TelepathyQt/location-info.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,14 +20,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_location_info_h_HEADER_GUARD_ -#define _TelepathyQt4_location_info_h_HEADER_GUARD_ +#ifndef _TelepathyQt_location_info_h_HEADER_GUARD_ +#define _TelepathyQt_location_info_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Global> +#include <TelepathyQt/Global> #include <QDateTime> #include <QSharedDataPointer> diff --git a/TelepathyQt4/main.dox b/TelepathyQt/main.dox index 10042ba2..d87e346e 100644 --- a/TelepathyQt4/main.dox +++ b/TelepathyQt/main.dox @@ -1,5 +1,5 @@ /* - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008 Nokia Corporation diff --git a/TelepathyQt4/manager-file.cpp b/TelepathyQt/manager-file.cpp index 7f4b14a2..e04c1e49 100644 --- a/TelepathyQt4/manager-file.cpp +++ b/TelepathyQt/manager-file.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008-2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008-2010 Nokia Corporation @@ -20,12 +20,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/ManagerFile> +#include <TelepathyQt/ManagerFile> -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/KeyFile> +#include <TelepathyQt/Constants> +#include <TelepathyQt/KeyFile> #include <QtCore/QDir> #include <QtCore/QHash> @@ -367,7 +367,7 @@ QVariant ManagerFile::Private::valueForKey(const QString ¶m, /** * \class ManagerFile * \ingroup utils - * \headerfile TelepathyQt4/manager-file.h <TelepathyQt4/ManagerFile> + * \headerfile TelepathyQt/manager-file.h <TelepathyQt/ManagerFile> * * \brief The ManagerFile class provides an easy way to read Telepathy manager * files according to the \telepathy_spec. diff --git a/TelepathyQt4/manager-file.h b/TelepathyQt/manager-file.h index d7734184..200c89d0 100644 --- a/TelepathyQt4/manager-file.h +++ b/TelepathyQt/manager-file.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008-2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008-2010 Nokia Corporation @@ -20,16 +20,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_manager_file_h_HEADER_GUARD_ -#define _TelepathyQt4_manager_file_h_HEADER_GUARD_ +#ifndef _TelepathyQt_manager_file_h_HEADER_GUARD_ +#define _TelepathyQt_manager_file_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/AvatarSpec> -#include <TelepathyQt4/PresenceSpec> -#include <TelepathyQt4/Types> +#include <TelepathyQt/AvatarSpec> +#include <TelepathyQt/PresenceSpec> +#include <TelepathyQt/Types> #include <QMetaType> #include <QVariant> diff --git a/TelepathyQt4/media-session-handler.cpp b/TelepathyQt/media-session-handler.cpp index 18dfb538..b3eb4789 100644 --- a/TelepathyQt4/media-session-handler.cpp +++ b/TelepathyQt/media-session-handler.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008 Nokia Corporation @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/MediaSessionHandler> +#include <TelepathyQt/MediaSessionHandler> -#include "TelepathyQt4/_gen/cli-media-session-handler-body.hpp" -#include "TelepathyQt4/_gen/cli-media-session-handler.moc.hpp" +#include "TelepathyQt/_gen/cli-media-session-handler-body.hpp" +#include "TelepathyQt/_gen/cli-media-session-handler.moc.hpp" diff --git a/TelepathyQt4/media-session-handler.h b/TelepathyQt/media-session-handler.h index 27765a8c..9603f888 100644 --- a/TelepathyQt4/media-session-handler.h +++ b/TelepathyQt/media-session-handler.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008 Nokia Corporation @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_media_session_handler_h_HEADER_GUARD_ -#define _TelepathyQt4_media_session_handler_h_HEADER_GUARD_ +#ifndef _TelepathyQt_media_session_handler_h_HEADER_GUARD_ +#define _TelepathyQt_media_session_handler_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER @@ -45,6 +45,6 @@ * Proxy objects representing remote Telepathy MediaSessionHandler objects. */ -#include <TelepathyQt4/_gen/cli-media-session-handler.h> +#include <TelepathyQt/_gen/cli-media-session-handler.h> #endif diff --git a/TelepathyQt4/media-session-handler.xml b/TelepathyQt/media-session-handler.xml index 8b051cd2..8b051cd2 100644 --- a/TelepathyQt4/media-session-handler.xml +++ b/TelepathyQt/media-session-handler.xml diff --git a/TelepathyQt4/media-stream-handler.cpp b/TelepathyQt/media-stream-handler.cpp index dbfedb54..1361716f 100644 --- a/TelepathyQt4/media-stream-handler.cpp +++ b/TelepathyQt/media-stream-handler.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008 Nokia Corporation @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/MediaStreamHandler> +#include <TelepathyQt/MediaStreamHandler> -#include "TelepathyQt4/_gen/cli-media-stream-handler-body.hpp" -#include "TelepathyQt4/_gen/cli-media-stream-handler.moc.hpp" +#include "TelepathyQt/_gen/cli-media-stream-handler-body.hpp" +#include "TelepathyQt/_gen/cli-media-stream-handler.moc.hpp" diff --git a/TelepathyQt4/media-stream-handler.h b/TelepathyQt/media-stream-handler.h index dd9a04ca..635d8490 100644 --- a/TelepathyQt4/media-stream-handler.h +++ b/TelepathyQt/media-stream-handler.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008 Nokia Corporation @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_media_stream_handler_h_HEADER_GUARD_ -#define _TelepathyQt4_media_stream_handler_h_HEADER_GUARD_ +#ifndef _TelepathyQt_media_stream_handler_h_HEADER_GUARD_ +#define _TelepathyQt_media_stream_handler_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER @@ -45,6 +45,6 @@ * Proxy objects representing remote Telepathy MediaStreamHandler objects. */ -#include <TelepathyQt4/_gen/cli-media-stream-handler.h> +#include <TelepathyQt/_gen/cli-media-stream-handler.h> #endif diff --git a/TelepathyQt4/media-stream-handler.xml b/TelepathyQt/media-stream-handler.xml index 348d5a68..348d5a68 100644 --- a/TelepathyQt4/media-stream-handler.xml +++ b/TelepathyQt/media-stream-handler.xml diff --git a/TelepathyQt4/message-content-part.cpp b/TelepathyQt/message-content-part.cpp index 9a20046c..13363583 100644 --- a/TelepathyQt4/message-content-part.cpp +++ b/TelepathyQt/message-content-part.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2011 Nokia Corporation @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/MessageContentPart> +#include <TelepathyQt/MessageContentPart> #include <QSharedData> @@ -38,7 +38,7 @@ struct TP_QT_NO_EXPORT MessageContentPart::Private : public QSharedData /** * \class MessageContentPart * \ingroup wrappers - * \headerfile TelepathyQt4/message-content-part.h <TelepathyQt4/MessageContentPart> + * \headerfile TelepathyQt/message-content-part.h <TelepathyQt/MessageContentPart> * * \brief The MessageContentPart class represents a Telepathy message part. */ @@ -87,7 +87,7 @@ MessagePart MessageContentPart::barePart() const /** * \class MessageContentPartList * \ingroup wrappers - * \headerfile TelepathyQt4/message-content-part.h <TelepathyQt4/MessageContentPartList> + * \headerfile TelepathyQt/message-content-part.h <TelepathyQt/MessageContentPartList> * * \brief The MessageContentPartList class represents a list of * MessageContentPart. diff --git a/TelepathyQt4/message-content-part.h b/TelepathyQt/message-content-part.h index 4bde3e50..7ad289e6 100644 --- a/TelepathyQt4/message-content-part.h +++ b/TelepathyQt/message-content-part.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2011 Nokia Corporation @@ -20,15 +20,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_message_content_part_h_HEADER_GUARD_ -#define _TelepathyQt4_message_content_part_h_HEADER_GUARD_ +#ifndef _TelepathyQt_message_content_part_h_HEADER_GUARD_ +#define _TelepathyQt_message_content_part_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Constants> +#include <TelepathyQt/Types> namespace Tp { diff --git a/TelepathyQt4/message.cpp b/TelepathyQt/message.cpp index 1d188762..1f6ca82b 100644 --- a/TelepathyQt4/message.cpp +++ b/TelepathyQt/message.cpp @@ -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,12 +20,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/Message> -#include <TelepathyQt4/ReceivedMessage> +#include <TelepathyQt/Message> +#include <TelepathyQt/ReceivedMessage> -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/TextChannel> +#include <TelepathyQt/TextChannel> #include <QDateTime> #include <QPointer> @@ -133,7 +133,7 @@ void Message::Private::clearSenderHandle() /** * \class Message * \ingroup clientchannel - * \headerfile TelepathyQt4/message.h <TelepathyQt4/Message> + * \headerfile TelepathyQt/message.h <TelepathyQt/Message> * * \brief The Message class represents a Telepathy message in a TextChannel. * @@ -455,7 +455,7 @@ MessagePartList Message::parts() const /** * \class ReceivedMessage * \ingroup clientchannel - * \headerfile TelepathyQt4/message.h <TelepathyQt4/ReceivedMessage> + * \headerfile TelepathyQt/message.h <TelepathyQt/ReceivedMessage> * * \brief The ReceivedMessage class is a subclass of Message, representing a * received message only. @@ -467,7 +467,7 @@ MessagePartList Message::parts() const /** * \class ReceivedMessage::DeliveryDetails * \ingroup clientchannel - * \headerfile TelepathyQt4/message.h <TelepathyQt4/ReceivedMessage> + * \headerfile TelepathyQt/message.h <TelepathyQt/ReceivedMessage> * * \brief The ReceivedMessage::DeliveryDetails class represents the details of a delivery report. */ diff --git a/TelepathyQt4/message.h b/TelepathyQt/message.h index 3f2fbdae..c6a0211c 100644 --- a/TelepathyQt4/message.h +++ b/TelepathyQt/message.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,8 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_message_h_HEADER_GUARD_ -#define _TelepathyQt4_message_h_HEADER_GUARD_ +#ifndef _TelepathyQt_message_h_HEADER_GUARD_ +#define _TelepathyQt_message_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER @@ -29,9 +29,9 @@ #include <QSharedDataPointer> -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/Contact> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Constants> +#include <TelepathyQt/Contact> +#include <TelepathyQt/Types> class QDateTime; diff --git a/TelepathyQt4/method-invocation-context.dox b/TelepathyQt/method-invocation-context.dox index 31975cbb..dd7f4ab5 100644 --- a/TelepathyQt4/method-invocation-context.dox +++ b/TelepathyQt/method-invocation-context.dox @@ -1,5 +1,5 @@ /* - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2011 Nokia Corporation @@ -23,7 +23,7 @@ /** * \class Tp::MethodInvocationContext * \ingroup utils - * \headerfile TelepathyQt4/method-invocation-context.h <TelepathyQt4/MethodInvocationContext> + * \headerfile TelepathyQt/method-invocation-context.h <TelepathyQt/MethodInvocationContext> * * \brief The MethodInvocationContext class provides a way for the service implementation to * respond to method calls. diff --git a/TelepathyQt4/method-invocation-context.h b/TelepathyQt/method-invocation-context.h index c1ee2fde..29c5f9fb 100644 --- a/TelepathyQt4/method-invocation-context.h +++ b/TelepathyQt/method-invocation-context.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,8 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_method_invocation_context_h_HEADER_GUARD_ -#define _TelepathyQt4_method_invocation_context_h_HEADER_GUARD_ +#ifndef _TelepathyQt_method_invocation_context_h_HEADER_GUARD_ +#define _TelepathyQt_method_invocation_context_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER diff --git a/TelepathyQt4/not-filter.dox b/TelepathyQt/not-filter.dox index f67a3b05..3c45a812 100644 --- a/TelepathyQt4/not-filter.dox +++ b/TelepathyQt/not-filter.dox @@ -1,5 +1,5 @@ /* - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2011 Nokia Corporation @@ -23,7 +23,7 @@ /** * \class Tp::NotFilter * \ingroup utils - * \headerfile TelepathyQt4/not-filter.h <TelepathyQt4/NotFilter> + * \headerfile TelepathyQt/not-filter.h <TelepathyQt/NotFilter> * * \brief The NotFilter class provides a generic filter object to be used * in conjunction of other filters. diff --git a/TelepathyQt4/not-filter.h b/TelepathyQt/not-filter.h index 09068005..b31b38ee 100644 --- a/TelepathyQt4/not-filter.h +++ b/TelepathyQt/not-filter.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,15 +20,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_not_filter_h_HEADER_GUARD_ -#define _TelepathyQt4_not_filter_h_HEADER_GUARD_ +#ifndef _TelepathyQt_not_filter_h_HEADER_GUARD_ +#define _TelepathyQt_not_filter_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Filter> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Filter> +#include <TelepathyQt/Types> namespace Tp { diff --git a/TelepathyQt4/object.cpp b/TelepathyQt/object.cpp index ff50a412..8d5555f4 100644 --- a/TelepathyQt4/object.cpp +++ b/TelepathyQt/object.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,9 +20,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/Object> +#include <TelepathyQt/Object> -#include "TelepathyQt4/_gen/object.moc.hpp" +#include "TelepathyQt/_gen/object.moc.hpp" namespace Tp { @@ -30,7 +30,7 @@ namespace Tp /** * \class Object * \ingroup clientobject - * \headerfile TelepathyQt4/object.h <TelepathyQt4/Object> + * \headerfile TelepathyQt/object.h <TelepathyQt/Object> * * \brief The Object class provides an object with property notification. */ diff --git a/TelepathyQt4/object.h b/TelepathyQt/object.h index f61d6911..7e24fb88 100644 --- a/TelepathyQt4/object.h +++ b/TelepathyQt/object.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,15 +20,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_object_h_HEADER_GUARD_ -#define _TelepathyQt4_object_h_HEADER_GUARD_ +#ifndef _TelepathyQt_object_h_HEADER_GUARD_ +#define _TelepathyQt_object_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Global> -#include <TelepathyQt4/RefCounted> +#include <TelepathyQt/Global> +#include <TelepathyQt/RefCounted> #include <QObject> #include <QString> diff --git a/TelepathyQt4/optional-interface-factory.cpp b/TelepathyQt/optional-interface-factory.cpp index 3007c6e9..4b0f8b8a 100644 --- a/TelepathyQt4/optional-interface-factory.cpp +++ b/TelepathyQt/optional-interface-factory.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008-2009 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008-2009 Nokia Corporation @@ -20,11 +20,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/OptionalInterfaceFactory> +#include <TelepathyQt/OptionalInterfaceFactory> -#include <TelepathyQt4/AbstractInterface> +#include <TelepathyQt/AbstractInterface> -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" #include <QMap> #include <QString> @@ -92,7 +92,7 @@ void OptionalInterfaceCache::cache(AbstractInterface *interface) const /** * \class OptionalInterfaceFactory * \ingroup clientsideproxies - * \headerfile TelepathyQt4/optional-interface-factory.h <TelepathyQt4/OptionalInterfaceFactory> + * \headerfile TelepathyQt/optional-interface-factory.h <TelepathyQt/OptionalInterfaceFactory> * * \brief The OptionalInterfaceFactory class is a helper class for * high-level D-Bus proxy classes willing to offer access to shared diff --git a/TelepathyQt4/optional-interface-factory.h b/TelepathyQt/optional-interface-factory.h index a825e063..babbe47e 100644 --- a/TelepathyQt4/optional-interface-factory.h +++ b/TelepathyQt/optional-interface-factory.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008-2009 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008-2009 Nokia Corporation @@ -20,14 +20,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_optional_interface_factory_h_HEADER_GUARD_ -#define _TelepathyQt4_optional_interface_factory_h_HEADER_GUARD_ +#ifndef _TelepathyQt_optional_interface_factory_h_HEADER_GUARD_ +#define _TelepathyQt_optional_interface_factory_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Global> +#include <TelepathyQt/Global> #include <QObject> #include <QStringList> diff --git a/TelepathyQt4/or-filter.dox b/TelepathyQt/or-filter.dox index 451c5142..7829397c 100644 --- a/TelepathyQt4/or-filter.dox +++ b/TelepathyQt/or-filter.dox @@ -1,5 +1,5 @@ /* - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2011 Nokia Corporation @@ -23,7 +23,7 @@ /** * \class Tp::OrFilter * \ingroup utils - * \headerfile TelepathyQt4/or-filter.h <TelepathyQt4/OrFilter> + * \headerfile TelepathyQt/or-filter.h <TelepathyQt/OrFilter> * * \brief The OrFilter class provides a generic filter object to be used * in conjunction of other filters. diff --git a/TelepathyQt4/or-filter.h b/TelepathyQt/or-filter.h index 534fecc0..c9b1c428 100644 --- a/TelepathyQt4/or-filter.h +++ b/TelepathyQt/or-filter.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,15 +20,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_or_filter_h_HEADER_GUARD_ -#define _TelepathyQt4_or_filter_h_HEADER_GUARD_ +#ifndef _TelepathyQt_or_filter_h_HEADER_GUARD_ +#define _TelepathyQt_or_filter_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Filter> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Filter> +#include <TelepathyQt/Types> namespace Tp { diff --git a/TelepathyQt4/outgoing-file-transfer-channel.cpp b/TelepathyQt/outgoing-file-transfer-channel.cpp index 4309e131..2fbd4504 100644 --- a/TelepathyQt4/outgoing-file-transfer-channel.cpp +++ b/TelepathyQt/outgoing-file-transfer-channel.cpp @@ -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,17 +20,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/OutgoingFileTransferChannel> +#include <TelepathyQt/OutgoingFileTransferChannel> -#include "TelepathyQt4/_gen/outgoing-file-transfer-channel.moc.hpp" +#include "TelepathyQt/_gen/outgoing-file-transfer-channel.moc.hpp" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/PendingFailure> -#include <TelepathyQt4/PendingVariant> -#include <TelepathyQt4/Types> -#include <TelepathyQt4/types-internal.h> +#include <TelepathyQt/Connection> +#include <TelepathyQt/PendingFailure> +#include <TelepathyQt/PendingVariant> +#include <TelepathyQt/Types> +#include <TelepathyQt/types-internal.h> #include <QIODevice> #include <QTcpSocket> @@ -74,7 +74,7 @@ OutgoingFileTransferChannel::Private::~Private() /** * \class OutgoingFileTransferChannel * \ingroup clientchannel - * \headerfile TelepathyQt4/outgoing-file-transfer-channel.h <TelepathyQt4/OutgoingFileTransferChannel> + * \headerfile TelepathyQt/outgoing-file-transfer-channel.h <TelepathyQt/OutgoingFileTransferChannel> * * \brief The OutgoingFileTransferChannel class represents a Telepathy channel * of type FileTransfer for outgoing file transfers. diff --git a/TelepathyQt4/outgoing-file-transfer-channel.h b/TelepathyQt/outgoing-file-transfer-channel.h index af4ef5bd..37daa842 100644 --- a/TelepathyQt4/outgoing-file-transfer-channel.h +++ b/TelepathyQt/outgoing-file-transfer-channel.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,14 +20,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_outgoing_file_transfer_channel_h_HEADER_GUARD_ -#define _TelepathyQt4_outgoing_file_transfer_channel_h_HEADER_GUARD_ +#ifndef _TelepathyQt_outgoing_file_transfer_channel_h_HEADER_GUARD_ +#define _TelepathyQt_outgoing_file_transfer_channel_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/FileTransferChannel> +#include <TelepathyQt/FileTransferChannel> #include <QAbstractSocket> diff --git a/TelepathyQt4/outgoing-stream-tube-channel-internal.h b/TelepathyQt/outgoing-stream-tube-channel-internal.h index ea4af17a..b7fe41c8 100644 --- a/TelepathyQt4/outgoing-stream-tube-channel-internal.h +++ b/TelepathyQt/outgoing-stream-tube-channel-internal.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @license LGPL 2.1 @@ -19,11 +19,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_outgoing_stream_tube_channel_internal_h_HEADER_GUARD_ -#define _TelepathyQt4_outgoing_stream_tube_channel_internal_h_HEADER_GUARD_ +#ifndef _TelepathyQt_outgoing_stream_tube_channel_internal_h_HEADER_GUARD_ +#define _TelepathyQt_outgoing_stream_tube_channel_internal_h_HEADER_GUARD_ -#include <TelepathyQt4/OutgoingStreamTubeChannel> -#include <TelepathyQt4/PendingOperation> +#include <TelepathyQt/OutgoingStreamTubeChannel> +#include <TelepathyQt/PendingOperation> namespace Tp { diff --git a/TelepathyQt4/outgoing-stream-tube-channel.cpp b/TelepathyQt/outgoing-stream-tube-channel.cpp index 0e95c455..22af7b8f 100644 --- a/TelepathyQt4/outgoing-stream-tube-channel.cpp +++ b/TelepathyQt/outgoing-stream-tube-channel.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010-2011 Collabora Ltd. <http://www.collabora.co.uk/> * @license LGPL 2.1 @@ -19,20 +19,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/OutgoingStreamTubeChannel> -#include "TelepathyQt4/outgoing-stream-tube-channel-internal.h" +#include <TelepathyQt/OutgoingStreamTubeChannel> +#include "TelepathyQt/outgoing-stream-tube-channel-internal.h" -#include "TelepathyQt4/_gen/outgoing-stream-tube-channel.moc.hpp" -#include "TelepathyQt4/_gen/outgoing-stream-tube-channel-internal.moc.hpp" +#include "TelepathyQt/_gen/outgoing-stream-tube-channel.moc.hpp" +#include "TelepathyQt/_gen/outgoing-stream-tube-channel-internal.moc.hpp" -#include "TelepathyQt4/debug-internal.h" -#include "TelepathyQt4/types-internal.h" +#include "TelepathyQt/debug-internal.h" +#include "TelepathyQt/types-internal.h" -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/ContactManager> -#include <TelepathyQt4/PendingContacts> -#include <TelepathyQt4/PendingFailure> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Connection> +#include <TelepathyQt/ContactManager> +#include <TelepathyQt/PendingContacts> +#include <TelepathyQt/PendingFailure> +#include <TelepathyQt/Types> #include <QHostAddress> #include <QTcpServer> @@ -185,7 +185,7 @@ OutgoingStreamTubeChannel::Private::Private(OutgoingStreamTubeChannel *parent) /** * \class OutgoingStreamTubeChannel * \ingroup clientchannel - * \headerfile TelepathyQt4/outgoing-stream-tube-channel.h <TelepathyQt4/OutgoingStreamTubeChannel> + * \headerfile TelepathyQt/outgoing-stream-tube-channel.h <TelepathyQt/OutgoingStreamTubeChannel> * * \brief The OutgoingStreamTubeChannel class represents an outgoing Telepathy channel * of type StreamTube. @@ -283,7 +283,7 @@ OutgoingStreamTubeChannel::~OutgoingStreamTubeChannel() * * Arbitrary parameters can be associated with the offer to bootstrap legacy protocols; these will * in particular be available as IncomingStreamTubeChannel::parameters() for a tube receiver - * implemented using TelepathyQt4 in the other end. + * implemented using TelepathyQt in the other end. * * This method requires OutgoingStreamTubeChannel::FeatureCore to be ready. * @@ -448,7 +448,7 @@ PendingOperation *OutgoingStreamTubeChannel::offerTcpSocket( * * Arbitrary parameters can be associated with the offer to bootstrap legacy protocols; these will * in particular be available as IncomingStreamTubeChannel::parameters() for a tube receiver - * implemented using TelepathyQt4 in the other end. + * implemented using TelepathyQt in the other end. * * This method requires OutgoingStreamTubeChannel::FeatureCore to be ready. * diff --git a/TelepathyQt4/outgoing-stream-tube-channel.h b/TelepathyQt/outgoing-stream-tube-channel.h index 7bc9472b..0a89a97b 100644 --- a/TelepathyQt4/outgoing-stream-tube-channel.h +++ b/TelepathyQt/outgoing-stream-tube-channel.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010-2011 Collabora Ltd. <http://www.collabora.co.uk/> * @license LGPL 2.1 @@ -19,15 +19,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_outgoing_stream_tube_channel_h_HEADER_GUARD_ -#define _TelepathyQt4_outgoing_stream_tube_channel_h_HEADER_GUARD_ +#ifndef _TelepathyQt_outgoing_stream_tube_channel_h_HEADER_GUARD_ +#define _TelepathyQt_outgoing_stream_tube_channel_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/StreamTubeChannel> -#include <TelepathyQt4/PendingOperation> +#include <TelepathyQt/StreamTubeChannel> +#include <TelepathyQt/PendingOperation> class QHostAddress; class QTcpServer; diff --git a/TelepathyQt4/pending-account.cpp b/TelepathyQt/pending-account.cpp index 8a9f48ea..22f2d3d7 100644 --- a/TelepathyQt4/pending-account.cpp +++ b/TelepathyQt/pending-account.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008 Nokia Corporation @@ -20,14 +20,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/PendingAccount> +#include <TelepathyQt/PendingAccount> -#include "TelepathyQt4/_gen/pending-account.moc.hpp" +#include "TelepathyQt/_gen/pending-account.moc.hpp" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/AccountManager> -#include <TelepathyQt4/PendingReady> +#include <TelepathyQt/AccountManager> +#include <TelepathyQt/PendingReady> #include <QDBusObjectPath> #include <QDBusPendingCallWatcher> @@ -44,7 +44,7 @@ struct TP_QT_NO_EXPORT PendingAccount::Private /** * \class PendingAccount * \ingroup clientaccount - * \headerfile TelepathyQt4/pending-account.h <TelepathyQt4/PendingAccount> + * \headerfile TelepathyQt/pending-account.h <TelepathyQt/PendingAccount> * * \brief The PendingAccount class represents the parameters of and the reply to * an asynchronous account request. diff --git a/TelepathyQt4/pending-account.h b/TelepathyQt/pending-account.h index 51c2cc7b..788d3464 100644 --- a/TelepathyQt4/pending-account.h +++ b/TelepathyQt/pending-account.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008 Nokia Corporation @@ -20,15 +20,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_pending_account_h_HEADER_GUARD_ -#define _TelepathyQt4_pending_account_h_HEADER_GUARD_ +#ifndef _TelepathyQt_pending_account_h_HEADER_GUARD_ +#define _TelepathyQt_pending_account_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Account> -#include <TelepathyQt4/PendingOperation> +#include <TelepathyQt/Account> +#include <TelepathyQt/PendingOperation> #include <QString> #include <QVariantMap> diff --git a/TelepathyQt4/pending-channel-request-internal.h b/TelepathyQt/pending-channel-request-internal.h index bb8eacf3..076e2b22 100644 --- a/TelepathyQt4/pending-channel-request-internal.h +++ b/TelepathyQt/pending-channel-request-internal.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,12 +20,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_pending_channel_request_internal_h_HEADER_GUARD_ -#define _TelepathyQt4_pending_channel_request_internal_h_HEADER_GUARD_ +#ifndef _TelepathyQt_pending_channel_request_internal_h_HEADER_GUARD_ +#define _TelepathyQt_pending_channel_request_internal_h_HEADER_GUARD_ -#include <TelepathyQt4/ChannelRequest> -#include <TelepathyQt4/PendingOperation> -#include <TelepathyQt4/Types> +#include <TelepathyQt/ChannelRequest> +#include <TelepathyQt/PendingOperation> +#include <TelepathyQt/Types> namespace Tp { diff --git a/TelepathyQt4/pending-channel-request.cpp b/TelepathyQt/pending-channel-request.cpp index 140ffceb..56c37ccb 100644 --- a/TelepathyQt4/pending-channel-request.cpp +++ b/TelepathyQt/pending-channel-request.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008 Nokia Corporation @@ -20,24 +20,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/PendingChannelRequest> -#include "TelepathyQt4/pending-channel-request-internal.h" +#include <TelepathyQt/PendingChannelRequest> +#include "TelepathyQt/pending-channel-request-internal.h" -#include "TelepathyQt4/_gen/pending-channel-request.moc.hpp" -#include "TelepathyQt4/_gen/pending-channel-request-internal.moc.hpp" +#include "TelepathyQt/_gen/pending-channel-request.moc.hpp" +#include "TelepathyQt/_gen/pending-channel-request-internal.moc.hpp" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/Account> -#include <TelepathyQt4/AccountFactory> -#include <TelepathyQt4/ChannelDispatcher> -#include <TelepathyQt4/ChannelFactory> -#include <TelepathyQt4/ChannelRequest> -#include <TelepathyQt4/ChannelRequestHints> -#include <TelepathyQt4/ConnectionFactory> -#include <TelepathyQt4/ContactFactory> -#include <TelepathyQt4/PendingFailure> -#include <TelepathyQt4/PendingReady> +#include <TelepathyQt/Account> +#include <TelepathyQt/AccountFactory> +#include <TelepathyQt/ChannelDispatcher> +#include <TelepathyQt/ChannelFactory> +#include <TelepathyQt/ChannelRequest> +#include <TelepathyQt/ChannelRequestHints> +#include <TelepathyQt/ConnectionFactory> +#include <TelepathyQt/ContactFactory> +#include <TelepathyQt/PendingFailure> +#include <TelepathyQt/PendingReady> namespace Tp { @@ -58,7 +58,7 @@ struct TP_QT_NO_EXPORT PendingChannelRequest::Private /** * \class PendingChannelRequest * \ingroup clientchannelrequest - * \headerfile TelepathyQt4/pending-channel-request.h <TelepathyQt4/PendingChannelRequest> + * \headerfile TelepathyQt/pending-channel-request.h <TelepathyQt/PendingChannelRequest> * * \brief The PendingChannelRequest class represents the parameters of and * the reply to an asynchronous ChannelRequest request. diff --git a/TelepathyQt4/pending-channel-request.h b/TelepathyQt/pending-channel-request.h index c074d1a0..1c62c21c 100644 --- a/TelepathyQt4/pending-channel-request.h +++ b/TelepathyQt/pending-channel-request.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,16 +20,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_pending_channel_request_h_HEADER_GUARD_ -#define _TelepathyQt4_pending_channel_request_h_HEADER_GUARD_ +#ifndef _TelepathyQt_pending_channel_request_h_HEADER_GUARD_ +#define _TelepathyQt_pending_channel_request_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Global> -#include <TelepathyQt4/PendingOperation> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Global> +#include <TelepathyQt/PendingOperation> +#include <TelepathyQt/Types> #include <QDateTime> #include <QString> diff --git a/TelepathyQt4/pending-channel.cpp b/TelepathyQt/pending-channel.cpp index 8af1da66..3207700b 100644 --- a/TelepathyQt4/pending-channel.cpp +++ b/TelepathyQt/pending-channel.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008-2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008-2010 Nokia Corporation @@ -20,23 +20,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/PendingChannel> +#include <TelepathyQt/PendingChannel> -#include "TelepathyQt4/_gen/pending-channel.moc.hpp" +#include "TelepathyQt/_gen/pending-channel.moc.hpp" -#include "TelepathyQt4/debug-internal.h" -#include "TelepathyQt4/fake-handler-manager-internal.h" -#include "TelepathyQt4/request-temporary-handler-internal.h" +#include "TelepathyQt/debug-internal.h" +#include "TelepathyQt/fake-handler-manager-internal.h" +#include "TelepathyQt/request-temporary-handler-internal.h" -#include <TelepathyQt4/Channel> -#include <TelepathyQt4/ChannelFactory> -#include <TelepathyQt4/ClientRegistrar> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/ConnectionLowlevel> -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/HandledChannelNotifier> -#include <TelepathyQt4/PendingChannelRequest> -#include <TelepathyQt4/PendingReady> +#include <TelepathyQt/Channel> +#include <TelepathyQt/ChannelFactory> +#include <TelepathyQt/ClientRegistrar> +#include <TelepathyQt/Connection> +#include <TelepathyQt/ConnectionLowlevel> +#include <TelepathyQt/Constants> +#include <TelepathyQt/HandledChannelNotifier> +#include <TelepathyQt/PendingChannelRequest> +#include <TelepathyQt/PendingReady> namespace Tp { @@ -99,7 +99,7 @@ private: /** * \class PendingChannel * \ingroup clientchannel - * \headerfile TelepathyQt4/pending-channel.h <TelepathyQt4/PendingChannel> + * \headerfile TelepathyQt/pending-channel.h <TelepathyQt/PendingChannel> * * \brief The PendingChannel class represents the parameters of and the reply to * an asynchronous channel request. diff --git a/TelepathyQt4/pending-channel.h b/TelepathyQt/pending-channel.h index fe02c7db..2480e431 100644 --- a/TelepathyQt4/pending-channel.h +++ b/TelepathyQt/pending-channel.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008-2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008-2010 Nokia Corporation @@ -20,15 +20,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_pending_channel_h_HEADER_GUARD_ -#define _TelepathyQt4_pending_channel_h_HEADER_GUARD_ +#ifndef _TelepathyQt_pending_channel_h_HEADER_GUARD_ +#define _TelepathyQt_pending_channel_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Channel> -#include <TelepathyQt4/PendingOperation> +#include <TelepathyQt/Channel> +#include <TelepathyQt/PendingOperation> #include <QString> #include <QVariantMap> diff --git a/TelepathyQt4/pending-connection.cpp b/TelepathyQt/pending-connection.cpp index dbbce7a6..e1e16728 100644 --- a/TelepathyQt4/pending-connection.cpp +++ b/TelepathyQt/pending-connection.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008 Nokia Corporation @@ -20,17 +20,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/PendingConnection> +#include <TelepathyQt/PendingConnection> -#include "TelepathyQt4/_gen/pending-connection.moc.hpp" +#include "TelepathyQt/_gen/pending-connection.moc.hpp" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/ChannelFactory> -#include <TelepathyQt4/ConnectionManager> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/ContactFactory> -#include <TelepathyQt4/PendingReady> +#include <TelepathyQt/ChannelFactory> +#include <TelepathyQt/ConnectionManager> +#include <TelepathyQt/Connection> +#include <TelepathyQt/ContactFactory> +#include <TelepathyQt/PendingReady> #include <QDBusObjectPath> #include <QDBusPendingCallWatcher> @@ -47,7 +47,7 @@ struct TP_QT_NO_EXPORT PendingConnection::Private /** * \class PendingConnection * \ingroup clientconn - * \headerfile TelepathyQt4/pending-connection.h <TelepathyQt4/PendingConnection> + * \headerfile TelepathyQt/pending-connection.h <TelepathyQt/PendingConnection> * * \brief The PendingConnection class represents the parameters of and the reply * to an asynchronous connection request. diff --git a/TelepathyQt4/pending-connection.h b/TelepathyQt/pending-connection.h index 6f0f9a0d..1f9c6c09 100644 --- a/TelepathyQt4/pending-connection.h +++ b/TelepathyQt/pending-connection.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008 Nokia Corporation @@ -20,15 +20,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_pending_connection_h_HEADER_GUARD_ -#define _TelepathyQt4_pending_connection_h_HEADER_GUARD_ +#ifndef _TelepathyQt_pending_connection_h_HEADER_GUARD_ +#define _TelepathyQt_pending_connection_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/PendingOperation> +#include <TelepathyQt/Connection> +#include <TelepathyQt/PendingOperation> #include <QString> #include <QVariantMap> diff --git a/TelepathyQt4/pending-contact-attributes.cpp b/TelepathyQt/pending-contact-attributes.cpp index df166ad2..2b9cbd17 100644 --- a/TelepathyQt4/pending-contact-attributes.cpp +++ b/TelepathyQt/pending-contact-attributes.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008 Nokia Corporation @@ -20,14 +20,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/PendingContactAttributes> +#include <TelepathyQt/PendingContactAttributes> -#include "TelepathyQt4/_gen/pending-contact-attributes.moc.hpp" +#include "TelepathyQt/_gen/pending-contact-attributes.moc.hpp" -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/ReferencedHandles> +#include <TelepathyQt/Connection> +#include <TelepathyQt/ReferencedHandles> -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" namespace Tp { @@ -35,7 +35,7 @@ namespace Tp /** * \class PendingContactAttributes * \ingroup clientconn - * \headerfile TelepathyQt4/pending-contact-attributes.h <TelepathyQt4/PendingContactAttributes> + * \headerfile TelepathyQt/pending-contact-attributes.h <TelepathyQt/PendingContactAttributes> * * \brief The PendingContactAttributes class represents the parameters of and * the reply to an asynchronous request for raw contact attributes, as used in diff --git a/TelepathyQt4/pending-contact-attributes.h b/TelepathyQt/pending-contact-attributes.h index 6deffec7..2f1fa14a 100644 --- a/TelepathyQt4/pending-contact-attributes.h +++ b/TelepathyQt/pending-contact-attributes.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008 Nokia Corporation @@ -20,17 +20,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_pending_contact_attributes_h_HEADER_GUARD_ -#define _TelepathyQt4_pending_contact_attributes_h_HEADER_GUARD_ +#ifndef _TelepathyQt_pending_contact_attributes_h_HEADER_GUARD_ +#define _TelepathyQt_pending_contact_attributes_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/PendingOperation> -#include <TelepathyQt4/Types> -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/Types> +#include <TelepathyQt/PendingOperation> +#include <TelepathyQt/Types> +#include <TelepathyQt/Constants> +#include <TelepathyQt/Types> namespace Tp { diff --git a/TelepathyQt4/pending-contact-info.cpp b/TelepathyQt/pending-contact-info.cpp index 8a0a9ec2..9a4c08d8 100644 --- a/TelepathyQt4/pending-contact-info.cpp +++ b/TelepathyQt/pending-contact-info.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,14 +20,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/PendingContactInfo> +#include <TelepathyQt/PendingContactInfo> -#include "TelepathyQt4/_gen/pending-contact-info.moc.hpp" +#include "TelepathyQt/_gen/pending-contact-info.moc.hpp" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/ContactManager> +#include <TelepathyQt/Connection> +#include <TelepathyQt/ContactManager> #include <QDBusPendingReply> @@ -42,7 +42,7 @@ struct TP_QT_NO_EXPORT PendingContactInfo::Private /** * \class PendingContactInfo * \ingroup clientconn - * \headerfile TelepathyQt4/pending-contact-info.h <TelepathyQt4/PendingContactInfo> + * \headerfile TelepathyQt/pending-contact-info.h <TelepathyQt/PendingContactInfo> * * \brief The PendingContactInfo class represents the parameters of and the * reply to an asynchronous contact info request. diff --git a/TelepathyQt4/pending-contact-info.h b/TelepathyQt/pending-contact-info.h index 2bc7651c..15e0686e 100644 --- a/TelepathyQt4/pending-contact-info.h +++ b/TelepathyQt/pending-contact-info.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,16 +20,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_pending_contact_info_h_HEADER_GUARD_ -#define _TelepathyQt4_pending_contact_info_h_HEADER_GUARD_ +#ifndef _TelepathyQt_pending_contact_info_h_HEADER_GUARD_ +#define _TelepathyQt_pending_contact_info_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Contact> -#include <TelepathyQt4/PendingOperation> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Contact> +#include <TelepathyQt/PendingOperation> +#include <TelepathyQt/Types> class QDBusPendingCallWatcher; diff --git a/TelepathyQt4/pending-contacts.cpp b/TelepathyQt/pending-contacts.cpp index 2afd648f..6bbf68c4 100644 --- a/TelepathyQt4/pending-contacts.cpp +++ b/TelepathyQt/pending-contacts.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008 Nokia Corporation @@ -20,18 +20,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/PendingContacts> -#include "TelepathyQt4/_gen/pending-contacts.moc.hpp" +#include <TelepathyQt/PendingContacts> +#include "TelepathyQt/_gen/pending-contacts.moc.hpp" -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/ConnectionLowlevel> -#include <TelepathyQt4/ContactManager> -#include <TelepathyQt4/ContactFactory> -#include <TelepathyQt4/PendingContactAttributes> -#include <TelepathyQt4/PendingHandles> -#include <TelepathyQt4/ReferencedHandles> +#include <TelepathyQt/Connection> +#include <TelepathyQt/ConnectionLowlevel> +#include <TelepathyQt/ContactManager> +#include <TelepathyQt/ContactFactory> +#include <TelepathyQt/PendingContactAttributes> +#include <TelepathyQt/PendingHandles> +#include <TelepathyQt/ReferencedHandles> -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" namespace Tp { @@ -127,7 +127,7 @@ void PendingContacts::Private::setFinished() /** * \class PendingContacts * \ingroup clientconn - * \headerfile TelepathyQt4/pending-contacts.h <TelepathyQt4/PendingContacts> + * \headerfile TelepathyQt/pending-contacts.h <TelepathyQt/PendingContacts> * * \brief The PendingContacts class is used by ContactManager when * creating/updating Contact objects. diff --git a/TelepathyQt4/pending-contacts.h b/TelepathyQt/pending-contacts.h index 86573a8e..0e03a8f2 100644 --- a/TelepathyQt4/pending-contacts.h +++ b/TelepathyQt/pending-contacts.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008 Nokia Corporation @@ -20,14 +20,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_pending_contacts_h_HEADER_GUARD_ -#define _TelepathyQt4_pending_contacts_h_HEADER_GUARD_ +#ifndef _TelepathyQt_pending_contacts_h_HEADER_GUARD_ +#define _TelepathyQt_pending_contacts_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/PendingOperation> +#include <TelepathyQt/PendingOperation> #include <QHash> #include <QList> @@ -35,8 +35,8 @@ #include <QSet> #include <QStringList> -#include <TelepathyQt4/Types> -#include <TelepathyQt4/Contact> +#include <TelepathyQt/Types> +#include <TelepathyQt/Contact> namespace Tp { diff --git a/TelepathyQt4/pending-handles.cpp b/TelepathyQt/pending-handles.cpp index 8c5a0a9c..4a6625d2 100644 --- a/TelepathyQt4/pending-handles.cpp +++ b/TelepathyQt/pending-handles.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008 Nokia Corporation @@ -20,14 +20,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/PendingHandles> +#include <TelepathyQt/PendingHandles> -#include "TelepathyQt4/_gen/pending-handles.moc.hpp" +#include "TelepathyQt/_gen/pending-handles.moc.hpp" -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/ReferencedHandles> +#include <TelepathyQt/Connection> +#include <TelepathyQt/ReferencedHandles> -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" namespace Tp { @@ -54,7 +54,7 @@ struct TP_QT_NO_EXPORT PendingHandles::Private /** * \class PendingHandles * \ingroup clientconn - * \headerfile TelepathyQt4/pending-handles.h <TelepathyQt4/PendingHandles> + * \headerfile TelepathyQt/pending-handles.h <TelepathyQt/PendingHandles> * * \brief The PendingHandles class represents the parameters of and the reply to * an asynchronous handle request/hold. diff --git a/TelepathyQt4/pending-handles.h b/TelepathyQt/pending-handles.h index 13453ecd..4a5dc0c2 100644 --- a/TelepathyQt4/pending-handles.h +++ b/TelepathyQt/pending-handles.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008 Nokia Corporation @@ -20,22 +20,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_pending_handles_h_HEADER_GUARD_ -#define _TelepathyQt4_pending_handles_h_HEADER_GUARD_ +#ifndef _TelepathyQt_pending_handles_h_HEADER_GUARD_ +#define _TelepathyQt_pending_handles_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/PendingOperation> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Constants> +#include <TelepathyQt/PendingOperation> +#include <TelepathyQt/Types> #include <QHash> #include <QString> #include <QStringList> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Types> namespace Tp { diff --git a/TelepathyQt4/pending-operation.cpp b/TelepathyQt/pending-operation.cpp index ce89c5d9..139821b3 100644 --- a/TelepathyQt4/pending-operation.cpp +++ b/TelepathyQt/pending-operation.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008-2009 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008-2009 Nokia Corporation @@ -20,16 +20,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/PendingOperation> +#include <TelepathyQt/PendingOperation> #define IN_TP_QT_HEADER #include "simple-pending-operations.h" #undef IN_TP_QT_HEADER -#include "TelepathyQt4/_gen/pending-operation.moc.hpp" -#include "TelepathyQt4/_gen/simple-pending-operations.moc.hpp" +#include "TelepathyQt/_gen/pending-operation.moc.hpp" +#include "TelepathyQt/_gen/simple-pending-operations.moc.hpp" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" #include <QDBusPendingCall> #include <QDBusPendingCallWatcher> @@ -54,7 +54,7 @@ struct TP_QT_NO_EXPORT PendingOperation::Private /** * \class PendingOperation - * \headerfile TelepathyQt4/pending-operation.h <TelepathyQt4/PendingOperation> + * \headerfile TelepathyQt/pending-operation.h <TelepathyQt/PendingOperation> * * \brief The PendingOperation class is a base class for pending asynchronous * operations. @@ -289,7 +289,7 @@ QString PendingOperation::errorMessage() const /** * \class PendingSuccess * \ingroup utils - * \headerfile TelepathyQt4/simple-pending-operations.h <TelepathyQt4/PendingSuccess> + * \headerfile TelepathyQt/simple-pending-operations.h <TelepathyQt/PendingSuccess> * * \brief The PendingSuccess class represents PendingOperation that is always * successful. @@ -298,7 +298,7 @@ QString PendingOperation::errorMessage() const /** * \class PendingFailure * \ingroup utils - * \headerfile TelepathyQt4/simple-pending-operations.h <TelepathyQt4/PendingFailure> + * \headerfile TelepathyQt/simple-pending-operations.h <TelepathyQt/PendingFailure> * * \brief The PendingFailure class represents a PendingOperation that always * fails with the error passed to the constructor. @@ -307,7 +307,7 @@ QString PendingOperation::errorMessage() const /** * \class PendingVoid * \ingroup utils - * \headerfile TelepathyQt4/simple-pending-operations.h <TelepathyQt4/PendingVoid> + * \headerfile TelepathyQt/simple-pending-operations.h <TelepathyQt/PendingVoid> * * \brief The PendingVoid class is a generic subclass of PendingOperation * representing a pending D-Bus method call that does not return anything @@ -362,7 +362,7 @@ struct TP_QT_NO_EXPORT PendingComposite::Private /** * \class PendingComposite * \ingroup utils - * \headerfile TelepathyQt4/simple-pending-operations.h <TelepathyQt4/PendingComposite> + * \headerfile TelepathyQt/simple-pending-operations.h <TelepathyQt/PendingComposite> * * \brief The PendingComposite class is a PendingOperation that can be used * to track multiple pending operations at once. diff --git a/TelepathyQt4/pending-operation.h b/TelepathyQt/pending-operation.h index 1e886519..55ab454e 100644 --- a/TelepathyQt4/pending-operation.h +++ b/TelepathyQt/pending-operation.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008-2009 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008-2009 Nokia Corporation @@ -20,16 +20,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_pending_operation_h_HEADER_GUARD_ -#define _TelepathyQt4_pending_operation_h_HEADER_GUARD_ +#ifndef _TelepathyQt_pending_operation_h_HEADER_GUARD_ +#define _TelepathyQt_pending_operation_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Global> -#include <TelepathyQt4/RefCounted> -#include <TelepathyQt4/SharedPtr> +#include <TelepathyQt/Global> +#include <TelepathyQt/RefCounted> +#include <TelepathyQt/SharedPtr> #include <QObject> diff --git a/TelepathyQt4/pending-ready.cpp b/TelepathyQt/pending-ready.cpp index 061818ce..e8620a43 100644 --- a/TelepathyQt4/pending-ready.cpp +++ b/TelepathyQt/pending-ready.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2009-2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2009-2010 Nokia Corporation @@ -20,13 +20,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/PendingReady> +#include <TelepathyQt/PendingReady> -#include "TelepathyQt4/_gen/pending-ready.moc.hpp" +#include "TelepathyQt/_gen/pending-ready.moc.hpp" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/DBusProxy> +#include <TelepathyQt/DBusProxy> namespace Tp { @@ -47,7 +47,7 @@ struct TP_QT_NO_EXPORT PendingReady::Private /** * \class PendingReady * \ingroup utils - * \headerfile TelepathyQt4/pending-ready.h <TelepathyQt4/PendingReady> + * \headerfile TelepathyQt/pending-ready.h <TelepathyQt/PendingReady> * * \brief The PendingReady class represents the features requested and the reply * to a request for an object to become ready. diff --git a/TelepathyQt4/pending-ready.h b/TelepathyQt/pending-ready.h index 2d868e66..7d0627ae 100644 --- a/TelepathyQt4/pending-ready.h +++ b/TelepathyQt/pending-ready.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2009-2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2009-2010 Nokia Corporation @@ -20,17 +20,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_pending_ready_h_HEADER_GUARD_ -#define _TelepathyQt4_pending_ready_h_HEADER_GUARD_ +#ifndef _TelepathyQt_pending_ready_h_HEADER_GUARD_ +#define _TelepathyQt_pending_ready_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/DBusProxyFactory> -#include <TelepathyQt4/PendingOperation> -#include <TelepathyQt4/ReadinessHelper> -#include <TelepathyQt4/SharedPtr> +#include <TelepathyQt/DBusProxyFactory> +#include <TelepathyQt/PendingOperation> +#include <TelepathyQt/ReadinessHelper> +#include <TelepathyQt/SharedPtr> #include <QSet> diff --git a/TelepathyQt4/pending-send-message.cpp b/TelepathyQt/pending-send-message.cpp index da3e7fb8..d339b571 100644 --- a/TelepathyQt4/pending-send-message.cpp +++ b/TelepathyQt/pending-send-message.cpp @@ -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,13 +20,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/PendingSendMessage> +#include <TelepathyQt/PendingSendMessage> -#include "TelepathyQt4/_gen/pending-send-message.moc.hpp" +#include "TelepathyQt/_gen/pending-send-message.moc.hpp" -#include <TelepathyQt4/ContactMessenger> -#include <TelepathyQt4/Message> -#include <TelepathyQt4/TextChannel> +#include <TelepathyQt/ContactMessenger> +#include <TelepathyQt/Message> +#include <TelepathyQt/TextChannel> namespace Tp { @@ -45,7 +45,7 @@ struct TP_QT_NO_EXPORT PendingSendMessage::Private /** * \class PendingSendMessage * \ingroup clientchannel - * \headerfile TelepathyQt4/pending-send-message.h <TelepathyQt4/PendingSendMessage> + * \headerfile TelepathyQt/pending-send-message.h <TelepathyQt/PendingSendMessage> * * \brief The PendingSendMessage class represents the parameters of and the * reply to an asynchronous message send request. diff --git a/TelepathyQt4/pending-send-message.h b/TelepathyQt/pending-send-message.h index 321982ea..fb9a8a3a 100644 --- a/TelepathyQt4/pending-send-message.h +++ b/TelepathyQt/pending-send-message.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,15 +20,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_pending_send_message_h_HEADER_GUARD_ -#define _TelepathyQt4_pending_send_message_h_HEADER_GUARD_ +#ifndef _TelepathyQt_pending_send_message_h_HEADER_GUARD_ +#define _TelepathyQt_pending_send_message_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/PendingOperation> -#include <TelepathyQt4/Types> +#include <TelepathyQt/PendingOperation> +#include <TelepathyQt/Types> class QDBusPendingCallWatcher; class QString; diff --git a/TelepathyQt4/pending-stream-tube-connection.cpp b/TelepathyQt/pending-stream-tube-connection.cpp index 5a8e8194..5759d923 100644 --- a/TelepathyQt4/pending-stream-tube-connection.cpp +++ b/TelepathyQt/pending-stream-tube-connection.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @license LGPL 2.1 @@ -20,16 +20,16 @@ */ -#include <TelepathyQt4/PendingStreamTubeConnection> +#include <TelepathyQt/PendingStreamTubeConnection> -#include "TelepathyQt4/_gen/pending-stream-tube-connection.moc.hpp" +#include "TelepathyQt/_gen/pending-stream-tube-connection.moc.hpp" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/IncomingStreamTubeChannel> -#include <TelepathyQt4/PendingVariant> -#include <TelepathyQt4/Types> -#include "TelepathyQt4/types-internal.h" +#include <TelepathyQt/IncomingStreamTubeChannel> +#include <TelepathyQt/PendingVariant> +#include <TelepathyQt/Types> +#include "TelepathyQt/types-internal.h" namespace Tp { @@ -66,7 +66,7 @@ PendingStreamTubeConnection::Private::~Private() /** * \class PendingStreamTubeConnection * \ingroup clientchannel - * \headerfile TelepathyQt4/incoming-stream-tube-channel.h <TelepathyQt4/PendingStreamTubeConnection> + * \headerfile TelepathyQt/incoming-stream-tube-channel.h <TelepathyQt/PendingStreamTubeConnection> * * \brief The PendingStreamTubeConnection class represents an asynchronous * operation for accepting an incoming stream tube. diff --git a/TelepathyQt4/pending-stream-tube-connection.h b/TelepathyQt/pending-stream-tube-connection.h index 7d260ada..2796e906 100644 --- a/TelepathyQt4/pending-stream-tube-connection.h +++ b/TelepathyQt/pending-stream-tube-connection.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @license LGPL 2.1 @@ -19,16 +19,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_pending_stream_tube_connection_h_HEADER_GUARD_ -#define _TelepathyQt4_pending_stream_tube_connection_h_HEADER_GUARD_ +#ifndef _TelepathyQt_pending_stream_tube_connection_h_HEADER_GUARD_ +#define _TelepathyQt_pending_stream_tube_connection_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/PendingOperation> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Constants> +#include <TelepathyQt/PendingOperation> +#include <TelepathyQt/Types> #include <QPair> diff --git a/TelepathyQt4/pending-string-list.cpp b/TelepathyQt/pending-string-list.cpp index 196eb95c..9776ffc9 100644 --- a/TelepathyQt4/pending-string-list.cpp +++ b/TelepathyQt/pending-string-list.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008 Nokia Corporation @@ -20,10 +20,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/PendingStringList> +#include <TelepathyQt/PendingStringList> -#include "TelepathyQt4/_gen/pending-string-list.moc.hpp" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/_gen/pending-string-list.moc.hpp" +#include "TelepathyQt/debug-internal.h" #include <QDBusPendingReply> @@ -38,7 +38,7 @@ struct TP_QT_NO_EXPORT PendingStringList::Private /** * \class PendingStringList * \ingroup utils - * \headerfile TelepathyQt4/pending-string-list.h <TelepathyQt4/PendingStringList> + * \headerfile TelepathyQt/pending-string-list.h <TelepathyQt/PendingStringList> * * \brief The PendingStringList class is a generic subclass of PendingOperation * representing a pending D-Bus method call that returns a string list. diff --git a/TelepathyQt4/pending-string-list.h b/TelepathyQt/pending-string-list.h index 6781c4ed..ddd29871 100644 --- a/TelepathyQt4/pending-string-list.h +++ b/TelepathyQt/pending-string-list.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008 Nokia Corporation @@ -20,14 +20,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_pending_string_list_h_HEADER_GUARD_ -#define _TelepathyQt4_pending_string_list_h_HEADER_GUARD_ +#ifndef _TelepathyQt_pending_string_list_h_HEADER_GUARD_ +#define _TelepathyQt_pending_string_list_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/PendingOperation> +#include <TelepathyQt/PendingOperation> #include <QStringList> diff --git a/TelepathyQt4/pending-variant-map.cpp b/TelepathyQt/pending-variant-map.cpp index 547a733c..effa1467 100644 --- a/TelepathyQt4/pending-variant-map.cpp +++ b/TelepathyQt/pending-variant-map.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2009-2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2009-2010 Nokia Corporation @@ -20,12 +20,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/PendingVariantMap> +#include <TelepathyQt/PendingVariantMap> -#include "TelepathyQt4/_gen/pending-variant-map.moc.hpp" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/_gen/pending-variant-map.moc.hpp" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/Global> +#include <TelepathyQt/Global> #include <QDBusPendingReply> @@ -40,7 +40,7 @@ struct TP_QT_NO_EXPORT PendingVariantMap::Private /** * \class PendingVariantMap * \ingroup utils - * \headerfile TelepathyQt4/pending-variant-map.h <TelepathyQt4/PendingVariantMap> + * \headerfile TelepathyQt/pending-variant-map.h <TelepathyQt/PendingVariantMap> * * \brief The PendingVariantMap class is a generic subclass of PendingOperation * representing a pending D-Bus method call that returns a variant map. diff --git a/TelepathyQt4/pending-variant-map.h b/TelepathyQt/pending-variant-map.h index ee601362..035c2a87 100644 --- a/TelepathyQt4/pending-variant-map.h +++ b/TelepathyQt/pending-variant-map.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2009-2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2009-2010 Nokia Corporation @@ -20,15 +20,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_pending_variant_map_h_HEADER_GUARD_ -#define _TelepathyQt4_pending_variant_map_h_HEADER_GUARD_ +#ifndef _TelepathyQt_pending_variant_map_h_HEADER_GUARD_ +#define _TelepathyQt_pending_variant_map_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Global> -#include <TelepathyQt4/PendingOperation> +#include <TelepathyQt/Global> +#include <TelepathyQt/PendingOperation> #include <QVariant> diff --git a/TelepathyQt4/pending-variant.cpp b/TelepathyQt/pending-variant.cpp index 033dd118..f9868fea 100644 --- a/TelepathyQt4/pending-variant.cpp +++ b/TelepathyQt/pending-variant.cpp @@ -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,12 +20,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/PendingVariant> +#include <TelepathyQt/PendingVariant> -#include "TelepathyQt4/_gen/pending-variant.moc.hpp" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/_gen/pending-variant.moc.hpp" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/Global> +#include <TelepathyQt/Global> #include <QDBusPendingReply> @@ -40,7 +40,7 @@ struct TP_QT_NO_EXPORT PendingVariant::Private /** * \class PendingVariant * \ingroup utils - * \headerfile TelepathyQt4/pending-variant.h <TelepathyQt4/PendingVariant> + * \headerfile TelepathyQt/pending-variant.h <TelepathyQt/PendingVariant> * * \brief The PendingVariant class is a generic subclass of PendingOperation * representing a pending D-Bus method call that returns a variant. diff --git a/TelepathyQt4/pending-variant.h b/TelepathyQt/pending-variant.h index a5cdff78..0a4ff868 100644 --- a/TelepathyQt4/pending-variant.h +++ b/TelepathyQt/pending-variant.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,15 +20,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_pending_variant_h_HEADER_GUARD_ -#define _TelepathyQt4_pending_variant_h_HEADER_GUARD_ +#ifndef _TelepathyQt_pending_variant_h_HEADER_GUARD_ +#define _TelepathyQt_pending_variant_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Global> -#include <TelepathyQt4/PendingOperation> +#include <TelepathyQt/Global> +#include <TelepathyQt/PendingOperation> #include <QVariant> diff --git a/TelepathyQt4/presence.cpp b/TelepathyQt/presence.cpp index c373e085..556e9561 100644 --- a/TelepathyQt4/presence.cpp +++ b/TelepathyQt/presence.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,9 +20,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/Presence> +#include <TelepathyQt/Presence> -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" namespace Tp { @@ -47,7 +47,7 @@ struct TP_QT_NO_EXPORT Presence::Private : public QSharedData /** * \class Presence * \ingroup wrappers - * \headerfile TelepathyQt4/presence.h <TelepathyQt4/Presence> + * \headerfile TelepathyQt/presence.h <TelepathyQt/Presence> * * \brief The Presence class represents a Telepathy simple presence. */ @@ -214,7 +214,7 @@ struct TP_QT_NO_EXPORT PresenceSpec::Private : public QSharedData /** * \class PresenceSpec * \ingroup wrappers - * \headerfile TelepathyQt4/presence.h <TelepathyQt4/PresenceSpec> + * \headerfile TelepathyQt/presence.h <TelepathyQt/PresenceSpec> * * \brief The PresenceSpec class represents a Telepathy presence information * supported by a protocol. @@ -327,7 +327,7 @@ SimpleStatusSpec PresenceSpec::bareSpec() const /** * \class PresenceSpecList * \ingroup wrappers - * \headerfile TelepathyQt4/presence.h <TelepathyQt4/PresenceSpecList> + * \headerfile TelepathyQt/presence.h <TelepathyQt/PresenceSpecList> * * \brief The PresenceSpecList class represents a list of PresenceSpec. */ diff --git a/TelepathyQt4/presence.h b/TelepathyQt/presence.h index 7f7edc79..4e5421cd 100644 --- a/TelepathyQt4/presence.h +++ b/TelepathyQt/presence.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,15 +20,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_presence_h_HEADER_GUARD_ -#define _TelepathyQt4_presence_h_HEADER_GUARD_ +#ifndef _TelepathyQt_presence_h_HEADER_GUARD_ +#define _TelepathyQt_presence_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Constants> +#include <TelepathyQt/Types> namespace Tp { diff --git a/TelepathyQt4/profile-manager.cpp b/TelepathyQt/profile-manager.cpp index ebef8f75..46391b6e 100644 --- a/TelepathyQt4/profile-manager.cpp +++ b/TelepathyQt/profile-manager.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,17 +20,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/ProfileManager> +#include <TelepathyQt/ProfileManager> -#include "TelepathyQt4/_gen/profile-manager.moc.hpp" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/_gen/profile-manager.moc.hpp" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/ConnectionManager> -#include <TelepathyQt4/PendingComposite> -#include <TelepathyQt4/PendingReady> -#include <TelepathyQt4/PendingStringList> -#include <TelepathyQt4/Profile> -#include <TelepathyQt4/ReadinessHelper> +#include <TelepathyQt/ConnectionManager> +#include <TelepathyQt/PendingComposite> +#include <TelepathyQt/PendingReady> +#include <TelepathyQt/PendingStringList> +#include <TelepathyQt/Profile> +#include <TelepathyQt/ReadinessHelper> #include <QFile> #include <QFileInfo> @@ -135,7 +135,7 @@ void ProfileManager::Private::introspectFakeProfiles(ProfileManager::Private *se /** * \class ProfileManager - * \headerfile TelepathyQt4/profile-manager.h <TelepathyQt4/ProfileManager> + * \headerfile TelepathyQt/profile-manager.h <TelepathyQt/ProfileManager> * * \brief The ProfileManager class provides helper methods to retrieve Profile * objects. diff --git a/TelepathyQt4/profile-manager.h b/TelepathyQt/profile-manager.h index 49f83c23..c5566339 100644 --- a/TelepathyQt4/profile-manager.h +++ b/TelepathyQt/profile-manager.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,17 +20,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_profile_manager_h_HEADER_GUARD_ -#define _TelepathyQt4_profile_manager_h_HEADER_GUARD_ +#ifndef _TelepathyQt_profile_manager_h_HEADER_GUARD_ +#define _TelepathyQt_profile_manager_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Object> -#include <TelepathyQt4/Profile> -#include <TelepathyQt4/ReadyObject> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Object> +#include <TelepathyQt/Profile> +#include <TelepathyQt/ReadyObject> +#include <TelepathyQt/Types> #include <QDBusConnection> #include <QObject> diff --git a/TelepathyQt4/profile.cpp b/TelepathyQt/profile.cpp index d873bb9d..ff487b75 100644 --- a/TelepathyQt4/profile.cpp +++ b/TelepathyQt/profile.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,14 +20,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/Profile> +#include <TelepathyQt/Profile> -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/ManagerFile> -#include <TelepathyQt4/Utils> -#include <TelepathyQt4/ProtocolInfo> -#include <TelepathyQt4/ProtocolParameter> +#include <TelepathyQt/ManagerFile> +#include <TelepathyQt/Utils> +#include <TelepathyQt/ProtocolInfo> +#include <TelepathyQt/ProtocolParameter> #include <QFile> #include <QFileInfo> @@ -522,7 +522,7 @@ void Profile::Private::invalidate() /** * \class Profile * \ingroup utils - * \headerfile TelepathyQt4/profile.h <TelepathyQt4/Profile> + * \headerfile TelepathyQt/profile.h <TelepathyQt/Profile> * * \brief The Profile class provides an easy way to read Telepathy profile * files according to http://telepathy.freedesktop.org/wiki/service-profile-v1. @@ -882,7 +882,7 @@ struct TP_QT_NO_EXPORT Profile::Parameter::Private /** * \class Profile::Parameter * \ingroup utils - * \headerfile TelepathyQt4/profile.h <TelepathyQt4/Profile> + * \headerfile TelepathyQt/profile.h <TelepathyQt/Profile> * * \brief The Profile::Parameter class represents a parameter defined in * .profile files. @@ -1054,7 +1054,7 @@ struct TP_QT_NO_EXPORT Profile::Presence::Private /** * \class Profile::Presence * \ingroup utils - * \headerfile TelepathyQt4/profile.h <TelepathyQt4/Profile> + * \headerfile TelepathyQt/profile.h <TelepathyQt/Profile> * * \brief The Profile::Presence class represents a presence defined in * .profile files. diff --git a/TelepathyQt4/profile.h b/TelepathyQt/profile.h index e36b1977..bce78969 100644 --- a/TelepathyQt4/profile.h +++ b/TelepathyQt/profile.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,15 +20,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_profile_h_HEADER_GUARD_ -#define _TelepathyQt4_profile_h_HEADER_GUARD_ +#ifndef _TelepathyQt_profile_h_HEADER_GUARD_ +#define _TelepathyQt_profile_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/RequestableChannelClassSpec> -#include <TelepathyQt4/Types> +#include <TelepathyQt/RequestableChannelClassSpec> +#include <TelepathyQt/Types> #include <QDBusSignature> #include <QObject> diff --git a/TelepathyQt4/properties.cpp b/TelepathyQt/properties.cpp index 2cdb4350..1b61da47 100644 --- a/TelepathyQt4/properties.cpp +++ b/TelepathyQt/properties.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008 Nokia Corporation @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/Properties> +#include <TelepathyQt/Properties> -#include "TelepathyQt4/_gen/cli-properties-body.hpp" -#include "TelepathyQt4/_gen/cli-properties.moc.hpp" +#include "TelepathyQt/_gen/cli-properties-body.hpp" +#include "TelepathyQt/_gen/cli-properties.moc.hpp" diff --git a/TelepathyQt4/properties.h b/TelepathyQt/properties.h index 08edc618..3d23199b 100644 --- a/TelepathyQt4/properties.h +++ b/TelepathyQt/properties.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008 Nokia Corporation @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_properties_h_HEADER_GUARD_ -#define _TelepathyQt4_properties_h_HEADER_GUARD_ +#ifndef _TelepathyQt_properties_h_HEADER_GUARD_ +#define _TelepathyQt_properties_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER @@ -46,6 +46,6 @@ * objects. */ -#include <TelepathyQt4/_gen/cli-properties.h> +#include <TelepathyQt/_gen/cli-properties.h> #endif diff --git a/TelepathyQt4/properties.xml b/TelepathyQt/properties.xml index 2f59b89c..2f59b89c 100644 --- a/TelepathyQt4/properties.xml +++ b/TelepathyQt/properties.xml diff --git a/TelepathyQt4/protocol-info.cpp b/TelepathyQt/protocol-info.cpp index c0b09fb7..385ea828 100644 --- a/TelepathyQt4/protocol-info.cpp +++ b/TelepathyQt/protocol-info.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,9 +20,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/ProtocolInfo> +#include <TelepathyQt/ProtocolInfo> -#include <TelepathyQt4/ConnectionCapabilities> +#include <TelepathyQt/ConnectionCapabilities> namespace Tp { @@ -54,7 +54,7 @@ struct TP_QT_NO_EXPORT ProtocolInfo::Private : public QSharedData /** * \class ProtocolInfo * \ingroup clientcm - * \headerfile TelepathyQt4/protocol-info.h <TelepathyQt4/ProtocolInfo> + * \headerfile TelepathyQt/protocol-info.h <TelepathyQt/ProtocolInfo> * * \brief The ProtocolInfo class represents a <a * href="http://telepathy.freedesktop.org/spec/Protocol.html">Telepathy Protocol</a>. diff --git a/TelepathyQt4/protocol-info.h b/TelepathyQt/protocol-info.h index b1f0423d..36d27ca9 100644 --- a/TelepathyQt4/protocol-info.h +++ b/TelepathyQt/protocol-info.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,18 +20,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_protocol_info_h_HEADER_GUARD_ -#define _TelepathyQt4_protocol_info_h_HEADER_GUARD_ +#ifndef _TelepathyQt_protocol_info_h_HEADER_GUARD_ +#define _TelepathyQt_protocol_info_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/AvatarSpec> -#include <TelepathyQt4/Global> -#include <TelepathyQt4/PresenceSpec> -#include <TelepathyQt4/ProtocolParameter> -#include <TelepathyQt4/Types> +#include <TelepathyQt/AvatarSpec> +#include <TelepathyQt/Global> +#include <TelepathyQt/PresenceSpec> +#include <TelepathyQt/ProtocolParameter> +#include <TelepathyQt/Types> #include <QSharedDataPointer> #include <QString> diff --git a/TelepathyQt4/protocol-parameter.cpp b/TelepathyQt/protocol-parameter.cpp index 9005949e..3f7f3476 100644 --- a/TelepathyQt4/protocol-parameter.cpp +++ b/TelepathyQt/protocol-parameter.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,9 +20,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/ProtocolParameter> +#include <TelepathyQt/ProtocolParameter> -#include <TelepathyQt4/ManagerFile> +#include <TelepathyQt/ManagerFile> namespace Tp { @@ -44,7 +44,7 @@ struct TP_QT_NO_EXPORT ProtocolParameter::Private : public QSharedData /** * \class ProtocolParameter * \ingroup clientcm - * \headerfile TelepathyQt4/protocol-parameter.h <TelepathyQt4/ProtocolParameter> + * \headerfile TelepathyQt/protocol-parameter.h <TelepathyQt/ProtocolParameter> * * \brief The ProtocolParameter class represents a Telepathy protocol parameter. */ diff --git a/TelepathyQt4/protocol-parameter.h b/TelepathyQt/protocol-parameter.h index 54eea067..0b017edc 100644 --- a/TelepathyQt4/protocol-parameter.h +++ b/TelepathyQt/protocol-parameter.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,15 +20,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_protocol_parameter_h_HEADER_GUARD_ -#define _TelepathyQt4_protocol_parameter_h_HEADER_GUARD_ +#ifndef _TelepathyQt_protocol_parameter_h_HEADER_GUARD_ +#define _TelepathyQt_protocol_parameter_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/Global> +#include <TelepathyQt/Constants> +#include <TelepathyQt/Global> #include <QDBusSignature> #include <QSharedDataPointer> diff --git a/TelepathyQt4/readiness-helper.cpp b/TelepathyQt/readiness-helper.cpp index eef229cf..1bc810ab 100644 --- a/TelepathyQt4/readiness-helper.cpp +++ b/TelepathyQt/readiness-helper.cpp @@ -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,17 +20,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/ReadinessHelper> +#include <TelepathyQt/ReadinessHelper> -#include "TelepathyQt4/_gen/readiness-helper.moc.hpp" +#include "TelepathyQt/_gen/readiness-helper.moc.hpp" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/DBusProxy> -#include <TelepathyQt4/PendingReady> -#include <TelepathyQt4/RefCounted> -#include <TelepathyQt4/SharedPtr> +#include <TelepathyQt/Constants> +#include <TelepathyQt/DBusProxy> +#include <TelepathyQt/PendingReady> +#include <TelepathyQt/RefCounted> +#include <TelepathyQt/SharedPtr> #include <QDBusError> #include <QSharedData> @@ -400,7 +400,7 @@ void ReadinessHelper::Private::abortOperations(const QString &errorName, /** * \class ReadinessHelper * \ingroup utils - * \headerfile TelepathyQt4/readiness-helper.h <TelepathyQt4/ReadinessHelper> + * \headerfile TelepathyQt/readiness-helper.h <TelepathyQt/ReadinessHelper> * * \brief The ReadinessHelper class is a helper class used by the introspection * process. @@ -409,7 +409,7 @@ void ReadinessHelper::Private::abortOperations(const QString &errorName, /** * \class ReadinessHelper::Introspectable * \ingroup utils - * \headerfile TelepathyQt4/readiness-helper.h <TelepathyQt4/ReadinessHelper> + * \headerfile TelepathyQt/readiness-helper.h <TelepathyQt/ReadinessHelper> * * \brief The ReadinessHelper::Introspectable class represents a introspectable * used by ReadinessHelper. diff --git a/TelepathyQt4/readiness-helper.h b/TelepathyQt/readiness-helper.h index 4ed32dd9..d570d172 100644 --- a/TelepathyQt4/readiness-helper.h +++ b/TelepathyQt/readiness-helper.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,14 +20,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_readiness_helper_h_HEADER_GUARD_ -#define _TelepathyQt4_readiness_helper_h_HEADER_GUARD_ +#ifndef _TelepathyQt_readiness_helper_h_HEADER_GUARD_ +#define _TelepathyQt_readiness_helper_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Feature> +#include <TelepathyQt/Feature> #include <QMap> #include <QSet> diff --git a/TelepathyQt4/ready-object.cpp b/TelepathyQt/ready-object.cpp index b5be3773..4c7037ff 100644 --- a/TelepathyQt4/ready-object.cpp +++ b/TelepathyQt/ready-object.cpp @@ -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,12 +20,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/ReadyObject> +#include <TelepathyQt/ReadyObject> -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/PendingReady> -#include <TelepathyQt4/ReadinessHelper> +#include <TelepathyQt/PendingReady> +#include <TelepathyQt/ReadinessHelper> namespace Tp { @@ -65,7 +65,7 @@ ReadyObject::Private::~Private() /** * \class ReadyObject * \ingroup clientreadiness - * \headerfile TelepathyQt4/ready-object.h> <TelepathyQt4/ReadyObject> + * \headerfile TelepathyQt/ready-object.h> <TelepathyQt/ReadyObject> */ /** diff --git a/TelepathyQt4/ready-object.h b/TelepathyQt/ready-object.h index 607e994f..d963f9e8 100644 --- a/TelepathyQt4/ready-object.h +++ b/TelepathyQt/ready-object.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,14 +20,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_ready_object_h_HEADER_GUARD_ -#define _TelepathyQt4_ready_object_h_HEADER_GUARD_ +#ifndef _TelepathyQt_ready_object_h_HEADER_GUARD_ +#define _TelepathyQt_ready_object_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Feature> +#include <TelepathyQt/Feature> #include <QObject> diff --git a/TelepathyQt4/referenced-handles.cpp b/TelepathyQt/referenced-handles.cpp index 186a0e04..475e5c2e 100644 --- a/TelepathyQt4/referenced-handles.cpp +++ b/TelepathyQt/referenced-handles.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008-2009 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008-2009 Nokia Corporation @@ -20,11 +20,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/ReferencedHandles> +#include <TelepathyQt/ReferencedHandles> -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/Connection> +#include <TelepathyQt/Connection> #include <QPointer> #include <QSharedData> @@ -98,7 +98,7 @@ private: /** * \class ReferencedHandles * \ingroup clientconn - * \headerfile TelepathyQt4/referenced-handles.h <TelepathyQt4/ReferencedHandles> + * \headerfile TelepathyQt/referenced-handles.h <TelepathyQt/ReferencedHandles> * * \brief Helper container for safe management of handle lifetimes. Every handle * in a ReferencedHandles container is guaranteed to be valid (and stay valid, diff --git a/TelepathyQt4/referenced-handles.h b/TelepathyQt/referenced-handles.h index c779fc9f..71dd0e2f 100644 --- a/TelepathyQt4/referenced-handles.h +++ b/TelepathyQt/referenced-handles.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008-2009 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008-2009 Nokia Corporation @@ -20,15 +20,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_referenced_handles_h_HEADER_GUARD_ -#define _TelepathyQt4_referenced_handles_h_HEADER_GUARD_ +#ifndef _TelepathyQt_referenced_handles_h_HEADER_GUARD_ +#define _TelepathyQt_referenced_handles_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Constants> +#include <TelepathyQt/Types> #ifndef QT_NO_STL # include <list> diff --git a/TelepathyQt4/request-temporary-handler-internal.cpp b/TelepathyQt/request-temporary-handler-internal.cpp index 8c1a2e6c..14b47923 100644 --- a/TelepathyQt4/request-temporary-handler-internal.cpp +++ b/TelepathyQt/request-temporary-handler-internal.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2011 Nokia Corporation @@ -20,13 +20,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "TelepathyQt4/request-temporary-handler-internal.h" +#include "TelepathyQt/request-temporary-handler-internal.h" -#include "TelepathyQt4/_gen/request-temporary-handler-internal.moc.hpp" +#include "TelepathyQt/_gen/request-temporary-handler-internal.moc.hpp" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/ChannelClassSpecList> +#include <TelepathyQt/ChannelClassSpecList> namespace Tp { diff --git a/TelepathyQt4/request-temporary-handler-internal.h b/TelepathyQt/request-temporary-handler-internal.h index 966a3a56..43eb87d3 100644 --- a/TelepathyQt4/request-temporary-handler-internal.h +++ b/TelepathyQt/request-temporary-handler-internal.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2011 Nokia Corporation @@ -20,14 +20,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_request_temporary_handler_internal_h_HEADER_GUARD_ -#define _TelepathyQt4_request_temporary_handler_internal_h_HEADER_GUARD_ +#ifndef _TelepathyQt_request_temporary_handler_internal_h_HEADER_GUARD_ +#define _TelepathyQt_request_temporary_handler_internal_h_HEADER_GUARD_ #include <QWeakPointer> -#include <TelepathyQt4/AbstractClientHandler> -#include <TelepathyQt4/Account> -#include <TelepathyQt4/Channel> +#include <TelepathyQt/AbstractClientHandler> +#include <TelepathyQt/Account> +#include <TelepathyQt/Channel> namespace Tp { diff --git a/TelepathyQt4/requestable-channel-class-spec.cpp b/TelepathyQt/requestable-channel-class-spec.cpp index d5c35e53..bf8bbc4e 100644 --- a/TelepathyQt4/requestable-channel-class-spec.cpp +++ b/TelepathyQt/requestable-channel-class-spec.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/RequestableChannelClassSpec> +#include <TelepathyQt/RequestableChannelClassSpec> namespace Tp { @@ -36,7 +36,7 @@ struct TP_QT_NO_EXPORT RequestableChannelClassSpec::Private : public QSharedData /** * \class RequestableChannelClassSpec * \ingroup wrappers - * \headerfile TelepathyQt4/requestable-channel-class-spec.h <TelepathyQt4/RequestableChannelClassSpec> + * \headerfile TelepathyQt/requestable-channel-class-spec.h <TelepathyQt/RequestableChannelClassSpec> * * \brief The RequestableChannelClassSpec class represents a Telepathy * requestable channel class. @@ -485,7 +485,7 @@ RequestableChannelClass RequestableChannelClassSpec::bareClass() const /** * \class RequestableChannelClassSpecList * \ingroup wrappers - * \headerfile TelepathyQt4/requestable-channel-class-spec.h <TelepathyQt4/RequestableChannelClassSpecList> + * \headerfile TelepathyQt/requestable-channel-class-spec.h <TelepathyQt/RequestableChannelClassSpecList> * * \brief The RequestableChannelClassSpecList class represents a list of * RequestableChannelClassSpec. diff --git a/TelepathyQt4/requestable-channel-class-spec.h b/TelepathyQt/requestable-channel-class-spec.h index 3d9a6a78..752f2e4c 100644 --- a/TelepathyQt4/requestable-channel-class-spec.h +++ b/TelepathyQt/requestable-channel-class-spec.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,15 +20,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_requestable_channel_class_spec_h_HEADER_GUARD_ -#define _TelepathyQt4_requestable_channel_class_spec_h_HEADER_GUARD_ +#ifndef _TelepathyQt_requestable_channel_class_spec_h_HEADER_GUARD_ +#define _TelepathyQt_requestable_channel_class_spec_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Constants> +#include <TelepathyQt/Types> namespace Tp { diff --git a/TelepathyQt4/room-list-channel.cpp b/TelepathyQt/room-list-channel.cpp index bbb319cb..9c7aec55 100644 --- a/TelepathyQt4/room-list-channel.cpp +++ b/TelepathyQt/room-list-channel.cpp @@ -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,12 +20,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/RoomListChannel> +#include <TelepathyQt/RoomListChannel> -#include "TelepathyQt4/_gen/room-list-channel.moc.hpp" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/_gen/room-list-channel.moc.hpp" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/Connection> +#include <TelepathyQt/Connection> namespace Tp { @@ -47,7 +47,7 @@ RoomListChannel::Private::~Private() /** * \class RoomListChannel * \ingroup clientchannel - * \headerfile TelepathyQt4/room-list-channel.h <TelepathyQt4/RoomListChannel> + * \headerfile TelepathyQt/room-list-channel.h <TelepathyQt/RoomListChannel> * * \brief The RoomListChannel class represents a Telepathy Channel of type RoomList. * diff --git a/TelepathyQt4/room-list-channel.h b/TelepathyQt/room-list-channel.h index c69d00c6..1c9a47a6 100644 --- a/TelepathyQt4/room-list-channel.h +++ b/TelepathyQt/room-list-channel.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,14 +20,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_room_list_channel_h_HEADER_GUARD_ -#define _TelepathyQt4_room_list_channel_h_HEADER_GUARD_ +#ifndef _TelepathyQt_room_list_channel_h_HEADER_GUARD_ +#define _TelepathyQt_room_list_channel_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Channel> +#include <TelepathyQt/Channel> namespace Tp { diff --git a/TelepathyQt4/shared-ptr.dox b/TelepathyQt/shared-ptr.dox index e2712eb0..ce21dc63 100644 --- a/TelepathyQt4/shared-ptr.dox +++ b/TelepathyQt/shared-ptr.dox @@ -1,5 +1,5 @@ /* - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008-2011 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008-2011 Nokia Corporation @@ -59,7 +59,7 @@ /** * \class Tp::RefCounted * \ingroup utils - * \headerfile TelepathyQt4/shared-ptr.h <TelepathyQt4/RefCounted> + * \headerfile TelepathyQt/shared-ptr.h <TelepathyQt/RefCounted> * * \brief The RefCounted class is a base class for shared objects used by * SharedPtr. @@ -70,7 +70,7 @@ /** * \class Tp::SharedPtr * \ingroup utils - * \headerfile TelepathyQt4/shared-ptr.h <TelepathyQt4/SharedPtr> + * \headerfile TelepathyQt/shared-ptr.h <TelepathyQt/SharedPtr> * * \brief The SharedPtr class is a pointer to an explicitly shared object. * diff --git a/TelepathyQt4/shared-ptr.h b/TelepathyQt/shared-ptr.h index ceb93902..69119980 100644 --- a/TelepathyQt4/shared-ptr.h +++ b/TelepathyQt/shared-ptr.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,14 +20,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_shared_ptr_h_HEADER_GUARD_ -#define _TelepathyQt4_shared_ptr_h_HEADER_GUARD_ +#ifndef _TelepathyQt_shared_ptr_h_HEADER_GUARD_ +#define _TelepathyQt_shared_ptr_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Global> +#include <TelepathyQt/Global> #include <QHash> #include <QWeakPointer> diff --git a/TelepathyQt4/simple-call-observer.cpp b/TelepathyQt/simple-call-observer.cpp index 0e8c3188..a62b8a40 100644 --- a/TelepathyQt4/simple-call-observer.cpp +++ b/TelepathyQt/simple-call-observer.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2011 Nokia Corporation @@ -20,24 +20,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/SimpleCallObserver> +#include <TelepathyQt/SimpleCallObserver> -#include "TelepathyQt4/_gen/simple-call-observer.moc.hpp" +#include "TelepathyQt/_gen/simple-call-observer.moc.hpp" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/Account> -#include <TelepathyQt4/ChannelClassSpec> -#include <TelepathyQt4/ChannelClassSpecList> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/Contact> -#include <TelepathyQt4/ContactManager> -#include <TelepathyQt4/PendingContacts> -#include <TelepathyQt4/PendingComposite> -#include <TelepathyQt4/PendingReady> -#include <TelepathyQt4/PendingSuccess> -#include <TelepathyQt4/SimpleObserver> -#include <TelepathyQt4/StreamedMediaChannel> +#include <TelepathyQt/Account> +#include <TelepathyQt/ChannelClassSpec> +#include <TelepathyQt/ChannelClassSpecList> +#include <TelepathyQt/Connection> +#include <TelepathyQt/Contact> +#include <TelepathyQt/ContactManager> +#include <TelepathyQt/PendingContacts> +#include <TelepathyQt/PendingComposite> +#include <TelepathyQt/PendingReady> +#include <TelepathyQt/PendingSuccess> +#include <TelepathyQt/SimpleObserver> +#include <TelepathyQt/StreamedMediaChannel> namespace Tp { @@ -86,7 +86,7 @@ SimpleCallObserver::Private::Private(SimpleCallObserver *parent, /** * \class SimpleCallObserver * \ingroup utils - * \headerfile TelepathyQt4/simple-call-observer.h <TelepathyQt4/SimpleCallObserver> + * \headerfile TelepathyQt/simple-call-observer.h <TelepathyQt/SimpleCallObserver> * * \brief The SimpleCallObserver class provides an easy way to track calls * in an account and can be optionally filtered by a contact and/or diff --git a/TelepathyQt4/simple-call-observer.h b/TelepathyQt/simple-call-observer.h index de7fe05c..988d092a 100644 --- a/TelepathyQt4/simple-call-observer.h +++ b/TelepathyQt/simple-call-observer.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2011 Nokia Corporation @@ -20,11 +20,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_simple_call_observer_h_HEADER_GUARD_ -#define _TelepathyQt4_simple_call_observer_h_HEADER_GUARD_ +#ifndef _TelepathyQt_simple_call_observer_h_HEADER_GUARD_ +#define _TelepathyQt_simple_call_observer_h_HEADER_GUARD_ -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Constants> +#include <TelepathyQt/Types> #include <QObject> diff --git a/TelepathyQt4/simple-observer-internal.h b/TelepathyQt/simple-observer-internal.h index 31d4de70..78900cf0 100644 --- a/TelepathyQt4/simple-observer-internal.h +++ b/TelepathyQt/simple-observer-internal.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2011 Nokia Corporation @@ -20,14 +20,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/Account> -#include <TelepathyQt4/AccountFactory> -#include <TelepathyQt4/Channel> -#include <TelepathyQt4/ChannelClassFeatures> -#include <TelepathyQt4/ChannelClassSpec> -#include <TelepathyQt4/ChannelClassSpecList> -#include <TelepathyQt4/ClientRegistrar> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Account> +#include <TelepathyQt/AccountFactory> +#include <TelepathyQt/Channel> +#include <TelepathyQt/ChannelClassFeatures> +#include <TelepathyQt/ChannelClassSpec> +#include <TelepathyQt/ChannelClassSpecList> +#include <TelepathyQt/ClientRegistrar> +#include <TelepathyQt/Types> namespace Tp { diff --git a/TelepathyQt4/simple-observer.cpp b/TelepathyQt/simple-observer.cpp index b6a73f5d..44bfff19 100644 --- a/TelepathyQt4/simple-observer.cpp +++ b/TelepathyQt/simple-observer.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2011 Nokia Corporation @@ -20,23 +20,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/SimpleObserver> -#include "TelepathyQt4/simple-observer-internal.h" +#include <TelepathyQt/SimpleObserver> +#include "TelepathyQt/simple-observer-internal.h" -#include "TelepathyQt4/_gen/simple-observer.moc.hpp" -#include "TelepathyQt4/_gen/simple-observer-internal.moc.hpp" +#include "TelepathyQt/_gen/simple-observer.moc.hpp" +#include "TelepathyQt/_gen/simple-observer-internal.moc.hpp" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/ChannelClassSpec> -#include <TelepathyQt4/ChannelClassSpecList> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/Contact> -#include <TelepathyQt4/ContactManager> -#include <TelepathyQt4/PendingContacts> -#include <TelepathyQt4/PendingComposite> -#include <TelepathyQt4/PendingReady> -#include <TelepathyQt4/PendingSuccess> +#include <TelepathyQt/ChannelClassSpec> +#include <TelepathyQt/ChannelClassSpecList> +#include <TelepathyQt/Connection> +#include <TelepathyQt/Contact> +#include <TelepathyQt/ContactManager> +#include <TelepathyQt/PendingContacts> +#include <TelepathyQt/PendingComposite> +#include <TelepathyQt/PendingReady> +#include <TelepathyQt/PendingSuccess> namespace Tp { @@ -354,7 +354,7 @@ void SimpleObserver::Private::ChannelWrapper::onChannelInvalidated(DBusProxy *pr /** * \class SimpleObserver * \ingroup utils - * \headerfile TelepathyQt4/simple-observer.h <TelepathyQt4/SimpleObserver> + * \headerfile TelepathyQt/simple-observer.h <TelepathyQt/SimpleObserver> * * \brief The SimpleObserver class provides an easy way to track channels * in an account and can be optionally filtered by a contact. diff --git a/TelepathyQt4/simple-observer.h b/TelepathyQt/simple-observer.h index 740e350e..e460d747 100644 --- a/TelepathyQt4/simple-observer.h +++ b/TelepathyQt/simple-observer.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2011 Nokia Corporation @@ -20,12 +20,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_simple_observer_h_HEADER_GUARD_ -#define _TelepathyQt4_simple_observer_h_HEADER_GUARD_ +#ifndef _TelepathyQt_simple_observer_h_HEADER_GUARD_ +#define _TelepathyQt_simple_observer_h_HEADER_GUARD_ -#include <TelepathyQt4/AbstractClientObserver> -#include <TelepathyQt4/ChannelClassFeatures> -#include <TelepathyQt4/Types> +#include <TelepathyQt/AbstractClientObserver> +#include <TelepathyQt/ChannelClassFeatures> +#include <TelepathyQt/Types> #include <QObject> diff --git a/TelepathyQt4/simple-pending-operations.h b/TelepathyQt/simple-pending-operations.h index 63a6a8c3..dce87852 100644 --- a/TelepathyQt4/simple-pending-operations.h +++ b/TelepathyQt/simple-pending-operations.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008-2009 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008-2009 Nokia Corporation @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_pending_operations_h_HEADER_GUARD_ -#define _TelepathyQt4_pending_operations_h_HEADER_GUARD_ +#ifndef _TelepathyQt_pending_operations_h_HEADER_GUARD_ +#define _TelepathyQt_pending_operations_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER @@ -29,7 +29,7 @@ #include <QObject> -#include <TelepathyQt4/PendingOperation> +#include <TelepathyQt/PendingOperation> namespace Tp { diff --git a/TelepathyQt4/simple-stream-tube-handler.cpp b/TelepathyQt/simple-stream-tube-handler.cpp index dfa9d243..7df9e4ea 100644 --- a/TelepathyQt4/simple-stream-tube-handler.cpp +++ b/TelepathyQt/simple-stream-tube-handler.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2011 Nokia Corporation @@ -20,17 +20,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "TelepathyQt4/simple-stream-tube-handler.h" +#include "TelepathyQt/simple-stream-tube-handler.h" -#include "TelepathyQt4/_gen/simple-stream-tube-handler.moc.hpp" +#include "TelepathyQt/_gen/simple-stream-tube-handler.moc.hpp" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/Account> -#include <TelepathyQt4/ChannelClassSpec> -#include <TelepathyQt4/PendingComposite> -#include <TelepathyQt4/PendingReady> -#include <TelepathyQt4/StreamTubeChannel> +#include <TelepathyQt/Account> +#include <TelepathyQt/ChannelClassSpec> +#include <TelepathyQt/PendingComposite> +#include <TelepathyQt/PendingReady> +#include <TelepathyQt/StreamTubeChannel> namespace Tp { diff --git a/TelepathyQt4/simple-stream-tube-handler.h b/TelepathyQt/simple-stream-tube-handler.h index 42662ead..d5b78dcb 100644 --- a/TelepathyQt4/simple-stream-tube-handler.h +++ b/TelepathyQt/simple-stream-tube-handler.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2011 Nokia Corporation @@ -20,13 +20,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_simple_stream_tube_handler_h_HEADER_GUARD_ -#define _TelepathyQt4_simple_stream_tube_handler_h_HEADER_GUARD_ +#ifndef _TelepathyQt_simple_stream_tube_handler_h_HEADER_GUARD_ +#define _TelepathyQt_simple_stream_tube_handler_h_HEADER_GUARD_ -#include <TelepathyQt4/AbstractClientHandler> -#include <TelepathyQt4/ChannelRequestHints> -#include <TelepathyQt4/RefCounted> -#include <TelepathyQt4/Types> +#include <TelepathyQt/AbstractClientHandler> +#include <TelepathyQt/ChannelRequestHints> +#include <TelepathyQt/RefCounted> +#include <TelepathyQt/Types> #include <QDateTime> #include <QLinkedList> diff --git a/TelepathyQt4/simple-text-observer-internal.h b/TelepathyQt/simple-text-observer-internal.h index 3532bb04..91b5e1d9 100644 --- a/TelepathyQt4/simple-text-observer-internal.h +++ b/TelepathyQt/simple-text-observer-internal.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2011 Nokia Corporation @@ -20,10 +20,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/Account> -#include <TelepathyQt4/Message> -#include <TelepathyQt4/SimpleObserver> -#include <TelepathyQt4/TextChannel> +#include <TelepathyQt/Account> +#include <TelepathyQt/Message> +#include <TelepathyQt/SimpleObserver> +#include <TelepathyQt/TextChannel> namespace Tp { diff --git a/TelepathyQt4/simple-text-observer.cpp b/TelepathyQt/simple-text-observer.cpp index 30fa35b5..2de0b6e1 100644 --- a/TelepathyQt4/simple-text-observer.cpp +++ b/TelepathyQt/simple-text-observer.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2011 Nokia Corporation @@ -20,24 +20,24 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/SimpleTextObserver> -#include "TelepathyQt4/simple-text-observer-internal.h" +#include <TelepathyQt/SimpleTextObserver> +#include "TelepathyQt/simple-text-observer-internal.h" -#include "TelepathyQt4/_gen/simple-text-observer.moc.hpp" -#include "TelepathyQt4/_gen/simple-text-observer-internal.moc.hpp" +#include "TelepathyQt/_gen/simple-text-observer.moc.hpp" +#include "TelepathyQt/_gen/simple-text-observer-internal.moc.hpp" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/ChannelClassSpec> -#include <TelepathyQt4/ChannelClassSpecList> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/Contact> -#include <TelepathyQt4/ContactManager> -#include <TelepathyQt4/Message> -#include <TelepathyQt4/PendingContacts> -#include <TelepathyQt4/PendingComposite> -#include <TelepathyQt4/PendingReady> -#include <TelepathyQt4/PendingSuccess> +#include <TelepathyQt/ChannelClassSpec> +#include <TelepathyQt/ChannelClassSpecList> +#include <TelepathyQt/Connection> +#include <TelepathyQt/Contact> +#include <TelepathyQt/ContactManager> +#include <TelepathyQt/Message> +#include <TelepathyQt/PendingContacts> +#include <TelepathyQt/PendingComposite> +#include <TelepathyQt/PendingReady> +#include <TelepathyQt/PendingSuccess> namespace Tp { @@ -98,7 +98,7 @@ void SimpleTextObserver::Private::TextChannelWrapper::onChannelMessageReceived( /** * \class SimpleTextObserver * \ingroup utils - * \headerfile TelepathyQt4/simple-text-observer.h <TelepathyQt4/SimpleTextObserver> + * \headerfile TelepathyQt/simple-text-observer.h <TelepathyQt/SimpleTextObserver> * * \brief The SimpleTextObserver class provides an easy way to track sent/received text messages * in an account and can be optionally filtered by a contact. diff --git a/TelepathyQt4/simple-text-observer.h b/TelepathyQt/simple-text-observer.h index 5ff87ba4..87b16736 100644 --- a/TelepathyQt4/simple-text-observer.h +++ b/TelepathyQt/simple-text-observer.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2011 Nokia Corporation @@ -20,11 +20,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_simple_text_observer_h_HEADER_GUARD_ -#define _TelepathyQt4_simple_text_observer_h_HEADER_GUARD_ +#ifndef _TelepathyQt_simple_text_observer_h_HEADER_GUARD_ +#define _TelepathyQt_simple_text_observer_h_HEADER_GUARD_ -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Constants> +#include <TelepathyQt/Types> #include <QObject> diff --git a/TelepathyQt4/stable-interfaces.xml b/TelepathyQt/stable-interfaces.xml index 934f65d9..fb9a0aca 100644 --- a/TelepathyQt4/stable-interfaces.xml +++ b/TelepathyQt/stable-interfaces.xml @@ -2,7 +2,7 @@ xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0" xmlns:xi="http://www.w3.org/2001/XInclude"> -<tp:title>Telepathy D-Bus Interface Specification, TelepathyQt4 copy</tp:title> +<tp:title>Telepathy D-Bus Interface Specification, TelepathyQt copy</tp:title> <tp:version>0.17.7</tp:version> <xi:include href="connection-manager.xml"/> diff --git a/TelepathyQt4/stream-tube-channel.cpp b/TelepathyQt/stream-tube-channel.cpp index 9cb0be5a..8a8b83c5 100644 --- a/TelepathyQt4/stream-tube-channel.cpp +++ b/TelepathyQt/stream-tube-channel.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010-2011 Collabora Ltd. <http://www.collabora.co.uk/> * @license LGPL 2.1 @@ -19,16 +19,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/StreamTubeChannel> +#include <TelepathyQt/StreamTubeChannel> -#include "TelepathyQt4/_gen/stream-tube-channel.moc.hpp" +#include "TelepathyQt/_gen/stream-tube-channel.moc.hpp" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/ContactManager> -#include <TelepathyQt4/PendingContacts> -#include <TelepathyQt4/PendingVariantMap> +#include <TelepathyQt/Connection> +#include <TelepathyQt/ContactManager> +#include <TelepathyQt/PendingContacts> +#include <TelepathyQt/PendingVariantMap> #include <QHostAddress> @@ -146,7 +146,7 @@ void StreamTubeChannel::Private::extractStreamTubeProperties(const QVariantMap & /** * \class StreamTubeChannel * \ingroup clientchannel - * \headerfile TelepathyQt4/stream-tube-channel.h <TelepathyQt4/StreamTubeChannel> + * \headerfile TelepathyQt/stream-tube-channel.h <TelepathyQt/StreamTubeChannel> * * \brief The StreamTubeChannel class represents a Telepathy channel of type StreamTube. * diff --git a/TelepathyQt4/stream-tube-channel.h b/TelepathyQt/stream-tube-channel.h index 548883cf..38ec6c43 100644 --- a/TelepathyQt4/stream-tube-channel.h +++ b/TelepathyQt/stream-tube-channel.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010-2011 Collabora Ltd. <http://www.collabora.co.uk/> * @license LGPL 2.1 @@ -19,14 +19,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_stream_tube_channel_h_HEADER_GUARD_ -#define _TelepathyQt4_stream_tube_channel_h_HEADER_GUARD_ +#ifndef _TelepathyQt_stream_tube_channel_h_HEADER_GUARD_ +#define _TelepathyQt_stream_tube_channel_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/TubeChannel> +#include <TelepathyQt/TubeChannel> class QHostAddress; diff --git a/TelepathyQt4/stream-tube-client-internal.h b/TelepathyQt/stream-tube-client-internal.h index 523d6630..b190e816 100644 --- a/TelepathyQt4/stream-tube-client-internal.h +++ b/TelepathyQt/stream-tube-client-internal.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2011 Nokia Corporation @@ -20,10 +20,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/Account> -#include <TelepathyQt4/ClientRegistrar> -#include <TelepathyQt4/IncomingStreamTubeChannel> -#include <TelepathyQt4/StreamTubeClient> +#include <TelepathyQt/Account> +#include <TelepathyQt/ClientRegistrar> +#include <TelepathyQt/IncomingStreamTubeChannel> +#include <TelepathyQt/StreamTubeClient> namespace Tp { diff --git a/TelepathyQt4/stream-tube-client.cpp b/TelepathyQt/stream-tube-client.cpp index 22c69174..85ee2001 100644 --- a/TelepathyQt4/stream-tube-client.cpp +++ b/TelepathyQt/stream-tube-client.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2011 Nokia Corporation @@ -20,20 +20,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/StreamTubeClient> +#include <TelepathyQt/StreamTubeClient> -#include "TelepathyQt4/stream-tube-client-internal.h" -#include "TelepathyQt4/_gen/stream-tube-client.moc.hpp" -#include "TelepathyQt4/_gen/stream-tube-client-internal.moc.hpp" +#include "TelepathyQt/stream-tube-client-internal.h" +#include "TelepathyQt/_gen/stream-tube-client.moc.hpp" +#include "TelepathyQt/_gen/stream-tube-client-internal.moc.hpp" -#include "TelepathyQt4/debug-internal.h" -#include "TelepathyQt4/simple-stream-tube-handler.h" +#include "TelepathyQt/debug-internal.h" +#include "TelepathyQt/simple-stream-tube-handler.h" -#include <TelepathyQt4/AccountManager> -#include <TelepathyQt4/ClientRegistrar> -#include <TelepathyQt4/IncomingStreamTubeChannel> -#include <TelepathyQt4/PendingStreamTubeConnection> -#include <TelepathyQt4/StreamTubeChannel> +#include <TelepathyQt/AccountManager> +#include <TelepathyQt/ClientRegistrar> +#include <TelepathyQt/IncomingStreamTubeChannel> +#include <TelepathyQt/PendingStreamTubeConnection> +#include <TelepathyQt/StreamTubeChannel> #include <QAbstractSocket> #include <QHash> @@ -44,7 +44,7 @@ namespace Tp /** * \class StreamTubeClient::TcpSourceAddressGenerator * \ingroup serverclient - * \headerfile TelepathyQt4/stream-tube-client.h <TelepathyQt4/StreamTubeClient> + * \headerfile TelepathyQt/stream-tube-client.h <TelepathyQt/StreamTubeClient> * * \brief The StreamTubeClient::TcpSourceAddressGenerator abstract interface allows using socket * source address/port based access control for connecting to tubes accepted as TCP sockets. @@ -103,7 +103,7 @@ struct TP_QT_NO_EXPORT StreamTubeClient::Tube::Private : public QSharedData /** * \class StreamTubeClient::Tube * \ingroup serverclient - * \headerfile TelepathyQt4/stream-tube-client.h <TelepathyQt4/StreamTubeClient> + * \headerfile TelepathyQt/stream-tube-client.h <TelepathyQt/StreamTubeClient> * * \brief The StreamTubeClient::Tube class represents a tube being handled by the client. */ @@ -316,7 +316,7 @@ void StreamTubeClient::TubeWrapper::onConnectionClosed(uint conn, const QString /** * \class StreamTubeClient * \ingroup serverclient - * \headerfile TelepathyQt4/stream-tube-client.h <TelepathyQt4/StreamTubeClient> + * \headerfile TelepathyQt/stream-tube-client.h <TelepathyQt/StreamTubeClient> * * \brief The StreamTubeClient class is a Handler implementation for incoming %Stream %Tube channels, * allowing an application to easily get notified about services they can connect to offered to them diff --git a/TelepathyQt4/stream-tube-client.h b/TelepathyQt/stream-tube-client.h index 57a22dc1..3d3f32ac 100644 --- a/TelepathyQt4/stream-tube-client.h +++ b/TelepathyQt/stream-tube-client.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2011 Nokia Corporation @@ -20,15 +20,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_stream_tube_client_h_HEADER_GUARD_ -#define _TelepathyQt4_stream_tube_client_h_HEADER_GUARD_ +#ifndef _TelepathyQt_stream_tube_client_h_HEADER_GUARD_ +#define _TelepathyQt_stream_tube_client_h_HEADER_GUARD_ -#include <TelepathyQt4/AccountFactory> -#include <TelepathyQt4/ChannelFactory> -#include <TelepathyQt4/ConnectionFactory> -#include <TelepathyQt4/ContactFactory> -#include <TelepathyQt4/RefCounted> -#include <TelepathyQt4/Types> +#include <TelepathyQt/AccountFactory> +#include <TelepathyQt/ChannelFactory> +#include <TelepathyQt/ConnectionFactory> +#include <TelepathyQt/ContactFactory> +#include <TelepathyQt/RefCounted> +#include <TelepathyQt/Types> class QHostAddress; diff --git a/TelepathyQt4/stream-tube-server-internal.h b/TelepathyQt/stream-tube-server-internal.h index 55f4359b..224f4b1e 100644 --- a/TelepathyQt4/stream-tube-server-internal.h +++ b/TelepathyQt/stream-tube-server-internal.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2011 Nokia Corporation @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/StreamTubeServer> -#include <TelepathyQt4/Types> +#include <TelepathyQt/StreamTubeServer> +#include <TelepathyQt/Types> namespace Tp { diff --git a/TelepathyQt4/stream-tube-server.cpp b/TelepathyQt/stream-tube-server.cpp index 326d0103..56e0afe2 100644 --- a/TelepathyQt4/stream-tube-server.cpp +++ b/TelepathyQt/stream-tube-server.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2011 Nokia Corporation @@ -20,23 +20,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/StreamTubeServer> -#include "TelepathyQt4/stream-tube-server-internal.h" +#include <TelepathyQt/StreamTubeServer> +#include "TelepathyQt/stream-tube-server-internal.h" -#include "TelepathyQt4/_gen/stream-tube-server.moc.hpp" -#include "TelepathyQt4/_gen/stream-tube-server-internal.moc.hpp" +#include "TelepathyQt/_gen/stream-tube-server.moc.hpp" +#include "TelepathyQt/_gen/stream-tube-server-internal.moc.hpp" -#include "TelepathyQt4/debug-internal.h" -#include "TelepathyQt4/simple-stream-tube-handler.h" +#include "TelepathyQt/debug-internal.h" +#include "TelepathyQt/simple-stream-tube-handler.h" #include <QScopedPointer> #include <QSharedData> #include <QTcpServer> -#include <TelepathyQt4/AccountManager> -#include <TelepathyQt4/ClientRegistrar> -#include <TelepathyQt4/OutgoingStreamTubeChannel> -#include <TelepathyQt4/StreamTubeChannel> +#include <TelepathyQt/AccountManager> +#include <TelepathyQt/ClientRegistrar> +#include <TelepathyQt/OutgoingStreamTubeChannel> +#include <TelepathyQt/StreamTubeChannel> namespace Tp { @@ -44,7 +44,7 @@ namespace Tp /** * \class StreamTubeServer::ParametersGenerator * \ingroup serverclient - * \headerfile TelepathyQt4/stream-tube-server.h <TelepathyQt4/StreamTubeServer> + * \headerfile TelepathyQt/stream-tube-server.h <TelepathyQt/StreamTubeServer> * * \brief The StreamTubeServer::ParametersGenerator abstract interface allows sending a different * set of parameters with each tube offer. @@ -108,7 +108,7 @@ struct TP_QT_NO_EXPORT StreamTubeServer::RemoteContact::Private : public QShared /** * \class StreamTubeServer::RemoteContact * \ingroup serverclient - * \headerfile TelepathyQt4/stream-tube-server.h <TelepathyQt4/StreamTubeServer> + * \headerfile TelepathyQt/stream-tube-server.h <TelepathyQt/StreamTubeServer> * * \brief The StreamTubeServer::RemoteContact class represents a contact from which a socket * connection to our exported socket originates. @@ -202,7 +202,7 @@ struct TP_QT_NO_EXPORT StreamTubeServer::Tube::Private : public QSharedData /** * \class StreamTubeServer::Tube * \ingroup serverclient - * \headerfile TelepathyQt4/stream-tube-server.h <TelepathyQt4/StreamTubeServer> + * \headerfile TelepathyQt/stream-tube-server.h <TelepathyQt/StreamTubeServer> * * \brief The StreamTubeServer::Tube class represents a tube being handled by the server. */ @@ -376,7 +376,7 @@ void StreamTubeServer::TubeWrapper::onConnectionClosed(uint conn, const QString /** * \class StreamTubeServer * \ingroup serverclient - * \headerfile TelepathyQt4/stream-tube-server.h <TelepathyQt4/StreamTubeServer> + * \headerfile TelepathyQt/stream-tube-server.h <TelepathyQt/StreamTubeServer> * * \brief The StreamTubeServer class is a Handler implementation for outgoing %Stream %Tube channels, * allowing an application to easily export a TCP network server over Telepathy Tubes without diff --git a/TelepathyQt4/stream-tube-server.h b/TelepathyQt/stream-tube-server.h index b39ef156..670b4a5f 100644 --- a/TelepathyQt4/stream-tube-server.h +++ b/TelepathyQt/stream-tube-server.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2011 Nokia Corporation @@ -20,18 +20,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_stream_tube_server_h_HEADER_GUARD_ -#define _TelepathyQt4_stream_tube_server_h_HEADER_GUARD_ +#ifndef _TelepathyQt_stream_tube_server_h_HEADER_GUARD_ +#define _TelepathyQt_stream_tube_server_h_HEADER_GUARD_ #include <QPair> #include <QSharedDataPointer> -#include <TelepathyQt4/AccountFactory> -#include <TelepathyQt4/ChannelFactory> -#include <TelepathyQt4/ConnectionFactory> -#include <TelepathyQt4/ContactFactory> -#include <TelepathyQt4/RefCounted> -#include <TelepathyQt4/Types> +#include <TelepathyQt/AccountFactory> +#include <TelepathyQt/ChannelFactory> +#include <TelepathyQt/ConnectionFactory> +#include <TelepathyQt/ContactFactory> +#include <TelepathyQt/RefCounted> +#include <TelepathyQt/Types> class QHostAddress; class QTcpServer; diff --git a/TelepathyQt4/streamed-media-channel.cpp b/TelepathyQt/streamed-media-channel.cpp index 38ba39c7..6901719d 100644 --- a/TelepathyQt4/streamed-media-channel.cpp +++ b/TelepathyQt/streamed-media-channel.cpp @@ -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,18 +20,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/StreamedMediaChannel> +#include <TelepathyQt/StreamedMediaChannel> -#include "TelepathyQt4/_gen/streamed-media-channel.moc.hpp" +#include "TelepathyQt/_gen/streamed-media-channel.moc.hpp" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/ContactManager> -#include <TelepathyQt4/PendingComposite> -#include <TelepathyQt4/PendingContacts> -#include <TelepathyQt4/PendingReady> -#include <TelepathyQt4/PendingVoid> +#include <TelepathyQt/Connection> +#include <TelepathyQt/ContactManager> +#include <TelepathyQt/PendingComposite> +#include <TelepathyQt/PendingContacts> +#include <TelepathyQt/PendingReady> +#include <TelepathyQt/PendingVoid> #include <QHash> @@ -49,7 +49,7 @@ struct TP_QT_NO_EXPORT PendingStreamedMediaStreams::Private /** * \class PendingStreamedMediaStreams * \ingroup clientchannel - * \headerfile TelepathyQt4/streamed-media-channel.h <TelepathyQt4/PendingStreamedMediaStreams> + * \headerfile TelepathyQt/streamed-media-channel.h <TelepathyQt/PendingStreamedMediaStreams> * * \brief Class containing the result of an asynchronous streamed media stream creation * request. @@ -321,7 +321,7 @@ StreamedMediaStream::SendingState StreamedMediaStream::Private::remoteSendingSta /** * \class StreamedMediaStream * \ingroup clientchannel - * \headerfile TelepathyQt4/streamed-media-channel.h <TelepathyQt4/StreamedMediaStream> + * \headerfile TelepathyQt/streamed-media-channel.h <TelepathyQt/StreamedMediaStream> * * \brief The StreamedMediaStream class represents a Telepathy streamed media * stream. @@ -850,7 +850,7 @@ void StreamedMediaChannel::Private::introspectLocalHoldState(StreamedMediaChanne /** * \class StreamedMediaChannel * \ingroup clientchannel - * \headerfile TelepathyQt4/streamed-media-channel.h <TelepathyQt4/StreamedMediaChannel> + * \headerfile TelepathyQt/streamed-media-channel.h <TelepathyQt/StreamedMediaChannel> * * \brief The StreamedMediaChannel class represents a Telepathy channel of type StreamedMedia. * @@ -1123,7 +1123,7 @@ PendingOperation *StreamedMediaChannel::hangupCall() * * For channels with the #TP_QT_IFACE_CHANNEL_INTERFACE_MEDIA_SIGNALLING interface, * the main handler of the channel is responsible for doing the actual streaming, for instance by - * calling createFarsightChannel(channel) from TelepathyQt4-Farsight library + * calling createFarsightChannel(channel) from TelepathyQt-Farsight library * and using the telepathy-farsight API on the resulting TfChannel. * * This method requires StreamedMediaChannel::FeatureCore to be ready. diff --git a/TelepathyQt4/streamed-media-channel.h b/TelepathyQt/streamed-media-channel.h index bdabb1ce..594e3a28 100644 --- a/TelepathyQt4/streamed-media-channel.h +++ b/TelepathyQt/streamed-media-channel.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,18 +20,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_streamed_media_channel_h_HEADER_GUARD_ -#define _TelepathyQt4_streamed_media_channel_h_HEADER_GUARD_ +#ifndef _TelepathyQt_streamed_media_channel_h_HEADER_GUARD_ +#define _TelepathyQt_streamed_media_channel_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Channel> -#include <TelepathyQt4/PendingOperation> -#include <TelepathyQt4/Object> -#include <TelepathyQt4/SharedPtr> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Channel> +#include <TelepathyQt/PendingOperation> +#include <TelepathyQt/Object> +#include <TelepathyQt/SharedPtr> +#include <TelepathyQt/Types> namespace Tp { diff --git a/TelepathyQt4/test-backdoors.cpp b/TelepathyQt/test-backdoors.cpp index 50fa420c..bf4b53a8 100644 --- a/TelepathyQt4/test-backdoors.cpp +++ b/TelepathyQt/test-backdoors.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008-2009 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008-2009 Nokia Corporation @@ -20,9 +20,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/test-backdoors.h> +#include <TelepathyQt/test-backdoors.h> -#include <TelepathyQt4/DBusProxy> +#include <TelepathyQt/DBusProxy> namespace Tp { diff --git a/TelepathyQt4/test-backdoors.h b/TelepathyQt/test-backdoors.h index 4bb6de1b..a1b84887 100644 --- a/TelepathyQt4/test-backdoors.h +++ b/TelepathyQt/test-backdoors.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008-2009 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008-2009 Nokia Corporation @@ -20,16 +20,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_test_backdoors_h_HEADER_GUARD_ -#define _TelepathyQt4_test_backdoors_h_HEADER_GUARD_ +#ifndef _TelepathyQt_test_backdoors_h_HEADER_GUARD_ +#define _TelepathyQt_test_backdoors_h_HEADER_GUARD_ #ifdef IN_TP_QT_HEADER #error "This file is an internal header and should never be included by a public one" #endif -#include <TelepathyQt4/Global> -#include <TelepathyQt4/ConnectionCapabilities> -#include <TelepathyQt4/ContactCapabilities> +#include <TelepathyQt/Global> +#include <TelepathyQt/ConnectionCapabilities> +#include <TelepathyQt/ContactCapabilities> #include <QString> diff --git a/TelepathyQt4/text-channel.cpp b/TelepathyQt/text-channel.cpp index f5dc05a2..83eab19b 100644 --- a/TelepathyQt4/text-channel.cpp +++ b/TelepathyQt/text-channel.cpp @@ -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,21 +20,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/TextChannel> +#include <TelepathyQt/TextChannel> -#include "TelepathyQt4/_gen/text-channel.moc.hpp" +#include "TelepathyQt/_gen/text-channel.moc.hpp" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/ConnectionLowlevel> -#include <TelepathyQt4/ContactManager> -#include <TelepathyQt4/Message> -#include <TelepathyQt4/PendingContacts> -#include <TelepathyQt4/PendingFailure> -#include <TelepathyQt4/PendingReady> -#include <TelepathyQt4/ReceivedMessage> -#include <TelepathyQt4/ReferencedHandles> +#include <TelepathyQt/Connection> +#include <TelepathyQt/ConnectionLowlevel> +#include <TelepathyQt/ContactManager> +#include <TelepathyQt/Message> +#include <TelepathyQt/PendingContacts> +#include <TelepathyQt/PendingFailure> +#include <TelepathyQt/PendingReady> +#include <TelepathyQt/ReceivedMessage> +#include <TelepathyQt/ReferencedHandles> #include <QDateTime> @@ -495,7 +495,7 @@ void TextChannel::Private::contactFound(ContactPtr contact) /** * \class TextChannel * \ingroup clientchannel - * \headerfile TelepathyQt4/text-channel.h <TelepathyQt4/TextChannel> + * \headerfile TelepathyQt/text-channel.h <TelepathyQt/TextChannel> * * \brief The TextChannel class represents a Telepathy channel of type Text. * diff --git a/TelepathyQt4/text-channel.h b/TelepathyQt/text-channel.h index 01161f78..4cf4241e 100644 --- a/TelepathyQt4/text-channel.h +++ b/TelepathyQt/text-channel.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,16 +20,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_text_channel_h_HEADER_GUARD_ -#define _TelepathyQt4_text_channel_h_HEADER_GUARD_ +#ifndef _TelepathyQt_text_channel_h_HEADER_GUARD_ +#define _TelepathyQt_text_channel_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Channel> -#include <TelepathyQt4/PendingOperation> -#include <TelepathyQt4/PendingSendMessage> +#include <TelepathyQt/Channel> +#include <TelepathyQt/PendingOperation> +#include <TelepathyQt/PendingSendMessage> namespace Tp { diff --git a/TelepathyQt4/tls-certificate.cpp b/TelepathyQt/tls-certificate.cpp index b772e169..8ba4f1b5 100644 --- a/TelepathyQt4/tls-certificate.cpp +++ b/TelepathyQt/tls-certificate.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * @license LGPL 2.1 @@ -20,7 +20,7 @@ */ #define IN_TP_QT_HEADER -#include <TelepathyQt4/tls-certificate.h> +#include <TelepathyQt/tls-certificate.h> -#include "TelepathyQt4/_gen/cli-tls-certificate-body.hpp" -#include "TelepathyQt4/_gen/cli-tls-certificate.moc.hpp" +#include "TelepathyQt/_gen/cli-tls-certificate-body.hpp" +#include "TelepathyQt/_gen/cli-tls-certificate.moc.hpp" diff --git a/TelepathyQt4/tls-certificate.h b/TelepathyQt/tls-certificate.h index 8a8f825c..5b2c1c78 100644 --- a/TelepathyQt4/tls-certificate.h +++ b/TelepathyQt/tls-certificate.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * @license LGPL 2.1 @@ -19,13 +19,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_tls_certificate_h_HEADER_GUARD_ -#define _TelepathyQt4_tls_certificate_h_HEADER_GUARD_ +#ifndef _TelepathyQt_tls_certificate_h_HEADER_GUARD_ +#define _TelepathyQt_tls_certificate_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/_gen/cli-tls-certificate.h> +#include <TelepathyQt/_gen/cli-tls-certificate.h> #endif diff --git a/TelepathyQt4/tls-certificate.xml b/TelepathyQt/tls-certificate.xml index 0ba3d2d0..0ba3d2d0 100644 --- a/TelepathyQt4/tls-certificate.xml +++ b/TelepathyQt/tls-certificate.xml diff --git a/TelepathyQt4/tube-channel.cpp b/TelepathyQt/tube-channel.cpp index 3d165c76..0e53b770 100644 --- a/TelepathyQt4/tube-channel.cpp +++ b/TelepathyQt/tube-channel.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010-2011 Collabora Ltd. <http://www.collabora.co.uk/> * @license LGPL 2.1 @@ -19,13 +19,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/TubeChannel> +#include <TelepathyQt/TubeChannel> -#include "TelepathyQt4/_gen/tube-channel.moc.hpp" +#include "TelepathyQt/_gen/tube-channel.moc.hpp" -#include "TelepathyQt4/debug-internal.h" +#include "TelepathyQt/debug-internal.h" -#include <TelepathyQt4/PendingVariantMap> +#include <TelepathyQt/PendingVariantMap> namespace Tp { @@ -93,7 +93,7 @@ void TubeChannel::Private::extractTubeProperties(const QVariantMap &props) /** * \class TubeChannel * \ingroup clientchannel - * \headerfile TelepathyQt4/tube-channel.h <TelepathyQt4/TubeChannel> + * \headerfile TelepathyQt/tube-channel.h <TelepathyQt/TubeChannel> * * \brief The TubeChannel class is a base class for all tube types. * diff --git a/TelepathyQt4/tube-channel.h b/TelepathyQt/tube-channel.h index b26115e3..42379203 100644 --- a/TelepathyQt4/tube-channel.h +++ b/TelepathyQt/tube-channel.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010-2011 Collabora Ltd. <http://www.collabora.co.uk/> * @license LGPL 2.1 @@ -19,14 +19,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_tube_channel_h_HEADER_GUARD_ -#define _TelepathyQt4_tube_channel_h_HEADER_GUARD_ +#ifndef _TelepathyQt_tube_channel_h_HEADER_GUARD_ +#define _TelepathyQt_tube_channel_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Channel> +#include <TelepathyQt/Channel> namespace Tp { diff --git a/TelepathyQt4/types-internal.h b/TelepathyQt/types-internal.h index cd7bce1c..f6ed06b5 100644 --- a/TelepathyQt4/types-internal.h +++ b/TelepathyQt/types-internal.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @license LGPL 2.1 @@ -19,12 +19,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_types_internal_h_HEADER_GUARD_ -#define _TelepathyQt4_types_internal_h_HEADER_GUARD_ +#ifndef _TelepathyQt_types_internal_h_HEADER_GUARD_ +#define _TelepathyQt_types_internal_h_HEADER_GUARD_ #include <QDBusVariant> #include <QDBusArgument> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Types> namespace Tp { diff --git a/TelepathyQt4/types.cpp b/TelepathyQt/types.cpp index fe5d125e..e9a606a0 100644 --- a/TelepathyQt4/types.cpp +++ b/TelepathyQt/types.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008 Nokia Corporation @@ -20,19 +20,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/Types> +#include <TelepathyQt/Types> -#include <TelepathyQt4/types-internal.h> +#include <TelepathyQt/types-internal.h> -#include "TelepathyQt4/_gen/types-body.hpp" +#include "TelepathyQt/_gen/types-body.hpp" -#include "TelepathyQt4/future-internal.h" -#include "TelepathyQt4/_gen/future-types-body.hpp" +#include "TelepathyQt/future-internal.h" +#include "TelepathyQt/_gen/future-types-body.hpp" namespace Tp { /** * \\ingroup types - * \headerfile TelepathyQt4/types.h <TelepathyQt4/Types> + * \headerfile TelepathyQt/types.h <TelepathyQt/Types> * * Register the types used by the library with the QtDBus type system. * diff --git a/TelepathyQt4/types.h b/TelepathyQt/types.h index c79abcd3..ff502402 100644 --- a/TelepathyQt4/types.h +++ b/TelepathyQt/types.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2008 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2008 Nokia Corporation @@ -20,18 +20,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_types_h_HEADER_GUARD_ -#define _TelepathyQt4_types_h_HEADER_GUARD_ +#ifndef _TelepathyQt_types_h_HEADER_GUARD_ +#define _TelepathyQt_types_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/_gen/types.h> +#include <TelepathyQt/_gen/types.h> -#include <TelepathyQt4/Global> -#include <TelepathyQt4/SharedPtr> -#include <TelepathyQt4/MethodInvocationContext> +#include <TelepathyQt/Global> +#include <TelepathyQt/SharedPtr> +#include <TelepathyQt/MethodInvocationContext> #include <QDBusVariant> diff --git a/TelepathyQt4/utils.cpp b/TelepathyQt/utils.cpp index f216abbd..d3874770 100644 --- a/TelepathyQt4/utils.cpp +++ b/TelepathyQt/utils.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/Utils> +#include <TelepathyQt/Utils> #include <QByteArray> #include <QString> diff --git a/TelepathyQt4/utils.h b/TelepathyQt/utils.h index 4abd4e81..02c2b35d 100644 --- a/TelepathyQt4/utils.h +++ b/TelepathyQt/utils.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,14 +20,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_utils_h_HEADER_GUARD_ -#define _TelepathyQt4_utils_h_HEADER_GUARD_ +#ifndef _TelepathyQt_utils_h_HEADER_GUARD_ +#define _TelepathyQt_utils_h_HEADER_GUARD_ #ifndef IN_TP_QT_HEADER #error IN_TP_QT_HEADER #endif -#include <TelepathyQt4/Global> +#include <TelepathyQt/Global> #include <QString> diff --git a/TelepathyQt4/AbstractClient b/TelepathyQt4/AbstractClient deleted file mode 100644 index d316a086..00000000 --- a/TelepathyQt4/AbstractClient +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_AbstractClient_HEADER_GUARD_ -#define _TelepathyQt4_AbstractClient_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/abstract-client.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/AbstractClientApprover b/TelepathyQt4/AbstractClientApprover deleted file mode 100644 index 669120f4..00000000 --- a/TelepathyQt4/AbstractClientApprover +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_AbstractClientApprover_HEADER_GUARD_ -#define _TelepathyQt4_AbstractClientApprover_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/abstract-client.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/AbstractClientHandler b/TelepathyQt4/AbstractClientHandler deleted file mode 100644 index 29c338ec..00000000 --- a/TelepathyQt4/AbstractClientHandler +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_AbstractClientHandler_HEADER_GUARD_ -#define _TelepathyQt4_AbstractClientHandler_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/abstract-client.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/AbstractClientObserver b/TelepathyQt4/AbstractClientObserver deleted file mode 100644 index f4866173..00000000 --- a/TelepathyQt4/AbstractClientObserver +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_AbstractClientObserver_HEADER_GUARD_ -#define _TelepathyQt4_AbstractClientObserver_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/abstract-client.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/AbstractInterface b/TelepathyQt4/AbstractInterface deleted file mode 100644 index 0097ed6a..00000000 --- a/TelepathyQt4/AbstractInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_AbstractInterface_HEADER_GUARD_ -#define _TelepathyQt4_AbstractInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/abstract-interface.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/Account b/TelepathyQt4/Account deleted file mode 100644 index 9c151233..00000000 --- a/TelepathyQt4/Account +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_Account_HEADER_GUARD_ -#define _TelepathyQt4_Account_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/account.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/AccountCapabilityFilter b/TelepathyQt4/AccountCapabilityFilter deleted file mode 100644 index 4123202c..00000000 --- a/TelepathyQt4/AccountCapabilityFilter +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_AccountCapabilityFilter_HEADER_GUARD_ -#define _TelepathyQt4_AccountCapabilityFilter_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/account-capability-filter.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/AccountFactory b/TelepathyQt4/AccountFactory deleted file mode 100644 index 80c5fdb2..00000000 --- a/TelepathyQt4/AccountFactory +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_AccountFactory_HEADER_GUARD_ -#define _TelepathyQt4_AccountFactory_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/account-factory.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/AccountFilter b/TelepathyQt4/AccountFilter deleted file mode 100644 index 0f5683c9..00000000 --- a/TelepathyQt4/AccountFilter +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_AccountFilter_HEADER_GUARD_ -#define _TelepathyQt4_AccountFilter_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/account-filter.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/AccountInterface b/TelepathyQt4/AccountInterface deleted file mode 100644 index 8b70bc16..00000000 --- a/TelepathyQt4/AccountInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_AccountInterface_HEADER_GUARD_ -#define _TelepathyQt4_AccountInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/account.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/AccountInterfaceAddressingInterface b/TelepathyQt4/AccountInterfaceAddressingInterface deleted file mode 100644 index 29fe0c1a..00000000 --- a/TelepathyQt4/AccountInterfaceAddressingInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_AccountInterfaceAddressingInterface_HEADER_GUARD_ -#define _TelepathyQt4_AccountInterfaceAddressingInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/account.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/AccountInterfaceAvatarInterface b/TelepathyQt4/AccountInterfaceAvatarInterface deleted file mode 100644 index fd110ce9..00000000 --- a/TelepathyQt4/AccountInterfaceAvatarInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_AccountInterfaceAvatarInterface_HEADER_GUARD_ -#define _TelepathyQt4_AccountInterfaceAvatarInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/account.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/AccountManagerInterface b/TelepathyQt4/AccountManagerInterface deleted file mode 100644 index ca98a7ee..00000000 --- a/TelepathyQt4/AccountManagerInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_AccountManagerInterface_HEADER_GUARD_ -#define _TelepathyQt4_AccountManagerInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/account-manager.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/AccountPropertyFilter b/TelepathyQt4/AccountPropertyFilter deleted file mode 100644 index a8508fed..00000000 --- a/TelepathyQt4/AccountPropertyFilter +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_AccountPropertyFilter_HEADER_GUARD_ -#define _TelepathyQt4_AccountPropertyFilter_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/account-property-filter.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/AccountSet b/TelepathyQt4/AccountSet deleted file mode 100644 index 8cfe23bb..00000000 --- a/TelepathyQt4/AccountSet +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_AccountSet_HEADER_GUARD_ -#define _TelepathyQt4_AccountSet_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/account-set.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/AndFilter b/TelepathyQt4/AndFilter deleted file mode 100644 index b65e4dda..00000000 --- a/TelepathyQt4/AndFilter +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_AndFilter_HEADER_GUARD_ -#define _TelepathyQt4_AndFilter_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/and-filter.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/AuthenticationTLSCertificateInterface b/TelepathyQt4/AuthenticationTLSCertificateInterface deleted file mode 100644 index e3f1c676..00000000 --- a/TelepathyQt4/AuthenticationTLSCertificateInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_AuthenticationTLSCertificateInterface_HEADER_GUARD_ -#define _TelepathyQt4_AuthenticationTLSCertificateInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/tls-certificate.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/AvatarData b/TelepathyQt4/AvatarData deleted file mode 100644 index c968d112..00000000 --- a/TelepathyQt4/AvatarData +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_AvatarData_HEADER_GUARD_ -#define _TelepathyQt4_AvatarData_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/avatar.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/AvatarSpec b/TelepathyQt4/AvatarSpec deleted file mode 100644 index d91672ae..00000000 --- a/TelepathyQt4/AvatarSpec +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_AvatarSpec_HEADER_GUARD_ -#define _TelepathyQt4_AvatarSpec_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/avatar.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/CapabilitiesBase b/TelepathyQt4/CapabilitiesBase deleted file mode 100644 index bedf6180..00000000 --- a/TelepathyQt4/CapabilitiesBase +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_CapabilitiesBase_HEADER_GUARD_ -#define _TelepathyQt4_CapabilitiesBase_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/capabilities-base.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/Channel b/TelepathyQt4/Channel deleted file mode 100644 index 21af6f22..00000000 --- a/TelepathyQt4/Channel +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_Channel_HEADER_GUARD_ -#define _TelepathyQt4_Channel_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelClassFeatures b/TelepathyQt4/ChannelClassFeatures deleted file mode 100644 index 085b896c..00000000 --- a/TelepathyQt4/ChannelClassFeatures +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ChannelClassFeatures_HEADER_GUARD_ -#define _TelepathyQt4_ChannelClassFeatures_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/channel-class-features.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelClassSpec b/TelepathyQt4/ChannelClassSpec deleted file mode 100644 index b4ca267e..00000000 --- a/TelepathyQt4/ChannelClassSpec +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ChannelClassSpec_HEADER_GUARD_ -#define _TelepathyQt4_ChannelClassSpec_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/channel-class-spec.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelClassSpecList b/TelepathyQt4/ChannelClassSpecList deleted file mode 100644 index cc139cef..00000000 --- a/TelepathyQt4/ChannelClassSpecList +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ChannelClassSpecList_HEADER_GUARD_ -#define _TelepathyQt4_ChannelClassSpecList_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/channel-class-spec.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelDispatchOperation b/TelepathyQt4/ChannelDispatchOperation deleted file mode 100644 index 68bb543b..00000000 --- a/TelepathyQt4/ChannelDispatchOperation +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ChannelDispatchOperation_HEADER_GUARD_ -#define _TelepathyQt4_ChannelDispatchOperation_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/channel-dispatch-operation.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelDispatchOperationInterface b/TelepathyQt4/ChannelDispatchOperationInterface deleted file mode 100644 index 5846dab3..00000000 --- a/TelepathyQt4/ChannelDispatchOperationInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ChannelDispatchOperationInterface_HEADER_GUARD_ -#define _TelepathyQt4_ChannelDispatchOperationInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/channel-dispatch-operation.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelDispatcher b/TelepathyQt4/ChannelDispatcher deleted file mode 100644 index f56a47b8..00000000 --- a/TelepathyQt4/ChannelDispatcher +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ChannelDispatcher_HEADER_GUARD_ -#define _TelepathyQt4_ChannelDispatcher_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/channel-dispatcher.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelDispatcherInterface b/TelepathyQt4/ChannelDispatcherInterface deleted file mode 100644 index e3dfba81..00000000 --- a/TelepathyQt4/ChannelDispatcherInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ChannelDispatcherInterface_HEADER_GUARD_ -#define _TelepathyQt4_ChannelDispatcherInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/channel-dispatcher.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelFactory b/TelepathyQt4/ChannelFactory deleted file mode 100644 index 70811248..00000000 --- a/TelepathyQt4/ChannelFactory +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ChannelFactory_HEADER_GUARD_ -#define _TelepathyQt4_ChannelFactory_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/channel-factory.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelInterface b/TelepathyQt4/ChannelInterface deleted file mode 100644 index dbabbce8..00000000 --- a/TelepathyQt4/ChannelInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ChannelInterface_HEADER_GUARD_ -#define _TelepathyQt4_ChannelInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelInterfaceAnonymityInterface b/TelepathyQt4/ChannelInterfaceAnonymityInterface deleted file mode 100644 index a6a6b7e5..00000000 --- a/TelepathyQt4/ChannelInterfaceAnonymityInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ChannelInterfaceAnonymityInterface_HEADER_GUARD_ -#define _TelepathyQt4_ChannelInterfaceAnonymityInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelInterfaceCallStateInterface b/TelepathyQt4/ChannelInterfaceCallStateInterface deleted file mode 100644 index 75a413fb..00000000 --- a/TelepathyQt4/ChannelInterfaceCallStateInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ChannelInterfaceCallStateInterface_HEADER_GUARD_ -#define _TelepathyQt4_ChannelInterfaceCallStateInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelInterfaceChatStateInterface b/TelepathyQt4/ChannelInterfaceChatStateInterface deleted file mode 100644 index 8d94773b..00000000 --- a/TelepathyQt4/ChannelInterfaceChatStateInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ChannelInterfaceChatStateInterface_HEADER_GUARD_ -#define _TelepathyQt4_ChannelInterfaceChatStateInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelInterfaceConferenceInterface b/TelepathyQt4/ChannelInterfaceConferenceInterface deleted file mode 100644 index cf6146ec..00000000 --- a/TelepathyQt4/ChannelInterfaceConferenceInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ChannelInterfaceConferenceInterface_HEADER_GUARD_ -#define _TelepathyQt4_ChannelInterfaceConferenceInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelInterfaceDTMFInterface b/TelepathyQt4/ChannelInterfaceDTMFInterface deleted file mode 100644 index dea8d43f..00000000 --- a/TelepathyQt4/ChannelInterfaceDTMFInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ChannelInterfaceDTMFInterface_HEADER_GUARD_ -#define _TelepathyQt4_ChannelInterfaceDTMFInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelInterfaceGroupInterface b/TelepathyQt4/ChannelInterfaceGroupInterface deleted file mode 100644 index 63f57715..00000000 --- a/TelepathyQt4/ChannelInterfaceGroupInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ChannelInterfaceGroupInterface_HEADER_GUARD_ -#define _TelepathyQt4_ChannelInterfaceGroupInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelInterfaceHoldInterface b/TelepathyQt4/ChannelInterfaceHoldInterface deleted file mode 100644 index 05becd54..00000000 --- a/TelepathyQt4/ChannelInterfaceHoldInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ChannelInterfaceHoldInterface_HEADER_GUARD_ -#define _TelepathyQt4_ChannelInterfaceHoldInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelInterfaceMediaSignallingInterface b/TelepathyQt4/ChannelInterfaceMediaSignallingInterface deleted file mode 100644 index f11d5502..00000000 --- a/TelepathyQt4/ChannelInterfaceMediaSignallingInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ChannelInterfaceMediaSignallingInterface_HEADER_GUARD_ -#define _TelepathyQt4_ChannelInterfaceMediaSignallingInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelInterfaceMessagesInterface b/TelepathyQt4/ChannelInterfaceMessagesInterface deleted file mode 100644 index e89e6405..00000000 --- a/TelepathyQt4/ChannelInterfaceMessagesInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ChannelInterfaceMessagesInterface_HEADER_GUARD_ -#define _TelepathyQt4_ChannelInterfaceMessagesInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelInterfacePasswordInterface b/TelepathyQt4/ChannelInterfacePasswordInterface deleted file mode 100644 index a18f6c91..00000000 --- a/TelepathyQt4/ChannelInterfacePasswordInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ChannelInterfacePasswordInterface_HEADER_GUARD_ -#define _TelepathyQt4_ChannelInterfacePasswordInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelInterfaceSASLAuthenticationInterface b/TelepathyQt4/ChannelInterfaceSASLAuthenticationInterface deleted file mode 100644 index eaf77846..00000000 --- a/TelepathyQt4/ChannelInterfaceSASLAuthenticationInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ChannelInterfaceSASLConnectionInterface_HEADER_GUARD_ -#define _TelepathyQt4_ChannelInterfaceSASLConnectionInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelInterfaceSecurableInterface b/TelepathyQt4/ChannelInterfaceSecurableInterface deleted file mode 100644 index 88bad983..00000000 --- a/TelepathyQt4/ChannelInterfaceSecurableInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ChannelInterfaceSecurableInterface_HEADER_GUARD_ -#define _TelepathyQt4_ChannelInterfaceSecurableInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelInterfaceServicePointInterface b/TelepathyQt4/ChannelInterfaceServicePointInterface deleted file mode 100644 index ca764456..00000000 --- a/TelepathyQt4/ChannelInterfaceServicePointInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ChannelInterfaceServicePointInterface_HEADER_GUARD_ -#define _TelepathyQt4_ChannelInterfaceServicePointInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelInterfaceTubeInterface b/TelepathyQt4/ChannelInterfaceTubeInterface deleted file mode 100644 index b3883266..00000000 --- a/TelepathyQt4/ChannelInterfaceTubeInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ChannelInterfaceTubeInterface_HEADER_GUARD_ -#define _TelepathyQt4_ChannelInterfaceTubeInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelRequest b/TelepathyQt4/ChannelRequest deleted file mode 100644 index bba75d29..00000000 --- a/TelepathyQt4/ChannelRequest +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ChannelRequest_HEADER_GUARD_ -#define _TelepathyQt4_ChannelRequest_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/channel-request.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelRequestHints b/TelepathyQt4/ChannelRequestHints deleted file mode 100644 index 50f37c9d..00000000 --- a/TelepathyQt4/ChannelRequestHints +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ChannelRequestHints_HEADER_GUARD_ -#define _TelepathyQt4_ChannelRequestHints_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/channel-request.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelRequestInterface b/TelepathyQt4/ChannelRequestInterface deleted file mode 100644 index c8af7460..00000000 --- a/TelepathyQt4/ChannelRequestInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ChannelRequestInterface_HEADER_GUARD_ -#define _TelepathyQt4_ChannelRequestInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/channel-request.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelTypeContactListInterface b/TelepathyQt4/ChannelTypeContactListInterface deleted file mode 100644 index 1f06d762..00000000 --- a/TelepathyQt4/ChannelTypeContactListInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ChannelTypeContactListInterface_HEADER_GUARD_ -#define _TelepathyQt4_ChannelTypeContactListInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelTypeContactSearchInterface b/TelepathyQt4/ChannelTypeContactSearchInterface deleted file mode 100644 index b4da0c58..00000000 --- a/TelepathyQt4/ChannelTypeContactSearchInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ChannelTypeContactSearchInterface_HEADER_GUARD_ -#define _TelepathyQt4_ChannelTypeContactSearchInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelTypeFileTransferInterface b/TelepathyQt4/ChannelTypeFileTransferInterface deleted file mode 100644 index 7b27302f..00000000 --- a/TelepathyQt4/ChannelTypeFileTransferInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ChannelTypeFileTransferInterface_HEADER_GUARD_ -#define _TelepathyQt4_ChannelTypeFileTransferInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelTypeRoomListInterface b/TelepathyQt4/ChannelTypeRoomListInterface deleted file mode 100644 index 4eb281e7..00000000 --- a/TelepathyQt4/ChannelTypeRoomListInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ChannelTypeRoomListInterface_HEADER_GUARD_ -#define _TelepathyQt4_ChannelTypeRoomListInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelTypeServerAuthenticationInterface b/TelepathyQt4/ChannelTypeServerAuthenticationInterface deleted file mode 100644 index 7b762413..00000000 --- a/TelepathyQt4/ChannelTypeServerAuthenticationInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ChannelTypeServerAuthenticationInterface_HEADER_GUARD_ -#define _TelepathyQt4_ChannelTypeServerAuthenticationInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelTypeServerTLSConnectionInterface b/TelepathyQt4/ChannelTypeServerTLSConnectionInterface deleted file mode 100644 index 8483b075..00000000 --- a/TelepathyQt4/ChannelTypeServerTLSConnectionInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ChannelTypeServerTLSConnectionInterface_HEADER_GUARD_ -#define _TelepathyQt4_ChannelTypeServerTLSConnectionInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelTypeStreamedMediaInterface b/TelepathyQt4/ChannelTypeStreamedMediaInterface deleted file mode 100644 index 701845f5..00000000 --- a/TelepathyQt4/ChannelTypeStreamedMediaInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ChannelTypeStreamedMediaInterface_HEADER_GUARD_ -#define _TelepathyQt4_ChannelTypeStreamedMediaInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelTypeTextInterface b/TelepathyQt4/ChannelTypeTextInterface deleted file mode 100644 index 1a8b21cc..00000000 --- a/TelepathyQt4/ChannelTypeTextInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ChannelTypeTextInterface_HEADER_GUARD_ -#define _TelepathyQt4_ChannelTypeTextInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelTypeTubeInterface b/TelepathyQt4/ChannelTypeTubeInterface deleted file mode 100644 index 673a3f06..00000000 --- a/TelepathyQt4/ChannelTypeTubeInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_Client_ChannelTypeTubeInterface_HEADER_GUARD_ -#define _TelepathyQt4_Client_ChannelTypeTubeInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ChannelTypeTubesInterface b/TelepathyQt4/ChannelTypeTubesInterface deleted file mode 100644 index 13a5da9e..00000000 --- a/TelepathyQt4/ChannelTypeTubesInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ChannelTypeTubesInterface_HEADER_GUARD_ -#define _TelepathyQt4_ChannelTypeTubesInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/Client b/TelepathyQt4/Client deleted file mode 100644 index 9678a2ec..00000000 --- a/TelepathyQt4/Client +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_Client_HEADER_GUARD_ -#define _TelepathyQt4_Client_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/client.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ClientApproverInterface b/TelepathyQt4/ClientApproverInterface deleted file mode 100644 index c1aa0569..00000000 --- a/TelepathyQt4/ClientApproverInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ClientApproverInterface_HEADER_GUARD_ -#define _TelepathyQt4_ClientApproverInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/client.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ClientHandlerInterface b/TelepathyQt4/ClientHandlerInterface deleted file mode 100644 index f4e32865..00000000 --- a/TelepathyQt4/ClientHandlerInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ClientHandlerInterface_HEADER_GUARD_ -#define _TelepathyQt4_ClientHandlerInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/client.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ClientInterface b/TelepathyQt4/ClientInterface deleted file mode 100644 index 5a8fb1bc..00000000 --- a/TelepathyQt4/ClientInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ClientInterface_HEADER_GUARD_ -#define _TelepathyQt4_ClientInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/client.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ClientInterfaceRequestsInterface b/TelepathyQt4/ClientInterfaceRequestsInterface deleted file mode 100644 index f276aee2..00000000 --- a/TelepathyQt4/ClientInterfaceRequestsInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ClientInterfaceRequestsInterface_HEADER_GUARD_ -#define _TelepathyQt4_ClientInterfaceRequestsInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/client.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ClientObserverInterface b/TelepathyQt4/ClientObserverInterface deleted file mode 100644 index 6c5bb41d..00000000 --- a/TelepathyQt4/ClientObserverInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ClientObserverInterface_HEADER_GUARD_ -#define _TelepathyQt4_ClientObserverInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/client.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ClientRegistrar b/TelepathyQt4/ClientRegistrar deleted file mode 100644 index 7c1d20ed..00000000 --- a/TelepathyQt4/ClientRegistrar +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ClientRegistrar_HEADER_GUARD_ -#define _TelepathyQt4_ClientRegistrar_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/client-registrar.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/Connection b/TelepathyQt4/Connection deleted file mode 100644 index 0f21fabc..00000000 --- a/TelepathyQt4/Connection +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_Connection_HEADER_GUARD_ -#define _TelepathyQt4_Connection_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/connection.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionCapabilities b/TelepathyQt4/ConnectionCapabilities deleted file mode 100644 index 36a35ffa..00000000 --- a/TelepathyQt4/ConnectionCapabilities +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ConnectionCapabilities_HEADER_GUARD_ -#define _TelepathyQt4_ConnectionCapabilities_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/connection-capabilities.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionFactory b/TelepathyQt4/ConnectionFactory deleted file mode 100644 index 166f92f5..00000000 --- a/TelepathyQt4/ConnectionFactory +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ConnectionFactory_HEADER_GUARD_ -#define _TelepathyQt4_ConnectionFactory_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/connection-factory.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterface b/TelepathyQt4/ConnectionInterface deleted file mode 100644 index 96d4cad4..00000000 --- a/TelepathyQt4/ConnectionInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ConnectionInterface_HEADER_GUARD_ -#define _TelepathyQt4_ConnectionInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/connection.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceAliasingInterface b/TelepathyQt4/ConnectionInterfaceAliasingInterface deleted file mode 100644 index 510a029d..00000000 --- a/TelepathyQt4/ConnectionInterfaceAliasingInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ConnectionInterfaceAliasingInterface_HEADER_GUARD_ -#define _TelepathyQt4_ConnectionInterfaceAliasingInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/connection.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceAnonymityInterface b/TelepathyQt4/ConnectionInterfaceAnonymityInterface deleted file mode 100644 index 1ecea332..00000000 --- a/TelepathyQt4/ConnectionInterfaceAnonymityInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ConnectionInterfaceAnonymityInterface_HEADER_GUARD_ -#define _TelepathyQt4_ConnectionInterfaceAnonymityInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/connection.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceAvatarsInterface b/TelepathyQt4/ConnectionInterfaceAvatarsInterface deleted file mode 100644 index ea5af17b..00000000 --- a/TelepathyQt4/ConnectionInterfaceAvatarsInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ConnectionInterfaceAvatarsInterface_HEADER_GUARD_ -#define _TelepathyQt4_ConnectionInterfaceAvatarsInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/connection.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceBalanceInterface b/TelepathyQt4/ConnectionInterfaceBalanceInterface deleted file mode 100644 index 5e02d1a3..00000000 --- a/TelepathyQt4/ConnectionInterfaceBalanceInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ConnectionInterfaceBalanceInterface_HEADER_GUARD_ -#define _TelepathyQt4_ConnectionInterfaceBalanceInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/connection.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceCapabilitiesInterface b/TelepathyQt4/ConnectionInterfaceCapabilitiesInterface deleted file mode 100644 index b7ad45a0..00000000 --- a/TelepathyQt4/ConnectionInterfaceCapabilitiesInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ConnectionInterfaceCapabilitiesInterface_HEADER_GUARD_ -#define _TelepathyQt4_ConnectionInterfaceCapabilitiesInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/connection.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceCellularInterface b/TelepathyQt4/ConnectionInterfaceCellularInterface deleted file mode 100644 index 3379adf2..00000000 --- a/TelepathyQt4/ConnectionInterfaceCellularInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ConnectionInterfaceCellularInterface_HEADER_GUARD_ -#define _TelepathyQt4_ConnectionInterfaceCellularInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/connection.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceClientTypes b/TelepathyQt4/ConnectionInterfaceClientTypes deleted file mode 100644 index 63a45da7..00000000 --- a/TelepathyQt4/ConnectionInterfaceClientTypes +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef _TelepathyQt4_ConnectionInterfaceClientTyes_HEADER_GUARD_ -#define _TelepathyQt4_ConnectionInterfaceClientTyes_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#ifdef TP_QT_DEPRECATED_WARNINGS -#warning "This file will be removed in a future tp-qt4 release, use #include <TelepathyQt4/ConnectionInterfaceClientTypesInterface> instead" -#endif - -#include <TelepathyQt4/connection.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceClientTypesInterface b/TelepathyQt4/ConnectionInterfaceClientTypesInterface deleted file mode 100644 index f157c47d..00000000 --- a/TelepathyQt4/ConnectionInterfaceClientTypesInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ConnectionInterfaceClientTypesInterface_HEADER_GUARD_ -#define _TelepathyQt4_ConnectionInterfaceClientTypesInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/connection.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceContactBlockingInterface b/TelepathyQt4/ConnectionInterfaceContactBlockingInterface deleted file mode 100644 index 2ff8e2ab..00000000 --- a/TelepathyQt4/ConnectionInterfaceContactBlockingInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ConnectionInterfaceContactBlockingInterface_HEADER_GUARD_ -#define _TelepathyQt4_ConnectionInterfaceContactBlockingInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/connection.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceContactCapabilitiesInterface b/TelepathyQt4/ConnectionInterfaceContactCapabilitiesInterface deleted file mode 100644 index 11e77a76..00000000 --- a/TelepathyQt4/ConnectionInterfaceContactCapabilitiesInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ConnectionInterfaceContactCapabilitiesInterface_HEADER_GUARD_ -#define _TelepathyQt4_ConnectionInterfaceContactCapabilitiesInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/connection.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceContactGroups b/TelepathyQt4/ConnectionInterfaceContactGroups deleted file mode 100644 index ca72a562..00000000 --- a/TelepathyQt4/ConnectionInterfaceContactGroups +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef _TelepathyQt4_ConnectionInterfaceContactGroups_HEADER_GUARD_ -#define _TelepathyQt4_ConnectionInterfaceContactGroups_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#ifdef TP_QT_DEPRECATED_WARNINGS -#warning "This file will be removed in a future tp-qt4 release, use #include <TelepathyQt4/ConnectionInterfaceContactGroupsInterface> instead" -#endif - -#include <TelepathyQt4/connection.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceContactGroupsInterface b/TelepathyQt4/ConnectionInterfaceContactGroupsInterface deleted file mode 100644 index 9e7ca09f..00000000 --- a/TelepathyQt4/ConnectionInterfaceContactGroupsInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ConnectionInterfaceContactGroupsInterface_HEADER_GUARD_ -#define _TelepathyQt4_ConnectionInterfaceContactGroupsInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/connection.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceContactInfoInterface b/TelepathyQt4/ConnectionInterfaceContactInfoInterface deleted file mode 100644 index eb62168d..00000000 --- a/TelepathyQt4/ConnectionInterfaceContactInfoInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ConnectionInterfaceContactInfoInterface_HEADER_GUARD_ -#define _TelepathyQt4_ConnectionInterfaceContactInfoInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/connection.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceContactList b/TelepathyQt4/ConnectionInterfaceContactList deleted file mode 100644 index 12492f3c..00000000 --- a/TelepathyQt4/ConnectionInterfaceContactList +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef _TelepathyQt4_ConnectionInterfaceContactList_HEADER_GUARD_ -#define _TelepathyQt4_ConnectionInterfaceContactList_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#ifdef TP_QT_DEPRECATED_WARNINGS -#warning "This file will be removed in a future tp-qt4 release, use #include <TelepathyQt4/ConnectionInterfaceContactListInterface> instead" -#endif - -#include <TelepathyQt4/connection.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceContactListInterface b/TelepathyQt4/ConnectionInterfaceContactListInterface deleted file mode 100644 index cef792d9..00000000 --- a/TelepathyQt4/ConnectionInterfaceContactListInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ConnectionInterfaceContactListInterface_HEADER_GUARD_ -#define _TelepathyQt4_ConnectionInterfaceContactListInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/connection.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceContactsInterface b/TelepathyQt4/ConnectionInterfaceContactsInterface deleted file mode 100644 index 965afbf4..00000000 --- a/TelepathyQt4/ConnectionInterfaceContactsInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ConnectionInterfaceContactsInterface_HEADER_GUARD_ -#define _TelepathyQt4_ConnectionInterfaceContactsInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/connection.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceLocationInterface b/TelepathyQt4/ConnectionInterfaceLocationInterface deleted file mode 100644 index 33af2e50..00000000 --- a/TelepathyQt4/ConnectionInterfaceLocationInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ConnectionInterfaceLocationInterface_HEADER_GUARD_ -#define _TelepathyQt4_ConnectionInterfaceLocationInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/connection.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceMailNotificationInterface b/TelepathyQt4/ConnectionInterfaceMailNotificationInterface deleted file mode 100644 index 4d981b51..00000000 --- a/TelepathyQt4/ConnectionInterfaceMailNotificationInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ConnectionInterfaceMailNotificationInterface_HEADER_GUARD_ -#define _TelepathyQt4_ConnectionInterfaceMailNotificationInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/connection.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfacePowerSaving b/TelepathyQt4/ConnectionInterfacePowerSaving deleted file mode 100644 index 97b94364..00000000 --- a/TelepathyQt4/ConnectionInterfacePowerSaving +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef _TelepathyQt4_ConnectionInterfacePowerSaving_HEADER_GUARD_ -#define _TelepathyQt4_ConnectionInterfacePowerSaving_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#ifdef TP_QT_DEPRECATED_WARNINGS -#warning "This file will be removed in a future tp-qt4 release, use #include <TelepathyQt4/ConnectionInterfacePowerSavingInterface> instead" -#endif - -#include <TelepathyQt4/connection.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfacePowerSavingInterface b/TelepathyQt4/ConnectionInterfacePowerSavingInterface deleted file mode 100644 index bf8c552f..00000000 --- a/TelepathyQt4/ConnectionInterfacePowerSavingInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ConnectionInterfacePowerSavingInterface_HEADER_GUARD_ -#define _TelepathyQt4_ConnectionInterfacePowerSavingInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/connection.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfacePresenceInterface b/TelepathyQt4/ConnectionInterfacePresenceInterface deleted file mode 100644 index 85f1a213..00000000 --- a/TelepathyQt4/ConnectionInterfacePresenceInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ConnectionInterfacePresenceInterface_HEADER_GUARD_ -#define _TelepathyQt4_ConnectionInterfacePresenceInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/connection.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceRequestsInterface b/TelepathyQt4/ConnectionInterfaceRequestsInterface deleted file mode 100644 index e8cc4af8..00000000 --- a/TelepathyQt4/ConnectionInterfaceRequestsInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ConnectionInterfaceRequestsInterface_HEADER_GUARD_ -#define _TelepathyQt4_ConnectionInterfaceRequestsInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/connection.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceServicePointInterface b/TelepathyQt4/ConnectionInterfaceServicePointInterface deleted file mode 100644 index 4e7b07e6..00000000 --- a/TelepathyQt4/ConnectionInterfaceServicePointInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ConnectionInterfaceServicePointInterface_HEADER_GUARD_ -#define _TelepathyQt4_ConnectionInterfaceServicePointInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/connection.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionInterfaceSimplePresenceInterface b/TelepathyQt4/ConnectionInterfaceSimplePresenceInterface deleted file mode 100644 index 4e3fc77f..00000000 --- a/TelepathyQt4/ConnectionInterfaceSimplePresenceInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ConnectionInterfaceSimplePresenceInterface_HEADER_GUARD_ -#define _TelepathyQt4_ConnectionInterfaceSimplePresenceInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/connection.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionLowlevel b/TelepathyQt4/ConnectionLowlevel deleted file mode 100644 index 87e9e82c..00000000 --- a/TelepathyQt4/ConnectionLowlevel +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ConnectionLowlevel_HEADER_GUARD -#define _TelepathyQt4_ConnectionLowlevel_HEADER_GUARD - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/connection-lowlevel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionManager b/TelepathyQt4/ConnectionManager deleted file mode 100644 index 513b1240..00000000 --- a/TelepathyQt4/ConnectionManager +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ConnectionManager_HEADER_GUARD_ -#define _TelepathyQt4_ConnectionManager_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/connection-manager.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionManagerInterface b/TelepathyQt4/ConnectionManagerInterface deleted file mode 100644 index 81868b07..00000000 --- a/TelepathyQt4/ConnectionManagerInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ConnectionManagerInterface_HEADER_GUARD_ -#define _TelepathyQt4_ConnectionManagerInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/connection-manager.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ConnectionManagerLowlevel b/TelepathyQt4/ConnectionManagerLowlevel deleted file mode 100644 index ab316996..00000000 --- a/TelepathyQt4/ConnectionManagerLowlevel +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ConnectionManagerLowlevel_HEADER_GUARD -#define _TelepathyQt4_ConnectionManagerLowlevel_HEADER_GUARD - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/connection-manager-lowlevel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/Constants b/TelepathyQt4/Constants deleted file mode 100644 index 64cacb26..00000000 --- a/TelepathyQt4/Constants +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_Constants_HEADER_GUARD_ -#define _TelepathyQt4_Constants_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/constants.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/Contact b/TelepathyQt4/Contact deleted file mode 100644 index a12e59fe..00000000 --- a/TelepathyQt4/Contact +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_Contact_HEADER_GUARD_ -#define _TelepathyQt4_Contact_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/contact.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ContactCapabilities b/TelepathyQt4/ContactCapabilities deleted file mode 100644 index a000bcac..00000000 --- a/TelepathyQt4/ContactCapabilities +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ContactCapabilities_HEADER_GUARD_ -#define _TelepathyQt4_ContactCapabilities_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/contact-capabilities.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ContactFactory b/TelepathyQt4/ContactFactory deleted file mode 100644 index ed5a79cf..00000000 --- a/TelepathyQt4/ContactFactory +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ContactFactory_HEADER_GUARD_ -#define _TelepathyQt4_ContactFactory_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/contact-factory.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ContactManager b/TelepathyQt4/ContactManager deleted file mode 100644 index 08045dcf..00000000 --- a/TelepathyQt4/ContactManager +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ContactManager_HEADER_GUARD_ -#define _TelepathyQt4_ContactManager_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/contact-manager.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ContactMessenger b/TelepathyQt4/ContactMessenger deleted file mode 100644 index daa78076..00000000 --- a/TelepathyQt4/ContactMessenger +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ContactMessenger_HEADER_GUARD_ -#define _TelepathyQt4_ContactMessenger_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/contact-messenger.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ContactSearchChannel b/TelepathyQt4/ContactSearchChannel deleted file mode 100644 index df6085b6..00000000 --- a/TelepathyQt4/ContactSearchChannel +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ContactSearchChannel_HEADER_GUARD_ -#define _TelepathyQt4_ContactSearchChannel_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/contact-search-channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/DBus b/TelepathyQt4/DBus deleted file mode 100644 index b807569f..00000000 --- a/TelepathyQt4/DBus +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_DBus_HEADER_GUARD_ -#define _TelepathyQt4_DBus_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/dbus.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/DBusDaemonInterface b/TelepathyQt4/DBusDaemonInterface deleted file mode 100644 index 1ffa1a9c..00000000 --- a/TelepathyQt4/DBusDaemonInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_DBusDaemonInterface_HEADER_GUARD_ -#define _TelepathyQt4_DBusDaemonInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/dbus.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/DBusProxy b/TelepathyQt4/DBusProxy deleted file mode 100644 index 534387ee..00000000 --- a/TelepathyQt4/DBusProxy +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_DBusProxy_HEADER_GUARD_ -#define _TelepathyQt4_DBusProxy_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/dbus-proxy.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/DBusProxyFactory b/TelepathyQt4/DBusProxyFactory deleted file mode 100644 index edd8801f..00000000 --- a/TelepathyQt4/DBusProxyFactory +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_DBusProxyFactory_HEADER_GUARD_ -#define _TelepathyQt4_DBusProxyFactory_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/dbus-proxy-factory.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/Debug b/TelepathyQt4/Debug deleted file mode 100644 index d13f75ac..00000000 --- a/TelepathyQt4/Debug +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_Debug_HEADER_GUARD_ -#define _TelepathyQt4_Debug_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/debug.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/Farsight/Channel b/TelepathyQt4/Farsight/Channel deleted file mode 100644 index 19fd9562..00000000 --- a/TelepathyQt4/Farsight/Channel +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_Farsight_Channel_HEADER_GUARD_ -#define _TelepathyQt4_Farsight_Channel_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/Farsight/channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/Feature b/TelepathyQt4/Feature deleted file mode 100644 index 8e8bebb6..00000000 --- a/TelepathyQt4/Feature +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_Feature_HEADER_GUARD_ -#define _TelepathyQt4_Feature_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/feature.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/Features b/TelepathyQt4/Features deleted file mode 100644 index 72e9966e..00000000 --- a/TelepathyQt4/Features +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_Features_HEADER_GUARD_ -#define _TelepathyQt4_Features_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/feature.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/FileTransferChannel b/TelepathyQt4/FileTransferChannel deleted file mode 100644 index dfca8a47..00000000 --- a/TelepathyQt4/FileTransferChannel +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_FileTransferChannel_HEADER_GUARD_ -#define _TelepathyQt4_FileTransferChannel_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/file-transfer-channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/FileTransferChannelCreationProperties b/TelepathyQt4/FileTransferChannelCreationProperties deleted file mode 100644 index 362d8670..00000000 --- a/TelepathyQt4/FileTransferChannelCreationProperties +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_FileTransferChannelCreationProperties_HEADER_GUARD_ -#define _TelepathyQt4_FileTransferChannelCreationProperties_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/file-transfer-channel-creation-properties.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/Filter b/TelepathyQt4/Filter deleted file mode 100644 index 2775dc11..00000000 --- a/TelepathyQt4/Filter +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_Filter_HEADER_GUARD_ -#define _TelepathyQt4_Filter_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/filter.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/GenericCapabilityFilter b/TelepathyQt4/GenericCapabilityFilter deleted file mode 100644 index 9bda825c..00000000 --- a/TelepathyQt4/GenericCapabilityFilter +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_GenericCapabilityFilter_HEADER_GUARD_ -#define _TelepathyQt4_GenericCapabilityFilter_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/generic-capability-filter.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/GenericPropertyFilter b/TelepathyQt4/GenericPropertyFilter deleted file mode 100644 index 110f00fe..00000000 --- a/TelepathyQt4/GenericPropertyFilter +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_GenericPropertyFilter_HEADER_GUARD_ -#define _TelepathyQt4_GenericPropertyFilter_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/generic-property-filter.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/Global b/TelepathyQt4/Global deleted file mode 100644 index d4fb7f21..00000000 --- a/TelepathyQt4/Global +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_Global_HEADER_GUARD_ -#define _TelepathyQt4_Global_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/global.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/HandledChannelNotifier b/TelepathyQt4/HandledChannelNotifier deleted file mode 100644 index 541071ec..00000000 --- a/TelepathyQt4/HandledChannelNotifier +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_HandledChannelNotifier_HEADER_GUARD_ -#define _TelepathyQt4_HandledChannelNotifier_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/handled-channel-notifier.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/IncomingFileTransferChannel b/TelepathyQt4/IncomingFileTransferChannel deleted file mode 100644 index 7f606fbb..00000000 --- a/TelepathyQt4/IncomingFileTransferChannel +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_IncomingFileTransferChannel_HEADER_GUARD_ -#define _TelepathyQt4_IncomingFileTransferChannel_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/incoming-file-transfer-channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/IncomingStreamTubeChannel b/TelepathyQt4/IncomingStreamTubeChannel deleted file mode 100644 index a7bfb033..00000000 --- a/TelepathyQt4/IncomingStreamTubeChannel +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_IncomingStreamTubeChannel_HEADER_GUARD_ -#define _TelepathyQt4_IncomingStreamTubeChannel_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/incoming-stream-tube-channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/IntrospectableInterface b/TelepathyQt4/IntrospectableInterface deleted file mode 100644 index ddb0c1b1..00000000 --- a/TelepathyQt4/IntrospectableInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_IntrospectableInterface_HEADER_GUARD_ -#define _TelepathyQt4_IntrospectableInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/dbus.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/KeyFile b/TelepathyQt4/KeyFile deleted file mode 100644 index 206a83f4..00000000 --- a/TelepathyQt4/KeyFile +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_KeyFile_HEADER_GUARD_ -#define _TelepathyQt4_KeyFile_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/key-file.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/LocationInfo b/TelepathyQt4/LocationInfo deleted file mode 100644 index 7069d0e7..00000000 --- a/TelepathyQt4/LocationInfo +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_LocationInfo_HEADER_GUARD_ -#define _TelepathyQt4_LocationInfo_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/location-info.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ManagerFile b/TelepathyQt4/ManagerFile deleted file mode 100644 index 32953004..00000000 --- a/TelepathyQt4/ManagerFile +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ManagerFile_HEADER_GUARD_ -#define _TelepathyQt4_ManagerFile_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/manager-file.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/MediaSessionHandler b/TelepathyQt4/MediaSessionHandler deleted file mode 100644 index c5502d08..00000000 --- a/TelepathyQt4/MediaSessionHandler +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_MediaSessionHandler_HEADER_GUARD_ -#define _TelepathyQt4_MediaSessionHandler_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/media-session-handler.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/MediaSessionHandlerInterface b/TelepathyQt4/MediaSessionHandlerInterface deleted file mode 100644 index 78b1066c..00000000 --- a/TelepathyQt4/MediaSessionHandlerInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_MediaSessionHandlerInterface_HEADER_GUARD_ -#define _TelepathyQt4_MediaSessionHandlerInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/media-session-handler.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/MediaStreamHandler b/TelepathyQt4/MediaStreamHandler deleted file mode 100644 index 3868220d..00000000 --- a/TelepathyQt4/MediaStreamHandler +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_MediaStreamHandler_HEADER_GUARD_ -#define _TelepathyQt4_MediaStreamHandler_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/media-stream-handler.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/MediaStreamHandlerInterface b/TelepathyQt4/MediaStreamHandlerInterface deleted file mode 100644 index 3ce2ad9b..00000000 --- a/TelepathyQt4/MediaStreamHandlerInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_MediaStreamHandlerInterface_HEADER_GUARD_ -#define _TelepathyQt4_MediaStreamHandlerInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/media-stream-handler.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/Message b/TelepathyQt4/Message deleted file mode 100644 index b790dad5..00000000 --- a/TelepathyQt4/Message +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_Message_HEADER_GUARD_ -#define _TelepathyQt4_Message_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/message.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/MessageContentPart b/TelepathyQt4/MessageContentPart deleted file mode 100644 index b46a2a70..00000000 --- a/TelepathyQt4/MessageContentPart +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_MessageContentPart_HEADER_GUARD_ -#define _TelepathyQt4_MessageContentPart_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/message-content-part.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/MessageContentPartList b/TelepathyQt4/MessageContentPartList deleted file mode 100644 index 73a0a2e7..00000000 --- a/TelepathyQt4/MessageContentPartList +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_MessageContentPartList_HEADER_GUARD_ -#define _TelepathyQt4_MessageContentPartList_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/message-content-part.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/MethodInvocationContext b/TelepathyQt4/MethodInvocationContext deleted file mode 100644 index 9072c238..00000000 --- a/TelepathyQt4/MethodInvocationContext +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_MethodInvocationContext_HEADER_GUARD_ -#define _TelepathyQt4_MethodInvocationContext_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/method-invocation-context.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/NotFilter b/TelepathyQt4/NotFilter deleted file mode 100644 index fe0d8224..00000000 --- a/TelepathyQt4/NotFilter +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_NotFilter_HEADER_GUARD_ -#define _TelepathyQt4_NotFilter_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/not-filter.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/Object b/TelepathyQt4/Object deleted file mode 100644 index 1abdf34e..00000000 --- a/TelepathyQt4/Object +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_Object_HEADER_GUARD_ -#define _TelepathyQt4_Object_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/object.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/OptionalInterfaceFactory b/TelepathyQt4/OptionalInterfaceFactory deleted file mode 100644 index 09c49e4a..00000000 --- a/TelepathyQt4/OptionalInterfaceFactory +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_OptionalInterfaceFactory_HEADER_GUARD_ -#define _TelepathyQt4_OptionalInterfaceFactory_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/optional-interface-factory.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/OrFilter b/TelepathyQt4/OrFilter deleted file mode 100644 index ca2ab990..00000000 --- a/TelepathyQt4/OrFilter +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_OrFilter_HEADER_GUARD_ -#define _TelepathyQt4_OrFilter_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/or-filter.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/OutgoingFileTransferChannel b/TelepathyQt4/OutgoingFileTransferChannel deleted file mode 100644 index 6f31c74d..00000000 --- a/TelepathyQt4/OutgoingFileTransferChannel +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_OutgoingFileTransferChannel_HEADER_GUARD_ -#define _TelepathyQt4_OutgoingFileTransferChannel_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/outgoing-file-transfer-channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/OutgoingStreamTubeChannel b/TelepathyQt4/OutgoingStreamTubeChannel deleted file mode 100644 index b5e68d67..00000000 --- a/TelepathyQt4/OutgoingStreamTubeChannel +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_OutgoingStreamTubeChannel_HEADER_GUARD_ -#define _TelepathyQt4_OutgoingStreamTubeChannel_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/outgoing-stream-tube-channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/PeerInterface b/TelepathyQt4/PeerInterface deleted file mode 100644 index 90192e5c..00000000 --- a/TelepathyQt4/PeerInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_PeerInterface_HEADER_GUARD_ -#define _TelepathyQt4_PeerInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/dbus.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/PendingAccount b/TelepathyQt4/PendingAccount deleted file mode 100644 index 7168ea87..00000000 --- a/TelepathyQt4/PendingAccount +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_PendingAccount_HEADER_GUARD_ -#define _TelepathyQt4_PendingAccount_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/pending-account.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/PendingChannel b/TelepathyQt4/PendingChannel deleted file mode 100644 index 2d565451..00000000 --- a/TelepathyQt4/PendingChannel +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_PendingChannel_HEADER_GUARD_ -#define _TelepathyQt4_PendingChannel_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/pending-channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/PendingChannelRequest b/TelepathyQt4/PendingChannelRequest deleted file mode 100644 index 42a0ea4a..00000000 --- a/TelepathyQt4/PendingChannelRequest +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_PendingChannelRequest_HEADER_GUARD_ -#define _TelepathyQt4_PendingChannelRequest_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/pending-channel-request.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/PendingComposite b/TelepathyQt4/PendingComposite deleted file mode 100644 index 691604cf..00000000 --- a/TelepathyQt4/PendingComposite +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_PendingComposite_HEADER_GUARD_ -#define _TelepathyQt4_PendingComposite_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/simple-pending-operations.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/PendingConnection b/TelepathyQt4/PendingConnection deleted file mode 100644 index b6d4c6d5..00000000 --- a/TelepathyQt4/PendingConnection +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_PendingConnection_HEADER_GUARD_ -#define _TelepathyQt4_PendingConnection_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/pending-connection.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/PendingContactAttributes b/TelepathyQt4/PendingContactAttributes deleted file mode 100644 index 5f37b436..00000000 --- a/TelepathyQt4/PendingContactAttributes +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_PendingContactAttributes_HEADER_GUARD_ -#define _TelepathyQt4_PendingContactAttributes_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/pending-contact-attributes.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/PendingContactInfo b/TelepathyQt4/PendingContactInfo deleted file mode 100644 index 9f3c7a3e..00000000 --- a/TelepathyQt4/PendingContactInfo +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_PendingContactInfo_HEADER_GUARD_ -#define _TelepathyQt4_PendingContactInfo_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/pending-contact-info.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/PendingContacts b/TelepathyQt4/PendingContacts deleted file mode 100644 index 40b8e042..00000000 --- a/TelepathyQt4/PendingContacts +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_PendingContacts_HEADER_GUARD_ -#define _TelepathyQt4_PendingContacts_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/pending-contacts.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/PendingFailure b/TelepathyQt4/PendingFailure deleted file mode 100644 index eb4ead7c..00000000 --- a/TelepathyQt4/PendingFailure +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_PendingFailure_HEADER_GUARD_ -#define _TelepathyQt4_PendingFailure_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/simple-pending-operations.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/PendingHandles b/TelepathyQt4/PendingHandles deleted file mode 100644 index aaad3c4d..00000000 --- a/TelepathyQt4/PendingHandles +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_PendingHandles_HEADER_GUARD_ -#define _TelepathyQt4_PendingHandles_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/pending-handles.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/PendingOperation b/TelepathyQt4/PendingOperation deleted file mode 100644 index fdffc4fc..00000000 --- a/TelepathyQt4/PendingOperation +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_PendingOperation_HEADER_GUARD_ -#define _TelepathyQt4_PendingOperation_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/pending-operation.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/PendingReady b/TelepathyQt4/PendingReady deleted file mode 100644 index e7adfc52..00000000 --- a/TelepathyQt4/PendingReady +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_PendingReady_HEADER_GUARD_ -#define _TelepathyQt4_PendingReady_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/pending-ready.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/PendingSendMessage b/TelepathyQt4/PendingSendMessage deleted file mode 100644 index 98b91d8f..00000000 --- a/TelepathyQt4/PendingSendMessage +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_PendingSendMessage_HEADER_GUARD_ -#define _TelepathyQt4_PendingSendMessage_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/pending-send-message.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/PendingStreamTubeConnection b/TelepathyQt4/PendingStreamTubeConnection deleted file mode 100644 index 7a094cae..00000000 --- a/TelepathyQt4/PendingStreamTubeConnection +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_PendingStreamTubeConnection_HEADER_GUARD_ -#define _TelepathyQt4_PendingStreamTubeConnection_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/pending-stream-tube-connection.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/PendingStreamedMediaStreams b/TelepathyQt4/PendingStreamedMediaStreams deleted file mode 100644 index 7c162936..00000000 --- a/TelepathyQt4/PendingStreamedMediaStreams +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_PendingStreamedMediaStreams_HEADER_GUARD_ -#define _TelepathyQt4_PendingStreamedMediaStreams_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/streamed-media-channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/PendingStringList b/TelepathyQt4/PendingStringList deleted file mode 100644 index 0e45b6a7..00000000 --- a/TelepathyQt4/PendingStringList +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_PendingStringList_HEADER_GUARD_ -#define _TelepathyQt4_PendingStringList_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/pending-string-list.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/PendingSuccess b/TelepathyQt4/PendingSuccess deleted file mode 100644 index bd3c7a28..00000000 --- a/TelepathyQt4/PendingSuccess +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_PendingSuccess_HEADER_GUARD_ -#define _TelepathyQt4_PendingSuccess_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/simple-pending-operations.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/PendingVariant b/TelepathyQt4/PendingVariant deleted file mode 100644 index c3146dd0..00000000 --- a/TelepathyQt4/PendingVariant +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_PendingVariant_HEADER_GUARD_ -#define _TelepathyQt4_PendingVariant_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/pending-variant.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/PendingVariantMap b/TelepathyQt4/PendingVariantMap deleted file mode 100644 index 2cccb0f9..00000000 --- a/TelepathyQt4/PendingVariantMap +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_PendingVariantMap_HEADER_GUARD_ -#define _TelepathyQt4_PendingVariantMap_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/pending-variant-map.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/PendingVoid b/TelepathyQt4/PendingVoid deleted file mode 100644 index 7e21623f..00000000 --- a/TelepathyQt4/PendingVoid +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_PendingVoid_HEADER_GUARD_ -#define _TelepathyQt4_PendingVoid_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/simple-pending-operations.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/Presence b/TelepathyQt4/Presence deleted file mode 100644 index 83d97022..00000000 --- a/TelepathyQt4/Presence +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_Presence_HEADER_GUARD_ -#define _TelepathyQt4_Presence_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/presence.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/PresenceSpec b/TelepathyQt4/PresenceSpec deleted file mode 100644 index 3d87b7c4..00000000 --- a/TelepathyQt4/PresenceSpec +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_PresenceSpec_HEADER_GUARD_ -#define _TelepathyQt4_PresenceSpec_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/presence.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/PresenceSpecList b/TelepathyQt4/PresenceSpecList deleted file mode 100644 index ff7448e9..00000000 --- a/TelepathyQt4/PresenceSpecList +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_PresenceSpecList_HEADER_GUARD_ -#define _TelepathyQt4_PresenceSpecList_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/presence.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/Profile b/TelepathyQt4/Profile deleted file mode 100644 index 161c0bfd..00000000 --- a/TelepathyQt4/Profile +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_Profile_HEADER_GUARD_ -#define _TelepathyQt4_Profile_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/profile.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ProfileManager b/TelepathyQt4/ProfileManager deleted file mode 100644 index 44db4deb..00000000 --- a/TelepathyQt4/ProfileManager +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ProfileManager_HEADER_GUARD_ -#define _TelepathyQt4_ProfileManager_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/profile-manager.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/Properties b/TelepathyQt4/Properties deleted file mode 100644 index 1caa85cb..00000000 --- a/TelepathyQt4/Properties +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_Properties_HEADER_GUARD_ -#define _TelepathyQt4_Properties_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/properties.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/PropertiesInterface b/TelepathyQt4/PropertiesInterface deleted file mode 100644 index 34f66bf7..00000000 --- a/TelepathyQt4/PropertiesInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_PropertiesInterface_HEADER_GUARD_ -#define _TelepathyQt4_PropertiesInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/dbus.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/PropertiesInterfaceInterface b/TelepathyQt4/PropertiesInterfaceInterface deleted file mode 100644 index 348bf457..00000000 --- a/TelepathyQt4/PropertiesInterfaceInterface +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_PropertiesInterfaceInterface_HEADER_GUARD_ -#define _TelepathyQt4_PropertiesInterfaceInterface_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/properties.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ProtocolInfo b/TelepathyQt4/ProtocolInfo deleted file mode 100644 index 1d9b16a8..00000000 --- a/TelepathyQt4/ProtocolInfo +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ProtocolInfo_HEADER_GUARD_ -#define _TelepathyQt4_ProtocolInfo_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/protocol-info.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ProtocolParameter b/TelepathyQt4/ProtocolParameter deleted file mode 100644 index 8b020afa..00000000 --- a/TelepathyQt4/ProtocolParameter +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ProtocolParameter_HEADER_GUARD_ -#define _TelepathyQt4_ProtocolParameter_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/protocol-parameter.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ReadinessHelper b/TelepathyQt4/ReadinessHelper deleted file mode 100644 index 91f61159..00000000 --- a/TelepathyQt4/ReadinessHelper +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ReadinessHelper_HEADER_GUARD_ -#define _TelepathyQt4_ReadinessHelper_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/readiness-helper.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ReadyObject b/TelepathyQt4/ReadyObject deleted file mode 100644 index 6415fbc4..00000000 --- a/TelepathyQt4/ReadyObject +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ReadyObject_HEADER_GUARD_ -#define _TelepathyQt4_ReadyObject_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/ready-object.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ReceivedMessage b/TelepathyQt4/ReceivedMessage deleted file mode 100644 index 379956f8..00000000 --- a/TelepathyQt4/ReceivedMessage +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_ReceivedMessage_HEADER_GUARD_ -#define _TelepathyQt4_ReceivedMessage_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/message.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/RefCounted b/TelepathyQt4/RefCounted deleted file mode 100644 index 995cabe9..00000000 --- a/TelepathyQt4/RefCounted +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_RefCounted_HEADER_GUARD_ -#define _TelepathyQt4_RefCounted_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/shared-ptr.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/ReferencedHandles b/TelepathyQt4/ReferencedHandles deleted file mode 100644 index 8c910f01..00000000 --- a/TelepathyQt4/ReferencedHandles +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef _TelepathyQt4_ReferencedHandles_HEADER_GUARD_ -#define _TelepathyQt4_ReferencedHandles_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/referenced-handles.h> - -#undef IN_TP_QT_HEADER - -#endif diff --git a/TelepathyQt4/ReferencedHandlesIterator b/TelepathyQt4/ReferencedHandlesIterator deleted file mode 100644 index 2e49aaba..00000000 --- a/TelepathyQt4/ReferencedHandlesIterator +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _TelepathyQt4_ReferencedHandlesIterator_HEADER_GUARD_ -#define _TelepathyQt4_ReferencedHandlesIterator_HEADER_GUARD_ - -#include <TelepathyQt4/referenced-handles.h> - -#endif diff --git a/TelepathyQt4/RequestableChannelClassSpec b/TelepathyQt4/RequestableChannelClassSpec deleted file mode 100644 index 1c9ac06f..00000000 --- a/TelepathyQt4/RequestableChannelClassSpec +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_RequestableChannelClassSpec_HEADER_GUARD_ -#define _TelepathyQt4_RequestableChannelClassSpec_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/requestable-channel-class-spec.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/RequestableChannelClassSpecList b/TelepathyQt4/RequestableChannelClassSpecList deleted file mode 100644 index c15fa006..00000000 --- a/TelepathyQt4/RequestableChannelClassSpecList +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_RequestableChannelClassSpecList_HEADER_GUARD_ -#define _TelepathyQt4_RequestableChannelClassSpecList_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/requestable-channel-class-spec.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/RoomListChannel b/TelepathyQt4/RoomListChannel deleted file mode 100644 index 164e7170..00000000 --- a/TelepathyQt4/RoomListChannel +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_RoomListChannel_HEADER_GUARD_ -#define _TelepathyQt4_RoomListChannel_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/room-list-channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/SharedPtr b/TelepathyQt4/SharedPtr deleted file mode 100644 index ef92feb6..00000000 --- a/TelepathyQt4/SharedPtr +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_SharedPtr_HEADER_GUARD_ -#define _TelepathyQt4_SharedPtr_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/shared-ptr.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/SimpleCallObserver b/TelepathyQt4/SimpleCallObserver deleted file mode 100644 index afc05ab5..00000000 --- a/TelepathyQt4/SimpleCallObserver +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_SimpleCallObserver_HEADER_GUARD_ -#define _TelepathyQt4_SimpleCallObserver_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/simple-call-observer.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/SimpleTextObserver b/TelepathyQt4/SimpleTextObserver deleted file mode 100644 index 81696508..00000000 --- a/TelepathyQt4/SimpleTextObserver +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_SimpleTextObserver_HEADER_GUARD_ -#define _TelepathyQt4_SimpleTextObserver_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/simple-text-observer.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/StatefulDBusProxy b/TelepathyQt4/StatefulDBusProxy deleted file mode 100644 index 07ecdbe3..00000000 --- a/TelepathyQt4/StatefulDBusProxy +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_StatefulDBusProxy_HEADER_GUARD_ -#define _TelepathyQt4_StatefulDBusProxy_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/dbus-proxy.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/StatelessDBusProxy b/TelepathyQt4/StatelessDBusProxy deleted file mode 100644 index 1b6459a2..00000000 --- a/TelepathyQt4/StatelessDBusProxy +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_StatelessDBusProxy_HEADER_GUARD_ -#define _TelepathyQt4_StatelessDBusProxy_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/dbus-proxy.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/StreamTubeChannel b/TelepathyQt4/StreamTubeChannel deleted file mode 100644 index 208436d4..00000000 --- a/TelepathyQt4/StreamTubeChannel +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_StreamTubeChannel_HEADER_GUARD_ -#define _TelepathyQt4_StreamTubeChannel_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/stream-tube-channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/StreamTubeClient b/TelepathyQt4/StreamTubeClient deleted file mode 100644 index d28611d3..00000000 --- a/TelepathyQt4/StreamTubeClient +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_StreamTubeClient_HEADER_GUARD_ -#define _TelepathyQt4_StreamTubeClient_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/stream-tube-client.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/StreamTubeServer b/TelepathyQt4/StreamTubeServer deleted file mode 100644 index 0d8ea7dc..00000000 --- a/TelepathyQt4/StreamTubeServer +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_StreamTubeServer_HEADER_GUARD_ -#define _TelepathyQt4_StreamTubeServer_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/stream-tube-server.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/StreamedMediaChannel b/TelepathyQt4/StreamedMediaChannel deleted file mode 100644 index 9abfbb50..00000000 --- a/TelepathyQt4/StreamedMediaChannel +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_StreamedMediaChannel_HEADER_GUARD_ -#define _TelepathyQt4_StreamedMediaChannel_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/streamed-media-channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/StreamedMediaStream b/TelepathyQt4/StreamedMediaStream deleted file mode 100644 index 3140c529..00000000 --- a/TelepathyQt4/StreamedMediaStream +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_StreamedMediaStream_HEADER_GUARD_ -#define _TelepathyQt4_StreamedMediaStream_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/streamed-media-channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/TelepathyQt4Farsight-uninstalled.pc.in b/TelepathyQt4/TelepathyQt4Farsight-uninstalled.pc.in deleted file mode 100644 index 38cb8379..00000000 --- a/TelepathyQt4/TelepathyQt4Farsight-uninstalled.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/nonexistent -exec_prefix=/nonexistent -abs_top_builddir=${CMAKE_BINARY_DIR} -abs_top_srcdir=${CMAKE_SOURCE_DIR} - -Name: Telepathy-Qt4-Farsight (uninstalled copy) -Description: Qt4 Telepathy Farsight utility library for the Telepathy framework -Version: ${PACKAGE_VERSION} -Requires.private: QtCore >= 4.5, QtDBus >= 4.5, telepathy-glib >= 0.7.28, telepathy-farsight >= 0.0.4, TelepathyQt4 = ${PACKAGE_VERSION} -Libs: ${CMAKE_BINARY_DIR}/TelepathyQt4/Farsight/libtelepathy-qt4-farsight.so -Cflags: -I${CMAKE_SOURCE_DIR} -I${CMAKE_BINARY_DIR} diff --git a/TelepathyQt4/TextChannel b/TelepathyQt4/TextChannel deleted file mode 100644 index ccea3b2f..00000000 --- a/TelepathyQt4/TextChannel +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_TextChannel_HEADER_GUARD_ -#define _TelepathyQt4_TextChannel_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/text-channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/TubeChannel b/TelepathyQt4/TubeChannel deleted file mode 100644 index 0121a55f..00000000 --- a/TelepathyQt4/TubeChannel +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_TubeChannel_HEADER_GUARD_ -#define _TelepathyQt4_TubeChannel_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/tube-channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/Types b/TelepathyQt4/Types deleted file mode 100644 index cac95c87..00000000 --- a/TelepathyQt4/Types +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_Types_HEADER_GUARD_ -#define _TelepathyQt4_Types_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/types.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt4/Utils b/TelepathyQt4/Utils deleted file mode 100644 index 5bd64320..00000000 --- a/TelepathyQt4/Utils +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt4_Utils_HEADER_GUARD_ -#define _TelepathyQt4_Utils_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt4/utils.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/cmake/modules/TelepathyDist.cmake b/cmake/modules/TelepathyDist.cmake index 1b4e3d28..258a7aed 100644 --- a/cmake/modules/TelepathyDist.cmake +++ b/cmake/modules/TelepathyDist.cmake @@ -51,7 +51,7 @@ if (ENABLE_CPACK) SET(CPACK_PACKAGE_VERSION_MAJOR ${TP_QT_MAJOR_VERSION}) SET(CPACK_PACKAGE_VERSION_MINOR ${TP_QT_MINOR_VERSION}) SET(CPACK_PACKAGE_VERSION_PATCH ${TP_QT_MICRO_VERSION}) - SET(CPACK_PACKAGE_INSTALL_DIRECTORY "TelepathyQt4") + SET(CPACK_PACKAGE_INSTALL_DIRECTORY "TelepathyQt") SET(CPACK_PACKAGE_CONTACT "telepathy@lists.freedesktop.org") set(CPACK_SOURCE_IGNORE_FILES "/build/;/.bzr/;~$;/.git/;/.kdev4/;${CPACK_SOURCE_IGNORE_FILES}") @@ -60,7 +60,7 @@ if (ENABLE_CPACK) # sure there is at least one set of four (4) backlasshes. #SET(CPACK_PACKAGE_ICON "${CMake_SOURCE_DIR}/Utilities/Release\\\\InstallIcon.bmp") #SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\MyExecutable.exe") - SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} TelepathyQt4") + SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} TelepathyQt") #SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\www.github.com") #SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\www.my-personal-home-page.com") #SET(CPACK_NSIS_CONTACT "me@my-personal-home-page.com") @@ -77,20 +77,20 @@ if (ENABLE_CPACK) endif (APPLE) #name components - set(CPACK_COMPONENT_MAINLIBRARY_DISPLAY_NAME "TelepathyQt4 main components") - set(CPACK_COMPONENT_FARSIGHT_DISPLAY_NAME "TelepathyQt4 Farsight support") - set(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "Development files for TelepathyQt4") - set(CPACK_COMPONENT_FARSIGHT_HEADERS_DISPLAY_NAME "Development files for TelepathyQt4-Farsight") + set(CPACK_COMPONENT_MAINLIBRARY_DISPLAY_NAME "TelepathyQt main components") + set(CPACK_COMPONENT_FARSIGHT_DISPLAY_NAME "TelepathyQt Farsight support") + set(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "Development files for TelepathyQt") + set(CPACK_COMPONENT_FARSIGHT_HEADERS_DISPLAY_NAME "Development files for TelepathyQt-Farsight") #components description set(CPACK_COMPONENT_MAINLIBRARY_DESCRIPTION - "The main TelepathyQt4 library") + "The main TelepathyQt library") set(CPACK_COMPONENT_FARSIGHT_DESCRIPTION - "The TelepathyQt4-Farsight library") + "The TelepathyQt-Farsight library") set(CPACK_COMPONENT_HEADERS_DESCRIPTION - "Development files for TelepathyQt4") + "Development files for TelepathyQt") set(CPACK_COMPONENT_FARSIGHT_HEADERS_DESCRIPTION - "Development files for TelepathyQt4-Farsight") + "Development files for TelepathyQt-Farsight") set(CPACK_COMPONENT_HEADERS_DEPENDS mainlibrary) set(CPACK_COMPONENT_FARSIGHT_DEPENDS mainlibrary) diff --git a/cmake/modules/TpQt4Macros.cmake b/cmake/modules/TpQt4Macros.cmake index 205293df..efbeb4ad 100644 --- a/cmake/modules/TpQt4Macros.cmake +++ b/cmake/modules/TpQt4Macros.cmake @@ -193,8 +193,8 @@ function(tpqt_client_generator spec group pretty_include namespace) --typesnamespace=Tp --headerfile=${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}.h --implfile=${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}-body.hpp - --realinclude=TelepathyQt4/${spec}.h - --prettyinclude=TelepathyQt4/${pretty_include} + --realinclude=TelepathyQt/${spec}.h + --prettyinclude=TelepathyQt/${pretty_include} --specxml=${CMAKE_CURRENT_BINARY_DIR}/_gen/stable-spec.xml --ifacexml=${CMAKE_CURRENT_BINARY_DIR}/_gen/spec-${spec}.xml --extraincludes=${TYPES_INCLUDE} @@ -229,13 +229,13 @@ function(tpqt_future_client_generator spec namespace) --typesnamespace=TpFuture --headerfile=${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}.h --implfile=${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}-body.hpp - --realinclude=TelepathyQt4/future-internal.h - --prettyinclude=TelepathyQt4/future-internal.h + --realinclude=TelepathyQt/future-internal.h + --prettyinclude=TelepathyQt/future-internal.h --specxml=${CMAKE_CURRENT_BINARY_DIR}/_gen/future-spec.xml --ifacexml=${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}.xml --extraincludes=${TYPES_INCLUDE} - --extraincludes='<TelepathyQt4/Types>' - --extraincludes='<TelepathyQt4/future-internal.h>' + --extraincludes='<TelepathyQt/Types>' + --extraincludes='<TelepathyQt/future-internal.h>' --visibility=TP_QT_NO_EXPORT ${future_client_generator_args}) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}.h ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}-body.hpp @@ -278,8 +278,8 @@ endfunction(tpqt_generate_manager_file MANAGER_FILE) function(tpqt_xincludator _TARGET_NAME _INPUT_FILE _OUTPUT_FILE) tpqt_extract_depends(xincludator_gen_args xincludator_gen_depends ${ARGN}) - # Gather all .xml files in TelepathyQt4 and spec/ and make this target depend on those - file(GLOB depends_xml_files ${CMAKE_SOURCE_DIR}/TelepathyQt4/*.xml ${CMAKE_SOURCE_DIR}/spec/*.xml) + # Gather all .xml files in TelepathyQt and spec/ and make this target depend on those + file(GLOB depends_xml_files ${CMAKE_SOURCE_DIR}/TelepathyQt/*.xml ${CMAKE_SOURCE_DIR}/spec/*.xml) add_custom_command(OUTPUT ${_OUTPUT_FILE} @@ -301,8 +301,8 @@ endfunction(tpqt_xincludator _TARGET_NAME _INPUT_FILE _OUTPUT_FILE) function(tpqt_constants_gen _TARGET_NAME _SPEC_XML _OUTFILE) tpqt_extract_depends(constants_gen_args constants_gen_depends ${ARGN}) - # Gather all .xml files in TelepathyQt4 and spec/ and make this target depend on those - file(GLOB depends_xml_files ${CMAKE_SOURCE_DIR}/TelepathyQt4/*.xml ${CMAKE_SOURCE_DIR}/spec/*.xml) + # Gather all .xml files in TelepathyQt and spec/ and make this target depend on those + file(GLOB depends_xml_files ${CMAKE_SOURCE_DIR}/TelepathyQt/*.xml ${CMAKE_SOURCE_DIR}/spec/*.xml) add_custom_command(OUTPUT ${_OUTFILE} @@ -326,8 +326,8 @@ endfunction (tpqt_constants_gen _TARGET_NAME _SPEC_XML _OUTFILE) function(tpqt_types_gen _TARGET_NAME _SPEC_XML _OUTFILE_DECL _OUTFILE_IMPL _NAMESPACE _REALINCLUDE _PRETTYINCLUDE) tpqt_extract_depends(types_gen_args types_gen_depends ${ARGN}) - # Gather all .xml files in TelepathyQt4 and spec/ and make this target depend on those - file(GLOB depends_xml_files ${CMAKE_SOURCE_DIR}/TelepathyQt4/*.xml ${CMAKE_SOURCE_DIR}/spec/*.xml) + # Gather all .xml files in TelepathyQt and spec/ and make this target depend on those + file(GLOB depends_xml_files ${CMAKE_SOURCE_DIR}/TelepathyQt/*.xml ${CMAKE_SOURCE_DIR}/spec/*.xml) add_custom_command(OUTPUT ${_OUTFILE_DECL} ${_OUTFILE_IMPL} COMMAND ${PYTHON_EXECUTABLE} diff --git a/doxygen.cfg.in b/doxygen.cfg.in index 4fdd68e2..f68c926c 100644 --- a/doxygen.cfg.in +++ b/doxygen.cfg.in @@ -535,7 +535,7 @@ WARN_LOGFILE = doxygen.log # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = ${abs_top_srcdir}/TelepathyQt4 ${abs_top_builddir}/TelepathyQt4 +INPUT = ${abs_top_srcdir}/TelepathyQt ${abs_top_builddir}/TelepathyQt # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is @@ -1439,7 +1439,7 @@ QHP_VIRTUAL_FOLDER = "${PROJECT_NAME}-${PACKAGE_VERSION}" QCH_FILE = ${abs_top_builddir}/doc/help/telepathy-qt4.qch QHG_LOCATION = ${QHELPGENERATOR_EXECUTABLE} -### TelepathyQt4 Settings +### TelepathyQt Settings ALIASES = \ "intern=\par<b>Internal use only.</b>" \ "reimp=\par<b>Reimplemented from superclass.</b>" \ @@ -1451,7 +1451,7 @@ ALIASES = \ "faq=\xrefitem FAQ \"F.A.Q.\" \"F.A.Q.\"" \ "authors=\xrefitem authors \"Author(s)\" \"Authors\"" \ "maintainers=\xrefitem maintainers \"Maintainer(s)\" \"Maintainers\"" \ - "glossary=\xrefitem glossary \"TelepathyQt4 Glossary\" \"TelepathyQt4 Glossary\"" \ + "glossary=\xrefitem glossary \"TelepathyQt Glossary\" \"TelepathyQt Glossary\"" \ "acronym=\b "\ "licenses=\xrefitem licenses \"License(s)\" \"Licenses\"" \ "short=@brief "\ diff --git a/examples/accounts/account-item.cpp b/examples/accounts/account-item.cpp index 0ad21373..b533d81a 100644 --- a/examples/accounts/account-item.cpp +++ b/examples/accounts/account-item.cpp @@ -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/> * @license LGPL 2.1 @@ -22,8 +22,8 @@ #include "account-item.h" #include "_gen/account-item.moc.hpp" -#include <TelepathyQt4/AccountManager> -#include <TelepathyQt4/PendingReady> +#include <TelepathyQt/AccountManager> +#include <TelepathyQt/PendingReady> #include <QDebug> #include <QComboBox> diff --git a/examples/accounts/account-item.h b/examples/accounts/account-item.h index d4584b21..07b72049 100644 --- a/examples/accounts/account-item.h +++ b/examples/accounts/account-item.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/> * @license LGPL 2.1 @@ -19,12 +19,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_examples_accounts_account_item_h_HEADER_GUARD_ -#define _TelepathyQt4_examples_accounts_account_item_h_HEADER_GUARD_ +#ifndef _TelepathyQt_examples_accounts_account_item_h_HEADER_GUARD_ +#define _TelepathyQt_examples_accounts_account_item_h_HEADER_GUARD_ -#include <TelepathyQt4/Types> -#include <TelepathyQt4/Account> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Types> +#include <TelepathyQt/Account> +#include <TelepathyQt/Types> #include <QString> diff --git a/examples/accounts/accounts-window.cpp b/examples/accounts/accounts-window.cpp index fc79b834..442b5b6c 100644 --- a/examples/accounts/accounts-window.cpp +++ b/examples/accounts/accounts-window.cpp @@ -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/> * @license LGPL 2.1 @@ -24,12 +24,12 @@ #include "account-item.h" -#include <TelepathyQt4/Types> -#include <TelepathyQt4/Account> -#include <TelepathyQt4/AccountFactory> -#include <TelepathyQt4/AccountManager> -#include <TelepathyQt4/PendingOperation> -#include <TelepathyQt4/PendingReady> +#include <TelepathyQt/Types> +#include <TelepathyQt/Account> +#include <TelepathyQt/AccountFactory> +#include <TelepathyQt/AccountManager> +#include <TelepathyQt/PendingOperation> +#include <TelepathyQt/PendingReady> #include <QCheckBox> #include <QDebug> diff --git a/examples/accounts/accounts-window.h b/examples/accounts/accounts-window.h index 28520d17..e47e67cd 100644 --- a/examples/accounts/accounts-window.h +++ b/examples/accounts/accounts-window.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/> * @license LGPL 2.1 @@ -19,12 +19,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_examples_accounts_accounts_window_h_HEADER_GUARD_ -#define _TelepathyQt4_examples_accounts_accounts_window_h_HEADER_GUARD_ +#ifndef _TelepathyQt_examples_accounts_accounts_window_h_HEADER_GUARD_ +#define _TelepathyQt_examples_accounts_accounts_window_h_HEADER_GUARD_ #include <QMainWindow> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Types> namespace Tp { class PendingOperation; diff --git a/examples/accounts/main.cpp b/examples/accounts/main.cpp index a21b62c1..c6d1fc1b 100644 --- a/examples/accounts/main.cpp +++ b/examples/accounts/main.cpp @@ -1,6 +1,6 @@ -#include <TelepathyQt4/Debug> -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Debug> +#include <TelepathyQt/Constants> +#include <TelepathyQt/Types> #include <QtGui> diff --git a/examples/contact-messenger/sender.cpp b/examples/contact-messenger/sender.cpp index 02fd3d20..b4791a3a 100644 --- a/examples/contact-messenger/sender.cpp +++ b/examples/contact-messenger/sender.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2011 Nokia Corporation @@ -23,12 +23,12 @@ #include "sender.h" #include "_gen/sender.moc.hpp" -#include <TelepathyQt4/Account> -#include <TelepathyQt4/Debug> -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/ContactMessenger> -#include <TelepathyQt4/PendingSendMessage> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Account> +#include <TelepathyQt/Debug> +#include <TelepathyQt/Constants> +#include <TelepathyQt/ContactMessenger> +#include <TelepathyQt/PendingSendMessage> +#include <TelepathyQt/Types> #include <QCoreApplication> diff --git a/examples/contact-messenger/sender.h b/examples/contact-messenger/sender.h index 6e363a25..2aae0b5e 100644 --- a/examples/contact-messenger/sender.h +++ b/examples/contact-messenger/sender.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2011 Nokia Corporation @@ -20,10 +20,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_examples_contact_messenger_sender_h_HEADER_GUARD_ -#define _TelepathyQt4_examples_contact_messenger_sender_h_HEADER_GUARD_ +#ifndef _TelepathyQt_examples_contact_messenger_sender_h_HEADER_GUARD_ +#define _TelepathyQt_examples_contact_messenger_sender_h_HEADER_GUARD_ -#include <TelepathyQt4/Types> +#include <TelepathyQt/Types> #include <QObject> #include <QString> diff --git a/examples/extensions/CMakeLists.txt b/examples/extensions/CMakeLists.txt index c00e38e2..d3b244b4 100644 --- a/examples/extensions/CMakeLists.txt +++ b/examples/extensions/CMakeLists.txt @@ -28,9 +28,9 @@ tpqt_constants_gen(example-extensions-constants ${generated_all_xml} ${CMAKE_CUR DEPENDS example-extensions-includator) if(MSVC) - set(TYPES_INCLUDE ^<TelepathyQt4/Types^>) + set(TYPES_INCLUDE ^<TelepathyQt/Types^>) else(MSVC) - set(TYPES_INCLUDE '<TelepathyQt4/Types>') + set(TYPES_INCLUDE '<TelepathyQt/Types>') endif(MSVC) tpqt_types_gen(example-extensions-typesgen ${generated_all_xml} @@ -44,10 +44,10 @@ tpqt_xincludator(example-extensions-connection-includator ${CMAKE_CURRENT_SOURCE if(MSVC) set(ESCAPED_QUOTES \"\"\") - set(connection_include ^<TelepathyQt4/Connection^>) + set(connection_include ^<TelepathyQt/Connection^>) else(MSVC) set(ESCAPED_QUOTES \\\") - set(connection_include '<TelepathyQt4/Connection>') + set(connection_include '<TelepathyQt/Connection>') endif(MSVC) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-connection-body.hpp ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-connection.h diff --git a/examples/file-transfer/file-receiver-handler.cpp b/examples/file-transfer/file-receiver-handler.cpp index f4f83d35..fe10c8bd 100644 --- a/examples/file-transfer/file-receiver-handler.cpp +++ b/examples/file-transfer/file-receiver-handler.cpp @@ -1,5 +1,5 @@ /* - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * Copyright (C) 2011 Nokia Corporation @@ -24,13 +24,13 @@ #include "pending-file-receive.h" -#include <TelepathyQt4/Channel> -#include <TelepathyQt4/ChannelClassSpec> -#include <TelepathyQt4/ChannelClassSpecList> -#include <TelepathyQt4/ChannelRequest> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/MethodInvocationContext> -#include <TelepathyQt4/IncomingFileTransferChannel> +#include <TelepathyQt/Channel> +#include <TelepathyQt/ChannelClassSpec> +#include <TelepathyQt/ChannelClassSpecList> +#include <TelepathyQt/ChannelRequest> +#include <TelepathyQt/Connection> +#include <TelepathyQt/MethodInvocationContext> +#include <TelepathyQt/IncomingFileTransferChannel> #include <QDateTime> #include <QDebug> diff --git a/examples/file-transfer/file-receiver-handler.h b/examples/file-transfer/file-receiver-handler.h index d34d5610..01091dd9 100644 --- a/examples/file-transfer/file-receiver-handler.h +++ b/examples/file-transfer/file-receiver-handler.h @@ -1,5 +1,5 @@ /* - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * Copyright (C) 2011 Nokia Corporation @@ -19,13 +19,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_examples_file_transfer_file_receiver_handler_h_HEADER_GUARD_ -#define _TelepathyQt4_examples_file_transfer_file_receiver_handler_h_HEADER_GUARD_ +#ifndef _TelepathyQt_examples_file_transfer_file_receiver_handler_h_HEADER_GUARD_ +#define _TelepathyQt_examples_file_transfer_file_receiver_handler_h_HEADER_GUARD_ -#include <TelepathyQt4/Account> -#include <TelepathyQt4/AbstractClientHandler> -#include <TelepathyQt4/PendingOperation> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Account> +#include <TelepathyQt/AbstractClientHandler> +#include <TelepathyQt/PendingOperation> +#include <TelepathyQt/Types> using namespace Tp; diff --git a/examples/file-transfer/file-receiver.cpp b/examples/file-transfer/file-receiver.cpp index 97c9d412..00eb6d62 100644 --- a/examples/file-transfer/file-receiver.cpp +++ b/examples/file-transfer/file-receiver.cpp @@ -1,5 +1,5 @@ /* - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * Copyright (C) 2011 Nokia Corporation @@ -21,14 +21,14 @@ #include "file-receiver.h" -#include <TelepathyQt4/AccountFactory> -#include <TelepathyQt4/ChannelFactory> -#include <TelepathyQt4/ClientRegistrar> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/ConnectionFactory> -#include <TelepathyQt4/ContactFactory> -#include <TelepathyQt4/Debug> -#include <TelepathyQt4/IncomingFileTransferChannel> +#include <TelepathyQt/AccountFactory> +#include <TelepathyQt/ChannelFactory> +#include <TelepathyQt/ClientRegistrar> +#include <TelepathyQt/Connection> +#include <TelepathyQt/ConnectionFactory> +#include <TelepathyQt/ContactFactory> +#include <TelepathyQt/Debug> +#include <TelepathyQt/IncomingFileTransferChannel> #include <QDebug> diff --git a/examples/file-transfer/file-receiver.h b/examples/file-transfer/file-receiver.h index e1b567b1..e79b6dd1 100644 --- a/examples/file-transfer/file-receiver.h +++ b/examples/file-transfer/file-receiver.h @@ -1,5 +1,5 @@ /* - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * Copyright (C) 2011 Nokia Corporation @@ -19,11 +19,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_examples_file_transfer_file_receiver_h_HEADER_GUARD_ -#define _TelepathyQt4_examples_file_transfer_file_receiver_h_HEADER_GUARD_ +#ifndef _TelepathyQt_examples_file_transfer_file_receiver_h_HEADER_GUARD_ +#define _TelepathyQt_examples_file_transfer_file_receiver_h_HEADER_GUARD_ -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Constants> +#include <TelepathyQt/Types> #include "file-receiver-handler.h" diff --git a/examples/file-transfer/file-sender.cpp b/examples/file-transfer/file-sender.cpp index b0081965..b86971f2 100644 --- a/examples/file-transfer/file-sender.cpp +++ b/examples/file-transfer/file-sender.cpp @@ -1,5 +1,5 @@ /* - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * Copyright (C) 2011 Nokia Corporation @@ -23,26 +23,26 @@ #include "pending-file-send.h" -#include <TelepathyQt4/Account> -#include <TelepathyQt4/AccountFactory> -#include <TelepathyQt4/AccountManager> -#include <TelepathyQt4/ChannelClassSpec> -#include <TelepathyQt4/ChannelClassSpecList> -#include <TelepathyQt4/ChannelFactory> -#include <TelepathyQt4/ClientRegistrar> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/ConnectionFactory> -#include <TelepathyQt4/Contact> -#include <TelepathyQt4/ContactCapabilities> -#include <TelepathyQt4/ContactFactory> -#include <TelepathyQt4/ContactManager> -#include <TelepathyQt4/Debug> -#include <TelepathyQt4/OutgoingFileTransferChannel> -#include <TelepathyQt4/PendingChannel> -#include <TelepathyQt4/PendingChannelRequest> -#include <TelepathyQt4/PendingContacts> -#include <TelepathyQt4/PendingOperation> -#include <TelepathyQt4/PendingReady> +#include <TelepathyQt/Account> +#include <TelepathyQt/AccountFactory> +#include <TelepathyQt/AccountManager> +#include <TelepathyQt/ChannelClassSpec> +#include <TelepathyQt/ChannelClassSpecList> +#include <TelepathyQt/ChannelFactory> +#include <TelepathyQt/ClientRegistrar> +#include <TelepathyQt/Connection> +#include <TelepathyQt/ConnectionFactory> +#include <TelepathyQt/Contact> +#include <TelepathyQt/ContactCapabilities> +#include <TelepathyQt/ContactFactory> +#include <TelepathyQt/ContactManager> +#include <TelepathyQt/Debug> +#include <TelepathyQt/OutgoingFileTransferChannel> +#include <TelepathyQt/PendingChannel> +#include <TelepathyQt/PendingChannelRequest> +#include <TelepathyQt/PendingContacts> +#include <TelepathyQt/PendingOperation> +#include <TelepathyQt/PendingReady> #include <QDebug> diff --git a/examples/file-transfer/file-sender.h b/examples/file-transfer/file-sender.h index 78bf7447..f6d455ab 100644 --- a/examples/file-transfer/file-sender.h +++ b/examples/file-transfer/file-sender.h @@ -1,5 +1,5 @@ /* - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * Copyright (C) 2011 Nokia Corporation @@ -19,11 +19,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_examples_file_transfer_file_sender_h_HEADER_GUARD_ -#define _TelepathyQt4_examples_file_transfer_file_sender_h_HEADER_GUARD_ +#ifndef _TelepathyQt_examples_file_transfer_file_sender_h_HEADER_GUARD_ +#define _TelepathyQt_examples_file_transfer_file_sender_h_HEADER_GUARD_ -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Constants> +#include <TelepathyQt/Types> using namespace Tp; diff --git a/examples/file-transfer/pending-file-receive.cpp b/examples/file-transfer/pending-file-receive.cpp index 75e04770..fd30aa91 100644 --- a/examples/file-transfer/pending-file-receive.cpp +++ b/examples/file-transfer/pending-file-receive.cpp @@ -1,5 +1,5 @@ /* - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * Copyright (C) 2011 Nokia Corporation @@ -22,9 +22,9 @@ #include "pending-file-receive.h" #include "_gen/pending-file-receive.moc.hpp" -#include <TelepathyQt4/Account> -#include <TelepathyQt4/Channel> -#include <TelepathyQt4/IncomingFileTransferChannel> +#include <TelepathyQt/Account> +#include <TelepathyQt/Channel> +#include <TelepathyQt/IncomingFileTransferChannel> #include <QDebug> #include <QFile> diff --git a/examples/file-transfer/pending-file-receive.h b/examples/file-transfer/pending-file-receive.h index 198e8d2f..14f64c0c 100644 --- a/examples/file-transfer/pending-file-receive.h +++ b/examples/file-transfer/pending-file-receive.h @@ -1,5 +1,5 @@ /* - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * Copyright (C) 2011 Nokia Corporation @@ -19,12 +19,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_examples_file_transfer_pending_file_receive_h_HEADER_GUARD_ -#define _TelepathyQt4_examples_file_transfer_pending_file_receive_h_HEADER_GUARD_ +#ifndef _TelepathyQt_examples_file_transfer_pending_file_receive_h_HEADER_GUARD_ +#define _TelepathyQt_examples_file_transfer_pending_file_receive_h_HEADER_GUARD_ -#include <TelepathyQt4/PendingOperation> -#include <TelepathyQt4/IncomingFileTransferChannel> -#include <TelepathyQt4/Types> +#include <TelepathyQt/PendingOperation> +#include <TelepathyQt/IncomingFileTransferChannel> +#include <TelepathyQt/Types> #include "pending-file-transfer.h" diff --git a/examples/file-transfer/pending-file-send.cpp b/examples/file-transfer/pending-file-send.cpp index aeb4aa97..18f92c11 100644 --- a/examples/file-transfer/pending-file-send.cpp +++ b/examples/file-transfer/pending-file-send.cpp @@ -1,5 +1,5 @@ /* - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * Copyright (C) 2011 Nokia Corporation @@ -22,9 +22,9 @@ #include "pending-file-send.h" #include "_gen/pending-file-send.moc.hpp" -#include <TelepathyQt4/Account> -#include <TelepathyQt4/Channel> -#include <TelepathyQt4/OutgoingFileTransferChannel> +#include <TelepathyQt/Account> +#include <TelepathyQt/Channel> +#include <TelepathyQt/OutgoingFileTransferChannel> #include <QDebug> #include <QFile> diff --git a/examples/file-transfer/pending-file-send.h b/examples/file-transfer/pending-file-send.h index a5dc1224..40edcf73 100644 --- a/examples/file-transfer/pending-file-send.h +++ b/examples/file-transfer/pending-file-send.h @@ -1,5 +1,5 @@ /* - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * Copyright (C) 2011 Nokia Corporation @@ -19,12 +19,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_examples_file_transfer_pending_file_send_h_HEADER_GUARD_ -#define _TelepathyQt4_examples_file_transfer_pending_file_send_h_HEADER_GUARD_ +#ifndef _TelepathyQt_examples_file_transfer_pending_file_send_h_HEADER_GUARD_ +#define _TelepathyQt_examples_file_transfer_pending_file_send_h_HEADER_GUARD_ -#include <TelepathyQt4/PendingOperation> -#include <TelepathyQt4/OutgoingFileTransferChannel> -#include <TelepathyQt4/Types> +#include <TelepathyQt/PendingOperation> +#include <TelepathyQt/OutgoingFileTransferChannel> +#include <TelepathyQt/Types> #include "pending-file-transfer.h" diff --git a/examples/file-transfer/pending-file-transfer.cpp b/examples/file-transfer/pending-file-transfer.cpp index a8a9ec52..1789ed33 100644 --- a/examples/file-transfer/pending-file-transfer.cpp +++ b/examples/file-transfer/pending-file-transfer.cpp @@ -1,5 +1,5 @@ /* - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * Copyright (C) 2011 Nokia Corporation @@ -22,9 +22,9 @@ #include "pending-file-transfer.h" #include "_gen/pending-file-transfer.moc.hpp" -#include <TelepathyQt4/Account> -#include <TelepathyQt4/Channel> -#include <TelepathyQt4/OutgoingFileTransferChannel> +#include <TelepathyQt/Account> +#include <TelepathyQt/Channel> +#include <TelepathyQt/OutgoingFileTransferChannel> #include <QDebug> #include <QFile> diff --git a/examples/file-transfer/pending-file-transfer.h b/examples/file-transfer/pending-file-transfer.h index 34393223..d1481969 100644 --- a/examples/file-transfer/pending-file-transfer.h +++ b/examples/file-transfer/pending-file-transfer.h @@ -1,5 +1,5 @@ /* - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/> * Copyright (C) 2011 Nokia Corporation @@ -19,12 +19,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_examples_file_transfer_pending_file_transfer_h_HEADER_GUARD_ -#define _TelepathyQt4_examples_file_transfer_pending_file_transfer_h_HEADER_GUARD_ +#ifndef _TelepathyQt_examples_file_transfer_pending_file_transfer_h_HEADER_GUARD_ +#define _TelepathyQt_examples_file_transfer_pending_file_transfer_h_HEADER_GUARD_ -#include <TelepathyQt4/PendingOperation> -#include <TelepathyQt4/OutgoingFileTransferChannel> -#include <TelepathyQt4/Types> +#include <TelepathyQt/PendingOperation> +#include <TelepathyQt/OutgoingFileTransferChannel> +#include <TelepathyQt/Types> using namespace Tp; diff --git a/examples/protocols/cm-wrapper.cpp b/examples/protocols/cm-wrapper.cpp index b8122b53..f4e2ffbe 100644 --- a/examples/protocols/cm-wrapper.cpp +++ b/examples/protocols/cm-wrapper.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -23,9 +23,9 @@ #include "cm-wrapper.h" #include "_gen/cm-wrapper.moc.hpp" -#include <TelepathyQt4/Debug> -#include <TelepathyQt4/ConnectionManager> -#include <TelepathyQt4/PendingReady> +#include <TelepathyQt/Debug> +#include <TelepathyQt/ConnectionManager> +#include <TelepathyQt/PendingReady> #include <QDebug> diff --git a/examples/protocols/cm-wrapper.h b/examples/protocols/cm-wrapper.h index a95778fe..63867ca0 100644 --- a/examples/protocols/cm-wrapper.h +++ b/examples/protocols/cm-wrapper.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,10 +20,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_examples_protocols_cm_wrapper_h_HEADER_GUARD_ -#define _TelepathyQt4_examples_protocols_cm_wrapper_h_HEADER_GUARD_ +#ifndef _TelepathyQt_examples_protocols_cm_wrapper_h_HEADER_GUARD_ +#define _TelepathyQt_examples_protocols_cm_wrapper_h_HEADER_GUARD_ -#include <TelepathyQt4/Types> +#include <TelepathyQt/Types> #include <QObject> #include <QString> diff --git a/examples/protocols/main.cpp b/examples/protocols/main.cpp index eed72c23..16d27fb5 100644 --- a/examples/protocols/main.cpp +++ b/examples/protocols/main.cpp @@ -1,6 +1,6 @@ -#include <TelepathyQt4/Debug> -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Debug> +#include <TelepathyQt/Constants> +#include <TelepathyQt/Types> #include <QDebug> #include <QtCore> diff --git a/examples/protocols/protocols.cpp b/examples/protocols/protocols.cpp index 1ccffe22..897724bc 100644 --- a/examples/protocols/protocols.cpp +++ b/examples/protocols/protocols.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -23,9 +23,9 @@ #include "protocols.h" #include "_gen/protocols.moc.hpp" -#include <TelepathyQt4/Debug> -#include <TelepathyQt4/ConnectionManager> -#include <TelepathyQt4/PendingStringList> +#include <TelepathyQt/Debug> +#include <TelepathyQt/ConnectionManager> +#include <TelepathyQt/PendingStringList> #include <QCoreApplication> #include <QDebug> diff --git a/examples/protocols/protocols.h b/examples/protocols/protocols.h index 896fe17a..bef2c086 100644 --- a/examples/protocols/protocols.h +++ b/examples/protocols/protocols.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/> * @copyright Copyright (C) 2010 Nokia Corporation @@ -20,10 +20,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_examples_protocols_protocols_h_HEADER_GUARD_ -#define _TelepathyQt4_examples_protocols_protocols_h_HEADER_GUARD_ +#ifndef _TelepathyQt_examples_protocols_protocols_h_HEADER_GUARD_ +#define _TelepathyQt_examples_protocols_protocols_h_HEADER_GUARD_ -#include <TelepathyQt4/Types> +#include <TelepathyQt/Types> #include "cm-wrapper.h" diff --git a/examples/roster/main.cpp b/examples/roster/main.cpp index 0ae8158d..d3d9d4e5 100644 --- a/examples/roster/main.cpp +++ b/examples/roster/main.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2009-2011 Collabora Ltd. <http://www.collabora.co.uk/> * @license LGPL 2.1 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <TelepathyQt4/Debug> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Debug> +#include <TelepathyQt/Types> #include <QDebug> #include <QtGui> diff --git a/examples/roster/roster-item.cpp b/examples/roster/roster-item.cpp index 25110f50..3b98e849 100644 --- a/examples/roster/roster-item.cpp +++ b/examples/roster/roster-item.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2009-2011 Collabora Ltd. <http://www.collabora.co.uk/> * @license LGPL 2.1 @@ -22,7 +22,7 @@ #include "roster-item.h" #include "_gen/roster-item.moc.hpp" -#include <TelepathyQt4/Presence> +#include <TelepathyQt/Presence> using namespace Tp; diff --git a/examples/roster/roster-item.h b/examples/roster/roster-item.h index aeaf30aa..af047ce6 100644 --- a/examples/roster/roster-item.h +++ b/examples/roster/roster-item.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/> * @license LGPL 2.1 @@ -19,11 +19,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_examples_roster_roster_item_h_HEADER_GUARD_ -#define _TelepathyQt4_examples_roster_roster_item_h_HEADER_GUARD_ +#ifndef _TelepathyQt_examples_roster_roster_item_h_HEADER_GUARD_ +#define _TelepathyQt_examples_roster_roster_item_h_HEADER_GUARD_ -#include <TelepathyQt4/Types> -#include <TelepathyQt4/Contact> +#include <TelepathyQt/Types> +#include <TelepathyQt/Contact> #include <QListWidgetItem> #include <QString> diff --git a/examples/roster/roster-widget.cpp b/examples/roster/roster-widget.cpp index 21b7526f..14bce332 100644 --- a/examples/roster/roster-widget.cpp +++ b/examples/roster/roster-widget.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2009-2011 Collabora Ltd. <http://www.collabora.co.uk/> * @license LGPL 2.1 @@ -24,13 +24,13 @@ #include "roster-item.h" -#include <TelepathyQt4/Types> -#include <TelepathyQt4/Contact> -#include <TelepathyQt4/ContactManager> -#include <TelepathyQt4/PendingConnection> -#include <TelepathyQt4/PendingContacts> -#include <TelepathyQt4/PendingOperation> -#include <TelepathyQt4/PendingReady> +#include <TelepathyQt/Types> +#include <TelepathyQt/Contact> +#include <TelepathyQt/ContactManager> +#include <TelepathyQt/PendingConnection> +#include <TelepathyQt/PendingContacts> +#include <TelepathyQt/PendingOperation> +#include <TelepathyQt/PendingReady> #include <QAction> #include <QDebug> diff --git a/examples/roster/roster-widget.h b/examples/roster/roster-widget.h index d485ec50..7dc52958 100644 --- a/examples/roster/roster-widget.h +++ b/examples/roster/roster-widget.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2009-2011 Collabora Ltd. <http://www.collabora.co.uk/> * @license LGPL 2.1 @@ -19,13 +19,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_examples_roster_roster_widget_h_HEADER_GUARD_ -#define _TelepathyQt4_examples_roster_roster_widget_h_HEADER_GUARD_ +#ifndef _TelepathyQt_examples_roster_roster_widget_h_HEADER_GUARD_ +#define _TelepathyQt_examples_roster_roster_widget_h_HEADER_GUARD_ #include <QWidget> -#include <TelepathyQt4/Contact> -#include <TelepathyQt4/Connection> +#include <TelepathyQt/Contact> +#include <TelepathyQt/Connection> namespace Tp { class Connection; diff --git a/examples/roster/roster-window.cpp b/examples/roster/roster-window.cpp index 76a57582..db42a9e9 100644 --- a/examples/roster/roster-window.cpp +++ b/examples/roster/roster-window.cpp @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2009-2011 Collabora Ltd. <http://www.collabora.co.uk/> * @license LGPL 2.1 @@ -24,13 +24,13 @@ #include "roster-widget.h" -#include <TelepathyQt4/Types> -#include <TelepathyQt4/ChannelFactory> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/ConnectionFactory> -#include <TelepathyQt4/ContactFactory> -#include <TelepathyQt4/PendingOperation> -#include <TelepathyQt4/PendingReady> +#include <TelepathyQt/Types> +#include <TelepathyQt/ChannelFactory> +#include <TelepathyQt/Connection> +#include <TelepathyQt/ConnectionFactory> +#include <TelepathyQt/ContactFactory> +#include <TelepathyQt/PendingOperation> +#include <TelepathyQt/PendingReady> #include <QDebug> diff --git a/examples/roster/roster-window.h b/examples/roster/roster-window.h index f3a5b343..adc75179 100644 --- a/examples/roster/roster-window.h +++ b/examples/roster/roster-window.h @@ -1,5 +1,5 @@ /** - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * @copyright Copyright (C) 2009-2011 Collabora Ltd. <http://www.collabora.co.uk/> * @license LGPL 2.1 @@ -19,13 +19,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_examples_roster_roster_window_h_HEADER_GUARD_ -#define _TelepathyQt4_examples_roster_roster_window_h_HEADER_GUARD_ +#ifndef _TelepathyQt_examples_roster_roster_window_h_HEADER_GUARD_ +#define _TelepathyQt_examples_roster_roster_window_h_HEADER_GUARD_ #include <QMainWindow> -#include <TelepathyQt4/Account> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Account> +#include <TelepathyQt/Types> namespace Tp { class PendingOperation; diff --git a/examples/stream-tubes/tube-initiator.cpp b/examples/stream-tubes/tube-initiator.cpp index bcf58466..bd1b7a9a 100644 --- a/examples/stream-tubes/tube-initiator.cpp +++ b/examples/stream-tubes/tube-initiator.cpp @@ -1,5 +1,5 @@ /* - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * Copyright (C) 2010-2011 Collabora Ltd. <http://www.collabora.co.uk/> * Copyright (C) 2011 Nokia Corporation @@ -21,26 +21,26 @@ #include "tube-initiator.h" -#include <TelepathyQt4/Account> -#include <TelepathyQt4/AccountFactory> -#include <TelepathyQt4/ClientRegistrar> -#include <TelepathyQt4/ContactFactory> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/ConnectionFactory> -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/Contact> -#include <TelepathyQt4/ContactCapabilities> -#include <TelepathyQt4/ContactFactory> -#include <TelepathyQt4/ContactManager> -#include <TelepathyQt4/Debug> -#include <TelepathyQt4/OutgoingStreamTubeChannel> -#include <TelepathyQt4/PendingChannelRequest> -#include <TelepathyQt4/PendingContacts> -#include <TelepathyQt4/PendingOperation> -#include <TelepathyQt4/PendingReady> -#include <TelepathyQt4/Presence> -#include <TelepathyQt4/StreamTubeChannel> -#include <TelepathyQt4/StreamTubeServer> +#include <TelepathyQt/Account> +#include <TelepathyQt/AccountFactory> +#include <TelepathyQt/ClientRegistrar> +#include <TelepathyQt/ContactFactory> +#include <TelepathyQt/Connection> +#include <TelepathyQt/ConnectionFactory> +#include <TelepathyQt/Constants> +#include <TelepathyQt/Contact> +#include <TelepathyQt/ContactCapabilities> +#include <TelepathyQt/ContactFactory> +#include <TelepathyQt/ContactManager> +#include <TelepathyQt/Debug> +#include <TelepathyQt/OutgoingStreamTubeChannel> +#include <TelepathyQt/PendingChannelRequest> +#include <TelepathyQt/PendingContacts> +#include <TelepathyQt/PendingOperation> +#include <TelepathyQt/PendingReady> +#include <TelepathyQt/Presence> +#include <TelepathyQt/StreamTubeChannel> +#include <TelepathyQt/StreamTubeServer> #include <QDebug> #include <QTcpServer> diff --git a/examples/stream-tubes/tube-initiator.h b/examples/stream-tubes/tube-initiator.h index 69ab7d3f..5cc68487 100644 --- a/examples/stream-tubes/tube-initiator.h +++ b/examples/stream-tubes/tube-initiator.h @@ -1,5 +1,5 @@ /* - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * Copyright (C) 2009-2011 Collabora Ltd. <http://www.collabora.co.uk/> * Copyright (C) 2009,2011 Nokia Corporation @@ -19,12 +19,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_examples_stream_tubes_tube_initiator_h_HEADER_GUARD_ -#define _TelepathyQt4_examples_stream_tubes_tube_initiator_h_HEADER_GUARD_ +#ifndef _TelepathyQt_examples_stream_tubes_tube_initiator_h_HEADER_GUARD_ +#define _TelepathyQt_examples_stream_tubes_tube_initiator_h_HEADER_GUARD_ -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/Contact> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Constants> +#include <TelepathyQt/Contact> +#include <TelepathyQt/Types> #include <QHash> #include <QHostAddress> diff --git a/examples/stream-tubes/tube-receiver.cpp b/examples/stream-tubes/tube-receiver.cpp index a202dd15..00f24735 100644 --- a/examples/stream-tubes/tube-receiver.cpp +++ b/examples/stream-tubes/tube-receiver.cpp @@ -1,5 +1,5 @@ /* - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * Copyright (C) 2009-2011 Collabora Ltd. <http://www.collabora.co.uk/> * Copyright (C) 2009,2011 Nokia Corporation @@ -21,9 +21,9 @@ #include "tube-receiver.h" -#include <TelepathyQt4/Debug> -#include <TelepathyQt4/IncomingStreamTubeChannel> -#include <TelepathyQt4/StreamTubeClient> +#include <TelepathyQt/Debug> +#include <TelepathyQt/IncomingStreamTubeChannel> +#include <TelepathyQt/StreamTubeClient> #include <QDebug> #include <QIODevice> diff --git a/examples/stream-tubes/tube-receiver.h b/examples/stream-tubes/tube-receiver.h index b6018037..434bba5b 100644 --- a/examples/stream-tubes/tube-receiver.h +++ b/examples/stream-tubes/tube-receiver.h @@ -1,5 +1,5 @@ /* - * This file is part of TelepathyQt4 + * This file is part of TelepathyQt * * Copyright (C) 2009-2011 Collabora Ltd. <http://www.collabora.co.uk/> * Copyright (C) 2009,2011 Nokia Corporation @@ -19,10 +19,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _TelepathyQt4_examples_stream_tubes_tube_receiver_h_HEADER_GUARD_ -#define _TelepathyQt4_examples_stream_tubes_tube_receiver_h_HEADER_GUARD_ +#ifndef _TelepathyQt_examples_stream_tubes_tube_receiver_h_HEADER_GUARD_ +#define _TelepathyQt_examples_stream_tubes_tube_receiver_h_HEADER_GUARD_ -#include <TelepathyQt4/Types> +#include <TelepathyQt/Types> #include <QLocalSocket> diff --git a/tests/capabilities.cpp b/tests/capabilities.cpp index 1279eb99..2f2dbe88 100644 --- a/tests/capabilities.cpp +++ b/tests/capabilities.cpp @@ -1,13 +1,13 @@ #include <QtTest/QtTest> -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/Debug> -#include <TelepathyQt4/CapabilitiesBase> -#include <TelepathyQt4/ConnectionCapabilities> -#include <TelepathyQt4/ContactCapabilities> -#include <TelepathyQt4/Types> - -#include <TelepathyQt4/test-backdoors.h> +#include <TelepathyQt/Constants> +#include <TelepathyQt/Debug> +#include <TelepathyQt/CapabilitiesBase> +#include <TelepathyQt/ConnectionCapabilities> +#include <TelepathyQt/ContactCapabilities> +#include <TelepathyQt/Types> + +#include <TelepathyQt/test-backdoors.h> using namespace Tp; diff --git a/tests/channel-class-spec.cpp b/tests/channel-class-spec.cpp index 877e1127..3131c40a 100644 --- a/tests/channel-class-spec.cpp +++ b/tests/channel-class-spec.cpp @@ -1,9 +1,9 @@ #include <QtTest/QtTest> -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/Debug> -#include <TelepathyQt4/ChannelClassSpec> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Constants> +#include <TelepathyQt/Debug> +#include <TelepathyQt/ChannelClassSpec> +#include <TelepathyQt/Types> using namespace Tp; diff --git a/tests/dbus/account-basics.cpp b/tests/dbus/account-basics.cpp index f68f8728..5ccdb0a1 100644 --- a/tests/dbus/account-basics.cpp +++ b/tests/dbus/account-basics.cpp @@ -4,16 +4,16 @@ #include <tests/lib/glib/echo2/conn.h> -#include <TelepathyQt4/Account> -#include <TelepathyQt4/AccountManager> -#include <TelepathyQt4/AccountSet> -#include <TelepathyQt4/ConnectionCapabilities> -#include <TelepathyQt4/PendingAccount> -#include <TelepathyQt4/PendingOperation> -#include <TelepathyQt4/PendingReady> -#include <TelepathyQt4/PendingStringList> -#include <TelepathyQt4/PendingVoid> -#include <TelepathyQt4/Profile> +#include <TelepathyQt/Account> +#include <TelepathyQt/AccountManager> +#include <TelepathyQt/AccountSet> +#include <TelepathyQt/ConnectionCapabilities> +#include <TelepathyQt/PendingAccount> +#include <TelepathyQt/PendingOperation> +#include <TelepathyQt/PendingReady> +#include <TelepathyQt/PendingStringList> +#include <TelepathyQt/PendingVoid> +#include <TelepathyQt/Profile> #include <telepathy-glib/debug.h> diff --git a/tests/dbus/account-channel-dispatcher.cpp b/tests/dbus/account-channel-dispatcher.cpp index d1010519..e58caa51 100644 --- a/tests/dbus/account-channel-dispatcher.cpp +++ b/tests/dbus/account-channel-dispatcher.cpp @@ -7,20 +7,20 @@ #define TP_QT_ENABLE_LOWLEVEL_API -#include <TelepathyQt4/Account> -#include <TelepathyQt4/AccountManager> -#include <TelepathyQt4/ChannelClassSpec> -#include <TelepathyQt4/ChannelRequest> -#include <TelepathyQt4/ChannelRequestHints> -#include <TelepathyQt4/Client> -#include <TelepathyQt4/ConnectionLowlevel> -#include <TelepathyQt4/Debug> -#include <TelepathyQt4/HandledChannelNotifier> -#include <TelepathyQt4/PendingAccount> -#include <TelepathyQt4/PendingChannel> -#include <TelepathyQt4/PendingChannelRequest> -#include <TelepathyQt4/PendingReady> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Account> +#include <TelepathyQt/AccountManager> +#include <TelepathyQt/ChannelClassSpec> +#include <TelepathyQt/ChannelRequest> +#include <TelepathyQt/ChannelRequestHints> +#include <TelepathyQt/Client> +#include <TelepathyQt/ConnectionLowlevel> +#include <TelepathyQt/Debug> +#include <TelepathyQt/HandledChannelNotifier> +#include <TelepathyQt/PendingAccount> +#include <TelepathyQt/PendingChannel> +#include <TelepathyQt/PendingChannelRequest> +#include <TelepathyQt/PendingReady> +#include <TelepathyQt/Types> #include <telepathy-glib/debug.h> diff --git a/tests/dbus/account-connection-factory.cpp b/tests/dbus/account-connection-factory.cpp index 5a46c5a9..828e9920 100644 --- a/tests/dbus/account-connection-factory.cpp +++ b/tests/dbus/account-connection-factory.cpp @@ -4,11 +4,11 @@ #include <tests/lib/glib/contacts-conn.h> -#include <TelepathyQt4/Account> -#include <TelepathyQt4/ChannelFactory> -#include <TelepathyQt4/ConnectionFactory> -#include <TelepathyQt4/PendingComposite> -#include <TelepathyQt4/PendingReady> +#include <TelepathyQt/Account> +#include <TelepathyQt/ChannelFactory> +#include <TelepathyQt/ConnectionFactory> +#include <TelepathyQt/PendingComposite> +#include <TelepathyQt/PendingReady> #include <telepathy-glib/debug.h> @@ -207,7 +207,7 @@ void TestAccountConnectionFactory::testIntrospectSeveralAccounts() mLoop->processEvents(); mLoop->processEvents(); } - + ops.push_back(acc->becomeReady()); } diff --git a/tests/dbus/account-set.cpp b/tests/dbus/account-set.cpp index 43798c1d..6312964f 100644 --- a/tests/dbus/account-set.cpp +++ b/tests/dbus/account-set.cpp @@ -4,18 +4,18 @@ #include <tests/lib/glib/echo2/conn.h> -#include <TelepathyQt4/Account> -#include <TelepathyQt4/AccountCapabilityFilter> -#include <TelepathyQt4/AccountManager> -#include <TelepathyQt4/AccountPropertyFilter> -#include <TelepathyQt4/AccountSet> -#include <TelepathyQt4/AndFilter> -#include <TelepathyQt4/NotFilter> -#include <TelepathyQt4/OrFilter> -#include <TelepathyQt4/PendingAccount> -#include <TelepathyQt4/PendingOperation> -#include <TelepathyQt4/PendingReady> -#include <TelepathyQt4/PendingVoid> +#include <TelepathyQt/Account> +#include <TelepathyQt/AccountCapabilityFilter> +#include <TelepathyQt/AccountManager> +#include <TelepathyQt/AccountPropertyFilter> +#include <TelepathyQt/AccountSet> +#include <TelepathyQt/AndFilter> +#include <TelepathyQt/NotFilter> +#include <TelepathyQt/OrFilter> +#include <TelepathyQt/PendingAccount> +#include <TelepathyQt/PendingOperation> +#include <TelepathyQt/PendingReady> +#include <TelepathyQt/PendingVoid> #include <telepathy-glib/debug.h> diff --git a/tests/dbus/chan-basics.cpp b/tests/dbus/chan-basics.cpp index 915adb67..8596060a 100644 --- a/tests/dbus/chan-basics.cpp +++ b/tests/dbus/chan-basics.cpp @@ -7,16 +7,16 @@ #define TP_QT_ENABLE_LOWLEVEL_API -#include <TelepathyQt4/Channel> -#include <TelepathyQt4/ChannelFactory> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/ConnectionLowlevel> -#include <TelepathyQt4/ContactFactory> -#include <TelepathyQt4/PendingChannel> -#include <TelepathyQt4/PendingHandles> -#include <TelepathyQt4/PendingReady> -#include <TelepathyQt4/ReferencedHandles> -#include <TelepathyQt4/TextChannel> +#include <TelepathyQt/Channel> +#include <TelepathyQt/ChannelFactory> +#include <TelepathyQt/Connection> +#include <TelepathyQt/ConnectionLowlevel> +#include <TelepathyQt/ContactFactory> +#include <TelepathyQt/PendingChannel> +#include <TelepathyQt/PendingHandles> +#include <TelepathyQt/PendingReady> +#include <TelepathyQt/ReferencedHandles> +#include <TelepathyQt/TextChannel> #include <telepathy-glib/debug.h> diff --git a/tests/dbus/chan-conference.cpp b/tests/dbus/chan-conference.cpp index 5f0bb10e..c1f36e15 100644 --- a/tests/dbus/chan-conference.cpp +++ b/tests/dbus/chan-conference.cpp @@ -6,8 +6,8 @@ #include <tests/lib/glib/echo/conn.h> #include <tests/lib/glib/future/conference/chan.h> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/PendingReady> +#include <TelepathyQt/Connection> +#include <TelepathyQt/PendingReady> #include <telepathy-glib/debug.h> diff --git a/tests/dbus/chan-group.cpp b/tests/dbus/chan-group.cpp index df2d327a..82d4ffd8 100644 --- a/tests/dbus/chan-group.cpp +++ b/tests/dbus/chan-group.cpp @@ -6,13 +6,13 @@ #include <tests/lib/glib/textchan-group.h> #include <tests/lib/glib/textchan-null.h> -#include <TelepathyQt4/Channel> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/ContactManager> -#include <TelepathyQt4/PendingChannel> -#include <TelepathyQt4/PendingContacts> -#include <TelepathyQt4/PendingReady> -#include <TelepathyQt4/TextChannel> +#include <TelepathyQt/Channel> +#include <TelepathyQt/Connection> +#include <TelepathyQt/ContactManager> +#include <TelepathyQt/PendingChannel> +#include <TelepathyQt/PendingContacts> +#include <TelepathyQt/PendingReady> +#include <TelepathyQt/TextChannel> #include <telepathy-glib/debug.h> diff --git a/tests/dbus/client-factories.cpp b/tests/dbus/client-factories.cpp index 1e5ff458..02eb1940 100644 --- a/tests/dbus/client-factories.cpp +++ b/tests/dbus/client-factories.cpp @@ -9,39 +9,39 @@ #define TP_QT_ENABLE_LOWLEVEL_API -#include <TelepathyQt4/Account> -#include <TelepathyQt4/AccountFactory> -#include <TelepathyQt4/AccountManager> -#include <TelepathyQt4/AbstractClientHandler> -#include <TelepathyQt4/AbstractClientObserver> -#include <TelepathyQt4/Channel> -#include <TelepathyQt4/ChannelClassSpec> -#include <TelepathyQt4/ChannelClassSpecList> -#include <TelepathyQt4/ChannelDispatchOperation> -#include <TelepathyQt4/ChannelFactory> -#include <TelepathyQt4/ChannelRequest> -#include <TelepathyQt4/ClientHandlerInterface> -#include <TelepathyQt4/ClientInterfaceRequestsInterface> -#include <TelepathyQt4/ClientObserverInterface> -#include <TelepathyQt4/ClientRegistrar> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/ConnectionFactory> -#include <TelepathyQt4/ConnectionLowlevel> -#include <TelepathyQt4/ContactFactory> -#include <TelepathyQt4/ContactSearchChannel> -#include <TelepathyQt4/Debug> -#include <TelepathyQt4/FileTransferChannel> -#include <TelepathyQt4/IncomingFileTransferChannel> -#include <TelepathyQt4/IncomingStreamTubeChannel> -#include <TelepathyQt4/MethodInvocationContext> -#include <TelepathyQt4/OutgoingFileTransferChannel> -#include <TelepathyQt4/OutgoingStreamTubeChannel> -#include <TelepathyQt4/PendingAccount> -#include <TelepathyQt4/PendingReady> -#include <TelepathyQt4/StreamedMediaChannel> -#include <TelepathyQt4/StreamTubeChannel> -#include <TelepathyQt4/TextChannel> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Account> +#include <TelepathyQt/AccountFactory> +#include <TelepathyQt/AccountManager> +#include <TelepathyQt/AbstractClientHandler> +#include <TelepathyQt/AbstractClientObserver> +#include <TelepathyQt/Channel> +#include <TelepathyQt/ChannelClassSpec> +#include <TelepathyQt/ChannelClassSpecList> +#include <TelepathyQt/ChannelDispatchOperation> +#include <TelepathyQt/ChannelFactory> +#include <TelepathyQt/ChannelRequest> +#include <TelepathyQt/ClientHandlerInterface> +#include <TelepathyQt/ClientInterfaceRequestsInterface> +#include <TelepathyQt/ClientObserverInterface> +#include <TelepathyQt/ClientRegistrar> +#include <TelepathyQt/Connection> +#include <TelepathyQt/ConnectionFactory> +#include <TelepathyQt/ConnectionLowlevel> +#include <TelepathyQt/ContactFactory> +#include <TelepathyQt/ContactSearchChannel> +#include <TelepathyQt/Debug> +#include <TelepathyQt/FileTransferChannel> +#include <TelepathyQt/IncomingFileTransferChannel> +#include <TelepathyQt/IncomingStreamTubeChannel> +#include <TelepathyQt/MethodInvocationContext> +#include <TelepathyQt/OutgoingFileTransferChannel> +#include <TelepathyQt/OutgoingStreamTubeChannel> +#include <TelepathyQt/PendingAccount> +#include <TelepathyQt/PendingReady> +#include <TelepathyQt/StreamedMediaChannel> +#include <TelepathyQt/StreamTubeChannel> +#include <TelepathyQt/TextChannel> +#include <TelepathyQt/Types> #include <telepathy-glib/debug.h> diff --git a/tests/dbus/client.cpp b/tests/dbus/client.cpp index 16a8b78b..268f97b0 100644 --- a/tests/dbus/client.cpp +++ b/tests/dbus/client.cpp @@ -7,23 +7,23 @@ #define TP_QT_ENABLE_LOWLEVEL_API -#include <TelepathyQt4/Account> -#include <TelepathyQt4/AccountManager> -#include <TelepathyQt4/AbstractClientHandler> -#include <TelepathyQt4/AbstractClientObserver> -#include <TelepathyQt4/Channel> -#include <TelepathyQt4/ChannelClassSpec> -#include <TelepathyQt4/ChannelDispatchOperation> -#include <TelepathyQt4/ChannelRequest> -#include <TelepathyQt4/ClientHandlerInterface> -#include <TelepathyQt4/ClientInterfaceRequestsInterface> -#include <TelepathyQt4/ClientObserverInterface> -#include <TelepathyQt4/ClientRegistrar> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/ConnectionLowlevel> -#include <TelepathyQt4/MethodInvocationContext> -#include <TelepathyQt4/PendingAccount> -#include <TelepathyQt4/PendingReady> +#include <TelepathyQt/Account> +#include <TelepathyQt/AccountManager> +#include <TelepathyQt/AbstractClientHandler> +#include <TelepathyQt/AbstractClientObserver> +#include <TelepathyQt/Channel> +#include <TelepathyQt/ChannelClassSpec> +#include <TelepathyQt/ChannelDispatchOperation> +#include <TelepathyQt/ChannelRequest> +#include <TelepathyQt/ClientHandlerInterface> +#include <TelepathyQt/ClientInterfaceRequestsInterface> +#include <TelepathyQt/ClientObserverInterface> +#include <TelepathyQt/ClientRegistrar> +#include <TelepathyQt/Connection> +#include <TelepathyQt/ConnectionLowlevel> +#include <TelepathyQt/MethodInvocationContext> +#include <TelepathyQt/PendingAccount> +#include <TelepathyQt/PendingReady> #include <telepathy-glib/debug.h> diff --git a/tests/dbus/cm-basics.cpp b/tests/dbus/cm-basics.cpp index 6dea73e2..d26ae2f6 100644 --- a/tests/dbus/cm-basics.cpp +++ b/tests/dbus/cm-basics.cpp @@ -3,11 +3,11 @@ #include <tests/lib/glib/simple-manager.h> #include <tests/lib/glib/echo2/connection-manager.h> -#include <TelepathyQt4/ConnectionCapabilities> -#include <TelepathyQt4/ConnectionManager> -#include <TelepathyQt4/PendingReady> -#include <TelepathyQt4/PendingStringList> -#include <TelepathyQt4/PresenceSpec> +#include <TelepathyQt/ConnectionCapabilities> +#include <TelepathyQt/ConnectionManager> +#include <TelepathyQt/PendingReady> +#include <TelepathyQt/PendingStringList> +#include <TelepathyQt/PresenceSpec> #include <telepathy-glib/debug.h> diff --git a/tests/dbus/conn-basics.cpp b/tests/dbus/conn-basics.cpp index 64c63b7b..c9c17e7a 100644 --- a/tests/dbus/conn-basics.cpp +++ b/tests/dbus/conn-basics.cpp @@ -7,13 +7,13 @@ #define TP_QT_ENABLE_LOWLEVEL_API -#include <TelepathyQt4/ChannelFactory> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/ConnectionLowlevel> -#include <TelepathyQt4/ContactFactory> -#include <TelepathyQt4/PendingChannel> -#include <TelepathyQt4/PendingReady> -#include <TelepathyQt4/Debug> +#include <TelepathyQt/ChannelFactory> +#include <TelepathyQt/Connection> +#include <TelepathyQt/ConnectionLowlevel> +#include <TelepathyQt/ContactFactory> +#include <TelepathyQt/PendingChannel> +#include <TelepathyQt/PendingReady> +#include <TelepathyQt/Debug> #include <telepathy-glib/dbus.h> #include <telepathy-glib/debug.h> diff --git a/tests/dbus/conn-capabilities.cpp b/tests/dbus/conn-capabilities.cpp index edc8568e..c92903d8 100644 --- a/tests/dbus/conn-capabilities.cpp +++ b/tests/dbus/conn-capabilities.cpp @@ -4,8 +4,8 @@ #include <tests/lib/glib/echo2/conn.h> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/ConnectionCapabilities> +#include <TelepathyQt/Connection> +#include <TelepathyQt/ConnectionCapabilities> #include <telepathy-glib/debug.h> diff --git a/tests/dbus/conn-introspect-cornercases.cpp b/tests/dbus/conn-introspect-cornercases.cpp index f938f6a4..1f892481 100644 --- a/tests/dbus/conn-introspect-cornercases.cpp +++ b/tests/dbus/conn-introspect-cornercases.cpp @@ -7,13 +7,13 @@ #define TP_QT_ENABLE_LOWLEVEL_API -#include <TelepathyQt4/ChannelFactory> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/ConnectionLowlevel> -#include <TelepathyQt4/ContactFactory> -#include <TelepathyQt4/Debug> -#include <TelepathyQt4/PendingReady> -#include <TelepathyQt4/ReferencedHandles> +#include <TelepathyQt/ChannelFactory> +#include <TelepathyQt/Connection> +#include <TelepathyQt/ConnectionLowlevel> +#include <TelepathyQt/ContactFactory> +#include <TelepathyQt/Debug> +#include <TelepathyQt/PendingReady> +#include <TelepathyQt/ReferencedHandles> #include <telepathy-glib/base-connection.h> #include <telepathy-glib/dbus.h> diff --git a/tests/dbus/conn-requests.cpp b/tests/dbus/conn-requests.cpp index bde154d9..9f3488b9 100644 --- a/tests/dbus/conn-requests.cpp +++ b/tests/dbus/conn-requests.cpp @@ -6,12 +6,12 @@ #define TP_QT_ENABLE_LOWLEVEL_API -#include <TelepathyQt4/Channel> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/ConnectionLowlevel> -#include <TelepathyQt4/PendingChannel> -#include <TelepathyQt4/PendingHandles> -#include <TelepathyQt4/ReferencedHandles> +#include <TelepathyQt/Channel> +#include <TelepathyQt/Connection> +#include <TelepathyQt/ConnectionLowlevel> +#include <TelepathyQt/PendingChannel> +#include <TelepathyQt/PendingHandles> +#include <TelepathyQt/ReferencedHandles> #include <telepathy-glib/debug.h> diff --git a/tests/dbus/conn-roster-groups-legacy.cpp b/tests/dbus/conn-roster-groups-legacy.cpp index 90413c98..d03e2d7b 100644 --- a/tests/dbus/conn-roster-groups-legacy.cpp +++ b/tests/dbus/conn-roster-groups-legacy.cpp @@ -7,15 +7,15 @@ #define TP_QT_ENABLE_LOWLEVEL_API -#include <TelepathyQt4/ChannelFactory> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/ConnectionLowlevel> -#include <TelepathyQt4/Contact> -#include <TelepathyQt4/ContactFactory> -#include <TelepathyQt4/ContactManager> -#include <TelepathyQt4/PendingContacts> -#include <TelepathyQt4/PendingReady> -#include <TelepathyQt4/Debug> +#include <TelepathyQt/ChannelFactory> +#include <TelepathyQt/Connection> +#include <TelepathyQt/ConnectionLowlevel> +#include <TelepathyQt/Contact> +#include <TelepathyQt/ContactFactory> +#include <TelepathyQt/ContactManager> +#include <TelepathyQt/PendingContacts> +#include <TelepathyQt/PendingReady> +#include <TelepathyQt/Debug> #include <telepathy-glib/debug.h> diff --git a/tests/dbus/conn-roster-groups.cpp b/tests/dbus/conn-roster-groups.cpp index 36aaae07..7c7ed597 100644 --- a/tests/dbus/conn-roster-groups.cpp +++ b/tests/dbus/conn-roster-groups.cpp @@ -7,15 +7,15 @@ #define TP_QT_ENABLE_LOWLEVEL_API -#include <TelepathyQt4/ChannelFactory> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/ConnectionLowlevel> -#include <TelepathyQt4/Contact> -#include <TelepathyQt4/ContactFactory> -#include <TelepathyQt4/ContactManager> -#include <TelepathyQt4/PendingContacts> -#include <TelepathyQt4/PendingReady> -#include <TelepathyQt4/Debug> +#include <TelepathyQt/ChannelFactory> +#include <TelepathyQt/Connection> +#include <TelepathyQt/ConnectionLowlevel> +#include <TelepathyQt/Contact> +#include <TelepathyQt/ContactFactory> +#include <TelepathyQt/ContactManager> +#include <TelepathyQt/PendingContacts> +#include <TelepathyQt/PendingReady> +#include <TelepathyQt/Debug> #include <telepathy-glib/debug.h> diff --git a/tests/dbus/conn-roster-legacy.cpp b/tests/dbus/conn-roster-legacy.cpp index 80d153d1..e4aaff5a 100644 --- a/tests/dbus/conn-roster-legacy.cpp +++ b/tests/dbus/conn-roster-legacy.cpp @@ -4,10 +4,10 @@ #include <tests/lib/glib/contactlist/conn.h> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/Contact> -#include <TelepathyQt4/ContactManager> -#include <TelepathyQt4/PendingContacts> +#include <TelepathyQt/Connection> +#include <TelepathyQt/Contact> +#include <TelepathyQt/ContactManager> +#include <TelepathyQt/PendingContacts> #include <telepathy-glib/debug.h> diff --git a/tests/dbus/conn-roster.cpp b/tests/dbus/conn-roster.cpp index 7440f527..827e8c39 100644 --- a/tests/dbus/conn-roster.cpp +++ b/tests/dbus/conn-roster.cpp @@ -4,12 +4,12 @@ #include <tests/lib/glib/contactlist2/conn.h> -#include <TelepathyQt4/ChannelFactory> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/Contact> -#include <TelepathyQt4/ContactFactory> -#include <TelepathyQt4/ContactManager> -#include <TelepathyQt4/PendingContacts> +#include <TelepathyQt/ChannelFactory> +#include <TelepathyQt/Connection> +#include <TelepathyQt/Contact> +#include <TelepathyQt/ContactFactory> +#include <TelepathyQt/ContactManager> +#include <TelepathyQt/PendingContacts> #include <telepathy-glib/debug.h> diff --git a/tests/dbus/contact-factory.cpp b/tests/dbus/contact-factory.cpp index d7c56637..d81bf4fe 100644 --- a/tests/dbus/contact-factory.cpp +++ b/tests/dbus/contact-factory.cpp @@ -4,9 +4,9 @@ #include <tests/lib/glib/contacts-conn.h> -#include <TelepathyQt4/ChannelFactory> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/ContactFactory> +#include <TelepathyQt/ChannelFactory> +#include <TelepathyQt/Connection> +#include <TelepathyQt/ContactFactory> #include <telepathy-glib/debug.h> diff --git a/tests/dbus/contact-messenger.cpp b/tests/dbus/contact-messenger.cpp index 8a0d90ca..14e2ae00 100644 --- a/tests/dbus/contact-messenger.cpp +++ b/tests/dbus/contact-messenger.cpp @@ -9,22 +9,22 @@ #define TP_QT_ENABLE_LOWLEVEL_API -#include <TelepathyQt4/Account> -#include <TelepathyQt4/AccountManager> -#include <TelepathyQt4/ChannelClassSpec> -#include <TelepathyQt4/Client> -#include <TelepathyQt4/ConnectionLowlevel> -#include <TelepathyQt4/ContactManager> -#include <TelepathyQt4/ContactMessenger> -#include <TelepathyQt4/Debug> -#include <TelepathyQt4/Message> -#include <TelepathyQt4/MessageContentPart> -#include <TelepathyQt4/PendingAccount> -#include <TelepathyQt4/PendingContacts> -#include <TelepathyQt4/PendingReady> -#include <TelepathyQt4/PendingSendMessage> -#include <TelepathyQt4/TextChannel> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Account> +#include <TelepathyQt/AccountManager> +#include <TelepathyQt/ChannelClassSpec> +#include <TelepathyQt/Client> +#include <TelepathyQt/ConnectionLowlevel> +#include <TelepathyQt/ContactManager> +#include <TelepathyQt/ContactMessenger> +#include <TelepathyQt/Debug> +#include <TelepathyQt/Message> +#include <TelepathyQt/MessageContentPart> +#include <TelepathyQt/PendingAccount> +#include <TelepathyQt/PendingContacts> +#include <TelepathyQt/PendingReady> +#include <TelepathyQt/PendingSendMessage> +#include <TelepathyQt/TextChannel> +#include <TelepathyQt/Types> #include <telepathy-glib/cm-message.h> #include <telepathy-glib/debug.h> diff --git a/tests/dbus/contact-search-chan.cpp b/tests/dbus/contact-search-chan.cpp index 6987bce4..9739d6f9 100644 --- a/tests/dbus/contact-search-chan.cpp +++ b/tests/dbus/contact-search-chan.cpp @@ -5,9 +5,9 @@ #include <tests/lib/glib/echo/conn.h> #include <tests/lib/glib/contact-search-chan.h> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/ContactSearchChannel> -#include <TelepathyQt4/PendingReady> +#include <TelepathyQt/Connection> +#include <TelepathyQt/ContactSearchChannel> +#include <TelepathyQt/PendingReady> #include <telepathy-glib/debug.h> diff --git a/tests/dbus/contacts-avatar.cpp b/tests/dbus/contacts-avatar.cpp index 16a504cd..816a41c4 100644 --- a/tests/dbus/contacts-avatar.cpp +++ b/tests/dbus/contacts-avatar.cpp @@ -4,11 +4,11 @@ #include <tests/lib/glib/contacts-conn.h> -#include <TelepathyQt4/AvatarData> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/Contact> -#include <TelepathyQt4/ContactManager> -#include <TelepathyQt4/PendingContacts> +#include <TelepathyQt/AvatarData> +#include <TelepathyQt/Connection> +#include <TelepathyQt/Contact> +#include <TelepathyQt/ContactManager> +#include <TelepathyQt/PendingContacts> #include <telepathy-glib/debug.h> diff --git a/tests/dbus/contacts-capabilities.cpp b/tests/dbus/contacts-capabilities.cpp index fa2cf861..042340c2 100644 --- a/tests/dbus/contacts-capabilities.cpp +++ b/tests/dbus/contacts-capabilities.cpp @@ -4,11 +4,11 @@ #include <tests/lib/glib/contacts-conn.h> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/Contact> -#include <TelepathyQt4/ContactCapabilities> -#include <TelepathyQt4/ContactManager> -#include <TelepathyQt4/PendingContacts> +#include <TelepathyQt/Connection> +#include <TelepathyQt/Contact> +#include <TelepathyQt/ContactCapabilities> +#include <TelepathyQt/ContactManager> +#include <TelepathyQt/PendingContacts> #include <telepathy-glib/debug.h> diff --git a/tests/dbus/contacts-info.cpp b/tests/dbus/contacts-info.cpp index af5f297f..4968c599 100644 --- a/tests/dbus/contacts-info.cpp +++ b/tests/dbus/contacts-info.cpp @@ -4,11 +4,11 @@ #include <tests/lib/glib/contacts-conn.h> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/Contact> -#include <TelepathyQt4/ContactManager> -#include <TelepathyQt4/PendingContacts> -#include <TelepathyQt4/PendingContactInfo> +#include <TelepathyQt/Connection> +#include <TelepathyQt/Contact> +#include <TelepathyQt/ContactManager> +#include <TelepathyQt/PendingContacts> +#include <TelepathyQt/PendingContactInfo> #include <telepathy-glib/debug.h> diff --git a/tests/dbus/contacts-location.cpp b/tests/dbus/contacts-location.cpp index 724f982b..c3870a97 100644 --- a/tests/dbus/contacts-location.cpp +++ b/tests/dbus/contacts-location.cpp @@ -4,11 +4,11 @@ #include <tests/lib/glib/contacts-conn.h> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/Contact> -#include <TelepathyQt4/LocationInfo> -#include <TelepathyQt4/ContactManager> -#include <TelepathyQt4/PendingContacts> +#include <TelepathyQt/Connection> +#include <TelepathyQt/Contact> +#include <TelepathyQt/LocationInfo> +#include <TelepathyQt/ContactManager> +#include <TelepathyQt/PendingContacts> #include <telepathy-glib/debug.h> diff --git a/tests/dbus/contacts.cpp b/tests/dbus/contacts.cpp index c048fb15..333c196b 100644 --- a/tests/dbus/contacts.cpp +++ b/tests/dbus/contacts.cpp @@ -7,19 +7,19 @@ #define TP_QT_ENABLE_LOWLEVEL_API -#include <TelepathyQt4/ChannelFactory> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/ConnectionLowlevel> -#include <TelepathyQt4/Contact> -#include <TelepathyQt4/ContactFactory> -#include <TelepathyQt4/ContactManager> -#include <TelepathyQt4/PendingContacts> -#include <TelepathyQt4/PendingVoid> -#include <TelepathyQt4/PendingReady> -#include <TelepathyQt4/Presence> -#include <TelepathyQt4/ReferencedHandles> -#include <TelepathyQt4/Debug> -#include <TelepathyQt4/Types> +#include <TelepathyQt/ChannelFactory> +#include <TelepathyQt/Connection> +#include <TelepathyQt/ConnectionLowlevel> +#include <TelepathyQt/Contact> +#include <TelepathyQt/ContactFactory> +#include <TelepathyQt/ContactManager> +#include <TelepathyQt/PendingContacts> +#include <TelepathyQt/PendingVoid> +#include <TelepathyQt/PendingReady> +#include <TelepathyQt/Presence> +#include <TelepathyQt/ReferencedHandles> +#include <TelepathyQt/Debug> +#include <TelepathyQt/Types> #include <telepathy-glib/debug.h> diff --git a/tests/dbus/dbus-properties.cpp b/tests/dbus/dbus-properties.cpp index 4e012dae..5b82a9c7 100644 --- a/tests/dbus/dbus-properties.cpp +++ b/tests/dbus/dbus-properties.cpp @@ -1,13 +1,13 @@ #include <QtCore/QEventLoop> #include <QtTest/QtTest> -#include <TelepathyQt4/Debug> -#include <TelepathyQt4/Account> -#include <TelepathyQt4/AccountManager> -#include <TelepathyQt4/PendingAccount> -#include <TelepathyQt4/PendingOperation> -#include <TelepathyQt4/PendingVariantMap> -#include <TelepathyQt4/PendingReady> +#include <TelepathyQt/Debug> +#include <TelepathyQt/Account> +#include <TelepathyQt/AccountManager> +#include <TelepathyQt/PendingAccount> +#include <TelepathyQt/PendingOperation> +#include <TelepathyQt/PendingVariantMap> +#include <TelepathyQt/PendingReady> #include <tests/lib/test.h> diff --git a/tests/dbus/dbus-proxy-factory.cpp b/tests/dbus/dbus-proxy-factory.cpp index 3fc7edb9..cca9587c 100644 --- a/tests/dbus/dbus-proxy-factory.cpp +++ b/tests/dbus/dbus-proxy-factory.cpp @@ -7,15 +7,15 @@ #include <QString> #include <QVariantMap> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/ConnectionFactory> -#include <TelepathyQt4/ContactFactory> -#include <TelepathyQt4/ChannelFactory> -#include <TelepathyQt4/Debug> -#include <TelepathyQt4/PendingReady> -#include <TelepathyQt4/Types> - -#include <TelepathyQt4/test-backdoors.h> +#include <TelepathyQt/Connection> +#include <TelepathyQt/ConnectionFactory> +#include <TelepathyQt/ContactFactory> +#include <TelepathyQt/ChannelFactory> +#include <TelepathyQt/Debug> +#include <TelepathyQt/PendingReady> +#include <TelepathyQt/Types> + +#include <TelepathyQt/test-backdoors.h> #include <telepathy-glib/debug.h> diff --git a/tests/dbus/handles.cpp b/tests/dbus/handles.cpp index a97c9ffe..2182da48 100644 --- a/tests/dbus/handles.cpp +++ b/tests/dbus/handles.cpp @@ -6,10 +6,10 @@ #define TP_QT_ENABLE_LOWLEVEL_API -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/ConnectionLowlevel> -#include <TelepathyQt4/PendingHandles> -#include <TelepathyQt4/ReferencedHandles> +#include <TelepathyQt/Connection> +#include <TelepathyQt/ConnectionLowlevel> +#include <TelepathyQt/PendingHandles> +#include <TelepathyQt/ReferencedHandles> #include <telepathy-glib/debug.h> diff --git a/tests/dbus/profile-manager.cpp b/tests/dbus/profile-manager.cpp index 226f5bdb..9224b050 100644 --- a/tests/dbus/profile-manager.cpp +++ b/tests/dbus/profile-manager.cpp @@ -1,7 +1,7 @@ #include <QtTest/QtTest> -#include <TelepathyQt4/PendingReady> -#include <TelepathyQt4/ProfileManager> +#include <TelepathyQt/PendingReady> +#include <TelepathyQt/ProfileManager> #include <tests/lib/test.h> diff --git a/tests/dbus/simple-observer.cpp b/tests/dbus/simple-observer.cpp index cab31231..876a138d 100644 --- a/tests/dbus/simple-observer.cpp +++ b/tests/dbus/simple-observer.cpp @@ -11,18 +11,18 @@ #define TP_QT_ENABLE_LOWLEVEL_API -#include <TelepathyQt4/Account> -#include <TelepathyQt4/ChannelClassSpec> -#include <TelepathyQt4/Client> -#include <TelepathyQt4/ConnectionLowlevel> -#include <TelepathyQt4/Debug> -#include <TelepathyQt4/PendingReady> -#include <TelepathyQt4/SimpleCallObserver> -#include <TelepathyQt4/SimpleObserver> -#include <TelepathyQt4/SimpleTextObserver> -#include <TelepathyQt4/StreamedMediaChannel> -#include <TelepathyQt4/TextChannel> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Account> +#include <TelepathyQt/ChannelClassSpec> +#include <TelepathyQt/Client> +#include <TelepathyQt/ConnectionLowlevel> +#include <TelepathyQt/Debug> +#include <TelepathyQt/PendingReady> +#include <TelepathyQt/SimpleCallObserver> +#include <TelepathyQt/SimpleObserver> +#include <TelepathyQt/SimpleTextObserver> +#include <TelepathyQt/StreamedMediaChannel> +#include <TelepathyQt/TextChannel> +#include <TelepathyQt/Types> #include <telepathy-glib/cm-message.h> #include <telepathy-glib/debug.h> diff --git a/tests/dbus/stateful-proxy.cpp b/tests/dbus/stateful-proxy.cpp index 82abee4b..ebe75f22 100644 --- a/tests/dbus/stateful-proxy.cpp +++ b/tests/dbus/stateful-proxy.cpp @@ -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 @@ -23,11 +23,11 @@ #include <QEventLoop> #include <QtTest> -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/Debug> -#include <TelepathyQt4/Types> -#include <TelepathyQt4/DBus> -#include <TelepathyQt4/StatefulDBusProxy> +#include <TelepathyQt/Constants> +#include <TelepathyQt/Debug> +#include <TelepathyQt/Types> +#include <TelepathyQt/DBus> +#include <TelepathyQt/StatefulDBusProxy> #include "tests/lib/test.h" diff --git a/tests/dbus/stream-tube-chan.cpp b/tests/dbus/stream-tube-chan.cpp index 5e159c12..6091ab9a 100644 --- a/tests/dbus/stream-tube-chan.cpp +++ b/tests/dbus/stream-tube-chan.cpp @@ -5,13 +5,13 @@ #include <tests/lib/glib/simple-conn.h> #include <tests/lib/glib/stream-tube-chan.h> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/IncomingStreamTubeChannel> -#include <TelepathyQt4/OutgoingStreamTubeChannel> -#include <TelepathyQt4/PendingReady> -#include <TelepathyQt4/PendingStreamTubeConnection> -#include <TelepathyQt4/ReferencedHandles> -#include <TelepathyQt4/StreamTubeChannel> +#include <TelepathyQt/Connection> +#include <TelepathyQt/IncomingStreamTubeChannel> +#include <TelepathyQt/OutgoingStreamTubeChannel> +#include <TelepathyQt/PendingReady> +#include <TelepathyQt/PendingStreamTubeConnection> +#include <TelepathyQt/ReferencedHandles> +#include <TelepathyQt/StreamTubeChannel> #include <telepathy-glib/telepathy-glib.h> diff --git a/tests/dbus/stream-tube-handlers.cpp b/tests/dbus/stream-tube-handlers.cpp index fddb26e5..1d837c52 100644 --- a/tests/dbus/stream-tube-handlers.cpp +++ b/tests/dbus/stream-tube-handlers.cpp @@ -6,21 +6,21 @@ #include <tests/lib/glib/stream-tube-chan.h> #include <tests/lib/glib/echo/chan.h> -#include <TelepathyQt4/AbstractClient> -#include <TelepathyQt4/Account> -#include <TelepathyQt4/AccountManager> -#include <TelepathyQt4/ChannelClassSpec> -#include <TelepathyQt4/ClientHandlerInterface> -#include <TelepathyQt4/ClientRegistrar> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/IncomingStreamTubeChannel> -#include <TelepathyQt4/OutgoingStreamTubeChannel> -#include <TelepathyQt4/PendingAccount> -#include <TelepathyQt4/PendingReady> -#include <TelepathyQt4/ReferencedHandles> -#include <TelepathyQt4/StreamTubeChannel> -#include <TelepathyQt4/StreamTubeClient> -#include <TelepathyQt4/StreamTubeServer> +#include <TelepathyQt/AbstractClient> +#include <TelepathyQt/Account> +#include <TelepathyQt/AccountManager> +#include <TelepathyQt/ChannelClassSpec> +#include <TelepathyQt/ClientHandlerInterface> +#include <TelepathyQt/ClientRegistrar> +#include <TelepathyQt/Connection> +#include <TelepathyQt/IncomingStreamTubeChannel> +#include <TelepathyQt/OutgoingStreamTubeChannel> +#include <TelepathyQt/PendingAccount> +#include <TelepathyQt/PendingReady> +#include <TelepathyQt/ReferencedHandles> +#include <TelepathyQt/StreamTubeChannel> +#include <TelepathyQt/StreamTubeClient> +#include <TelepathyQt/StreamTubeServer> #include <telepathy-glib/telepathy-glib.h> diff --git a/tests/dbus/streamed-media-chan.cpp b/tests/dbus/streamed-media-chan.cpp index 3f4ca2e5..567d8c57 100644 --- a/tests/dbus/streamed-media-chan.cpp +++ b/tests/dbus/streamed-media-chan.cpp @@ -6,13 +6,13 @@ #define TP_QT_ENABLE_LOWLEVEL_API -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/ConnectionLowlevel> -#include <TelepathyQt4/ContactManager> -#include <TelepathyQt4/PendingChannel> -#include <TelepathyQt4/PendingContacts> -#include <TelepathyQt4/PendingReady> -#include <TelepathyQt4/StreamedMediaChannel> +#include <TelepathyQt/Connection> +#include <TelepathyQt/ConnectionLowlevel> +#include <TelepathyQt/ContactManager> +#include <TelepathyQt/PendingChannel> +#include <TelepathyQt/PendingContacts> +#include <TelepathyQt/PendingReady> +#include <TelepathyQt/StreamedMediaChannel> #include <telepathy-glib/debug.h> diff --git a/tests/dbus/text-chan.cpp b/tests/dbus/text-chan.cpp index 8abdd0ad..d7f8ad10 100644 --- a/tests/dbus/text-chan.cpp +++ b/tests/dbus/text-chan.cpp @@ -6,11 +6,11 @@ #include <tests/lib/glib/echo/chan.h> #include <tests/lib/glib/echo2/chan.h> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/Message> -#include <TelepathyQt4/PendingReady> -#include <TelepathyQt4/ReceivedMessage> -#include <TelepathyQt4/TextChannel> +#include <TelepathyQt/Connection> +#include <TelepathyQt/Message> +#include <TelepathyQt/PendingReady> +#include <TelepathyQt/ReceivedMessage> +#include <TelepathyQt/TextChannel> #include <telepathy-glib/debug.h> diff --git a/tests/dbus/types.cpp b/tests/dbus/types.cpp index 864ad327..313b50c7 100644 --- a/tests/dbus/types.cpp +++ b/tests/dbus/types.cpp @@ -1,8 +1,8 @@ #include <tests/lib/test.h> -#include <TelepathyQt4/Channel> -#include <TelepathyQt4/Types> -#include <TelepathyQt4/types-internal.h> +#include <TelepathyQt/Channel> +#include <TelepathyQt/Types> +#include <TelepathyQt/types-internal.h> using namespace Tp; diff --git a/tests/features.cpp b/tests/features.cpp index c8c605d9..7925e775 100644 --- a/tests/features.cpp +++ b/tests/features.cpp @@ -1,9 +1,9 @@ #include <QtTest/QtTest> -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/Debug> -#include <TelepathyQt4/Feature> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Constants> +#include <TelepathyQt/Debug> +#include <TelepathyQt/Feature> +#include <TelepathyQt/Types> using namespace Tp; diff --git a/tests/file-transfer-channel-creation-properties.cpp b/tests/file-transfer-channel-creation-properties.cpp index 8f40eb45..aa63080f 100644 --- a/tests/file-transfer-channel-creation-properties.cpp +++ b/tests/file-transfer-channel-creation-properties.cpp @@ -1,6 +1,6 @@ #include <QtTest/QtTest> -#include <TelepathyQt4/FileTransferChannelCreationProperties> +#include <TelepathyQt/FileTransferChannelCreationProperties> using namespace Tp; diff --git a/tests/key-file.cpp b/tests/key-file.cpp index 077e1a09..a890ba1c 100644 --- a/tests/key-file.cpp +++ b/tests/key-file.cpp @@ -1,6 +1,6 @@ #include <QtTest/QtTest> -#include <TelepathyQt4/KeyFile> +#include <TelepathyQt/KeyFile> using namespace Tp; diff --git a/tests/lib/glib-helpers/test-conn-helper.cpp b/tests/lib/glib-helpers/test-conn-helper.cpp index 96097fb9..46ba4183 100644 --- a/tests/lib/glib-helpers/test-conn-helper.cpp +++ b/tests/lib/glib-helpers/test-conn-helper.cpp @@ -3,14 +3,14 @@ #define TP_QT_ENABLE_LOWLEVEL_API -#include <TelepathyQt4/ChannelFactory> -#include <TelepathyQt4/Connection> -#include <TelepathyQt4/ConnectionLowlevel> -#include <TelepathyQt4/ContactFactory> -#include <TelepathyQt4/ContactManager> -#include <TelepathyQt4/PendingChannel> -#include <TelepathyQt4/PendingContacts> -#include <TelepathyQt4/PendingReady> +#include <TelepathyQt/ChannelFactory> +#include <TelepathyQt/Connection> +#include <TelepathyQt/ConnectionLowlevel> +#include <TelepathyQt/ContactFactory> +#include <TelepathyQt/ContactManager> +#include <TelepathyQt/PendingChannel> +#include <TelepathyQt/PendingContacts> +#include <TelepathyQt/PendingReady> TestConnHelper::TestConnHelper(Test *parent, GType gType, const QString &account, const QString &protocol) diff --git a/tests/lib/glib-helpers/test-conn-helper.h b/tests/lib/glib-helpers/test-conn-helper.h index d1c2f4d2..7f1a09f7 100644 --- a/tests/lib/glib-helpers/test-conn-helper.h +++ b/tests/lib/glib-helpers/test-conn-helper.h @@ -1,11 +1,11 @@ -#ifndef _TelepathyQt4_tests_lib_glib_helpers_test_conn_helper_h_HEADER_GUARD_ -#define _TelepathyQt4_tests_lib_glib_helpers_test_conn_helper_h_HEADER_GUARD_ +#ifndef _TelepathyQt_tests_lib_glib_helpers_test_conn_helper_h_HEADER_GUARD_ +#define _TelepathyQt_tests_lib_glib_helpers_test_conn_helper_h_HEADER_GUARD_ #include <tests/lib/test.h> -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/Features> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Constants> +#include <TelepathyQt/Features> +#include <TelepathyQt/Types> #include <glib-object.h> @@ -99,4 +99,4 @@ private: Tp::ChannelPtr mChannel; }; -#endif // _TelepathyQt4_tests_lib_glib_helpers_test_conn_helper_h_HEADER_GUARD_ +#endif // _TelepathyQt_tests_lib_glib_helpers_test_conn_helper_h_HEADER_GUARD_ diff --git a/tests/lib/test.cpp b/tests/lib/test.cpp index 5fb39409..3a2eb16a 100644 --- a/tests/lib/test.cpp +++ b/tests/lib/test.cpp @@ -4,12 +4,12 @@ #include <QtCore/QTimer> -#include <TelepathyQt4/Types> -#include <TelepathyQt4/Debug> -#include <TelepathyQt4/DBus> -#include <TelepathyQt4/PendingVoid> -#include <TelepathyQt4/SharedPtr> -#include <TelepathyQt4/RefCounted> +#include <TelepathyQt/Types> +#include <TelepathyQt/Debug> +#include <TelepathyQt/DBus> +#include <TelepathyQt/PendingVoid> +#include <TelepathyQt/SharedPtr> +#include <TelepathyQt/RefCounted> using Tp::PendingOperation; using Tp::PendingVoid; diff --git a/tests/lib/test.h b/tests/lib/test.h index 39591542..15e5f83f 100644 --- a/tests/lib/test.h +++ b/tests/lib/test.h @@ -1,12 +1,12 @@ -#ifndef _TelepathyQt4_tests_lib_test_h_HEADER_GUARD_ -#define _TelepathyQt4_tests_lib_test_h_HEADER_GUARD_ +#ifndef _TelepathyQt_tests_lib_test_h_HEADER_GUARD_ +#define _TelepathyQt_tests_lib_test_h_HEADER_GUARD_ #include <QtDBus> #include <QtTest> -#include <TelepathyQt4/PendingOperation> -#include <TelepathyQt4/PendingVariant> -#include <TelepathyQt4/Constants> +#include <TelepathyQt/PendingOperation> +#include <TelepathyQt/PendingVariant> +#include <TelepathyQt/Constants> namespace Tp { @@ -85,4 +85,4 @@ bool Test::waitForProperty(Tp::PendingVariant *pv, T *value) } \ qDebug() << "finished"; -#endif // _TelepathyQt4_tests_lib_test_h_HEADER_GUARD_ +#endif // _TelepathyQt_tests_lib_test_h_HEADER_GUARD_ diff --git a/tests/manager-file.cpp b/tests/manager-file.cpp index deed5170..746db93e 100644 --- a/tests/manager-file.cpp +++ b/tests/manager-file.cpp @@ -1,8 +1,8 @@ #include <QtTest/QtTest> -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/Debug> -#include <TelepathyQt4/ManagerFile> +#include <TelepathyQt/Constants> +#include <TelepathyQt/Debug> +#include <TelepathyQt/ManagerFile> using namespace Tp; diff --git a/tests/presence.cpp b/tests/presence.cpp index c631c14a..c89bcb7d 100644 --- a/tests/presence.cpp +++ b/tests/presence.cpp @@ -1,9 +1,9 @@ #include <QtTest/QtTest> -#include <TelepathyQt4/Constants> -#include <TelepathyQt4/Debug> -#include <TelepathyQt4/Presence> -#include <TelepathyQt4/Types> +#include <TelepathyQt/Constants> +#include <TelepathyQt/Debug> +#include <TelepathyQt/Presence> +#include <TelepathyQt/Types> using namespace Tp; diff --git a/tests/profile.cpp b/tests/profile.cpp index 7aeea6f7..155107b5 100644 --- a/tests/profile.cpp +++ b/tests/profile.cpp @@ -1,7 +1,7 @@ #include <QtTest/QtTest> -#include <TelepathyQt4/Debug> -#include <TelepathyQt4/Profile> +#include <TelepathyQt/Debug> +#include <TelepathyQt/Profile> using namespace Tp; diff --git a/tests/ptr.cpp b/tests/ptr.cpp index faf8c22c..6f6e6a67 100644 --- a/tests/ptr.cpp +++ b/tests/ptr.cpp @@ -1,6 +1,6 @@ #include <QtTest/QtTest> -#include <TelepathyQt4/SharedPtr> +#include <TelepathyQt/SharedPtr> using namespace Tp; diff --git a/tests/rccspec.cpp b/tests/rccspec.cpp index bd3e55d4..089e6839 100644 --- a/tests/rccspec.cpp +++ b/tests/rccspec.cpp @@ -1,6 +1,6 @@ #include <QtTest/QtTest> -#include <TelepathyQt4/RequestableChannelClassSpec> +#include <TelepathyQt/RequestableChannelClassSpec> using namespace Tp; diff --git a/tests/utils.cpp b/tests/utils.cpp index 30732bd8..fcf63afb 100644 --- a/tests/utils.cpp +++ b/tests/utils.cpp @@ -1,6 +1,6 @@ #include <QtTest/QtTest> -#include <TelepathyQt4/Utils> +#include <TelepathyQt/Utils> using namespace Tp; diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 3c023216..0caf9666 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -3,8 +3,8 @@ add_custom_command(OUTPUT FIXME.out COMMAND egrep - ARGS -A 5 '[F]IXME|[T]ODO|[X]XX' ${CMAKE_SOURCE_DIR}/TelepathyQt4/*.[ch]* - ${CMAKE_SOURCE_DIR}/TelepathyQt4/*.[ch]* + ARGS -A 5 '[F]IXME|[T]ODO|[X]XX' ${CMAKE_SOURCE_DIR}/TelepathyQt/*.[ch]* + ${CMAKE_SOURCE_DIR}/TelepathyQt/*.[ch]* > FIXME.out || true) add_custom_target(check-local DEPENDS FIXME.out) diff --git a/tools/qt4-client-gen.py b/tools/qt4-client-gen.py index 465029be..bd1f775f 100644 --- a/tools/qt4-client-gen.py +++ b/tools/qt4-client-gen.py @@ -86,9 +86,9 @@ class Generator(object): #include <QDBusPendingReply> -#include <TelepathyQt4/AbstractInterface> -#include <TelepathyQt4/DBusProxy> -#include <TelepathyQt4/Global> +#include <TelepathyQt/AbstractInterface> +#include <TelepathyQt/DBusProxy> +#include <TelepathyQt/Global> namespace Tp { diff --git a/tools/qt4-types-gen.py b/tools/qt4-types-gen.py index 979c01dc..24cd4228 100644 --- a/tools/qt4-types-gen.py +++ b/tools/qt4-types-gen.py @@ -173,7 +173,7 @@ class Generator(object): #include <QDBusSignature> #include <QDBusVariant> -#include <TelepathyQt4/Global> +#include <TelepathyQt/Global> /** * \\addtogroup typesconstants Types and constants |