Renamed TelepathyQt4 directory to TelepathyQt.

36 files changed, 213 insertions, 213 deletions

diff --git a/examples/accounts/account-item.cpp b/examples/accounts/account-item.cpp
index 0ad21373..b533d81a 100644
--- a/examples/accounts/account-item.cpp
+++ b/examples/accounts/account-item.cpp
@@ -1,5 +1,5 @@
 /**
- * This file is part of TelepathyQt4
+ * This file is part of TelepathyQt
  *
  * @copyright Copyright (C) 2009 Collabora Ltd. <http://www.collabora.co.uk/>
  * @license LGPL 2.1
@@ -22,8 +22,8 @@
 #include "account-item.h"
 #include "_gen/account-item.moc.hpp"
 
-#include <TelepathyQt4/AccountManager>
-#include <TelepathyQt4/PendingReady>
+#include <TelepathyQt/AccountManager>
+#include <TelepathyQt/PendingReady>
 
 #include <QDebug>
 #include <QComboBox>
diff --git a/examples/accounts/account-item.h b/examples/accounts/account-item.h
index d4584b21..07b72049 100644
--- a/examples/accounts/account-item.h
+++ b/examples/accounts/account-item.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of TelepathyQt4
+ * This file is part of TelepathyQt
  *
  * @copyright Copyright (C) 2009 Collabora Ltd. <http://www.collabora.co.uk/>
  * @license LGPL 2.1
@@ -19,12 +19,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TelepathyQt4_examples_accounts_account_item_h_HEADER_GUARD_
-#define _TelepathyQt4_examples_accounts_account_item_h_HEADER_GUARD_
+#ifndef _TelepathyQt_examples_accounts_account_item_h_HEADER_GUARD_
+#define _TelepathyQt_examples_accounts_account_item_h_HEADER_GUARD_
 
-#include <TelepathyQt4/Types>
-#include <TelepathyQt4/Account>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Types>
+#include <TelepathyQt/Account>
+#include <TelepathyQt/Types>
 
 #include <QString>
 
diff --git a/examples/accounts/accounts-window.cpp b/examples/accounts/accounts-window.cpp
index fc79b834..442b5b6c 100644
--- a/examples/accounts/accounts-window.cpp
+++ b/examples/accounts/accounts-window.cpp
@@ -1,5 +1,5 @@
 /**
- * This file is part of TelepathyQt4
+ * This file is part of TelepathyQt
  *
  * @copyright Copyright (C) 2009 Collabora Ltd. <http://www.collabora.co.uk/>
  * @license LGPL 2.1
@@ -24,12 +24,12 @@
 
 #include "account-item.h"
 
-#include <TelepathyQt4/Types>
-#include <TelepathyQt4/Account>
-#include <TelepathyQt4/AccountFactory>
-#include <TelepathyQt4/AccountManager>
-#include <TelepathyQt4/PendingOperation>
-#include <TelepathyQt4/PendingReady>
+#include <TelepathyQt/Types>
+#include <TelepathyQt/Account>
+#include <TelepathyQt/AccountFactory>
+#include <TelepathyQt/AccountManager>
+#include <TelepathyQt/PendingOperation>
+#include <TelepathyQt/PendingReady>
 
 #include <QCheckBox>
 #include <QDebug>
diff --git a/examples/accounts/accounts-window.h b/examples/accounts/accounts-window.h
index 28520d17..e47e67cd 100644
--- a/examples/accounts/accounts-window.h
+++ b/examples/accounts/accounts-window.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of TelepathyQt4
+ * This file is part of TelepathyQt
  *
  * @copyright Copyright (C) 2009 Collabora Ltd. <http://www.collabora.co.uk/>
  * @license LGPL 2.1
@@ -19,12 +19,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TelepathyQt4_examples_accounts_accounts_window_h_HEADER_GUARD_
-#define _TelepathyQt4_examples_accounts_accounts_window_h_HEADER_GUARD_
+#ifndef _TelepathyQt_examples_accounts_accounts_window_h_HEADER_GUARD_
+#define _TelepathyQt_examples_accounts_accounts_window_h_HEADER_GUARD_
 
 #include <QMainWindow>
 
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Types>
 
 namespace Tp {
 class PendingOperation;
diff --git a/examples/accounts/main.cpp b/examples/accounts/main.cpp
index a21b62c1..c6d1fc1b 100644
--- a/examples/accounts/main.cpp
+++ b/examples/accounts/main.cpp
@@ -1,6 +1,6 @@
-#include <TelepathyQt4/Debug>
-#include <TelepathyQt4/Constants>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Debug>
+#include <TelepathyQt/Constants>
+#include <TelepathyQt/Types>
 
 #include <QtGui>
 
diff --git a/examples/contact-messenger/sender.cpp b/examples/contact-messenger/sender.cpp
index 02fd3d20..b4791a3a 100644
--- a/examples/contact-messenger/sender.cpp
+++ b/examples/contact-messenger/sender.cpp
@@ -1,5 +1,5 @@
 /**
- * This file is part of TelepathyQt4
+ * This file is part of TelepathyQt
  *
  * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/>
  * @copyright Copyright (C) 2011 Nokia Corporation
@@ -23,12 +23,12 @@
 #include "sender.h"
 #include "_gen/sender.moc.hpp"
 
-#include <TelepathyQt4/Account>
-#include <TelepathyQt4/Debug>
-#include <TelepathyQt4/Constants>
-#include <TelepathyQt4/ContactMessenger>
-#include <TelepathyQt4/PendingSendMessage>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Account>
+#include <TelepathyQt/Debug>
+#include <TelepathyQt/Constants>
+#include <TelepathyQt/ContactMessenger>
+#include <TelepathyQt/PendingSendMessage>
+#include <TelepathyQt/Types>
 
 #include <QCoreApplication>
 
diff --git a/examples/contact-messenger/sender.h b/examples/contact-messenger/sender.h
index 6e363a25..2aae0b5e 100644
--- a/examples/contact-messenger/sender.h
+++ b/examples/contact-messenger/sender.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of TelepathyQt4
+ * This file is part of TelepathyQt
  *
  * @copyright Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/>
  * @copyright Copyright (C) 2011 Nokia Corporation
@@ -20,10 +20,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TelepathyQt4_examples_contact_messenger_sender_h_HEADER_GUARD_
-#define _TelepathyQt4_examples_contact_messenger_sender_h_HEADER_GUARD_
+#ifndef _TelepathyQt_examples_contact_messenger_sender_h_HEADER_GUARD_
+#define _TelepathyQt_examples_contact_messenger_sender_h_HEADER_GUARD_
 
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Types>
 
 #include <QObject>
 #include <QString>
diff --git a/examples/extensions/CMakeLists.txt b/examples/extensions/CMakeLists.txt
index c00e38e2..d3b244b4 100644
--- a/examples/extensions/CMakeLists.txt
+++ b/examples/extensions/CMakeLists.txt
@@ -28,9 +28,9 @@ tpqt_constants_gen(example-extensions-constants ${generated_all_xml} ${CMAKE_CUR
                     DEPENDS example-extensions-includator)
 
 if(MSVC)
-    set(TYPES_INCLUDE ^<TelepathyQt4/Types^>)
+    set(TYPES_INCLUDE ^<TelepathyQt/Types^>)
 else(MSVC)
-    set(TYPES_INCLUDE '<TelepathyQt4/Types>')
+    set(TYPES_INCLUDE '<TelepathyQt/Types>')
 endif(MSVC)
 
 tpqt_types_gen(example-extensions-typesgen ${generated_all_xml}
@@ -44,10 +44,10 @@ tpqt_xincludator(example-extensions-connection-includator ${CMAKE_CURRENT_SOURCE
 
 if(MSVC)
   set(ESCAPED_QUOTES \"\"\")
-  set(connection_include ^<TelepathyQt4/Connection^>)
+  set(connection_include ^<TelepathyQt/Connection^>)
 else(MSVC)
   set(ESCAPED_QUOTES \\\")
-  set(connection_include '<TelepathyQt4/Connection>')
+  set(connection_include '<TelepathyQt/Connection>')
 endif(MSVC)
 
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-connection-body.hpp ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-connection.h
diff --git a/examples/file-transfer/file-receiver-handler.cpp b/examples/file-transfer/file-receiver-handler.cpp
index f4f83d35..fe10c8bd 100644
--- a/examples/file-transfer/file-receiver-handler.cpp
+++ b/examples/file-transfer/file-receiver-handler.cpp
@@ -1,5 +1,5 @@
 /*
- * This file is part of TelepathyQt4
+ * This file is part of TelepathyQt
  *
  * Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/>
  * Copyright (C) 2011 Nokia Corporation
@@ -24,13 +24,13 @@
 
 #include "pending-file-receive.h"
 
-#include <TelepathyQt4/Channel>
-#include <TelepathyQt4/ChannelClassSpec>
-#include <TelepathyQt4/ChannelClassSpecList>
-#include <TelepathyQt4/ChannelRequest>
-#include <TelepathyQt4/Connection>
-#include <TelepathyQt4/MethodInvocationContext>
-#include <TelepathyQt4/IncomingFileTransferChannel>
+#include <TelepathyQt/Channel>
+#include <TelepathyQt/ChannelClassSpec>
+#include <TelepathyQt/ChannelClassSpecList>
+#include <TelepathyQt/ChannelRequest>
+#include <TelepathyQt/Connection>
+#include <TelepathyQt/MethodInvocationContext>
+#include <TelepathyQt/IncomingFileTransferChannel>
 
 #include <QDateTime>
 #include <QDebug>
diff --git a/examples/file-transfer/file-receiver-handler.h b/examples/file-transfer/file-receiver-handler.h
index d34d5610..01091dd9 100644
--- a/examples/file-transfer/file-receiver-handler.h
+++ b/examples/file-transfer/file-receiver-handler.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of TelepathyQt4
+ * This file is part of TelepathyQt
  *
  * Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/>
  * Copyright (C) 2011 Nokia Corporation
@@ -19,13 +19,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TelepathyQt4_examples_file_transfer_file_receiver_handler_h_HEADER_GUARD_
-#define _TelepathyQt4_examples_file_transfer_file_receiver_handler_h_HEADER_GUARD_
+#ifndef _TelepathyQt_examples_file_transfer_file_receiver_handler_h_HEADER_GUARD_
+#define _TelepathyQt_examples_file_transfer_file_receiver_handler_h_HEADER_GUARD_
 
-#include <TelepathyQt4/Account>
-#include <TelepathyQt4/AbstractClientHandler>
-#include <TelepathyQt4/PendingOperation>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Account>
+#include <TelepathyQt/AbstractClientHandler>
+#include <TelepathyQt/PendingOperation>
+#include <TelepathyQt/Types>
 
 using namespace Tp;
 
diff --git a/examples/file-transfer/file-receiver.cpp b/examples/file-transfer/file-receiver.cpp
index 97c9d412..00eb6d62 100644
--- a/examples/file-transfer/file-receiver.cpp
+++ b/examples/file-transfer/file-receiver.cpp
@@ -1,5 +1,5 @@
 /*
- * This file is part of TelepathyQt4
+ * This file is part of TelepathyQt
  *
  * Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/>
  * Copyright (C) 2011 Nokia Corporation
@@ -21,14 +21,14 @@
 
 #include "file-receiver.h"
 
-#include <TelepathyQt4/AccountFactory>
-#include <TelepathyQt4/ChannelFactory>
-#include <TelepathyQt4/ClientRegistrar>
-#include <TelepathyQt4/Connection>
-#include <TelepathyQt4/ConnectionFactory>
-#include <TelepathyQt4/ContactFactory>
-#include <TelepathyQt4/Debug>
-#include <TelepathyQt4/IncomingFileTransferChannel>
+#include <TelepathyQt/AccountFactory>
+#include <TelepathyQt/ChannelFactory>
+#include <TelepathyQt/ClientRegistrar>
+#include <TelepathyQt/Connection>
+#include <TelepathyQt/ConnectionFactory>
+#include <TelepathyQt/ContactFactory>
+#include <TelepathyQt/Debug>
+#include <TelepathyQt/IncomingFileTransferChannel>
 
 #include <QDebug>
 
diff --git a/examples/file-transfer/file-receiver.h b/examples/file-transfer/file-receiver.h
index e1b567b1..e79b6dd1 100644
--- a/examples/file-transfer/file-receiver.h
+++ b/examples/file-transfer/file-receiver.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of TelepathyQt4
+ * This file is part of TelepathyQt
  *
  * Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/>
  * Copyright (C) 2011 Nokia Corporation
@@ -19,11 +19,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TelepathyQt4_examples_file_transfer_file_receiver_h_HEADER_GUARD_
-#define _TelepathyQt4_examples_file_transfer_file_receiver_h_HEADER_GUARD_
+#ifndef _TelepathyQt_examples_file_transfer_file_receiver_h_HEADER_GUARD_
+#define _TelepathyQt_examples_file_transfer_file_receiver_h_HEADER_GUARD_
 
-#include <TelepathyQt4/Constants>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Constants>
+#include <TelepathyQt/Types>
 
 #include "file-receiver-handler.h"
 
diff --git a/examples/file-transfer/file-sender.cpp b/examples/file-transfer/file-sender.cpp
index b0081965..b86971f2 100644
--- a/examples/file-transfer/file-sender.cpp
+++ b/examples/file-transfer/file-sender.cpp
@@ -1,5 +1,5 @@
 /*
- * This file is part of TelepathyQt4
+ * This file is part of TelepathyQt
  *
  * Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/>
  * Copyright (C) 2011 Nokia Corporation
@@ -23,26 +23,26 @@
 
 #include "pending-file-send.h"
 
-#include <TelepathyQt4/Account>
-#include <TelepathyQt4/AccountFactory>
-#include <TelepathyQt4/AccountManager>
-#include <TelepathyQt4/ChannelClassSpec>
-#include <TelepathyQt4/ChannelClassSpecList>
-#include <TelepathyQt4/ChannelFactory>
-#include <TelepathyQt4/ClientRegistrar>
-#include <TelepathyQt4/Connection>
-#include <TelepathyQt4/ConnectionFactory>
-#include <TelepathyQt4/Contact>
-#include <TelepathyQt4/ContactCapabilities>
-#include <TelepathyQt4/ContactFactory>
-#include <TelepathyQt4/ContactManager>
-#include <TelepathyQt4/Debug>
-#include <TelepathyQt4/OutgoingFileTransferChannel>
-#include <TelepathyQt4/PendingChannel>
-#include <TelepathyQt4/PendingChannelRequest>
-#include <TelepathyQt4/PendingContacts>
-#include <TelepathyQt4/PendingOperation>
-#include <TelepathyQt4/PendingReady>
+#include <TelepathyQt/Account>
+#include <TelepathyQt/AccountFactory>
+#include <TelepathyQt/AccountManager>
+#include <TelepathyQt/ChannelClassSpec>
+#include <TelepathyQt/ChannelClassSpecList>
+#include <TelepathyQt/ChannelFactory>
+#include <TelepathyQt/ClientRegistrar>
+#include <TelepathyQt/Connection>
+#include <TelepathyQt/ConnectionFactory>
+#include <TelepathyQt/Contact>
+#include <TelepathyQt/ContactCapabilities>
+#include <TelepathyQt/ContactFactory>
+#include <TelepathyQt/ContactManager>
+#include <TelepathyQt/Debug>
+#include <TelepathyQt/OutgoingFileTransferChannel>
+#include <TelepathyQt/PendingChannel>
+#include <TelepathyQt/PendingChannelRequest>
+#include <TelepathyQt/PendingContacts>
+#include <TelepathyQt/PendingOperation>
+#include <TelepathyQt/PendingReady>
 
 #include <QDebug>
 
diff --git a/examples/file-transfer/file-sender.h b/examples/file-transfer/file-sender.h
index 78bf7447..f6d455ab 100644
--- a/examples/file-transfer/file-sender.h
+++ b/examples/file-transfer/file-sender.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of TelepathyQt4
+ * This file is part of TelepathyQt
  *
  * Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/>
  * Copyright (C) 2011 Nokia Corporation
@@ -19,11 +19,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TelepathyQt4_examples_file_transfer_file_sender_h_HEADER_GUARD_
-#define _TelepathyQt4_examples_file_transfer_file_sender_h_HEADER_GUARD_
+#ifndef _TelepathyQt_examples_file_transfer_file_sender_h_HEADER_GUARD_
+#define _TelepathyQt_examples_file_transfer_file_sender_h_HEADER_GUARD_
 
-#include <TelepathyQt4/Constants>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Constants>
+#include <TelepathyQt/Types>
 
 using namespace Tp;
 
diff --git a/examples/file-transfer/pending-file-receive.cpp b/examples/file-transfer/pending-file-receive.cpp
index 75e04770..fd30aa91 100644
--- a/examples/file-transfer/pending-file-receive.cpp
+++ b/examples/file-transfer/pending-file-receive.cpp
@@ -1,5 +1,5 @@
 /*
- * This file is part of TelepathyQt4
+ * This file is part of TelepathyQt
  *
  * Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/>
  * Copyright (C) 2011 Nokia Corporation
@@ -22,9 +22,9 @@
 #include "pending-file-receive.h"
 #include "_gen/pending-file-receive.moc.hpp"
 
-#include <TelepathyQt4/Account>
-#include <TelepathyQt4/Channel>
-#include <TelepathyQt4/IncomingFileTransferChannel>
+#include <TelepathyQt/Account>
+#include <TelepathyQt/Channel>
+#include <TelepathyQt/IncomingFileTransferChannel>
 
 #include <QDebug>
 #include <QFile>
diff --git a/examples/file-transfer/pending-file-receive.h b/examples/file-transfer/pending-file-receive.h
index 198e8d2f..14f64c0c 100644
--- a/examples/file-transfer/pending-file-receive.h
+++ b/examples/file-transfer/pending-file-receive.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of TelepathyQt4
+ * This file is part of TelepathyQt
  *
  * Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/>
  * Copyright (C) 2011 Nokia Corporation
@@ -19,12 +19,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TelepathyQt4_examples_file_transfer_pending_file_receive_h_HEADER_GUARD_
-#define _TelepathyQt4_examples_file_transfer_pending_file_receive_h_HEADER_GUARD_
+#ifndef _TelepathyQt_examples_file_transfer_pending_file_receive_h_HEADER_GUARD_
+#define _TelepathyQt_examples_file_transfer_pending_file_receive_h_HEADER_GUARD_
 
-#include <TelepathyQt4/PendingOperation>
-#include <TelepathyQt4/IncomingFileTransferChannel>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/PendingOperation>
+#include <TelepathyQt/IncomingFileTransferChannel>
+#include <TelepathyQt/Types>
 
 #include "pending-file-transfer.h"
 
diff --git a/examples/file-transfer/pending-file-send.cpp b/examples/file-transfer/pending-file-send.cpp
index aeb4aa97..18f92c11 100644
--- a/examples/file-transfer/pending-file-send.cpp
+++ b/examples/file-transfer/pending-file-send.cpp
@@ -1,5 +1,5 @@
 /*
- * This file is part of TelepathyQt4
+ * This file is part of TelepathyQt
  *
  * Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/>
  * Copyright (C) 2011 Nokia Corporation
@@ -22,9 +22,9 @@
 #include "pending-file-send.h"
 #include "_gen/pending-file-send.moc.hpp"
 
-#include <TelepathyQt4/Account>
-#include <TelepathyQt4/Channel>
-#include <TelepathyQt4/OutgoingFileTransferChannel>
+#include <TelepathyQt/Account>
+#include <TelepathyQt/Channel>
+#include <TelepathyQt/OutgoingFileTransferChannel>
 
 #include <QDebug>
 #include <QFile>
diff --git a/examples/file-transfer/pending-file-send.h b/examples/file-transfer/pending-file-send.h
index a5dc1224..40edcf73 100644
--- a/examples/file-transfer/pending-file-send.h
+++ b/examples/file-transfer/pending-file-send.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of TelepathyQt4
+ * This file is part of TelepathyQt
  *
  * Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/>
  * Copyright (C) 2011 Nokia Corporation
@@ -19,12 +19,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TelepathyQt4_examples_file_transfer_pending_file_send_h_HEADER_GUARD_
-#define _TelepathyQt4_examples_file_transfer_pending_file_send_h_HEADER_GUARD_
+#ifndef _TelepathyQt_examples_file_transfer_pending_file_send_h_HEADER_GUARD_
+#define _TelepathyQt_examples_file_transfer_pending_file_send_h_HEADER_GUARD_
 
-#include <TelepathyQt4/PendingOperation>
-#include <TelepathyQt4/OutgoingFileTransferChannel>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/PendingOperation>
+#include <TelepathyQt/OutgoingFileTransferChannel>
+#include <TelepathyQt/Types>
 
 #include "pending-file-transfer.h"
 
diff --git a/examples/file-transfer/pending-file-transfer.cpp b/examples/file-transfer/pending-file-transfer.cpp
index a8a9ec52..1789ed33 100644
--- a/examples/file-transfer/pending-file-transfer.cpp
+++ b/examples/file-transfer/pending-file-transfer.cpp
@@ -1,5 +1,5 @@
 /*
- * This file is part of TelepathyQt4
+ * This file is part of TelepathyQt
  *
  * Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/>
  * Copyright (C) 2011 Nokia Corporation
@@ -22,9 +22,9 @@
 #include "pending-file-transfer.h"
 #include "_gen/pending-file-transfer.moc.hpp"
 
-#include <TelepathyQt4/Account>
-#include <TelepathyQt4/Channel>
-#include <TelepathyQt4/OutgoingFileTransferChannel>
+#include <TelepathyQt/Account>
+#include <TelepathyQt/Channel>
+#include <TelepathyQt/OutgoingFileTransferChannel>
 
 #include <QDebug>
 #include <QFile>
diff --git a/examples/file-transfer/pending-file-transfer.h b/examples/file-transfer/pending-file-transfer.h
index 34393223..d1481969 100644
--- a/examples/file-transfer/pending-file-transfer.h
+++ b/examples/file-transfer/pending-file-transfer.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of TelepathyQt4
+ * This file is part of TelepathyQt
  *
  * Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/>
  * Copyright (C) 2011 Nokia Corporation
@@ -19,12 +19,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TelepathyQt4_examples_file_transfer_pending_file_transfer_h_HEADER_GUARD_
-#define _TelepathyQt4_examples_file_transfer_pending_file_transfer_h_HEADER_GUARD_
+#ifndef _TelepathyQt_examples_file_transfer_pending_file_transfer_h_HEADER_GUARD_
+#define _TelepathyQt_examples_file_transfer_pending_file_transfer_h_HEADER_GUARD_
 
-#include <TelepathyQt4/PendingOperation>
-#include <TelepathyQt4/OutgoingFileTransferChannel>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/PendingOperation>
+#include <TelepathyQt/OutgoingFileTransferChannel>
+#include <TelepathyQt/Types>
 
 using namespace Tp;
 
diff --git a/examples/protocols/cm-wrapper.cpp b/examples/protocols/cm-wrapper.cpp
index b8122b53..f4e2ffbe 100644
--- a/examples/protocols/cm-wrapper.cpp
+++ b/examples/protocols/cm-wrapper.cpp
@@ -1,5 +1,5 @@
 /**
- * This file is part of TelepathyQt4
+ * This file is part of TelepathyQt
  *
  * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/>
  * @copyright Copyright (C) 2010 Nokia Corporation
@@ -23,9 +23,9 @@
 #include "cm-wrapper.h"
 #include "_gen/cm-wrapper.moc.hpp"
 
-#include <TelepathyQt4/Debug>
-#include <TelepathyQt4/ConnectionManager>
-#include <TelepathyQt4/PendingReady>
+#include <TelepathyQt/Debug>
+#include <TelepathyQt/ConnectionManager>
+#include <TelepathyQt/PendingReady>
 
 #include <QDebug>
 
diff --git a/examples/protocols/cm-wrapper.h b/examples/protocols/cm-wrapper.h
index a95778fe..63867ca0 100644
--- a/examples/protocols/cm-wrapper.h
+++ b/examples/protocols/cm-wrapper.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of TelepathyQt4
+ * This file is part of TelepathyQt
  *
  * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/>
  * @copyright Copyright (C) 2010 Nokia Corporation
@@ -20,10 +20,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TelepathyQt4_examples_protocols_cm_wrapper_h_HEADER_GUARD_
-#define _TelepathyQt4_examples_protocols_cm_wrapper_h_HEADER_GUARD_
+#ifndef _TelepathyQt_examples_protocols_cm_wrapper_h_HEADER_GUARD_
+#define _TelepathyQt_examples_protocols_cm_wrapper_h_HEADER_GUARD_
 
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Types>
 
 #include <QObject>
 #include <QString>
diff --git a/examples/protocols/main.cpp b/examples/protocols/main.cpp
index eed72c23..16d27fb5 100644
--- a/examples/protocols/main.cpp
+++ b/examples/protocols/main.cpp
@@ -1,6 +1,6 @@
-#include <TelepathyQt4/Debug>
-#include <TelepathyQt4/Constants>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Debug>
+#include <TelepathyQt/Constants>
+#include <TelepathyQt/Types>
 
 #include <QDebug>
 #include <QtCore>
diff --git a/examples/protocols/protocols.cpp b/examples/protocols/protocols.cpp
index 1ccffe22..897724bc 100644
--- a/examples/protocols/protocols.cpp
+++ b/examples/protocols/protocols.cpp
@@ -1,5 +1,5 @@
 /**
- * This file is part of TelepathyQt4
+ * This file is part of TelepathyQt
  *
  * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/>
  * @copyright Copyright (C) 2010 Nokia Corporation
@@ -23,9 +23,9 @@
 #include "protocols.h"
 #include "_gen/protocols.moc.hpp"
 
-#include <TelepathyQt4/Debug>
-#include <TelepathyQt4/ConnectionManager>
-#include <TelepathyQt4/PendingStringList>
+#include <TelepathyQt/Debug>
+#include <TelepathyQt/ConnectionManager>
+#include <TelepathyQt/PendingStringList>
 
 #include <QCoreApplication>
 #include <QDebug>
diff --git a/examples/protocols/protocols.h b/examples/protocols/protocols.h
index 896fe17a..bef2c086 100644
--- a/examples/protocols/protocols.h
+++ b/examples/protocols/protocols.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of TelepathyQt4
+ * This file is part of TelepathyQt
  *
  * @copyright Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/>
  * @copyright Copyright (C) 2010 Nokia Corporation
@@ -20,10 +20,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TelepathyQt4_examples_protocols_protocols_h_HEADER_GUARD_
-#define _TelepathyQt4_examples_protocols_protocols_h_HEADER_GUARD_
+#ifndef _TelepathyQt_examples_protocols_protocols_h_HEADER_GUARD_
+#define _TelepathyQt_examples_protocols_protocols_h_HEADER_GUARD_
 
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Types>
 
 #include "cm-wrapper.h"
 
diff --git a/examples/roster/main.cpp b/examples/roster/main.cpp
index 0ae8158d..d3d9d4e5 100644
--- a/examples/roster/main.cpp
+++ b/examples/roster/main.cpp
@@ -1,5 +1,5 @@
 /**
- * This file is part of TelepathyQt4
+ * This file is part of TelepathyQt
  *
  * @copyright Copyright (C) 2009-2011 Collabora Ltd. <http://www.collabora.co.uk/>
  * @license LGPL 2.1
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <TelepathyQt4/Debug>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Debug>
+#include <TelepathyQt/Types>
 
 #include <QDebug>
 #include <QtGui>
diff --git a/examples/roster/roster-item.cpp b/examples/roster/roster-item.cpp
index 25110f50..3b98e849 100644
--- a/examples/roster/roster-item.cpp
+++ b/examples/roster/roster-item.cpp
@@ -1,5 +1,5 @@
 /**
- * This file is part of TelepathyQt4
+ * This file is part of TelepathyQt
  *
  * @copyright Copyright (C) 2009-2011 Collabora Ltd. <http://www.collabora.co.uk/>
  * @license LGPL 2.1
@@ -22,7 +22,7 @@
 #include "roster-item.h"
 #include "_gen/roster-item.moc.hpp"
 
-#include <TelepathyQt4/Presence>
+#include <TelepathyQt/Presence>
 
 using namespace Tp;
 
diff --git a/examples/roster/roster-item.h b/examples/roster/roster-item.h
index aeaf30aa..af047ce6 100644
--- a/examples/roster/roster-item.h
+++ b/examples/roster/roster-item.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of TelepathyQt4
+ * This file is part of TelepathyQt
  *
  * @copyright Copyright (C) 2009 Collabora Ltd. <http://www.collabora.co.uk/>
  * @license LGPL 2.1
@@ -19,11 +19,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TelepathyQt4_examples_roster_roster_item_h_HEADER_GUARD_
-#define _TelepathyQt4_examples_roster_roster_item_h_HEADER_GUARD_
+#ifndef _TelepathyQt_examples_roster_roster_item_h_HEADER_GUARD_
+#define _TelepathyQt_examples_roster_roster_item_h_HEADER_GUARD_
 
-#include <TelepathyQt4/Types>
-#include <TelepathyQt4/Contact>
+#include <TelepathyQt/Types>
+#include <TelepathyQt/Contact>
 
 #include <QListWidgetItem>
 #include <QString>
diff --git a/examples/roster/roster-widget.cpp b/examples/roster/roster-widget.cpp
index 21b7526f..14bce332 100644
--- a/examples/roster/roster-widget.cpp
+++ b/examples/roster/roster-widget.cpp
@@ -1,5 +1,5 @@
 /**
- * This file is part of TelepathyQt4
+ * This file is part of TelepathyQt
  *
  * @copyright Copyright (C) 2009-2011 Collabora Ltd. <http://www.collabora.co.uk/>
  * @license LGPL 2.1
@@ -24,13 +24,13 @@
 
 #include "roster-item.h"
 
-#include <TelepathyQt4/Types>
-#include <TelepathyQt4/Contact>
-#include <TelepathyQt4/ContactManager>
-#include <TelepathyQt4/PendingConnection>
-#include <TelepathyQt4/PendingContacts>
-#include <TelepathyQt4/PendingOperation>
-#include <TelepathyQt4/PendingReady>
+#include <TelepathyQt/Types>
+#include <TelepathyQt/Contact>
+#include <TelepathyQt/ContactManager>
+#include <TelepathyQt/PendingConnection>
+#include <TelepathyQt/PendingContacts>
+#include <TelepathyQt/PendingOperation>
+#include <TelepathyQt/PendingReady>
 
 #include <QAction>
 #include <QDebug>
diff --git a/examples/roster/roster-widget.h b/examples/roster/roster-widget.h
index d485ec50..7dc52958 100644
--- a/examples/roster/roster-widget.h
+++ b/examples/roster/roster-widget.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of TelepathyQt4
+ * This file is part of TelepathyQt
  *
  * @copyright Copyright (C) 2009-2011 Collabora Ltd. <http://www.collabora.co.uk/>
  * @license LGPL 2.1
@@ -19,13 +19,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TelepathyQt4_examples_roster_roster_widget_h_HEADER_GUARD_
-#define _TelepathyQt4_examples_roster_roster_widget_h_HEADER_GUARD_
+#ifndef _TelepathyQt_examples_roster_roster_widget_h_HEADER_GUARD_
+#define _TelepathyQt_examples_roster_roster_widget_h_HEADER_GUARD_
 
 #include <QWidget>
 
-#include <TelepathyQt4/Contact>
-#include <TelepathyQt4/Connection>
+#include <TelepathyQt/Contact>
+#include <TelepathyQt/Connection>
 
 namespace Tp {
 class Connection;
diff --git a/examples/roster/roster-window.cpp b/examples/roster/roster-window.cpp
index 76a57582..db42a9e9 100644
--- a/examples/roster/roster-window.cpp
+++ b/examples/roster/roster-window.cpp
@@ -1,5 +1,5 @@
 /**
- * This file is part of TelepathyQt4
+ * This file is part of TelepathyQt
  *
  * @copyright Copyright (C) 2009-2011 Collabora Ltd. <http://www.collabora.co.uk/>
  * @license LGPL 2.1
@@ -24,13 +24,13 @@
 
 #include "roster-widget.h"
 
-#include <TelepathyQt4/Types>
-#include <TelepathyQt4/ChannelFactory>
-#include <TelepathyQt4/Connection>
-#include <TelepathyQt4/ConnectionFactory>
-#include <TelepathyQt4/ContactFactory>
-#include <TelepathyQt4/PendingOperation>
-#include <TelepathyQt4/PendingReady>
+#include <TelepathyQt/Types>
+#include <TelepathyQt/ChannelFactory>
+#include <TelepathyQt/Connection>
+#include <TelepathyQt/ConnectionFactory>
+#include <TelepathyQt/ContactFactory>
+#include <TelepathyQt/PendingOperation>
+#include <TelepathyQt/PendingReady>
 
 #include <QDebug>
 
diff --git a/examples/roster/roster-window.h b/examples/roster/roster-window.h
index f3a5b343..adc75179 100644
--- a/examples/roster/roster-window.h
+++ b/examples/roster/roster-window.h
@@ -1,5 +1,5 @@
 /**
- * This file is part of TelepathyQt4
+ * This file is part of TelepathyQt
  *
  * @copyright Copyright (C) 2009-2011 Collabora Ltd. <http://www.collabora.co.uk/>
  * @license LGPL 2.1
@@ -19,13 +19,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TelepathyQt4_examples_roster_roster_window_h_HEADER_GUARD_
-#define _TelepathyQt4_examples_roster_roster_window_h_HEADER_GUARD_
+#ifndef _TelepathyQt_examples_roster_roster_window_h_HEADER_GUARD_
+#define _TelepathyQt_examples_roster_roster_window_h_HEADER_GUARD_
 
 #include <QMainWindow>
 
-#include <TelepathyQt4/Account>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Account>
+#include <TelepathyQt/Types>
 
 namespace Tp {
 class PendingOperation;
diff --git a/examples/stream-tubes/tube-initiator.cpp b/examples/stream-tubes/tube-initiator.cpp
index bcf58466..bd1b7a9a 100644
--- a/examples/stream-tubes/tube-initiator.cpp
+++ b/examples/stream-tubes/tube-initiator.cpp
@@ -1,5 +1,5 @@
 /*
- * This file is part of TelepathyQt4
+ * This file is part of TelepathyQt
  *
  * Copyright (C) 2010-2011 Collabora Ltd. <http://www.collabora.co.uk/>
  * Copyright (C) 2011 Nokia Corporation
@@ -21,26 +21,26 @@
 
 #include "tube-initiator.h"
 
-#include <TelepathyQt4/Account>
-#include <TelepathyQt4/AccountFactory>
-#include <TelepathyQt4/ClientRegistrar>
-#include <TelepathyQt4/ContactFactory>
-#include <TelepathyQt4/Connection>
-#include <TelepathyQt4/ConnectionFactory>
-#include <TelepathyQt4/Constants>
-#include <TelepathyQt4/Contact>
-#include <TelepathyQt4/ContactCapabilities>
-#include <TelepathyQt4/ContactFactory>
-#include <TelepathyQt4/ContactManager>
-#include <TelepathyQt4/Debug>
-#include <TelepathyQt4/OutgoingStreamTubeChannel>
-#include <TelepathyQt4/PendingChannelRequest>
-#include <TelepathyQt4/PendingContacts>
-#include <TelepathyQt4/PendingOperation>
-#include <TelepathyQt4/PendingReady>
-#include <TelepathyQt4/Presence>
-#include <TelepathyQt4/StreamTubeChannel>
-#include <TelepathyQt4/StreamTubeServer>
+#include <TelepathyQt/Account>
+#include <TelepathyQt/AccountFactory>
+#include <TelepathyQt/ClientRegistrar>
+#include <TelepathyQt/ContactFactory>
+#include <TelepathyQt/Connection>
+#include <TelepathyQt/ConnectionFactory>
+#include <TelepathyQt/Constants>
+#include <TelepathyQt/Contact>
+#include <TelepathyQt/ContactCapabilities>
+#include <TelepathyQt/ContactFactory>
+#include <TelepathyQt/ContactManager>
+#include <TelepathyQt/Debug>
+#include <TelepathyQt/OutgoingStreamTubeChannel>
+#include <TelepathyQt/PendingChannelRequest>
+#include <TelepathyQt/PendingContacts>
+#include <TelepathyQt/PendingOperation>
+#include <TelepathyQt/PendingReady>
+#include <TelepathyQt/Presence>
+#include <TelepathyQt/StreamTubeChannel>
+#include <TelepathyQt/StreamTubeServer>
 
 #include <QDebug>
 #include <QTcpServer>
diff --git a/examples/stream-tubes/tube-initiator.h b/examples/stream-tubes/tube-initiator.h
index 69ab7d3f..5cc68487 100644
--- a/examples/stream-tubes/tube-initiator.h
+++ b/examples/stream-tubes/tube-initiator.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of TelepathyQt4
+ * This file is part of TelepathyQt
  *
  * Copyright (C) 2009-2011 Collabora Ltd. <http://www.collabora.co.uk/>
  * Copyright (C) 2009,2011 Nokia Corporation
@@ -19,12 +19,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TelepathyQt4_examples_stream_tubes_tube_initiator_h_HEADER_GUARD_
-#define _TelepathyQt4_examples_stream_tubes_tube_initiator_h_HEADER_GUARD_
+#ifndef _TelepathyQt_examples_stream_tubes_tube_initiator_h_HEADER_GUARD_
+#define _TelepathyQt_examples_stream_tubes_tube_initiator_h_HEADER_GUARD_
 
-#include <TelepathyQt4/Constants>
-#include <TelepathyQt4/Contact>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Constants>
+#include <TelepathyQt/Contact>
+#include <TelepathyQt/Types>
 
 #include <QHash>
 #include <QHostAddress>
diff --git a/examples/stream-tubes/tube-receiver.cpp b/examples/stream-tubes/tube-receiver.cpp
index a202dd15..00f24735 100644
--- a/examples/stream-tubes/tube-receiver.cpp
+++ b/examples/stream-tubes/tube-receiver.cpp
@@ -1,5 +1,5 @@
 /*
- * This file is part of TelepathyQt4
+ * This file is part of TelepathyQt
  *
  * Copyright (C) 2009-2011 Collabora Ltd. <http://www.collabora.co.uk/>
  * Copyright (C) 2009,2011 Nokia Corporation
@@ -21,9 +21,9 @@
 
 #include "tube-receiver.h"
 
-#include <TelepathyQt4/Debug>
-#include <TelepathyQt4/IncomingStreamTubeChannel>
-#include <TelepathyQt4/StreamTubeClient>
+#include <TelepathyQt/Debug>
+#include <TelepathyQt/IncomingStreamTubeChannel>
+#include <TelepathyQt/StreamTubeClient>
 
 #include <QDebug>
 #include <QIODevice>
diff --git a/examples/stream-tubes/tube-receiver.h b/examples/stream-tubes/tube-receiver.h
index b6018037..434bba5b 100644
--- a/examples/stream-tubes/tube-receiver.h
+++ b/examples/stream-tubes/tube-receiver.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of TelepathyQt4
+ * This file is part of TelepathyQt
  *
  * Copyright (C) 2009-2011 Collabora Ltd. <http://www.collabora.co.uk/>
  * Copyright (C) 2009,2011 Nokia Corporation
@@ -19,10 +19,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TelepathyQt4_examples_stream_tubes_tube_receiver_h_HEADER_GUARD_
-#define _TelepathyQt4_examples_stream_tubes_tube_receiver_h_HEADER_GUARD_
+#ifndef _TelepathyQt_examples_stream_tubes_tube_receiver_h_HEADER_GUARD_
+#define _TelepathyQt_examples_stream_tubes_tube_receiver_h_HEADER_GUARD_
 
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Types>
 
 #include <QLocalSocket>