[telepathy-qt4/master] Get rid of Client dir.
Andre Moreira Magalhaes (andrunko)
andre.magalhaes at collabora.co.uk
Fri Apr 3 14:59:33 PDT 2009
---
Makefile.am | 2 +-
NEWS | 2 +-
TelepathyQt4/{Client => }/AbstractInterface | 2 +-
TelepathyQt4/{Client => }/Account | 2 +-
TelepathyQt4/{Client => }/AccountInterface | 2 +-
TelepathyQt4/{Client => }/AccountManager | 2 +-
TelepathyQt4/{Client => }/AccountManagerInterface | 2 +-
TelepathyQt4/{Client => }/Channel | 2 +-
TelepathyQt4/{Client => }/ChannelInterface | 2 +-
.../ChannelInterfaceCallStateInterface | 2 +-
.../ChannelInterfaceChatStateInterface | 2 +-
.../{Client => }/ChannelInterfaceDTMFInterface | 2 +-
.../{Client => }/ChannelInterfaceGroupInterface | 2 +-
.../{Client => }/ChannelInterfaceHoldInterface | 2 +-
.../ChannelInterfaceMediaSignallingInterface | 2 +-
.../{Client => }/ChannelInterfacePasswordInterface | 2 +-
.../{Client => }/ChannelTypeContactListInterface | 2 +-
.../{Client => }/ChannelTypeRoomListInterface | 2 +-
.../{Client => }/ChannelTypeStreamedMediaInterface | 2 +-
TelepathyQt4/{Client => }/ChannelTypeTextInterface | 2 +-
.../{Client => }/ChannelTypeTubesInterface | 2 +-
TelepathyQt4/Client/Types | 13 -
TelepathyQt4/Client/types.h | 61 ----
TelepathyQt4/{Client => }/Connection | 2 +-
TelepathyQt4/{Client => }/ConnectionInterface | 2 +-
.../ConnectionInterfaceAliasingInterface | 2 +-
.../ConnectionInterfaceAvatarsInterface | 2 +-
.../ConnectionInterfaceCapabilitiesInterface | 2 +-
.../ConnectionInterfaceContactsInterface | 2 +-
.../ConnectionInterfacePresenceInterface | 2 +-
.../ConnectionInterfaceRequestsInterface | 2 +-
.../ConnectionInterfaceSimplePresenceInterface | 2 +-
TelepathyQt4/{Client => }/ConnectionManager | 2 +-
.../{Client => }/ConnectionManagerInterface | 2 +-
TelepathyQt4/{Client => }/Contact | 2 +-
TelepathyQt4/{Client => }/ContactManager | 2 +-
TelepathyQt4/{Client => }/DBus | 2 +-
TelepathyQt4/{Client => }/DBusDaemonInterface | 2 +-
TelepathyQt4/{Client => }/DBusProxy | 2 +-
TelepathyQt4/{Client => }/Feature | 2 +-
TelepathyQt4/{Client => }/FileTransfer | 2 +-
TelepathyQt4/{Client => }/IntrospectableInterface | 2 +-
TelepathyQt4/Makefile.am | 342 ++++++++++----------
TelepathyQt4/{Client => }/MediaSessionHandler | 2 +-
.../{Client => }/MediaSessionHandlerInterface | 2 +-
TelepathyQt4/{Client => }/MediaStreamHandler | 2 +-
.../{Client => }/MediaStreamHandlerInterface | 2 +-
TelepathyQt4/{Client => }/Message | 2 +-
TelepathyQt4/{Client => }/OptionalInterfaceFactory | 2 +-
TelepathyQt4/{Client => }/PeerInterface | 2 +-
TelepathyQt4/{Client => }/PendingAccount | 2 +-
TelepathyQt4/{Client => }/PendingChannel | 2 +-
TelepathyQt4/{Client => }/PendingConnection | 2 +-
TelepathyQt4/{Client => }/PendingContactAttributes | 2 +-
TelepathyQt4/{Client => }/PendingContacts | 2 +-
TelepathyQt4/{Client => }/PendingFailure | 2 +-
TelepathyQt4/{Client => }/PendingHandles | 2 +-
TelepathyQt4/{Client => }/PendingOperation | 2 +-
TelepathyQt4/{Client => }/PendingReady | 2 +-
TelepathyQt4/{Client => }/PendingStringList | 2 +-
TelepathyQt4/{Client => }/PendingSuccess | 2 +-
TelepathyQt4/{Client => }/PendingVoidMethodCall | 2 +-
TelepathyQt4/{Client => }/Properties | 2 +-
TelepathyQt4/{Client => }/PropertiesInterface | 2 +-
.../{Client => }/PropertiesInterfaceInterface | 2 +-
TelepathyQt4/Prototype/Account.cpp | 4 +-
TelepathyQt4/Prototype/AccountManager.cpp | 4 +-
TelepathyQt4/Prototype/AvatarManager.cpp | 2 +-
TelepathyQt4/Prototype/CapabilitiesManager.cpp | 2 +-
TelepathyQt4/Prototype/ChatChannel.cpp | 4 +-
TelepathyQt4/Prototype/Connection.cpp | 4 +-
TelepathyQt4/Prototype/ConnectionFacade.cpp | 4 +-
TelepathyQt4/Prototype/Contact.cpp | 2 +-
TelepathyQt4/Prototype/Contact.h | 2 +-
TelepathyQt4/Prototype/ContactManager.cpp | 2 +-
TelepathyQt4/Prototype/PresenceManager.cpp | 2 +-
TelepathyQt4/Prototype/StreamedMediaChannel.cpp | 4 +-
TelepathyQt4/Prototype/StreamedMediaChannel.h | 4 +-
TelepathyQt4/{Client => }/ReadinessHelper | 2 +-
TelepathyQt4/{Client => }/ReadyObject | 2 +-
TelepathyQt4/{Client => }/ReceivedMessage | 2 +-
TelepathyQt4/{Client => }/ReferencedHandles | 2 +-
.../{Client => }/ReferencedHandlesIterator | 2 +-
TelepathyQt4/{Client => }/RoomList | 2 +-
TelepathyQt4/{Client => }/StatefulDBusProxy | 2 +-
TelepathyQt4/{Client => }/StatelessDBusProxy | 2 +-
TelepathyQt4/{Client => }/StreamedMediaChannel | 2 +-
TelepathyQt4/{Client => }/TextChannel | 2 +-
TelepathyQt4/{Client => }/abstract-interface.cpp | 6 +-
TelepathyQt4/{Client => }/abstract-interface.h | 0
TelepathyQt4/{Client => }/account-manager.cpp | 10 +-
TelepathyQt4/{Client => }/account-manager.h | 14 +-
TelepathyQt4/{Client => }/account.cpp | 16 +-
TelepathyQt4/{Client => }/account.h | 14 +-
TelepathyQt4/{Client => }/channel.cpp | 24 +-
TelepathyQt4/{Client => }/channel.h | 14 +-
TelepathyQt4/{Client => }/connection-internal.h | 4 +-
.../{Client => }/connection-manager-internal.h | 2 +-
TelepathyQt4/{Client => }/connection-manager.cpp | 18 +-
TelepathyQt4/{Client => }/connection-manager.h | 12 +-
TelepathyQt4/{Client => }/connection.cpp | 28 +-
TelepathyQt4/{Client => }/connection.h | 14 +-
TelepathyQt4/{Client => }/contact-manager.cpp | 18 +-
TelepathyQt4/{Client => }/contact-manager.h | 6 +-
TelepathyQt4/{Client => }/contact.cpp | 10 +-
TelepathyQt4/{Client => }/contact.h | 0
TelepathyQt4/{Client => }/dbus-proxy.cpp | 10 +-
TelepathyQt4/{Client => }/dbus-proxy.h | 0
TelepathyQt4/{Client => }/dbus.cpp | 2 +-
TelepathyQt4/{Client => }/dbus.h | 0
TelepathyQt4/{Client => }/feature.cpp | 2 +-
TelepathyQt4/{Client => }/feature.h | 0
TelepathyQt4/{Client => }/file-transfer.cpp | 8 +-
TelepathyQt4/{Client => }/file-transfer.h | 2 +-
TelepathyQt4/header-compile-test.cpp | 22 +-
.../{Client => }/media-session-handler.cpp | 2 +-
TelepathyQt4/{Client => }/media-session-handler.h | 0
TelepathyQt4/{Client => }/media-stream-handler.cpp | 2 +-
TelepathyQt4/{Client => }/media-stream-handler.h | 0
TelepathyQt4/{Client => }/message.cpp | 10 +-
TelepathyQt4/{Client => }/message.h | 4 +-
.../{Client => }/optional-interface-factory.cpp | 4 +-
.../{Client => }/optional-interface-factory.h | 2 +-
TelepathyQt4/{Client => }/pending-account.cpp | 8 +-
TelepathyQt4/{Client => }/pending-account.h | 4 +-
TelepathyQt4/{Client => }/pending-channel.cpp | 18 +-
TelepathyQt4/{Client => }/pending-channel.h | 4 +-
TelepathyQt4/{Client => }/pending-connection.cpp | 10 +-
TelepathyQt4/{Client => }/pending-connection.h | 4 +-
.../{Client => }/pending-contact-attributes.cpp | 10 +-
.../{Client => }/pending-contact-attributes.h | 4 +-
TelepathyQt4/{Client => }/pending-contacts.cpp | 14 +-
TelepathyQt4/{Client => }/pending-contacts.h | 4 +-
TelepathyQt4/{Client => }/pending-handles.cpp | 10 +-
TelepathyQt4/{Client => }/pending-handles.h | 4 +-
TelepathyQt4/{Client => }/pending-operation.cpp | 6 +-
TelepathyQt4/{Client => }/pending-operation.h | 0
TelepathyQt4/{Client => }/pending-ready.cpp | 6 +-
TelepathyQt4/{Client => }/pending-ready.h | 4 +-
TelepathyQt4/{Client => }/pending-string-list.cpp | 6 +-
TelepathyQt4/{Client => }/pending-string-list.h | 2 +-
TelepathyQt4/{Client => }/properties.cpp | 2 +-
TelepathyQt4/{Client => }/properties.h | 0
TelepathyQt4/{Client => }/readiness-helper.cpp | 8 +-
TelepathyQt4/{Client => }/readiness-helper.h | 2 +-
TelepathyQt4/{Client => }/ready-object.cpp | 8 +-
TelepathyQt4/{Client => }/ready-object.h | 2 +-
TelepathyQt4/{Client => }/referenced-handles.cpp | 10 +-
TelepathyQt4/{Client => }/referenced-handles.h | 4 +-
TelepathyQt4/{Client => }/room-list.cpp | 8 +-
TelepathyQt4/{Client => }/room-list.h | 2 +-
.../{Client => }/simple-pending-operations.h | 2 +-
.../{Client => }/streamed-media-channel.cpp | 16 +-
TelepathyQt4/{Client => }/streamed-media-channel.h | 6 +-
TelepathyQt4/{Client => }/text-channel.cpp | 20 +-
TelepathyQt4/{Client => }/text-channel.h | 4 +-
TelepathyQt4/types.h | 32 ++
examples/accounts/account-item.cpp | 4 +-
examples/accounts/account-item.h | 4 +-
examples/accounts/accounts-window.cpp | 8 +-
examples/accounts/accounts-window.h | 2 +-
examples/call/call-handler.cpp | 16 +-
examples/call/call-handler.h | 4 +-
examples/call/call-roster-widget.cpp | 12 +-
examples/call/call-roster-widget.h | 2 +-
examples/call/call-widget.cpp | 14 +-
examples/call/call-widget.h | 6 +-
examples/call/call-window.cpp | 12 +-
examples/call/call-window.h | 2 +-
examples/call/farsight-channel.cpp | 4 +-
examples/call/farsight-channel.h | 2 +-
examples/extensions/Makefile.am | 2 +-
examples/roster/roster-item.h | 2 +-
examples/roster/roster-widget.cpp | 12 +-
examples/roster/roster-widget.h | 4 +-
examples/roster/roster-window.cpp | 8 +-
examples/roster/roster-window.h | 2 +-
tests/dbus/account-basics.cpp | 12 +-
tests/dbus/chan-basics.cpp | 12 +-
tests/dbus/chan-group.cpp | 16 +-
tests/dbus/cm-basics.cpp | 6 +-
tests/dbus/conn-basics.cpp | 6 +-
tests/dbus/conn-requests.cpp | 12 +-
tests/dbus/conn-roster.cpp | 12 +-
tests/dbus/contacts.cpp | 14 +-
tests/dbus/handles.cpp | 10 +-
tests/dbus/stateful-proxy.cpp | 4 +-
tests/dbus/streamed-media-chan.cpp | 12 +-
tests/dbus/text-chan.cpp | 10 +-
tests/lib/test.cpp | 4 +-
tests/lib/test.h | 2 +-
tests/pinocchio/cm-basics.cpp | 8 +-
tests/pinocchio/conn-basics.cpp | 8 +-
tests/pinocchio/handles.cpp | 10 +-
tests/pinocchio/lib.cpp | 2 +-
tests/pinocchio/lib.h | 2 +-
tests/prototype/prototype.cpp | 8 +-
tools/qt4-client-gen.py | 4 +-
198 files changed, 686 insertions(+), 734 deletions(-)
rename TelepathyQt4/{Client => }/AbstractInterface (83%)
rename TelepathyQt4/{Client => }/Account (85%)
rename TelepathyQt4/{Client => }/AccountInterface (86%)
rename TelepathyQt4/{Client => }/AccountManager (83%)
rename TelepathyQt4/{Client => }/AccountManagerInterface (84%)
rename TelepathyQt4/{Client => }/Channel (85%)
rename TelepathyQt4/{Client => }/ChannelInterface (86%)
rename TelepathyQt4/{Client => }/ChannelInterfaceCallStateInterface (87%)
rename TelepathyQt4/{Client => }/ChannelInterfaceChatStateInterface (87%)
rename TelepathyQt4/{Client => }/ChannelInterfaceDTMFInterface (87%)
rename TelepathyQt4/{Client => }/ChannelInterfaceGroupInterface (87%)
rename TelepathyQt4/{Client => }/ChannelInterfaceHoldInterface (87%)
rename TelepathyQt4/{Client => }/ChannelInterfaceMediaSignallingInterface (87%)
rename TelepathyQt4/{Client => }/ChannelInterfacePasswordInterface (87%)
rename TelepathyQt4/{Client => }/ChannelTypeContactListInterface (87%)
rename TelepathyQt4/{Client => }/ChannelTypeRoomListInterface (87%)
rename TelepathyQt4/{Client => }/ChannelTypeStreamedMediaInterface (87%)
rename TelepathyQt4/{Client => }/ChannelTypeTextInterface (86%)
rename TelepathyQt4/{Client => }/ChannelTypeTubesInterface (86%)
delete mode 100644 TelepathyQt4/Client/Types
delete mode 100644 TelepathyQt4/Client/types.h
rename TelepathyQt4/{Client => }/Connection (84%)
rename TelepathyQt4/{Client => }/ConnectionInterface (85%)
rename TelepathyQt4/{Client => }/ConnectionInterfaceAliasingInterface (86%)
rename TelepathyQt4/{Client => }/ConnectionInterfaceAvatarsInterface (86%)
rename TelepathyQt4/{Client => }/ConnectionInterfaceCapabilitiesInterface (87%)
rename TelepathyQt4/{Client => }/ConnectionInterfaceContactsInterface (86%)
rename TelepathyQt4/{Client => }/ConnectionInterfacePresenceInterface (86%)
rename TelepathyQt4/{Client => }/ConnectionInterfaceRequestsInterface (86%)
rename TelepathyQt4/{Client => }/ConnectionInterfaceSimplePresenceInterface (87%)
rename TelepathyQt4/{Client => }/ConnectionManager (83%)
rename TelepathyQt4/{Client => }/ConnectionManagerInterface (83%)
rename TelepathyQt4/{Client => }/Contact (85%)
rename TelepathyQt4/{Client => }/ContactManager (83%)
rename TelepathyQt4/{Client => }/DBus (85%)
rename TelepathyQt4/{Client => }/DBusDaemonInterface (87%)
rename TelepathyQt4/{Client => }/DBusProxy (84%)
rename TelepathyQt4/{Client => }/Feature (85%)
rename TelepathyQt4/{Client => }/FileTransfer (83%)
rename TelepathyQt4/{Client => }/IntrospectableInterface (87%)
rename TelepathyQt4/{Client => }/MediaSessionHandler (82%)
rename TelepathyQt4/{Client => }/MediaSessionHandlerInterface (83%)
rename TelepathyQt4/{Client => }/MediaStreamHandler (82%)
rename TelepathyQt4/{Client => }/MediaStreamHandlerInterface (83%)
rename TelepathyQt4/{Client => }/Message (85%)
rename TelepathyQt4/{Client => }/OptionalInterfaceFactory (81%)
rename TelepathyQt4/{Client => }/PeerInterface (86%)
rename TelepathyQt4/{Client => }/PendingAccount (83%)
rename TelepathyQt4/{Client => }/PendingChannel (83%)
rename TelepathyQt4/{Client => }/PendingConnection (83%)
rename TelepathyQt4/{Client => }/PendingContactAttributes (70%)
rename TelepathyQt4/{Client => }/PendingContacts (83%)
rename TelepathyQt4/{Client => }/PendingFailure (80%)
rename TelepathyQt4/{Client => }/PendingHandles (83%)
rename TelepathyQt4/{Client => }/PendingOperation (83%)
rename TelepathyQt4/{Client => }/PendingReady (83%)
rename TelepathyQt4/{Client => }/PendingStringList (82%)
rename TelepathyQt4/{Client => }/PendingSuccess (80%)
rename TelepathyQt4/{Client => }/PendingVoidMethodCall (81%)
rename TelepathyQt4/{Client => }/Properties (84%)
rename TelepathyQt4/{Client => }/PropertiesInterface (87%)
rename TelepathyQt4/{Client => }/PropertiesInterfaceInterface (86%)
rename TelepathyQt4/{Client => }/ReadinessHelper (83%)
rename TelepathyQt4/{Client => }/ReadyObject (84%)
rename TelepathyQt4/{Client => }/ReceivedMessage (85%)
rename TelepathyQt4/{Client => }/ReferencedHandles (81%)
rename TelepathyQt4/{Client => }/ReferencedHandlesIterator (73%)
rename TelepathyQt4/{Client => }/RoomList (84%)
rename TelepathyQt4/{Client => }/StatefulDBusProxy (85%)
rename TelepathyQt4/{Client => }/StatelessDBusProxy (85%)
rename TelepathyQt4/{Client => }/StreamedMediaChannel (82%)
rename TelepathyQt4/{Client => }/TextChannel (84%)
rename TelepathyQt4/{Client => }/abstract-interface.cpp (94%)
rename TelepathyQt4/{Client => }/abstract-interface.h (100%)
rename TelepathyQt4/{Client => }/account-manager.cpp (98%)
rename TelepathyQt4/{Client => }/account-manager.h (91%)
rename TelepathyQt4/{Client => }/account.cpp (98%)
rename TelepathyQt4/{Client => }/account.h (95%)
rename TelepathyQt4/{Client => }/channel.cpp (99%)
rename TelepathyQt4/{Client => }/channel.h (97%)
rename TelepathyQt4/{Client => }/connection-internal.h (94%)
rename TelepathyQt4/{Client => }/connection-manager-internal.h (98%)
rename TelepathyQt4/{Client => }/connection-manager.cpp (97%)
rename TelepathyQt4/{Client => }/connection-manager.h (94%)
rename TelepathyQt4/{Client => }/connection.cpp (98%)
rename TelepathyQt4/{Client => }/connection.h (96%)
rename TelepathyQt4/{Client => }/contact-manager.cpp (98%)
rename TelepathyQt4/{Client => }/contact-manager.h (98%)
rename TelepathyQt4/{Client => }/contact.cpp (97%)
rename TelepathyQt4/{Client => }/contact.h (100%)
rename TelepathyQt4/{Client => }/dbus-proxy.cpp (96%)
rename TelepathyQt4/{Client => }/dbus-proxy.h (100%)
rename TelepathyQt4/{Client => }/dbus.cpp (96%)
rename TelepathyQt4/{Client => }/dbus.h (100%)
rename TelepathyQt4/{Client => }/feature.cpp (97%)
rename TelepathyQt4/{Client => }/feature.h (100%)
rename TelepathyQt4/{Client => }/file-transfer.cpp (91%)
rename TelepathyQt4/{Client => }/file-transfer.h (97%)
rename TelepathyQt4/{Client => }/media-session-handler.cpp (95%)
rename TelepathyQt4/{Client => }/media-session-handler.h (100%)
rename TelepathyQt4/{Client => }/media-stream-handler.cpp (95%)
rename TelepathyQt4/{Client => }/media-stream-handler.h (100%)
rename TelepathyQt4/{Client => }/message.cpp (97%)
rename TelepathyQt4/{Client => }/message.h (97%)
rename TelepathyQt4/{Client => }/optional-interface-factory.cpp (95%)
rename TelepathyQt4/{Client => }/optional-interface-factory.h (97%)
rename TelepathyQt4/{Client => }/pending-account.cpp (95%)
rename TelepathyQt4/{Client => }/pending-account.h (95%)
rename TelepathyQt4/{Client => }/pending-channel.cpp (96%)
rename TelepathyQt4/{Client => }/pending-channel.h (96%)
rename TelepathyQt4/{Client => }/pending-connection.cpp (95%)
rename TelepathyQt4/{Client => }/pending-connection.h (95%)
rename TelepathyQt4/{Client => }/pending-contact-attributes.cpp (95%)
rename TelepathyQt4/{Client => }/pending-contact-attributes.h (96%)
rename TelepathyQt4/{Client => }/pending-contacts.cpp (97%)
rename TelepathyQt4/{Client => }/pending-contacts.h (97%)
rename TelepathyQt4/{Client => }/pending-handles.cpp (98%)
rename TelepathyQt4/{Client => }/pending-handles.h (96%)
rename TelepathyQt4/{Client => }/pending-operation.cpp (96%)
rename TelepathyQt4/{Client => }/pending-operation.h (100%)
rename TelepathyQt4/{Client => }/pending-ready.cpp (93%)
rename TelepathyQt4/{Client => }/pending-ready.h (94%)
rename TelepathyQt4/{Client => }/pending-string-list.cpp (87%)
rename TelepathyQt4/{Client => }/pending-string-list.h (97%)
rename TelepathyQt4/{Client => }/properties.cpp (95%)
rename TelepathyQt4/{Client => }/properties.h (100%)
rename TelepathyQt4/{Client => }/readiness-helper.cpp (98%)
rename TelepathyQt4/{Client => }/readiness-helper.h (99%)
rename TelepathyQt4/{Client => }/ready-object.cpp (94%)
rename TelepathyQt4/{Client => }/ready-object.h (97%)
rename TelepathyQt4/{Client => }/referenced-handles.cpp (98%)
rename TelepathyQt4/{Client => }/referenced-handles.h (98%)
rename TelepathyQt4/{Client => }/room-list.cpp (92%)
rename TelepathyQt4/{Client => }/room-list.h (97%)
rename TelepathyQt4/{Client => }/simple-pending-operations.h (98%)
rename TelepathyQt4/{Client => }/streamed-media-channel.cpp (98%)
rename TelepathyQt4/{Client => }/streamed-media-channel.h (97%)
rename TelepathyQt4/{Client => }/text-channel.cpp (98%)
rename TelepathyQt4/{Client => }/text-channel.h (98%)
diff --git a/Makefile.am b/Makefile.am
index c956515..3fd2c87 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@ MOSTLYCLEANFILES = $(DX_CLEANFILES)
check-local::
egrep -A 5 '[F]IXME|[T]ODO|[X]XX' $(srcdir)/TelepathyQt4/*.[ch]* \
- $(srcdir)/TelepathyQt4/Client/*.[ch]* \
+ $(srcdir)/TelepathyQt4/*.[ch]* \
> FIXME.out || true
doc/html: doxygen-doc
diff --git a/NEWS b/NEWS
index 76de5d8..1e51f0c 100644
--- a/NEWS
+++ b/NEWS
@@ -49,7 +49,7 @@ API changes:
* Channel Features are now Feature objects, not integers
-* The Feature class is now in its own header, <TelepathyQt4/Client/Feature>
+* The Feature class is now in its own header, <TelepathyQt4/Feature>
Enhancements:
diff --git a/TelepathyQt4/Client/AbstractInterface b/TelepathyQt4/AbstractInterface
similarity index 83%
rename from TelepathyQt4/Client/AbstractInterface
rename to TelepathyQt4/AbstractInterface
index b1213f5..91b20d4 100644
--- a/TelepathyQt4/Client/AbstractInterface
+++ b/TelepathyQt4/AbstractInterface
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/abstract-interface.h>
+#include <TelepathyQt4/abstract-interface.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/Account b/TelepathyQt4/Account
similarity index 85%
rename from TelepathyQt4/Client/Account
rename to TelepathyQt4/Account
index 94966cd..11b684b 100644
--- a/TelepathyQt4/Client/Account
+++ b/TelepathyQt4/Account
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/account.h>
+#include <TelepathyQt4/account.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/AccountInterface b/TelepathyQt4/AccountInterface
similarity index 86%
rename from TelepathyQt4/Client/AccountInterface
rename to TelepathyQt4/AccountInterface
index 12d5405..d592a9b 100644
--- a/TelepathyQt4/Client/AccountInterface
+++ b/TelepathyQt4/AccountInterface
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/account.h>
+#include <TelepathyQt4/account.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/AccountManager b/TelepathyQt4/AccountManager
similarity index 83%
rename from TelepathyQt4/Client/AccountManager
rename to TelepathyQt4/AccountManager
index e50504d..7944bc5 100644
--- a/TelepathyQt4/Client/AccountManager
+++ b/TelepathyQt4/AccountManager
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/account-manager.h>
+#include <TelepathyQt4/account-manager.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/AccountManagerInterface b/TelepathyQt4/AccountManagerInterface
similarity index 84%
rename from TelepathyQt4/Client/AccountManagerInterface
rename to TelepathyQt4/AccountManagerInterface
index 8b7aba6..057abc4 100644
--- a/TelepathyQt4/Client/AccountManagerInterface
+++ b/TelepathyQt4/AccountManagerInterface
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/account-manager.h>
+#include <TelepathyQt4/account-manager.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/Channel b/TelepathyQt4/Channel
similarity index 85%
rename from TelepathyQt4/Client/Channel
rename to TelepathyQt4/Channel
index 7679ccd..de507e9 100644
--- a/TelepathyQt4/Client/Channel
+++ b/TelepathyQt4/Channel
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/channel.h>
+#include <TelepathyQt4/channel.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/ChannelInterface b/TelepathyQt4/ChannelInterface
similarity index 86%
rename from TelepathyQt4/Client/ChannelInterface
rename to TelepathyQt4/ChannelInterface
index 0581902..4c61264 100644
--- a/TelepathyQt4/Client/ChannelInterface
+++ b/TelepathyQt4/ChannelInterface
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/channel.h>
+#include <TelepathyQt4/channel.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/ChannelInterfaceCallStateInterface b/TelepathyQt4/ChannelInterfaceCallStateInterface
similarity index 87%
rename from TelepathyQt4/Client/ChannelInterfaceCallStateInterface
rename to TelepathyQt4/ChannelInterfaceCallStateInterface
index 73c9a2e..d035c25 100644
--- a/TelepathyQt4/Client/ChannelInterfaceCallStateInterface
+++ b/TelepathyQt4/ChannelInterfaceCallStateInterface
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/channel.h>
+#include <TelepathyQt4/channel.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/ChannelInterfaceChatStateInterface b/TelepathyQt4/ChannelInterfaceChatStateInterface
similarity index 87%
rename from TelepathyQt4/Client/ChannelInterfaceChatStateInterface
rename to TelepathyQt4/ChannelInterfaceChatStateInterface
index 7ff98d1..6511af4 100644
--- a/TelepathyQt4/Client/ChannelInterfaceChatStateInterface
+++ b/TelepathyQt4/ChannelInterfaceChatStateInterface
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/channel.h>
+#include <TelepathyQt4/channel.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/ChannelInterfaceDTMFInterface b/TelepathyQt4/ChannelInterfaceDTMFInterface
similarity index 87%
rename from TelepathyQt4/Client/ChannelInterfaceDTMFInterface
rename to TelepathyQt4/ChannelInterfaceDTMFInterface
index 02ac8ec..846f7f0 100644
--- a/TelepathyQt4/Client/ChannelInterfaceDTMFInterface
+++ b/TelepathyQt4/ChannelInterfaceDTMFInterface
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/channel.h>
+#include <TelepathyQt4/channel.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/ChannelInterfaceGroupInterface b/TelepathyQt4/ChannelInterfaceGroupInterface
similarity index 87%
rename from TelepathyQt4/Client/ChannelInterfaceGroupInterface
rename to TelepathyQt4/ChannelInterfaceGroupInterface
index 513c927..4a9c48e 100644
--- a/TelepathyQt4/Client/ChannelInterfaceGroupInterface
+++ b/TelepathyQt4/ChannelInterfaceGroupInterface
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/channel.h>
+#include <TelepathyQt4/channel.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/ChannelInterfaceHoldInterface b/TelepathyQt4/ChannelInterfaceHoldInterface
similarity index 87%
rename from TelepathyQt4/Client/ChannelInterfaceHoldInterface
rename to TelepathyQt4/ChannelInterfaceHoldInterface
index 42d22b6..17d81b5 100644
--- a/TelepathyQt4/Client/ChannelInterfaceHoldInterface
+++ b/TelepathyQt4/ChannelInterfaceHoldInterface
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/channel.h>
+#include <TelepathyQt4/channel.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/ChannelInterfaceMediaSignallingInterface b/TelepathyQt4/ChannelInterfaceMediaSignallingInterface
similarity index 87%
rename from TelepathyQt4/Client/ChannelInterfaceMediaSignallingInterface
rename to TelepathyQt4/ChannelInterfaceMediaSignallingInterface
index 5e635d8..07f52f2 100644
--- a/TelepathyQt4/Client/ChannelInterfaceMediaSignallingInterface
+++ b/TelepathyQt4/ChannelInterfaceMediaSignallingInterface
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/channel.h>
+#include <TelepathyQt4/channel.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/ChannelInterfacePasswordInterface b/TelepathyQt4/ChannelInterfacePasswordInterface
similarity index 87%
rename from TelepathyQt4/Client/ChannelInterfacePasswordInterface
rename to TelepathyQt4/ChannelInterfacePasswordInterface
index c1757c0..a0b23dd 100644
--- a/TelepathyQt4/Client/ChannelInterfacePasswordInterface
+++ b/TelepathyQt4/ChannelInterfacePasswordInterface
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/channel.h>
+#include <TelepathyQt4/channel.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/ChannelTypeContactListInterface b/TelepathyQt4/ChannelTypeContactListInterface
similarity index 87%
rename from TelepathyQt4/Client/ChannelTypeContactListInterface
rename to TelepathyQt4/ChannelTypeContactListInterface
index 8c2ea86..eb870d9 100644
--- a/TelepathyQt4/Client/ChannelTypeContactListInterface
+++ b/TelepathyQt4/ChannelTypeContactListInterface
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/channel.h>
+#include <TelepathyQt4/channel.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/ChannelTypeRoomListInterface b/TelepathyQt4/ChannelTypeRoomListInterface
similarity index 87%
rename from TelepathyQt4/Client/ChannelTypeRoomListInterface
rename to TelepathyQt4/ChannelTypeRoomListInterface
index 1d2721e..be71301 100644
--- a/TelepathyQt4/Client/ChannelTypeRoomListInterface
+++ b/TelepathyQt4/ChannelTypeRoomListInterface
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/channel.h>
+#include <TelepathyQt4/channel.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/ChannelTypeStreamedMediaInterface b/TelepathyQt4/ChannelTypeStreamedMediaInterface
similarity index 87%
rename from TelepathyQt4/Client/ChannelTypeStreamedMediaInterface
rename to TelepathyQt4/ChannelTypeStreamedMediaInterface
index 573475c..7a18cad 100644
--- a/TelepathyQt4/Client/ChannelTypeStreamedMediaInterface
+++ b/TelepathyQt4/ChannelTypeStreamedMediaInterface
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/channel.h>
+#include <TelepathyQt4/channel.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/ChannelTypeTextInterface b/TelepathyQt4/ChannelTypeTextInterface
similarity index 86%
rename from TelepathyQt4/Client/ChannelTypeTextInterface
rename to TelepathyQt4/ChannelTypeTextInterface
index f61c4d4..dd15f3e 100644
--- a/TelepathyQt4/Client/ChannelTypeTextInterface
+++ b/TelepathyQt4/ChannelTypeTextInterface
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/channel.h>
+#include <TelepathyQt4/channel.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/ChannelTypeTubesInterface b/TelepathyQt4/ChannelTypeTubesInterface
similarity index 86%
rename from TelepathyQt4/Client/ChannelTypeTubesInterface
rename to TelepathyQt4/ChannelTypeTubesInterface
index 266ec19..a1f2fbc 100644
--- a/TelepathyQt4/Client/ChannelTypeTubesInterface
+++ b/TelepathyQt4/ChannelTypeTubesInterface
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/channel.h>
+#include <TelepathyQt4/channel.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/Types b/TelepathyQt4/Client/Types
deleted file mode 100644
index 79cb0db..0000000
--- a/TelepathyQt4/Client/Types
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef _TelepathyQt4_Client_Types_HEADER_GUARD_
-#define _TelepathyQt4_Client_Types_HEADER_GUARD_
-
-#ifndef IN_TELEPATHY_QT4_HEADER
-#define IN_TELEPATHY_QT4_HEADER
-#endif
-
-#include <TelepathyQt4/Client/types.h>
-
-#undef IN_TELEPATHY_QT4_HEADER
-
-#endif
-// vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/types.h b/TelepathyQt4/Client/types.h
deleted file mode 100644
index 8351409..0000000
--- a/TelepathyQt4/Client/types.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * This file is part of TelepathyQt4
- *
- * Copyright (C) 2009 Collabora Ltd. <http://www.collabora.co.uk/>
- * Copyright (C) 2009 Nokia Corporation
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef _TelepathyQt4_cli_types_h_HEADER_GUARD_
-#define _TelepathyQt4_cli_types_h_HEADER_GUARD_
-
-#ifndef IN_TELEPATHY_QT4_HEADER
-#error IN_TELEPATHY_QT4_HEADER
-#endif
-
-#include <TelepathyQt4/SharedPtr>
-
-namespace Telepathy
-{
-namespace Client
-{
-
-class Account;
-class AccountManager;
-class Channel;
-class Connection;
-class ConnectionManager;
-class FileTransfer;
-class RoomList;
-class MediaStream;
-class StreamedMediaChannel;
-class TextChannel;
-
-typedef SharedPtr<Account> AccountPtr;
-typedef SharedPtr<AccountManager> AccountManagerPtr;
-typedef SharedPtr<Channel> ChannelPtr;
-typedef SharedPtr<Connection> ConnectionPtr;
-typedef SharedPtr<ConnectionManager> ConnectionManagerPtr;
-typedef SharedPtr<FileTransfer> FileTransferPtr;
-typedef SharedPtr<RoomList> RoomListPtr;
-typedef SharedPtr<MediaStream> MediaStreamPtr;
-typedef SharedPtr<StreamedMediaChannel> StreamedMediaChannelPtr;
-typedef SharedPtr<TextChannel> TextChannelPtr;
-
-} // Telepathy::Client
-} // Telepathy
-
-#endif
diff --git a/TelepathyQt4/Client/Connection b/TelepathyQt4/Connection
similarity index 84%
rename from TelepathyQt4/Client/Connection
rename to TelepathyQt4/Connection
index 082e469..50a4096 100644
--- a/TelepathyQt4/Client/Connection
+++ b/TelepathyQt4/Connection
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/connection.h>
+#include <TelepathyQt4/connection.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/ConnectionInterface b/TelepathyQt4/ConnectionInterface
similarity index 85%
rename from TelepathyQt4/Client/ConnectionInterface
rename to TelepathyQt4/ConnectionInterface
index 7467512..6956671 100644
--- a/TelepathyQt4/Client/ConnectionInterface
+++ b/TelepathyQt4/ConnectionInterface
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/connection.h>
+#include <TelepathyQt4/connection.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/ConnectionInterfaceAliasingInterface b/TelepathyQt4/ConnectionInterfaceAliasingInterface
similarity index 86%
rename from TelepathyQt4/Client/ConnectionInterfaceAliasingInterface
rename to TelepathyQt4/ConnectionInterfaceAliasingInterface
index bbc49c7..990e22e 100644
--- a/TelepathyQt4/Client/ConnectionInterfaceAliasingInterface
+++ b/TelepathyQt4/ConnectionInterfaceAliasingInterface
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/connection.h>
+#include <TelepathyQt4/connection.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/ConnectionInterfaceAvatarsInterface b/TelepathyQt4/ConnectionInterfaceAvatarsInterface
similarity index 86%
rename from TelepathyQt4/Client/ConnectionInterfaceAvatarsInterface
rename to TelepathyQt4/ConnectionInterfaceAvatarsInterface
index d473fb9..2033f92 100644
--- a/TelepathyQt4/Client/ConnectionInterfaceAvatarsInterface
+++ b/TelepathyQt4/ConnectionInterfaceAvatarsInterface
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/connection.h>
+#include <TelepathyQt4/connection.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/ConnectionInterfaceCapabilitiesInterface b/TelepathyQt4/ConnectionInterfaceCapabilitiesInterface
similarity index 87%
rename from TelepathyQt4/Client/ConnectionInterfaceCapabilitiesInterface
rename to TelepathyQt4/ConnectionInterfaceCapabilitiesInterface
index e125d56..1cfbbb1 100644
--- a/TelepathyQt4/Client/ConnectionInterfaceCapabilitiesInterface
+++ b/TelepathyQt4/ConnectionInterfaceCapabilitiesInterface
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/connection.h>
+#include <TelepathyQt4/connection.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/ConnectionInterfaceContactsInterface b/TelepathyQt4/ConnectionInterfaceContactsInterface
similarity index 86%
rename from TelepathyQt4/Client/ConnectionInterfaceContactsInterface
rename to TelepathyQt4/ConnectionInterfaceContactsInterface
index 8a66801..285008a 100644
--- a/TelepathyQt4/Client/ConnectionInterfaceContactsInterface
+++ b/TelepathyQt4/ConnectionInterfaceContactsInterface
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/connection.h>
+#include <TelepathyQt4/connection.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/ConnectionInterfacePresenceInterface b/TelepathyQt4/ConnectionInterfacePresenceInterface
similarity index 86%
rename from TelepathyQt4/Client/ConnectionInterfacePresenceInterface
rename to TelepathyQt4/ConnectionInterfacePresenceInterface
index 8946062..46867c0 100644
--- a/TelepathyQt4/Client/ConnectionInterfacePresenceInterface
+++ b/TelepathyQt4/ConnectionInterfacePresenceInterface
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/connection.h>
+#include <TelepathyQt4/connection.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/ConnectionInterfaceRequestsInterface b/TelepathyQt4/ConnectionInterfaceRequestsInterface
similarity index 86%
rename from TelepathyQt4/Client/ConnectionInterfaceRequestsInterface
rename to TelepathyQt4/ConnectionInterfaceRequestsInterface
index 7ea614d..b6f1ac9 100644
--- a/TelepathyQt4/Client/ConnectionInterfaceRequestsInterface
+++ b/TelepathyQt4/ConnectionInterfaceRequestsInterface
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/connection.h>
+#include <TelepathyQt4/connection.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/ConnectionInterfaceSimplePresenceInterface b/TelepathyQt4/ConnectionInterfaceSimplePresenceInterface
similarity index 87%
rename from TelepathyQt4/Client/ConnectionInterfaceSimplePresenceInterface
rename to TelepathyQt4/ConnectionInterfaceSimplePresenceInterface
index fc92872..59a7e3e 100644
--- a/TelepathyQt4/Client/ConnectionInterfaceSimplePresenceInterface
+++ b/TelepathyQt4/ConnectionInterfaceSimplePresenceInterface
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/connection.h>
+#include <TelepathyQt4/connection.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/ConnectionManager b/TelepathyQt4/ConnectionManager
similarity index 83%
rename from TelepathyQt4/Client/ConnectionManager
rename to TelepathyQt4/ConnectionManager
index 7dee708..acf11dd 100644
--- a/TelepathyQt4/Client/ConnectionManager
+++ b/TelepathyQt4/ConnectionManager
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/connection-manager.h>
+#include <TelepathyQt4/connection-manager.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/ConnectionManagerInterface b/TelepathyQt4/ConnectionManagerInterface
similarity index 83%
rename from TelepathyQt4/Client/ConnectionManagerInterface
rename to TelepathyQt4/ConnectionManagerInterface
index 51c9062..ab1812b 100644
--- a/TelepathyQt4/Client/ConnectionManagerInterface
+++ b/TelepathyQt4/ConnectionManagerInterface
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/connection-manager.h>
+#include <TelepathyQt4/connection-manager.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/Contact b/TelepathyQt4/Contact
similarity index 85%
rename from TelepathyQt4/Client/Contact
rename to TelepathyQt4/Contact
index e03e9d9..5f6a7b0 100644
--- a/TelepathyQt4/Client/Contact
+++ b/TelepathyQt4/Contact
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/contact.h>
+#include <TelepathyQt4/contact.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/ContactManager b/TelepathyQt4/ContactManager
similarity index 83%
rename from TelepathyQt4/Client/ContactManager
rename to TelepathyQt4/ContactManager
index 7e0bf0d..79aef9c 100644
--- a/TelepathyQt4/Client/ContactManager
+++ b/TelepathyQt4/ContactManager
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/contact-manager.h>
+#include <TelepathyQt4/contact-manager.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/DBus b/TelepathyQt4/DBus
similarity index 85%
rename from TelepathyQt4/Client/DBus
rename to TelepathyQt4/DBus
index 0a7f008..c9537e3 100644
--- a/TelepathyQt4/Client/DBus
+++ b/TelepathyQt4/DBus
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/dbus.h>
+#include <TelepathyQt4/dbus.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/DBusDaemonInterface b/TelepathyQt4/DBusDaemonInterface
similarity index 87%
rename from TelepathyQt4/Client/DBusDaemonInterface
rename to TelepathyQt4/DBusDaemonInterface
index 6d5c1f9..2da332e 100644
--- a/TelepathyQt4/Client/DBusDaemonInterface
+++ b/TelepathyQt4/DBusDaemonInterface
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/dbus.h>
+#include <TelepathyQt4/dbus.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/DBusProxy b/TelepathyQt4/DBusProxy
similarity index 84%
rename from TelepathyQt4/Client/DBusProxy
rename to TelepathyQt4/DBusProxy
index 8e7e50f..d77da33 100644
--- a/TelepathyQt4/Client/DBusProxy
+++ b/TelepathyQt4/DBusProxy
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/dbus-proxy.h>
+#include <TelepathyQt4/dbus-proxy.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/Feature b/TelepathyQt4/Feature
similarity index 85%
rename from TelepathyQt4/Client/Feature
rename to TelepathyQt4/Feature
index 145336c..0a5e3f6 100644
--- a/TelepathyQt4/Client/Feature
+++ b/TelepathyQt4/Feature
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/feature.h>
+#include <TelepathyQt4/feature.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/FileTransfer b/TelepathyQt4/FileTransfer
similarity index 83%
rename from TelepathyQt4/Client/FileTransfer
rename to TelepathyQt4/FileTransfer
index 8845206..fe7675b 100644
--- a/TelepathyQt4/Client/FileTransfer
+++ b/TelepathyQt4/FileTransfer
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/file-transfer.h>
+#include <TelepathyQt4/file-transfer.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/IntrospectableInterface b/TelepathyQt4/IntrospectableInterface
similarity index 87%
rename from TelepathyQt4/Client/IntrospectableInterface
rename to TelepathyQt4/IntrospectableInterface
index a91e7f0..0baa397 100644
--- a/TelepathyQt4/Client/IntrospectableInterface
+++ b/TelepathyQt4/IntrospectableInterface
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/dbus.h>
+#include <TelepathyQt4/dbus.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Makefile.am b/TelepathyQt4/Makefile.am
index ee91e70..55a1aea 100644
--- a/TelepathyQt4/Makefile.am
+++ b/TelepathyQt4/Makefile.am
@@ -2,7 +2,6 @@
SUBDIRS = . Prototype
tpqt4includedir=$(includedir)/telepathy-1.0/TelepathyQt4
-tpqt4clientincludedir=$(tpqt4includedir)/Client
genincludedir=$(tpqt4includedir)/_gen
pkgconfigdir = ${libdir}/pkgconfig
@@ -39,44 +38,44 @@ libtelepathy_qt4_la_LIBADD = $(ALL_LIBS)
libtelepathy_qt4_la_DEPENDENCIES = Makefile.am
libtelepathy_qt4_la_SOURCES = \
- Client/abstract-interface.cpp \
- Client/account.cpp \
- Client/account-manager.cpp \
- Client/channel.cpp \
- Client/connection.cpp \
- Client/connection-manager.cpp \
- Client/connection-internal.h \
- Client/connection-manager-internal.h \
- Client/contact.cpp \
- Client/contact-manager.cpp \
- Client/dbus.cpp \
- Client/dbus-proxy.cpp \
- Client/feature.cpp \
- Client/file-transfer.cpp \
- Client/media-session-handler.cpp \
- Client/media-stream-handler.cpp \
- Client/message.cpp \
- Client/optional-interface-factory.cpp \
- Client/pending-account.cpp \
- Client/pending-channel.cpp \
- Client/pending-connection.cpp \
- Client/pending-contact-attributes.cpp \
- Client/pending-contacts.cpp \
- Client/pending-handles.cpp \
- Client/pending-operation.cpp \
- Client/pending-ready.cpp \
- Client/pending-string-list.cpp \
- Client/properties.cpp \
- Client/readiness-helper.cpp \
- Client/ready-object.cpp \
- Client/referenced-handles.cpp \
- Client/room-list.cpp \
- Client/streamed-media-channel.cpp \
- Client/text-channel.cpp \
+ abstract-interface.cpp \
+ account.cpp \
+ account-manager.cpp \
+ channel.cpp \
+ connection.cpp \
+ connection-manager.cpp \
+ connection-internal.h \
+ connection-manager-internal.h \
+ contact.cpp \
+ contact-manager.cpp \
+ dbus.cpp \
+ dbus-proxy.cpp \
debug.cpp \
debug-internal.h \
+ feature.cpp \
+ file-transfer.cpp \
key-file.cpp \
manager-file.cpp \
+ media-session-handler.cpp \
+ media-stream-handler.cpp \
+ message.cpp \
+ optional-interface-factory.cpp \
+ pending-account.cpp \
+ pending-channel.cpp \
+ pending-connection.cpp \
+ pending-contact-attributes.cpp \
+ pending-contacts.cpp \
+ pending-handles.cpp \
+ pending-operation.cpp \
+ pending-ready.cpp \
+ pending-string-list.cpp \
+ properties.cpp \
+ readiness-helper.cpp \
+ ready-object.cpp \
+ referenced-handles.cpp \
+ room-list.cpp \
+ streamed-media-channel.cpp \
+ text-channel.cpp \
types.cpp \
header-compile-test.cpp
@@ -100,156 +99,152 @@ nodist_libtelepathy_qt4_la_SOURCES = \
_gen/cli-properties-body.hpp \
_gen/cli-properties.moc.hpp \
_gen/types-body.hpp \
- Client/_gen/abstract-interface.moc.hpp \
- Client/_gen/account.moc.hpp \
- Client/_gen/account-manager.moc.hpp \
- Client/_gen/channel.moc.hpp \
- Client/_gen/connection.moc.hpp \
- Client/_gen/connection-manager.moc.hpp \
- Client/_gen/connection-internal.moc.hpp \
- Client/_gen/connection-manager-internal.moc.hpp \
- Client/_gen/contact.moc.hpp \
- Client/_gen/contact-manager.moc.hpp \
- Client/_gen/dbus-proxy.moc.hpp \
- Client/_gen/file-transfer.moc.hpp \
- Client/_gen/pending-account.moc.hpp \
- Client/_gen/pending-channel.moc.hpp \
- Client/_gen/pending-connection.moc.hpp \
- Client/_gen/pending-contact-attributes.moc.hpp \
- Client/_gen/pending-contacts.moc.hpp \
- Client/_gen/pending-handles.moc.hpp \
- Client/_gen/pending-operation.moc.hpp \
- Client/_gen/pending-ready.moc.hpp \
- Client/_gen/pending-string-list.moc.hpp \
- Client/_gen/readiness-helper.moc.hpp \
- Client/_gen/room-list.moc.hpp \
- Client/_gen/simple-pending-operations.moc.hpp \
- Client/_gen/streamed-media-channel.moc.hpp \
- Client/_gen/text-channel.moc.hpp
+ _gen/abstract-interface.moc.hpp \
+ _gen/account.moc.hpp \
+ _gen/account-manager.moc.hpp \
+ _gen/channel.moc.hpp \
+ _gen/connection.moc.hpp \
+ _gen/connection-manager.moc.hpp \
+ _gen/connection-internal.moc.hpp \
+ _gen/connection-manager-internal.moc.hpp \
+ _gen/contact.moc.hpp \
+ _gen/contact-manager.moc.hpp \
+ _gen/dbus-proxy.moc.hpp \
+ _gen/file-transfer.moc.hpp \
+ _gen/pending-account.moc.hpp \
+ _gen/pending-channel.moc.hpp \
+ _gen/pending-connection.moc.hpp \
+ _gen/pending-contact-attributes.moc.hpp \
+ _gen/pending-contacts.moc.hpp \
+ _gen/pending-handles.moc.hpp \
+ _gen/pending-operation.moc.hpp \
+ _gen/pending-ready.moc.hpp \
+ _gen/pending-string-list.moc.hpp \
+ _gen/readiness-helper.moc.hpp \
+ _gen/room-list.moc.hpp \
+ _gen/simple-pending-operations.moc.hpp \
+ _gen/streamed-media-channel.moc.hpp \
+ _gen/text-channel.moc.hpp
tpqt4include_HEADERS = \
+ AbstractInterface \
+ Account \
+ AccountManager \
+ Channel \
+ Connection \
+ ConnectionManager \
Constants \
+ Contact \
+ ContactManager \
Debug \
+ DBus \
+ DBusProxy \
+ Feature \
+ FileTransfer \
KeyFile \
ManagerFile \
+ MediaSessionHandler \
+ MediaStreamHandler \
+ Message \
+ OptionalInterfaceFactory \
+ PendingAccount \
+ PendingChannel \
+ PendingConnection \
+ PendingContacts \
+ PendingContactAttributes \
+ PendingFailure \
+ PendingHandles \
+ PendingOperation \
+ PendingReady \
+ PendingSuccess \
+ PendingStringList \
+ PendingVoidMethodCall \
+ Properties \
+ ReadinessHelper \
+ ReadyObject \
+ ReceivedMessage \
+ ReferencedHandles \
+ ReferencedHandlesIterator \
+ RoomList \
SharedData \
SharedPtr \
- WeakPtr \
+ StatelessDBusProxy \
+ StatefulDBusProxy \
+ StreamedMediaChannel \
+ TextChannel \
Types \
+ WeakPtr \
+ AccountInterface \
+ AccountManagerInterface \
+ ChannelInterface \
+ ChannelInterfaceCallStateInterface \
+ ChannelInterfaceChatStateInterface \
+ ChannelInterfaceDTMFInterface \
+ ChannelInterfaceGroupInterface \
+ ChannelInterfaceHoldInterface \
+ ChannelInterfaceMediaSignallingInterface \
+ ChannelInterfacePasswordInterface \
+ ChannelTypeContactListInterface \
+ ChannelTypeRoomListInterface \
+ ChannelTypeStreamedMediaInterface \
+ ChannelTypeTextInterface \
+ ChannelTypeTubesInterface \
+ ConnectionInterface \
+ ConnectionInterfaceAliasingInterface \
+ ConnectionInterfaceAvatarsInterface \
+ ConnectionInterfaceCapabilitiesInterface \
+ ConnectionInterfaceContactsInterface \
+ ConnectionInterfacePresenceInterface \
+ ConnectionInterfaceRequestsInterface \
+ ConnectionInterfaceSimplePresenceInterface \
+ ConnectionManagerInterface \
+ DBusDaemonInterface \
+ IntrospectableInterface \
+ MediaSessionHandlerInterface \
+ MediaStreamHandlerInterface \
+ PeerInterface \
+ PropertiesInterface \
+ PropertiesInterfaceInterface \
+ abstract-interface.h \
+ account.h \
+ account-manager.h \
+ channel.h \
+ connection.h \
+ connection-manager.h \
constants.h \
+ contact.h \
+ contact-manager.h \
+ dbus.h \
+ dbus-proxy.h \
debug.h \
+ feature.h \
+ file-transfer.h \
key-file.h \
manager-file.h \
+ media-session-handler.h \
+ media-stream-handler.h \
+ message.h \
+ optional-interface-factory.h \
+ pending-account.h \
+ pending-channel.h \
+ pending-connection.h \
+ pending-contact-attributes.h \
+ pending-contacts.h \
+ pending-handles.h \
+ pending-operation.h \
+ pending-ready.h \
+ pending-string-list.h \
+ properties.h \
+ readiness-helper.h \
+ ready-object.h \
+ referenced-handles.h \
+ room-list.h \
shared-ptr.h \
+ simple-pending-operations.h \
+ streamed-media-channel.h \
+ text-channel.h \
types.h
-tpqt4clientinclude_HEADERS = \
- Client/AbstractInterface \
- Client/Account \
- Client/AccountManager \
- Client/Channel \
- Client/Connection \
- Client/ConnectionManager \
- Client/Contact \
- Client/ContactManager \
- Client/DBus \
- Client/DBusProxy \
- Client/Feature \
- Client/FileTransfer \
- Client/MediaSessionHandler \
- Client/MediaStreamHandler \
- Client/Message \
- Client/OptionalInterfaceFactory \
- Client/PendingAccount \
- Client/PendingChannel \
- Client/PendingConnection \
- Client/PendingContacts \
- Client/PendingContactAttributes \
- Client/PendingFailure \
- Client/PendingHandles \
- Client/PendingOperation \
- Client/PendingReady \
- Client/PendingSuccess \
- Client/PendingStringList \
- Client/PendingVoidMethodCall \
- Client/Properties \
- Client/ReadinessHelper \
- Client/ReadyObject \
- Client/ReceivedMessage \
- Client/ReferencedHandles \
- Client/ReferencedHandlesIterator \
- Client/RoomList \
- Client/StatelessDBusProxy \
- Client/StatefulDBusProxy \
- Client/StreamedMediaChannel \
- Client/TextChannel \
- Client/Types \
- Client/AccountInterface \
- Client/AccountManagerInterface \
- Client/ChannelInterface \
- Client/ChannelInterfaceCallStateInterface \
- Client/ChannelInterfaceChatStateInterface \
- Client/ChannelInterfaceDTMFInterface \
- Client/ChannelInterfaceGroupInterface \
- Client/ChannelInterfaceHoldInterface \
- Client/ChannelInterfaceMediaSignallingInterface \
- Client/ChannelInterfacePasswordInterface \
- Client/ChannelTypeContactListInterface \
- Client/ChannelTypeRoomListInterface \
- Client/ChannelTypeStreamedMediaInterface \
- Client/ChannelTypeTextInterface \
- Client/ChannelTypeTubesInterface \
- Client/ConnectionInterface \
- Client/ConnectionInterfaceAliasingInterface \
- Client/ConnectionInterfaceAvatarsInterface \
- Client/ConnectionInterfaceCapabilitiesInterface \
- Client/ConnectionInterfaceContactsInterface \
- Client/ConnectionInterfacePresenceInterface \
- Client/ConnectionInterfaceRequestsInterface \
- Client/ConnectionInterfaceSimplePresenceInterface \
- Client/ConnectionManagerInterface \
- Client/DBusDaemonInterface \
- Client/IntrospectableInterface \
- Client/MediaSessionHandlerInterface \
- Client/MediaStreamHandlerInterface \
- Client/PeerInterface \
- Client/PropertiesInterface \
- Client/PropertiesInterfaceInterface \
- Client/abstract-interface.h \
- Client/account.h \
- Client/account-manager.h \
- Client/channel.h \
- Client/connection.h \
- Client/connection-manager.h \
- Client/contact.h \
- Client/contact-manager.h \
- Client/dbus.h \
- Client/dbus-proxy.h \
- Client/feature.h \
- Client/file-transfer.h \
- Client/media-session-handler.h \
- Client/media-stream-handler.h \
- Client/message.h \
- Client/optional-interface-factory.h \
- Client/pending-account.h \
- Client/pending-channel.h \
- Client/pending-connection.h \
- Client/pending-contact-attributes.h \
- Client/pending-contacts.h \
- Client/pending-handles.h \
- Client/pending-operation.h \
- Client/pending-ready.h \
- Client/pending-string-list.h \
- Client/properties.h \
- Client/readiness-helper.h \
- Client/ready-object.h \
- Client/referenced-handles.h \
- Client/room-list.h \
- Client/simple-pending-operations.h \
- Client/streamed-media-channel.h \
- Client/text-channel.h \
- Client/types.h
-
nodist_geninclude_HEADERS = \
_gen/cli-account.h \
_gen/cli-account-manager.h \
@@ -390,17 +385,16 @@ _gen/cli-%.h _gen/cli-%-body.hpp: _gen/spec-%.xml \
--typesnamespace='Telepathy' \
--headerfile=_gen/cli-$*.h \
--implfile=_gen/cli-$*-body.hpp \
- --realinclude='TelepathyQt4/Client/$*.h' \
- --prettyinclude='TelepathyQt4/Client/'$$prettyinclude \
+ --realinclude='TelepathyQt4/$*.h' \
+ --prettyinclude='TelepathyQt4/'$$prettyinclude \
--specxml=_gen/stable-spec.xml \
--ifacexml=$< \
--extraincludes='<TelepathyQt4/Types>' \
--must-define='IN_TELEPATHY_QT4_HEADER' \
$$mainiface
-Client/_gen/%.moc.hpp: $(srcdir)/Client/%.h _gen/constants.h _gen/types.h
- $(mkdir_p) Client/_gen
+_gen/%.moc.hpp: %.h _gen/constants.h _gen/types.h
$(MOC) $(AM_CPPFLAGS) -i $< -o $@
-_gen/%.moc.hpp: _gen/%.h _gen/constants.h _gen/types.h
+_gen/cli-%.moc.hpp: _gen/cli-%.h _gen/constants.h _gen/types.h
$(MOC) $(AM_CPPFLAGS) -i $< -o $@
diff --git a/TelepathyQt4/Client/MediaSessionHandler b/TelepathyQt4/MediaSessionHandler
similarity index 82%
rename from TelepathyQt4/Client/MediaSessionHandler
rename to TelepathyQt4/MediaSessionHandler
index 7e4d8b5..97a821e 100644
--- a/TelepathyQt4/Client/MediaSessionHandler
+++ b/TelepathyQt4/MediaSessionHandler
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/media-session-handler.h>
+#include <TelepathyQt4/media-session-handler.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/MediaSessionHandlerInterface b/TelepathyQt4/MediaSessionHandlerInterface
similarity index 83%
rename from TelepathyQt4/Client/MediaSessionHandlerInterface
rename to TelepathyQt4/MediaSessionHandlerInterface
index 8ed9889..d0188d7 100644
--- a/TelepathyQt4/Client/MediaSessionHandlerInterface
+++ b/TelepathyQt4/MediaSessionHandlerInterface
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/media-session-handler.h>
+#include <TelepathyQt4/media-session-handler.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/MediaStreamHandler b/TelepathyQt4/MediaStreamHandler
similarity index 82%
rename from TelepathyQt4/Client/MediaStreamHandler
rename to TelepathyQt4/MediaStreamHandler
index 1789bb4..325898e 100644
--- a/TelepathyQt4/Client/MediaStreamHandler
+++ b/TelepathyQt4/MediaStreamHandler
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/media-stream-handler.h>
+#include <TelepathyQt4/media-stream-handler.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/MediaStreamHandlerInterface b/TelepathyQt4/MediaStreamHandlerInterface
similarity index 83%
rename from TelepathyQt4/Client/MediaStreamHandlerInterface
rename to TelepathyQt4/MediaStreamHandlerInterface
index 1af69f7..8f150e0 100644
--- a/TelepathyQt4/Client/MediaStreamHandlerInterface
+++ b/TelepathyQt4/MediaStreamHandlerInterface
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/media-stream-handler.h>
+#include <TelepathyQt4/media-stream-handler.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/Message b/TelepathyQt4/Message
similarity index 85%
rename from TelepathyQt4/Client/Message
rename to TelepathyQt4/Message
index fd4d70f..d26fd08 100644
--- a/TelepathyQt4/Client/Message
+++ b/TelepathyQt4/Message
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/message.h>
+#include <TelepathyQt4/message.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/OptionalInterfaceFactory b/TelepathyQt4/OptionalInterfaceFactory
similarity index 81%
rename from TelepathyQt4/Client/OptionalInterfaceFactory
rename to TelepathyQt4/OptionalInterfaceFactory
index 3523997..3565349 100644
--- a/TelepathyQt4/Client/OptionalInterfaceFactory
+++ b/TelepathyQt4/OptionalInterfaceFactory
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/optional-interface-factory.h>
+#include <TelepathyQt4/optional-interface-factory.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/PeerInterface b/TelepathyQt4/PeerInterface
similarity index 86%
rename from TelepathyQt4/Client/PeerInterface
rename to TelepathyQt4/PeerInterface
index ab1c9ad..407ceba 100644
--- a/TelepathyQt4/Client/PeerInterface
+++ b/TelepathyQt4/PeerInterface
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/dbus.h>
+#include <TelepathyQt4/dbus.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/PendingAccount b/TelepathyQt4/PendingAccount
similarity index 83%
rename from TelepathyQt4/Client/PendingAccount
rename to TelepathyQt4/PendingAccount
index d004255..2c88f79 100644
--- a/TelepathyQt4/Client/PendingAccount
+++ b/TelepathyQt4/PendingAccount
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/pending-account.h>
+#include <TelepathyQt4/pending-account.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/PendingChannel b/TelepathyQt4/PendingChannel
similarity index 83%
rename from TelepathyQt4/Client/PendingChannel
rename to TelepathyQt4/PendingChannel
index 6281696..30c734e 100644
--- a/TelepathyQt4/Client/PendingChannel
+++ b/TelepathyQt4/PendingChannel
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/pending-channel.h>
+#include <TelepathyQt4/pending-channel.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/PendingConnection b/TelepathyQt4/PendingConnection
similarity index 83%
rename from TelepathyQt4/Client/PendingConnection
rename to TelepathyQt4/PendingConnection
index 01d69d4..21a39b8 100644
--- a/TelepathyQt4/Client/PendingConnection
+++ b/TelepathyQt4/PendingConnection
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/pending-connection.h>
+#include <TelepathyQt4/pending-connection.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/PendingContactAttributes b/TelepathyQt4/PendingContactAttributes
similarity index 70%
rename from TelepathyQt4/Client/PendingContactAttributes
rename to TelepathyQt4/PendingContactAttributes
index 719fe21..3c7db75 100644
--- a/TelepathyQt4/Client/PendingContactAttributes
+++ b/TelepathyQt4/PendingContactAttributes
@@ -1,6 +1,6 @@
#ifndef _TelepathyQt4_Client_PendingContactAttributes_HEADER_GUARD_
#define _TelepathyQt4_Client_PendingContactAttributes_HEADER_GUARD_
-#include <TelepathyQt4/Client/pending-contact-attributes.h>
+#include <TelepathyQt4/pending-contact-attributes.h>
#endif
diff --git a/TelepathyQt4/Client/PendingContacts b/TelepathyQt4/PendingContacts
similarity index 83%
rename from TelepathyQt4/Client/PendingContacts
rename to TelepathyQt4/PendingContacts
index 4ba8567..37d746b 100644
--- a/TelepathyQt4/Client/PendingContacts
+++ b/TelepathyQt4/PendingContacts
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/pending-contacts.h>
+#include <TelepathyQt4/pending-contacts.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/PendingFailure b/TelepathyQt4/PendingFailure
similarity index 80%
rename from TelepathyQt4/Client/PendingFailure
rename to TelepathyQt4/PendingFailure
index 05e67fa..0c92583 100644
--- a/TelepathyQt4/Client/PendingFailure
+++ b/TelepathyQt4/PendingFailure
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/simple-pending-operations.h>
+#include <TelepathyQt4/simple-pending-operations.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/PendingHandles b/TelepathyQt4/PendingHandles
similarity index 83%
rename from TelepathyQt4/Client/PendingHandles
rename to TelepathyQt4/PendingHandles
index 3b24823..1a5fbd5 100644
--- a/TelepathyQt4/Client/PendingHandles
+++ b/TelepathyQt4/PendingHandles
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/pending-handles.h>
+#include <TelepathyQt4/pending-handles.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/PendingOperation b/TelepathyQt4/PendingOperation
similarity index 83%
rename from TelepathyQt4/Client/PendingOperation
rename to TelepathyQt4/PendingOperation
index ffddab7..915fedd 100644
--- a/TelepathyQt4/Client/PendingOperation
+++ b/TelepathyQt4/PendingOperation
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/pending-operation.h>
+#include <TelepathyQt4/pending-operation.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/PendingReady b/TelepathyQt4/PendingReady
similarity index 83%
rename from TelepathyQt4/Client/PendingReady
rename to TelepathyQt4/PendingReady
index 135ea8b..e4fe2fa 100644
--- a/TelepathyQt4/Client/PendingReady
+++ b/TelepathyQt4/PendingReady
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/pending-ready.h>
+#include <TelepathyQt4/pending-ready.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/PendingStringList b/TelepathyQt4/PendingStringList
similarity index 82%
rename from TelepathyQt4/Client/PendingStringList
rename to TelepathyQt4/PendingStringList
index 65d95c5..8db445e 100644
--- a/TelepathyQt4/Client/PendingStringList
+++ b/TelepathyQt4/PendingStringList
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/pending-string-list.h>
+#include <TelepathyQt4/pending-string-list.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/PendingSuccess b/TelepathyQt4/PendingSuccess
similarity index 80%
rename from TelepathyQt4/Client/PendingSuccess
rename to TelepathyQt4/PendingSuccess
index 4174b08..598ee94 100644
--- a/TelepathyQt4/Client/PendingSuccess
+++ b/TelepathyQt4/PendingSuccess
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/simple-pending-operations.h>
+#include <TelepathyQt4/simple-pending-operations.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/PendingVoidMethodCall b/TelepathyQt4/PendingVoidMethodCall
similarity index 81%
rename from TelepathyQt4/Client/PendingVoidMethodCall
rename to TelepathyQt4/PendingVoidMethodCall
index cba711a..f0af6b3 100644
--- a/TelepathyQt4/Client/PendingVoidMethodCall
+++ b/TelepathyQt4/PendingVoidMethodCall
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/simple-pending-operations.h>
+#include <TelepathyQt4/simple-pending-operations.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/Properties b/TelepathyQt4/Properties
similarity index 84%
rename from TelepathyQt4/Client/Properties
rename to TelepathyQt4/Properties
index e4be83e..f9ed265 100644
--- a/TelepathyQt4/Client/Properties
+++ b/TelepathyQt4/Properties
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/properties.h>
+#include <TelepathyQt4/properties.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/PropertiesInterface b/TelepathyQt4/PropertiesInterface
similarity index 87%
rename from TelepathyQt4/Client/PropertiesInterface
rename to TelepathyQt4/PropertiesInterface
index b18df7a..c627292 100644
--- a/TelepathyQt4/Client/PropertiesInterface
+++ b/TelepathyQt4/PropertiesInterface
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/dbus.h>
+#include <TelepathyQt4/dbus.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/PropertiesInterfaceInterface b/TelepathyQt4/PropertiesInterfaceInterface
similarity index 86%
rename from TelepathyQt4/Client/PropertiesInterfaceInterface
rename to TelepathyQt4/PropertiesInterfaceInterface
index 6107521..66cc1f3 100644
--- a/TelepathyQt4/Client/PropertiesInterfaceInterface
+++ b/TelepathyQt4/PropertiesInterfaceInterface
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/properties.h>
+#include <TelepathyQt4/properties.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Prototype/Account.cpp b/TelepathyQt4/Prototype/Account.cpp
index 932d178..d316810 100644
--- a/TelepathyQt4/Prototype/Account.cpp
+++ b/TelepathyQt4/Prototype/Account.cpp
@@ -25,8 +25,8 @@
#include <QDebug>
#include <QMetaProperty>
-#include <TelepathyQt4/Client/Account>
-#include <TelepathyQt4/Client/AccountManager>
+#include <TelepathyQt4/Account>
+#include <TelepathyQt4/AccountManager>
#include <TelepathyQt4/Prototype/Connection.h>
#include <TelepathyQt4/Prototype/PresenceManager.h>
diff --git a/TelepathyQt4/Prototype/AccountManager.cpp b/TelepathyQt4/Prototype/AccountManager.cpp
index af1c009..c822db6 100644
--- a/TelepathyQt4/Prototype/AccountManager.cpp
+++ b/TelepathyQt4/Prototype/AccountManager.cpp
@@ -29,8 +29,8 @@
#include <QMap>
#include <QPointer>
-#include <TelepathyQt4/Client/AccountManager>
-#include <TelepathyQt4/Client/DBus>
+#include <TelepathyQt4/AccountManager>
+#include <TelepathyQt4/DBus>
#include <TelepathyQt4/Types>
#include <TelepathyQt4/Prototype/Account.h>
diff --git a/TelepathyQt4/Prototype/AvatarManager.cpp b/TelepathyQt4/Prototype/AvatarManager.cpp
index e296107..1030077 100644
--- a/TelepathyQt4/Prototype/AvatarManager.cpp
+++ b/TelepathyQt4/Prototype/AvatarManager.cpp
@@ -29,7 +29,7 @@
#include <QMap>
#include <QPointer>
-#include <TelepathyQt4/Client/Connection>
+#include <TelepathyQt4/Connection>
#include <TelepathyQt4/Prototype/Account.h>
#include <TelepathyQt4/Prototype/AccountManager.h>
diff --git a/TelepathyQt4/Prototype/CapabilitiesManager.cpp b/TelepathyQt4/Prototype/CapabilitiesManager.cpp
index 526b54c..ef2ed95 100644
--- a/TelepathyQt4/Prototype/CapabilitiesManager.cpp
+++ b/TelepathyQt4/Prototype/CapabilitiesManager.cpp
@@ -29,7 +29,7 @@
#include <QMap>
#include <QPointer>
-#include <TelepathyQt4/Client/Connection>
+#include <TelepathyQt4/Connection>
#include <TelepathyQt4/Prototype/Account.h>
#include <TelepathyQt4/Prototype/AccountManager.h>
diff --git a/TelepathyQt4/Prototype/ChatChannel.cpp b/TelepathyQt4/Prototype/ChatChannel.cpp
index aba3480..1718101 100644
--- a/TelepathyQt4/Prototype/ChatChannel.cpp
+++ b/TelepathyQt4/Prototype/ChatChannel.cpp
@@ -26,8 +26,8 @@
#include <QMetaProperty>
#include <TelepathyQt4/Constants>
-#include <TelepathyQt4/Client/Connection>
-#include <TelepathyQt4/Client/Channel>
+#include <TelepathyQt4/Connection>
+#include <TelepathyQt4/Channel>
#include <TelepathyQt4/Prototype/Contact.h>
diff --git a/TelepathyQt4/Prototype/Connection.cpp b/TelepathyQt4/Prototype/Connection.cpp
index 39e8e12..0cb72e1 100644
--- a/TelepathyQt4/Prototype/Connection.cpp
+++ b/TelepathyQt4/Prototype/Connection.cpp
@@ -25,8 +25,8 @@
#include <QDebug>
#include <QMetaProperty>
-#include <TelepathyQt4/Client/Connection>
-#include <TelepathyQt4/Client/ConnectionManager>
+#include <TelepathyQt4/Connection>
+#include <TelepathyQt4/ConnectionManager>
#include <TelepathyQt4/Prototype/Account.h>
#include <TelepathyQt4/Prototype/AvatarManager.h>
diff --git a/TelepathyQt4/Prototype/ConnectionFacade.cpp b/TelepathyQt4/Prototype/ConnectionFacade.cpp
index 5d805c8..b727e30 100644
--- a/TelepathyQt4/Prototype/ConnectionFacade.cpp
+++ b/TelepathyQt4/Prototype/ConnectionFacade.cpp
@@ -26,8 +26,8 @@
#include <QDebug>
#include <QPointer>
-#include <TelepathyQt4/Client/Connection>
-#include <TelepathyQt4/Client/ConnectionManager>
+#include <TelepathyQt4/Connection>
+#include <TelepathyQt4/ConnectionManager>
#include <TelepathyQt4/Prototype/Account.h>
#include <TelepathyQt4/Prototype/AccountManager.h>
diff --git a/TelepathyQt4/Prototype/Contact.cpp b/TelepathyQt4/Prototype/Contact.cpp
index ef62065..a828497 100644
--- a/TelepathyQt4/Prototype/Contact.cpp
+++ b/TelepathyQt4/Prototype/Contact.cpp
@@ -25,7 +25,7 @@
#include <QDebug>
#include <QMetaProperty>
-#include <TelepathyQt4/Client/Channel>
+#include <TelepathyQt4/Channel>
#include <TelepathyQt4/Constants>
#include <TelepathyQt4/Prototype/ChatChannel.h>
diff --git a/TelepathyQt4/Prototype/Contact.h b/TelepathyQt4/Prototype/Contact.h
index 3dc9bab..b07eef2 100644
--- a/TelepathyQt4/Prototype/Contact.h
+++ b/TelepathyQt4/Prototype/Contact.h
@@ -27,7 +27,7 @@
#include <QPointer>
#include <QVariantMap>
-#include <TelepathyQt4/Client/Channel>
+#include <TelepathyQt4/Channel>
#include <TelepathyQt4/Prototype/AvatarManager.h>
diff --git a/TelepathyQt4/Prototype/ContactManager.cpp b/TelepathyQt4/Prototype/ContactManager.cpp
index b2238ed..af9794b 100644
--- a/TelepathyQt4/Prototype/ContactManager.cpp
+++ b/TelepathyQt4/Prototype/ContactManager.cpp
@@ -32,7 +32,7 @@
#include <QPointer>
#include <QString>
-#include <TelepathyQt4/Client/Channel>
+#include <TelepathyQt4/Channel>
#include <TelepathyQt4/Prototype/ChatChannel.h>
#include <TelepathyQt4/Prototype/ConnectionFacade.h>
diff --git a/TelepathyQt4/Prototype/PresenceManager.cpp b/TelepathyQt4/Prototype/PresenceManager.cpp
index dc90e98..43b7ebc 100644
--- a/TelepathyQt4/Prototype/PresenceManager.cpp
+++ b/TelepathyQt4/Prototype/PresenceManager.cpp
@@ -29,7 +29,7 @@
#include <QMap>
#include <QPointer>
-#include <TelepathyQt4/Client/Connection>
+#include <TelepathyQt4/Connection>
#include <TelepathyQt4/Prototype/Account.h>
#include <TelepathyQt4/Prototype/AccountManager.h>
diff --git a/TelepathyQt4/Prototype/StreamedMediaChannel.cpp b/TelepathyQt4/Prototype/StreamedMediaChannel.cpp
index 41922a9..3f5e6cd 100644
--- a/TelepathyQt4/Prototype/StreamedMediaChannel.cpp
+++ b/TelepathyQt4/Prototype/StreamedMediaChannel.cpp
@@ -24,8 +24,8 @@
#include <QDebug>
#include <QMetaProperty>
-#include <TelepathyQt4/Client/Connection>
-#include <TelepathyQt4/Client/Channel>
+#include <TelepathyQt4/Connection>
+#include <TelepathyQt4/Channel>
// ChannelHandlerInterface and StreamEngineInterface from stream-engine
// 0.5.x, which is currently used as the only media streaming backend.
diff --git a/TelepathyQt4/Prototype/StreamedMediaChannel.h b/TelepathyQt4/Prototype/StreamedMediaChannel.h
index 8a98173..8628a5a 100644
--- a/TelepathyQt4/Prototype/StreamedMediaChannel.h
+++ b/TelepathyQt4/Prototype/StreamedMediaChannel.h
@@ -22,8 +22,8 @@
#ifndef TelepathyQt4_Prototype_StreamedMediaChannel_H_
#define TelepathyQt4_Prototype_StreamedMediaChannel_H_
-#include <TelepathyQt4/Client/Connection>
-#include <TelepathyQt4/Client/Channel>
+#include <TelepathyQt4/Connection>
+#include <TelepathyQt4/Channel>
#include <QObject>
#include <QVariantMap>
diff --git a/TelepathyQt4/Client/ReadinessHelper b/TelepathyQt4/ReadinessHelper
similarity index 83%
rename from TelepathyQt4/Client/ReadinessHelper
rename to TelepathyQt4/ReadinessHelper
index e779b28..1d16096 100644
--- a/TelepathyQt4/Client/ReadinessHelper
+++ b/TelepathyQt4/ReadinessHelper
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/readiness-helper.h>
+#include <TelepathyQt4/readiness-helper.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/ReadyObject b/TelepathyQt4/ReadyObject
similarity index 84%
rename from TelepathyQt4/Client/ReadyObject
rename to TelepathyQt4/ReadyObject
index 37e4419..30ac559 100644
--- a/TelepathyQt4/Client/ReadyObject
+++ b/TelepathyQt4/ReadyObject
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/ready-object.h>
+#include <TelepathyQt4/ready-object.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/ReceivedMessage b/TelepathyQt4/ReceivedMessage
similarity index 85%
rename from TelepathyQt4/Client/ReceivedMessage
rename to TelepathyQt4/ReceivedMessage
index c3b2a76..6ea9887 100644
--- a/TelepathyQt4/Client/ReceivedMessage
+++ b/TelepathyQt4/ReceivedMessage
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/message.h>
+#include <TelepathyQt4/message.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/ReferencedHandles b/TelepathyQt4/ReferencedHandles
similarity index 81%
rename from TelepathyQt4/Client/ReferencedHandles
rename to TelepathyQt4/ReferencedHandles
index e222a56..040459b 100644
--- a/TelepathyQt4/Client/ReferencedHandles
+++ b/TelepathyQt4/ReferencedHandles
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/referenced-handles.h>
+#include <TelepathyQt4/referenced-handles.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/ReferencedHandlesIterator b/TelepathyQt4/ReferencedHandlesIterator
similarity index 73%
rename from TelepathyQt4/Client/ReferencedHandlesIterator
rename to TelepathyQt4/ReferencedHandlesIterator
index 0d5c94a..56d510a 100644
--- a/TelepathyQt4/Client/ReferencedHandlesIterator
+++ b/TelepathyQt4/ReferencedHandlesIterator
@@ -1,6 +1,6 @@
#ifndef _TelepathyQt4_Client_ReferencedHandlesIterator_HEADER_GUARD_
#define _TelepathyQt4_Client_ReferencedHandlesIterator_HEADER_GUARD_
-#include <TelepathyQt4/Client/referenced-handles.h>
+#include <TelepathyQt4/referenced-handles.h>
#endif
diff --git a/TelepathyQt4/Client/RoomList b/TelepathyQt4/RoomList
similarity index 84%
rename from TelepathyQt4/Client/RoomList
rename to TelepathyQt4/RoomList
index 4b0135f..1552461 100644
--- a/TelepathyQt4/Client/RoomList
+++ b/TelepathyQt4/RoomList
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/room-list.h>
+#include <TelepathyQt4/room-list.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/StatefulDBusProxy b/TelepathyQt4/StatefulDBusProxy
similarity index 85%
rename from TelepathyQt4/Client/StatefulDBusProxy
rename to TelepathyQt4/StatefulDBusProxy
index 46bf453..ee0270f 100644
--- a/TelepathyQt4/Client/StatefulDBusProxy
+++ b/TelepathyQt4/StatefulDBusProxy
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/dbus-proxy.h>
+#include <TelepathyQt4/dbus-proxy.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/StatelessDBusProxy b/TelepathyQt4/StatelessDBusProxy
similarity index 85%
rename from TelepathyQt4/Client/StatelessDBusProxy
rename to TelepathyQt4/StatelessDBusProxy
index 35d8d1a..384d9f5 100644
--- a/TelepathyQt4/Client/StatelessDBusProxy
+++ b/TelepathyQt4/StatelessDBusProxy
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/dbus-proxy.h>
+#include <TelepathyQt4/dbus-proxy.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/StreamedMediaChannel b/TelepathyQt4/StreamedMediaChannel
similarity index 82%
rename from TelepathyQt4/Client/StreamedMediaChannel
rename to TelepathyQt4/StreamedMediaChannel
index 234eda2..39a3d27 100644
--- a/TelepathyQt4/Client/StreamedMediaChannel
+++ b/TelepathyQt4/StreamedMediaChannel
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/streamed-media-channel.h>
+#include <TelepathyQt4/streamed-media-channel.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/TextChannel b/TelepathyQt4/TextChannel
similarity index 84%
rename from TelepathyQt4/Client/TextChannel
rename to TelepathyQt4/TextChannel
index 75c18a9..1c36b03 100644
--- a/TelepathyQt4/Client/TextChannel
+++ b/TelepathyQt4/TextChannel
@@ -5,7 +5,7 @@
#define IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/text-channel.h>
+#include <TelepathyQt4/text-channel.h>
#undef IN_TELEPATHY_QT4_HEADER
diff --git a/TelepathyQt4/Client/abstract-interface.cpp b/TelepathyQt4/abstract-interface.cpp
similarity index 94%
rename from TelepathyQt4/Client/abstract-interface.cpp
rename to TelepathyQt4/abstract-interface.cpp
index c4fcbcf..7919fcc 100644
--- a/TelepathyQt4/Client/abstract-interface.cpp
+++ b/TelepathyQt4/abstract-interface.cpp
@@ -18,11 +18,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <TelepathyQt4/Client/AbstractInterface>
+#include <TelepathyQt4/AbstractInterface>
-#include <TelepathyQt4/Client/DBusProxy>
+#include <TelepathyQt4/DBusProxy>
-#include "TelepathyQt4/Client/_gen/abstract-interface.moc.hpp"
+#include "TelepathyQt4/_gen/abstract-interface.moc.hpp"
#include "TelepathyQt4/debug-internal.h"
namespace Telepathy
diff --git a/TelepathyQt4/Client/abstract-interface.h b/TelepathyQt4/abstract-interface.h
similarity index 100%
rename from TelepathyQt4/Client/abstract-interface.h
rename to TelepathyQt4/abstract-interface.h
diff --git a/TelepathyQt4/Client/account-manager.cpp b/TelepathyQt4/account-manager.cpp
similarity index 98%
rename from TelepathyQt4/Client/account-manager.cpp
rename to TelepathyQt4/account-manager.cpp
index 69314ba..8b8c7f2 100644
--- a/TelepathyQt4/Client/account-manager.cpp
+++ b/TelepathyQt4/account-manager.cpp
@@ -19,16 +19,16 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <TelepathyQt4/Client/AccountManager>
+#include <TelepathyQt4/AccountManager>
-#include "TelepathyQt4/Client/_gen/account-manager.moc.hpp"
+#include "TelepathyQt4/_gen/account-manager.moc.hpp"
#include "TelepathyQt4/_gen/cli-account-manager.moc.hpp"
#include "TelepathyQt4/_gen/cli-account-manager-body.hpp"
#include "TelepathyQt4/debug-internal.h"
-#include <TelepathyQt4/Client/PendingAccount>
-#include <TelepathyQt4/Client/PendingReady>
+#include <TelepathyQt4/PendingAccount>
+#include <TelepathyQt4/PendingReady>
#include <TelepathyQt4/Constants>
#include <QQueue>
@@ -145,7 +145,7 @@ void AccountManager::Private::setAccountPaths(QSet<QString> &set,
/**
* \class AccountManager
* \ingroup clientaccount
- * \headerfile <TelepathyQt4/Client/account-manager.h> <TelepathyQt4/Client/AccountManager>
+ * \headerfile <TelepathyQt4/account-manager.h> <TelepathyQt4/AccountManager>
*
* \brief The AccountManager class provides an object representing a
* <a href="http://telepathy.freedesktop.org">Telepathy</a> account manager.
diff --git a/TelepathyQt4/Client/account-manager.h b/TelepathyQt4/account-manager.h
similarity index 91%
rename from TelepathyQt4/Client/account-manager.h
rename to TelepathyQt4/account-manager.h
index 4e3e2ea..0d127b6 100644
--- a/TelepathyQt4/Client/account-manager.h
+++ b/TelepathyQt4/account-manager.h
@@ -28,13 +28,13 @@
#include <TelepathyQt4/_gen/cli-account-manager.h>
-#include <TelepathyQt4/Client/Account>
-#include <TelepathyQt4/Client/DBus>
-#include <TelepathyQt4/Client/DBusProxy>
-#include <TelepathyQt4/Client/OptionalInterfaceFactory>
-#include <TelepathyQt4/Client/ReadinessHelper>
-#include <TelepathyQt4/Client/ReadyObject>
-#include <TelepathyQt4/Client/Types>
+#include <TelepathyQt4/Account>
+#include <TelepathyQt4/DBus>
+#include <TelepathyQt4/DBusProxy>
+#include <TelepathyQt4/OptionalInterfaceFactory>
+#include <TelepathyQt4/ReadinessHelper>
+#include <TelepathyQt4/ReadyObject>
+#include <TelepathyQt4/Types>
#include <TelepathyQt4/SharedPtr>
#include <QDBusObjectPath>
diff --git a/TelepathyQt4/Client/account.cpp b/TelepathyQt4/account.cpp
similarity index 98%
rename from TelepathyQt4/Client/account.cpp
rename to TelepathyQt4/account.cpp
index 72e7757..b75e2ff 100644
--- a/TelepathyQt4/Client/account.cpp
+++ b/TelepathyQt4/account.cpp
@@ -19,19 +19,19 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <TelepathyQt4/Client/Account>
+#include <TelepathyQt4/Account>
-#include "TelepathyQt4/Client/_gen/account.moc.hpp"
+#include "TelepathyQt4/_gen/account.moc.hpp"
#include "TelepathyQt4/_gen/cli-account.moc.hpp"
#include "TelepathyQt4/_gen/cli-account-body.hpp"
#include "TelepathyQt4/debug-internal.h"
-#include <TelepathyQt4/Client/AccountManager>
-#include <TelepathyQt4/Client/ConnectionManager>
-#include <TelepathyQt4/Client/PendingFailure>
-#include <TelepathyQt4/Client/PendingReady>
-#include <TelepathyQt4/Client/PendingVoidMethodCall>
+#include <TelepathyQt4/AccountManager>
+#include <TelepathyQt4/ConnectionManager>
+#include <TelepathyQt4/PendingFailure>
+#include <TelepathyQt4/PendingReady>
+#include <TelepathyQt4/PendingVoidMethodCall>
#include <TelepathyQt4/Constants>
#include <TelepathyQt4/Debug>
@@ -182,7 +182,7 @@ Account::Private::~Private()
/**
* \class Account
* \ingroup clientaccount
- * \headerfile TelepathyQt4/Client/account.h> <TelepathyQt4/Client/Account>
+ * \headerfile TelepathyQt4/account.h> <TelepathyQt4/Account>
*
* Object representing a Telepathy account.
*
diff --git a/TelepathyQt4/Client/account.h b/TelepathyQt4/account.h
similarity index 95%
rename from TelepathyQt4/Client/account.h
rename to TelepathyQt4/account.h
index 7390c5d..ea827ff 100644
--- a/TelepathyQt4/Client/account.h
+++ b/TelepathyQt4/account.h
@@ -28,13 +28,13 @@
#include <TelepathyQt4/_gen/cli-account.h>
-#include <TelepathyQt4/Client/Connection>
-#include <TelepathyQt4/Client/DBus>
-#include <TelepathyQt4/Client/DBusProxy>
-#include <TelepathyQt4/Client/OptionalInterfaceFactory>
-#include <TelepathyQt4/Client/ReadinessHelper>
-#include <TelepathyQt4/Client/ReadyObject>
-#include <TelepathyQt4/Client/Types>
+#include <TelepathyQt4/Connection>
+#include <TelepathyQt4/DBus>
+#include <TelepathyQt4/DBusProxy>
+#include <TelepathyQt4/OptionalInterfaceFactory>
+#include <TelepathyQt4/ReadinessHelper>
+#include <TelepathyQt4/ReadyObject>
+#include <TelepathyQt4/Types>
#include <TelepathyQt4/Constants>
#include <TelepathyQt4/SharedPtr>
diff --git a/TelepathyQt4/Client/channel.cpp b/TelepathyQt4/channel.cpp
similarity index 99%
rename from TelepathyQt4/Client/channel.cpp
rename to TelepathyQt4/channel.cpp
index 4f2cecc..0b40564 100644
--- a/TelepathyQt4/Client/channel.cpp
+++ b/TelepathyQt4/channel.cpp
@@ -19,21 +19,21 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <TelepathyQt4/Client/Channel>
+#include <TelepathyQt4/Channel>
#include "TelepathyQt4/_gen/cli-channel-body.hpp"
#include "TelepathyQt4/_gen/cli-channel.moc.hpp"
-#include "TelepathyQt4/Client/_gen/channel.moc.hpp"
+#include "TelepathyQt4/_gen/channel.moc.hpp"
#include "TelepathyQt4/debug-internal.h"
-#include <TelepathyQt4/Client/Connection>
-#include <TelepathyQt4/Client/ContactManager>
-#include <TelepathyQt4/Client/PendingContacts>
-#include <TelepathyQt4/Client/PendingFailure>
-#include <TelepathyQt4/Client/PendingOperation>
-#include <TelepathyQt4/Client/PendingReady>
-#include <TelepathyQt4/Client/PendingSuccess>
-#include <TelepathyQt4/Client/ReferencedHandles>
+#include <TelepathyQt4/Connection>
+#include <TelepathyQt4/ContactManager>
+#include <TelepathyQt4/PendingContacts>
+#include <TelepathyQt4/PendingFailure>
+#include <TelepathyQt4/PendingOperation>
+#include <TelepathyQt4/PendingReady>
+#include <TelepathyQt4/PendingSuccess>
+#include <TelepathyQt4/ReferencedHandles>
#include <TelepathyQt4/Constants>
#include <QHash>
@@ -919,7 +919,7 @@ void Channel::Private::setReady()
/**
* \class Channel
* \ingroup clientchannel
- * \headerfile <TelepathyQt4/Client/channel.h> <TelepathyQt4/Client/Channel>
+ * \headerfile <TelepathyQt4/channel.h> <TelepathyQt4/Channel>
*
* High-level proxy object for accessing remote %Telepathy %Channel objects.
*
@@ -2234,7 +2234,7 @@ void Channel::continueIntrospection()
/**
* \class Channel::GroupMemberChangeDetails
* \ingroup clientchannel
- * \headerfile TelepathyQt4/Client/channel.h <TelepathyQt4/Client/Channel>
+ * \headerfile TelepathyQt4/channel.h <TelepathyQt4/Channel>
*
* Class opaquely storing information on a group membership change for a
* single member.
diff --git a/TelepathyQt4/Client/channel.h b/TelepathyQt4/channel.h
similarity index 97%
rename from TelepathyQt4/Client/channel.h
rename to TelepathyQt4/channel.h
index 77c75e8..e060fc6 100644
--- a/TelepathyQt4/Client/channel.h
+++ b/TelepathyQt4/channel.h
@@ -29,13 +29,13 @@
#include <TelepathyQt4/_gen/cli-channel.h>
#include <TelepathyQt4/Constants>
-#include <TelepathyQt4/Client/Contact>
-#include <TelepathyQt4/Client/DBus>
-#include <TelepathyQt4/Client/DBusProxy>
-#include <TelepathyQt4/Client/OptionalInterfaceFactory>
-#include <TelepathyQt4/Client/ReadinessHelper>
-#include <TelepathyQt4/Client/ReadyObject>
-#include <TelepathyQt4/Client/Types>
+#include <TelepathyQt4/Contact>
+#include <TelepathyQt4/DBus>
+#include <TelepathyQt4/DBusProxy>
+#include <TelepathyQt4/OptionalInterfaceFactory>
+#include <TelepathyQt4/ReadinessHelper>
+#include <TelepathyQt4/ReadyObject>
+#include <TelepathyQt4/Types>
#include <TelepathyQt4/SharedPtr>
#include <QSet>
diff --git a/TelepathyQt4/Client/connection-internal.h b/TelepathyQt4/connection-internal.h
similarity index 94%
rename from TelepathyQt4/Client/connection-internal.h
rename to TelepathyQt4/connection-internal.h
index 89535fa..6d72cfe 100644
--- a/TelepathyQt4/Client/connection-internal.h
+++ b/TelepathyQt4/connection-internal.h
@@ -22,9 +22,9 @@
#ifndef _TelepathyQt4_cli_connection_internal_h_HEADER_GUARD_
#define _TelepathyQt4_cli_connection_internal_h_HEADER_GUARD_
-#include <TelepathyQt4/Client/Connection>
+#include <TelepathyQt4/Connection>
-#include <TelepathyQt4/Client/PendingReady>
+#include <TelepathyQt4/PendingReady>
#include <QSet>
diff --git a/TelepathyQt4/Client/connection-manager-internal.h b/TelepathyQt4/connection-manager-internal.h
similarity index 98%
rename from TelepathyQt4/Client/connection-manager-internal.h
rename to TelepathyQt4/connection-manager-internal.h
index d205455..e6036fa 100644
--- a/TelepathyQt4/Client/connection-manager-internal.h
+++ b/TelepathyQt4/connection-manager-internal.h
@@ -22,7 +22,7 @@
#ifndef _TelepathyQt4_cli_connection_manager_internal_h_HEADER_GUARD_
#define _TelepathyQt4_cli_connection_manager_internal_h_HEADER_GUARD_
-#include <TelepathyQt4/Client/PendingStringList>
+#include <TelepathyQt4/PendingStringList>
#include <QDBusConnection>
#include <QLatin1String>
diff --git a/TelepathyQt4/Client/connection-manager.cpp b/TelepathyQt4/connection-manager.cpp
similarity index 97%
rename from TelepathyQt4/Client/connection-manager.cpp
rename to TelepathyQt4/connection-manager.cpp
index f803e7f..e988c44 100644
--- a/TelepathyQt4/Client/connection-manager.cpp
+++ b/TelepathyQt4/connection-manager.cpp
@@ -19,19 +19,19 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <TelepathyQt4/Client/ConnectionManager>
-#include "TelepathyQt4/Client/connection-manager-internal.h"
+#include <TelepathyQt4/ConnectionManager>
+#include "TelepathyQt4/connection-manager-internal.h"
#include "TelepathyQt4/_gen/cli-connection-manager-body.hpp"
#include "TelepathyQt4/_gen/cli-connection-manager.moc.hpp"
-#include "TelepathyQt4/Client/_gen/connection-manager.moc.hpp"
-#include "TelepathyQt4/Client/_gen/connection-manager-internal.moc.hpp"
+#include "TelepathyQt4/_gen/connection-manager.moc.hpp"
+#include "TelepathyQt4/_gen/connection-manager-internal.moc.hpp"
#include "TelepathyQt4/debug-internal.h"
-#include <TelepathyQt4/Client/DBus>
-#include <TelepathyQt4/Client/PendingConnection>
-#include <TelepathyQt4/Client/PendingReady>
+#include <TelepathyQt4/DBus>
+#include <TelepathyQt4/PendingConnection>
+#include <TelepathyQt4/PendingReady>
#include <TelepathyQt4/Constants>
#include <TelepathyQt4/ManagerFile>
#include <TelepathyQt4/Types>
@@ -113,7 +113,7 @@ struct ProtocolInfo::Private
/**
* \class ProtocolInfo
* \ingroup clientcm
- * \headerfile TelepathyQt4/Client/connection-manager.h <TelepathyQt4/Client/ConnectionManager>
+ * \headerfile TelepathyQt4/connection-manager.h <TelepathyQt4/ConnectionManager>
*
* Object representing a Telepathy protocol info.
*/
@@ -338,7 +338,7 @@ ProtocolInfo *ConnectionManager::Private::protocol(const QString &protocolName)
/**
* \class ConnectionManager
* \ingroup clientcm
- * \headerfile TelepathyQt4/Client/connection-manager.h <TelepathyQt4/Client/ConnectionManager>
+ * \headerfile TelepathyQt4/connection-manager.h <TelepathyQt4/ConnectionManager>
*
* Object representing a Telepathy connection manager. Connection managers
* allow connections to be made on one or more protocols.
diff --git a/TelepathyQt4/Client/connection-manager.h b/TelepathyQt4/connection-manager.h
similarity index 94%
rename from TelepathyQt4/Client/connection-manager.h
rename to TelepathyQt4/connection-manager.h
index 80801f9..8eec869 100644
--- a/TelepathyQt4/Client/connection-manager.h
+++ b/TelepathyQt4/connection-manager.h
@@ -28,12 +28,12 @@
#include <TelepathyQt4/_gen/cli-connection-manager.h>
-#include <TelepathyQt4/Client/DBus>
-#include <TelepathyQt4/Client/DBusProxy>
-#include <TelepathyQt4/Client/OptionalInterfaceFactory>
-#include <TelepathyQt4/Client/ReadinessHelper>
-#include <TelepathyQt4/Client/ReadyObject>
-#include <TelepathyQt4/Client/Types>
+#include <TelepathyQt4/DBus>
+#include <TelepathyQt4/DBusProxy>
+#include <TelepathyQt4/OptionalInterfaceFactory>
+#include <TelepathyQt4/ReadinessHelper>
+#include <TelepathyQt4/ReadyObject>
+#include <TelepathyQt4/Types>
#include <TelepathyQt4/Constants>
#include <TelepathyQt4/SharedPtr>
diff --git a/TelepathyQt4/Client/connection.cpp b/TelepathyQt4/connection.cpp
similarity index 98%
rename from TelepathyQt4/Client/connection.cpp
rename to TelepathyQt4/connection.cpp
index e08bdf5..0fd12ae 100644
--- a/TelepathyQt4/Client/connection.cpp
+++ b/TelepathyQt4/connection.cpp
@@ -19,25 +19,25 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <TelepathyQt4/Client/Connection>
-#include "TelepathyQt4/Client/connection-internal.h"
+#include <TelepathyQt4/Connection>
+#include "TelepathyQt4/connection-internal.h"
#include "TelepathyQt4/_gen/cli-connection.moc.hpp"
#include "TelepathyQt4/_gen/cli-connection-body.hpp"
-#include "TelepathyQt4/Client/_gen/connection.moc.hpp"
-#include "TelepathyQt4/Client/_gen/connection-internal.moc.hpp"
+#include "TelepathyQt4/_gen/connection.moc.hpp"
+#include "TelepathyQt4/_gen/connection-internal.moc.hpp"
#include "TelepathyQt4/debug-internal.h"
-#include <TelepathyQt4/Client/ContactManager>
-#include <TelepathyQt4/Client/PendingChannel>
-#include <TelepathyQt4/Client/PendingContactAttributes>
-#include <TelepathyQt4/Client/PendingContacts>
-#include <TelepathyQt4/Client/PendingFailure>
-#include <TelepathyQt4/Client/PendingHandles>
-#include <TelepathyQt4/Client/PendingReady>
-#include <TelepathyQt4/Client/PendingVoidMethodCall>
-#include <TelepathyQt4/Client/ReferencedHandles>
+#include <TelepathyQt4/ContactManager>
+#include <TelepathyQt4/PendingChannel>
+#include <TelepathyQt4/PendingContactAttributes>
+#include <TelepathyQt4/PendingContacts>
+#include <TelepathyQt4/PendingFailure>
+#include <TelepathyQt4/PendingHandles>
+#include <TelepathyQt4/PendingReady>
+#include <TelepathyQt4/PendingVoidMethodCall>
+#include <TelepathyQt4/ReferencedHandles>
#include <QMap>
#include <QMetaObject>
@@ -429,7 +429,7 @@ QMutex Connection::Private::handleContextsLock;
/**
* \class Connection
* \ingroup clientconn
- * \headerfile <TelepathyQt4/Client/connection.h> <TelepathyQt4/Client/Connection>
+ * \headerfile <TelepathyQt4/connection.h> <TelepathyQt4/Connection>
*
* Object representing a Telepathy connection.
*
diff --git a/TelepathyQt4/Client/connection.h b/TelepathyQt4/connection.h
similarity index 96%
rename from TelepathyQt4/Client/connection.h
rename to TelepathyQt4/connection.h
index 3c3ce06..3bfb7a6 100644
--- a/TelepathyQt4/Client/connection.h
+++ b/TelepathyQt4/connection.h
@@ -28,13 +28,13 @@
#include <TelepathyQt4/_gen/cli-connection.h>
-#include <TelepathyQt4/Client/Contact>
-#include <TelepathyQt4/Client/DBus>
-#include <TelepathyQt4/Client/DBusProxy>
-#include <TelepathyQt4/Client/OptionalInterfaceFactory>
-#include <TelepathyQt4/Client/ReadinessHelper>
-#include <TelepathyQt4/Client/ReadyObject>
-#include <TelepathyQt4/Client/Types>
+#include <TelepathyQt4/Contact>
+#include <TelepathyQt4/DBus>
+#include <TelepathyQt4/DBusProxy>
+#include <TelepathyQt4/OptionalInterfaceFactory>
+#include <TelepathyQt4/ReadinessHelper>
+#include <TelepathyQt4/ReadyObject>
+#include <TelepathyQt4/Types>
#include <TelepathyQt4/SharedPtr>
#include <TelepathyQt4/Constants>
diff --git a/TelepathyQt4/Client/contact-manager.cpp b/TelepathyQt4/contact-manager.cpp
similarity index 98%
rename from TelepathyQt4/Client/contact-manager.cpp
rename to TelepathyQt4/contact-manager.cpp
index e08f592..73a7f40 100644
--- a/TelepathyQt4/Client/contact-manager.cpp
+++ b/TelepathyQt4/contact-manager.cpp
@@ -19,20 +19,20 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <TelepathyQt4/Client/ContactManager>
-#include "TelepathyQt4/Client/_gen/contact-manager.moc.hpp"
+#include <TelepathyQt4/ContactManager>
+#include "TelepathyQt4/_gen/contact-manager.moc.hpp"
#include <QMap>
#include <QString>
#include <QSet>
#include <QWeakPointer>
-#include <TelepathyQt4/Client/Connection>
-#include <TelepathyQt4/Client/PendingContactAttributes>
-#include <TelepathyQt4/Client/PendingContacts>
-#include <TelepathyQt4/Client/PendingFailure>
-#include <TelepathyQt4/Client/PendingHandles>
-#include <TelepathyQt4/Client/ReferencedHandles>
+#include <TelepathyQt4/Connection>
+#include <TelepathyQt4/PendingContactAttributes>
+#include <TelepathyQt4/PendingContacts>
+#include <TelepathyQt4/PendingFailure>
+#include <TelepathyQt4/PendingHandles>
+#include <TelepathyQt4/ReferencedHandles>
#include "TelepathyQt4/debug-internal.h"
@@ -62,7 +62,7 @@ namespace Client
/**
* \class ContactManager
* \ingroup clientconn
- * \headerfile <TelepathyQt4/Client/contact-manager.h> <TelepathyQt4/Client/ContactManager>
+ * \headerfile <TelepathyQt4/contact-manager.h> <TelepathyQt4/ContactManager>
*/
struct ContactManager::Private
diff --git a/TelepathyQt4/Client/contact-manager.h b/TelepathyQt4/contact-manager.h
similarity index 98%
rename from TelepathyQt4/Client/contact-manager.h
rename to TelepathyQt4/contact-manager.h
index 92614be..9e7025f 100644
--- a/TelepathyQt4/Client/contact-manager.h
+++ b/TelepathyQt4/contact-manager.h
@@ -32,9 +32,9 @@
#include <QSet>
#include <TelepathyQt4/Types>
-#include <TelepathyQt4/Client/Contact>
-#include <TelepathyQt4/Client/Channel>
-#include <TelepathyQt4/Client/ReferencedHandles>
+#include <TelepathyQt4/Contact>
+#include <TelepathyQt4/Channel>
+#include <TelepathyQt4/ReferencedHandles>
namespace Telepathy
{
diff --git a/TelepathyQt4/Client/contact.cpp b/TelepathyQt4/contact.cpp
similarity index 97%
rename from TelepathyQt4/Client/contact.cpp
rename to TelepathyQt4/contact.cpp
index 056396d..0a0274f 100644
--- a/TelepathyQt4/Client/contact.cpp
+++ b/TelepathyQt4/contact.cpp
@@ -19,12 +19,12 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <TelepathyQt4/Client/Contact>
-#include "TelepathyQt4/Client/_gen/contact.moc.hpp"
+#include <TelepathyQt4/Contact>
+#include "TelepathyQt4/_gen/contact.moc.hpp"
-#include <TelepathyQt4/Client/Connection>
-#include <TelepathyQt4/Client/ContactManager>
-#include <TelepathyQt4/Client/ReferencedHandles>
+#include <TelepathyQt4/Connection>
+#include <TelepathyQt4/ContactManager>
+#include <TelepathyQt4/ReferencedHandles>
#include <TelepathyQt4/Constants>
#include "TelepathyQt4/debug-internal.h"
diff --git a/TelepathyQt4/Client/contact.h b/TelepathyQt4/contact.h
similarity index 100%
rename from TelepathyQt4/Client/contact.h
rename to TelepathyQt4/contact.h
diff --git a/TelepathyQt4/Client/dbus-proxy.cpp b/TelepathyQt4/dbus-proxy.cpp
similarity index 96%
rename from TelepathyQt4/Client/dbus-proxy.cpp
rename to TelepathyQt4/dbus-proxy.cpp
index 20e2c11..294e320 100644
--- a/TelepathyQt4/Client/dbus-proxy.cpp
+++ b/TelepathyQt4/dbus-proxy.cpp
@@ -19,9 +19,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <TelepathyQt4/Client/DBusProxy>
+#include <TelepathyQt4/DBusProxy>
-#include "TelepathyQt4/Client/_gen/dbus-proxy.moc.hpp"
+#include "TelepathyQt4/_gen/dbus-proxy.moc.hpp"
#include "TelepathyQt4/debug-internal.h"
@@ -43,7 +43,7 @@ namespace Client
/**
* \class DBusProxy
* \ingroup FIXME: what group is it in?
- * \headerfile TelepathyQt4/Client/dbus-proxy.h <TelepathyQt4/Client/DBusProxy>
+ * \headerfile TelepathyQt4/dbus-proxy.h <TelepathyQt4/DBusProxy>
*
* Base class representing a remote object available over D-Bus.
*
@@ -267,7 +267,7 @@ void DBusProxy::emitInvalidated()
/**
* \class StatefulDBusProxy
* \ingroup FIXME: what group is it in?
- * \headerfile TelepathyQt4/Client/dbus-proxy.h <TelepathyQt4/Client/DBusProxy>
+ * \headerfile TelepathyQt4/dbus-proxy.h <TelepathyQt4/DBusProxy>
*
* Base class representing a remote object whose API is stateful. These
* objects do not remain useful if the service providing them exits or
@@ -320,7 +320,7 @@ void StatefulDBusProxy::onServiceOwnerChanged(const QString &name, const QString
/**
* \class StatelessDBusProxy
* \ingroup FIXME: what group is it in?
- * \headerfile TelepathyQt4/Client/dbus-proxy.h <TelepathyQt4/Client/DBusProxy>
+ * \headerfile TelepathyQt4/dbus-proxy.h <TelepathyQt4/DBusProxy>
*
* Base class representing a remote object whose API is basically stateless.
* These objects can remain valid even if the service providing them exits
diff --git a/TelepathyQt4/Client/dbus-proxy.h b/TelepathyQt4/dbus-proxy.h
similarity index 100%
rename from TelepathyQt4/Client/dbus-proxy.h
rename to TelepathyQt4/dbus-proxy.h
diff --git a/TelepathyQt4/Client/dbus.cpp b/TelepathyQt4/dbus.cpp
similarity index 96%
rename from TelepathyQt4/Client/dbus.cpp
rename to TelepathyQt4/dbus.cpp
index 1f2c9a0..3507b07 100644
--- a/TelepathyQt4/Client/dbus.cpp
+++ b/TelepathyQt4/dbus.cpp
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <TelepathyQt4/Client/DBus>
+#include <TelepathyQt4/DBus>
#include "TelepathyQt4/_gen/cli-dbus-body.hpp"
#include "TelepathyQt4/_gen/cli-dbus.moc.hpp"
diff --git a/TelepathyQt4/Client/dbus.h b/TelepathyQt4/dbus.h
similarity index 100%
rename from TelepathyQt4/Client/dbus.h
rename to TelepathyQt4/dbus.h
diff --git a/TelepathyQt4/Client/feature.cpp b/TelepathyQt4/feature.cpp
similarity index 97%
rename from TelepathyQt4/Client/feature.cpp
rename to TelepathyQt4/feature.cpp
index dee5d3e..5c70a6a 100644
--- a/TelepathyQt4/Client/feature.cpp
+++ b/TelepathyQt4/feature.cpp
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <TelepathyQt4/Client/Feature>
+#include <TelepathyQt4/Feature>
namespace Telepathy
{
diff --git a/TelepathyQt4/Client/feature.h b/TelepathyQt4/feature.h
similarity index 100%
rename from TelepathyQt4/Client/feature.h
rename to TelepathyQt4/feature.h
diff --git a/TelepathyQt4/Client/file-transfer.cpp b/TelepathyQt4/file-transfer.cpp
similarity index 91%
rename from TelepathyQt4/Client/file-transfer.cpp
rename to TelepathyQt4/file-transfer.cpp
index 1cb2703..5732dca 100644
--- a/TelepathyQt4/Client/file-transfer.cpp
+++ b/TelepathyQt4/file-transfer.cpp
@@ -18,12 +18,12 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <TelepathyQt4/Client/FileTransfer>
+#include <TelepathyQt4/FileTransfer>
-#include "TelepathyQt4/Client/_gen/file-transfer.moc.hpp"
+#include "TelepathyQt4/_gen/file-transfer.moc.hpp"
#include "TelepathyQt4/debug-internal.h"
-#include <TelepathyQt4/Client/Connection>
+#include <TelepathyQt4/Connection>
namespace Telepathy
{
@@ -47,7 +47,7 @@ FileTransfer::Private::~Private()
/**
* \class FileTransfer
* \ingroup clientchannel
- * \headerfile TelepathyQt4/Client/file-transfer.h <TelepathyQt4/Client/FileTransfer>
+ * \headerfile TelepathyQt4/file-transfer.h <TelepathyQt4/FileTransfer>
*
* High-level proxy object for accessing remote %Channel objects of the
* FileTransfer channel type. These channels can be used to transfer one file
diff --git a/TelepathyQt4/Client/file-transfer.h b/TelepathyQt4/file-transfer.h
similarity index 97%
rename from TelepathyQt4/Client/file-transfer.h
rename to TelepathyQt4/file-transfer.h
index 0eaace3..5881a90 100644
--- a/TelepathyQt4/Client/file-transfer.h
+++ b/TelepathyQt4/file-transfer.h
@@ -25,7 +25,7 @@
#error IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/Channel>
+#include <TelepathyQt4/Channel>
namespace Telepathy
{
diff --git a/TelepathyQt4/header-compile-test.cpp b/TelepathyQt4/header-compile-test.cpp
index 0c386f0..9b34b14 100644
--- a/TelepathyQt4/header-compile-test.cpp
+++ b/TelepathyQt4/header-compile-test.cpp
@@ -3,16 +3,16 @@
* in the library to verify the generation machinery generates valid C++.
*/
-#include <TelepathyQt4/Client/AccountManager>
-#include <TelepathyQt4/Client/Account>
-#include <TelepathyQt4/Client/Channel>
-#include <TelepathyQt4/Client/Connection>
-#include <TelepathyQt4/Client/ConnectionManager>
-#include <TelepathyQt4/Client/DBus>
-#include <TelepathyQt4/Client/MediaSessionHandler>
-#include <TelepathyQt4/Client/MediaStreamHandler>
-#include <TelepathyQt4/Client/OptionalInterfaceFactory>
-#include <TelepathyQt4/Client/Properties>
-#include <TelepathyQt4/Client/PendingOperation>
+#include <TelepathyQt4/AccountManager>
+#include <TelepathyQt4/Account>
+#include <TelepathyQt4/Channel>
+#include <TelepathyQt4/Connection>
+#include <TelepathyQt4/ConnectionManager>
+#include <TelepathyQt4/DBus>
+#include <TelepathyQt4/MediaSessionHandler>
+#include <TelepathyQt4/MediaStreamHandler>
+#include <TelepathyQt4/OptionalInterfaceFactory>
+#include <TelepathyQt4/Properties>
+#include <TelepathyQt4/PendingOperation>
#include <TelepathyQt4/Constants>
#include <TelepathyQt4/Types>
diff --git a/TelepathyQt4/Client/media-session-handler.cpp b/TelepathyQt4/media-session-handler.cpp
similarity index 95%
rename from TelepathyQt4/Client/media-session-handler.cpp
rename to TelepathyQt4/media-session-handler.cpp
index 5448060..01105d9 100644
--- a/TelepathyQt4/Client/media-session-handler.cpp
+++ b/TelepathyQt4/media-session-handler.cpp
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <TelepathyQt4/Client/MediaSessionHandler>
+#include <TelepathyQt4/MediaSessionHandler>
#include "TelepathyQt4/_gen/cli-media-session-handler-body.hpp"
#include "TelepathyQt4/_gen/cli-media-session-handler.moc.hpp"
diff --git a/TelepathyQt4/Client/media-session-handler.h b/TelepathyQt4/media-session-handler.h
similarity index 100%
rename from TelepathyQt4/Client/media-session-handler.h
rename to TelepathyQt4/media-session-handler.h
diff --git a/TelepathyQt4/Client/media-stream-handler.cpp b/TelepathyQt4/media-stream-handler.cpp
similarity index 95%
rename from TelepathyQt4/Client/media-stream-handler.cpp
rename to TelepathyQt4/media-stream-handler.cpp
index 61eba93..a0bdef0 100644
--- a/TelepathyQt4/Client/media-stream-handler.cpp
+++ b/TelepathyQt4/media-stream-handler.cpp
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <TelepathyQt4/Client/MediaStreamHandler>
+#include <TelepathyQt4/MediaStreamHandler>
#include "TelepathyQt4/_gen/cli-media-stream-handler-body.hpp"
#include "TelepathyQt4/_gen/cli-media-stream-handler.moc.hpp"
diff --git a/TelepathyQt4/Client/media-stream-handler.h b/TelepathyQt4/media-stream-handler.h
similarity index 100%
rename from TelepathyQt4/Client/media-stream-handler.h
rename to TelepathyQt4/media-stream-handler.h
diff --git a/TelepathyQt4/Client/message.cpp b/TelepathyQt4/message.cpp
similarity index 97%
rename from TelepathyQt4/Client/message.cpp
rename to TelepathyQt4/message.cpp
index bdba1c1..f71cb74 100644
--- a/TelepathyQt4/Client/message.cpp
+++ b/TelepathyQt4/message.cpp
@@ -18,14 +18,14 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <TelepathyQt4/Client/Message>
-#include <TelepathyQt4/Client/ReceivedMessage>
+#include <TelepathyQt4/Message>
+#include <TelepathyQt4/ReceivedMessage>
#include <QDateTime>
#include <QPointer>
#include <QSet>
-#include <TelepathyQt4/Client/TextChannel>
+#include <TelepathyQt4/TextChannel>
#include "TelepathyQt4/debug-internal.h"
@@ -120,7 +120,7 @@ void Message::Private::clearSenderHandle()
/**
* \class Message
* \ingroup clientchannel
- * \headerfile <TelepathyQt4/Client/text-channel.h> <TelepathyQt4/Client/TextChannel>
+ * \headerfile <TelepathyQt4/text-channel.h> <TelepathyQt4/TextChannel>
*
* Object representing a message. These objects are implicitly shared, like
* QString.
@@ -422,7 +422,7 @@ MessagePartList Message::parts() const
/**
* \class ReceivedMessage
* \ingroup clientchannel
- * \headerfile <TelepathyQt4/Client/text-channel.h> <TelepathyQt4/Client/TextChannel>
+ * \headerfile <TelepathyQt4/text-channel.h> <TelepathyQt4/TextChannel>
*
* Subclass of Message, with additional information that's generally only
* available on received messages.
diff --git a/TelepathyQt4/Client/message.h b/TelepathyQt4/message.h
similarity index 97%
rename from TelepathyQt4/Client/message.h
rename to TelepathyQt4/message.h
index c6d8496..c8c801e 100644
--- a/TelepathyQt4/Client/message.h
+++ b/TelepathyQt4/message.h
@@ -27,8 +27,8 @@
#include <QSharedDataPointer>
-#include <TelepathyQt4/Client/Contact>
-#include <TelepathyQt4/Client/Types>
+#include <TelepathyQt4/Contact>
+#include <TelepathyQt4/Types>
#include <TelepathyQt4/Constants>
#include <TelepathyQt4/Types>
diff --git a/TelepathyQt4/Client/optional-interface-factory.cpp b/TelepathyQt4/optional-interface-factory.cpp
similarity index 95%
rename from TelepathyQt4/Client/optional-interface-factory.cpp
rename to TelepathyQt4/optional-interface-factory.cpp
index 1326701..def4500 100644
--- a/TelepathyQt4/Client/optional-interface-factory.cpp
+++ b/TelepathyQt4/optional-interface-factory.cpp
@@ -19,9 +19,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <TelepathyQt4/Client/OptionalInterfaceFactory>
+#include <TelepathyQt4/OptionalInterfaceFactory>
-#include <TelepathyQt4/Client/AbstractInterface>
+#include <TelepathyQt4/AbstractInterface>
#include "TelepathyQt4/debug-internal.h"
diff --git a/TelepathyQt4/Client/optional-interface-factory.h b/TelepathyQt4/optional-interface-factory.h
similarity index 97%
rename from TelepathyQt4/Client/optional-interface-factory.h
rename to TelepathyQt4/optional-interface-factory.h
index 8d79efc..cba7ae6 100644
--- a/TelepathyQt4/Client/optional-interface-factory.h
+++ b/TelepathyQt4/optional-interface-factory.h
@@ -77,7 +77,7 @@ class OptionalInterfaceCache
/**
* \class OptionalInterfaceFactory
* \ingroup clientsideproxies
- * \headerfile <TelepathyQt4/Client/optional-interface-factory.h> <TelepathyQt4/Client/OptionalInterfaceFactory>
+ * \headerfile <TelepathyQt4/optional-interface-factory.h> <TelepathyQt4/OptionalInterfaceFactory>
*
* Implementation helper class for high-level proxy classes willing to offer
* access to shared instances of interface proxies for optional interfaces.
diff --git a/TelepathyQt4/Client/pending-account.cpp b/TelepathyQt4/pending-account.cpp
similarity index 95%
rename from TelepathyQt4/Client/pending-account.cpp
rename to TelepathyQt4/pending-account.cpp
index d4fa8ed..4248df1 100644
--- a/TelepathyQt4/Client/pending-account.cpp
+++ b/TelepathyQt4/pending-account.cpp
@@ -19,13 +19,13 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <TelepathyQt4/Client/PendingAccount>
+#include <TelepathyQt4/PendingAccount>
-#include "TelepathyQt4/Client/_gen/pending-account.moc.hpp"
+#include "TelepathyQt4/_gen/pending-account.moc.hpp"
#include "TelepathyQt4/debug-internal.h"
-#include <TelepathyQt4/Client/AccountManager>
+#include <TelepathyQt4/AccountManager>
#include <QDBusObjectPath>
#include <QDBusPendingCallWatcher>
@@ -62,7 +62,7 @@ struct PendingAccount::Private
/**
* \class PendingAccount
* \ingroup clientaccount
- * \headerfile <TelepathyQt4/Client/pending-account.h> <TelepathyQt4/Client/PendingAccount>
+ * \headerfile <TelepathyQt4/pending-account.h> <TelepathyQt4/PendingAccount>
*
* Class containing the parameters of and the reply to an asynchronous account
* request. Instances of this class cannot be constructed directly; the only
diff --git a/TelepathyQt4/Client/pending-account.h b/TelepathyQt4/pending-account.h
similarity index 95%
rename from TelepathyQt4/Client/pending-account.h
rename to TelepathyQt4/pending-account.h
index 0ce1a82..3c60c53 100644
--- a/TelepathyQt4/Client/pending-account.h
+++ b/TelepathyQt4/pending-account.h
@@ -26,8 +26,8 @@
#error IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/Account>
-#include <TelepathyQt4/Client/PendingOperation>
+#include <TelepathyQt4/Account>
+#include <TelepathyQt4/PendingOperation>
#include <QString>
#include <QVariantMap>
diff --git a/TelepathyQt4/Client/pending-channel.cpp b/TelepathyQt4/pending-channel.cpp
similarity index 96%
rename from TelepathyQt4/Client/pending-channel.cpp
rename to TelepathyQt4/pending-channel.cpp
index 28d705a..d1e3663 100644
--- a/TelepathyQt4/Client/pending-channel.cpp
+++ b/TelepathyQt4/pending-channel.cpp
@@ -19,18 +19,18 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <TelepathyQt4/Client/PendingChannel>
+#include <TelepathyQt4/PendingChannel>
-#include "TelepathyQt4/Client/_gen/pending-channel.moc.hpp"
+#include "TelepathyQt4/_gen/pending-channel.moc.hpp"
#include "TelepathyQt4/debug-internal.h"
-#include <TelepathyQt4/Client/Channel>
-#include <TelepathyQt4/Client/Connection>
-#include <TelepathyQt4/Client/FileTransfer>
-#include <TelepathyQt4/Client/RoomList>
-#include <TelepathyQt4/Client/StreamedMediaChannel>
-#include <TelepathyQt4/Client/TextChannel>
+#include <TelepathyQt4/Channel>
+#include <TelepathyQt4/Connection>
+#include <TelepathyQt4/FileTransfer>
+#include <TelepathyQt4/RoomList>
+#include <TelepathyQt4/StreamedMediaChannel>
+#include <TelepathyQt4/TextChannel>
#include <TelepathyQt4/Constants>
/**
@@ -69,7 +69,7 @@ struct PendingChannel::Private
/**
* \class PendingChannel
* \ingroup clientconn
- * \headerfile <TelepathyQt4/Client/pending-channel.h> <TelepathyQt4/Client/PendingChannel>
+ * \headerfile <TelepathyQt4/pending-channel.h> <TelepathyQt4/PendingChannel>
*
* Class containing the parameters of and the reply to an asynchronous channel
* request. Instances of this class cannot be constructed directly; the only way
diff --git a/TelepathyQt4/Client/pending-channel.h b/TelepathyQt4/pending-channel.h
similarity index 96%
rename from TelepathyQt4/Client/pending-channel.h
rename to TelepathyQt4/pending-channel.h
index b63f50d..e16085c 100644
--- a/TelepathyQt4/Client/pending-channel.h
+++ b/TelepathyQt4/pending-channel.h
@@ -26,8 +26,8 @@
#error IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/Channel>
-#include <TelepathyQt4/Client/PendingOperation>
+#include <TelepathyQt4/Channel>
+#include <TelepathyQt4/PendingOperation>
#include <QString>
#include <QVariantMap>
diff --git a/TelepathyQt4/Client/pending-connection.cpp b/TelepathyQt4/pending-connection.cpp
similarity index 95%
rename from TelepathyQt4/Client/pending-connection.cpp
rename to TelepathyQt4/pending-connection.cpp
index 9da61a8..7951b85 100644
--- a/TelepathyQt4/Client/pending-connection.cpp
+++ b/TelepathyQt4/pending-connection.cpp
@@ -19,14 +19,14 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <TelepathyQt4/Client/PendingConnection>
+#include <TelepathyQt4/PendingConnection>
-#include "TelepathyQt4/Client/_gen/pending-connection.moc.hpp"
+#include "TelepathyQt4/_gen/pending-connection.moc.hpp"
#include "TelepathyQt4/debug-internal.h"
-#include <TelepathyQt4/Client/ConnectionManager>
-#include <TelepathyQt4/Client/Connection>
+#include <TelepathyQt4/ConnectionManager>
+#include <TelepathyQt4/Connection>
#include <QDBusObjectPath>
#include <QDBusPendingCallWatcher>
@@ -64,7 +64,7 @@ struct PendingConnection::Private
/**
* \class PendingConnection
* \ingroup clientconnection
- * \headerfile <TelepathyQt4/Client/pending-connection.h> <TelepathyQt4/Client/PendingConnection>
+ * \headerfile <TelepathyQt4/pending-connection.h> <TelepathyQt4/PendingConnection>
*
* Class containing the parameters of and the reply to an asynchronous connection
* request. Instances of this class cannot be constructed directly; the only
diff --git a/TelepathyQt4/Client/pending-connection.h b/TelepathyQt4/pending-connection.h
similarity index 95%
rename from TelepathyQt4/Client/pending-connection.h
rename to TelepathyQt4/pending-connection.h
index 8a8ec34..c295ad3 100644
--- a/TelepathyQt4/Client/pending-connection.h
+++ b/TelepathyQt4/pending-connection.h
@@ -26,8 +26,8 @@
#error IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/Connection>
-#include <TelepathyQt4/Client/PendingOperation>
+#include <TelepathyQt4/Connection>
+#include <TelepathyQt4/PendingOperation>
#include <QString>
#include <QVariantMap>
diff --git a/TelepathyQt4/Client/pending-contact-attributes.cpp b/TelepathyQt4/pending-contact-attributes.cpp
similarity index 95%
rename from TelepathyQt4/Client/pending-contact-attributes.cpp
rename to TelepathyQt4/pending-contact-attributes.cpp
index 64254a6..10e4c38 100644
--- a/TelepathyQt4/Client/pending-contact-attributes.cpp
+++ b/TelepathyQt4/pending-contact-attributes.cpp
@@ -19,12 +19,12 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <TelepathyQt4/Client/PendingContactAttributes>
+#include <TelepathyQt4/PendingContactAttributes>
-#include "TelepathyQt4/Client/_gen/pending-contact-attributes.moc.hpp"
+#include "TelepathyQt4/_gen/pending-contact-attributes.moc.hpp"
-#include <TelepathyQt4/Client/Connection>
-#include <TelepathyQt4/Client/ReferencedHandles>
+#include <TelepathyQt4/Connection>
+#include <TelepathyQt4/ReferencedHandles>
#include "TelepathyQt4/debug-internal.h"
@@ -55,7 +55,7 @@ namespace Client
/**
* \class PendingContactAttributes
* \ingroup clientconn
- * \headerfile <TelepathyQt4/Client/pending-contact-attributes.h> <TelepathyQt4/Client/PendingContactAttributes>
+ * \headerfile <TelepathyQt4/pending-contact-attributes.h> <TelepathyQt4/PendingContactAttributes>
*
* Class containing the parameters of and the reply to an asynchronous request for raw contact
* attributes, as used in the Connection::getContactAttributes() low-level convenience method
diff --git a/TelepathyQt4/Client/pending-contact-attributes.h b/TelepathyQt4/pending-contact-attributes.h
similarity index 96%
rename from TelepathyQt4/Client/pending-contact-attributes.h
rename to TelepathyQt4/pending-contact-attributes.h
index 0234842..f74721c 100644
--- a/TelepathyQt4/Client/pending-contact-attributes.h
+++ b/TelepathyQt4/pending-contact-attributes.h
@@ -30,8 +30,8 @@ class PendingContactAttributes;
}
}
-#include <TelepathyQt4/Client/PendingOperation>
-#include <TelepathyQt4/Client/Types>
+#include <TelepathyQt4/PendingOperation>
+#include <TelepathyQt4/Types>
#include <TelepathyQt4/Constants>
#include <TelepathyQt4/Types>
diff --git a/TelepathyQt4/Client/pending-contacts.cpp b/TelepathyQt4/pending-contacts.cpp
similarity index 97%
rename from TelepathyQt4/Client/pending-contacts.cpp
rename to TelepathyQt4/pending-contacts.cpp
index 086521f..3065af0 100644
--- a/TelepathyQt4/Client/pending-contacts.cpp
+++ b/TelepathyQt4/pending-contacts.cpp
@@ -19,14 +19,14 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <TelepathyQt4/Client/PendingContacts>
-#include "TelepathyQt4/Client/_gen/pending-contacts.moc.hpp"
-
-#include <TelepathyQt4/Client/Connection>
-#include <TelepathyQt4/Client/ContactManager>
-#include <TelepathyQt4/Client/PendingContactAttributes>
-#include <TelepathyQt4/Client/PendingHandles>
-#include <TelepathyQt4/Client/ReferencedHandles>
+#include <TelepathyQt4/PendingContacts>
+#include "TelepathyQt4/_gen/pending-contacts.moc.hpp"
+
+#include <TelepathyQt4/Connection>
+#include <TelepathyQt4/ContactManager>
+#include <TelepathyQt4/PendingContactAttributes>
+#include <TelepathyQt4/PendingHandles>
+#include <TelepathyQt4/ReferencedHandles>
#include "TelepathyQt4/debug-internal.h"
diff --git a/TelepathyQt4/Client/pending-contacts.h b/TelepathyQt4/pending-contacts.h
similarity index 97%
rename from TelepathyQt4/Client/pending-contacts.h
rename to TelepathyQt4/pending-contacts.h
index 2fa6518..41ccdb5 100644
--- a/TelepathyQt4/Client/pending-contacts.h
+++ b/TelepathyQt4/pending-contacts.h
@@ -26,7 +26,7 @@
#error IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/PendingOperation>
+#include <TelepathyQt4/PendingOperation>
#include <QHash>
#include <QList>
@@ -35,7 +35,7 @@
#include <QStringList>
#include <TelepathyQt4/Types>
-#include <TelepathyQt4/Client/Contact>
+#include <TelepathyQt4/Contact>
namespace Telepathy
{
diff --git a/TelepathyQt4/Client/pending-handles.cpp b/TelepathyQt4/pending-handles.cpp
similarity index 98%
rename from TelepathyQt4/Client/pending-handles.cpp
rename to TelepathyQt4/pending-handles.cpp
index 55fe1dd..b9857bf 100644
--- a/TelepathyQt4/Client/pending-handles.cpp
+++ b/TelepathyQt4/pending-handles.cpp
@@ -19,12 +19,12 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <TelepathyQt4/Client/PendingHandles>
+#include <TelepathyQt4/PendingHandles>
-#include "TelepathyQt4/Client/_gen/pending-handles.moc.hpp"
+#include "TelepathyQt4/_gen/pending-handles.moc.hpp"
-#include <TelepathyQt4/Client/Connection>
-#include <TelepathyQt4/Client/ReferencedHandles>
+#include <TelepathyQt4/Connection>
+#include <TelepathyQt4/ReferencedHandles>
#include "TelepathyQt4/debug-internal.h"
@@ -67,7 +67,7 @@ struct PendingHandles::Private
/**
* \class PendingHandles
* \ingroup clientconn
- * \headerfile <TelepathyQt4/Client/pending-handles.h> <TelepathyQt4/Client/PendingHandles>
+ * \headerfile <TelepathyQt4/pending-handles.h> <TelepathyQt4/PendingHandles>
*
* Class containing the parameters of and the reply to an asynchronous handle
* request/hold. Instances of this class cannot be constructed directly; the
diff --git a/TelepathyQt4/Client/pending-handles.h b/TelepathyQt4/pending-handles.h
similarity index 96%
rename from TelepathyQt4/Client/pending-handles.h
rename to TelepathyQt4/pending-handles.h
index 4c73a27..09075e0 100644
--- a/TelepathyQt4/Client/pending-handles.h
+++ b/TelepathyQt4/pending-handles.h
@@ -26,8 +26,8 @@
#error IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/PendingOperation>
-#include <TelepathyQt4/Client/Types>
+#include <TelepathyQt4/PendingOperation>
+#include <TelepathyQt4/Types>
#include <TelepathyQt4/Types>
#include <QHash>
diff --git a/TelepathyQt4/Client/pending-operation.cpp b/TelepathyQt4/pending-operation.cpp
similarity index 96%
rename from TelepathyQt4/Client/pending-operation.cpp
rename to TelepathyQt4/pending-operation.cpp
index cf59827..2ef8576 100644
--- a/TelepathyQt4/Client/pending-operation.cpp
+++ b/TelepathyQt4/pending-operation.cpp
@@ -19,14 +19,14 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <TelepathyQt4/Client/PendingOperation>
+#include <TelepathyQt4/PendingOperation>
#define IN_TELEPATHY_QT4_HEADER
#include "simple-pending-operations.h"
#undef IN_TELEPATHY_QT4_HEADER
-#include "TelepathyQt4/Client/_gen/pending-operation.moc.hpp"
-#include "TelepathyQt4/Client/_gen/simple-pending-operations.moc.hpp"
+#include "TelepathyQt4/_gen/pending-operation.moc.hpp"
+#include "TelepathyQt4/_gen/simple-pending-operations.moc.hpp"
#include "TelepathyQt4/debug-internal.h"
diff --git a/TelepathyQt4/Client/pending-operation.h b/TelepathyQt4/pending-operation.h
similarity index 100%
rename from TelepathyQt4/Client/pending-operation.h
rename to TelepathyQt4/pending-operation.h
diff --git a/TelepathyQt4/Client/pending-ready.cpp b/TelepathyQt4/pending-ready.cpp
similarity index 93%
rename from TelepathyQt4/Client/pending-ready.cpp
rename to TelepathyQt4/pending-ready.cpp
index 11ac046..a76b224 100644
--- a/TelepathyQt4/Client/pending-ready.cpp
+++ b/TelepathyQt4/pending-ready.cpp
@@ -19,9 +19,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <TelepathyQt4/Client/PendingReady>
+#include <TelepathyQt4/PendingReady>
-#include "TelepathyQt4/Client/_gen/pending-ready.moc.hpp"
+#include "TelepathyQt4/_gen/pending-ready.moc.hpp"
#include "TelepathyQt4/debug-internal.h"
@@ -55,7 +55,7 @@ struct PendingReady::Private
/**
* \class PendingReady
- * \headerfile <TelepathyQt4/Client/pending-ready.h> <TelepathyQt4/Client/PendingReady>
+ * \headerfile <TelepathyQt4/pending-ready.h> <TelepathyQt4/PendingReady>
*
* Class containing the features requested and the reply to a request
* for an object to become ready. Instances of this class cannot be
diff --git a/TelepathyQt4/Client/pending-ready.h b/TelepathyQt4/pending-ready.h
similarity index 94%
rename from TelepathyQt4/Client/pending-ready.h
rename to TelepathyQt4/pending-ready.h
index a018959..2936fd7 100644
--- a/TelepathyQt4/Client/pending-ready.h
+++ b/TelepathyQt4/pending-ready.h
@@ -26,8 +26,8 @@
#error IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/PendingOperation>
-#include <TelepathyQt4/Client/ReadinessHelper>
+#include <TelepathyQt4/PendingOperation>
+#include <TelepathyQt4/ReadinessHelper>
#include <QSet>
diff --git a/TelepathyQt4/Client/pending-string-list.cpp b/TelepathyQt4/pending-string-list.cpp
similarity index 87%
rename from TelepathyQt4/Client/pending-string-list.cpp
rename to TelepathyQt4/pending-string-list.cpp
index 4b0a586..1b710f2 100644
--- a/TelepathyQt4/Client/pending-string-list.cpp
+++ b/TelepathyQt4/pending-string-list.cpp
@@ -19,9 +19,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <TelepathyQt4/Client/PendingStringList>
+#include <TelepathyQt4/PendingStringList>
-#include "TelepathyQt4/Client/_gen/pending-string-list.moc.hpp"
+#include "TelepathyQt4/_gen/pending-string-list.moc.hpp"
#include "TelepathyQt4/debug-internal.h"
#include <QDBusPendingReply>
@@ -38,7 +38,7 @@ struct PendingStringList::Private
/**
* \class PendingStringList
- * \headerfile <TelepathyQt4/Client/pending-string-list.h> <TelepathyQt4/Client/PendingStringList>
+ * \headerfile <TelepathyQt4/pending-string-list.h> <TelepathyQt4/PendingStringList>
*/
PendingStringList::PendingStringList(QObject *parent)
diff --git a/TelepathyQt4/Client/pending-string-list.h b/TelepathyQt4/pending-string-list.h
similarity index 97%
rename from TelepathyQt4/Client/pending-string-list.h
rename to TelepathyQt4/pending-string-list.h
index 173660e..1e5797b 100644
--- a/TelepathyQt4/Client/pending-string-list.h
+++ b/TelepathyQt4/pending-string-list.h
@@ -26,7 +26,7 @@
#error IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/PendingOperation>
+#include <TelepathyQt4/PendingOperation>
#include <QStringList>
diff --git a/TelepathyQt4/Client/properties.cpp b/TelepathyQt4/properties.cpp
similarity index 95%
rename from TelepathyQt4/Client/properties.cpp
rename to TelepathyQt4/properties.cpp
index 6b1cc20..609d3db 100644
--- a/TelepathyQt4/Client/properties.cpp
+++ b/TelepathyQt4/properties.cpp
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <TelepathyQt4/Client/Properties>
+#include <TelepathyQt4/Properties>
#include <TelepathyQt4/_gen/cli-properties-body.hpp>
#include <TelepathyQt4/_gen/cli-properties.moc.hpp>
diff --git a/TelepathyQt4/Client/properties.h b/TelepathyQt4/properties.h
similarity index 100%
rename from TelepathyQt4/Client/properties.h
rename to TelepathyQt4/properties.h
diff --git a/TelepathyQt4/Client/readiness-helper.cpp b/TelepathyQt4/readiness-helper.cpp
similarity index 98%
rename from TelepathyQt4/Client/readiness-helper.cpp
rename to TelepathyQt4/readiness-helper.cpp
index f7e415d..aebf54c 100644
--- a/TelepathyQt4/Client/readiness-helper.cpp
+++ b/TelepathyQt4/readiness-helper.cpp
@@ -19,14 +19,14 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <TelepathyQt4/Client/ReadinessHelper>
+#include <TelepathyQt4/ReadinessHelper>
-#include "TelepathyQt4/Client/_gen/readiness-helper.moc.hpp"
+#include "TelepathyQt4/_gen/readiness-helper.moc.hpp"
#include "TelepathyQt4/debug-internal.h"
-#include <TelepathyQt4/Client/DBusProxy>
-#include <TelepathyQt4/Client/PendingReady>
+#include <TelepathyQt4/DBusProxy>
+#include <TelepathyQt4/PendingReady>
#include <TelepathyQt4/Constants>
#include <QDBusError>
diff --git a/TelepathyQt4/Client/readiness-helper.h b/TelepathyQt4/readiness-helper.h
similarity index 99%
rename from TelepathyQt4/Client/readiness-helper.h
rename to TelepathyQt4/readiness-helper.h
index 01e62f2..78b4c17 100644
--- a/TelepathyQt4/Client/readiness-helper.h
+++ b/TelepathyQt4/readiness-helper.h
@@ -26,7 +26,7 @@
#error IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/Feature>
+#include <TelepathyQt4/Feature>
#include <QMap>
#include <QSet>
diff --git a/TelepathyQt4/Client/ready-object.cpp b/TelepathyQt4/ready-object.cpp
similarity index 94%
rename from TelepathyQt4/Client/ready-object.cpp
rename to TelepathyQt4/ready-object.cpp
index 2a05dea..14c7965 100644
--- a/TelepathyQt4/Client/ready-object.cpp
+++ b/TelepathyQt4/ready-object.cpp
@@ -19,12 +19,12 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <TelepathyQt4/Client/ReadyObject>
+#include <TelepathyQt4/ReadyObject>
#include "TelepathyQt4/debug-internal.h"
-#include <TelepathyQt4/Client/PendingReady>
-#include <TelepathyQt4/Client/ReadinessHelper>
+#include <TelepathyQt4/PendingReady>
+#include <TelepathyQt4/ReadinessHelper>
namespace Telepathy
{
@@ -58,7 +58,7 @@ ReadyObject::Private::~Private()
/**
* \class ReadyObject
* \ingroup clientreadiness
- * \headerfile TelepathyQt4/Client/ready-object.h> <TelepathyQt4/Client/ReadyObject>
+ * \headerfile TelepathyQt4/ready-object.h> <TelepathyQt4/ReadyObject>
*/
/**
diff --git a/TelepathyQt4/Client/ready-object.h b/TelepathyQt4/ready-object.h
similarity index 97%
rename from TelepathyQt4/Client/ready-object.h
rename to TelepathyQt4/ready-object.h
index b442861..74460ae 100644
--- a/TelepathyQt4/Client/ready-object.h
+++ b/TelepathyQt4/ready-object.h
@@ -26,7 +26,7 @@
#error IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/Feature>
+#include <TelepathyQt4/Feature>
#include <QObject>
diff --git a/TelepathyQt4/Client/referenced-handles.cpp b/TelepathyQt4/referenced-handles.cpp
similarity index 98%
rename from TelepathyQt4/Client/referenced-handles.cpp
rename to TelepathyQt4/referenced-handles.cpp
index fb2086d..6f75192 100644
--- a/TelepathyQt4/Client/referenced-handles.cpp
+++ b/TelepathyQt4/referenced-handles.cpp
@@ -19,14 +19,14 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <TelepathyQt4/Client/ReferencedHandles>
+#include <TelepathyQt4/ReferencedHandles>
-#include <QPointer>
-#include <QSharedData>
+#include "TelepathyQt4/debug-internal.h"
-#include <TelepathyQt4/Client/Connection>
+#include <TelepathyQt4/Connection>
-#include "../debug-internal.h"
+#include <QPointer>
+#include <QSharedData>
namespace Telepathy
{
diff --git a/TelepathyQt4/Client/referenced-handles.h b/TelepathyQt4/referenced-handles.h
similarity index 98%
rename from TelepathyQt4/Client/referenced-handles.h
rename to TelepathyQt4/referenced-handles.h
index 44ddea8..021720f 100644
--- a/TelepathyQt4/Client/referenced-handles.h
+++ b/TelepathyQt4/referenced-handles.h
@@ -45,7 +45,7 @@
* interfaces.
*/
-#include <TelepathyQt4/Client/Types>
+#include <TelepathyQt4/Types>
#include <TelepathyQt4/Types>
#include <list>
@@ -64,7 +64,7 @@ class Connection;
/**
* \class ReferencedHandles
* \ingroup clientconn
- * \headerfile <TelepathyQt4/Client/referenced-handles.h> <TelepathyQt4/Client/ReferencedHandles>
+ * \headerfile <TelepathyQt4/referenced-handles.h> <TelepathyQt4/ReferencedHandles>
*
* Helper container for safe management of handle lifetimes. Every handle in a
* ReferencedHandles container is guaranteed to be valid (and stay valid, as
diff --git a/TelepathyQt4/Client/room-list.cpp b/TelepathyQt4/room-list.cpp
similarity index 92%
rename from TelepathyQt4/Client/room-list.cpp
rename to TelepathyQt4/room-list.cpp
index b875c58..2c4adaa 100644
--- a/TelepathyQt4/Client/room-list.cpp
+++ b/TelepathyQt4/room-list.cpp
@@ -18,12 +18,12 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <TelepathyQt4/Client/RoomList>
+#include <TelepathyQt4/RoomList>
-#include "TelepathyQt4/Client/_gen/room-list.moc.hpp"
+#include "TelepathyQt4/_gen/room-list.moc.hpp"
#include "TelepathyQt4/debug-internal.h"
-#include <TelepathyQt4/Client/Connection>
+#include <TelepathyQt4/Connection>
namespace Telepathy
{
@@ -47,7 +47,7 @@ RoomList::Private::~Private()
/**
* \class RoomList
* \ingroup clientchannel
- * \headerfile TelepathyQt4/Client/room-list.h <TelepathyQt4/Client/RoomList>
+ * \headerfile TelepathyQt4/room-list.h <TelepathyQt4/RoomList>
*
* High-level proxy object for accessing remote %Channel objects of the RoomList
* channel type.
diff --git a/TelepathyQt4/Client/room-list.h b/TelepathyQt4/room-list.h
similarity index 97%
rename from TelepathyQt4/Client/room-list.h
rename to TelepathyQt4/room-list.h
index 82ca013..9f85771 100644
--- a/TelepathyQt4/Client/room-list.h
+++ b/TelepathyQt4/room-list.h
@@ -25,7 +25,7 @@
#error IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/Channel>
+#include <TelepathyQt4/Channel>
namespace Telepathy
{
diff --git a/TelepathyQt4/Client/simple-pending-operations.h b/TelepathyQt4/simple-pending-operations.h
similarity index 98%
rename from TelepathyQt4/Client/simple-pending-operations.h
rename to TelepathyQt4/simple-pending-operations.h
index 871b25f..209752e 100644
--- a/TelepathyQt4/Client/simple-pending-operations.h
+++ b/TelepathyQt4/simple-pending-operations.h
@@ -28,7 +28,7 @@
#include <QObject>
-#include <TelepathyQt4/Client/PendingOperation>
+#include <TelepathyQt4/PendingOperation>
namespace Telepathy
{
diff --git a/TelepathyQt4/Client/streamed-media-channel.cpp b/TelepathyQt4/streamed-media-channel.cpp
similarity index 98%
rename from TelepathyQt4/Client/streamed-media-channel.cpp
rename to TelepathyQt4/streamed-media-channel.cpp
index a8edebf..1b8e99f 100644
--- a/TelepathyQt4/Client/streamed-media-channel.cpp
+++ b/TelepathyQt4/streamed-media-channel.cpp
@@ -18,17 +18,17 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <TelepathyQt4/Client/StreamedMediaChannel>
+#include <TelepathyQt4/StreamedMediaChannel>
-#include "TelepathyQt4/Client/_gen/streamed-media-channel.moc.hpp"
+#include "TelepathyQt4/_gen/streamed-media-channel.moc.hpp"
#include "TelepathyQt4/debug-internal.h"
-#include <TelepathyQt4/Client/Connection>
-#include <TelepathyQt4/Client/ContactManager>
-#include <TelepathyQt4/Client/PendingContacts>
-#include <TelepathyQt4/Client/PendingReady>
-#include <TelepathyQt4/Client/PendingVoidMethodCall>
+#include <TelepathyQt4/Connection>
+#include <TelepathyQt4/ContactManager>
+#include <TelepathyQt4/PendingContacts>
+#include <TelepathyQt4/PendingReady>
+#include <TelepathyQt4/PendingVoidMethodCall>
#include <QHash>
@@ -503,7 +503,7 @@ void StreamedMediaChannel::Private::introspectStreams(StreamedMediaChannel::Priv
/**
* \class StreamedMediaChannel
* \ingroup clientchannel
- * \headerfile <TelepathyQt4/Client/streamed-media-channel.h> <TelepathyQt4/Client/StreamedMediaChannel>
+ * \headerfile <TelepathyQt4/streamed-media-channel.h> <TelepathyQt4/StreamedMediaChannel>
*
* High-level proxy object for accessing remote %Channel objects of the
* StreamedMedia channel type.
diff --git a/TelepathyQt4/Client/streamed-media-channel.h b/TelepathyQt4/streamed-media-channel.h
similarity index 97%
rename from TelepathyQt4/Client/streamed-media-channel.h
rename to TelepathyQt4/streamed-media-channel.h
index a444a37..bc12783 100644
--- a/TelepathyQt4/Client/streamed-media-channel.h
+++ b/TelepathyQt4/streamed-media-channel.h
@@ -25,9 +25,9 @@
#error IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/Channel>
-#include <TelepathyQt4/Client/PendingOperation>
-#include <TelepathyQt4/Client/Types>
+#include <TelepathyQt4/Channel>
+#include <TelepathyQt4/PendingOperation>
+#include <TelepathyQt4/Types>
#include <TelepathyQt4/SharedPtr>
namespace Telepathy
diff --git a/TelepathyQt4/Client/text-channel.cpp b/TelepathyQt4/text-channel.cpp
similarity index 98%
rename from TelepathyQt4/Client/text-channel.cpp
rename to TelepathyQt4/text-channel.cpp
index 9d268df..95ff88f 100644
--- a/TelepathyQt4/Client/text-channel.cpp
+++ b/TelepathyQt4/text-channel.cpp
@@ -18,19 +18,19 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <TelepathyQt4/Client/TextChannel>
+#include <TelepathyQt4/TextChannel>
#include <QDateTime>
-#include "TelepathyQt4/Client/_gen/text-channel.moc.hpp"
+#include "TelepathyQt4/_gen/text-channel.moc.hpp"
-#include <TelepathyQt4/Client/Connection>
-#include <TelepathyQt4/Client/ContactManager>
-#include <TelepathyQt4/Client/Message>
-#include <TelepathyQt4/Client/PendingContacts>
-#include <TelepathyQt4/Client/PendingReady>
-#include <TelepathyQt4/Client/ReceivedMessage>
-#include <TelepathyQt4/Client/ReferencedHandles>
+#include <TelepathyQt4/Connection>
+#include <TelepathyQt4/ContactManager>
+#include <TelepathyQt4/Message>
+#include <TelepathyQt4/PendingContacts>
+#include <TelepathyQt4/PendingReady>
+#include <TelepathyQt4/ReceivedMessage>
+#include <TelepathyQt4/ReferencedHandles>
#include "TelepathyQt4/debug-internal.h"
@@ -321,7 +321,7 @@ void TextChannel::Private::updateCapabilities()
/**
* \class TextChannel
* \ingroup clientchannel
- * \headerfile <TelepathyQt4/Client/text-channel.h> <TelepathyQt4/Client/TextChannel>
+ * \headerfile <TelepathyQt4/text-channel.h> <TelepathyQt4/TextChannel>
*
* High-level proxy object for accessing remote %Channel objects of the Text
* channel type.
diff --git a/TelepathyQt4/Client/text-channel.h b/TelepathyQt4/text-channel.h
similarity index 98%
rename from TelepathyQt4/Client/text-channel.h
rename to TelepathyQt4/text-channel.h
index 48c56e7..be34088 100644
--- a/TelepathyQt4/Client/text-channel.h
+++ b/TelepathyQt4/text-channel.h
@@ -25,8 +25,8 @@
#error IN_TELEPATHY_QT4_HEADER
#endif
-#include <TelepathyQt4/Client/Channel>
-#include <TelepathyQt4/Client/PendingOperation>
+#include <TelepathyQt4/Channel>
+#include <TelepathyQt4/PendingOperation>
namespace Telepathy
{
diff --git a/TelepathyQt4/types.h b/TelepathyQt4/types.h
index 57fb01c..772ff98 100644
--- a/TelepathyQt4/types.h
+++ b/TelepathyQt4/types.h
@@ -28,4 +28,36 @@
#include <TelepathyQt4/_gen/types.h>
+#include <TelepathyQt4/SharedPtr>
+
+namespace Telepathy
+{
+namespace Client
+{
+
+class Account;
+class AccountManager;
+class Channel;
+class Connection;
+class ConnectionManager;
+class FileTransfer;
+class RoomList;
+class MediaStream;
+class StreamedMediaChannel;
+class TextChannel;
+
+typedef SharedPtr<Account> AccountPtr;
+typedef SharedPtr<AccountManager> AccountManagerPtr;
+typedef SharedPtr<Channel> ChannelPtr;
+typedef SharedPtr<Connection> ConnectionPtr;
+typedef SharedPtr<ConnectionManager> ConnectionManagerPtr;
+typedef SharedPtr<FileTransfer> FileTransferPtr;
+typedef SharedPtr<RoomList> RoomListPtr;
+typedef SharedPtr<MediaStream> MediaStreamPtr;
+typedef SharedPtr<StreamedMediaChannel> StreamedMediaChannelPtr;
+typedef SharedPtr<TextChannel> TextChannelPtr;
+
+} // Telepathy::Client
+} // Telepathy
+
#endif
diff --git a/examples/accounts/account-item.cpp b/examples/accounts/account-item.cpp
index 172fa74..c43ec3b 100644
--- a/examples/accounts/account-item.cpp
+++ b/examples/accounts/account-item.cpp
@@ -21,8 +21,8 @@
#include "account-item.h"
#include "_gen/account-item.moc.hpp"
-#include <TelepathyQt4/Client/AccountManager>
-#include <TelepathyQt4/Client/PendingReady>
+#include <TelepathyQt4/AccountManager>
+#include <TelepathyQt4/PendingReady>
#include <QDebug>
#include <QComboBox>
diff --git a/examples/accounts/account-item.h b/examples/accounts/account-item.h
index be55d26..4438cf6 100644
--- a/examples/accounts/account-item.h
+++ b/examples/accounts/account-item.h
@@ -22,8 +22,8 @@
#define _TelepathyQt4_examples_accounts_account_item_h_HEADER_GUARD_
#include <TelepathyQt4/Types>
-#include <TelepathyQt4/Client/Account>
-#include <TelepathyQt4/Client/Types>
+#include <TelepathyQt4/Account>
+#include <TelepathyQt4/Types>
#include <QString>
diff --git a/examples/accounts/accounts-window.cpp b/examples/accounts/accounts-window.cpp
index abbe4ba..a1e1ed3 100644
--- a/examples/accounts/accounts-window.cpp
+++ b/examples/accounts/accounts-window.cpp
@@ -24,10 +24,10 @@
#include "account-item.h"
#include <TelepathyQt4/Types>
-#include <TelepathyQt4/Client/Account>
-#include <TelepathyQt4/Client/AccountManager>
-#include <TelepathyQt4/Client/PendingOperation>
-#include <TelepathyQt4/Client/PendingReady>
+#include <TelepathyQt4/Account>
+#include <TelepathyQt4/AccountManager>
+#include <TelepathyQt4/PendingOperation>
+#include <TelepathyQt4/PendingReady>
#include <QCheckBox>
#include <QDebug>
diff --git a/examples/accounts/accounts-window.h b/examples/accounts/accounts-window.h
index cdf741b..b6b0660 100644
--- a/examples/accounts/accounts-window.h
+++ b/examples/accounts/accounts-window.h
@@ -23,7 +23,7 @@
#include <QMainWindow>
-#include <TelepathyQt4/Client/Types>
+#include <TelepathyQt4/Types>
namespace Telepathy {
namespace Client {
diff --git a/examples/call/call-handler.cpp b/examples/call/call-handler.cpp
index 73f5c8d..e016357 100644
--- a/examples/call/call-handler.cpp
+++ b/examples/call/call-handler.cpp
@@ -24,14 +24,14 @@
#include "call-widget.h"
-#include <TelepathyQt4/Client/Channel>
-#include <TelepathyQt4/Client/Connection>
-#include <TelepathyQt4/Client/Contact>
-#include <TelepathyQt4/Client/ContactManager>
-#include <TelepathyQt4/Client/PendingChannel>
-#include <TelepathyQt4/Client/PendingReady>
-#include <TelepathyQt4/Client/ReferencedHandles>
-#include <TelepathyQt4/Client/StreamedMediaChannel>
+#include <TelepathyQt4/Channel>
+#include <TelepathyQt4/Connection>
+#include <TelepathyQt4/Contact>
+#include <TelepathyQt4/ContactManager>
+#include <TelepathyQt4/PendingChannel>
+#include <TelepathyQt4/PendingReady>
+#include <TelepathyQt4/ReferencedHandles>
+#include <TelepathyQt4/StreamedMediaChannel>
#include <QDebug>
#include <QMessageBox>
diff --git a/examples/call/call-handler.h b/examples/call/call-handler.h
index 72be3b7..ff75ad7 100644
--- a/examples/call/call-handler.h
+++ b/examples/call/call-handler.h
@@ -24,8 +24,8 @@
#include <QObject>
-#include <TelepathyQt4/Client/Channel>
-#include <TelepathyQt4/Client/Contact>
+#include <TelepathyQt4/Channel>
+#include <TelepathyQt4/Contact>
namespace Telepathy {
namespace Client {
diff --git a/examples/call/call-roster-widget.cpp b/examples/call/call-roster-widget.cpp
index 9478151..06ebb92 100644
--- a/examples/call/call-roster-widget.cpp
+++ b/examples/call/call-roster-widget.cpp
@@ -27,12 +27,12 @@
#include <examples/roster/roster-item.h>
-#include <TelepathyQt4/Client/Connection>
-#include <TelepathyQt4/Client/Contact>
-#include <TelepathyQt4/Client/ContactManager>
-#include <TelepathyQt4/Client/PendingChannel>
-#include <TelepathyQt4/Client/PendingReady>
-#include <TelepathyQt4/Client/StreamedMediaChannel>
+#include <TelepathyQt4/Connection>
+#include <TelepathyQt4/Contact>
+#include <TelepathyQt4/ContactManager>
+#include <TelepathyQt4/PendingChannel>
+#include <TelepathyQt4/PendingReady>
+#include <TelepathyQt4/StreamedMediaChannel>
#include <QAction>
#include <QDebug>
diff --git a/examples/call/call-roster-widget.h b/examples/call/call-roster-widget.h
index b3d3d84..419a340 100644
--- a/examples/call/call-roster-widget.h
+++ b/examples/call/call-roster-widget.h
@@ -22,7 +22,7 @@
#ifndef _TelepathyQt4_examples_call_call_roster_widget_h_HEADER_GUARD_
#define _TelepathyQt4_examples_call_call_roster_widget_h_HEADER_GUARD_
-#include <TelepathyQt4/Client/Contact>
+#include <TelepathyQt4/Contact>
#include <examples/roster/roster-widget.h>
diff --git a/examples/call/call-widget.cpp b/examples/call/call-widget.cpp
index c4d8f88..f947ded 100644
--- a/examples/call/call-widget.cpp
+++ b/examples/call/call-widget.cpp
@@ -24,13 +24,13 @@
#include "video-widget.h"
-#include <TelepathyQt4/Client/Channel>
-#include <TelepathyQt4/Client/Connection>
-#include <TelepathyQt4/Client/Contact>
-#include <TelepathyQt4/Client/ContactManager>
-#include <TelepathyQt4/Client/PendingChannel>
-#include <TelepathyQt4/Client/PendingReady>
-#include <TelepathyQt4/Client/StreamedMediaChannel>
+#include <TelepathyQt4/Channel>
+#include <TelepathyQt4/Connection>
+#include <TelepathyQt4/Contact>
+#include <TelepathyQt4/ContactManager>
+#include <TelepathyQt4/PendingChannel>
+#include <TelepathyQt4/PendingReady>
+#include <TelepathyQt4/StreamedMediaChannel>
#include <QDebug>
#include <QHBoxLayout>
diff --git a/examples/call/call-widget.h b/examples/call/call-widget.h
index 10a8a57..0cd929e 100644
--- a/examples/call/call-widget.h
+++ b/examples/call/call-widget.h
@@ -24,9 +24,9 @@
#include <QWidget>
-#include <TelepathyQt4/Client/Channel>
-#include <TelepathyQt4/Client/Contact>
-#include <TelepathyQt4/Client/StreamedMediaChannel>
+#include <TelepathyQt4/Channel>
+#include <TelepathyQt4/Contact>
+#include <TelepathyQt4/StreamedMediaChannel>
#include <TelepathyQt4/Constants>
#include "farsight-channel.h"
diff --git a/examples/call/call-window.cpp b/examples/call/call-window.cpp
index 972b28c..b997f08 100644
--- a/examples/call/call-window.cpp
+++ b/examples/call/call-window.cpp
@@ -26,12 +26,12 @@
#include "call-roster-widget.h"
#include <TelepathyQt4/Types>
-#include <TelepathyQt4/Client/Connection>
-#include <TelepathyQt4/Client/ConnectionManager>
-#include <TelepathyQt4/Client/PendingConnection>
-#include <TelepathyQt4/Client/PendingOperation>
-#include <TelepathyQt4/Client/PendingReady>
-#include <TelepathyQt4/Client/StreamedMediaChannel>
+#include <TelepathyQt4/Connection>
+#include <TelepathyQt4/ConnectionManager>
+#include <TelepathyQt4/PendingConnection>
+#include <TelepathyQt4/PendingOperation>
+#include <TelepathyQt4/PendingReady>
+#include <TelepathyQt4/StreamedMediaChannel>
#include <QDebug>
diff --git a/examples/call/call-window.h b/examples/call/call-window.h
index 8ebdca6..191b6ce 100644
--- a/examples/call/call-window.h
+++ b/examples/call/call-window.h
@@ -24,7 +24,7 @@
#include <QMainWindow>
-#include <TelepathyQt4/Client/Connection>
+#include <TelepathyQt4/Connection>
#include <TelepathyQt4/Types>
namespace Telepathy {
diff --git a/examples/call/farsight-channel.cpp b/examples/call/farsight-channel.cpp
index 49006aa..b69d15a 100644
--- a/examples/call/farsight-channel.cpp
+++ b/examples/call/farsight-channel.cpp
@@ -30,8 +30,8 @@
#include <telepathy-glib/channel.h>
#include <telepathy-glib/connection.h>
#include <telepathy-glib/dbus.h>
-#include <TelepathyQt4/Client/Connection>
-#include <TelepathyQt4/Client/StreamedMediaChannel>
+#include <TelepathyQt4/Connection>
+#include <TelepathyQt4/StreamedMediaChannel>
namespace Telepathy {
namespace Client {
diff --git a/examples/call/farsight-channel.h b/examples/call/farsight-channel.h
index 0ed81bb..68ac88e 100644
--- a/examples/call/farsight-channel.h
+++ b/examples/call/farsight-channel.h
@@ -22,7 +22,7 @@
#ifndef _TelepathyQt4_examples_call_farsight_channel_h_HEADER_GUARD_
#define _TelepathyQt4_examples_call_farsight_channel_h_HEADER_GUARD_
-#include <TelepathyQt4/Client/Types>
+#include <TelepathyQt4/Types>
#include <QObject>
#include <QMetaType>
diff --git a/examples/extensions/Makefile.am b/examples/extensions/Makefile.am
index a775973..b72a493 100644
--- a/examples/extensions/Makefile.am
+++ b/examples/extensions/Makefile.am
@@ -102,7 +102,7 @@ _gen/cli-connection-body.hpp _gen/cli-connection.h: _gen/connection.xml \
--realinclude='../cli-connection.h' \
--specxml=_gen/all.xml \
--ifacexml=$< \
- --extraincludes='<TelepathyQt4/Client/Connection>,"types.h"' \
+ --extraincludes='<TelepathyQt4/Connection>,"types.h"' \
--mainiface='Telepathy::Client::ConnectionInterface'
%.moc.hpp: %.h _gen/constants.h _gen/types.h
diff --git a/examples/roster/roster-item.h b/examples/roster/roster-item.h
index 8abf05e..48d5a4a 100644
--- a/examples/roster/roster-item.h
+++ b/examples/roster/roster-item.h
@@ -22,7 +22,7 @@
#define _TelepathyQt4_examples_roster_roster_item_h_HEADER_GUARD_
#include <TelepathyQt4/Types>
-#include <TelepathyQt4/Client/Contact>
+#include <TelepathyQt4/Contact>
#include <QListWidgetItem>
#include <QString>
diff --git a/examples/roster/roster-widget.cpp b/examples/roster/roster-widget.cpp
index 0fde9f2..6a01291 100644
--- a/examples/roster/roster-widget.cpp
+++ b/examples/roster/roster-widget.cpp
@@ -24,12 +24,12 @@
#include "roster-item.h"
#include <TelepathyQt4/Types>
-#include <TelepathyQt4/Client/Contact>
-#include <TelepathyQt4/Client/ContactManager>
-#include <TelepathyQt4/Client/PendingConnection>
-#include <TelepathyQt4/Client/PendingContacts>
-#include <TelepathyQt4/Client/PendingOperation>
-#include <TelepathyQt4/Client/PendingReady>
+#include <TelepathyQt4/Contact>
+#include <TelepathyQt4/ContactManager>
+#include <TelepathyQt4/PendingConnection>
+#include <TelepathyQt4/PendingContacts>
+#include <TelepathyQt4/PendingOperation>
+#include <TelepathyQt4/PendingReady>
#include <QAction>
#include <QDebug>
diff --git a/examples/roster/roster-widget.h b/examples/roster/roster-widget.h
index 00bc437..80bc456 100644
--- a/examples/roster/roster-widget.h
+++ b/examples/roster/roster-widget.h
@@ -23,8 +23,8 @@
#include <QWidget>
-#include <TelepathyQt4/Client/Contact>
-#include <TelepathyQt4/Client/Connection>
+#include <TelepathyQt4/Contact>
+#include <TelepathyQt4/Connection>
namespace Telepathy {
namespace Client {
diff --git a/examples/roster/roster-window.cpp b/examples/roster/roster-window.cpp
index 1909ea4..f719306 100644
--- a/examples/roster/roster-window.cpp
+++ b/examples/roster/roster-window.cpp
@@ -24,10 +24,10 @@
#include "roster-widget.h"
#include <TelepathyQt4/Types>
-#include <TelepathyQt4/Client/ConnectionManager>
-#include <TelepathyQt4/Client/PendingConnection>
-#include <TelepathyQt4/Client/PendingOperation>
-#include <TelepathyQt4/Client/PendingReady>
+#include <TelepathyQt4/ConnectionManager>
+#include <TelepathyQt4/PendingConnection>
+#include <TelepathyQt4/PendingOperation>
+#include <TelepathyQt4/PendingReady>
#include <QDebug>
diff --git a/examples/roster/roster-window.h b/examples/roster/roster-window.h
index 5be8e3e..5ba5124 100644
--- a/examples/roster/roster-window.h
+++ b/examples/roster/roster-window.h
@@ -24,7 +24,7 @@
#include <QMainWindow>
#include <QSharedPointer>
-#include <TelepathyQt4/Client/Connection>
+#include <TelepathyQt4/Connection>
namespace Telepathy {
namespace Client {
diff --git a/tests/dbus/account-basics.cpp b/tests/dbus/account-basics.cpp
index 1a716ea..464af92 100644
--- a/tests/dbus/account-basics.cpp
+++ b/tests/dbus/account-basics.cpp
@@ -3,12 +3,12 @@
#include <TelepathyQt4/Debug>
#include <TelepathyQt4/Types>
-#include <TelepathyQt4/Client/Account>
-#include <TelepathyQt4/Client/AccountManager>
-#include <TelepathyQt4/Client/ConnectionManager>
-#include <TelepathyQt4/Client/PendingAccount>
-#include <TelepathyQt4/Client/PendingOperation>
-#include <TelepathyQt4/Client/PendingReady>
+#include <TelepathyQt4/Account>
+#include <TelepathyQt4/AccountManager>
+#include <TelepathyQt4/ConnectionManager>
+#include <TelepathyQt4/PendingAccount>
+#include <TelepathyQt4/PendingOperation>
+#include <TelepathyQt4/PendingReady>
#include <tests/lib/test.h>
diff --git a/tests/dbus/chan-basics.cpp b/tests/dbus/chan-basics.cpp
index a3fd601..2787120 100644
--- a/tests/dbus/chan-basics.cpp
+++ b/tests/dbus/chan-basics.cpp
@@ -5,12 +5,12 @@
#include <QtTest/QtTest>
-#include <TelepathyQt4/Client/Channel>
-#include <TelepathyQt4/Client/Connection>
-#include <TelepathyQt4/Client/PendingChannel>
-#include <TelepathyQt4/Client/PendingHandles>
-#include <TelepathyQt4/Client/PendingReady>
-#include <TelepathyQt4/Client/ReferencedHandles>
+#include <TelepathyQt4/Channel>
+#include <TelepathyQt4/Connection>
+#include <TelepathyQt4/PendingChannel>
+#include <TelepathyQt4/PendingHandles>
+#include <TelepathyQt4/PendingReady>
+#include <TelepathyQt4/ReferencedHandles>
#include <TelepathyQt4/Debug>
#include <telepathy-glib/debug.h>
diff --git a/tests/dbus/chan-group.cpp b/tests/dbus/chan-group.cpp
index 48d9ce7..80a6ff9 100644
--- a/tests/dbus/chan-group.cpp
+++ b/tests/dbus/chan-group.cpp
@@ -5,14 +5,14 @@
#include <QtTest/QtTest>
-#include <TelepathyQt4/Client/Channel>
-#include <TelepathyQt4/Client/Connection>
-#include <TelepathyQt4/Client/ContactManager>
-#include <TelepathyQt4/Client/PendingChannel>
-#include <TelepathyQt4/Client/PendingContacts>
-#include <TelepathyQt4/Client/PendingHandles>
-#include <TelepathyQt4/Client/PendingReady>
-#include <TelepathyQt4/Client/ReferencedHandles>
+#include <TelepathyQt4/Channel>
+#include <TelepathyQt4/Connection>
+#include <TelepathyQt4/ContactManager>
+#include <TelepathyQt4/PendingChannel>
+#include <TelepathyQt4/PendingContacts>
+#include <TelepathyQt4/PendingHandles>
+#include <TelepathyQt4/PendingReady>
+#include <TelepathyQt4/ReferencedHandles>
#include <TelepathyQt4/Debug>
#include <telepathy-glib/debug.h>
diff --git a/tests/dbus/cm-basics.cpp b/tests/dbus/cm-basics.cpp
index 5d3a27f..072fff7 100644
--- a/tests/dbus/cm-basics.cpp
+++ b/tests/dbus/cm-basics.cpp
@@ -5,9 +5,9 @@
#include <QtTest/QtTest>
-#include <TelepathyQt4/Client/ConnectionManager>
-#include <TelepathyQt4/Client/PendingReady>
-#include <TelepathyQt4/Client/PendingStringList>
+#include <TelepathyQt4/ConnectionManager>
+#include <TelepathyQt4/PendingReady>
+#include <TelepathyQt4/PendingStringList>
#include <TelepathyQt4/Debug>
#include <telepathy-glib/dbus.h>
diff --git a/tests/dbus/conn-basics.cpp b/tests/dbus/conn-basics.cpp
index 4b2cc2e..d94df33 100644
--- a/tests/dbus/conn-basics.cpp
+++ b/tests/dbus/conn-basics.cpp
@@ -5,9 +5,9 @@
#include <QtTest/QtTest>
-#include <TelepathyQt4/Client/Connection>
-#include <TelepathyQt4/Client/PendingChannel>
-#include <TelepathyQt4/Client/PendingReady>
+#include <TelepathyQt4/Connection>
+#include <TelepathyQt4/PendingChannel>
+#include <TelepathyQt4/PendingReady>
#include <TelepathyQt4/Debug>
#include <telepathy-glib/debug.h>
diff --git a/tests/dbus/conn-requests.cpp b/tests/dbus/conn-requests.cpp
index a695ce8..79d95b7 100644
--- a/tests/dbus/conn-requests.cpp
+++ b/tests/dbus/conn-requests.cpp
@@ -5,12 +5,12 @@
#include <QtTest/QtTest>
-#include <TelepathyQt4/Client/Channel>
-#include <TelepathyQt4/Client/Connection>
-#include <TelepathyQt4/Client/PendingChannel>
-#include <TelepathyQt4/Client/PendingReady>
-#include <TelepathyQt4/Client/PendingHandles>
-#include <TelepathyQt4/Client/ReferencedHandles>
+#include <TelepathyQt4/Channel>
+#include <TelepathyQt4/Connection>
+#include <TelepathyQt4/PendingChannel>
+#include <TelepathyQt4/PendingReady>
+#include <TelepathyQt4/PendingHandles>
+#include <TelepathyQt4/ReferencedHandles>
#include <TelepathyQt4/Debug>
#include <telepathy-glib/debug.h>
diff --git a/tests/dbus/conn-roster.cpp b/tests/dbus/conn-roster.cpp
index c1808ad..979890b 100644
--- a/tests/dbus/conn-roster.cpp
+++ b/tests/dbus/conn-roster.cpp
@@ -5,12 +5,12 @@
#include <QtTest/QtTest>
-#include <TelepathyQt4/Client/Connection>
-#include <TelepathyQt4/Client/Contact>
-#include <TelepathyQt4/Client/ContactManager>
-#include <TelepathyQt4/Client/PendingChannel>
-#include <TelepathyQt4/Client/PendingContacts>
-#include <TelepathyQt4/Client/PendingReady>
+#include <TelepathyQt4/Connection>
+#include <TelepathyQt4/Contact>
+#include <TelepathyQt4/ContactManager>
+#include <TelepathyQt4/PendingChannel>
+#include <TelepathyQt4/PendingContacts>
+#include <TelepathyQt4/PendingReady>
#include <TelepathyQt4/Debug>
#include <telepathy-glib/debug.h>
diff --git a/tests/dbus/contacts.cpp b/tests/dbus/contacts.cpp
index b68c0df..5044078 100644
--- a/tests/dbus/contacts.cpp
+++ b/tests/dbus/contacts.cpp
@@ -5,13 +5,13 @@
#include <QtDBus>
#include <QtTest>
-#include <TelepathyQt4/Client/Connection>
-#include <TelepathyQt4/Client/Contact>
-#include <TelepathyQt4/Client/ContactManager>
-#include <TelepathyQt4/Client/PendingContacts>
-#include <TelepathyQt4/Client/PendingVoidMethodCall>
-#include <TelepathyQt4/Client/PendingReady>
-#include <TelepathyQt4/Client/ReferencedHandles>
+#include <TelepathyQt4/Connection>
+#include <TelepathyQt4/Contact>
+#include <TelepathyQt4/ContactManager>
+#include <TelepathyQt4/PendingContacts>
+#include <TelepathyQt4/PendingVoidMethodCall>
+#include <TelepathyQt4/PendingReady>
+#include <TelepathyQt4/ReferencedHandles>
#include <TelepathyQt4/Debug>
#include <TelepathyQt4/Types>
diff --git a/tests/dbus/handles.cpp b/tests/dbus/handles.cpp
index 6cd03f4..7e67fb3 100644
--- a/tests/dbus/handles.cpp
+++ b/tests/dbus/handles.cpp
@@ -5,11 +5,11 @@
#include <QtTest/QtTest>
-#include <TelepathyQt4/Client/Connection>
-#include <TelepathyQt4/Client/PendingHandles>
-#include <TelepathyQt4/Client/PendingVoidMethodCall>
-#include <TelepathyQt4/Client/PendingReady>
-#include <TelepathyQt4/Client/ReferencedHandles>
+#include <TelepathyQt4/Connection>
+#include <TelepathyQt4/PendingHandles>
+#include <TelepathyQt4/PendingVoidMethodCall>
+#include <TelepathyQt4/PendingReady>
+#include <TelepathyQt4/ReferencedHandles>
#include <TelepathyQt4/Debug>
#include <telepathy-glib/debug.h>
diff --git a/tests/dbus/stateful-proxy.cpp b/tests/dbus/stateful-proxy.cpp
index 460576f..f099406 100644
--- a/tests/dbus/stateful-proxy.cpp
+++ b/tests/dbus/stateful-proxy.cpp
@@ -25,8 +25,8 @@
#include <TelepathyQt4/Constants>
#include <TelepathyQt4/Debug>
#include <TelepathyQt4/Types>
-#include <TelepathyQt4/Client/DBus>
-#include <TelepathyQt4/Client/StatefulDBusProxy>
+#include <TelepathyQt4/DBus>
+#include <TelepathyQt4/StatefulDBusProxy>
#include "tests/lib/test.h"
diff --git a/tests/dbus/streamed-media-chan.cpp b/tests/dbus/streamed-media-chan.cpp
index e3d92da..a350b82 100644
--- a/tests/dbus/streamed-media-chan.cpp
+++ b/tests/dbus/streamed-media-chan.cpp
@@ -1,12 +1,12 @@
#include <QtCore/QDebug>
#include <QtTest/QtTest>
-#include <TelepathyQt4/Client/Connection>
-#include <TelepathyQt4/Client/ContactManager>
-#include <TelepathyQt4/Client/PendingChannel>
-#include <TelepathyQt4/Client/PendingContacts>
-#include <TelepathyQt4/Client/PendingReady>
-#include <TelepathyQt4/Client/StreamedMediaChannel>
+#include <TelepathyQt4/Connection>
+#include <TelepathyQt4/ContactManager>
+#include <TelepathyQt4/PendingChannel>
+#include <TelepathyQt4/PendingContacts>
+#include <TelepathyQt4/PendingReady>
+#include <TelepathyQt4/StreamedMediaChannel>
#include <TelepathyQt4/Debug>
#include <telepathy-glib/debug.h>
diff --git a/tests/dbus/text-chan.cpp b/tests/dbus/text-chan.cpp
index ab40181..d1ae88b 100644
--- a/tests/dbus/text-chan.cpp
+++ b/tests/dbus/text-chan.cpp
@@ -5,11 +5,11 @@
#include <QtTest/QtTest>
-#include <TelepathyQt4/Client/Connection>
-#include <TelepathyQt4/Client/Message>
-#include <TelepathyQt4/Client/PendingReady>
-#include <TelepathyQt4/Client/ReceivedMessage>
-#include <TelepathyQt4/Client/TextChannel>
+#include <TelepathyQt4/Connection>
+#include <TelepathyQt4/Message>
+#include <TelepathyQt4/PendingReady>
+#include <TelepathyQt4/ReceivedMessage>
+#include <TelepathyQt4/TextChannel>
#include <TelepathyQt4/Debug>
#include <telepathy-glib/debug.h>
diff --git a/tests/lib/test.cpp b/tests/lib/test.cpp
index 1a75bf2..25e858e 100644
--- a/tests/lib/test.cpp
+++ b/tests/lib/test.cpp
@@ -6,8 +6,8 @@
#include <TelepathyQt4/Types>
#include <TelepathyQt4/Debug>
-#include <TelepathyQt4/Client/DBus>
-#include <TelepathyQt4/Client/PendingVoidMethodCall>
+#include <TelepathyQt4/DBus>
+#include <TelepathyQt4/PendingVoidMethodCall>
using Telepathy::Client::PendingOperation;
diff --git a/tests/lib/test.h b/tests/lib/test.h
index cfd55be..eeaed47 100644
--- a/tests/lib/test.h
+++ b/tests/lib/test.h
@@ -2,7 +2,7 @@
#include <QtTest>
-#include <TelepathyQt4/Client/PendingOperation>
+#include <TelepathyQt4/PendingOperation>
#include <TelepathyQt4/Constants>
namespace Telepathy
diff --git a/tests/pinocchio/cm-basics.cpp b/tests/pinocchio/cm-basics.cpp
index 5207cd5..058f543 100644
--- a/tests/pinocchio/cm-basics.cpp
+++ b/tests/pinocchio/cm-basics.cpp
@@ -3,10 +3,10 @@
#include <QtDBus/QtDBus>
-#include <TelepathyQt4/Client/ConnectionManager>
-#include <TelepathyQt4/Client/PendingConnection>
-#include <TelepathyQt4/Client/PendingReady>
-#include <TelepathyQt4/Client/PendingStringList>
+#include <TelepathyQt4/ConnectionManager>
+#include <TelepathyQt4/PendingConnection>
+#include <TelepathyQt4/PendingReady>
+#include <TelepathyQt4/PendingStringList>
#include <tests/pinocchio/lib.h>
diff --git a/tests/pinocchio/conn-basics.cpp b/tests/pinocchio/conn-basics.cpp
index 3712180..f5bcb5d 100644
--- a/tests/pinocchio/conn-basics.cpp
+++ b/tests/pinocchio/conn-basics.cpp
@@ -4,10 +4,10 @@
#include <QtDBus/QtDBus>
#include <TelepathyQt4/Constants>
-#include <TelepathyQt4/Client/DBus>
-#include <TelepathyQt4/Client/Connection>
-#include <TelepathyQt4/Client/ConnectionManager>
-#include <TelepathyQt4/Client/PendingReady>
+#include <TelepathyQt4/DBus>
+#include <TelepathyQt4/Connection>
+#include <TelepathyQt4/ConnectionManager>
+#include <TelepathyQt4/PendingReady>
#include <tests/pinocchio/lib.h>
diff --git a/tests/pinocchio/handles.cpp b/tests/pinocchio/handles.cpp
index 6ac1440..df43fe3 100644
--- a/tests/pinocchio/handles.cpp
+++ b/tests/pinocchio/handles.cpp
@@ -9,11 +9,11 @@
#include <QDBusPendingReply>
#include <TelepathyQt4/Constants>
-#include <TelepathyQt4/Client/Connection>
-#include <TelepathyQt4/Client/ConnectionManager>
-#include <TelepathyQt4/Client/PendingHandles>
-#include <TelepathyQt4/Client/PendingReady>
-#include <TelepathyQt4/Client/ReferencedHandles>
+#include <TelepathyQt4/Connection>
+#include <TelepathyQt4/ConnectionManager>
+#include <TelepathyQt4/PendingHandles>
+#include <TelepathyQt4/PendingReady>
+#include <TelepathyQt4/ReferencedHandles>
#include <tests/pinocchio/lib.h>
diff --git a/tests/pinocchio/lib.cpp b/tests/pinocchio/lib.cpp
index 883e404..8b4f99f 100644
--- a/tests/pinocchio/lib.cpp
+++ b/tests/pinocchio/lib.cpp
@@ -6,7 +6,7 @@
#include <TelepathyQt4/Types>
#include <TelepathyQt4/Debug>
-#include <TelepathyQt4/Client/DBus>
+#include <TelepathyQt4/DBus>
using Telepathy::Client::DBus::DBusDaemonInterface;
using Telepathy::Client::PendingOperation;
diff --git a/tests/pinocchio/lib.h b/tests/pinocchio/lib.h
index 9ddc694..08654ec 100644
--- a/tests/pinocchio/lib.h
+++ b/tests/pinocchio/lib.h
@@ -4,7 +4,7 @@
#include <QtTest/QtTest>
-#include <TelepathyQt4/Client/PendingOperation>
+#include <TelepathyQt4/PendingOperation>
#include <TelepathyQt4/Constants>
#include "tests/lib/test.h"
diff --git a/tests/prototype/prototype.cpp b/tests/prototype/prototype.cpp
index 5b1043d..cf61db5 100644
--- a/tests/prototype/prototype.cpp
+++ b/tests/prototype/prototype.cpp
@@ -10,10 +10,10 @@
#include <QtTest/QSignalSpy>
-#include <TelepathyQt4/Client/Account>
-#include <TelepathyQt4/Client/AccountManager>
-#include <TelepathyQt4/Client/ConnectionManager>
-#include <TelepathyQt4/Client/Connection>
+#include <TelepathyQt4/Account>
+#include <TelepathyQt4/AccountManager>
+#include <TelepathyQt4/ConnectionManager>
+#include <TelepathyQt4/Connection>
#include <TelepathyQt4/Types>
#include <TelepathyQt4/Prototype/Account.h>
diff --git a/tools/qt4-client-gen.py b/tools/qt4-client-gen.py
index 567c66e..0af6e34 100644
--- a/tools/qt4-client-gen.py
+++ b/tools/qt4-client-gen.py
@@ -84,8 +84,8 @@ class Generator(object):
#include <QDBusPendingReply>
-#include <TelepathyQt4/Client/AbstractInterface>
-#include <TelepathyQt4/Client/DBusProxy>
+#include <TelepathyQt4/AbstractInterface>
+#include <TelepathyQt4/DBusProxy>
// basically the same as GLib's G_GNUC_DEPRECATED
#ifndef TELEPATHY_GNUC_DEPRECATED
--
1.5.6.5
More information about the telepathy-commits
mailing list