[telepathy-qt4/master] Renamed Telepathy namespace to Tp.
Andre Moreira Magalhaes (andrunko)
andre.magalhaes at collabora.co.uk
Tue Apr 7 22:48:52 PDT 2009
---
TelepathyQt4/Makefile.am | 24 +-
TelepathyQt4/Prototype/Account.cpp | 10 +-
TelepathyQt4/Prototype/Account.h | 4 +-
TelepathyQt4/Prototype/AccountManager.cpp | 18 +-
TelepathyQt4/Prototype/AvatarManager.cpp | 18 +-
TelepathyQt4/Prototype/AvatarManager.h | 6 +-
TelepathyQt4/Prototype/CapabilitiesManager.cpp | 48 ++--
TelepathyQt4/Prototype/CapabilitiesManager.h | 18 +-
TelepathyQt4/Prototype/ChatChannel.cpp | 28 +-
TelepathyQt4/Prototype/ChatChannel.h | 4 +-
TelepathyQt4/Prototype/Connection.cpp | 54 ++--
TelepathyQt4/Prototype/Connection.h | 24 +-
TelepathyQt4/Prototype/ConnectionFacade.cpp | 28 +-
TelepathyQt4/Prototype/ConnectionFacade.h | 14 +-
TelepathyQt4/Prototype/Contact.cpp | 18 +-
TelepathyQt4/Prototype/Contact.h | 12 +-
TelepathyQt4/Prototype/ContactManager.cpp | 206 ++++++------
TelepathyQt4/Prototype/ContactManager.h | 48 ++--
TelepathyQt4/Prototype/Makefile.am | 2 +-
TelepathyQt4/Prototype/PresenceManager.cpp | 112 ++++----
TelepathyQt4/Prototype/PresenceManager.h | 20 +-
TelepathyQt4/Prototype/StreamedMediaChannel.cpp | 96 +++---
TelepathyQt4/Prototype/StreamedMediaChannel.h | 26 +-
TelepathyQt4/abstract-interface.cpp | 10 +-
TelepathyQt4/abstract-interface.h | 6 +-
TelepathyQt4/account-manager.cpp | 14 +-
TelepathyQt4/account-manager.h | 4 +-
TelepathyQt4/account.cpp | 66 ++--
TelepathyQt4/account.h | 36 +-
TelepathyQt4/async-model.dox | 12 +-
TelepathyQt4/channel.cpp | 136 ++++----
TelepathyQt4/channel.h | 34 +-
TelepathyQt4/connection-internal.h | 6 +-
TelepathyQt4/connection-manager-internal.h | 4 +-
TelepathyQt4/connection-manager.cpp | 12 +-
TelepathyQt4/connection-manager.h | 8 +-
TelepathyQt4/connection.cpp | 28 +-
TelepathyQt4/connection.h | 16 +-
TelepathyQt4/constants.h | 6 +-
TelepathyQt4/contact-manager.cpp | 68 ++--
TelepathyQt4/contact-manager.h | 40 ++--
TelepathyQt4/contact.cpp | 4 +-
TelepathyQt4/contact.h | 10 +-
TelepathyQt4/dbus-proxy.cpp | 10 +-
TelepathyQt4/dbus-proxy.h | 6 +-
TelepathyQt4/debug-internal.h | 4 +-
TelepathyQt4/debug.cpp | 4 +-
TelepathyQt4/debug.h | 5 +-
TelepathyQt4/feature.cpp | 4 +-
TelepathyQt4/feature.h | 4 +-
TelepathyQt4/file-transfer.cpp | 4 +-
TelepathyQt4/file-transfer.h | 4 +-
TelepathyQt4/key-file.cpp | 4 +-
TelepathyQt4/key-file.h | 2 +-
TelepathyQt4/manager-file.cpp | 16 +-
TelepathyQt4/manager-file.h | 2 +-
TelepathyQt4/message.cpp | 4 +-
TelepathyQt4/message.h | 4 +-
TelepathyQt4/optional-interface-factory.cpp | 4 +-
TelepathyQt4/optional-interface-factory.h | 4 +-
TelepathyQt4/pending-account.cpp | 4 +-
TelepathyQt4/pending-account.h | 4 +-
TelepathyQt4/pending-channel.cpp | 6 +-
TelepathyQt4/pending-channel.h | 4 +-
TelepathyQt4/pending-connection.cpp | 4 +-
TelepathyQt4/pending-connection.h | 4 +-
TelepathyQt4/pending-contact-attributes.cpp | 4 +-
TelepathyQt4/pending-contact-attributes.h | 4 +-
TelepathyQt4/pending-contacts.cpp | 24 +-
TelepathyQt4/pending-contacts.h | 12 +-
TelepathyQt4/pending-handles.cpp | 4 +-
TelepathyQt4/pending-handles.h | 4 +-
TelepathyQt4/pending-operation.cpp | 4 +-
TelepathyQt4/pending-operation.h | 6 +-
TelepathyQt4/pending-ready.cpp | 4 +-
TelepathyQt4/pending-ready.h | 4 +-
TelepathyQt4/pending-string-list.cpp | 4 +-
TelepathyQt4/pending-string-list.h | 4 +-
TelepathyQt4/readiness-helper.cpp | 16 +-
TelepathyQt4/readiness-helper.h | 8 +-
TelepathyQt4/ready-object.cpp | 4 +-
TelepathyQt4/ready-object.h | 4 +-
TelepathyQt4/referenced-handles.cpp | 4 +-
TelepathyQt4/referenced-handles.h | 4 +-
TelepathyQt4/room-list.cpp | 4 +-
TelepathyQt4/room-list.h | 4 +-
TelepathyQt4/shared-ptr.h | 4 +-
TelepathyQt4/simple-pending-operations.h | 4 +-
TelepathyQt4/streamed-media-channel.cpp | 116 ++++----
TelepathyQt4/streamed-media-channel.h | 54 ++--
TelepathyQt4/text-channel.cpp | 36 +-
TelepathyQt4/text-channel.h | 20 +-
TelepathyQt4/types.h | 4 +-
examples/accounts/account-item.cpp | 38 ++--
examples/accounts/account-item.h | 18 +-
examples/accounts/accounts-window.cpp | 8 +-
examples/accounts/accounts-window.h | 6 +-
examples/accounts/main.cpp | 6 +-
examples/call/call-handler.cpp | 16 +-
examples/call/call-handler.h | 14 +-
examples/call/call-roster-widget.cpp | 2 +-
examples/call/call-roster-widget.h | 4 +-
examples/call/call-widget.cpp | 140 ++++----
examples/call/call-widget.h | 46 ++--
examples/call/call-window.cpp | 44 ++--
examples/call/call-window.h | 16 +-
examples/call/farsight-channel.cpp | 6 +-
examples/call/farsight-channel.h | 10 +-
examples/call/main.cpp | 8 +-
examples/call/video-widget.cpp | 4 +-
examples/call/video-widget.h | 4 +-
examples/extensions/Makefile.am | 6 +-
examples/roster/main.cpp | 6 +-
examples/roster/roster-item.cpp | 6 +-
examples/roster/roster-item.h | 6 +-
examples/roster/roster-widget.cpp | 18 +-
examples/roster/roster-widget.h | 18 +-
examples/roster/roster-window.cpp | 24 +-
examples/roster/roster-window.h | 14 +-
tests/dbus/account-basics.cpp | 56 ++--
tests/dbus/chan-basics.cpp | 52 ++--
tests/dbus/chan-group.cpp | 80 +++---
tests/dbus/cm-basics.cpp | 12 +-
tests/dbus/conn-basics.cpp | 22 +-
tests/dbus/conn-requests.cpp | 40 ++--
tests/dbus/conn-roster.cpp | 36 +-
tests/dbus/contacts.cpp | 88 +++---
tests/dbus/handles.cpp | 26 +-
tests/dbus/stateful-proxy.cpp | 24 +-
tests/dbus/streamed-media-chan.cpp | 384 +++++++++++-----------
tests/dbus/text-chan.cpp | 78 +++---
tests/key-file.cpp | 2 +-
tests/lib/test.cpp | 18 +-
tests/lib/test.h | 6 +-
tests/manager-file.cpp | 2 +-
tests/pinocchio/cm-basics.cpp | 26 +-
tests/pinocchio/conn-basics.cpp | 44 ++--
tests/pinocchio/handles.cpp | 70 ++--
tests/pinocchio/lib.cpp | 4 +-
tests/prototype/prototype.cpp | 124 ++++----
tests/prototype/prototype.h | 2 +-
tools/libqt4codegen.py | 2 +-
tools/qt4-client-gen.py | 22 +-
143 files changed, 1771 insertions(+), 1770 deletions(-)
diff --git a/TelepathyQt4/Makefile.am b/TelepathyQt4/Makefile.am
index 55a1aea..f828d48 100644
--- a/TelepathyQt4/Makefile.am
+++ b/TelepathyQt4/Makefile.am
@@ -309,7 +309,7 @@ _gen/constants.h: _gen/stable-spec.xml \
$(top_srcdir)/tools/qt4-constants-gen.py \
Makefile.am
$(PYTHON) $(top_srcdir)/tools/qt4-constants-gen.py \
- --namespace='Telepathy' \
+ --namespace='Tp' \
--str-constant-prefix='TELEPATHY_' \
--must-define='IN_TELEPATHY_QT4_HEADER' \
--specxml=$< \
@@ -319,7 +319,7 @@ _gen/types.h _gen/types-body.hpp: _gen/stable-spec.xml \
$(top_srcdir)/tools/qt4-types-gen.py \
Makefile.am
$(PYTHON) $(top_srcdir)/tools/qt4-types-gen.py \
- --namespace='Telepathy' \
+ --namespace='Tp' \
--declfile='_gen/types.h' \
--implfile='_gen/types-body.hpp' \
--realinclude='TelepathyQt4/types.h' \
@@ -338,7 +338,7 @@ _gen/cli-%.h _gen/cli-%-body.hpp: _gen/spec-%.xml \
$(top_srcdir)/tools/qt4-client-gen.py \
Makefile.am
set -e; \
- namespace='Telepathy::Client'; \
+ namespace='Tp::Client'; \
group= ; \
prettyinclude= ; \
mainiface= ; \
@@ -346,35 +346,35 @@ _gen/cli-%.h _gen/cli-%-body.hpp: _gen/spec-%.xml \
channel) \
group='clientchannel'; \
prettyinclude='Channel'; \
- mainiface='--mainiface=Telepathy::Client::ChannelInterface';; \
+ mainiface='--mainiface=Tp::Client::ChannelInterface';; \
account) \
group='clientaccount'; \
prettyinclude='AccountManager'; \
- mainiface='--mainiface=Telepathy::Client::AccountInterface';; \
+ mainiface='--mainiface=Tp::Client::AccountInterface';; \
account-manager) \
group='clientam'; \
prettyinclude='AccountManager'; \
- mainiface='--mainiface=Telepathy::Client::AccountManagerInterface';; \
+ mainiface='--mainiface=Tp::Client::AccountManagerInterface';; \
connection) \
group='clientconn'; \
prettyinclude='Connection'; \
- mainiface='--mainiface=Telepathy::Client::ConnectionInterface';; \
+ mainiface='--mainiface=Tp::Client::ConnectionInterface';; \
connection-manager) \
group='clientcm'; \
prettyinclude='ConnectionManager'; \
- mainiface='--mainiface=Telepathy::Client::ConnectionManagerInterface';; \
+ mainiface='--mainiface=Tp::Client::ConnectionManagerInterface';; \
dbus) \
group='clientdbus'; \
- namespace='Telepathy::Client::DBus'; \
+ namespace='Tp::Client::DBus'; \
prettyinclude='DBus';; \
media-session-handler) \
group='clientmsesh'; \
prettyinclude='MediaSessionHandler'; \
- mainiface='--mainiface=Telepathy::Client::MediaSessionHandlerInterface';; \
+ mainiface='--mainiface=Tp::Client::MediaSessionHandlerInterface';; \
media-stream-handler) \
group='clientmstrh'; \
prettyinclude='MediaStreamHandler'; \
- mainiface='--mainiface=Telepathy::Client::MediaStreamHandlerInterface';; \
+ mainiface='--mainiface=Tp::Client::MediaStreamHandlerInterface';; \
properties) \
group='clientprops'; \
prettyinclude='Properties';; \
@@ -382,7 +382,7 @@ _gen/cli-%.h _gen/cli-%-body.hpp: _gen/spec-%.xml \
$(PYTHON) $(top_srcdir)/tools/qt4-client-gen.py \
--group=$$group \
--namespace=$$namespace \
- --typesnamespace='Telepathy' \
+ --typesnamespace='Tp' \
--headerfile=_gen/cli-$*.h \
--implfile=_gen/cli-$*-body.hpp \
--realinclude='TelepathyQt4/$*.h' \
diff --git a/TelepathyQt4/Prototype/Account.cpp b/TelepathyQt4/Prototype/Account.cpp
index d316810..572d5d2 100644
--- a/TelepathyQt4/Prototype/Account.cpp
+++ b/TelepathyQt4/Prototype/Account.cpp
@@ -49,7 +49,7 @@ public:
QString m_handle;
bool m_isValid;
- Telepathy::Client::AccountInterface* m_pInterface;
+ Tp::Client::AccountInterface* m_pInterface;
QVariantMap m_parameters;
QVariantMap m_properties;
QString m_connectionManagerName;
@@ -205,10 +205,10 @@ QString Account::currentPresence()
return g_offline;
}
#if 1
- disconnect ( connection()->presenceManager(), SIGNAL( signalOwnPresenceUpdated( const TpPrototype::Account* , const Telepathy::SimplePresence& ) ),
+ disconnect ( connection()->presenceManager(), SIGNAL( signalOwnPresenceUpdated( const TpPrototype::Account* , const Tp::SimplePresence& ) ),
this, SIGNAL( signalPresenceChanged() ) );
- connect ( connection()->presenceManager(), SIGNAL( signalOwnPresenceUpdated( const TpPrototype::Account* , const Telepathy::SimplePresence& ) ),
+ connect ( connection()->presenceManager(), SIGNAL( signalOwnPresenceUpdated( const TpPrototype::Account* , const Tp::SimplePresence& ) ),
this, SIGNAL( signalPresenceChanged() ) );
#endif
@@ -220,7 +220,7 @@ QString Account::handle() const
return d->m_handle;
}
-Telepathy::Client::AccountInterface* Account::interface()
+Tp::Client::AccountInterface* Account::interface()
{
return d->m_pInterface;
}
@@ -251,7 +251,7 @@ void Account::init( const QString handle )
#ifdef ENABLE_DEBUG_OUTPUT_
qDebug() << "Handle:" << d->m_handle;
#endif
- d->m_pInterface = new Telepathy::Client::AccountInterface( "org.freedesktop.Telepathy.AccountManager",
+ d->m_pInterface = new Tp::Client::AccountInterface( "org.freedesktop.Telepathy.AccountManager",
d->m_handle,
this );
diff --git a/TelepathyQt4/Prototype/Account.h b/TelepathyQt4/Prototype/Account.h
index 6fa1086..36aa44f 100644
--- a/TelepathyQt4/Prototype/Account.h
+++ b/TelepathyQt4/Prototype/Account.h
@@ -27,7 +27,7 @@
#include <QPointer>
#include <QVariantMap>
-namespace Telepathy {
+namespace Tp {
namespace Client {
class AccountInterface;
}
@@ -150,7 +150,7 @@ protected:
* D-BUS interface.
* This protected access to the D-BUS interface can be used to extend this class with special features.
*/
- Telepathy::Client::AccountInterface* interface();
+ Tp::Client::AccountInterface* interface();
/**
* Returns the handle.
diff --git a/TelepathyQt4/Prototype/AccountManager.cpp b/TelepathyQt4/Prototype/AccountManager.cpp
index c822db6..44af61d 100644
--- a/TelepathyQt4/Prototype/AccountManager.cpp
+++ b/TelepathyQt4/Prototype/AccountManager.cpp
@@ -47,8 +47,8 @@ public:
AccountManagerPrivate()
{ init(); }
- Telepathy::Client::AccountManagerInterface* m_pInterface;
- Telepathy::Client::DBus::PropertiesInterface* m_propertiesInterface;
+ Tp::Client::AccountManagerInterface* m_pInterface;
+ Tp::Client::DBus::PropertiesInterface* m_propertiesInterface;
QMap<QString, QPointer<Account> > m_validAccountHandles;
void init()
@@ -56,7 +56,7 @@ public:
m_pInterface = NULL;
}
- Telepathy::ObjectPathList validAccounts()
+ Tp::ObjectPathList validAccounts()
{
Q_ASSERT(m_propertiesInterface);
@@ -68,10 +68,10 @@ public:
{
qWarning().nospace() << get.error().name() << ": "
<< get.error().message();
- return Telepathy::ObjectPathList();
+ return Tp::ObjectPathList();
}
- Telepathy::ObjectPathList paths = qdbus_cast<Telepathy::ObjectPathList>(
+ Tp::ObjectPathList paths = qdbus_cast<Tp::ObjectPathList>(
get.value().variant());
if (paths.size() == 0)
@@ -345,8 +345,8 @@ void AccountManager::slotAccountRemoved()
void AccountManager::init()
{
- Telepathy::registerTypes();
- d->m_pInterface = new Telepathy::Client::AccountManagerInterface( "org.freedesktop.Telepathy.AccountManager",
+ Tp::registerTypes();
+ d->m_pInterface = new Tp::Client::AccountManagerInterface( "org.freedesktop.Telepathy.AccountManager",
"/org/freedesktop/Telepathy/AccountManager",
this );
Q_ASSERT( d->m_pInterface );
@@ -359,14 +359,14 @@ void AccountManager::init()
}
//Q_ASSERT( d->m_pInterface->isValid() );
- d->m_propertiesInterface = new Telepathy::Client::DBus::PropertiesInterface(
+ d->m_propertiesInterface = new Tp::Client::DBus::PropertiesInterface(
"org.freedesktop.Telepathy.AccountManager",
"/org/freedesktop/Telepathy/AccountManager",
this);
Q_ASSERT( d->m_propertiesInterface );
// It might be better to use layzy initializing here.. (ses)
- Telepathy::ObjectPathList account_handles = d->validAccounts();
+ Tp::ObjectPathList account_handles = d->validAccounts();
foreach( const QDBusObjectPath& account_handle, account_handles )
{
diff --git a/TelepathyQt4/Prototype/AvatarManager.cpp b/TelepathyQt4/Prototype/AvatarManager.cpp
index 1030077..6bc91cf 100644
--- a/TelepathyQt4/Prototype/AvatarManager.cpp
+++ b/TelepathyQt4/Prototype/AvatarManager.cpp
@@ -46,16 +46,16 @@ class TpPrototype::AvatarManagerPrivate
{
public:
AvatarManagerPrivate( Connection* connection,
- Telepathy::Client::ConnectionInterface* interface )
+ Tp::Client::ConnectionInterface* interface )
{ init( connection, interface ); }
- Telepathy::Client::ConnectionInterface* m_pConnectionInterface;
- Telepathy::Client::ConnectionInterfaceAvatarsInterface* m_pAvatarsInterface;
+ Tp::Client::ConnectionInterface* m_pConnectionInterface;
+ Tp::Client::ConnectionInterfaceAvatarsInterface* m_pAvatarsInterface;
QPointer<Connection> m_pConnection;
bool m_isValid;
void init( Connection* connection,
- Telepathy::Client::ConnectionInterface* interface )
+ Tp::Client::ConnectionInterface* interface )
{
m_pConnection = connection;
m_pConnectionInterface = interface;
@@ -66,7 +66,7 @@ public:
};
AvatarManager::AvatarManager( Connection* connection,
- Telepathy::Client::ConnectionInterface* interface,
+ Tp::Client::ConnectionInterface* interface,
QObject* parent ):
QObject( parent ),
d( new AvatarManagerPrivate( connection, interface ) )
@@ -166,7 +166,7 @@ TpPrototype::AvatarManager::AvatarRequirements AvatarManager::avatarRequirements
void AvatarManager::avatarForContactList( const QList<QPointer<Contact> >& contacts )
{
Q_ASSERT( d->m_pAvatarsInterface );
- Telepathy::UIntList contact_ids;
+ Tp::UIntList contact_ids;
foreach( Contact* contact, contacts )
{
if ( !contact )
@@ -259,7 +259,7 @@ void AvatarManager::slotAvatarRetrieved( uint contactHandle, const QString& toke
}
void AvatarManager::init( Connection* connection,
- Telepathy::Client::ConnectionInterface* interface )
+ Tp::Client::ConnectionInterface* interface )
{
Q_ASSERT( interface );
@@ -269,7 +269,7 @@ void AvatarManager::init( Connection* connection,
return;
}
- Telepathy::registerTypes();
+ Tp::registerTypes();
qRegisterMetaType<TpPrototype::AvatarManager::Avatar>();
QDBusPendingReply<QStringList> interfaces_reply = d->m_pConnectionInterface->GetInterfaces();
@@ -308,7 +308,7 @@ void AvatarManager::init( Connection* connection,
#ifdef ENABLE_DEBUG_OUTPUT_
qDebug() << "Interface Name: " << avatar_interface_name;
#endif
- d->m_pAvatarsInterface = new Telepathy::Client::ConnectionInterfaceAvatarsInterface( d->m_pConnectionInterface->service(), d->m_pConnectionInterface->path(), this );
+ d->m_pAvatarsInterface = new Tp::Client::ConnectionInterfaceAvatarsInterface( d->m_pConnectionInterface->service(), d->m_pConnectionInterface->path(), this );
connect( d->m_pAvatarsInterface, SIGNAL( AvatarUpdated(uint, const QString&) ),
this, SLOT( slotAvatarUpdated(uint, const QString&) ) );
diff --git a/TelepathyQt4/Prototype/AvatarManager.h b/TelepathyQt4/Prototype/AvatarManager.h
index 085a281..a6f07a7 100644
--- a/TelepathyQt4/Prototype/AvatarManager.h
+++ b/TelepathyQt4/Prototype/AvatarManager.h
@@ -28,7 +28,7 @@
#include <TelepathyQt4/Types>
-namespace Telepathy
+namespace Tp
{
namespace Client
{
@@ -152,7 +152,7 @@ protected:
* Constructor. The capabilities manager cannot be instantiated directly. Use Connection::AvatarManager() for it!
*/
AvatarManager( TpPrototype::Connection* connection,
- Telepathy::Client::ConnectionInterface* interface,
+ Tp::Client::ConnectionInterface* interface,
QObject* parent = NULL );
~AvatarManager();
@@ -161,7 +161,7 @@ protected slots:
void slotAvatarRetrieved( uint contact, const QString& token, const QByteArray& avatar, const QString& type );
private:
- void init( TpPrototype::Connection* connection, Telepathy::Client::ConnectionInterface* interface );
+ void init( TpPrototype::Connection* connection, Tp::Client::ConnectionInterface* interface );
TpPrototype::AvatarManagerPrivate * const d;
friend class Connection;
diff --git a/TelepathyQt4/Prototype/CapabilitiesManager.cpp b/TelepathyQt4/Prototype/CapabilitiesManager.cpp
index ef2ed95..294e755 100644
--- a/TelepathyQt4/Prototype/CapabilitiesManager.cpp
+++ b/TelepathyQt4/Prototype/CapabilitiesManager.cpp
@@ -48,8 +48,8 @@ public:
CapabilitiesManagerPrivate()
{ init(); }
- Telepathy::Client::ConnectionInterface* m_pConnectionInterface;
- Telepathy::Client::ConnectionInterfaceCapabilitiesInterface* m_pCapabilitiesInterface;
+ Tp::Client::ConnectionInterface* m_pConnectionInterface;
+ Tp::Client::ConnectionInterfaceCapabilitiesInterface* m_pCapabilitiesInterface;
QPointer<Connection> m_pConnection;
@@ -66,7 +66,7 @@ public:
};
CapabilitiesManager::CapabilitiesManager( Connection* connection,
- Telepathy::Client::ConnectionInterface* interface,
+ Tp::Client::ConnectionInterface* interface,
QObject* parent ):
QObject( parent ),
d( new CapabilitiesManagerPrivate )
@@ -94,9 +94,9 @@ TpPrototype::Connection* CapabilitiesManager::connection()
return d->m_pConnection;
}
-bool CapabilitiesManager::setCapabilities( const Telepathy::CapabilityPairList& capabilities, const QStringList& removedChannels )
+bool CapabilitiesManager::setCapabilities( const Tp::CapabilityPairList& capabilities, const QStringList& removedChannels )
{
- QDBusPendingReply<Telepathy::CapabilityPairList> advertise_capabilities_reply = d->m_pCapabilitiesInterface->AdvertiseCapabilities( capabilities, removedChannels );
+ QDBusPendingReply<Tp::CapabilityPairList> advertise_capabilities_reply = d->m_pCapabilitiesInterface->AdvertiseCapabilities( capabilities, removedChannels );
advertise_capabilities_reply.waitForFinished();
if ( !advertise_capabilities_reply.isValid() )
@@ -119,12 +119,12 @@ bool CapabilitiesManager::setCapabilities( const Telepathy::CapabilityPairList&
return true;
}
-Telepathy::ContactCapabilityList CapabilitiesManager::capabilities()
+Tp::ContactCapabilityList CapabilitiesManager::capabilities()
{
uint self_handle = TpPrototype::ConnectionFacade::instance()->selfHandleForConnectionInterface( d->m_pConnectionInterface );
QList<uint> handle_list;
handle_list.append( self_handle );
- QDBusPendingReply<Telepathy::ContactCapabilityList> capabilities_reply = d->m_pCapabilitiesInterface->GetCapabilities( handle_list );
+ QDBusPendingReply<Tp::ContactCapabilityList> capabilities_reply = d->m_pCapabilitiesInterface->GetCapabilities( handle_list );
capabilities_reply.waitForFinished();
if ( !capabilities_reply.isValid() )
@@ -136,10 +136,10 @@ Telepathy::ContactCapabilityList CapabilitiesManager::capabilities()
<< "error message:" << error.message();
d->m_isValid = false;
- return Telepathy::ContactCapabilityList();
+ return Tp::ContactCapabilityList();
}
- Telepathy::ContactCapabilityList capabilities=capabilities_reply.value();
+ Tp::ContactCapabilityList capabilities=capabilities_reply.value();
return capabilities;
}
@@ -148,7 +148,7 @@ Telepathy::ContactCapabilityList CapabilitiesManager::capabilities()
void CapabilitiesManager::capabilitiesForContactList( const QList<QPointer<Contact> >& contacts )
{
Q_ASSERT( d->m_pCapabilitiesInterface );
- Telepathy::UIntList contact_ids;
+ Tp::UIntList contact_ids;
foreach( Contact* contact, contacts )
{
if ( !contact )
@@ -156,7 +156,7 @@ void CapabilitiesManager::capabilitiesForContactList( const QList<QPointer<Conta
contact_ids.append( contact->telepathyHandle() );
}
- QDBusPendingReply<Telepathy::ContactCapabilityList> capabilities_reply = d->m_pCapabilitiesInterface->GetCapabilities( contact_ids );
+ QDBusPendingReply<Tp::ContactCapabilityList> capabilities_reply = d->m_pCapabilitiesInterface->GetCapabilities( contact_ids );
capabilities_reply.waitForFinished();
if ( !capabilities_reply.isValid() )
@@ -171,14 +171,14 @@ void CapabilitiesManager::capabilitiesForContactList( const QList<QPointer<Conta
return;
}
- Telepathy::ContactCapabilityList capabilities=capabilities_reply.value();
+ Tp::ContactCapabilityList capabilities=capabilities_reply.value();
foreach( Contact* contact, contacts )
{
- Telepathy::ContactCapabilityList contact_capabilities;
+ Tp::ContactCapabilityList contact_capabilities;
for ( int i=0; i < capabilities.size(); i++ )
{
- Telepathy::ContactCapability capability = capabilities.value( i );
+ Tp::ContactCapability capability = capabilities.value( i );
if ( contact && contact->telepathyHandle() == capability.handle )
{
contact_capabilities.append( capability );
@@ -188,7 +188,7 @@ void CapabilitiesManager::capabilitiesForContactList( const QList<QPointer<Conta
}
}
-void CapabilitiesManager::slotCapabilitiesChanged( const Telepathy::CapabilityChangeList& capabilities )
+void CapabilitiesManager::slotCapabilitiesChanged( const Tp::CapabilityChangeList& capabilities )
{
if ( !d->m_pConnection )
{
@@ -203,7 +203,7 @@ void CapabilitiesManager::slotCapabilitiesChanged( const Telepathy::CapabilityCh
for (int i=0; i<capabilities.size(); i++)
{
- Telepathy::CapabilityChange changed_capability = capabilities.value( i );
+ Tp::CapabilityChange changed_capability = capabilities.value( i );
#ifdef ENABLE_DEBUG_OUTPUT_
qDebug() << "CapabilityChange "<< i<< "handle" <<changed_capability.handle;
qDebug() << "CapabilityChange"<< i << "CannelType" <<changed_capability.channelType;
@@ -220,7 +220,7 @@ void CapabilitiesManager::slotCapabilitiesChanged( const Telepathy::CapabilityCh
}
uint self_handle = ConnectionFacade::instance()->selfHandleForConnectionInterface( d->m_pConnectionInterface );
- foreach( const Telepathy::CapabilityChange& changed_capability, capabilities )
+ foreach( const Tp::CapabilityChange& changed_capability, capabilities )
{
if ( changed_capability.handle == self_handle )
{
@@ -233,7 +233,7 @@ void CapabilitiesManager::slotCapabilitiesChanged( const Telepathy::CapabilityCh
if ( contact && contact->telepathyHandle() == changed_capability.handle )
{
// Modify stored list of capabilities
- Telepathy::ContactCapabilityList contact_capabilities = contact->capabilities();
+ Tp::ContactCapabilityList contact_capabilities = contact->capabilities();
for ( int i = 0; i < contact_capabilities.size(); ++i )
{
if ( contact_capabilities.at(i).channelType == changed_capability.channelType )
@@ -242,7 +242,7 @@ void CapabilitiesManager::slotCapabilitiesChanged( const Telepathy::CapabilityCh
}
}
- Telepathy::ContactCapability new_capability;
+ Tp::ContactCapability new_capability;
new_capability.handle = changed_capability.handle;
new_capability.channelType = changed_capability.channelType;
new_capability.genericFlags = changed_capability.newGenericFlags;
@@ -260,7 +260,7 @@ void CapabilitiesManager::slotCapabilitiesChanged( const Telepathy::CapabilityCh
void CapabilitiesManager::init( Connection* connection,
- Telepathy::Client::ConnectionInterface* interface )
+ Tp::Client::ConnectionInterface* interface )
{
Q_ASSERT( interface );
@@ -270,7 +270,7 @@ void CapabilitiesManager::init( Connection* connection,
return;
}
- Telepathy::registerTypes();
+ Tp::registerTypes();
d->m_pConnectionInterface = interface;
d->m_pConnection = connection;
QDBusPendingReply<QStringList> interfaces_reply = d->m_pConnectionInterface->GetInterfaces();
@@ -311,10 +311,10 @@ void CapabilitiesManager::init( Connection* connection,
//qDebug() << "Connection interface :" << d->m_pConnectionInterface->connection().interface()->path();
qDebug() << "Interface Name: " << capabilities_interface_name;
#endif
- d->m_pCapabilitiesInterface = new Telepathy::Client::ConnectionInterfaceCapabilitiesInterface(d->m_pConnectionInterface->service(),d->m_pConnectionInterface->path(),this );
+ d->m_pCapabilitiesInterface = new Tp::Client::ConnectionInterfaceCapabilitiesInterface(d->m_pConnectionInterface->service(),d->m_pConnectionInterface->path(),this );
- connect( d->m_pCapabilitiesInterface, SIGNAL( CapabilitiesChanged( const Telepathy::CapabilityChangeList& ) ),
- this, SLOT( slotCapabilitiesChanged( const Telepathy::CapabilityChangeList& ) ) );
+ connect( d->m_pCapabilitiesInterface, SIGNAL( CapabilitiesChanged( const Tp::CapabilityChangeList& ) ),
+ this, SLOT( slotCapabilitiesChanged( const Tp::CapabilityChangeList& ) ) );
}
diff --git a/TelepathyQt4/Prototype/CapabilitiesManager.h b/TelepathyQt4/Prototype/CapabilitiesManager.h
index a92f460..e6f7f37 100644
--- a/TelepathyQt4/Prototype/CapabilitiesManager.h
+++ b/TelepathyQt4/Prototype/CapabilitiesManager.h
@@ -29,7 +29,7 @@
#include <TelepathyQt4/Types>
-namespace Telepathy
+namespace Tp
{
namespace Client
{
@@ -75,18 +75,18 @@ public:
/**
* Set the capabilities.
* This function sets the capabilites of the account that belongs to this connection.
- * @param capabilities List of capabilities for a specific channel. See Telepathy D-Bus spec section "Channel_Media_Capabilities"
+ * @param capabilities List of capabilities for a specific channel. See Tp D-Bus spec section "Channel_Media_Capabilities"
* @param removedChanels List of channels that are removed.
* @return true if setting was successful
*/
- bool setCapabilities( const Telepathy::CapabilityPairList& capabilities, const QStringList& removedChannels = QStringList() );
+ bool setCapabilities( const Tp::CapabilityPairList& capabilities, const QStringList& removedChannels = QStringList() );
/**
* Request capabilites.
* Returns the capabilites of the account that belongs to this connection.
* @return List of capabilities
*/
- Telepathy::ContactCapabilityList capabilities();
+ Tp::ContactCapabilityList capabilities();
/**
* Gets the capabilities for a list of contacts and provides them to to specific contacts.
@@ -98,27 +98,27 @@ signals:
/**
* The capability of a contact has changed. This signal is emitted when any of the known contacts changed its capability.
*/
- void signalCapabilitiesChanged( TpPrototype::Contact* contact, const Telepathy::CapabilityChange& changedCapability );
+ void signalCapabilitiesChanged( TpPrototype::Contact* contact, const Tp::CapabilityChange& changedCapability );
/**
* My capability was changed. This signal is emmitted if the capability of one of my channes was changed.
*/
- void signalOwnCapabilityChanged( const Telepathy::CapabilityChange& changedCapability );
+ void signalOwnCapabilityChanged( const Tp::CapabilityChange& changedCapability );
protected:
/**
* Constructor. The capabilities manager cannot be instantiated directly. Use Connection::CapabilitiesManager() for it!
*/
CapabilitiesManager( TpPrototype::Connection* connection,
- Telepathy::Client::ConnectionInterface* interface,
+ Tp::Client::ConnectionInterface* interface,
QObject* parent = NULL );
~CapabilitiesManager();
protected slots:
- void slotCapabilitiesChanged( const Telepathy::CapabilityChangeList& capabilities );
+ void slotCapabilitiesChanged( const Tp::CapabilityChangeList& capabilities );
private:
- void init( TpPrototype::Connection* connection, Telepathy::Client::ConnectionInterface* interface );
+ void init( TpPrototype::Connection* connection, Tp::Client::ConnectionInterface* interface );
TpPrototype::CapabilitiesManagerPrivate * const d;
friend class Connection;
diff --git a/TelepathyQt4/Prototype/ChatChannel.cpp b/TelepathyQt4/Prototype/ChatChannel.cpp
index 1718101..e388d9b 100644
--- a/TelepathyQt4/Prototype/ChatChannel.cpp
+++ b/TelepathyQt4/Prototype/ChatChannel.cpp
@@ -49,9 +49,9 @@ public:
}
QPointer<TpPrototype::Contact> m_pContact;
- Telepathy::Client::ChannelTypeTextInterface* m_pTextChannel;
- QPointer<Telepathy::Client::ConnectionInterface> m_pConnectionInterface;
- Telepathy::Client::ChannelInterface* m_pChannelInterface;
+ Tp::Client::ChannelTypeTextInterface* m_pTextChannel;
+ QPointer<Tp::Client::ConnectionInterface> m_pConnectionInterface;
+ Tp::Client::ChannelInterface* m_pChannelInterface;
bool m_isValid;
bool m_areSignalsConnected;
@@ -68,11 +68,11 @@ private:
}
};
-ChatChannel::ChatChannel( Contact* contact, Telepathy::Client::ConnectionInterface* connectionInterface, QObject* parent ):
+ChatChannel::ChatChannel( Contact* contact, Tp::Client::ConnectionInterface* connectionInterface, QObject* parent ):
QObject( parent ),
d(new ChatChannelPrivate())
{
- Telepathy::registerTypes();
+ Tp::registerTypes();
d->m_pContact = contact;
d->m_pConnectionInterface = connectionInterface;
@@ -118,9 +118,9 @@ void ChatChannel::pendingTextMessages()
qWarning() << "ChatChannel::pendingTextMessages: Action ignored due to missing text channel!";
}
- QDBusPendingReply<Telepathy::PendingTextMessageList> reply= d->m_pTextChannel->ListPendingMessages( true );
- const Telepathy::PendingTextMessageList chatMessages = reply.value();
- Telepathy::PendingTextMessage messageshandle;
+ QDBusPendingReply<Tp::PendingTextMessageList> reply= d->m_pTextChannel->ListPendingMessages( true );
+ const Tp::PendingTextMessageList chatMessages = reply.value();
+ Tp::PendingTextMessage messageshandle;
for ( int i=0; i < chatMessages.size(); i++ )
{
messageshandle = chatMessages.at(i);
@@ -138,7 +138,7 @@ void ChatChannel::requestTextChannel( uint handle )
{
QDBusPendingReply<QDBusObjectPath> reply0 =
d->m_pConnectionInterface->RequestChannel( "org.freedesktop.Telepathy.Channel.Type.Text",
- Telepathy::HandleTypeContact, handle, true );
+ Tp::HandleTypeContact, handle, true );
reply0.waitForFinished();
if (!reply0.isValid())
{
@@ -161,10 +161,10 @@ void ChatChannel::openTextChannel(uint handle, uint handleType, const QString& c
qDebug() << "ContactManager Channel Services Name" << channel_service_name;
qDebug() << "ContactManager Channel Path" << channel_path;
// This channel may never be closed!
- d->m_pTextChannel = new Telepathy::Client::ChannelTypeTextInterface( channel_service_name,
+ d->m_pTextChannel = new Tp::Client::ChannelTypeTextInterface( channel_service_name,
channel_path,
this );
- d->m_pChannelInterface = new Telepathy::Client::ChannelInterface( channel_service_name,
+ d->m_pChannelInterface = new Tp::Client::ChannelInterface( channel_service_name,
channel_path,
this );
Q_ASSERT( d->m_pChannelInterface->isValid() );
@@ -204,9 +204,9 @@ void ChatChannel::openTextChannel(uint handle, uint handleType, const QString& c
connect(d->m_pTextChannel, SIGNAL(SendError(uint , uint , uint , const QString& )),
this, SLOT(slotSendError(uint , uint , uint , const QString& )));
- /* QDBusPendingReply<Telepathy::PendingTextMessageList> reply= d->m_groupTextChannel->ListPendingMessages(false);
- const Telepathy::PendingTextMessageList chatMessages=reply.value();
- Telepathy::PendingTextMessage messageshandle;
+ /* QDBusPendingReply<Tp::PendingTextMessageList> reply= d->m_groupTextChannel->ListPendingMessages(false);
+ const Tp::PendingTextMessageList chatMessages=reply.value();
+ Tp::PendingTextMessage messageshandle;
for (int i=0; i<chatMessages.size(); i++)
{
messageshandle= chatMessages.at(i);
diff --git a/TelepathyQt4/Prototype/ChatChannel.h b/TelepathyQt4/Prototype/ChatChannel.h
index 14d05b6..cd55ce6 100644
--- a/TelepathyQt4/Prototype/ChatChannel.h
+++ b/TelepathyQt4/Prototype/ChatChannel.h
@@ -33,7 +33,7 @@
#define ATTRIBUTE_DEPRECATED
#endif
-namespace Telepathy {
+namespace Tp {
namespace Client{
class ConnectionInterface;
}
@@ -98,7 +98,7 @@ protected:
* Constructor.
* Use Contact::chatChannel() to obtain an object of ChatChannel.
*/
- ChatChannel( Contact* contact, Telepathy::Client::ConnectionInterface* connectionInterface , QObject* parent = NULL );
+ ChatChannel( Contact* contact, Tp::Client::ConnectionInterface* connectionInterface , QObject* parent = NULL );
void requestTextChannel(uint handle);
void openTextChannel(uint handle, uint handleType, const QString& channelPath, const QString& channelType );
diff --git a/TelepathyQt4/Prototype/Connection.cpp b/TelepathyQt4/Prototype/Connection.cpp
index 0cb72e1..0eb9fa9 100644
--- a/TelepathyQt4/Prototype/Connection.cpp
+++ b/TelepathyQt4/Prototype/Connection.cpp
@@ -47,9 +47,9 @@ public:
QString m_serviceName;
QString m_objectPath;
bool m_isValid;
- Telepathy::ConnectionStatus m_status;
- Telepathy::ConnectionStatusReason m_reason;
- Telepathy::Client::ConnectionInterface* m_pInterface;
+ Tp::ConnectionStatus m_status;
+ Tp::ConnectionStatusReason m_reason;
+ Tp::Client::ConnectionInterface* m_pInterface;
QPointer<ContactManager> m_pContactManager;
QPointer<PresenceManager> m_pPresenceManager;
QPointer<CapabilitiesManager> m_pCapabilitiesManager;
@@ -60,8 +60,8 @@ public:
void init()
{
m_isValid = false; // Will be set on true after initial initialization.
- m_status = Telepathy::ConnectionStatusDisconnected;
- m_reason = Telepathy::ConnectionStatusReasonNoneSpecified;
+ m_status = Tp::ConnectionStatusDisconnected;
+ m_reason = Tp::ConnectionStatusReasonNoneSpecified;
m_pInterface = NULL;
m_pContactManager = NULL;
m_pPresenceManager = NULL;
@@ -73,8 +73,8 @@ public:
void cleanup()
{
m_isValid = true;
- m_status = Telepathy::ConnectionStatusDisconnected;
- m_reason = Telepathy::ConnectionStatusReasonNoneSpecified;
+ m_status = Tp::ConnectionStatusDisconnected;
+ m_reason = Tp::ConnectionStatusReasonNoneSpecified;
delete m_pInterface;
m_pInterface = NULL;
delete m_pContactManager;
@@ -96,7 +96,7 @@ public:
Q_ASSERT( !m_connectionManager.isEmpty() );
Q_ASSERT( !m_protocol.isEmpty() );
- Telepathy::Client::ConnectionManagerInterface cm_interface( "org.freedesktop.Telepathy.ConnectionManager." + m_connectionManager,
+ Tp::Client::ConnectionManagerInterface cm_interface( "org.freedesktop.Telepathy.ConnectionManager." + m_connectionManager,
"/org/freedesktop/Telepathy/ConnectionManager/" + m_connectionManager,
NULL );
@@ -133,7 +133,7 @@ public:
m_serviceName = connection_service_name;
m_objectPath = connection_object_path.path();
- m_pInterface = new Telepathy::Client::ConnectionInterface( m_serviceName,
+ m_pInterface = new Tp::Client::ConnectionInterface( m_serviceName,
m_objectPath,
NULL );
@@ -158,7 +158,7 @@ Connection::~Connection()
#ifdef ENABLE_DEBUG_OUTPUT_
qDebug() << "D'tor Connection:" << this;
#endif
- if ( Telepathy::ConnectionStatusDisconnected != d->m_status )
+ if ( Tp::ConnectionStatusDisconnected != d->m_status )
{ requestDisconnect(); }
delete d;
}
@@ -169,20 +169,20 @@ bool Connection::isValid()
return d->m_isValid;
}
-Telepathy::ConnectionStatus Connection::status()
+Tp::ConnectionStatus Connection::status()
{
return d->m_status;
}
-Telepathy::ConnectionStatusReason Connection::reason()
+Tp::ConnectionStatusReason Connection::reason()
{
return d->m_reason;
}
bool Connection::requestConnect()
{
- if ( ( Telepathy::ConnectionStatusConnecting == d->m_status )
- || ( Telepathy::ConnectionStatusConnected == d->m_status ) )
+ if ( ( Tp::ConnectionStatusConnecting == d->m_status )
+ || ( Tp::ConnectionStatusConnected == d->m_status ) )
{ return false; }
startupInit();
@@ -190,7 +190,7 @@ bool Connection::requestConnect()
if ( !d->m_pInterface )
{ return false; }
- d->m_status = Telepathy::ConnectionStatusConnecting;
+ d->m_status = Tp::ConnectionStatusConnecting;
QDBusPendingReply<> connection_connect_reply = d->m_pInterface->Connect();
connection_connect_reply.waitForFinished();
@@ -202,7 +202,7 @@ bool Connection::requestConnect()
<< "Connect: error name:" << error.name()
<< "error message:" << error.message();
- d->m_status = Telepathy::ConnectionStatusDisconnected;
+ d->m_status = Tp::ConnectionStatusDisconnected;
d->m_isValid = false;
return false;
@@ -214,7 +214,7 @@ bool Connection::requestConnect()
bool Connection::requestDisconnect()
{
- if ( ! d->m_pInterface || ! isValid() || ( Telepathy::ConnectionStatusDisconnected == d->m_status ) )
+ if ( ! d->m_pInterface || ! isValid() || ( Tp::ConnectionStatusDisconnected == d->m_status ) )
{ return false; }
QDBusPendingReply<> connection_disconnect_reply = d->m_pInterface->Disconnect();
@@ -230,7 +230,7 @@ bool Connection::requestDisconnect()
}
// Always expect that we are disconnected after this point!
- d->m_status = Telepathy::ConnectionStatusDisconnected;
+ d->m_status = Tp::ConnectionStatusDisconnected;
// Get rid of the contact and presence manager
delete d->m_pContactManager;
@@ -243,7 +243,7 @@ bool Connection::requestDisconnect()
ContactManager* Connection::contactManager()
{
- if ( Telepathy::ConnectionStatusConnected != d->m_status )
+ if ( Tp::ConnectionStatusConnected != d->m_status )
{ return NULL; }
if ( !d->m_pContactManager )
{ d->m_pContactManager = new ContactManager( d->m_pInterface, this ); }
@@ -280,7 +280,7 @@ QString Connection::handle() const
return d->m_objectPath;
}
-Telepathy::Client::ConnectionInterface* Connection::interface()
+Tp::Client::ConnectionInterface* Connection::interface()
{
return d->m_pInterface;
}
@@ -290,9 +290,9 @@ void Connection::slotStatusChanged( uint status, uint reason )
#ifdef ENABLE_DEBUG_OUTPUT_
qDebug() << "Connection::slotStatusChanged() Status:" << status;
#endif
- Telepathy::ConnectionStatus old_status = d->m_status;
- d->m_status = static_cast<Telepathy::ConnectionStatus>( status );
- d->m_reason = static_cast<Telepathy::ConnectionStatusReason>( reason );
+ Tp::ConnectionStatus old_status = d->m_status;
+ d->m_status = static_cast<Tp::ConnectionStatus>( status );
+ d->m_reason = static_cast<Tp::ConnectionStatusReason>( reason );
if ( d->m_status != old_status )
{
@@ -327,7 +327,7 @@ void Connection::slotNewChannel(const QDBusObjectPath& objectPath, const QString
return;
}
- if ( handleType == Telepathy::HandleTypeContact )
+ if ( handleType == Tp::HandleTypeContact )
{
contactManager()->openTextChannel(handle,handleType,objectPath.path(),channelType);
}
@@ -372,9 +372,9 @@ void Connection::slotNewChannel(const QDBusObjectPath& objectPath, const QString
}
}
-QList<uint> Connection::RequestHandles( Telepathy::HandleType handletype, QStringList& handlestrings)
+QList<uint> Connection::RequestHandles( Tp::HandleType handletype, QStringList& handlestrings)
{
- Telepathy::registerTypes();
+ Tp::registerTypes();
return d->m_pInterface->RequestHandles( handletype,handlestrings);
}
@@ -407,7 +407,7 @@ bool Connection::managerSupported( const QString& managerName )
void Connection::init( TpPrototype::Account* account )
{
- Telepathy::registerTypes();
+ Tp::registerTypes();
if ( !account )
{ return; }
diff --git a/TelepathyQt4/Prototype/Connection.h b/TelepathyQt4/Prototype/Connection.h
index 34e4904..14c44f5 100644
--- a/TelepathyQt4/Prototype/Connection.h
+++ b/TelepathyQt4/Prototype/Connection.h
@@ -36,7 +36,7 @@
#define ATTRIBUTE_DEPRECATED
#endif
-namespace Telepathy
+namespace Tp
{
namespace Client
{
@@ -84,20 +84,20 @@ public:
/**
* Connection Status.
* @return The current connection status.
- * @see Telepathy::ConnectionStatus defined in constants.h
+ * @see Tp::ConnectionStatus defined in constants.h
*/
- Telepathy::ConnectionStatus status();
+ Tp::ConnectionStatus status();
/**
* Reason for last state change.
* @return The reason.
- * @see Telepathy::ConnectionStatusReason defined in constants.h
+ * @see Tp::ConnectionStatusReason defined in constants.h
*/
- Telepathy::ConnectionStatusReason reason();
+ Tp::ConnectionStatusReason reason();
/**
* Connect to server.
- * This call is asynchrous. Wait until signalStatusChanged() was emitted and the connection state is Telepathy::ConnectionStatusConnected
+ * This call is asynchrous. Wait until signalStatusChanged() was emitted and the connection state is Tp::ConnectionStatusConnected
* before calling contactManager() or presenceManager() will succeed.
* @see signalStatusChanged()
*/
@@ -170,11 +170,11 @@ signals:
* @param connection The connection which changes its status.
* @param newStatus The new status that is valid now.
* @param oldStatus The old status that was valid before.
- * @see Telepathy::ConnectionStatus
+ * @see Tp::ConnectionStatus
*/
void signalStatusChanged( TpPrototype::Connection* connection,
- Telepathy::ConnectionStatus newStatus,
- Telepathy::ConnectionStatus oldStatus );
+ Tp::ConnectionStatus newStatus,
+ Tp::ConnectionStatus oldStatus );
protected slots:
void slotStatusChanged( uint status, uint reason );
@@ -199,7 +199,7 @@ protected:
* D-BUS interface.
* This protected access to the D-BUS interface can be used to extend this class with special features.
*/
- Telepathy::Client::ConnectionInterface* interface();
+ Tp::Client::ConnectionInterface* interface();
/**
* Provides a generic handle.
@@ -207,7 +207,7 @@ protected:
* @param handlestrings An array of names of entities to request handles for
* @return An array of integer handle numbers in the same order as the given strings
*/
- QList<uint> RequestHandles( Telepathy::HandleType handletype, QStringList& handlestrings);
+ QList<uint> RequestHandles( Tp::HandleType handletype, QStringList& handlestrings);
/**
* Check if manager is supported.
@@ -227,7 +227,7 @@ protected:
pManager = NULL;
}
- if ( status() != Telepathy::ConnectionStatusConnected )
+ if ( status() != Tp::ConnectionStatusConnected )
{ return NULL; }
pManager = new Manager( this, interface(), this );
diff --git a/TelepathyQt4/Prototype/ConnectionFacade.cpp b/TelepathyQt4/Prototype/ConnectionFacade.cpp
index b727e30..3040d36 100644
--- a/TelepathyQt4/Prototype/ConnectionFacade.cpp
+++ b/TelepathyQt4/Prototype/ConnectionFacade.cpp
@@ -74,7 +74,7 @@ ConnectionFacade::~ConnectionFacade()
QStringList ConnectionFacade::listOfConnectionManagers()
{
- Telepathy::registerTypes();
+ Tp::registerTypes();
QStringList ret_list;
@@ -116,7 +116,7 @@ QStringList ConnectionFacade::listOfConnectionManagers()
QStringList ConnectionFacade::listOfProtocolsForConnectionManager( const QString& connectionManager )
{
- Telepathy::registerTypes();
+ Tp::registerTypes();
QStringList empty_list;
@@ -124,7 +124,7 @@ QStringList ConnectionFacade::listOfProtocolsForConnectionManager( const QString
if ( !list_of_connection_managers.contains( connectionManager ) )
{ return empty_list; } // return empty list
- Telepathy::Client::ConnectionManagerInterface connection_manager_interface( "org.freedesktop.Telepathy.ConnectionManager." + connectionManager,
+ Tp::Client::ConnectionManagerInterface connection_manager_interface( "org.freedesktop.Telepathy.ConnectionManager." + connectionManager,
"/org/freedesktop/Telepathy/ConnectionManager/" + connectionManager );
QDBusPendingReply<QStringList> list_protocols_reply = connection_manager_interface.ListProtocols();
@@ -146,14 +146,14 @@ QStringList ConnectionFacade::listOfProtocolsForConnectionManager( const QString
// TODO: Return the parameter list with all flags as we receive it from telepathy. This solution hides the flags and is unable
// to handle all required types..
-Telepathy::ParamSpecList ConnectionFacade::paramSpecListForConnectionManagerAndProtocol( const QString& connectionManager, const QString& protocol )
+Tp::ParamSpecList ConnectionFacade::paramSpecListForConnectionManagerAndProtocol( const QString& connectionManager, const QString& protocol )
{
- Telepathy::registerTypes();
+ Tp::registerTypes();
- Telepathy::Client::ConnectionManagerInterface connection_manager_interface( "org.freedesktop.Telepathy.ConnectionManager." + connectionManager,
+ Tp::Client::ConnectionManagerInterface connection_manager_interface( "org.freedesktop.Telepathy.ConnectionManager." + connectionManager,
"/org/freedesktop/Telepathy/ConnectionManager/" + connectionManager );
- QDBusPendingReply<Telepathy::ParamSpecList> get_parameters_reply = connection_manager_interface.GetParameters( protocol );
+ QDBusPendingReply<Tp::ParamSpecList> get_parameters_reply = connection_manager_interface.GetParameters( protocol );
get_parameters_reply.waitForFinished();
if ( !get_parameters_reply.isValid() )
@@ -164,10 +164,10 @@ Telepathy::ParamSpecList ConnectionFacade::paramSpecListForConnectionManagerAndP
<< "error name:" << error.name()
<< "error message:" << error.message();
- return Telepathy::ParamSpecList() ; // returns empty list
+ return Tp::ParamSpecList() ; // returns empty list
}
- Telepathy::ParamSpecList param_spec_list = get_parameters_reply.value();
+ Tp::ParamSpecList param_spec_list = get_parameters_reply.value();
return param_spec_list;
}
@@ -176,7 +176,7 @@ QVariantMap ConnectionFacade::parameterListForConnectionManagerAndProtocol( cons
{
QVariantMap ret_map;
- foreach( const Telepathy::ParamSpec& item, paramSpecListForConnectionManagerAndProtocol(connectionManager, protocol) )
+ foreach( const Tp::ParamSpec& item, paramSpecListForConnectionManagerAndProtocol(connectionManager, protocol) )
{
ret_map.insert( item.name, item.defaultValue.variant() );
#ifdef ENABLE_DEBUG_OUTPUT_
@@ -198,7 +198,7 @@ QVariantMap ConnectionFacade::parameterListForConnectionManagerAndProtocol( cons
QVariantMap ConnectionFacade::parameterListForProtocol( const QString& protocol, int account_number )
{
- Telepathy::registerTypes();
+ Tp::registerTypes();
QVariantMap ret_map;
@@ -212,7 +212,7 @@ QVariantMap ConnectionFacade::parameterListForProtocol( const QString& protocol,
}
ret_map.insert( "password", "basyskom" );
ret_map.insert( "server", "localhost" );
- ret_map.insert( "resource", "Telepathy" );
+ ret_map.insert( "resource", "Tp" );
ret_map.insert( "port", static_cast<uint>(5222) );
return ret_map;
}
@@ -220,7 +220,7 @@ QVariantMap ConnectionFacade::parameterListForProtocol( const QString& protocol,
// account_number is used for test purposes only we have to delte this later
TpPrototype::Connection* ConnectionFacade::connectionWithAccount( Account* account, int account_number )
{
- Telepathy::registerTypes();
+ Tp::registerTypes();
if ( !account )
{ return NULL; }
@@ -236,7 +236,7 @@ TpPrototype::Connection* ConnectionFacade::connectionWithAccount( Account* accou
return account->connection();
}
-int ConnectionFacade::selfHandleForConnectionInterface( Telepathy::Client::ConnectionInterface* connectionInterface )
+int ConnectionFacade::selfHandleForConnectionInterface( Tp::Client::ConnectionInterface* connectionInterface )
{
if ( !connectionInterface )
{
diff --git a/TelepathyQt4/Prototype/ConnectionFacade.h b/TelepathyQt4/Prototype/ConnectionFacade.h
index c567630..80543b4 100644
--- a/TelepathyQt4/Prototype/ConnectionFacade.h
+++ b/TelepathyQt4/Prototype/ConnectionFacade.h
@@ -34,7 +34,7 @@
#define ATTRIBUTE_DEPRECATED
#endif
-namespace Telepathy
+namespace Tp
{
namespace Client
{
@@ -49,7 +49,7 @@ namespace TpPrototype
* @defgroup qt_style_api Prototype Qt-Style Client API
*
* This API provides a high level client side API that enables developers
- * to access to Telepathy on a high level of abstraction. However, the
+ * to access to Tp on a high level of abstraction. However, the
* implementation is problematic in places.
*
* Work is in progress to merge the functionality of this prototype API into
@@ -69,8 +69,8 @@ class Account;
/**
* @ingroup qt_convenience
- * Class to access to Telepathy and Mission control services. This class is used to encapsulate the low level D-BUS Interface
- * to Telepathy and MissionControl. It provides a series of helper functions.<br>
+ * Class to access to Tp and Mission control services. This class is used to encapsulate the low level D-BUS Interface
+ * to Tp and MissionControl. It provides a series of helper functions.<br>
* This class follows the <i>facade</i> pattern.
* @todo Move as much functions as possible into adequate classes.
*/
@@ -92,12 +92,12 @@ public:
QStringList listOfProtocolsForConnectionManager( const QString& connectionManager );
/**
- * Returns a Telepathy::ParamSpecList from the given protocol an connection manager.
+ * Returns a Tp::ParamSpecList from the given protocol an connection manager.
* @param connectionManager The connection manager for the protocol.
* @param protocol Name of the protocol that is supported by the connection manager.
* @return A map with all supported parameters with default values.
*/
- Telepathy::ParamSpecList paramSpecListForConnectionManagerAndProtocol( const QString& connectionManager, const QString& protocol );
+ Tp::ParamSpecList paramSpecListForConnectionManagerAndProtocol( const QString& connectionManager, const QString& protocol );
/**
* Returns a list of parameters for the given protocol and connection manager.
@@ -128,7 +128,7 @@ public:
* @todo: This is more or less a local function and should not be part of a public API. But I don't have a better place right now!
* @return The local handle is usually 1 but may change on demand. -1 is returned on error.
*/
- int selfHandleForConnectionInterface( Telepathy::Client::ConnectionInterface* connectionInterface );
+ int selfHandleForConnectionInterface( Tp::Client::ConnectionInterface* connectionInterface );
private:
ConnectionFacade( QObject* parent );
diff --git a/TelepathyQt4/Prototype/Contact.cpp b/TelepathyQt4/Prototype/Contact.cpp
index a828497..9dec667 100644
--- a/TelepathyQt4/Prototype/Contact.cpp
+++ b/TelepathyQt4/Prototype/Contact.cpp
@@ -38,7 +38,7 @@ class TpPrototype::ContactPrivate
{
public:
ContactPrivate( const uint & handle, const QString & name, Contact::ContactTypes type,
- Telepathy::Client::ConnectionInterface* connectionInterface, TpPrototype::ContactManager* contactManager )
+ Tp::Client::ConnectionInterface* connectionInterface, TpPrototype::ContactManager* contactManager )
{ init(handle, name, type, connectionInterface, contactManager); }
~ContactPrivate()
{}
@@ -50,16 +50,16 @@ public:
uint m_presenceType;
QString m_presenceStatus;
QString m_presenceMessage;
- Telepathy::ContactCapabilityList m_capabilityList;
+ Tp::ContactCapabilityList m_capabilityList;
TpPrototype::AvatarManager::Avatar m_avatar;
- Telepathy::Client::ConnectionInterface* m_pConnectionInterface;
+ Tp::Client::ConnectionInterface* m_pConnectionInterface;
QPointer<TpPrototype::ChatChannel> m_pChatChannel;
QPointer<TpPrototype::StreamedMediaChannel> m_pStreamedMediaChannel;
QPointer<TpPrototype::ContactManager> m_pContactManager;
private:
void init( uint handle, const QString & name, Contact::ContactTypes type,
- Telepathy::Client::ConnectionInterface* connectionInterface, TpPrototype::ContactManager* contactManager )
+ Tp::Client::ConnectionInterface* connectionInterface, TpPrototype::ContactManager* contactManager )
{
Q_ASSERT( connectionInterface );
Q_ASSERT( contactManager );
@@ -87,7 +87,7 @@ uint Contact::telepathyHandle() const
{ return d->m_handle; }
uint Contact::telepathyHandleType() const
-{ return Telepathy::HandleTypeContact; }
+{ return Tp::HandleTypeContact; }
QString Contact::name() const
{ return d->m_name; }
@@ -130,10 +130,10 @@ void Contact::setPresenceMessage( QString _presenceMessage)
QString Contact::presenceMessage()
{ return d->m_presenceMessage; }
-void Contact::setCapabilities( const Telepathy::ContactCapabilityList& capabilityList )
+void Contact::setCapabilities( const Tp::ContactCapabilityList& capabilityList )
{ d->m_capabilityList = capabilityList; }
-Telepathy::ContactCapabilityList Contact::capabilities() const
+Tp::ContactCapabilityList Contact::capabilities() const
{ return d->m_capabilityList; }
void Contact::setAvatar( const TpPrototype::AvatarManager::Avatar& avatar )
@@ -141,7 +141,7 @@ void Contact::setAvatar( const TpPrototype::AvatarManager::Avatar& avatar )
d->m_avatar = avatar;
}
-Telepathy::Client::ConnectionInterface* Contact::interface()
+Tp::Client::ConnectionInterface* Contact::interface()
{
return d->m_pConnectionInterface;
}
@@ -179,7 +179,7 @@ TpPrototype::ContactManager* Contact::contactManager()
Contact::Contact( const uint & handle, const QString & url, ContactTypes type,
- Telepathy::Client::ConnectionInterface* connectionInterface, TpPrototype::ContactManager* contactManager ) :
+ Tp::Client::ConnectionInterface* connectionInterface, TpPrototype::ContactManager* contactManager ) :
QObject( contactManager ),
d( new ContactPrivate( handle, url, type, connectionInterface, contactManager ) )
{
diff --git a/TelepathyQt4/Prototype/Contact.h b/TelepathyQt4/Prototype/Contact.h
index b07eef2..2b7eb5e 100644
--- a/TelepathyQt4/Prototype/Contact.h
+++ b/TelepathyQt4/Prototype/Contact.h
@@ -37,7 +37,7 @@
#define ATTRIBUTE_DEPRECATED
#endif
-namespace Telepathy
+namespace Tp
{
namespace Client
{
@@ -124,7 +124,7 @@ public:
* @todo Implement this!
* @see PresenceManager
*/
- Telepathy::SimplePresence presence() { return Telepathy::SimplePresence(); /* TODO: Implement me ! */ };
+ Tp::SimplePresence presence() { return Tp::SimplePresence(); /* TODO: Implement me ! */ };
/**
* @todo: Add Doc and get/setr in presence manager
@@ -158,7 +158,7 @@ public:
* @todo: Add Doc and get/setr in presence manager
*
*/
- Telepathy::ContactCapabilityList capabilities() const;
+ Tp::ContactCapabilityList capabilities() const;
/**
@@ -193,7 +193,7 @@ protected:
* This object is never created directly. Use ContactManager to create or request a contact.
* @see ContactManager
*/
- Contact( const uint & handle, const QString & name, ContactTypes type, Telepathy::Client::ConnectionInterface* connectionInterface, TpPrototype::ContactManager* contactManager );
+ Contact( const uint & handle, const QString & name, ContactTypes type, Tp::Client::ConnectionInterface* connectionInterface, TpPrototype::ContactManager* contactManager );
~Contact();
@@ -215,7 +215,7 @@ protected:
/**
* @todo: Add Doc and get/setr in presence manager
*/
- void setCapabilities( const Telepathy::ContactCapabilityList& capabilityList );
+ void setCapabilities( const Tp::ContactCapabilityList& capabilityList );
/**
* Set the avatar.
@@ -228,7 +228,7 @@ protected:
* D-BUS interface.
* This protected access to the D-BUS interface can be used to extend this class with special features.
*/
- Telepathy::Client::ConnectionInterface* interface();
+ Tp::Client::ConnectionInterface* interface();
private:
diff --git a/TelepathyQt4/Prototype/ContactManager.cpp b/TelepathyQt4/Prototype/ContactManager.cpp
index af9794b..4145843 100644
--- a/TelepathyQt4/Prototype/ContactManager.cpp
+++ b/TelepathyQt4/Prototype/ContactManager.cpp
@@ -52,12 +52,12 @@ public:
~ContactManagerPrivate()
{ }
- Telepathy::Client::ConnectionInterface* m_pInterface;
- Telepathy::Client::ChannelInterfaceGroupInterface* m_groupSubscribedChannel;
- Telepathy::Client::ChannelInterfaceGroupInterface* m_groupKnownChannel;
- Telepathy::Client::ChannelInterfaceGroupInterface* m_groupPublishedChannel;
- Telepathy::Client::ChannelInterfaceGroupInterface* m_groupDeniedChannel;
- Telepathy::Client::ChannelTypeTextInterface* m_groupTextChannel;
+ Tp::Client::ConnectionInterface* m_pInterface;
+ Tp::Client::ChannelInterfaceGroupInterface* m_groupSubscribedChannel;
+ Tp::Client::ChannelInterfaceGroupInterface* m_groupKnownChannel;
+ Tp::Client::ChannelInterfaceGroupInterface* m_groupPublishedChannel;
+ Tp::Client::ChannelInterfaceGroupInterface* m_groupDeniedChannel;
+ Tp::Client::ChannelTypeTextInterface* m_groupTextChannel;
QHash<uint, QPointer<Contact> > m_members;
QHash<uint, QPointer<Contact> > m_subscribed;
@@ -79,7 +79,7 @@ public:
}
// Returns a list of all <i>handles</i> already <i>contained</i> in <i>list</i>
- QList<uint> handlesToLookUp( const QHash<uint, QPointer<Contact> >& list, const Telepathy::UIntList& handles, bool contained )
+ QList<uint> handlesToLookUp( const QHash<uint, QPointer<Contact> >& list, const Tp::UIntList& handles, bool contained )
{
QList<uint> to_look_up;
foreach(uint handle, handles)
@@ -90,37 +90,37 @@ public:
return to_look_up;
}
- QList<uint> subscribedHandlesToLookUp(const Telepathy::UIntList& handles)
+ QList<uint> subscribedHandlesToLookUp(const Tp::UIntList& handles)
{
return handlesToLookUp( m_subscribed, handles, false );
}
- QList<uint> newKnownHandlesToLookUp(const Telepathy::UIntList& handles)
+ QList<uint> newKnownHandlesToLookUp(const Tp::UIntList& handles)
{
return handlesToLookUp( m_members, handles, false );
}
- QList<uint> removedHandlesToLookUp(const Telepathy::UIntList& handles)
+ QList<uint> removedHandlesToLookUp(const Tp::UIntList& handles)
{
return handlesToLookUp( m_members, handles, true );
}
- QList<uint> localPendingHandlesToLookUp(const Telepathy::UIntList& handles)
+ QList<uint> localPendingHandlesToLookUp(const Tp::UIntList& handles)
{
return handlesToLookUp( m_localPending, handles, false );
}
- QList<uint> remotePendingHandlesToLookUp(const Telepathy::UIntList& handles)
+ QList<uint> remotePendingHandlesToLookUp(const Tp::UIntList& handles)
{
return handlesToLookUp( m_remotePending, handles, false );
}
- QList<uint> newDeniedHandles( const Telepathy::UIntList& handles )
+ QList<uint> newDeniedHandles( const Tp::UIntList& handles )
{
return handlesToLookUp( m_denied, handles, false );
}
- QList<uint> removedDeniedHandles( const Telepathy::UIntList& handles )
+ QList<uint> removedDeniedHandles( const Tp::UIntList& handles )
{
return handlesToLookUp( m_denied, handles, true );
}
@@ -143,7 +143,7 @@ public:
};
-ContactManager::ContactManager( Telepathy::Client::ConnectionInterface* connection,
+ContactManager::ContactManager( Tp::Client::ConnectionInterface* connection,
QObject* parent ):
QObject( parent ),
d( new ContactManagerPrivate )
@@ -184,10 +184,10 @@ QList<QPointer<Contact> > ContactManager::remoteAuthorizationPendingList()
QList<QPointer<Contact> > ContactManager::blockedContacts()
{ return d->m_denied.values(); }
-void ContactManager::init( Telepathy::Client::ConnectionInterface* connection )
+void ContactManager::init( Tp::Client::ConnectionInterface* connection )
{
Q_ASSERT(0 != connection);
- Telepathy::registerTypes();
+ Tp::registerTypes();
d->m_pInterface = connection;
#ifdef ENABLE_DEBUG_OUTPUT_
qDebug() << "ContactManager up and running... waiting for signals.";
@@ -200,7 +200,7 @@ bool ContactManager::requestContact( const QString& id )
QStringList contact_ids;
contact_ids.append(id);
- QList<uint> contact_handles=d->m_pInterface->RequestHandles( Telepathy::HandleTypeContact,contact_ids);
+ QList<uint> contact_handles=d->m_pInterface->RequestHandles( Tp::HandleTypeContact,contact_ids);
if (!contact_handles.empty())
{
if ( d->m_groupSubscribedChannel)
@@ -293,14 +293,14 @@ uint ContactManager::localHandle()
/*
- inline QDBusPendingReply<> AcknowledgePendingMessages(const Telepathy::UIntList& IDs)
+ inline QDBusPendingReply<> AcknowledgePendingMessages(const Tp::UIntList& IDs)
{
QList<QVariant> argumentList;
argumentList << QVariant::fromValue(IDs);
return asyncCallWithArgumentList(QLatin1String("AcknowledgePendingMessages"), argumentList);
}
- inline QDBusPendingReply<Telepathy::UIntList> GetMessageTypes()
+ inline QDBusPendingReply<Tp::UIntList> GetMessageTypes()
{
return asyncCall(QLatin1String("GetMessageTypes"));
}
@@ -316,7 +316,7 @@ void ContactManager::openSubscribedContactsChannel(uint handle, const QDBusObjec
qDebug() << "ContactManager Channel Path" << channelPath.path();
#endif
// This channel may never be closed!
- d->m_groupSubscribedChannel = new Telepathy::Client::ChannelInterfaceGroupInterface(channel_service_name,channelPath.path(),
+ d->m_groupSubscribedChannel = new Tp::Client::ChannelInterfaceGroupInterface(channel_service_name,channelPath.path(),
this);
if (!d->m_groupSubscribedChannel->isValid())
{
@@ -327,13 +327,13 @@ void ContactManager::openSubscribedContactsChannel(uint handle, const QDBusObjec
d->m_groupSubscribedChannel = 0;
return;
}
- QDBusPendingReply<Telepathy::UIntList, Telepathy::UIntList, Telepathy::UIntList> reply2=d->m_groupSubscribedChannel->GetAllMembers();
+ QDBusPendingReply<Tp::UIntList, Tp::UIntList, Tp::UIntList> reply2=d->m_groupSubscribedChannel->GetAllMembers();
reply2.waitForFinished();
- const Telepathy::UIntList mlist1= QList< quint32 > (reply2.argumentAt<0>());
- const Telepathy::UIntList mlist2;
- const Telepathy::UIntList mlist3= QList< quint32 > (reply2.argumentAt<1>());
- const Telepathy::UIntList mlist4= QList< quint32 > (reply2.argumentAt<2>());
+ const Tp::UIntList mlist1= QList< quint32 > (reply2.argumentAt<0>());
+ const Tp::UIntList mlist2;
+ const Tp::UIntList mlist3= QList< quint32 > (reply2.argumentAt<1>());
+ const Tp::UIntList mlist4= QList< quint32 > (reply2.argumentAt<2>());
#ifdef ENABLE_DEBUG_OUTPUT_
qDebug() << "Number of current members" << mlist1.size();
qDebug() << "Number of local pending members" << mlist2.size();
@@ -350,16 +350,16 @@ void ContactManager::openSubscribedContactsChannel(uint handle, const QDBusObjec
// All lists are empty when the channel is created, so it suffices to connect
// the MembersChanged signal.
connect(d->m_groupSubscribedChannel, SIGNAL(MembersChanged(const QString&,
- const Telepathy::UIntList&, // added to members list
- const Telepathy::UIntList&, // removed from members list
- const Telepathy::UIntList&, // local pending list
- const Telepathy::UIntList&, // remote pending list
+ const Tp::UIntList&, // added to members list
+ const Tp::UIntList&, // removed from members list
+ const Tp::UIntList&, // local pending list
+ const Tp::UIntList&, // remote pending list
uint, uint)),
this, SLOT(slotSubscribedMembersChanged(const QString&,
- const Telepathy::UIntList&,
- const Telepathy::UIntList&,
- const Telepathy::UIntList&,
- const Telepathy::UIntList&,
+ const Tp::UIntList&,
+ const Tp::UIntList&,
+ const Tp::UIntList&,
+ const Tp::UIntList&,
uint, uint)));
}
@@ -372,7 +372,7 @@ void ContactManager::openKnownContactsChannel(uint handle, const QDBusObjectPath
qDebug() << "ContactManager Channel Path" << channelPath.path();
#endif
// This channel may never be closed!
- d->m_groupKnownChannel = new Telepathy::Client::ChannelInterfaceGroupInterface(channel_service_name,channelPath.path(),
+ d->m_groupKnownChannel = new Tp::Client::ChannelInterfaceGroupInterface(channel_service_name,channelPath.path(),
this);
if (!d->m_groupKnownChannel->isValid())
{
@@ -383,13 +383,13 @@ void ContactManager::openKnownContactsChannel(uint handle, const QDBusObjectPath
d->m_groupKnownChannel = 0;
return;
}
- QDBusPendingReply<Telepathy::UIntList, Telepathy::UIntList, Telepathy::UIntList> reply2=d->m_groupKnownChannel->GetAllMembers();
+ QDBusPendingReply<Tp::UIntList, Tp::UIntList, Tp::UIntList> reply2=d->m_groupKnownChannel->GetAllMembers();
reply2.waitForFinished();
- const Telepathy::UIntList mlist1= QList< quint32 > (reply2.argumentAt<0>());
- const Telepathy::UIntList mlist2;
- const Telepathy::UIntList mlist3= QList< quint32 > (reply2.argumentAt<1>());
- const Telepathy::UIntList mlist4= QList< quint32 > (reply2.argumentAt<2>());
+ const Tp::UIntList mlist1= QList< quint32 > (reply2.argumentAt<0>());
+ const Tp::UIntList mlist2;
+ const Tp::UIntList mlist3= QList< quint32 > (reply2.argumentAt<1>());
+ const Tp::UIntList mlist4= QList< quint32 > (reply2.argumentAt<2>());
#ifdef ENABLE_DEBUG_OUTPUT_
qDebug() << "Number of current members" << mlist1.size();
qDebug() << "Number of local pending members" << mlist2.size();
@@ -406,16 +406,16 @@ void ContactManager::openKnownContactsChannel(uint handle, const QDBusObjectPath
// All lists are empty when the channel is created, so it suffices to connect
// the MembersChanged signal.
connect(d->m_groupKnownChannel, SIGNAL(MembersChanged(const QString&,
- const Telepathy::UIntList&, // added to members list
- const Telepathy::UIntList&, // removed from members list
- const Telepathy::UIntList&, // local pending list
- const Telepathy::UIntList&, // remote pending list
+ const Tp::UIntList&, // added to members list
+ const Tp::UIntList&, // removed from members list
+ const Tp::UIntList&, // local pending list
+ const Tp::UIntList&, // remote pending list
uint, uint)),
this, SLOT(slotKnownMembersChanged(const QString&,
- const Telepathy::UIntList&,
- const Telepathy::UIntList&,
- const Telepathy::UIntList&,
- const Telepathy::UIntList&,
+ const Tp::UIntList&,
+ const Tp::UIntList&,
+ const Tp::UIntList&,
+ const Tp::UIntList&,
uint, uint)));
}
@@ -428,7 +428,7 @@ void ContactManager::openDenyContactsChannel(uint handle, const QDBusObjectPath&
qDebug() << "ContactManager Channel Path" << channelPath.path();
#endif
// This channel may never be closed!
- d->m_groupDeniedChannel = new Telepathy::Client::ChannelInterfaceGroupInterface(channel_service_name,channelPath.path(),
+ d->m_groupDeniedChannel = new Tp::Client::ChannelInterfaceGroupInterface(channel_service_name,channelPath.path(),
this);
if (!d->m_groupDeniedChannel->isValid())
{
@@ -440,12 +440,12 @@ void ContactManager::openDenyContactsChannel(uint handle, const QDBusObjectPath&
return;
}
- QDBusPendingReply<Telepathy::UIntList, Telepathy::UIntList, Telepathy::UIntList> reply2=d->m_groupKnownChannel->GetAllMembers();
+ QDBusPendingReply<Tp::UIntList, Tp::UIntList, Tp::UIntList> reply2=d->m_groupKnownChannel->GetAllMembers();
reply2.waitForFinished();
- const Telepathy::UIntList current = QList< quint32 > (reply2.argumentAt<0>());
- const Telepathy::UIntList local_pending = QList< quint32 > (reply2.argumentAt<1>());
- const Telepathy::UIntList remote_pending = QList< quint32 > (reply2.argumentAt<2>());
+ const Tp::UIntList current = QList< quint32 > (reply2.argumentAt<0>());
+ const Tp::UIntList local_pending = QList< quint32 > (reply2.argumentAt<1>());
+ const Tp::UIntList remote_pending = QList< quint32 > (reply2.argumentAt<2>());
#ifdef ENABLE_DEBUG_OUTPUT_
qDebug() << "Denied-Members: Number of current members" << current.size();
qDebug() << "Denied-Members: Number of local pending members" << local_pending.size();
@@ -454,7 +454,7 @@ void ContactManager::openDenyContactsChannel(uint handle, const QDBusObjectPath&
if (( current.size()>0) || ( local_pending.size()>0) || ( remote_pending.size()>0))
slotDeniedMembersChanged("",
current,
- Telepathy::UIntList(),
+ Tp::UIntList(),
local_pending,
remote_pending,
0, 0);
@@ -462,17 +462,17 @@ void ContactManager::openDenyContactsChannel(uint handle, const QDBusObjectPath&
// All lists are empty when the channel is created, so it suffices to connect
// the MembersChanged signal.
connect(d->m_groupDeniedChannel, SIGNAL(MembersChanged(const QString&,
- const Telepathy::UIntList&, // added to members list
- const Telepathy::UIntList&, // removed from members list
- const Telepathy::UIntList&, // local pending list
- const Telepathy::UIntList&, // remote pending list
+ const Tp::UIntList&, // added to members list
+ const Tp::UIntList&, // removed from members list
+ const Tp::UIntList&, // local pending list
+ const Tp::UIntList&, // remote pending list
uint, // actor
uint)), // reason
this, SLOT(slotDeniedMembersChanged(const QString&,
- const Telepathy::UIntList&,
- const Telepathy::UIntList&,
- const Telepathy::UIntList&,
- const Telepathy::UIntList&,
+ const Tp::UIntList&,
+ const Tp::UIntList&,
+ const Tp::UIntList&,
+ const Tp::UIntList&,
uint, uint)));
}
@@ -543,7 +543,7 @@ void ContactManager::openPublishContactsChannel(uint handle, const QDBusObjectPa
qDebug() << "ContactManager Channel Path" << channelPath.path();
#endif
// This channel may never be closed!
- d->m_groupPublishedChannel = new Telepathy::Client::ChannelInterfaceGroupInterface(channel_service_name,channelPath.path(),
+ d->m_groupPublishedChannel = new Tp::Client::ChannelInterfaceGroupInterface(channel_service_name,channelPath.path(),
this);
if (!d->m_groupPublishedChannel->isValid())
{
@@ -554,13 +554,13 @@ void ContactManager::openPublishContactsChannel(uint handle, const QDBusObjectPa
d->m_groupPublishedChannel = 0;
return;
}
- QDBusPendingReply<Telepathy::UIntList, Telepathy::UIntList, Telepathy::UIntList> reply2=d->m_groupPublishedChannel->GetAllMembers();
+ QDBusPendingReply<Tp::UIntList, Tp::UIntList, Tp::UIntList> reply2=d->m_groupPublishedChannel->GetAllMembers();
reply2.waitForFinished();
- const Telepathy::UIntList mlist1= QList< quint32 > (reply2.argumentAt<0>());
- const Telepathy::UIntList mlist2;
- const Telepathy::UIntList mlist3= QList< quint32 > (reply2.argumentAt<1>());
- const Telepathy::UIntList mlist4= QList< quint32 > (reply2.argumentAt<2>());
+ const Tp::UIntList mlist1= QList< quint32 > (reply2.argumentAt<0>());
+ const Tp::UIntList mlist2;
+ const Tp::UIntList mlist3= QList< quint32 > (reply2.argumentAt<1>());
+ const Tp::UIntList mlist4= QList< quint32 > (reply2.argumentAt<2>());
#ifdef ENABLE_DEBUG_OUTPUT_
qDebug() << "Number of current members" << mlist1.size();
qDebug() << "Number of local pending members" << mlist2.size();
@@ -580,16 +580,16 @@ void ContactManager::openPublishContactsChannel(uint handle, const QDBusObjectPa
// All lists are empty when the channel is created, so it suffices to connect
// the MembersChanged signal.
connect(d->m_groupPublishedChannel, SIGNAL(MembersChanged(const QString&,
- const Telepathy::UIntList&, // added to members list
- const Telepathy::UIntList&, // removed from members list
- const Telepathy::UIntList&, // local pending list
- const Telepathy::UIntList&, // remote pending list
+ const Tp::UIntList&, // added to members list
+ const Tp::UIntList&, // removed from members list
+ const Tp::UIntList&, // local pending list
+ const Tp::UIntList&, // remote pending list
uint, uint)),
this, SLOT(slotPublishedMembersChanged(const QString&,
- const Telepathy::UIntList&,
- const Telepathy::UIntList&,
- const Telepathy::UIntList&,
- const Telepathy::UIntList&,
+ const Tp::UIntList&,
+ const Tp::UIntList&,
+ const Tp::UIntList&,
+ const Tp::UIntList&,
uint, uint)));
}
@@ -597,10 +597,10 @@ void ContactManager::openPublishContactsChannel(uint handle, const QDBusObjectPa
void ContactManager::slotKnownMembersChanged(const QString& message,
- const Telepathy::UIntList& members_added,
- const Telepathy::UIntList& members_removed,
- const Telepathy::UIntList& local_pending,
- const Telepathy::UIntList& remote_pending,
+ const Tp::UIntList& members_added,
+ const Tp::UIntList& members_removed,
+ const Tp::UIntList& local_pending,
+ const Tp::UIntList& remote_pending,
uint actor, uint reason)
{
slotMembersChanged("Known",
@@ -611,10 +611,10 @@ void ContactManager::slotKnownMembersChanged(const QString& message,
actor, reason);
}
void ContactManager::slotPublishedMembersChanged(const QString& message,
- const Telepathy::UIntList& members_added,
- const Telepathy::UIntList& members_removed,
- const Telepathy::UIntList& local_pending,
- const Telepathy::UIntList& remote_pending,
+ const Tp::UIntList& members_added,
+ const Tp::UIntList& members_removed,
+ const Tp::UIntList& local_pending,
+ const Tp::UIntList& remote_pending,
uint actor, uint reason)
{
slotMembersChanged("Published",
@@ -626,10 +626,10 @@ void ContactManager::slotPublishedMembersChanged(const QString& message,
}
void ContactManager::slotSubscribedMembersChanged(const QString& message,
- const Telepathy::UIntList& members_added,
- const Telepathy::UIntList& members_removed,
- const Telepathy::UIntList& local_pending,
- const Telepathy::UIntList& remote_pending,
+ const Tp::UIntList& members_added,
+ const Tp::UIntList& members_removed,
+ const Tp::UIntList& local_pending,
+ const Tp::UIntList& remote_pending,
uint actor, uint reason)
{
slotMembersChanged("Subscribed",
@@ -641,10 +641,10 @@ void ContactManager::slotSubscribedMembersChanged(const QString& message,
}
void ContactManager::slotDeniedMembersChanged(const QString& message,
- const Telepathy::UIntList& members_added,
- const Telepathy::UIntList& members_removed,
- const Telepathy::UIntList& local_pending,
- const Telepathy::UIntList& remote_pending,
+ const Tp::UIntList& members_added,
+ const Tp::UIntList& members_removed,
+ const Tp::UIntList& local_pending,
+ const Tp::UIntList& remote_pending,
uint actor,
uint reason)
{
@@ -663,7 +663,7 @@ void ContactManager::slotDeniedMembersChanged(const QString& message,
}
// Members that are not already known (in list of members): create new contact.
- QDBusPendingReply<QStringList> handle_names_reply = d->m_pInterface->InspectHandles( Telepathy::HandleTypeContact, new_members );
+ QDBusPendingReply<QStringList> handle_names_reply = d->m_pInterface->InspectHandles( Tp::HandleTypeContact, new_members );
handle_names_reply.waitForFinished();
if ( !handle_names_reply.isValid() )
{
@@ -711,10 +711,10 @@ void ContactManager::slotDeniedMembersChanged(const QString& message,
// TODO: This function is a real beast. It should be split into separate functions. Rethink whether it is a good idea
// to map all slots to this functions!?
void ContactManager::slotMembersChanged(const QString& message,
- const Telepathy::UIntList& members_added,
- const Telepathy::UIntList& members_removed,
- const Telepathy::UIntList& local_pending,
- const Telepathy::UIntList& remote_pending,
+ const Tp::UIntList& members_added,
+ const Tp::UIntList& members_removed,
+ const Tp::UIntList& local_pending,
+ const Tp::UIntList& remote_pending,
uint actor, uint reason)
{
static bool is_already_in = false; // FIXME: Remove this until RTCHM-329
@@ -741,7 +741,7 @@ void ContactManager::slotMembersChanged(const QString& message,
QList<uint> known_to_look_up(d->newKnownHandlesToLookUp(members_added));
// look up 'missing' handles:
QDBusPendingReply<QStringList> handle_names =
- d->m_pInterface->InspectHandles(Telepathy::HandleTypeContact, known_to_look_up);
+ d->m_pInterface->InspectHandles(Tp::HandleTypeContact, known_to_look_up);
handle_names.waitForFinished();
if (!handle_names.isValid())
{
@@ -811,7 +811,7 @@ void ContactManager::slotMembersChanged(const QString& message,
// look up 'missing' handles:
QDBusPendingReply<QStringList> handle_names =
- d->m_pInterface->InspectHandles(Telepathy::HandleTypeContact, subscribed_to_look_up);
+ d->m_pInterface->InspectHandles(Tp::HandleTypeContact, subscribed_to_look_up);
handle_names.waitForFinished();
if (!handle_names.isValid())
{
@@ -911,7 +911,7 @@ void ContactManager::slotMembersChanged(const QString& message,
QList<uint> localPending_to_look_up(d->localPendingHandlesToLookUp(local_pending));
// look up 'missing' handles:
QDBusPendingReply<QStringList> handle_names =
- d->m_pInterface->InspectHandles(Telepathy::HandleTypeContact, localPending_to_look_up);
+ d->m_pInterface->InspectHandles(Tp::HandleTypeContact, localPending_to_look_up);
handle_names.waitForFinished();
if (!handle_names.isValid())
{
@@ -983,7 +983,7 @@ void ContactManager::slotMembersChanged(const QString& message,
// look up 'missing' handles:
QDBusPendingReply<QStringList> handle_names =
- d->m_pInterface->InspectHandles(Telepathy::HandleTypeContact, remotePending_to_look_up);
+ d->m_pInterface->InspectHandles(Tp::HandleTypeContact, remotePending_to_look_up);
handle_names.waitForFinished();
if (!handle_names.isValid())
@@ -1068,7 +1068,7 @@ void ContactManager::slotMembersChanged(const QString& message,
QList<uint> removed_to_look_up(d->removedHandlesToLookUp(members_removed));
// look up 'missing' handles:
QDBusPendingReply<QStringList> handle_names =
- d->m_pInterface->InspectHandles(Telepathy::HandleTypeContact, removed_to_look_up);
+ d->m_pInterface->InspectHandles(Tp::HandleTypeContact, removed_to_look_up);
handle_names.waitForFinished();
if (!handle_names.isValid())
{
@@ -1139,7 +1139,7 @@ void ContactManager::slotMembersChanged(const QString& message,
d->mapHashToList( d->m_localPending ),
d->mapHashToList( d->m_remotePending ),
contactForHandle( actor ),
- static_cast<Telepathy::ChannelGroupChangeReason>( reason ) );
+ static_cast<Tp::ChannelGroupChangeReason>( reason ) );
}
#include "_gen/ContactManager.h.moc"
diff --git a/TelepathyQt4/Prototype/ContactManager.h b/TelepathyQt4/Prototype/ContactManager.h
index 4496946..64fc0ac 100644
--- a/TelepathyQt4/Prototype/ContactManager.h
+++ b/TelepathyQt4/Prototype/ContactManager.h
@@ -44,7 +44,7 @@
-namespace Telepathy
+namespace Tp
{
namespace Client
{
@@ -273,13 +273,13 @@ signals:
QList<QPointer<TpPrototype ::Contact> > localPending,
QList<QPointer<TpPrototype ::Contact> > remotePending,
TpPrototype ::Contact* actor,
- Telepathy::ChannelGroupChangeReason reason );
+ Tp::ChannelGroupChangeReason reason );
protected:
/**
* Constructor. The contact manager cannot be instantiated directly. Use Connection::contactManager() for it!
*/
- ContactManager( Telepathy::Client::ConnectionInterface* connection,
+ ContactManager( Tp::Client::ConnectionInterface* connection,
QObject* parent = NULL );
~ContactManager();
@@ -308,37 +308,37 @@ protected:
protected slots:
void slotMembersChanged(const QString& message,
- const Telepathy::UIntList& members_added,
- const Telepathy::UIntList& members_removed,
- const Telepathy::UIntList& local_pending,
- const Telepathy::UIntList& remote_pending,
+ const Tp::UIntList& members_added,
+ const Tp::UIntList& members_removed,
+ const Tp::UIntList& local_pending,
+ const Tp::UIntList& remote_pending,
uint actor, uint reason);
void slotKnownMembersChanged(const QString& message,
- const Telepathy::UIntList& members_added,
- const Telepathy::UIntList& members_removed,
- const Telepathy::UIntList& local_pending,
- const Telepathy::UIntList& remote_pending,
+ const Tp::UIntList& members_added,
+ const Tp::UIntList& members_removed,
+ const Tp::UIntList& local_pending,
+ const Tp::UIntList& remote_pending,
uint actor, uint reason);
void slotPublishedMembersChanged(const QString& message,
- const Telepathy::UIntList& members_added,
- const Telepathy::UIntList& members_removed,
- const Telepathy::UIntList& local_pending,
- const Telepathy::UIntList& remote_pending,
+ const Tp::UIntList& members_added,
+ const Tp::UIntList& members_removed,
+ const Tp::UIntList& local_pending,
+ const Tp::UIntList& remote_pending,
uint actor, uint reason);
void slotSubscribedMembersChanged(const QString& message,
- const Telepathy::UIntList& members_added,
- const Telepathy::UIntList& members_removed,
- const Telepathy::UIntList& local_pending,
- const Telepathy::UIntList& remote_pending,
+ const Tp::UIntList& members_added,
+ const Tp::UIntList& members_removed,
+ const Tp::UIntList& local_pending,
+ const Tp::UIntList& remote_pending,
uint actor, uint reason);
void slotDeniedMembersChanged(const QString& message,
- const Telepathy::UIntList& members_added,
- const Telepathy::UIntList& members_removed,
- const Telepathy::UIntList& local_pending,
- const Telepathy::UIntList& remote_pending,
+ const Tp::UIntList& members_added,
+ const Tp::UIntList& members_removed,
+ const Tp::UIntList& local_pending,
+ const Tp::UIntList& remote_pending,
uint actor, uint reason);
private:
- void init( Telepathy::Client::ConnectionInterface* connection );
+ void init( Tp::Client::ConnectionInterface* connection );
ContactManagerPrivate * const d;
friend class Connection;
diff --git a/TelepathyQt4/Prototype/Makefile.am b/TelepathyQt4/Prototype/Makefile.am
index c7942dd..d087e23 100644
--- a/TelepathyQt4/Prototype/Makefile.am
+++ b/TelepathyQt4/Prototype/Makefile.am
@@ -181,7 +181,7 @@ _gen/cli-%.h _gen/cli-%-body.hpp: _gen/spec-%.xml \
$(PYTHON) $(top_srcdir)/tools/qt4-client-gen.py \
--group=$$group \
--namespace=$$namespace \
- --typesnamespace='Telepathy' \
+ --typesnamespace='Tp' \
--headerfile=_gen/cli-$*.h \
--implfile=_gen/cli-$*-body.hpp \
--realinclude='TelepathyQt4/Prototype/cli-$*.h' \
diff --git a/TelepathyQt4/Prototype/PresenceManager.cpp b/TelepathyQt4/Prototype/PresenceManager.cpp
index 43b7ebc..220377b 100644
--- a/TelepathyQt4/Prototype/PresenceManager.cpp
+++ b/TelepathyQt4/Prototype/PresenceManager.cpp
@@ -52,18 +52,18 @@ class TpPrototype::PresenceManagerPrivate
{
public:
PresenceManagerPrivate( Connection* connection,
- Telepathy::Client::ConnectionInterface* interface )
+ Tp::Client::ConnectionInterface* interface )
{ init( connection, interface ); }
- Telepathy::Client::ConnectionInterface* m_pConnectionInterface;
- Telepathy::Client::ConnectionInterfaceSimplePresenceInterface* m_pSimplePresenceInterface;
- Telepathy::Client::ConnectionInterfacePresenceInterface* m_pPresenceInterface;
+ Tp::Client::ConnectionInterface* m_pConnectionInterface;
+ Tp::Client::ConnectionInterfaceSimplePresenceInterface* m_pSimplePresenceInterface;
+ Tp::Client::ConnectionInterfacePresenceInterface* m_pPresenceInterface;
QPointer<Connection> m_pConnection;
bool m_isValid;
QMap<QString,int> m_mapStatusStringToType;
void init( Connection* connection,
- Telepathy::Client::ConnectionInterface* interface )
+ Tp::Client::ConnectionInterface* interface )
{
m_pConnectionInterface = interface;
m_pConnection = connection;
@@ -100,9 +100,9 @@ public:
return m_mapStatusStringToType.value( status );
}
- Telepathy::SimplePresence convertToSimplePresence( const Telepathy::LastActivityAndStatuses& status ) const
+ Tp::SimplePresence convertToSimplePresence( const Tp::LastActivityAndStatuses& status ) const
{
- Telepathy::SimplePresence simple_presence;
+ Tp::SimplePresence simple_presence;
QStringList status_list = status.statuses.keys();
@@ -117,9 +117,9 @@ public:
return simple_presence;
}
- Telepathy::SimpleContactPresences convertToSimplePresences( const Telepathy::ContactPresences& presences ) const
+ Tp::SimpleContactPresences convertToSimplePresences( const Tp::ContactPresences& presences ) const
{
- Telepathy::SimpleContactPresences contact_presences;
+ Tp::SimpleContactPresences contact_presences;
QList<uint> keys = presences.keys();
foreach( uint key, keys )
@@ -130,9 +130,9 @@ public:
return contact_presences;
}
- Telepathy::MultipleStatusMap convertToMultipleStatusMap( const QString& status, const QString& statusMessage ) const
+ Tp::MultipleStatusMap convertToMultipleStatusMap( const QString& status, const QString& statusMessage ) const
{
- Telepathy::MultipleStatusMap status_map;
+ Tp::MultipleStatusMap status_map;
QVariantMap protocol_specif_parameters;
if ( !statusMessage.isEmpty() )
@@ -145,7 +145,7 @@ public:
};
PresenceManager::PresenceManager( Connection* connection,
- Telepathy::Client::ConnectionInterface* interface,
+ Tp::Client::ConnectionInterface* interface,
QObject* parent ):
QObject( parent ),
d( new PresenceManagerPrivate( connection, interface ) )
@@ -166,7 +166,7 @@ bool PresenceManager::isValid()
return d->m_isValid;
}
-Telepathy::SimpleStatusSpecMap PresenceManager::statuses()
+Tp::SimpleStatusSpecMap PresenceManager::statuses()
{
Q_ASSERT( d->m_pSimplePresenceInterface || d->m_pPresenceInterface );
@@ -176,18 +176,18 @@ Telepathy::SimpleStatusSpecMap PresenceManager::statuses()
if ( d->m_pPresenceInterface )
{
// We return a minimum set of states that should be provided by every contact manager and protocol
- Telepathy::SimpleStatusSpecMap ret_status;
- Telepathy::SimpleStatusSpec available = { 2, 2, true };
+ Tp::SimpleStatusSpecMap ret_status;
+ Tp::SimpleStatusSpec available = { 2, 2, true };
ret_status.insert( "available", available );
- Telepathy::SimpleStatusSpec away = { 3, 3, true };
+ Tp::SimpleStatusSpec away = { 3, 3, true };
ret_status.insert( "away", away );
- Telepathy::SimpleStatusSpec offline = { 1, 1, true };
+ Tp::SimpleStatusSpec offline = { 1, 1, true };
ret_status.insert( "offline", offline );
return ret_status;
}
- return Telepathy::SimpleStatusSpecMap();
+ return Tp::SimpleStatusSpecMap();
}
bool PresenceManager::setPresence( const QString& status, const QString& statusMessage )
@@ -204,7 +204,7 @@ bool PresenceManager::setPresence( const QString& status, const QString& statusM
Q_ASSERT( d->m_pConnection );
// TODO: Think whether sending this signal here manually (and before disconnecting) is really a good idea!
- const Telepathy::SimplePresence new_presence = { d->mapStatusStringToType( "offline" ), status, statusMessage };
+ const Tp::SimplePresence new_presence = { d->mapStatusStringToType( "offline" ), status, statusMessage };
emit signalOwnPresenceUpdated( d->m_pConnection->account(), new_presence );
d->m_pConnection->requestDisconnect();
@@ -249,7 +249,7 @@ bool PresenceManager::setPresence( const QString& status, const QString& statusM
#if 0 // TODO: Exame further: At some point I received the signal. Don't know why..
// The simple presence interface is emitting a signal if I changed the local presence here but the presence interface does not!
// We simulate this behavior here..
- const Telepathy::SimplePresence new_presence = { d->mapStatusStringToType( status ), status, statusMessage };
+ const Tp::SimplePresence new_presence = { d->mapStatusStringToType( status ), status, statusMessage };
emit signalOwnPresenceUpdated( d->m_pConnection->account(), new_presence );
#endif
return true;
@@ -260,21 +260,21 @@ bool PresenceManager::setPresence( const QString& status, const QString& statusM
}
// TODO: This function is doing the same as presencesForContacts() but just for one contact! Merge both functions to remove code duplication!
-Telepathy::SimplePresence PresenceManager::currentPresence()
+Tp::SimplePresence PresenceManager::currentPresence()
{
Q_ASSERT( d->m_pSimplePresenceInterface || d->m_pPresenceInterface );
if ( !d->m_pConnection || ( !d->m_pSimplePresenceInterface && !d->m_pPresenceInterface ) )
{
- return Telepathy::SimplePresence();
+ return Tp::SimplePresence();
}
- Telepathy::UIntList uid_list;
+ Tp::UIntList uid_list;
uid_list << d->localHandle();
if ( d->m_pSimplePresenceInterface )
{
- QDBusPendingReply<Telepathy::SimpleContactPresences> get_presence_reply = d->m_pSimplePresenceInterface->GetPresences( uid_list );
+ QDBusPendingReply<Tp::SimpleContactPresences> get_presence_reply = d->m_pSimplePresenceInterface->GetPresences( uid_list );
get_presence_reply.waitForFinished();
if ( !get_presence_reply.isValid() )
@@ -286,21 +286,21 @@ Telepathy::SimplePresence PresenceManager::currentPresence()
<< "error message:" << error.message();
d->m_isValid = false;
- return Telepathy::SimplePresence();
+ return Tp::SimplePresence();
}
- Telepathy::SimpleContactPresences presence_list = get_presence_reply.value();
- QList<Telepathy::SimplePresence> value_list = presence_list.values();
+ Tp::SimpleContactPresences presence_list = get_presence_reply.value();
+ QList<Tp::SimplePresence> value_list = presence_list.values();
if ( value_list.count() == 0 )
- { return Telepathy::SimplePresence(); }
+ { return Tp::SimplePresence(); }
return value_list.at( 0 );
}
if ( d->m_pPresenceInterface )
{
- QDBusPendingReply<Telepathy::ContactPresences> get_presence_reply = d->m_pPresenceInterface->GetPresence( uid_list );
+ QDBusPendingReply<Tp::ContactPresences> get_presence_reply = d->m_pPresenceInterface->GetPresence( uid_list );
get_presence_reply.waitForFinished();
if ( !get_presence_reply.isValid() )
@@ -312,31 +312,31 @@ Telepathy::SimplePresence PresenceManager::currentPresence()
<< "error message:" << error.message();
d->m_isValid = false;
- return Telepathy::SimplePresence();
+ return Tp::SimplePresence();
}
- Telepathy::ContactPresences presence_list = get_presence_reply.value();
- QList<Telepathy::LastActivityAndStatuses> value_list = presence_list.values();
+ Tp::ContactPresences presence_list = get_presence_reply.value();
+ QList<Tp::LastActivityAndStatuses> value_list = presence_list.values();
if ( value_list.count() == 0 )
- { return Telepathy::SimplePresence(); }
+ { return Tp::SimplePresence(); }
return d->convertToSimplePresence( value_list.at( 0 ) );
}
// Fall through..
- return Telepathy::SimplePresence();
+ return Tp::SimplePresence();
}
// TODO: See comment for currentPresence! Merge both to remove code duplication
-Telepathy::SimpleContactPresences PresenceManager::presencesForContacts( const QList<QPointer<Contact> >& contacts )
+Tp::SimpleContactPresences PresenceManager::presencesForContacts( const QList<QPointer<Contact> >& contacts )
{
Q_ASSERT( d->m_pSimplePresenceInterface || d->m_pPresenceInterface );
if ( !d->m_pConnection || ( !d->m_pSimplePresenceInterface && !d->m_pPresenceInterface ) )
- { return Telepathy::SimpleContactPresences(); }
+ { return Tp::SimpleContactPresences(); }
- Telepathy::UIntList contact_ids;
+ Tp::UIntList contact_ids;
foreach( Contact* contact, contacts )
{
if ( !contact )
@@ -346,7 +346,7 @@ Telepathy::SimpleContactPresences PresenceManager::presencesForContacts( const Q
if ( d->m_pSimplePresenceInterface )
{
- QDBusPendingReply<Telepathy::SimpleContactPresences> get_presence_reply = d->m_pSimplePresenceInterface->GetPresences( contact_ids );
+ QDBusPendingReply<Tp::SimpleContactPresences> get_presence_reply = d->m_pSimplePresenceInterface->GetPresences( contact_ids );
get_presence_reply.waitForFinished();
if ( !get_presence_reply.isValid() )
@@ -357,10 +357,10 @@ Telepathy::SimpleContactPresences PresenceManager::presencesForContacts( const Q
<< "error name:" << error.name()
<< "error message:" << error.message();
- return Telepathy::SimpleContactPresences();
+ return Tp::SimpleContactPresences();
}
- Telepathy::SimpleContactPresences presences=get_presence_reply.value();
+ Tp::SimpleContactPresences presences=get_presence_reply.value();
QList<uint> keys = presences.keys();
QPointer<TpPrototype::Contact> contact;
foreach( uint key, keys )
@@ -389,7 +389,7 @@ Telepathy::SimpleContactPresences PresenceManager::presencesForContacts( const Q
if ( d->m_pPresenceInterface )
{
- QDBusPendingReply<Telepathy::ContactPresences> get_presence_reply = d->m_pPresenceInterface->GetPresence( contact_ids );
+ QDBusPendingReply<Tp::ContactPresences> get_presence_reply = d->m_pPresenceInterface->GetPresence( contact_ids );
get_presence_reply.waitForFinished();
if ( !get_presence_reply.isValid() )
@@ -401,10 +401,10 @@ Telepathy::SimpleContactPresences PresenceManager::presencesForContacts( const Q
<< "error message:" << error.message();
d->m_isValid = false;
- return Telepathy::SimpleContactPresences();
+ return Tp::SimpleContactPresences();
}
- Telepathy::ContactPresences presences = get_presence_reply.value();
+ Tp::ContactPresences presences = get_presence_reply.value();
QList<uint> keys = presences.keys();
QPointer<TpPrototype::Contact> contact;
foreach( uint key, keys )
@@ -416,7 +416,7 @@ Telepathy::SimpleContactPresences PresenceManager::presencesForContacts( const Q
//qDebug() << "Contact "<< key << "Status" <<presences.value( key ).status;
if (contact->telepathyHandle()==key)
{
- Telepathy::SimplePresence simple_presence = d->convertToSimplePresence( presences.value( key ) );
+ Tp::SimplePresence simple_presence = d->convertToSimplePresence( presences.value( key ) );
contact->setPresenceType( simple_presence.type );
contact->setPresenceStatus( simple_presence.status );
contact->setPresenceMessage( simple_presence.statusMessage );
@@ -428,13 +428,13 @@ Telepathy::SimpleContactPresences PresenceManager::presencesForContacts( const Q
}
// Fall through..
- return Telepathy::SimpleContactPresences();
+ return Tp::SimpleContactPresences();
}
// Protected slots
// Called by the _simple_ presence interface if presence were updated
-void PresenceManager::slotPresencesChanged( const Telepathy::SimpleContactPresences& presences )
+void PresenceManager::slotPresencesChanged( const Tp::SimpleContactPresences& presences )
{
#ifdef ENABLE_DEBUG_OUTPUT_
qDebug() << __PRETTY_FUNCTION__;
@@ -448,7 +448,7 @@ void PresenceManager::slotPresencesChanged( const Telepathy::SimpleContactPresen
QList<uint> keys = presences.keys();
foreach( uint key, keys )
{
- Telepathy::SimplePresence changed_presence = presences.value( key );
+ Tp::SimplePresence changed_presence = presences.value( key );
#ifdef ENABLE_DEBUG_OUTPUT_
qDebug() << "Contact ID: " << key
<< "Type: " << changed_presence.type
@@ -502,7 +502,7 @@ void PresenceManager::slotPresencesChanged( const Telepathy::SimpleContactPresen
}
// Called by the presence interface (that one without "simple" prefix) if any presences were updated
-void PresenceManager::slotPresencesUpdate( const Telepathy::ContactPresences& presences )
+void PresenceManager::slotPresencesUpdate( const Tp::ContactPresences& presences )
{
#ifdef ENABLE_DEBUG_OUTPUT_
qDebug() << "PresenceManager::slotPresencesUpdate()";
@@ -511,7 +511,7 @@ void PresenceManager::slotPresencesUpdate( const Telepathy::ContactPresences& pr
{
qDebug() << "Contact ID : " << key
<< "LastActivity: " << presences.value( key ).lastActivity;
- Telepathy::MultipleStatusMap statuses = presences.value( key ).statuses; // QMap<QString, QVariantMap>
+ Tp::MultipleStatusMap statuses = presences.value( key ).statuses; // QMap<QString, QVariantMap>
QList<QString> status_keys = statuses.keys();
foreach( QString status_key, status_keys )
{
@@ -537,7 +537,7 @@ void PresenceManager::init()
return;
}
- Telepathy::registerTypes();
+ Tp::registerTypes();
QDBusPendingReply<QStringList> interfaces_reply = d->m_pConnectionInterface->GetInterfaces();
interfaces_reply.waitForFinished();
@@ -584,14 +584,14 @@ void PresenceManager::init()
#ifdef ENABLE_DEBUG_OUTPUT_
qDebug( "PresenceManager::init(): Connection Manager provides the Interface \"SimplePresence\". I will use this one!" );
#endif
- d->m_pSimplePresenceInterface = new Telepathy::Client::ConnectionInterfaceSimplePresenceInterface( d->m_pConnectionInterface->service(),
+ d->m_pSimplePresenceInterface = new Tp::Client::ConnectionInterfaceSimplePresenceInterface( d->m_pConnectionInterface->service(),
d->m_pConnectionInterface->path(),
this );
Q_ASSERT( d->m_pSimplePresenceInterface );
Q_ASSERT( d->m_pSimplePresenceInterface->isValid() );
- connect( d->m_pSimplePresenceInterface, SIGNAL( PresencesChanged( const Telepathy::SimpleContactPresences& ) ),
- this, SLOT( slotPresencesChanged( const Telepathy::SimpleContactPresences& ) ) );
+ connect( d->m_pSimplePresenceInterface, SIGNAL( PresencesChanged( const Tp::SimpleContactPresences& ) ),
+ this, SLOT( slotPresencesChanged( const Tp::SimpleContactPresences& ) ) );
return;
}
@@ -601,14 +601,14 @@ void PresenceManager::init()
#ifdef ENABLE_DEBUG_OUTPUT_
qDebug( "PresenceManager::init(): Connection Manager provides the Interface \"Presence\". I will use this one!" );
#endif
- d->m_pPresenceInterface = new Telepathy::Client::ConnectionInterfacePresenceInterface( d->m_pConnectionInterface->service(),
+ d->m_pPresenceInterface = new Tp::Client::ConnectionInterfacePresenceInterface( d->m_pConnectionInterface->service(),
d->m_pConnectionInterface->path(),
this );
Q_ASSERT( d->m_pPresenceInterface );
Q_ASSERT( d->m_pPresenceInterface->isValid() );
- connect( d->m_pPresenceInterface, SIGNAL( PresenceUpdate(const Telepathy::ContactPresences& ) ),
- this, SLOT( slotPresencesUpdate( const Telepathy::ContactPresences& ) ) );
+ connect( d->m_pPresenceInterface, SIGNAL( PresenceUpdate(const Tp::ContactPresences& ) ),
+ this, SLOT( slotPresencesUpdate( const Tp::ContactPresences& ) ) );
return;
diff --git a/TelepathyQt4/Prototype/PresenceManager.h b/TelepathyQt4/Prototype/PresenceManager.h
index 1a9c8cd..aa9c7d4 100644
--- a/TelepathyQt4/Prototype/PresenceManager.h
+++ b/TelepathyQt4/Prototype/PresenceManager.h
@@ -28,7 +28,7 @@
#include <TelepathyQt4/Types>
-namespace Telepathy
+namespace Tp
{
namespace Client
{
@@ -74,7 +74,7 @@ public:
* @return The list of supported statuses.
* @see connection::status();
*/
- Telepathy::SimpleStatusSpecMap statuses();
+ Tp::SimpleStatusSpecMap statuses();
/**
* Set Presence.
@@ -90,7 +90,7 @@ public:
* The local presence is returned for the connection.
* @return Returns my current local presence or an empty item on error.
*/
- Telepathy::SimplePresence currentPresence();
+ Tp::SimplePresence currentPresence();
/**
* Request presences.
@@ -99,9 +99,9 @@ public:
* @return List of presence information for contacts as <i>QMap<int,SimplePresence> </i>. The <i>int</i> represents the
* identifier of the contact as returned by Contact::identifier(), An empty list is returned on error.
* @todo Future: Use QList<Contact> instead QList<QPointer<Contact> > or introduce a class <i>ContactGroup</i> that handles all internally.
- * @todo Future: Telepathy::SimpleContactPresences relies of an handle (the <i>int</i>). This should be encapsulated.
+ * @todo Future: Tp::SimpleContactPresences relies of an handle (the <i>int</i>). This should be encapsulated.
*/
- Telepathy::SimpleContactPresences presencesForContacts( const QList<QPointer<TpPrototype::Contact> >& contacts );
+ Tp::SimpleContactPresences presencesForContacts( const QList<QPointer<TpPrototype::Contact> >& contacts );
/**
* Returns the connection that belongs to this presence information.
@@ -116,7 +116,7 @@ signals:
* @param contact The contact that changes.
* @param presence The presence information.
*/
- void signalRemotePresencesUpdated( TpPrototype::Contact* contact, const Telepathy::SimplePresence& presence );
+ void signalRemotePresencesUpdated( TpPrototype::Contact* contact, const Tp::SimplePresence& presence );
/**
* Local presence changed.
@@ -124,20 +124,20 @@ signals:
* @param account The account that changes.
* @param presence The presence information.
*/
- void signalOwnPresenceUpdated( const TpPrototype::Account* account, const Telepathy::SimplePresence& presence );
+ void signalOwnPresenceUpdated( const TpPrototype::Account* account, const Tp::SimplePresence& presence );
protected:
/**
* Constructor. The presence manager cannot be instantiated directly. Use Connection::presenceManager() for it!
*/
PresenceManager( TpPrototype::Connection* connection,
- Telepathy::Client::ConnectionInterface* interface,
+ Tp::Client::ConnectionInterface* interface,
QObject* parent = NULL );
~PresenceManager();
protected slots:
- void slotPresencesChanged( const Telepathy::SimpleContactPresences& presences );
- void slotPresencesUpdate( const Telepathy::ContactPresences& presences );
+ void slotPresencesChanged( const Tp::SimpleContactPresences& presences );
+ void slotPresencesUpdate( const Tp::ContactPresences& presences );
private:
void init();
diff --git a/TelepathyQt4/Prototype/StreamedMediaChannel.cpp b/TelepathyQt4/Prototype/StreamedMediaChannel.cpp
index 3f5e6cd..2e6cf0d 100644
--- a/TelepathyQt4/Prototype/StreamedMediaChannel.cpp
+++ b/TelepathyQt4/Prototype/StreamedMediaChannel.cpp
@@ -29,7 +29,7 @@
// ChannelHandlerInterface and StreamEngineInterface from stream-engine
// 0.5.x, which is currently used as the only media streaming backend.
-// These interfaces are not really part of the Telepathy spec
+// These interfaces are not really part of the Tp spec
#include <TelepathyQt4/Prototype/Client/ChannelHandler>
#include <TelepathyQt4/Prototype/Client/StreamEngine>
@@ -49,11 +49,11 @@ public:
{ init(); }
QPointer<TpPrototype::Contact> m_pContact;
- QPointer<Telepathy::Client::ConnectionInterface> m_pConnectionInterface;
- Telepathy::Client::ChannelTypeStreamedMediaInterface* m_pStreamedMediaInterface;
- Telepathy::Client::ChannelInterfaceGroupInterface* m_pGroupInterface;
- Telepathy::Client::ChannelInterfaceMediaSignallingInterface* m_pMediaSignallingInterface;
- Telepathy::Client::ChannelInterfaceCallStateInterface* m_pCallStateInterface;
+ QPointer<Tp::Client::ConnectionInterface> m_pConnectionInterface;
+ Tp::Client::ChannelTypeStreamedMediaInterface* m_pStreamedMediaInterface;
+ Tp::Client::ChannelInterfaceGroupInterface* m_pGroupInterface;
+ Tp::Client::ChannelInterfaceMediaSignallingInterface* m_pMediaSignallingInterface;
+ Tp::Client::ChannelInterfaceCallStateInterface* m_pCallStateInterface;
// Interfaces of the telepathy stream engine:
TpPrototype::Client::ChannelHandlerInterface* m_pStreamEngineHandlerInterface;
@@ -143,11 +143,11 @@ private:
};
-StreamedMediaChannel::StreamedMediaChannel( Contact* contact, Telepathy::Client::ConnectionInterface* connectionInterface, QObject* parent ):
+StreamedMediaChannel::StreamedMediaChannel( Contact* contact, Tp::Client::ConnectionInterface* connectionInterface, QObject* parent ):
QObject( parent ),
d(new StreamedMediaChannelPrivate())
{
- Telepathy::registerTypes();
+ Tp::registerTypes();
d->m_pContact = contact;
d->m_pConnectionInterface = connectionInterface;
@@ -177,7 +177,7 @@ bool StreamedMediaChannel::rejectIncomingStream()
return removeMembers( reject_handles );
}
-bool StreamedMediaChannel::requestChannel( QList<Telepathy::MediaStreamType> types )
+bool StreamedMediaChannel::requestChannel( QList<Tp::MediaStreamType> types )
{
Q_ASSERT( d->m_pConnectionInterface );
Q_ASSERT( d->m_pContact );
@@ -187,8 +187,8 @@ bool StreamedMediaChannel::requestChannel( QList<Telepathy::MediaStreamType> typ
return false;
}
- QDBusPendingReply<QDBusObjectPath> request_channel_reply = d->m_pConnectionInterface->RequestChannel( Telepathy::Client::ChannelTypeStreamedMediaInterface::staticInterfaceName(),
- Telepathy::HandleTypeContact,
+ QDBusPendingReply<QDBusObjectPath> request_channel_reply = d->m_pConnectionInterface->RequestChannel( Tp::Client::ChannelTypeStreamedMediaInterface::staticInterfaceName(),
+ Tp::HandleTypeContact,
d->m_pContact->telepathyHandle(),
true );
request_channel_reply.waitForFinished();
@@ -212,7 +212,7 @@ bool StreamedMediaChannel::requestChannel( QList<Telepathy::MediaStreamType> typ
}
QDBusObjectPath channel_path=request_channel_reply.value();
- d->m_pStreamedMediaInterface = new Telepathy::Client::ChannelTypeStreamedMediaInterface( d->m_pConnectionInterface->service(), channel_path.path(), this );
+ d->m_pStreamedMediaInterface = new Tp::Client::ChannelTypeStreamedMediaInterface( d->m_pConnectionInterface->service(), channel_path.path(), this );
connectSignals();
if ( !d->m_pStreamedMediaInterface )
@@ -228,7 +228,7 @@ bool StreamedMediaChannel::requestChannel( QList<Telepathy::MediaStreamType> typ
}
- QDBusPendingReply<Telepathy::MediaStreamInfoList> request_streams_reply = d->m_pStreamedMediaInterface->RequestStreams( d->m_pContact->telepathyHandle(),
+ QDBusPendingReply<Tp::MediaStreamInfoList> request_streams_reply = d->m_pStreamedMediaInterface->RequestStreams( d->m_pContact->telepathyHandle(),
stream_types );
request_streams_reply.waitForFinished();
@@ -247,7 +247,7 @@ bool StreamedMediaChannel::requestChannel( QList<Telepathy::MediaStreamType> typ
return true;
}
-bool StreamedMediaChannel::requestStreams( TpPrototype::Contact* contact, QList<Telepathy::MediaStreamType> types )
+bool StreamedMediaChannel::requestStreams( TpPrototype::Contact* contact, QList<Tp::MediaStreamType> types )
{
Q_ASSERT( d->m_pStreamedMediaInterface );
@@ -263,7 +263,7 @@ bool StreamedMediaChannel::requestStreams( TpPrototype::Contact* contact, QList<
}
- QDBusPendingReply<Telepathy::MediaStreamInfoList> request_streams_reply = d->m_pStreamedMediaInterface->RequestStreams( d->m_pContact->telepathyHandle(),
+ QDBusPendingReply<Tp::MediaStreamInfoList> request_streams_reply = d->m_pStreamedMediaInterface->RequestStreams( d->m_pContact->telepathyHandle(),
stream_types );
request_streams_reply.waitForFinished();
@@ -302,7 +302,7 @@ QList<QPointer<TpPrototype::Contact> > StreamedMediaChannel::localPendingContact
#ifdef ENABLE_DEBUG_OUTPUT_
qDebug() << "Local Pending members : ";
#endif
- foreach( Telepathy::LocalPendingInfo local_pending_info, d->m_pGroupInterface->LocalPendingMembers() )
+ foreach( Tp::LocalPendingInfo local_pending_info, d->m_pGroupInterface->LocalPendingMembers() )
{
#ifdef ENABLE_DEBUG_OUTPUT_
qDebug() << "To be added: " << local_pending_info.toBeAdded;
@@ -317,7 +317,7 @@ QList<QPointer<TpPrototype::Contact> > StreamedMediaChannel::localPendingContact
QList<QPointer<TpPrototype::Contact> > StreamedMediaChannel::members()
{
- Telepathy::UIntList member_handles = d->m_pGroupInterface->Members();
+ Tp::UIntList member_handles = d->m_pGroupInterface->Members();
QList<QPointer<TpPrototype::Contact> > member_list;
@@ -346,16 +346,16 @@ bool StreamedMediaChannel::removeStreams( const QList<uint>& streamIds )
return true;
}
-Telepathy::MediaStreamInfoList StreamedMediaChannel::requestStreams( QList<Telepathy::MediaStreamType> _types )
+Tp::MediaStreamInfoList StreamedMediaChannel::requestStreams( QList<Tp::MediaStreamType> _types )
{
- Telepathy::UIntList types;
+ Tp::UIntList types;
foreach( uint type, _types )
{
types.append( type );
}
- QDBusPendingReply<Telepathy::MediaStreamInfoList> request_streams_reply = d->m_pStreamedMediaInterface->RequestStreams( d->m_pContact->telepathyHandle(), types);
+ QDBusPendingReply<Tp::MediaStreamInfoList> request_streams_reply = d->m_pStreamedMediaInterface->RequestStreams( d->m_pContact->telepathyHandle(), types);
request_streams_reply.waitForFinished();
if ( !request_streams_reply.isValid() )
@@ -365,18 +365,18 @@ Telepathy::MediaStreamInfoList StreamedMediaChannel::requestStreams( QList<Telep
<< "error name:" << error.name()
<< "error message:" << error.message();
- return QDBusPendingReply<Telepathy::MediaStreamInfoList>();
+ return QDBusPendingReply<Tp::MediaStreamInfoList>();
}
return request_streams_reply.value();
}
-Telepathy::MediaStreamInfoList StreamedMediaChannel::listStreams()
+Tp::MediaStreamInfoList StreamedMediaChannel::listStreams()
{
if ( !d->m_pStreamedMediaInterface )
- { return Telepathy::MediaStreamInfoList();}
+ { return Tp::MediaStreamInfoList();}
- QDBusPendingReply<Telepathy::MediaStreamInfoList> reply = d->m_pStreamedMediaInterface->ListStreams();
+ QDBusPendingReply<Tp::MediaStreamInfoList> reply = d->m_pStreamedMediaInterface->ListStreams();
reply.waitForFinished();
if ( !reply.isValid() )
{
@@ -385,7 +385,7 @@ Telepathy::MediaStreamInfoList StreamedMediaChannel::listStreams()
<< "error name:" << error.name()
<< "error message:" << error.message();
- return Telepathy::MediaStreamInfoList();
+ return Tp::MediaStreamInfoList();
}
return reply.value();
@@ -481,7 +481,7 @@ void StreamedMediaChannel::requestStreamedMediaChannel( uint handle )
}
QDBusPendingReply<QDBusObjectPath> reply0 = d->m_pConnectionInterface->RequestChannel( "org.freedesktop.Telepathy.Channel.Type.StreamedMedia",
- Telepathy::HandleTypeContact,
+ Tp::HandleTypeContact,
handle,
true );
reply0.waitForFinished();
@@ -499,7 +499,7 @@ void StreamedMediaChannel::requestStreamedMediaChannel( uint handle )
#ifdef ENABLE_DEBUG_OUTPUT_
qDebug() << "StreamedMediaChannel new ChannelTypeStreamedMediaInterface(): Path:" << channel_path.path();
#endif
- d->m_pStreamedMediaInterface = new Telepathy::Client::ChannelTypeStreamedMediaInterface( d->m_pConnectionInterface->service(), channel_path.path(), this );
+ d->m_pStreamedMediaInterface = new Tp::Client::ChannelTypeStreamedMediaInterface( d->m_pConnectionInterface->service(), channel_path.path(), this );
connectSignals();
}
@@ -524,7 +524,7 @@ void StreamedMediaChannel::openStreamedMediaChannel( uint handle, uint handleTyp
#ifdef ENABLE_DEBUG_OUTPUT_
qDebug() << "Create new ChannelTypeStreamedMediaInterface";
#endif
- d->m_pStreamedMediaInterface = new Telepathy::Client::ChannelTypeStreamedMediaInterface( channel_service_name, channelPath, this );
+ d->m_pStreamedMediaInterface = new Tp::Client::ChannelTypeStreamedMediaInterface( channel_service_name, channelPath, this );
connectSignals();
}
if (!d->m_pStreamedMediaInterface->isValid())
@@ -552,22 +552,22 @@ void StreamedMediaChannel::openStreamedMediaChannel( uint handle, uint handleTyp
#ifdef ENABLE_DEBUG_OUTPUT_
qDebug() << "Initialize ChannelInterfaceGroupInterface..";
#endif
- d->m_pGroupInterface = new Telepathy::Client::ChannelInterfaceGroupInterface( streamed_media_service_name,
+ d->m_pGroupInterface = new Tp::Client::ChannelInterfaceGroupInterface( streamed_media_service_name,
channelPath );
connect( d->m_pGroupInterface, SIGNAL( MembersChanged(const QString& ,
- const Telepathy::UIntList& ,
- const Telepathy::UIntList& ,
- const Telepathy::UIntList& ,
- const Telepathy::UIntList& ,
+ const Tp::UIntList& ,
+ const Tp::UIntList& ,
+ const Tp::UIntList& ,
+ const Tp::UIntList& ,
uint ,
uint )
),
this, SLOT( slotMembersChanged(const QString& ,
- const Telepathy::UIntList& ,
- const Telepathy::UIntList& ,
- const Telepathy::UIntList& ,
- const Telepathy::UIntList& ,
+ const Tp::UIntList& ,
+ const Tp::UIntList& ,
+ const Tp::UIntList& ,
+ const Tp::UIntList& ,
uint ,
uint )
)
@@ -581,7 +581,7 @@ void StreamedMediaChannel::openStreamedMediaChannel( uint handle, uint handleTyp
#ifdef ENABLE_DEBUG_OUTPUT_
qDebug() << "Initialize ChannelInterfaceCallStateInterface..";
#endif
- d->m_pCallStateInterface = new Telepathy::Client::ChannelInterfaceCallStateInterface( streamed_media_service_name,
+ d->m_pCallStateInterface = new Tp::Client::ChannelInterfaceCallStateInterface( streamed_media_service_name,
channelPath );
}
@@ -590,7 +590,7 @@ void StreamedMediaChannel::openStreamedMediaChannel( uint handle, uint handleTyp
#ifdef ENABLE_DEBUG_OUTPUT_
qDebug() << "Initialize ChannelInterfaceMediaSignallingInterface..";
#endif
- d->m_pMediaSignallingInterface = new Telepathy::Client::ChannelInterfaceMediaSignallingInterface( streamed_media_service_name, channelPath );
+ d->m_pMediaSignallingInterface = new Tp::Client::ChannelInterfaceMediaSignallingInterface( streamed_media_service_name, channelPath );
}
if ( !d->m_pStreamEngineInterface )
@@ -624,21 +624,21 @@ void StreamedMediaChannel::openStreamedMediaChannel( uint handle, uint handleTyp
// Cleanup if we were unable to establish interfaces..
if ( d->m_pGroupInterface && !d->m_pGroupInterface->isValid() )
{
- qWarning() << "Could not establish interface:" << Telepathy::Client::ChannelInterfaceGroupInterface::staticInterfaceName();
+ qWarning() << "Could not establish interface:" << Tp::Client::ChannelInterfaceGroupInterface::staticInterfaceName();
delete d->m_pGroupInterface;
d->m_pGroupInterface = NULL;
}
if ( d->m_pCallStateInterface && !d->m_pCallStateInterface->isValid() )
{
- qWarning() << "Could not establish interface:" << Telepathy::Client::ChannelInterfaceCallStateInterface::staticInterfaceName();
+ qWarning() << "Could not establish interface:" << Tp::Client::ChannelInterfaceCallStateInterface::staticInterfaceName();
delete d->m_pCallStateInterface;
d->m_pCallStateInterface = NULL;
}
if ( d->m_pMediaSignallingInterface && !d->m_pMediaSignallingInterface->isValid() )
{
- qWarning() << "Could not establish interface:" << Telepathy::Client::ChannelInterfaceMediaSignallingInterface::staticInterfaceName();
+ qWarning() << "Could not establish interface:" << Tp::Client::ChannelInterfaceMediaSignallingInterface::staticInterfaceName();
delete d->m_pMediaSignallingInterface;
d->m_pMediaSignallingInterface = NULL;
}
@@ -763,7 +763,7 @@ void StreamedMediaChannel::slotStreamAdded(uint streamID, uint contactHandle, ui
#ifdef ENABLE_DEBUG_OUTPUT_
qDebug() << __PRETTY_FUNCTION__ << "streamID:" << streamID << "contactHandle: " << contactHandle << "streamType:" << streamType;
#endif
- emit signalStreamAdded( this, streamID, static_cast<Telepathy::MediaStreamType>(streamType) );
+ emit signalStreamAdded( this, streamID, static_cast<Tp::MediaStreamType>(streamType) );
}
void StreamedMediaChannel::slotStreamDirectionChanged(uint streamID, uint streamDirection, uint pendingFlags)
@@ -796,14 +796,14 @@ void StreamedMediaChannel::slotStreamStateChanged(uint streamID, uint streamStat
#ifdef ENABLE_DEBUG_OUTPUT_
qDebug() << __PRETTY_FUNCTION__ << "streamID:" << streamID << "streamState: " << streamState;
#endif
- emit signalStreamStateChanged( this, streamID, static_cast<Telepathy::MediaStreamState>(streamState) );
+ emit signalStreamStateChanged( this, streamID, static_cast<Tp::MediaStreamState>(streamState) );
}
void StreamedMediaChannel::slotMembersChanged( const QString& message,
- const Telepathy::UIntList& added,
- const Telepathy::UIntList& removed,
- const Telepathy::UIntList& localPending,
- const Telepathy::UIntList& remotePending,
+ const Tp::UIntList& added,
+ const Tp::UIntList& removed,
+ const Tp::UIntList& localPending,
+ const Tp::UIntList& remotePending,
uint actor,
uint reason )
{
diff --git a/TelepathyQt4/Prototype/StreamedMediaChannel.h b/TelepathyQt4/Prototype/StreamedMediaChannel.h
index 8628a5a..3b69faa 100644
--- a/TelepathyQt4/Prototype/StreamedMediaChannel.h
+++ b/TelepathyQt4/Prototype/StreamedMediaChannel.h
@@ -63,7 +63,7 @@ class Account;
* @endcode
* Request a channel (in this case an audio channel):
* @code
- * media_channel->requestChannel( QList<Telepathy::MediaStreamType>() << Telepathy::MediaStreamTypeAudio );
+ * media_channel->requestChannel( QList<Tp::MediaStreamType>() << Tp::MediaStreamTypeAudio );
* @endcode
* Whether the call was accepted or rejected is signalled by the following signals:
* @code
@@ -129,9 +129,9 @@ public:
* @param types The stream types that should be opened for this channel
* @return Returns true if request call was successful.
*/
- bool requestChannel( QList<Telepathy::MediaStreamType> types );
+ bool requestChannel( QList<Tp::MediaStreamType> types );
- bool requestStreams( TpPrototype::Contact* contact, QList<Telepathy::MediaStreamType> types );
+ bool requestStreams( TpPrototype::Contact* contact, QList<Tp::MediaStreamType> types );
/**
* Add contacts to the group.
@@ -198,7 +198,7 @@ public:
* The returned list is empty if an error occured.
*
*/
- Telepathy::MediaStreamInfoList requestStreams( QList<Telepathy::MediaStreamType> types );
+ Tp::MediaStreamInfoList requestStreams( QList<Tp::MediaStreamType> types );
/**
* Begins a call to the D-Bus method "ListStreams" on the remote object.
@@ -220,7 +220,7 @@ public:
* </ul>
* The returned list is empty if an error occured.
*/
- Telepathy::MediaStreamInfoList listStreams();
+ Tp::MediaStreamInfoList listStreams();
signals:
/**
@@ -241,7 +241,7 @@ signals:
* @param streamId The id of the stream.
* @param streamType The type of the stream.
*/
- void signalStreamAdded( TpPrototype::StreamedMediaChannel* channel, uint streamId, Telepathy::MediaStreamType streamType );
+ void signalStreamAdded( TpPrototype::StreamedMediaChannel* channel, uint streamId, Tp::MediaStreamType streamType );
/**
* Stream was removed.
@@ -275,9 +275,9 @@ signals:
/**
* A stream changed its state
* @param streamId The ID of the stream as returned by listStreams()
- * @param streamState The state as provided by Telepathy::MediaStreamInfo
+ * @param streamState The state as provided by Tp::MediaStreamInfo
*/
- void signalStreamStateChanged( TpPrototype::StreamedMediaChannel* channel, uint streamID, Telepathy::MediaStreamState streamState );
+ void signalStreamStateChanged( TpPrototype::StreamedMediaChannel* channel, uint streamID, Tp::MediaStreamState streamState );
/**
* Emitted when the direction or pending flags of a stream are changed.
@@ -367,7 +367,7 @@ protected:
* Constructor.
* Use Contact::streamedMediaChannel() to obtain an object of StreamedMediaChannel.
*/
- StreamedMediaChannel( Contact* contact, Telepathy::Client::ConnectionInterface* connectionInterface , QObject* parent = NULL );
+ StreamedMediaChannel( Contact* contact, Tp::Client::ConnectionInterface* connectionInterface , QObject* parent = NULL );
/**
* Request a new streamed media channel.
@@ -419,10 +419,10 @@ protected slots:
* Represents the signal "MembersChanged" on the remote object.
*/
void slotMembersChanged(const QString& message,
- const Telepathy::UIntList& added,
- const Telepathy::UIntList& removed,
- const Telepathy::UIntList& localPending,
- const Telepathy::UIntList& remotePending,
+ const Tp::UIntList& added,
+ const Tp::UIntList& removed,
+ const Tp::UIntList& localPending,
+ const Tp::UIntList& remotePending,
uint actor,
uint reason);
private:
diff --git a/TelepathyQt4/abstract-interface.cpp b/TelepathyQt4/abstract-interface.cpp
index 4dcaccd..2e8d229 100644
--- a/TelepathyQt4/abstract-interface.cpp
+++ b/TelepathyQt4/abstract-interface.cpp
@@ -25,7 +25,7 @@
#include "TelepathyQt4/_gen/abstract-interface.moc.hpp"
#include "TelepathyQt4/debug-internal.h"
-namespace Telepathy
+namespace Tp
{
struct AbstractInterface::Private
@@ -53,8 +53,8 @@ AbstractInterface::AbstractInterface(DBusProxy *parent, const char *interface)
interface, parent->dbusConnection(), parent),
mPriv(new Private())
{
- connect(parent, SIGNAL(invalidated(Telepathy::DBusProxy *, const QString &, const QString &)),
- this, SLOT(invalidate(Telepathy::DBusProxy *, const QString &, const QString &)));
+ connect(parent, SIGNAL(invalidated(Tp::DBusProxy *, const QString &, const QString &)),
+ this, SLOT(invalidate(Tp::DBusProxy *, const QString &, const QString &)));
}
AbstractInterface::~AbstractInterface()
@@ -77,7 +77,7 @@ QString AbstractInterface::invalidationMessage() const
return mPriv->mMessage;
}
-void AbstractInterface::invalidate(Telepathy::DBusProxy *proxy,
+void AbstractInterface::invalidate(DBusProxy *proxy,
const QString &error, const QString &message)
{
Q_ASSERT(!error.isEmpty());
@@ -88,4 +88,4 @@ void AbstractInterface::invalidate(Telepathy::DBusProxy *proxy,
}
}
-} // Telepathy
+} // Tp
diff --git a/TelepathyQt4/abstract-interface.h b/TelepathyQt4/abstract-interface.h
index b39f432..1e34be8 100644
--- a/TelepathyQt4/abstract-interface.h
+++ b/TelepathyQt4/abstract-interface.h
@@ -27,7 +27,7 @@
#include <QDBusAbstractInterface>
-namespace Telepathy
+namespace Tp
{
class DBusProxy;
@@ -45,7 +45,7 @@ public:
QString invalidationMessage() const;
protected Q_SLOTS:
- virtual void invalidate(Telepathy::DBusProxy *proxy,
+ virtual void invalidate(Tp::DBusProxy *proxy,
const QString &error, const QString &message);
protected:
@@ -59,6 +59,6 @@ private:
Private *mPriv;
};
-} // Telepathy
+} // Tp
#endif
diff --git a/TelepathyQt4/account-manager.cpp b/TelepathyQt4/account-manager.cpp
index bac6767..9d65cb8 100644
--- a/TelepathyQt4/account-manager.cpp
+++ b/TelepathyQt4/account-manager.cpp
@@ -55,7 +55,7 @@
* and their optional interfaces.
*/
-namespace Telepathy
+namespace Tp
{
struct AccountManager::Private
@@ -117,7 +117,7 @@ AccountManager::Private::~Private()
void AccountManager::Private::setAccountPaths(QSet<QString> &set,
const QVariant &variant)
{
- Telepathy::ObjectPathList paths = qdbus_cast<Telepathy::ObjectPathList>(variant);
+ ObjectPathList paths = qdbus_cast<ObjectPathList>(variant);
if (paths.size() == 0) {
// maybe the AccountManager is buggy, like Mission Control
@@ -206,7 +206,7 @@ void AccountManager::Private::setAccountPaths(QSet<QString> &set,
* ~MyClass() { }
*
* private Q_SLOTS:
- * void onAccountManagerReady(Telepathy::PendingOperation*);
+ * void onAccountManagerReady(Tp::PendingOperation*);
*
* private:
* AccountManagerPtr am;
@@ -217,11 +217,11 @@ void AccountManager::Private::setAccountPaths(QSet<QString> &set,
* am(AccountManager::create())
* {
* connect(am->becomeReady(),
- * SIGNAL(finished(Telepathy::PendingOperation*)),
- * SLOT(onAccountManagerReady(Telepathy::PendingOperation*)));
+ * SIGNAL(finished(Tp::PendingOperation*)),
+ * SLOT(onAccountManagerReady(Tp::PendingOperation*)));
* }
*
- * void MyClass::onAccountManagerReady(Telepathy::PendingOperation *op)
+ * void MyClass::onAccountManagerReady(Tp::PendingOperation *op)
* {
* if (op->isError()) {
* qWarning() << "Account manager cannot become ready:" <<
@@ -627,4 +627,4 @@ void AccountManager::onAccountRemoved(const QDBusObjectPath &objectPath)
emit accountRemoved(path);
}
-} // Telepathy
+} // Tp
diff --git a/TelepathyQt4/account-manager.h b/TelepathyQt4/account-manager.h
index 20b4fbe..e3da144 100644
--- a/TelepathyQt4/account-manager.h
+++ b/TelepathyQt4/account-manager.h
@@ -42,7 +42,7 @@
#include <QString>
#include <QVariantMap>
-namespace Telepathy
+namespace Tp
{
class AccountManager;
@@ -112,6 +112,6 @@ private:
Private *mPriv;
};
-} // Telepathy
+} // Tp
#endif
diff --git a/TelepathyQt4/account.cpp b/TelepathyQt4/account.cpp
index c00a927..ea1c9db 100644
--- a/TelepathyQt4/account.cpp
+++ b/TelepathyQt4/account.cpp
@@ -50,7 +50,7 @@
* backwards compatibility helpers for older services and other utilities.
*/
-namespace Telepathy
+namespace Tp
{
struct Account::Private
@@ -88,14 +88,14 @@ struct Account::Private
QString icon;
QString connectionObjectPath;
QString normalizedName;
- Telepathy::Avatar avatar;
+ Avatar avatar;
ConnectionManagerPtr cm;
ProtocolInfo *protocolInfo;
- Telepathy::ConnectionStatus connectionStatus;
- Telepathy::ConnectionStatusReason connectionStatusReason;
- Telepathy::SimplePresence automaticPresence;
- Telepathy::SimplePresence currentPresence;
- Telepathy::SimplePresence requestedPresence;
+ ConnectionStatus connectionStatus;
+ ConnectionStatusReason connectionStatusReason;
+ SimplePresence automaticPresence;
+ SimplePresence currentPresence;
+ SimplePresence requestedPresence;
ConnectionPtr connection;
};
@@ -108,8 +108,8 @@ Account::Private::Private(Account *parent)
enabled(false),
connectsAutomatically(false),
protocolInfo(0),
- connectionStatus(Telepathy::ConnectionStatusDisconnected),
- connectionStatusReason(Telepathy::ConnectionStatusReasonNoneSpecified)
+ connectionStatus(ConnectionStatusDisconnected),
+ connectionStatusReason(ConnectionStatusReasonNoneSpecified)
{
// FIXME: QRegExp probably isn't the most efficient possible way to parse
// this :-)
@@ -184,7 +184,7 @@ Account::Private::~Private()
*
* Object representing a Telepathy account.
*
- * If the Telepathy account is deleted from the AccountManager, this object
+ * If the account is deleted from the AccountManager, this object
* will not be deleted automatically; however, it will emit invalidated()
* and will cease to be useful.
*/
@@ -390,7 +390,7 @@ PendingOperation *Account::setNickname(const QString &value)
*
* \return Account avatar.
*/
-const Telepathy::Avatar &Account::avatar() const
+const Avatar &Account::avatar() const
{
if (!isReady(Features() << FeatureAvatar)) {
warning() << "Trying to retrieve avatar from account, but "
@@ -408,7 +408,7 @@ const Telepathy::Avatar &Account::avatar() const
* \return A PendingOperation which will emit PendingOperation::finished
* when the call has finished.
*/
-PendingOperation *Account::setAvatar(const Telepathy::Avatar &avatar)
+PendingOperation *Account::setAvatar(const Avatar &avatar)
{
if (!mPriv->interfaces.contains(TELEPATHY_INTERFACE_ACCOUNT_INTERFACE_AVATAR)) {
return new PendingFailure(this, TELEPATHY_ERROR_NOT_IMPLEMENTED,
@@ -496,7 +496,7 @@ PendingOperation *Account::setConnectsAutomatically(bool value)
*
* \return Value indication the status of this account conneciton.
*/
-Telepathy::ConnectionStatus Account::connectionStatus() const
+ConnectionStatus Account::connectionStatus() const
{
return mPriv->connectionStatus;
}
@@ -506,7 +506,7 @@ Telepathy::ConnectionStatus Account::connectionStatus() const
*
* \return Value indication the status reason of this account conneciton.
*/
-Telepathy::ConnectionStatusReason Account::connectionStatusReason() const
+ConnectionStatusReason Account::connectionStatusReason() const
{
return mPriv->connectionStatusReason;
}
@@ -553,7 +553,7 @@ ConnectionPtr Account::connection() const
*
* \return Presence status that will be set when this account is put online.
*/
-Telepathy::SimplePresence Account::automaticPresence() const
+SimplePresence Account::automaticPresence() const
{
return mPriv->automaticPresence;
}
@@ -568,7 +568,7 @@ Telepathy::SimplePresence Account::automaticPresence() const
* \sa setRequestedPresence()
*/
PendingOperation *Account::setAutomaticPresence(
- const Telepathy::SimplePresence &value)
+ const SimplePresence &value)
{
return new PendingVoidMethodCall(this,
propertiesInterface()->Set(TELEPATHY_INTERFACE_ACCOUNT,
@@ -581,7 +581,7 @@ PendingOperation *Account::setAutomaticPresence(
* \return The actual presence of this account.
* \sa requestedPresence(), automaticPresence()
*/
-Telepathy::SimplePresence Account::currentPresence() const
+SimplePresence Account::currentPresence() const
{
return mPriv->currentPresence;
}
@@ -596,7 +596,7 @@ Telepathy::SimplePresence Account::currentPresence() const
* \return The requested presence of this account.
* \sa currentPresence(), automaticPresence()
*/
-Telepathy::SimplePresence Account::requestedPresence() const
+SimplePresence Account::requestedPresence() const
{
return mPriv->requestedPresence;
}
@@ -610,7 +610,7 @@ Telepathy::SimplePresence Account::requestedPresence() const
* \sa setAutomaticPresence()
*/
PendingOperation *Account::setRequestedPresence(
- const Telepathy::SimplePresence &value)
+ const SimplePresence &value)
{
return new PendingVoidMethodCall(this,
propertiesInterface()->Set(TELEPATHY_INTERFACE_ACCOUNT,
@@ -775,8 +775,8 @@ void Account::Private::introspectProtocolInfo(Account::Private *self)
self->parent->dbusConnection(),
self->cmName);
self->parent->connect(self->cm->becomeReady(),
- SIGNAL(finished(Telepathy::PendingOperation *)),
- SLOT(onConnectionManagerReady(Telepathy::PendingOperation *)));
+ SIGNAL(finished(Tp::PendingOperation *)),
+ SLOT(onConnectionManagerReady(Tp::PendingOperation *)));
}
void Account::Private::updateProperties(const QVariantMap &props)
@@ -847,9 +847,9 @@ void Account::Private::updateProperties(const QVariantMap &props)
}
if (props.contains("AutomaticPresence") &&
- automaticPresence != qdbus_cast<Telepathy::SimplePresence>(
+ automaticPresence != qdbus_cast<SimplePresence>(
props["AutomaticPresence"])) {
- automaticPresence = qdbus_cast<Telepathy::SimplePresence>(
+ automaticPresence = qdbus_cast<SimplePresence>(
props["AutomaticPresence"]);
debug() << " Automatic Presence:" << automaticPresence.type <<
"-" << automaticPresence.status;
@@ -857,9 +857,9 @@ void Account::Private::updateProperties(const QVariantMap &props)
}
if (props.contains("CurrentPresence") &&
- currentPresence != qdbus_cast<Telepathy::SimplePresence>(
+ currentPresence != qdbus_cast<SimplePresence>(
props["CurrentPresence"])) {
- currentPresence = qdbus_cast<Telepathy::SimplePresence>(
+ currentPresence = qdbus_cast<SimplePresence>(
props["CurrentPresence"]);
debug() << " Current Presence:" << currentPresence.type <<
"-" << currentPresence.status;
@@ -867,9 +867,9 @@ void Account::Private::updateProperties(const QVariantMap &props)
}
if (props.contains("RequestedPresence") &&
- requestedPresence != qdbus_cast<Telepathy::SimplePresence>(
+ requestedPresence != qdbus_cast<SimplePresence>(
props["RequestedPresence"])) {
- requestedPresence = qdbus_cast<Telepathy::SimplePresence>(
+ requestedPresence = qdbus_cast<SimplePresence>(
props["RequestedPresence"]);
debug() << " Requested Presence:" << requestedPresence.type <<
"-" << requestedPresence.status;
@@ -900,18 +900,18 @@ void Account::Private::updateProperties(const QVariantMap &props)
bool changed = false;
if (props.contains("ConnectionStatus") &&
- connectionStatus != Telepathy::ConnectionStatus(
+ connectionStatus != ConnectionStatus(
qdbus_cast<uint>(props["ConnectionStatus"]))) {
- connectionStatus = Telepathy::ConnectionStatus(
+ connectionStatus = ConnectionStatus(
qdbus_cast<uint>(props["ConnectionStatus"]));
debug() << " Connection Status:" << connectionStatus;
changed = true;
}
if (props.contains("ConnectionStatusReason") &&
- connectionStatusReason != Telepathy::ConnectionStatusReason(
+ connectionStatusReason != ConnectionStatusReason(
qdbus_cast<uint>(props["ConnectionStatusReason"]))) {
- connectionStatusReason = Telepathy::ConnectionStatusReason(
+ connectionStatusReason = ConnectionStatusReason(
qdbus_cast<uint>(props["ConnectionStatusReason"]));
debug() << " Connection StatusReason:" << connectionStatusReason;
changed = true;
@@ -964,7 +964,7 @@ void Account::gotAvatar(QDBusPendingCallWatcher *watcher)
if (!reply.isError()) {
debug() << "Got reply to GetAvatar(Account)";
- mPriv->avatar = qdbus_cast<Telepathy::Avatar>(reply);
+ mPriv->avatar = qdbus_cast<Avatar>(reply);
// first time
if (!mPriv->readinessHelper->actualFeatures().contains(FeatureAvatar)) {
@@ -1030,4 +1030,4 @@ void Account::onRemoved()
QLatin1String("Account removed from AccountManager"));
}
-} // Telepathy
+} // Tp
diff --git a/TelepathyQt4/account.h b/TelepathyQt4/account.h
index 0b68e63..1b7aaf7 100644
--- a/TelepathyQt4/account.h
+++ b/TelepathyQt4/account.h
@@ -43,7 +43,7 @@
#include <QStringList>
#include <QVariantMap>
-namespace Telepathy
+namespace Tp
{
class Account;
@@ -93,8 +93,8 @@ public:
PendingOperation *setNickname(const QString &value);
// requires spec 0.17.16
- const Telepathy::Avatar &avatar() const;
- PendingOperation *setAvatar(const Telepathy::Avatar &avatar);
+ const Avatar &avatar() const;
+ PendingOperation *setAvatar(const Avatar &avatar);
QVariantMap parameters() const;
PendingOperation *updateParameters(const QVariantMap &set,
@@ -106,20 +106,20 @@ public:
bool connectsAutomatically() const;
PendingOperation *setConnectsAutomatically(bool value);
- Telepathy::ConnectionStatus connectionStatus() const;
- Telepathy::ConnectionStatusReason connectionStatusReason() const;
+ ConnectionStatus connectionStatus() const;
+ ConnectionStatusReason connectionStatusReason() const;
bool haveConnection() const;
ConnectionPtr connection() const;
- Telepathy::SimplePresence automaticPresence() const;
+ SimplePresence automaticPresence() const;
PendingOperation *setAutomaticPresence(
- const Telepathy::SimplePresence &value);
+ const SimplePresence &value);
- Telepathy::SimplePresence currentPresence() const;
+ SimplePresence currentPresence() const;
- Telepathy::SimplePresence requestedPresence() const;
+ SimplePresence requestedPresence() const;
PendingOperation *setRequestedPresence(
- const Telepathy::SimplePresence &value);
+ const SimplePresence &value);
QString uniqueIdentifier() const;
@@ -166,12 +166,12 @@ Q_SIGNALS:
void stateChanged(bool);
void connectsAutomaticallyPropertyChanged(bool);
void parametersChanged(const QVariantMap &);
- void automaticPresenceChanged(const Telepathy::SimplePresence &) const;
- void currentPresenceChanged(const Telepathy::SimplePresence &) const;
- void requestedPresenceChanged(const Telepathy::SimplePresence &) const;
- void avatarChanged(const Telepathy::Avatar &);
- void connectionStatusChanged(Telepathy::ConnectionStatus,
- Telepathy::ConnectionStatusReason);
+ void automaticPresenceChanged(const Tp::SimplePresence &) const;
+ void currentPresenceChanged(const Tp::SimplePresence &) const;
+ void requestedPresenceChanged(const Tp::SimplePresence &) const;
+ void avatarChanged(const Tp::Avatar &);
+ void connectionStatusChanged(Tp::ConnectionStatus,
+ Tp::ConnectionStatusReason);
void haveConnectionChanged(bool haveConnection);
protected:
@@ -185,7 +185,7 @@ private Q_SLOTS:
void gotMainProperties(QDBusPendingCallWatcher *);
void gotAvatar(QDBusPendingCallWatcher *);
void onAvatarChanged();
- void onConnectionManagerReady(Telepathy::PendingOperation *);
+ void onConnectionManagerReady(Tp::PendingOperation *);
void onPropertyChanged(const QVariantMap &delta);
void onRemoved();
@@ -195,6 +195,6 @@ private:
Private *mPriv;
};
-} // Telepathy
+} // Tp
#endif
diff --git a/TelepathyQt4/async-model.dox b/TelepathyQt4/async-model.dox
index da90d49..c82b422 100644
--- a/TelepathyQt4/async-model.dox
+++ b/TelepathyQt4/async-model.dox
@@ -39,14 +39,14 @@
*
* In order to do this new classes so called PendingOperations were created,
* and all methods that need to be asynchronous will return a \link
- * Telepathy::Client::PendingOperation \endlink which will emit a signal \link
- * Telepathy::Client::PendingOperation::finished() \endlink when the operation
+ * Tp::PendingOperation \endlink which will emit a signal \link
+ * Tp::PendingOperation::finished() \endlink when the operation
* has ended. See PendingOperation documentation for more details.
*
- * So when instantiating a new object (\link Telepathy::Client::Account \endlink,
- * \link Telepathy::Client::AccountManager \endlink, \link
- * Telepathy::Client::Connection \endlink, and so on), one needs to call \link
- * Telepathy::Client::ReadyObject::becomeReady() \endlink and wait the returned
+ * So when instantiating a new object (\link Tp::Account \endlink,
+ * \link Tp::AccountManager \endlink, \link
+ * Tp::Connection \endlink, and so on), one needs to call \link
+ * Tp::ReadyObject::becomeReady() \endlink and wait the returned
* PendingOperation to finish before using the object.
*
* This assures that the initial object introspection process is completed and
diff --git a/TelepathyQt4/channel.cpp b/TelepathyQt4/channel.cpp
index 75ca9bd..2674ee6 100644
--- a/TelepathyQt4/channel.cpp
+++ b/TelepathyQt4/channel.cpp
@@ -59,7 +59,7 @@
* interfaces.
*/
-namespace Telepathy
+namespace Tp
{
struct Channel::Private
@@ -171,8 +171,8 @@ struct Channel::Private
struct Channel::Private::GroupMembersChangedInfo
{
- GroupMembersChangedInfo(const Telepathy::UIntList &added, const Telepathy::UIntList &removed,
- const Telepathy::UIntList &localPending, const Telepathy::UIntList &remotePending,
+ GroupMembersChangedInfo(const UIntList &added, const UIntList &removed,
+ const UIntList &localPending, const UIntList &remotePending,
const QVariantMap &details)
: added(added),
removed(removed),
@@ -186,10 +186,10 @@ struct Channel::Private::GroupMembersChangedInfo
{
}
- Telepathy::UIntList added;
- Telepathy::UIntList removed;
- Telepathy::UIntList localPending;
- Telepathy::UIntList remotePending;
+ UIntList added;
+ UIntList removed;
+ UIntList localPending;
+ UIntList remotePending;
QVariantMap details;
uint actor;
uint reason;
@@ -228,7 +228,7 @@ Channel::Private::Private(Channel *parent, const ConnectionPtr &connection)
debug() << " Connection to owning connection's lifetime signals";
parent->connect(connection.data(),
- SIGNAL(invalidated(Telepathy::DBusProxy *,
+ SIGNAL(invalidated(Tp::DBusProxy *,
const QString &, const QString &)),
SLOT(onConnectionInvalidated()));
@@ -329,19 +329,19 @@ void Channel::Private::introspectGroup()
debug() << "Connecting to Channel.Interface.Group::MembersChanged";
parent->connect(group,
- SIGNAL(MembersChanged(const QString&, const Telepathy::UIntList&,
- const Telepathy::UIntList&, const Telepathy::UIntList&,
- const Telepathy::UIntList&, uint, uint)),
- SLOT(onMembersChanged(const QString&, const Telepathy::UIntList&,
- const Telepathy::UIntList&, const Telepathy::UIntList&,
- const Telepathy::UIntList&, uint, uint)));
+ SIGNAL(MembersChanged(const QString&, const Tp::UIntList&,
+ const Tp::UIntList&, const Tp::UIntList&,
+ const Tp::UIntList&, uint, uint)),
+ SLOT(onMembersChanged(const QString&, const Tp::UIntList&,
+ const Tp::UIntList&, const Tp::UIntList&,
+ const Tp::UIntList&, uint, uint)));
debug() << "Connecting to Channel.Interface.Group::HandleOwnersChanged";
parent->connect(group,
- SIGNAL(HandleOwnersChanged(const Telepathy::HandleOwnerMap&,
- const Telepathy::UIntList&)),
- SLOT(onHandleOwnersChanged(const Telepathy::HandleOwnerMap&,
- const Telepathy::UIntList&)));
+ SIGNAL(HandleOwnersChanged(const Tp::HandleOwnerMap&,
+ const Tp::UIntList&)),
+ SLOT(onHandleOwnersChanged(const Tp::HandleOwnerMap&,
+ const Tp::UIntList&)));
debug() << "Connecting to Channel.Interface.Group::SelfHandleChanged";
parent->connect(group,
@@ -565,40 +565,40 @@ bool Channel::Private::setGroupFlags(uint newGroupFlags)
!usingMembersChangedDetailed) {
usingMembersChangedDetailed = true;
parent->disconnect(group,
- SIGNAL(MembersChanged(const QString&, const Telepathy::UIntList&,
- const Telepathy::UIntList&, const Telepathy::UIntList&,
- const Telepathy::UIntList&, uint, uint)),
+ SIGNAL(MembersChanged(const QString&, const Tp::UIntList&,
+ const Tp::UIntList&, const Tp::UIntList&,
+ const Tp::UIntList&, uint, uint)),
parent,
- SLOT(onMembersChanged(const QString&, const Telepathy::UIntList&,
- const Telepathy::UIntList&, const Telepathy::UIntList&,
- const Telepathy::UIntList&, uint, uint)));
+ SLOT(onMembersChanged(const QString&, const Tp::UIntList&,
+ const Tp::UIntList&, const Tp::UIntList&,
+ const Tp::UIntList&, uint, uint)));
parent->connect(group,
- SIGNAL(MembersChangedDetailed(const Telepathy::UIntList&,
- const Telepathy::UIntList&, const Telepathy::UIntList&,
- const Telepathy::UIntList&, const QVariantMap&)),
- SLOT(onMembersChangedDetailed(const Telepathy::UIntList&,
- const Telepathy::UIntList&, const Telepathy::UIntList&,
- const Telepathy::UIntList&, const QVariantMap&)));
+ SIGNAL(MembersChangedDetailed(const Tp::UIntList&,
+ const Tp::UIntList&, const Tp::UIntList&,
+ const Tp::UIntList&, const QVariantMap&)),
+ SLOT(onMembersChangedDetailed(const Tp::UIntList&,
+ const Tp::UIntList&, const Tp::UIntList&,
+ const Tp::UIntList&, const QVariantMap&)));
} else if (!(groupFlags & ChannelGroupFlagMembersChangedDetailed) &&
usingMembersChangedDetailed) {
warning() << " Channel service did spec-incompliant removal of MCD from GroupFlags";
usingMembersChangedDetailed = false;
parent->disconnect(group,
- SIGNAL(MembersChangedDetailed(const Telepathy::UIntList&,
- const Telepathy::UIntList&, const Telepathy::UIntList&,
- const Telepathy::UIntList&, const QVariantMap&)),
+ SIGNAL(MembersChangedDetailed(const Tp::UIntList&,
+ const Tp::UIntList&, const Tp::UIntList&,
+ const Tp::UIntList&, const QVariantMap&)),
parent,
- SLOT(onMembersChangedDetailed(const Telepathy::UIntList&,
- const Telepathy::UIntList&, const Telepathy::UIntList&,
- const Telepathy::UIntList&, const QVariantMap&)));
+ SLOT(onMembersChangedDetailed(const Tp::UIntList&,
+ const Tp::UIntList&, const Tp::UIntList&,
+ const Tp::UIntList&, const QVariantMap&)));
parent->connect(group,
- SIGNAL(MembersChanged(const QString&, const Telepathy::UIntList&,
- const Telepathy::UIntList&, const Telepathy::UIntList&,
- const Telepathy::UIntList&, uint, uint)),
+ SIGNAL(MembersChanged(const QString&, const Tp::UIntList&,
+ const Tp::UIntList&, const Tp::UIntList&,
+ const Tp::UIntList&, uint, uint)),
parent,
- SLOT(onMembersChanged(const QString&, const Telepathy::UIntList&,
- const Telepathy::UIntList&, const Telepathy::UIntList&,
- const Telepathy::UIntList&, uint, uint)));
+ SLOT(onMembersChanged(const QString&, const Tp::UIntList&,
+ const Tp::UIntList&, const Tp::UIntList&,
+ const Tp::UIntList&, uint, uint)));
}
return true;
@@ -648,8 +648,8 @@ void Channel::Private::buildContacts()
<< Contact::FeatureAvatarToken
<< Contact::FeatureSimplePresence);
parent->connect(pendingContacts,
- SIGNAL(finished(Telepathy::PendingOperation *)),
- SLOT(gotContacts(Telepathy::PendingOperation *)));
+ SIGNAL(finished(Tp::PendingOperation *)),
+ SLOT(gotContacts(Tp::PendingOperation *)));
}
void Channel::Private::processMembersChanged()
@@ -861,7 +861,7 @@ bool Channel::Private::fakeGroupInterfaceIfNeeded()
{
if (interfaces.contains(TELEPATHY_INTERFACE_CHANNEL_INTERFACE_GROUP)) {
return false;
- } else if (targetHandleType != Telepathy::HandleTypeContact) {
+ } else if (targetHandleType != HandleTypeContact) {
return false;
}
@@ -919,7 +919,7 @@ void Channel::Private::setReady()
* \ingroup clientchannel
* \headerfile <TelepathyQt4/channel.h> <TelepathyQt4/Channel>
*
- * High-level proxy object for accessing remote %Telepathy %Channel objects.
+ * High-level proxy object for accessing remote Telepathy Channel objects.
*
* It adds the following features compared to using ChannelInterface directly:
* <ul>
@@ -1185,7 +1185,7 @@ bool Channel::groupCanAddContacts() const
warning() << "Channel::groupCanAddContacts() used channel not ready";
}
- return mPriv->groupFlags & Telepathy::ChannelGroupFlagCanAdd;
+ return mPriv->groupFlags & ChannelGroupFlagCanAdd;
}
/**
@@ -1248,7 +1248,7 @@ bool Channel::groupCanRescindContacts() const
warning() << "Channel::groupCanRescindContacts() used channel not ready";
}
- return mPriv->groupFlags & Telepathy::ChannelGroupFlagCanRescind;
+ return mPriv->groupFlags & ChannelGroupFlagCanRescind;
}
/**
@@ -1266,7 +1266,7 @@ bool Channel::groupCanRemoveContacts() const
warning() << "Channel::groupCanRemoveContacts() used channel not ready";
}
- return mPriv->groupFlags & Telepathy::ChannelGroupFlagCanRemove;
+ return mPriv->groupFlags & ChannelGroupFlagCanRemove;
}
/**
@@ -1564,7 +1564,7 @@ PendingOperation *Channel::groupAddSelfHandle()
"ready";
return new PendingFailure(this,
TELEPATHY_ERROR_INVALID_ARGUMENT,
- "Telepathy-Qt4: Channel object not ready");
+ "Channel object not ready");
}
UIntList handles;
@@ -1591,10 +1591,10 @@ PendingOperation *Channel::groupAddSelfHandle()
/**
* \fn void Channel::groupMembersChanged(
- * const Telepathy::Contacts &groupMembersAdded,
- * const Telepathy::Contacts &groupLocalPendingMembersAdded,
- * const Telepathy::Contacts &groupRemotePendingMembersAdded,
- * const Telepathy::Contacts &groupMembersRemoved,
+ * const Tp::Contacts &groupMembersAdded,
+ * const Tp::Contacts &groupLocalPendingMembersAdded,
+ * const Tp::Contacts &groupRemotePendingMembersAdded,
+ * const Tp::Contacts &groupMembersRemoved,
* const Channel::GroupMemberChangeDetails &details);
*
* Emitted when the value returned by groupContacts(), groupLocalPendingContacts() or
@@ -1611,7 +1611,7 @@ PendingOperation *Channel::groupAddSelfHandle()
*/
/**
- * \fn void Channel::groupHandleOwnersChanged(const HandleOwnerMap &owners, const Telepathy::UIntList &added, const Telepathy::UIntList &removed)
+ * \fn void Channel::groupHandleOwnersChanged(const HandleOwnerMap &owners, const Tp::UIntList &added, const Tp::UIntList &removed)
*
* Emitted when the value returned by groupHandleOwners() changes.
*
@@ -2068,20 +2068,20 @@ void Channel::onGroupFlagsChanged(uint added, uint removed)
"value" << added << "added" << removed << "removed";
emit groupFlagsChanged(mPriv->groupFlags, added, removed);
- if (added & Telepathy::ChannelGroupFlagCanAdd ||
- removed & Telepathy::ChannelGroupFlagCanAdd) {
+ if (added & ChannelGroupFlagCanAdd ||
+ removed & ChannelGroupFlagCanAdd) {
debug() << "Emitting groupCanAddContactsChanged";
emit groupCanAddContactsChanged(groupCanAddContacts());
}
- if (added & Telepathy::ChannelGroupFlagCanRemove ||
- removed & Telepathy::ChannelGroupFlagCanRemove) {
+ if (added & ChannelGroupFlagCanRemove ||
+ removed & ChannelGroupFlagCanRemove) {
debug() << "Emitting groupCanRemoveContactsChanged";
emit groupCanRemoveContactsChanged(groupCanRemoveContacts());
}
- if (added & Telepathy::ChannelGroupFlagCanRescind ||
- removed & Telepathy::ChannelGroupFlagCanRescind) {
+ if (added & ChannelGroupFlagCanRescind ||
+ removed & ChannelGroupFlagCanRescind) {
debug() << "Emitting groupCanRescindContactsChanged";
emit groupCanRescindContactsChanged(groupCanRescindContacts());
}
@@ -2089,8 +2089,8 @@ void Channel::onGroupFlagsChanged(uint added, uint removed)
}
void Channel::onMembersChanged(const QString &message,
- const Telepathy::UIntList &added, const Telepathy::UIntList &removed,
- const Telepathy::UIntList &localPending, const Telepathy::UIntList &remotePending,
+ const UIntList &added, const UIntList &removed,
+ const UIntList &localPending, const UIntList &remotePending,
uint actor, uint reason)
{
debug() << "Got Channel.Interface.Group::MembersChanged with" << added.size() <<
@@ -2117,8 +2117,8 @@ void Channel::onMembersChanged(const QString &message,
}
void Channel::onMembersChangedDetailed(
- const Telepathy::UIntList &added, const Telepathy::UIntList &removed,
- const Telepathy::UIntList &localPending, const Telepathy::UIntList &remotePending,
+ const UIntList &added, const UIntList &removed,
+ const UIntList &localPending, const UIntList &remotePending,
const QVariantMap &details)
{
debug() << "Got Channel.Interface.Group::MembersChangedDetailed with" << added.size() <<
@@ -2151,8 +2151,8 @@ void Channel::onMembersChangedDetailed(
}
}
-void Channel::onHandleOwnersChanged(const Telepathy::HandleOwnerMap &added,
- const Telepathy::UIntList &removed)
+void Channel::onHandleOwnersChanged(const HandleOwnerMap &added,
+ const UIntList &removed)
{
debug() << "Got Channel.Interface.Group::HandleOwnersChanged with" <<
added.size() << "added," << removed.size() << "removed";
@@ -2290,4 +2290,4 @@ void Channel::continueIntrospection()
* \return The message as a string.
*/
-} // Telepathy
+} // Tp
diff --git a/TelepathyQt4/channel.h b/TelepathyQt4/channel.h
index e860112..3485fb3 100644
--- a/TelepathyQt4/channel.h
+++ b/TelepathyQt4/channel.h
@@ -41,7 +41,7 @@
#include <QSet>
#include <QVariantMap>
-namespace Telepathy
+namespace Tp
{
class Connection;
@@ -86,7 +86,7 @@ public:
bool groupCanRemoveContacts() const;
PendingOperation *groupRemoveContacts(const QList<ContactPtr> &contacts,
const QString &message = QString(),
- uint reason = Telepathy::ChannelGroupChangeReasonNone);
+ uint reason = ChannelGroupChangeReasonNone);
Contacts groupContacts() const;
Contacts groupLocalPendingContacts() const;
@@ -145,14 +145,14 @@ Q_SIGNALS:
void groupCanRescindContactsChanged(bool canRescindContacts);
void groupMembersChanged(
- const Telepathy::Contacts &groupMembersAdded,
- const Telepathy::Contacts &groupLocalPendingMembersAdded,
- const Telepathy::Contacts &groupRemotePendingMembersAdded,
- const Telepathy::Contacts &groupMembersRemoved,
- const Telepathy::Channel::GroupMemberChangeDetails &details);
+ const Tp::Contacts &groupMembersAdded,
+ const Tp::Contacts &groupLocalPendingMembersAdded,
+ const Tp::Contacts &groupRemotePendingMembersAdded,
+ const Tp::Contacts &groupMembersRemoved,
+ const Tp::Channel::GroupMemberChangeDetails &details);
- void groupHandleOwnersChanged(const Telepathy::HandleOwnerMap &owners,
- const Telepathy::UIntList &added, const Telepathy::UIntList &removed);
+ void groupHandleOwnersChanged(const Tp::HandleOwnerMap &owners,
+ const Tp::UIntList &added, const Tp::UIntList &removed);
void groupSelfContactChanged();
@@ -287,17 +287,17 @@ private Q_SLOTS:
void gotAllMembers(QDBusPendingCallWatcher *watcher);
void gotLocalPendingMembersWithInfo(QDBusPendingCallWatcher *watcher);
void gotSelfHandle(QDBusPendingCallWatcher *watcher);
- void gotContacts(Telepathy::PendingOperation *op);
+ void gotContacts(Tp::PendingOperation *op);
void onGroupFlagsChanged(uint, uint);
void onMembersChanged(const QString&,
- const Telepathy::UIntList&, const Telepathy::UIntList&,
- const Telepathy::UIntList&, const Telepathy::UIntList&, uint, uint);
+ const Tp::UIntList&, const Tp::UIntList&,
+ const Tp::UIntList&, const Tp::UIntList&, uint, uint);
void onMembersChangedDetailed(
- const Telepathy::UIntList &added, const Telepathy::UIntList &removed,
- const Telepathy::UIntList &localPending, const Telepathy::UIntList &remotePending,
+ const Tp::UIntList &added, const Tp::UIntList &removed,
+ const Tp::UIntList &localPending, const Tp::UIntList &remotePending,
const QVariantMap &details);
- void onHandleOwnersChanged(const Telepathy::HandleOwnerMap&, const Telepathy::UIntList&);
+ void onHandleOwnersChanged(const Tp::HandleOwnerMap&, const Tp::UIntList&);
void onSelfHandleChanged(uint);
void continueIntrospection();
@@ -308,8 +308,8 @@ private:
Private *mPriv;
};
-} // Telepathy
+} // Tp
-Q_DECLARE_METATYPE(Telepathy::Channel::GroupMemberChangeDetails);
+Q_DECLARE_METATYPE(Tp::Channel::GroupMemberChangeDetails);
#endif
diff --git a/TelepathyQt4/connection-internal.h b/TelepathyQt4/connection-internal.h
index d69ec45..3e6a6b1 100644
--- a/TelepathyQt4/connection-internal.h
+++ b/TelepathyQt4/connection-internal.h
@@ -28,7 +28,7 @@
#include <QSet>
-namespace Telepathy
+namespace Tp
{
class Connection::PendingConnect : public PendingReady
@@ -40,9 +40,9 @@ public:
private Q_SLOTS:
void onConnectReply(QDBusPendingCallWatcher *);
- void onBecomeReadyReply(Telepathy::PendingOperation *);
+ void onBecomeReadyReply(Tp::PendingOperation *);
};
-} // Telepathy
+} // Tp
#endif
diff --git a/TelepathyQt4/connection-manager-internal.h b/TelepathyQt4/connection-manager-internal.h
index c851dbd..18ac431 100644
--- a/TelepathyQt4/connection-manager-internal.h
+++ b/TelepathyQt4/connection-manager-internal.h
@@ -29,7 +29,7 @@
#include <QQueue>
#include <QString>
-namespace Telepathy
+namespace Tp
{
class ConnectionManager;
@@ -90,6 +90,6 @@ private:
QDBusConnection mBus;
};
-} // Telepathy
+} // Tp
#endif
diff --git a/TelepathyQt4/connection-manager.cpp b/TelepathyQt4/connection-manager.cpp
index 06629ce..be78170 100644
--- a/TelepathyQt4/connection-manager.cpp
+++ b/TelepathyQt4/connection-manager.cpp
@@ -59,13 +59,13 @@
* Proxy objects representing remote Telepathy ConnectionManager objects.
*/
-namespace Telepathy
+namespace Tp
{
ProtocolParameter::ProtocolParameter(const QString &name,
const QDBusSignature &dbusSignature,
QVariant defaultValue,
- Telepathy::ConnMgrParamFlag flags)
+ ConnMgrParamFlag flags)
: mName(name),
mDBusSignature(dbusSignature),
mType(ManagerFile::variantTypeFromDBusSignature(dbusSignature.signature())),
@@ -191,7 +191,7 @@ bool ProtocolInfo::hasParameter(const QString &name) const
/**
* Return whether it might be possible to register new accounts on this
- * protocol via Telepathy, by setting the special parameter named
+ * protocol, by setting the special parameter named
* <code>register</code> to <code>true</code>.
*
* \return The same thing as hasParameter("register").
@@ -211,13 +211,13 @@ void ProtocolInfo::addParameter(const ParamSpec &spec)
uint flags = spec.flags;
if (spec.name.endsWith("password")) {
- flags |= Telepathy::ConnMgrParamFlagSecret;
+ flags |= ConnMgrParamFlagSecret;
}
ProtocolParameter *param = new ProtocolParameter(spec.name,
QDBusSignature(spec.signature),
defaultValue,
- (Telepathy::ConnMgrParamFlag) flags);
+ (ConnMgrParamFlag) flags);
mPriv->params.append(param);
}
@@ -676,4 +676,4 @@ void ConnectionManager::gotParameters(QDBusPendingCallWatcher *watcher)
watcher->deleteLater();
}
-} // Telepathy
+} // Tp
diff --git a/TelepathyQt4/connection-manager.h b/TelepathyQt4/connection-manager.h
index ecba905..e8b8f55 100644
--- a/TelepathyQt4/connection-manager.h
+++ b/TelepathyQt4/connection-manager.h
@@ -39,7 +39,7 @@
#include <QSet>
-namespace Telepathy
+namespace Tp
{
class PendingConnection;
@@ -57,7 +57,7 @@ public:
ProtocolParameter(const QString &name,
const QDBusSignature &dbusSignature,
QVariant defaultValue,
- Telepathy::ConnMgrParamFlag flags);
+ ConnMgrParamFlag flags);
~ProtocolParameter();
QString name() const { return mName; }
@@ -82,7 +82,7 @@ private:
QDBusSignature mDBusSignature;
QVariant::Type mType;
QVariant mDefaultValue;
- Telepathy::ConnMgrParamFlag mFlags;
+ ConnMgrParamFlag mFlags;
};
@@ -169,6 +169,6 @@ private:
Private *mPriv;
};
-} // Telepathy
+} // Tp
#endif
diff --git a/TelepathyQt4/connection.cpp b/TelepathyQt4/connection.cpp
index 0b1cb3d..2574959 100644
--- a/TelepathyQt4/connection.cpp
+++ b/TelepathyQt4/connection.cpp
@@ -67,7 +67,7 @@
* Proxy objects representing remote Telepathy Connection objects.
*/
-namespace Telepathy
+namespace Tp
{
struct Connection::Private
@@ -350,8 +350,8 @@ void Connection::Private::introspectSelfContact(Connection::Private *self)
<< Contact::FeatureAvatarToken
<< Contact::FeatureSimplePresence);
self->parent->connect(contacts,
- SIGNAL(finished(Telepathy::PendingOperation *)),
- SLOT(gotSelfContact(Telepathy::PendingOperation *)));
+ SIGNAL(finished(Tp::PendingOperation *)),
+ SLOT(gotSelfContact(Tp::PendingOperation *)));
}
void Connection::Private::introspectSelfHandle()
@@ -379,12 +379,12 @@ void Connection::Private::introspectRoster(Connection::Private *self)
(ContactManager::ContactListChannel::Type) i));
PendingHandles *pending = self->parent->requestHandles(
- Telepathy::HandleTypeList,
+ HandleTypeList,
QStringList() << ContactManager::ContactListChannel::identifierForType(
(ContactManager::ContactListChannel::Type) i));
self->parent->connect(pending,
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(gotContactListsHandles(Telepathy::PendingOperation*)));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(gotContactListsHandles(Tp::PendingOperation*)));
}
}
@@ -406,12 +406,12 @@ void Connection::PendingConnect::onConnectReply(QDBusPendingCallWatcher *watcher
}
else {
connect(qobject_cast<Connection*>(parent())->becomeReady(requestedFeatures()),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(onBecomeReadyReply(Telepathy::PendingOperation*)));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(onBecomeReadyReply(Tp::PendingOperation*)));
}
}
-void Connection::PendingConnect::onBecomeReadyReply(Telepathy::PendingOperation *op)
+void Connection::PendingConnect::onBecomeReadyReply(Tp::PendingOperation *op)
{
if (op->isError()) {
setFinishedWithError(op->errorName(), op->errorMessage());
@@ -970,7 +970,7 @@ void Connection::gotContactListsHandles(PendingOperation *op)
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
TELEPATHY_INTERFACE_CHANNEL_TYPE_CONTACT_LIST);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
- Telepathy::HandleTypeList);
+ HandleTypeList);
Q_ASSERT(pending->handles().size() == 1);
Q_ASSERT(pending->namesRequested().size() == 1);
@@ -981,8 +981,8 @@ void Connection::gotContactListsHandles(PendingOperation *op)
mPriv->contactListsChannels[type].handle = handle;
request[QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandle")] = handle[0];
connect(ensureChannel(request),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(gotContactListChannel(Telepathy::PendingOperation*)));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(gotContactListChannel(Tp::PendingOperation*)));
}
void Connection::gotContactListChannel(PendingOperation *op)
@@ -1003,7 +1003,7 @@ void Connection::gotContactListChannel(PendingOperation *op)
Q_ASSERT(!mPriv->contactListsChannels[i].channel);
mPriv->contactListsChannels[i].channel = channel;
connect(channel->becomeReady(),
- SIGNAL(finished(Telepathy::PendingOperation *)),
+ SIGNAL(finished(Tp::PendingOperation *)),
SLOT(contactListChannelReady()));
}
}
@@ -1450,4 +1450,4 @@ void Connection::onSelfHandleChanged(uint handle)
}
}
-} // Telepathy
+} // Tp
diff --git a/TelepathyQt4/connection.h b/TelepathyQt4/connection.h
index de052c1..a589bd3 100644
--- a/TelepathyQt4/connection.h
+++ b/TelepathyQt4/connection.h
@@ -44,7 +44,7 @@
#include <QString>
#include <QStringList>
-namespace Telepathy
+namespace Tp
{
class Channel;
@@ -72,9 +72,9 @@ public:
static const Feature FeatureRoster;
enum Status {
- StatusDisconnected = Telepathy::ConnectionStatusDisconnected,
- StatusConnecting = Telepathy::ConnectionStatusConnecting,
- StatusConnected = Telepathy::ConnectionStatusConnected,
+ StatusDisconnected = ConnectionStatusDisconnected,
+ StatusConnecting = ConnectionStatusConnecting,
+ StatusConnected = ConnectionStatusConnected,
StatusUnknown = 0xFFFFFFFF
};
@@ -189,10 +189,10 @@ private Q_SLOTS:
void gotInterfaces(QDBusPendingCallWatcher *watcher);
void gotContactAttributeInterfaces(QDBusPendingCallWatcher *watcher);
void gotSimpleStatuses(QDBusPendingCallWatcher *watcher);
- void gotSelfContact(Telepathy::PendingOperation *);
+ void gotSelfContact(Tp::PendingOperation *);
void gotSelfHandle(QDBusPendingCallWatcher *watcher);
- void gotContactListsHandles(Telepathy::PendingOperation *);
- void gotContactListChannel(Telepathy::PendingOperation *);
+ void gotContactListsHandles(Tp::PendingOperation *);
+ void gotContactListChannel(Tp::PendingOperation *);
void contactListChannelReady();
void doReleaseSweep(uint type);
@@ -216,6 +216,6 @@ private:
Private *mPriv;
};
-} // Telepathy
+} // Tp
#endif
diff --git a/TelepathyQt4/constants.h b/TelepathyQt4/constants.h
index 103a24d..0f42296 100644
--- a/TelepathyQt4/constants.h
+++ b/TelepathyQt4/constants.h
@@ -70,7 +70,7 @@
/**
* The well-known bus name of the Account Manager.
*
- * \see Telepathy::AccountManager
+ * \see Tp::AccountManager
*/
#define TELEPATHY_ACCOUNT_MANAGER_BUS_NAME \
"org.freedesktop.Telepathy.AccountManager"
@@ -78,7 +78,7 @@
/**
* The object path of the Account Manager object.
*
- * \see Telepathy::AccountManager
+ * \see Tp::AccountManager
*/
#define TELEPATHY_ACCOUNT_MANAGER_OBJECT_PATH \
"/org/freedesktop/Telepathy/AccountManager"
@@ -88,7 +88,7 @@
* "gabble"), the protocol (e.g. "jabber") and an element
* identifying the particular account should be appended.
*
- * \see Telepathy::Account
+ * \see Tp::Account
*/
#define TELEPATHY_ACCOUNT_OBJECT_PATH_BASE \
"/org/freedesktop/Telepathy/Account"
diff --git a/TelepathyQt4/contact-manager.cpp b/TelepathyQt4/contact-manager.cpp
index 8e8508f..a2530ac 100644
--- a/TelepathyQt4/contact-manager.cpp
+++ b/TelepathyQt4/contact-manager.cpp
@@ -54,7 +54,7 @@
* Proxy objects representing remote Telepathy Connection objects.
*/
-namespace Telepathy
+namespace Tp
{
/**
@@ -191,7 +191,7 @@ bool ContactManager::subscriptionRequestHasMessage() const
{
return mPriv->subscribeChannel &&
(mPriv->subscribeChannel->groupFlags() &
- Telepathy::ChannelGroupFlagMessageAdd);
+ ChannelGroupFlagMessageAdd);
}
/**
@@ -257,7 +257,7 @@ bool ContactManager::subscriptionRemovalHasMessage() const
{
return mPriv->subscribeChannel &&
(mPriv->subscribeChannel->groupFlags() &
- Telepathy::ChannelGroupFlagMessageRemove);
+ ChannelGroupFlagMessageRemove);
}
/**
@@ -290,7 +290,7 @@ bool ContactManager::subscriptionRescindingHasMessage() const
{
return mPriv->subscribeChannel &&
(mPriv->subscribeChannel->groupFlags() &
- Telepathy::ChannelGroupFlagMessageRescind);
+ ChannelGroupFlagMessageRescind);
}
/**
@@ -346,7 +346,7 @@ bool ContactManager::publicationAuthorizationHasMessage() const
{
return mPriv->subscribeChannel &&
(mPriv->subscribeChannel->groupFlags() &
- Telepathy::ChannelGroupFlagMessageAccept);
+ ChannelGroupFlagMessageAccept);
}
/**
@@ -387,7 +387,7 @@ bool ContactManager::publicationRejectionHasMessage() const
{
return mPriv->subscribeChannel &&
(mPriv->subscribeChannel->groupFlags() &
- Telepathy::ChannelGroupFlagMessageReject);
+ ChannelGroupFlagMessageReject);
}
/**
@@ -422,7 +422,7 @@ bool ContactManager::publicationRemovalHasMessage() const
{
return mPriv->subscribeChannel &&
(mPriv->subscribeChannel->groupFlags() &
- Telepathy::ChannelGroupFlagMessageRemove);
+ ChannelGroupFlagMessageRemove);
}
/**
@@ -565,7 +565,7 @@ PendingContacts *ContactManager::upgradeContacts(const QList<ContactPtr> &contac
return new PendingContacts(this, contacts, features);
}
-void ContactManager::onAliasesChanged(const Telepathy::AliasPairList &aliases)
+void ContactManager::onAliasesChanged(const AliasPairList &aliases)
{
debug() << "Got AliasesChanged for" << aliases.size() << "contacts";
@@ -588,7 +588,7 @@ void ContactManager::onAvatarUpdated(uint handle, const QString &token)
}
}
-void ContactManager::onPresencesChanged(const Telepathy::SimpleContactPresences &presences)
+void ContactManager::onPresencesChanged(const SimpleContactPresences &presences)
{
debug() << "Got PresencesChanged for" << presences.size() << "contacts";
@@ -757,36 +757,36 @@ void ContactManager::setContactListChannels(
if (type == ContactListChannel::TypeSubscribe) {
method = SLOT(onSubscribeChannelMembersChanged(
- const Telepathy::Contacts &,
- const Telepathy::Contacts &,
- const Telepathy::Contacts &,
- const Telepathy::Contacts &,
- const Telepathy::Channel::GroupMemberChangeDetails &));
+ const Tp::Contacts &,
+ const Tp::Contacts &,
+ const Tp::Contacts &,
+ const Tp::Contacts &,
+ const Tp::Channel::GroupMemberChangeDetails &));
} else if (type == ContactListChannel::TypePublish) {
method = SLOT(onPublishChannelMembersChanged(
- const Telepathy::Contacts &,
- const Telepathy::Contacts &,
- const Telepathy::Contacts &,
- const Telepathy::Contacts &,
- const Telepathy::Channel::GroupMemberChangeDetails &));
+ const Tp::Contacts &,
+ const Tp::Contacts &,
+ const Tp::Contacts &,
+ const Tp::Contacts &,
+ const Tp::Channel::GroupMemberChangeDetails &));
} else if (type == ContactListChannel::TypeDeny) {
method = SLOT(onDenyChannelMembersChanged(
- const Telepathy::Contacts &,
- const Telepathy::Contacts &,
- const Telepathy::Contacts &,
- const Telepathy::Contacts &,
- const Telepathy::Channel::GroupMemberChangeDetails &));
+ const Tp::Contacts &,
+ const Tp::Contacts &,
+ const Tp::Contacts &,
+ const Tp::Contacts &,
+ const Tp::Channel::GroupMemberChangeDetails &));
} else {
continue;
}
connect(channel.data(),
SIGNAL(groupMembersChanged(
- const Telepathy::Contacts &,
- const Telepathy::Contacts &,
- const Telepathy::Contacts &,
- const Telepathy::Contacts &,
- const Telepathy::Channel::GroupMemberChangeDetails &)),
+ const Tp::Contacts &,
+ const Tp::Contacts &,
+ const Tp::Contacts &,
+ const Tp::Contacts &,
+ const Tp::Channel::GroupMemberChangeDetails &)),
method);
}
}
@@ -817,9 +817,9 @@ void ContactManager::Private::ensureTracking(Contact::Feature feature)
case Contact::FeatureAlias:
QObject::connect(
conn->aliasingInterface(),
- SIGNAL(AliasesChanged(const Telepathy::AliasPairList &)),
+ SIGNAL(AliasesChanged(const Tp::AliasPairList &)),
conn->contactManager(),
- SLOT(onAliasesChanged(const Telepathy::AliasPairList &)));
+ SLOT(onAliasesChanged(const Tp::AliasPairList &)));
break;
case Contact::FeatureAvatarToken:
@@ -833,9 +833,9 @@ void ContactManager::Private::ensureTracking(Contact::Feature feature)
case Contact::FeatureSimplePresence:
QObject::connect(
conn->simplePresenceInterface(),
- SIGNAL(PresencesChanged(const Telepathy::SimpleContactPresences &)),
+ SIGNAL(PresencesChanged(const Tp::SimpleContactPresences &)),
conn->contactManager(),
- SLOT(onPresencesChanged(const Telepathy::SimpleContactPresences &)));
+ SLOT(onPresencesChanged(const Tp::SimpleContactPresences &)));
break;
default:
@@ -946,4 +946,4 @@ uint ContactManager::ContactListChannel::typeForIdentifier(const QString &identi
return (uint) -1;
}
-} // Telepathy
+} // Tp
diff --git a/TelepathyQt4/contact-manager.h b/TelepathyQt4/contact-manager.h
index 7a31734..8f60836 100644
--- a/TelepathyQt4/contact-manager.h
+++ b/TelepathyQt4/contact-manager.h
@@ -36,7 +36,7 @@
#include <TelepathyQt4/Channel>
#include <TelepathyQt4/ReferencedHandles>
-namespace Telepathy
+namespace Tp
{
class Connection;
@@ -93,31 +93,31 @@ class ContactManager : public QObject
ContactPtr lookupContactByHandle(uint handle);
Q_SIGNALS:
- void presencePublicationRequested(const Telepathy::Contacts &contacts);
+ void presencePublicationRequested(const Tp::Contacts &contacts);
private Q_SLOTS:
- void onAliasesChanged(const Telepathy::AliasPairList &);
+ void onAliasesChanged(const Tp::AliasPairList &);
void onAvatarUpdated(uint, const QString &);
- void onPresencesChanged(const Telepathy::SimpleContactPresences &);
+ void onPresencesChanged(const Tp::SimpleContactPresences &);
void onSubscribeChannelMembersChanged(
- const Telepathy::Contacts &groupMembersAdded,
- const Telepathy::Contacts &groupLocalPendingMembersAdded,
- const Telepathy::Contacts &groupRemotePendingMembersAdded,
- const Telepathy::Contacts &groupMembersRemoved,
- const Telepathy::Channel::GroupMemberChangeDetails &details);
+ const Tp::Contacts &groupMembersAdded,
+ const Tp::Contacts &groupLocalPendingMembersAdded,
+ const Tp::Contacts &groupRemotePendingMembersAdded,
+ const Tp::Contacts &groupMembersRemoved,
+ const Tp::Channel::GroupMemberChangeDetails &details);
void onPublishChannelMembersChanged(
- const Telepathy::Contacts &groupMembersAdded,
- const Telepathy::Contacts &groupLocalPendingMembersAdded,
- const Telepathy::Contacts &groupRemotePendingMembersAdded,
- const Telepathy::Contacts &groupMembersRemoved,
- const Telepathy::Channel::GroupMemberChangeDetails &details);
+ const Tp::Contacts &groupMembersAdded,
+ const Tp::Contacts &groupLocalPendingMembersAdded,
+ const Tp::Contacts &groupRemotePendingMembersAdded,
+ const Tp::Contacts &groupMembersRemoved,
+ const Tp::Channel::GroupMemberChangeDetails &details);
void onDenyChannelMembersChanged(
- const Telepathy::Contacts &groupMembersAdded,
- const Telepathy::Contacts &groupLocalPendingMembersAdded,
- const Telepathy::Contacts &groupRemotePendingMembersAdded,
- const Telepathy::Contacts &groupMembersRemoved,
- const Telepathy::Channel::GroupMemberChangeDetails &details);
+ const Tp::Contacts &groupMembersAdded,
+ const Tp::Contacts &groupLocalPendingMembersAdded,
+ const Tp::Contacts &groupRemotePendingMembersAdded,
+ const Tp::Contacts &groupMembersRemoved,
+ const Tp::Channel::GroupMemberChangeDetails &details);
private:
struct ContactListChannel
@@ -167,6 +167,6 @@ class ContactManager : public QObject
Private *mPriv;
};
-} // Telepathy
+} // Tp
#endif
diff --git a/TelepathyQt4/contact.cpp b/TelepathyQt4/contact.cpp
index f90d202..0c8eafa 100644
--- a/TelepathyQt4/contact.cpp
+++ b/TelepathyQt4/contact.cpp
@@ -29,7 +29,7 @@
#include "TelepathyQt4/debug-internal.h"
-namespace Telepathy
+namespace Tp
{
struct Contact::Private
@@ -355,4 +355,4 @@ void Contact::setBlocked(bool value)
emit blockStatusChanged(value);
}
-} // Telepathy
+} // Tp
diff --git a/TelepathyQt4/contact.h b/TelepathyQt4/contact.h
index 0fce4fc..41c5396 100644
--- a/TelepathyQt4/contact.h
+++ b/TelepathyQt4/contact.h
@@ -33,7 +33,7 @@
#include <TelepathyQt4/Types>
-namespace Telepathy
+namespace Tp
{
class ContactManager;
@@ -93,13 +93,13 @@ Q_SIGNALS:
void avatarTokenChanged(const QString &avatarToken);
void simplePresenceChanged(const QString &status, uint type, const QString &presenceMessage);
- void subscriptionStateChanged(Telepathy::Contact::PresenceState state);
- void publishStateChanged(Telepathy::Contact::PresenceState state);
+ void subscriptionStateChanged(Tp::Contact::PresenceState state);
+ void publishStateChanged(Tp::Contact::PresenceState state);
void blockStatusChanged(bool blocked);
// TODO: consider how the Renaming interface should work and map to Contacts
// I guess it would be something like:
- // void renamedTo(Telepathy::ContactPtr)
+ // void renamedTo(Tp::ContactPtr)
// with that contact getting the same features requested as the current one. Or would we rather
// want to signal that change right away with a handle?
@@ -133,6 +133,6 @@ inline uint qHash(const ContactPtr &contact)
return qHash(contact.data());
}
-} // Telepathy
+} // Tp
#endif
diff --git a/TelepathyQt4/dbus-proxy.cpp b/TelepathyQt4/dbus-proxy.cpp
index 9b35d93..8c829fd 100644
--- a/TelepathyQt4/dbus-proxy.cpp
+++ b/TelepathyQt4/dbus-proxy.cpp
@@ -33,7 +33,7 @@
#include <QDBusConnectionInterface>
#include <QDBusError>
-namespace Telepathy
+namespace Tp
{
// ==== DBusProxy ======================================================
@@ -198,7 +198,7 @@ QString DBusProxy::invalidationMessage() const
}
/**
- * \fn void DBusProxy::invalidated (Telepathy::DBusProxy *proxy,
+ * \fn void DBusProxy::invalidated (Tp::DBusProxy *proxy,
* const QString &errorName, const QString &errorMessage)
*
* Emitted when this object is no longer usable.
@@ -271,7 +271,7 @@ void DBusProxy::emitInvalidated()
* objects do not remain useful if the service providing them exits or
* crashes, so they emit #invalidated() if this happens.
*
- * Examples in Telepathy include the Connection and Channel.
+ * Examples include the Connection and Channel.
*/
StatefulDBusProxy::StatefulDBusProxy(const QDBusConnection &dbusConnection,
@@ -324,7 +324,7 @@ void StatefulDBusProxy::onServiceOwnerChanged(const QString &name, const QString
* These objects can remain valid even if the service providing them exits
* and is restarted.
*
- * Examples in Telepathy include the AccountManager, Account and
+ * Examples include the AccountManager, Account and
* ConnectionManager.
*/
@@ -349,4 +349,4 @@ StatelessDBusProxy::~StatelessDBusProxy()
{
}
-} // Telepathy
+} // Tp
diff --git a/TelepathyQt4/dbus-proxy.h b/TelepathyQt4/dbus-proxy.h
index 1267bd9..448b4fd 100644
--- a/TelepathyQt4/dbus-proxy.h
+++ b/TelepathyQt4/dbus-proxy.h
@@ -31,7 +31,7 @@
class QDBusConnection;
class QDBusError;
-namespace Telepathy
+namespace Tp
{
class DBusProxy : public QObject
@@ -65,7 +65,7 @@ protected:
void invalidate(const QDBusError &error);
Q_SIGNALS:
- void invalidated(Telepathy::DBusProxy *proxy,
+ void invalidated(Tp::DBusProxy *proxy,
const QString &errorName, const QString &errorMessage);
private Q_SLOTS:
@@ -115,6 +115,6 @@ private:
Private *mPriv;
};
-}
+} // Tp
#endif
diff --git a/TelepathyQt4/debug-internal.h b/TelepathyQt4/debug-internal.h
index 9e755cf..6200ecb 100644
--- a/TelepathyQt4/debug-internal.h
+++ b/TelepathyQt4/debug-internal.h
@@ -26,7 +26,7 @@
#include <config.h>
-namespace Telepathy
+namespace Tp
{
#ifdef ENABLE_DEBUG
@@ -85,6 +85,6 @@ inline NoDebug warning()
#endif /* #ifdef ENABLE_DEBUG */
-} /* namespace Telepathy */
+} // Tp
#endif
diff --git a/TelepathyQt4/debug.cpp b/TelepathyQt4/debug.cpp
index f35db99..77c43d9 100644
--- a/TelepathyQt4/debug.cpp
+++ b/TelepathyQt4/debug.cpp
@@ -25,7 +25,7 @@
#include <QIODevice>
-namespace Telepathy
+namespace Tp
{
#ifdef ENABLE_DEBUG
@@ -86,4 +86,4 @@ void enableWarnings(bool enable)
#endif /* #ifdef ENABLE_DEBUG */
-} // Telepathy
+} // Tp
diff --git a/TelepathyQt4/debug.h b/TelepathyQt4/debug.h
index a6652bc..dc82c5c 100644
--- a/TelepathyQt4/debug.h
+++ b/TelepathyQt4/debug.h
@@ -39,8 +39,9 @@
* category can be invidually enabled.
*/
-namespace Telepathy
+namespace Tp
{
+
/**
* \ingroup debug
*
@@ -67,6 +68,6 @@ void enableDebug(bool enable);
*/
void enableWarnings(bool enable);
-} /* namespace Telepathy */
+} // Tp
#endif
diff --git a/TelepathyQt4/feature.cpp b/TelepathyQt4/feature.cpp
index ece331c..c519390 100644
--- a/TelepathyQt4/feature.cpp
+++ b/TelepathyQt4/feature.cpp
@@ -21,7 +21,7 @@
#include <TelepathyQt4/Feature>
-namespace Telepathy
+namespace Tp
{
struct Feature::Private : public QSharedData
@@ -59,4 +59,4 @@ bool Feature::isCritical() const
return mPriv->critical;
}
-} // Telepathy
+} // Tp
diff --git a/TelepathyQt4/feature.h b/TelepathyQt4/feature.h
index c304ecd..645c9bc 100644
--- a/TelepathyQt4/feature.h
+++ b/TelepathyQt4/feature.h
@@ -31,7 +31,7 @@
#include <QSharedDataPointer>
#include <QString>
-namespace Telepathy
+namespace Tp
{
class Feature : public QPair<QString, uint>
@@ -64,6 +64,6 @@ inline Features operator|(const Feature &feature1, const Feature &feature2)
return Features() << feature1 << feature2;
}
-} // Telepathy
+} // Tp
#endif
diff --git a/TelepathyQt4/file-transfer.cpp b/TelepathyQt4/file-transfer.cpp
index 591762d..7c975b5 100644
--- a/TelepathyQt4/file-transfer.cpp
+++ b/TelepathyQt4/file-transfer.cpp
@@ -25,7 +25,7 @@
#include <TelepathyQt4/Connection>
-namespace Telepathy
+namespace Tp
{
struct FileTransfer::Private
@@ -89,4 +89,4 @@ FileTransfer::~FileTransfer()
delete mPriv;
}
-} // Telepathy
+} // Tp
diff --git a/TelepathyQt4/file-transfer.h b/TelepathyQt4/file-transfer.h
index 46aa7de..6f8365f 100644
--- a/TelepathyQt4/file-transfer.h
+++ b/TelepathyQt4/file-transfer.h
@@ -27,7 +27,7 @@
#include <TelepathyQt4/Channel>
-namespace Telepathy
+namespace Tp
{
class FileTransfer : public Channel
@@ -51,6 +51,6 @@ private:
Private *mPriv;
};
-} // Telepathy
+} // Tp
#endif
diff --git a/TelepathyQt4/key-file.cpp b/TelepathyQt4/key-file.cpp
index 49e27f6..09062e0 100644
--- a/TelepathyQt4/key-file.cpp
+++ b/TelepathyQt4/key-file.cpp
@@ -29,7 +29,7 @@
#include "TelepathyQt4/debug-internal.h"
-namespace Telepathy
+namespace Tp
{
struct KeyFile::Private
@@ -552,4 +552,4 @@ QStringList KeyFile::valueAsStringList(const QString &key) const
return mPriv->valueAsStringList(key);
}
-} // Telepathy
+} // Tp
diff --git a/TelepathyQt4/key-file.h b/TelepathyQt4/key-file.h
index 4cedeb6..5d647f0 100644
--- a/TelepathyQt4/key-file.h
+++ b/TelepathyQt4/key-file.h
@@ -31,7 +31,7 @@
class QString;
class QStringList;
-namespace Telepathy
+namespace Tp
{
class KeyFile
diff --git a/TelepathyQt4/manager-file.cpp b/TelepathyQt4/manager-file.cpp
index afd2645..6014644 100644
--- a/TelepathyQt4/manager-file.cpp
+++ b/TelepathyQt4/manager-file.cpp
@@ -32,7 +32,7 @@
#include "TelepathyQt4/debug-internal.h"
-namespace Telepathy
+namespace Tp
{
struct ManagerFile::Private
@@ -124,23 +124,23 @@ bool ManagerFile::Private::parse(const QString &fileName)
spec.name = param.right(param.length() - 6);
if (spec.name.endsWith("password")) {
- spec.flags |= Telepathy::ConnMgrParamFlagSecret;
+ spec.flags |= ConnMgrParamFlagSecret;
}
QStringList values = keyFile.value(param).split(QChar(' '));
spec.signature = values[0];
if (values.contains("secret")) {
- spec.flags |= Telepathy::ConnMgrParamFlagSecret;
+ spec.flags |= ConnMgrParamFlagSecret;
}
if (values.contains("dbus-property")) {
- spec.flags |= Telepathy::ConnMgrParamFlagDBusProperty;
+ spec.flags |= ConnMgrParamFlagDBusProperty;
}
if (values.contains("required")) {
- spec.flags |= Telepathy::ConnMgrParamFlagRequired;
+ spec.flags |= ConnMgrParamFlagRequired;
}
if (values.contains("register")) {
- spec.flags |= Telepathy::ConnMgrParamFlagRegister;
+ spec.flags |= ConnMgrParamFlagRegister;
}
paramSpecList.append(spec);
@@ -162,7 +162,7 @@ bool ManagerFile::Private::parse(const QString &fileName)
ParamSpec *spec = getParameter(protocol, paramName);
- spec->flags |= Telepathy::ConnMgrParamFlagHasDefault;
+ spec->flags |= ConnMgrParamFlagHasDefault;
/* map based on the param dbus signature, otherwise use
* QString */
@@ -360,4 +360,4 @@ QVariant::Type ManagerFile::variantTypeFromDBusSignature(const QString &signatur
return type;
}
-} // Telepathy
+} // Tp
diff --git a/TelepathyQt4/manager-file.h b/TelepathyQt4/manager-file.h
index 62e4ba9..ed65a5b 100644
--- a/TelepathyQt4/manager-file.h
+++ b/TelepathyQt4/manager-file.h
@@ -32,7 +32,7 @@
class QString;
-namespace Telepathy
+namespace Tp
{
class ManagerFile
diff --git a/TelepathyQt4/message.cpp b/TelepathyQt4/message.cpp
index b654d06..d249cb5 100644
--- a/TelepathyQt4/message.cpp
+++ b/TelepathyQt4/message.cpp
@@ -29,7 +29,7 @@
#include "TelepathyQt4/debug-internal.h"
-namespace Telepathy
+namespace Tp
{
class Message::Private : public QSharedData
@@ -566,4 +566,4 @@ void ReceivedMessage::setSender(const ContactPtr &sender)
mPriv->sender = sender;
}
-} // Telepathy
+} // Tp
diff --git a/TelepathyQt4/message.h b/TelepathyQt4/message.h
index bd4197f..75d0300 100644
--- a/TelepathyQt4/message.h
+++ b/TelepathyQt4/message.h
@@ -34,7 +34,7 @@
class QDateTime;
-namespace Telepathy
+namespace Tp
{
class Contact;
@@ -119,6 +119,6 @@ private:
void setSender(const ContactPtr &sender);
};
-} // Telepathy
+} // Tp
#endif
diff --git a/TelepathyQt4/optional-interface-factory.cpp b/TelepathyQt4/optional-interface-factory.cpp
index 2e8e058..e3660e0 100644
--- a/TelepathyQt4/optional-interface-factory.cpp
+++ b/TelepathyQt4/optional-interface-factory.cpp
@@ -28,7 +28,7 @@
#include <QMap>
#include <QString>
-namespace Telepathy
+namespace Tp
{
struct OptionalInterfaceCache::Private
@@ -79,4 +79,4 @@ void OptionalInterfaceCache::cache(AbstractInterface *interface) const
mPriv->interfaces[name] = interface;
}
-} // Telepathy
+} // Tp
diff --git a/TelepathyQt4/optional-interface-factory.h b/TelepathyQt4/optional-interface-factory.h
index 4f0a9e5..4045443 100644
--- a/TelepathyQt4/optional-interface-factory.h
+++ b/TelepathyQt4/optional-interface-factory.h
@@ -40,7 +40,7 @@
#include <QtGlobal>
#include <QObject>
-namespace Telepathy
+namespace Tp
{
class AbstractInterface;
@@ -152,6 +152,6 @@ template <typename DBusProxySubclass> class OptionalInterfaceFactory
}
};
-} // Telepathy
+} // Tp
#endif
diff --git a/TelepathyQt4/pending-account.cpp b/TelepathyQt4/pending-account.cpp
index 9f99197..e032727 100644
--- a/TelepathyQt4/pending-account.cpp
+++ b/TelepathyQt4/pending-account.cpp
@@ -42,7 +42,7 @@
* backwards compatibility helpers for older services and other utilities.
*/
-namespace Telepathy
+namespace Tp
{
struct PendingAccount::Private
@@ -171,4 +171,4 @@ void PendingAccount::onCallFinished(QDBusPendingCallWatcher *watcher)
watcher->deleteLater();
}
-} // Telepathy
+} // Tp
diff --git a/TelepathyQt4/pending-account.h b/TelepathyQt4/pending-account.h
index 7d2eafd..960effb 100644
--- a/TelepathyQt4/pending-account.h
+++ b/TelepathyQt4/pending-account.h
@@ -34,7 +34,7 @@
class QDBusPendingCallWatcher;
-namespace Telepathy
+namespace Tp
{
class AccountManager;
@@ -67,6 +67,6 @@ private:
Private *mPriv;
};
-} // Telepathy
+} // Tp
#endif
diff --git a/TelepathyQt4/pending-channel.cpp b/TelepathyQt4/pending-channel.cpp
index 8b813d6..5aac41b 100644
--- a/TelepathyQt4/pending-channel.cpp
+++ b/TelepathyQt4/pending-channel.cpp
@@ -44,7 +44,7 @@
* backwards compatibility helpers for older services and other utilities.
*/
-namespace Telepathy
+namespace Tp
{
struct PendingChannel::Private
@@ -211,7 +211,7 @@ uint PendingChannel::targetHandle() const
* If this channel request has finished, return the immutable properties of
* the resulting channel. Otherwise, return an empty map.
*
- * The keys and values in this map are defined by the Telepathy D-Bus API
+ * The keys and values in this map are defined by the Telepathy D-Bus
* specification, or by third-party extensions to that specification.
* These are the properties that cannot change over the lifetime of the
* channel; they're announced in the result of the request, for efficiency.
@@ -356,4 +356,4 @@ void PendingChannel::onCallEnsureChannelFinished(QDBusPendingCallWatcher *watche
watcher->deleteLater();
}
-} // Telepathy
+} // Tp
diff --git a/TelepathyQt4/pending-channel.h b/TelepathyQt4/pending-channel.h
index bcf8033..963fae5 100644
--- a/TelepathyQt4/pending-channel.h
+++ b/TelepathyQt4/pending-channel.h
@@ -34,7 +34,7 @@
#include <QDBusPendingCallWatcher>
-namespace Telepathy
+namespace Tp
{
class Connection;
@@ -80,6 +80,6 @@ private:
Private *mPriv;
};
-} // Telepathy
+} // Tp
#endif
diff --git a/TelepathyQt4/pending-connection.cpp b/TelepathyQt4/pending-connection.cpp
index 9dd2a02..e53cad0 100644
--- a/TelepathyQt4/pending-connection.cpp
+++ b/TelepathyQt4/pending-connection.cpp
@@ -43,7 +43,7 @@
* backwards compatibility helpers for older services and other utilities.
*/
-namespace Telepathy
+namespace Tp
{
struct PendingConnection::Private
@@ -194,4 +194,4 @@ void PendingConnection::onCallFinished(QDBusPendingCallWatcher *watcher)
watcher->deleteLater();
}
-} // Telepathy
+} // Tp
diff --git a/TelepathyQt4/pending-connection.h b/TelepathyQt4/pending-connection.h
index 1c14c90..5a509e8 100644
--- a/TelepathyQt4/pending-connection.h
+++ b/TelepathyQt4/pending-connection.h
@@ -34,7 +34,7 @@
class QDBusPendingCallWatcher;
-namespace Telepathy
+namespace Tp
{
class ConnectionManager;
@@ -68,6 +68,6 @@ private:
Private *mPriv;
};
-} // Telepathy
+} // Tp
#endif
diff --git a/TelepathyQt4/pending-contact-attributes.cpp b/TelepathyQt4/pending-contact-attributes.cpp
index 2a80b8a..de50773 100644
--- a/TelepathyQt4/pending-contact-attributes.cpp
+++ b/TelepathyQt4/pending-contact-attributes.cpp
@@ -47,7 +47,7 @@
* interfaces.
*/
-namespace Telepathy
+namespace Tp
{
/**
@@ -239,4 +239,4 @@ void PendingContactAttributes::failImmediately(const QString &error, const QStri
setFinishedWithError(error, errorMessage);
}
-} // Telepathy
+} // Tp
diff --git a/TelepathyQt4/pending-contact-attributes.h b/TelepathyQt4/pending-contact-attributes.h
index 3816d3d..8e6aedb 100644
--- a/TelepathyQt4/pending-contact-attributes.h
+++ b/TelepathyQt4/pending-contact-attributes.h
@@ -31,7 +31,7 @@
#include <TelepathyQt4/Constants>
#include <TelepathyQt4/Types>
-namespace Telepathy
+namespace Tp
{
class ReferencedHandles;
@@ -68,6 +68,6 @@ private:
Private *mPriv;
};
-} // Telepathy
+} // Tp
#endif
diff --git a/TelepathyQt4/pending-contacts.cpp b/TelepathyQt4/pending-contacts.cpp
index eb692a5..9c31fe6 100644
--- a/TelepathyQt4/pending-contacts.cpp
+++ b/TelepathyQt4/pending-contacts.cpp
@@ -30,7 +30,7 @@
#include "TelepathyQt4/debug-internal.h"
-namespace Telepathy
+namespace Tp
{
struct PendingContacts::Private
@@ -256,8 +256,8 @@ void PendingContacts::onRequestHandlesFinished(PendingOperation *operation)
mPriv->nested = manager()->contactsForHandles(pendingHandles->handles(), features());
connect(mPriv->nested,
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(onNestedFinished(Telepathy::PendingOperation*)));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(onNestedFinished(Tp::PendingOperation*)));
}
void PendingContacts::onReferenceHandlesFinished(PendingOperation *operation)
@@ -367,16 +367,16 @@ PendingContacts::PendingContacts(ContactManager *manager,
interfaces, true);
connect(attributes,
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(onAttributesFinished(Telepathy::PendingOperation*)));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(onAttributesFinished(Tp::PendingOperation*)));
} else {
debug() << " Falling back to inspect contact handles";
// fallback to just create the contacts
PendingHandles *handles = conn->referenceHandles(HandleTypeContact,
otherContacts.toList());
connect(handles,
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(onReferenceHandlesFinished(Telepathy::PendingOperation*)));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(onReferenceHandlesFinished(Tp::PendingOperation*)));
}
} else {
allAttributesFetched();
@@ -391,8 +391,8 @@ PendingContacts::PendingContacts(ContactManager *manager,
PendingHandles *handles = conn->requestHandles(HandleTypeContact, identifiers);
connect(handles,
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(onRequestHandlesFinished(Telepathy::PendingOperation*)));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(onRequestHandlesFinished(Tp::PendingOperation*)));
}
PendingContacts::PendingContacts(ContactManager *manager,
@@ -406,8 +406,8 @@ PendingContacts::PendingContacts(ContactManager *manager,
mPriv->nested = manager->contactsForHandles(handles, features);
connect(mPriv->nested,
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(onNestedFinished(Telepathy::PendingOperation*)));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(onNestedFinished(Tp::PendingOperation*)));
}
void PendingContacts::allAttributesFetched()
@@ -421,4 +421,4 @@ void PendingContacts::allAttributesFetched()
setFinished();
}
-} // Telepathy
+} // Tp
diff --git a/TelepathyQt4/pending-contacts.h b/TelepathyQt4/pending-contacts.h
index 5d2797c..b4adc34 100644
--- a/TelepathyQt4/pending-contacts.h
+++ b/TelepathyQt4/pending-contacts.h
@@ -37,7 +37,7 @@
#include <TelepathyQt4/Types>
#include <TelepathyQt4/Contact>
-namespace Telepathy
+namespace Tp
{
class ContactManager;
@@ -67,10 +67,10 @@ public:
QHash<QString, QPair<QString, QString> > invalidIdentifiers() const;
private Q_SLOTS:
- void onAttributesFinished(Telepathy::PendingOperation *);
- void onRequestHandlesFinished(Telepathy::PendingOperation *);
- void onReferenceHandlesFinished(Telepathy::PendingOperation *);
- void onNestedFinished(Telepathy::PendingOperation *);
+ void onAttributesFinished(Tp::PendingOperation *);
+ void onRequestHandlesFinished(Tp::PendingOperation *);
+ void onReferenceHandlesFinished(Tp::PendingOperation *);
+ void onNestedFinished(Tp::PendingOperation *);
void onInspectHandlesFinished(QDBusPendingCallWatcher *);
private:
@@ -94,6 +94,6 @@ private:
Private *mPriv;
};
-} // Telepathy
+} // Tp
#endif
diff --git a/TelepathyQt4/pending-handles.cpp b/TelepathyQt4/pending-handles.cpp
index 5634b83..eda41e0 100644
--- a/TelepathyQt4/pending-handles.cpp
+++ b/TelepathyQt4/pending-handles.cpp
@@ -39,7 +39,7 @@
* backwards compatibility helpers for older services and other utilities.
*/
-namespace Telepathy
+namespace Tp
{
struct PendingHandles::Private
@@ -493,4 +493,4 @@ void PendingHandles::onHoldHandlesFallbackFinished(QDBusPendingCallWatcher *watc
watcher->deleteLater();
}
-} // Telepathy
+} // Tp
diff --git a/TelepathyQt4/pending-handles.h b/TelepathyQt4/pending-handles.h
index 52d7d24..282dd87 100644
--- a/TelepathyQt4/pending-handles.h
+++ b/TelepathyQt4/pending-handles.h
@@ -36,7 +36,7 @@
#include <TelepathyQt4/Types>
-namespace Telepathy
+namespace Tp
{
class PendingHandles;
@@ -88,6 +88,6 @@ private:
Private *mPriv;
};
-} // Telepathy
+} // Tp
#endif
diff --git a/TelepathyQt4/pending-operation.cpp b/TelepathyQt4/pending-operation.cpp
index e8bc5b7..d3c02cf 100644
--- a/TelepathyQt4/pending-operation.cpp
+++ b/TelepathyQt4/pending-operation.cpp
@@ -34,7 +34,7 @@
#include <QDBusPendingCallWatcher>
#include <QTimer>
-namespace Telepathy
+namespace Tp
{
struct PendingOperation::Private
@@ -185,4 +185,4 @@ void PendingVoidMethodCall::watcherFinished(QDBusPendingCallWatcher* watcher)
}
}
-} // Telepathy
+} // Tp
diff --git a/TelepathyQt4/pending-operation.h b/TelepathyQt4/pending-operation.h
index a0baa8d..f2fba1d 100644
--- a/TelepathyQt4/pending-operation.h
+++ b/TelepathyQt4/pending-operation.h
@@ -32,7 +32,7 @@ class QDBusError;
class QDBusPendingCall;
class QDBusPendingCallWatcher;
-namespace Telepathy
+namespace Tp
{
/**
@@ -131,7 +131,7 @@ Q_SIGNALS:
* \param operation This operation object, from which further information
* may be obtained
*/
- void finished(Telepathy::PendingOperation* operation);
+ void finished(Tp::PendingOperation* operation);
protected:
/**
@@ -172,6 +172,6 @@ private:
Private *mPriv;
};
-} // Telepathy
+} // Tp
#endif
diff --git a/TelepathyQt4/pending-ready.cpp b/TelepathyQt4/pending-ready.cpp
index fa077bf..2d69862 100644
--- a/TelepathyQt4/pending-ready.cpp
+++ b/TelepathyQt4/pending-ready.cpp
@@ -36,7 +36,7 @@
* backwards compatibility helpers for older services and other utilities.
*/
-namespace Telepathy
+namespace Tp
{
struct PendingReady::Private
@@ -101,4 +101,4 @@ Features PendingReady::requestedFeatures() const
return mPriv->requestedFeatures;
}
-} // Telepathy
+} // Tp
diff --git a/TelepathyQt4/pending-ready.h b/TelepathyQt4/pending-ready.h
index 3c9f22a..a407b2e 100644
--- a/TelepathyQt4/pending-ready.h
+++ b/TelepathyQt4/pending-ready.h
@@ -31,7 +31,7 @@
#include <QSet>
-namespace Telepathy
+namespace Tp
{
class PendingReady: public PendingOperation
@@ -56,6 +56,6 @@ private:
Private *mPriv;
};
-} // Telepathy
+} // Tp
#endif
diff --git a/TelepathyQt4/pending-string-list.cpp b/TelepathyQt4/pending-string-list.cpp
index 5817473..24f9e1a 100644
--- a/TelepathyQt4/pending-string-list.cpp
+++ b/TelepathyQt4/pending-string-list.cpp
@@ -26,7 +26,7 @@
#include <QDBusPendingReply>
-namespace Telepathy
+namespace Tp
{
struct PendingStringList::Private
@@ -63,4 +63,4 @@ void PendingStringList::setResult(const QStringList &result)
mPriv->result = result;
}
-} // Telepathy
+} // Tp
diff --git a/TelepathyQt4/pending-string-list.h b/TelepathyQt4/pending-string-list.h
index 32f5e82..b41ca73 100644
--- a/TelepathyQt4/pending-string-list.h
+++ b/TelepathyQt4/pending-string-list.h
@@ -30,7 +30,7 @@
#include <QStringList>
-namespace Telepathy
+namespace Tp
{
class PendingStringList : public PendingOperation
@@ -54,6 +54,6 @@ private:
Private *mPriv;
};
-} // Telepathy
+} // Tp
#endif
diff --git a/TelepathyQt4/readiness-helper.cpp b/TelepathyQt4/readiness-helper.cpp
index e4a835c..5a64b87 100644
--- a/TelepathyQt4/readiness-helper.cpp
+++ b/TelepathyQt4/readiness-helper.cpp
@@ -32,7 +32,7 @@
#include <QDBusError>
#include <QTimer>
-namespace Telepathy
+namespace Tp
{
struct ReadinessHelper::Private
@@ -97,8 +97,8 @@ ReadinessHelper::Private::Private(
if (proxy) {
parent->connect(proxy,
- SIGNAL(invalidated(Telepathy::DBusProxy *, const QString &, const QString &)),
- SLOT(onProxyInvalidated(Telepathy::DBusProxy *, const QString &, const QString &)));
+ SIGNAL(invalidated(Tp::DBusProxy *, const QString &, const QString &)),
+ SLOT(onProxyInvalidated(Tp::DBusProxy *, const QString &, const QString &)));
}
debug() << "ReadinessHelper: supportedStatuses =" << supportedStatuses;
@@ -281,9 +281,9 @@ void ReadinessHelper::Private::abortOperations(const QString &errorName,
{
foreach (PendingReady *operation, pendingOperations) {
parent->disconnect(operation,
- SIGNAL(finished(Telepathy::PendingOperation*)),
+ SIGNAL(finished(Tp::PendingOperation*)),
parent,
- SLOT(onOperationFinished(Telepathy::PendingOperation*)));
+ SLOT(onOperationFinished(Tp::PendingOperation*)));
parent->disconnect(operation,
SIGNAL(destroyed(QObject*)),
parent,
@@ -478,8 +478,8 @@ PendingReady *ReadinessHelper::becomeReady(const Features &requestedFeatures)
operation = new PendingReady(requestedFeatures, mPriv->object, this);
connect(operation,
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(onOperationFinished(Telepathy::PendingOperation*)));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(onOperationFinished(Tp::PendingOperation*)));
connect(operation,
SIGNAL(destroyed(QObject*)),
SLOT(onOperationDestroyed(QObject*)));
@@ -535,4 +535,4 @@ void ReadinessHelper::onOperationDestroyed(QObject *obj)
mPriv->pendingOperations.removeOne(qobject_cast<PendingReady*>(obj));
}
-} // Telepathy
+} // Tp
diff --git a/TelepathyQt4/readiness-helper.h b/TelepathyQt4/readiness-helper.h
index 2e088b8..d3e02fb 100644
--- a/TelepathyQt4/readiness-helper.h
+++ b/TelepathyQt4/readiness-helper.h
@@ -34,7 +34,7 @@
class QDBusError;
-namespace Telepathy
+namespace Tp
{
class DBusProxy;
@@ -119,9 +119,9 @@ Q_SIGNALS:
private Q_SLOTS:
void iterateIntrospection();
- void onProxyInvalidated(Telepathy::DBusProxy *proxy,
+ void onProxyInvalidated(Tp::DBusProxy *proxy,
const QString &errorName, const QString &errorMessage);
- void onOperationFinished(Telepathy::PendingOperation *op);
+ void onOperationFinished(Tp::PendingOperation *op);
void onOperationDestroyed(QObject *obj);
private:
@@ -130,6 +130,6 @@ private:
Private *mPriv;
};
-} // Telepathy
+} // Tp
#endif
diff --git a/TelepathyQt4/ready-object.cpp b/TelepathyQt4/ready-object.cpp
index 9b25fae..6e7a390 100644
--- a/TelepathyQt4/ready-object.cpp
+++ b/TelepathyQt4/ready-object.cpp
@@ -26,7 +26,7 @@
#include <TelepathyQt4/PendingReady>
#include <TelepathyQt4/ReadinessHelper>
-namespace Telepathy
+namespace Tp
{
struct ReadyObject::Private
@@ -139,4 +139,4 @@ ReadinessHelper *ReadyObject::readinessHelper() const
return mPriv->readinessHelper;
}
-} // Telepathy
+} // Tp
diff --git a/TelepathyQt4/ready-object.h b/TelepathyQt4/ready-object.h
index f23e140..d329968 100644
--- a/TelepathyQt4/ready-object.h
+++ b/TelepathyQt4/ready-object.h
@@ -30,7 +30,7 @@
#include <QObject>
-namespace Telepathy
+namespace Tp
{
class DBusProxy;
@@ -61,6 +61,6 @@ private:
Private *mPriv;
};
-} // Telepathy
+} // Tp
#endif
diff --git a/TelepathyQt4/referenced-handles.cpp b/TelepathyQt4/referenced-handles.cpp
index 67b2f92..6ae26cf 100644
--- a/TelepathyQt4/referenced-handles.cpp
+++ b/TelepathyQt4/referenced-handles.cpp
@@ -28,7 +28,7 @@
#include <QPointer>
#include <QSharedData>
-namespace Telepathy
+namespace Tp
{
struct ReferencedHandles::Private : public QSharedData
@@ -297,4 +297,4 @@ ReferencedHandles::ReferencedHandles(const ConnectionPtr &connection,
{
}
-} // Telepathy
+} // Tp
diff --git a/TelepathyQt4/referenced-handles.h b/TelepathyQt4/referenced-handles.h
index 9a93988..faf094f 100644
--- a/TelepathyQt4/referenced-handles.h
+++ b/TelepathyQt4/referenced-handles.h
@@ -55,7 +55,7 @@
#include <QSharedDataPointer>
#include <QVector>
-namespace Telepathy
+namespace Tp
{
class Connection;
@@ -287,6 +287,6 @@ class ReferencedHandles
typedef QListIterator<uint> ReferencedHandlesIterator;
-} // Telepathy
+} // Tp
#endif
diff --git a/TelepathyQt4/room-list.cpp b/TelepathyQt4/room-list.cpp
index 6b1de67..d2bb358 100644
--- a/TelepathyQt4/room-list.cpp
+++ b/TelepathyQt4/room-list.cpp
@@ -25,7 +25,7 @@
#include <TelepathyQt4/Connection>
-namespace Telepathy
+namespace Tp
{
struct RoomList::Private
@@ -88,4 +88,4 @@ RoomList::~RoomList()
delete mPriv;
}
-} // Telepathy
+} // Tp
diff --git a/TelepathyQt4/room-list.h b/TelepathyQt4/room-list.h
index 0253449..f47376d 100644
--- a/TelepathyQt4/room-list.h
+++ b/TelepathyQt4/room-list.h
@@ -27,7 +27,7 @@
#include <TelepathyQt4/Channel>
-namespace Telepathy
+namespace Tp
{
class RoomList : public Channel
@@ -51,6 +51,6 @@ private:
Private *mPriv;
};
-} // Telepathy
+} // Tp
#endif
diff --git a/TelepathyQt4/shared-ptr.h b/TelepathyQt4/shared-ptr.h
index 73da246..5ad2e6c 100644
--- a/TelepathyQt4/shared-ptr.h
+++ b/TelepathyQt4/shared-ptr.h
@@ -28,7 +28,7 @@
#include <QObject>
-namespace Telepathy
+namespace Tp
{
class RefCounted;
@@ -200,6 +200,6 @@ private:
WeakData *wd;
};
-} // Telepathy
+} // Tp
#endif
diff --git a/TelepathyQt4/simple-pending-operations.h b/TelepathyQt4/simple-pending-operations.h
index 8e0e6ef..a4579ac 100644
--- a/TelepathyQt4/simple-pending-operations.h
+++ b/TelepathyQt4/simple-pending-operations.h
@@ -30,7 +30,7 @@
#include <TelepathyQt4/PendingOperation>
-namespace Telepathy
+namespace Tp
{
/**
@@ -106,6 +106,6 @@ private:
Private *mPriv;
};
-} // Telepathy
+} // Tp
#endif
diff --git a/TelepathyQt4/streamed-media-channel.cpp b/TelepathyQt4/streamed-media-channel.cpp
index df07b6d..f1a6c8a 100644
--- a/TelepathyQt4/streamed-media-channel.cpp
+++ b/TelepathyQt4/streamed-media-channel.cpp
@@ -32,7 +32,7 @@
#include <QHash>
-namespace Telepathy
+namespace Tp
{
struct PendingMediaStreams::Private
@@ -50,12 +50,12 @@ struct PendingMediaStreams::Private
PendingMediaStreams::PendingMediaStreams(const StreamedMediaChannelPtr &channel,
ContactPtr contact,
- QList<Telepathy::MediaStreamType> types)
+ QList<MediaStreamType> types)
: PendingOperation(channel.data()),
mPriv(new Private(this, channel))
{
- Telepathy::UIntList l;
- foreach (Telepathy::MediaStreamType type, types) {
+ UIntList l;
+ foreach (MediaStreamType type, types) {
l << type;
}
QDBusPendingCallWatcher *watcher =
@@ -89,7 +89,7 @@ MediaStreams PendingMediaStreams::streams() const
void PendingMediaStreams::gotStreams(QDBusPendingCallWatcher *watcher)
{
- QDBusPendingReply<Telepathy::MediaStreamInfoList> reply = *watcher;
+ QDBusPendingReply<MediaStreamInfoList> reply = *watcher;
if (reply.isError()) {
warning().nospace() << "StreamedMedia::RequestStreams()"
" failed with " << reply.error().name() << ": " <<
@@ -100,20 +100,20 @@ void PendingMediaStreams::gotStreams(QDBusPendingCallWatcher *watcher)
debug() << "Got reply to StreamedMedia::RequestStreams()";
- Telepathy::MediaStreamInfoList list = reply.value();
+ MediaStreamInfoList list = reply.value();
MediaStreamPtr stream;
StreamedMediaChannelPtr channel(mPriv->channel);
- foreach (const Telepathy::MediaStreamInfo &streamInfo, list) {
+ foreach (const MediaStreamInfo &streamInfo, list) {
stream = channel->lookupStreamById(streamInfo.identifier);
if (!stream) {
stream = MediaStreamPtr(
new MediaStream(channel,
streamInfo.identifier,
streamInfo.contact,
- (Telepathy::MediaStreamType) streamInfo.type,
- (Telepathy::MediaStreamState) streamInfo.state,
- (Telepathy::MediaStreamDirection) streamInfo.direction,
- (Telepathy::MediaStreamPendingSend) streamInfo.pendingSendFlags));
+ (MediaStreamType) streamInfo.type,
+ (MediaStreamState) streamInfo.state,
+ (MediaStreamDirection) streamInfo.direction,
+ (MediaStreamPendingSend) streamInfo.pendingSendFlags));
channel->addStream(stream);
} else {
channel->onStreamDirectionChanged(streamInfo.identifier,
@@ -123,11 +123,11 @@ void PendingMediaStreams::gotStreams(QDBusPendingCallWatcher *watcher)
}
mPriv->streams.append(stream);
connect(channel.data(),
- SIGNAL(streamRemoved(Telepathy::MediaStreamPtr)),
- SLOT(onStreamRemoved(Telepathy::MediaStreamPtr)));
+ SIGNAL(streamRemoved(Tp::MediaStreamPtr)),
+ SLOT(onStreamRemoved(Tp::MediaStreamPtr)));
connect(stream->becomeReady(),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(onStreamReady(Telepathy::PendingOperation*)));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(onStreamReady(Tp::PendingOperation*)));
}
watcher->deleteLater();
@@ -223,8 +223,8 @@ void MediaStream::Private::introspectContact(MediaStream::Private *self)
ContactManager *contactManager = chan->connection()->contactManager();
self->parent->connect(
contactManager->contactsForHandles(UIntList() << self->contactHandle),
- SIGNAL(finished(Telepathy::PendingOperation *)),
- SLOT(gotContact(Telepathy::PendingOperation *)));
+ SIGNAL(finished(Tp::PendingOperation *)),
+ SLOT(gotContact(Tp::PendingOperation *)));
}
const Feature MediaStream::FeatureContact = Feature(MediaStream::staticMetaObject.className(), 0);
@@ -275,7 +275,7 @@ ContactPtr MediaStream::contact() const
*
* \return The stream state.
*/
-Telepathy::MediaStreamState MediaStream::state() const
+MediaStreamState MediaStream::state() const
{
return mPriv->state;
}
@@ -285,7 +285,7 @@ Telepathy::MediaStreamState MediaStream::state() const
*
* \return The stream type.
*/
-Telepathy::MediaStreamType MediaStream::type() const
+MediaStreamType MediaStream::type() const
{
return mPriv->type;
}
@@ -297,7 +297,7 @@ Telepathy::MediaStreamType MediaStream::type() const
*/
bool MediaStream::sending() const
{
- return mPriv->direction & Telepathy::MediaStreamDirectionSend;
+ return mPriv->direction & MediaStreamDirectionSend;
}
/**
@@ -307,7 +307,7 @@ bool MediaStream::sending() const
*/
bool MediaStream::receiving() const
{
- return mPriv->direction & Telepathy::MediaStreamDirectionReceive;
+ return mPriv->direction & MediaStreamDirectionReceive;
}
/**
@@ -337,7 +337,7 @@ bool MediaStream::remoteSendingRequested() const
*
* \return The stream direction.
*/
-Telepathy::MediaStreamDirection MediaStream::direction() const
+MediaStreamDirection MediaStream::direction() const
{
return mPriv->direction;
}
@@ -347,7 +347,7 @@ Telepathy::MediaStreamDirection MediaStream::direction() const
*
* \return The stream pending send flags.
*/
-Telepathy::MediaStreamPendingSend MediaStream::pendingSend() const
+MediaStreamPendingSend MediaStream::pendingSend() const
{
return mPriv->pendingSend;
}
@@ -361,7 +361,7 @@ Telepathy::MediaStreamPendingSend MediaStream::pendingSend() const
* when the call has finished.
*/
PendingOperation *MediaStream::requestDirection(
- Telepathy::MediaStreamDirection direction)
+ MediaStreamDirection direction)
{
StreamedMediaChannelPtr chan(mPriv->channel);
return new PendingVoidMethodCall(this,
@@ -375,18 +375,18 @@ PendingOperation *MediaStream::requestDirection(
*
* \return A PendingOperation which will emit PendingOperation::finished
* when the call has finished.
- * \sa requestDirection(Telepathy::MediaStreamDirection direction)
+ * \sa requestDirection(Tp::MediaStreamDirection direction)
*/
PendingOperation *MediaStream::requestDirection(bool send, bool receive)
{
- uint dir = Telepathy::MediaStreamDirectionNone;
+ uint dir = MediaStreamDirectionNone;
if (send) {
- dir |= Telepathy::MediaStreamDirectionSend;
+ dir |= MediaStreamDirectionSend;
}
if (receive) {
- dir |= Telepathy::MediaStreamDirectionReceive;
+ dir |= MediaStreamDirectionReceive;
}
- return requestDirection((Telepathy::MediaStreamDirection) dir);
+ return requestDirection((MediaStreamDirection) dir);
}
uint MediaStream::contactHandle() const
@@ -394,14 +394,14 @@ uint MediaStream::contactHandle() const
return mPriv->contactHandle;
}
-void MediaStream::setDirection(Telepathy::MediaStreamDirection direction,
- Telepathy::MediaStreamPendingSend pendingSend)
+void MediaStream::setDirection(MediaStreamDirection direction,
+ MediaStreamPendingSend pendingSend)
{
mPriv->direction = direction;
mPriv->pendingSend = pendingSend;
}
-void MediaStream::setState(Telepathy::MediaStreamState state)
+void MediaStream::setState(MediaStreamState state)
{
mPriv->state = state;
}
@@ -567,7 +567,7 @@ MediaStreams StreamedMediaChannel::streams() const
return mPriv->streams.values();
}
-MediaStreams StreamedMediaChannel::streamsForType(Telepathy::MediaStreamType type) const
+MediaStreams StreamedMediaChannel::streamsForType(MediaStreamType type) const
{
if (!isReady(FeatureStreams)) {
warning() << "Trying to retrieve streams from streamed media channel, but "
@@ -623,7 +623,7 @@ PendingOperation *StreamedMediaChannel::removeStream(const MediaStreamPtr &strea
*/
PendingOperation *StreamedMediaChannel::removeStreams(const MediaStreams &streams)
{
- Telepathy::UIntList ids;
+ UIntList ids;
foreach (const MediaStreamPtr &stream, streams) {
ids << stream->id();
}
@@ -633,16 +633,16 @@ PendingOperation *StreamedMediaChannel::removeStreams(const MediaStreams &stream
PendingMediaStreams *StreamedMediaChannel::requestStream(
const ContactPtr &contact,
- Telepathy::MediaStreamType type)
+ MediaStreamType type)
{
return new PendingMediaStreams(StreamedMediaChannelPtr(this),
contact,
- QList<Telepathy::MediaStreamType>() << type);
+ QList<MediaStreamType>() << type);
}
PendingMediaStreams *StreamedMediaChannel::requestStreams(
const ContactPtr &contact,
- QList<Telepathy::MediaStreamType> types)
+ QList<MediaStreamType> types)
{
return new PendingMediaStreams(StreamedMediaChannelPtr(this),
contact, types);
@@ -650,7 +650,7 @@ PendingMediaStreams *StreamedMediaChannel::requestStreams(
void StreamedMediaChannel::gotStreams(QDBusPendingCallWatcher *watcher)
{
- QDBusPendingReply<Telepathy::MediaStreamInfoList> reply = *watcher;
+ QDBusPendingReply<MediaStreamInfoList> reply = *watcher;
if (reply.isError()) {
warning().nospace() << "StreamedMedia::ListStreams()"
" failed with " << reply.error().name() << ": " <<
@@ -663,19 +663,19 @@ void StreamedMediaChannel::gotStreams(QDBusPendingCallWatcher *watcher)
debug() << "Got reply to StreamedMedia::ListStreams()";
- Telepathy::MediaStreamInfoList list = reply.value();
+ MediaStreamInfoList list = reply.value();
if (list.size() > 0) {
- foreach (const Telepathy::MediaStreamInfo &streamInfo, list) {
+ foreach (const MediaStreamInfo &streamInfo, list) {
MediaStreamPtr stream = lookupStreamById(streamInfo.identifier);
if (!stream) {
addStream(MediaStreamPtr(
new MediaStream(StreamedMediaChannelPtr(this),
streamInfo.identifier,
streamInfo.contact,
- (Telepathy::MediaStreamType) streamInfo.type,
- (Telepathy::MediaStreamState) streamInfo.state,
- (Telepathy::MediaStreamDirection) streamInfo.direction,
- (Telepathy::MediaStreamPendingSend) streamInfo.pendingSendFlags)));
+ (MediaStreamType) streamInfo.type,
+ (MediaStreamState) streamInfo.state,
+ (MediaStreamDirection) streamInfo.direction,
+ (MediaStreamPendingSend) streamInfo.pendingSendFlags)));
} else {
onStreamDirectionChanged(streamInfo.identifier,
streamInfo.direction, streamInfo.pendingSendFlags);
@@ -736,11 +736,11 @@ void StreamedMediaChannel::onStreamAdded(uint streamId,
MediaStreamPtr stream = MediaStreamPtr(
new MediaStream(StreamedMediaChannelPtr(this), streamId,
contactHandle,
- (Telepathy::MediaStreamType) streamType,
+ (MediaStreamType) streamType,
// TODO where to get this info from?
- Telepathy::MediaStreamStateDisconnected,
- Telepathy::MediaStreamDirectionNone,
- (Telepathy::MediaStreamPendingSend) 0));
+ MediaStreamStateDisconnected,
+ MediaStreamDirectionNone,
+ (MediaStreamPendingSend) 0));
addStream(stream);
}
@@ -789,13 +789,13 @@ void StreamedMediaChannel::onStreamDirectionChanged(uint streamId,
}
stream->setDirection(
- (Telepathy::MediaStreamDirection) streamDirection,
- (Telepathy::MediaStreamPendingSend) streamPendingFlags);
+ (MediaStreamDirection) streamDirection,
+ (MediaStreamPendingSend) streamPendingFlags);
if (isReady(FeatureStreams) &&
!mPriv->incompleteStreams.contains(stream->id())) {
emit streamDirectionChanged(stream,
- (Telepathy::MediaStreamDirection) streamDirection,
- (Telepathy::MediaStreamPendingSend) streamPendingFlags);
+ (MediaStreamDirection) streamDirection,
+ (MediaStreamPendingSend) streamPendingFlags);
}
}
@@ -814,11 +814,11 @@ void StreamedMediaChannel::onStreamStateChanged(uint streamId,
return;
}
- stream->setState((Telepathy::MediaStreamState) streamState);
+ stream->setState((MediaStreamState) streamState);
if (isReady(FeatureStreams) &&
!mPriv->incompleteStreams.contains(stream->id())) {
emit streamStateChanged(stream,
- (Telepathy::MediaStreamState) streamState);
+ (MediaStreamState) streamState);
}
}
@@ -835,7 +835,7 @@ void StreamedMediaChannel::onStreamError(uint streamId,
if (isReady(FeatureStreams) &&
!mPriv->incompleteStreams.contains(stream->id())) {
emit streamError(stream,
- (Telepathy::MediaStreamError) errorCode,
+ (MediaStreamError) errorCode,
errorMessage);
}
}
@@ -844,8 +844,8 @@ void StreamedMediaChannel::addStream(const MediaStreamPtr &stream)
{
mPriv->incompleteStreams.insert(stream->id(), stream);
connect(stream->becomeReady(),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(onStreamReady(Telepathy::PendingOperation*)));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(onStreamReady(Tp::PendingOperation*)));
}
MediaStreamPtr StreamedMediaChannel::lookupStreamById(uint streamId)
@@ -858,4 +858,4 @@ MediaStreamPtr StreamedMediaChannel::lookupStreamById(uint streamId)
return MediaStreamPtr();
}
-} // Telepathy
+} // Tp
diff --git a/TelepathyQt4/streamed-media-channel.h b/TelepathyQt4/streamed-media-channel.h
index 9ef5411..3d1b582 100644
--- a/TelepathyQt4/streamed-media-channel.h
+++ b/TelepathyQt4/streamed-media-channel.h
@@ -30,7 +30,7 @@
#include <TelepathyQt4/Types>
#include <TelepathyQt4/SharedPtr>
-namespace Telepathy
+namespace Tp
{
class StreamedMediaChannel;
@@ -49,15 +49,15 @@ public:
private Q_SLOTS:
void gotStreams(QDBusPendingCallWatcher *);
- void onStreamRemoved(Telepathy::MediaStreamPtr);
- void onStreamReady(Telepathy::PendingOperation *);
+ void onStreamRemoved(Tp::MediaStreamPtr);
+ void onStreamReady(Tp::PendingOperation *);
private:
friend class StreamedMediaChannel;
PendingMediaStreams(const StreamedMediaChannelPtr &channel,
ContactPtr contact,
- QList<Telepathy::MediaStreamType> types);
+ QList<MediaStreamType> types);
struct Private;
friend struct Private;
@@ -78,24 +78,24 @@ public:
uint id() const;
ContactPtr contact() const;
- Telepathy::MediaStreamState state() const;
- Telepathy::MediaStreamType type() const;
+ MediaStreamState state() const;
+ MediaStreamType type() const;
bool sending() const;
bool receiving() const;
bool localSendingRequested() const;
bool remoteSendingRequested() const;
- Telepathy::MediaStreamDirection direction() const;
- Telepathy::MediaStreamPendingSend pendingSend() const;
+ MediaStreamDirection direction() const;
+ MediaStreamPendingSend pendingSend() const;
PendingOperation *requestDirection(
- Telepathy::MediaStreamDirection direction);
+ MediaStreamDirection direction);
PendingOperation *requestDirection(
bool send, bool receive);
private Q_SLOTS:
- void gotContact(Telepathy::PendingOperation *op);
+ void gotContact(Tp::PendingOperation *op);
private:
friend class PendingMediaStreams;
@@ -110,9 +110,9 @@ private:
uint contactHandle() const;
void setContact(const ContactPtr &contact);
- void setDirection(Telepathy::MediaStreamDirection direction,
- Telepathy::MediaStreamPendingSend pendingSend);
- void setState(Telepathy::MediaStreamState state);
+ void setDirection(MediaStreamDirection direction,
+ MediaStreamPendingSend pendingSend);
+ void setState(MediaStreamState state);
struct Private;
friend struct Private;
@@ -133,7 +133,7 @@ public:
~StreamedMediaChannel();
MediaStreams streams() const;
- MediaStreams streamsForType(Telepathy::MediaStreamType type) const;
+ MediaStreams streamsForType(MediaStreamType type) const;
bool awaitingLocalAnswer() const;
bool awaitingRemoteAnswer() const;
@@ -145,21 +145,21 @@ public:
PendingMediaStreams *requestStream(
const ContactPtr &contact,
- Telepathy::MediaStreamType type);
+ MediaStreamType type);
PendingMediaStreams *requestStreams(
const ContactPtr &contact,
- QList<Telepathy::MediaStreamType> types);
+ QList<MediaStreamType> types);
Q_SIGNALS:
- void streamAdded(const Telepathy::MediaStreamPtr &stream);
- void streamRemoved(const Telepathy::MediaStreamPtr &stream);
- void streamDirectionChanged(const Telepathy::MediaStreamPtr &stream,
- Telepathy::MediaStreamDirection direction,
- Telepathy::MediaStreamPendingSend pendingSend);
- void streamStateChanged(const Telepathy::MediaStreamPtr &stream,
- Telepathy::MediaStreamState);
- void streamError(const Telepathy::MediaStreamPtr &stream,
- Telepathy::MediaStreamError errorCode,
+ void streamAdded(const Tp::MediaStreamPtr &stream);
+ void streamRemoved(const Tp::MediaStreamPtr &stream);
+ void streamDirectionChanged(const Tp::MediaStreamPtr &stream,
+ Tp::MediaStreamDirection direction,
+ Tp::MediaStreamPendingSend pendingSend);
+ void streamStateChanged(const Tp::MediaStreamPtr &stream,
+ Tp::MediaStreamState);
+ void streamError(const Tp::MediaStreamPtr &stream,
+ Tp::MediaStreamError errorCode,
const QString &errorMessage);
protected:
@@ -168,7 +168,7 @@ protected:
private Q_SLOTS:
void gotStreams(QDBusPendingCallWatcher *);
- void onStreamReady(Telepathy::PendingOperation *);
+ void onStreamReady(Tp::PendingOperation *);
void onStreamAdded(uint, uint, uint);
void onStreamRemoved(uint);
void onStreamDirectionChanged(uint, uint, uint);
@@ -186,6 +186,6 @@ private:
Private *mPriv;
};
-} // Telepathy
+} // Tp
#endif
diff --git a/TelepathyQt4/text-channel.cpp b/TelepathyQt4/text-channel.cpp
index fd86650..975b035 100644
--- a/TelepathyQt4/text-channel.cpp
+++ b/TelepathyQt4/text-channel.cpp
@@ -34,7 +34,7 @@
#include "TelepathyQt4/debug-internal.h"
-namespace Telepathy
+namespace Tp
{
struct PendingSendMessage::Private
@@ -196,11 +196,11 @@ void TextChannel::Private::introspectMessageQueue(
// FeatureMessageQueue needs signal connections + Get (but we
// might as well do GetAll and reduce the number of code paths)
parent->connect(parent->messagesInterface(),
- SIGNAL(MessageReceived(const Telepathy::MessagePartList &)),
- SLOT(onMessageReceived(const Telepathy::MessagePartList &)));
+ SIGNAL(MessageReceived(const Tp::MessagePartList &)),
+ SLOT(onMessageReceived(const Tp::MessagePartList &)));
parent->connect(parent->messagesInterface(),
- SIGNAL(PendingMessagesRemoved(const Telepathy::UIntList &)),
- SLOT(onPendingMessagesRemoved(const Telepathy::UIntList &)));
+ SIGNAL(PendingMessagesRemoved(const Tp::UIntList &)),
+ SLOT(onPendingMessagesRemoved(const Tp::UIntList &)));
if (!self->gotProperties && !self->getAllInFlight) {
self->getAllInFlight = true;
@@ -267,9 +267,9 @@ void TextChannel::Private::introspectMessageSentSignal(
if (parent->hasMessagesInterface()) {
parent->connect(parent->messagesInterface(),
- SIGNAL(MessageSent(const Telepathy::MessagePartList &,
+ SIGNAL(MessageSent(const Tp::MessagePartList &,
uint, const QString &)),
- SLOT(onMessageSent(const Telepathy::MessagePartList &,
+ SLOT(onMessageSent(const Tp::MessagePartList &,
uint, const QString &)));
} else {
parent->connect(parent->textInterface(),
@@ -348,8 +348,8 @@ const Feature TextChannel::FeatureMessageCapabilities = Feature(TextChannel::sta
const Feature TextChannel::FeatureMessageSentSignal = Feature(TextChannel::staticMetaObject.className(), 2);
/**
- * \fn void TextChannel::messageSent(const Telepathy::Message &message,
- * Telepathy::MessageSendingFlags flags,
+ * \fn void TextChannel::messageSent(const Tp::Message &message,
+ * Tp::MessageSendingFlags flags,
* const QString &sentMessageToken)
*
* Emitted when a message is sent, if the FeatureMessageSentSignal Feature
@@ -370,7 +370,7 @@ const Feature TextChannel::FeatureMessageSentSignal = Feature(TextChannel::stati
*/
/**
- * \fn void TextChannel::messageReceived(const Telepathy::ReceivedMessage &message)
+ * \fn void TextChannel::messageReceived(const Tp::ReceivedMessage &message)
*
* Emitted when a message is added to messageQueue(), if the
* FeatureMessageQueue Feature has been enabled.
@@ -381,7 +381,7 @@ const Feature TextChannel::FeatureMessageSentSignal = Feature(TextChannel::stati
/**
* \fn void TextChannel::pendingMessageRemoved(
- * const Telepathy::ReceivedMessage &message)
+ * const Tp::ReceivedMessage &message)
*
* Emitted when a message is removed from messageQueue(), if the
* FeatureMessageQueue Feature has been enabled. See messageQueue() for the
@@ -667,11 +667,11 @@ PendingSendMessage *TextChannel::send(const MessagePartList &parts)
return op;
}
-void TextChannel::onMessageSent(const Telepathy::MessagePartList &parts,
+void TextChannel::onMessageSent(const MessagePartList &parts,
uint flags,
const QString &sentMessageToken)
{
- emit messageSent(Message(parts), Telepathy::MessageSendingFlag(flags),
+ emit messageSent(Message(parts), MessageSendingFlag(flags),
sentMessageToken);
}
@@ -741,8 +741,8 @@ void TextChannel::processQueue()
connect(connection()->contactManager()->contactsForHandles(
contactsRequired.toList()),
- SIGNAL(finished(Telepathy::PendingOperation *)),
- SLOT(onContactsFinished(Telepathy::PendingOperation *)));
+ SIGNAL(finished(Tp::PendingOperation *)),
+ SLOT(onContactsFinished(Tp::PendingOperation *)));
mPriv->awaitingContacts |= contactsRequired;
}
@@ -800,7 +800,7 @@ void TextChannel::onContactsFinished(PendingOperation *op)
processQueue();
}
-void TextChannel::onMessageReceived(const Telepathy::MessagePartList &parts)
+void TextChannel::onMessageReceived(const MessagePartList &parts)
{
if (!mPriv->initialMessagesReceived) {
return;
@@ -811,7 +811,7 @@ void TextChannel::onMessageReceived(const Telepathy::MessagePartList &parts)
processQueue();
}
-void TextChannel::onPendingMessagesRemoved(const Telepathy::UIntList &ids)
+void TextChannel::onPendingMessagesRemoved(const UIntList &ids)
{
if (!mPriv->initialMessagesReceived) {
return;
@@ -1002,4 +1002,4 @@ void TextChannel::gotPendingMessages(QDBusPendingCallWatcher *watcher)
watcher->deleteLater();
}
-} // Telepathy
+} // Tp
diff --git a/TelepathyQt4/text-channel.h b/TelepathyQt4/text-channel.h
index 2196af7..a39d482 100644
--- a/TelepathyQt4/text-channel.h
+++ b/TelepathyQt4/text-channel.h
@@ -28,7 +28,7 @@
#include <TelepathyQt4/Channel>
#include <TelepathyQt4/PendingOperation>
-namespace Telepathy
+namespace Tp
{
class PendingReadyChannel;
@@ -105,27 +105,27 @@ public Q_SLOTS:
Q_SIGNALS:
// FeatureMessageSentSignal
- void messageSent(const Telepathy::Message &message,
- Telepathy::MessageSendingFlags flags,
+ void messageSent(const Tp::Message &message,
+ Tp::MessageSendingFlags flags,
const QString &sentMessageToken);
// FeatureMessageQueue
- void messageReceived(const Telepathy::ReceivedMessage &message);
+ void messageReceived(const Tp::ReceivedMessage &message);
void pendingMessageRemoved(
- const Telepathy::ReceivedMessage &message);
+ const Tp::ReceivedMessage &message);
protected:
TextChannel(const ConnectionPtr &connection, const QString &objectPath,
const QVariantMap &immutableProperties);
private Q_SLOTS:
- void onContactsFinished(Telepathy::PendingOperation *);
+ void onContactsFinished(Tp::PendingOperation *);
void onAcknowledgePendingMessagesReply(QDBusPendingCallWatcher *);
- void onMessageSent(const Telepathy::MessagePartList &, uint,
+ void onMessageSent(const Tp::MessagePartList &, uint,
const QString &);
- void onMessageReceived(const Telepathy::MessagePartList &);
- void onPendingMessagesRemoved(const Telepathy::UIntList &);
+ void onMessageReceived(const Tp::MessagePartList &);
+ void onPendingMessagesRemoved(const Tp::UIntList &);
void onTextSent(uint, uint, const QString &);
void onTextReceived(uint, uint, uint, uint, uint, const QString &);
@@ -142,6 +142,6 @@ private:
Private *mPriv;
};
-} // Telepathy
+} // Tp
#endif
diff --git a/TelepathyQt4/types.h b/TelepathyQt4/types.h
index 61901db..826a470 100644
--- a/TelepathyQt4/types.h
+++ b/TelepathyQt4/types.h
@@ -30,7 +30,7 @@
#include <TelepathyQt4/SharedPtr>
-namespace Telepathy
+namespace Tp
{
class Account;
@@ -55,6 +55,6 @@ typedef SharedPtr<MediaStream> MediaStreamPtr;
typedef SharedPtr<StreamedMediaChannel> StreamedMediaChannelPtr;
typedef SharedPtr<TextChannel> TextChannelPtr;
-} // Telepathy
+} // Tp
#endif
diff --git a/examples/accounts/account-item.cpp b/examples/accounts/account-item.cpp
index ef3403e..41474aa 100644
--- a/examples/accounts/account-item.cpp
+++ b/examples/accounts/account-item.cpp
@@ -28,17 +28,17 @@
#include <QComboBox>
#include <QTableWidget>
-AccountItem::AccountItem(Telepathy::AccountManagerPtr am,
+AccountItem::AccountItem(Tp::AccountManagerPtr am,
const QString &objectPath, QTableWidget *table, int row, QObject *parent)
: QObject(parent),
- mAcc(Telepathy::Account::create(am->dbusConnection(),
+ mAcc(Tp::Account::create(am->dbusConnection(),
am->busName(), objectPath)),
mTable(table),
mRow(row)
{
connect(mAcc->becomeReady(),
- SIGNAL(finished(Telepathy::PendingOperation *)),
- SLOT(onReady(Telepathy::PendingOperation *)));
+ SIGNAL(finished(Tp::PendingOperation *)),
+ SLOT(onReady(Tp::PendingOperation *)));
}
AccountItem::~AccountItem()
@@ -61,11 +61,11 @@ void AccountItem::setupGui()
mTable->setItem(mRow, ColumnConnection, new QTableWidgetItem(mAcc->connectionObjectPath()));
}
-void AccountItem::onReady(Telepathy::PendingOperation *op)
+void AccountItem::onReady(Tp::PendingOperation *op)
{
setupGui();
- Telepathy::Account *acc = mAcc.data();
+ Tp::Account *acc = mAcc.data();
connect(acc,
SIGNAL(validityChanged(bool)),
SLOT(onValidityChanged(bool)));
@@ -82,17 +82,17 @@ void AccountItem::onReady(Telepathy::PendingOperation *op)
SIGNAL(connectsAutomaticallyPropertyChanged(bool)),
SLOT(onConnectsAutomaticallyPropertyChanged(bool)));
connect(acc,
- SIGNAL(automaticPresenceChanged(const Telepathy::SimplePresence &)),
- SLOT(onAutomaticPresenceChanged(const Telepathy::SimplePresence &)));
+ SIGNAL(automaticPresenceChanged(const Tp::SimplePresence &)),
+ SLOT(onAutomaticPresenceChanged(const Tp::SimplePresence &)));
connect(acc,
- SIGNAL(currentPresenceChanged(const Telepathy::SimplePresence &)),
- SLOT(onCurrentPresenceChanged(const Telepathy::SimplePresence &)));
+ SIGNAL(currentPresenceChanged(const Tp::SimplePresence &)),
+ SLOT(onCurrentPresenceChanged(const Tp::SimplePresence &)));
connect(acc,
- SIGNAL(requestedPresenceChanged(const Telepathy::SimplePresence &)),
- SLOT(onRequestedPresenceChanged(const Telepathy::SimplePresence &)));
+ SIGNAL(requestedPresenceChanged(const Tp::SimplePresence &)),
+ SLOT(onRequestedPresenceChanged(const Tp::SimplePresence &)));
connect(acc,
- SIGNAL(connectionStatusChanged(Telepathy::ConnectionStatus, Telepathy::ConnectionStatusReason)),
- SLOT(onConnectionStatusChanged(Telepathy::ConnectionStatus, Telepathy::ConnectionStatusReason)));
+ SIGNAL(connectionStatusChanged(Tp::ConnectionStatus, Tp::ConnectionStatusReason)),
+ SLOT(onConnectionStatusChanged(Tp::ConnectionStatus, Tp::ConnectionStatusReason)));
connect(acc,
SIGNAL(haveConnectionChanged(bool)),
SLOT(onHaveConnectionChanged(bool)));
@@ -128,26 +128,26 @@ void AccountItem::onConnectsAutomaticallyPropertyChanged(bool value)
item->setText((value ? "true" : "false"));
}
-void AccountItem::onAutomaticPresenceChanged(const Telepathy::SimplePresence &presence)
+void AccountItem::onAutomaticPresenceChanged(const Tp::SimplePresence &presence)
{
QTableWidgetItem *item = mTable->item(mRow, ColumnAutomaticPresence);
item->setText(presence.status);
}
-void AccountItem::onCurrentPresenceChanged(const Telepathy::SimplePresence &presence)
+void AccountItem::onCurrentPresenceChanged(const Tp::SimplePresence &presence)
{
QTableWidgetItem *item = mTable->item(mRow, ColumnCurrentPresence);
item->setText(presence.status);
}
-void AccountItem::onRequestedPresenceChanged(const Telepathy::SimplePresence &presence)
+void AccountItem::onRequestedPresenceChanged(const Tp::SimplePresence &presence)
{
QTableWidgetItem *item = mTable->item(mRow, ColumnRequestedPresence);
item->setText(presence.status);
}
-void AccountItem::onConnectionStatusChanged(Telepathy::ConnectionStatus status,
- Telepathy::ConnectionStatusReason reason)
+void AccountItem::onConnectionStatusChanged(Tp::ConnectionStatus status,
+ Tp::ConnectionStatusReason reason)
{
QTableWidgetItem *item = mTable->item(mRow, ColumnConnectionStatus);
item->setText(QString::number(status));
diff --git a/examples/accounts/account-item.h b/examples/accounts/account-item.h
index bad8b1b..fa7652d 100644
--- a/examples/accounts/account-item.h
+++ b/examples/accounts/account-item.h
@@ -27,7 +27,7 @@
#include <QString>
-namespace Telepathy {
+namespace Tp {
class AccountManager;
class PendingOperation;
}
@@ -56,30 +56,30 @@ public:
};
Q_ENUMS(Columns)
- AccountItem(Telepathy::AccountManagerPtr am, const QString &objectPath,
+ AccountItem(Tp::AccountManagerPtr am, const QString &objectPath,
QTableWidget *table, int row, QObject *parent = 0);
virtual ~AccountItem();
int row() const { return mRow; }
private Q_SLOTS:
- void onReady(Telepathy::PendingOperation *);
+ void onReady(Tp::PendingOperation *);
void onValidityChanged(bool);
void onStateChanged(bool);
void onDisplayNameChanged(const QString &);
void onNicknameChanged(const QString &);
void onConnectsAutomaticallyPropertyChanged(bool);
- void onAutomaticPresenceChanged(const Telepathy::SimplePresence &);
- void onCurrentPresenceChanged(const Telepathy::SimplePresence &);
- void onRequestedPresenceChanged(const Telepathy::SimplePresence &);
- void onConnectionStatusChanged(Telepathy::ConnectionStatus,
- Telepathy::ConnectionStatusReason);
+ void onAutomaticPresenceChanged(const Tp::SimplePresence &);
+ void onCurrentPresenceChanged(const Tp::SimplePresence &);
+ void onRequestedPresenceChanged(const Tp::SimplePresence &);
+ void onConnectionStatusChanged(Tp::ConnectionStatus,
+ Tp::ConnectionStatusReason);
void onHaveConnectionChanged(bool);
private:
void setupGui();
- Telepathy::AccountPtr mAcc;
+ Tp::AccountPtr mAcc;
QTableWidget *mTable;
int mRow;
};
diff --git a/examples/accounts/accounts-window.cpp b/examples/accounts/accounts-window.cpp
index 6bb0d33..304d724 100644
--- a/examples/accounts/accounts-window.cpp
+++ b/examples/accounts/accounts-window.cpp
@@ -41,10 +41,10 @@ AccountsWindow::AccountsWindow(QWidget *parent)
{
setupGui();
- mAM = Telepathy::AccountManager::create();
+ mAM = Tp::AccountManager::create();
connect(mAM->becomeReady(),
- SIGNAL(finished(Telepathy::PendingOperation *)),
- SLOT(onAMReady(Telepathy::PendingOperation *)));
+ SIGNAL(finished(Tp::PendingOperation *)),
+ SLOT(onAMReady(Tp::PendingOperation *)));
connect(mAM.data(),
SIGNAL(accountCreated(const QString &)),
SLOT(onAccountCreated(const QString &)));
@@ -78,7 +78,7 @@ void AccountsWindow::setupGui()
setCentralWidget(mTable);
}
-void AccountsWindow::onAMReady(Telepathy::PendingOperation *op)
+void AccountsWindow::onAMReady(Tp::PendingOperation *op)
{
mTable->setRowCount(mAM->validAccountPaths().count());
diff --git a/examples/accounts/accounts-window.h b/examples/accounts/accounts-window.h
index 5a98715..8b9408f 100644
--- a/examples/accounts/accounts-window.h
+++ b/examples/accounts/accounts-window.h
@@ -25,7 +25,7 @@
#include <TelepathyQt4/Types>
-namespace Telepathy {
+namespace Tp {
class PendingOperation;
}
@@ -41,13 +41,13 @@ public:
virtual ~AccountsWindow();
private Q_SLOTS:
- void onAMReady(Telepathy::PendingOperation *);
+ void onAMReady(Tp::PendingOperation *);
void onAccountCreated(const QString &);
private:
void setupGui();
- Telepathy::AccountManagerPtr mAM;
+ Tp::AccountManagerPtr mAM;
QTableWidget *mTable;
};
diff --git a/examples/accounts/main.cpp b/examples/accounts/main.cpp
index e6e87e1..a21b62c 100644
--- a/examples/accounts/main.cpp
+++ b/examples/accounts/main.cpp
@@ -10,9 +10,9 @@ int main(int argc, char **argv)
{
QApplication app(argc, argv);
- Telepathy::registerTypes();
- Telepathy::enableDebug(true);
- Telepathy::enableWarnings(true);
+ Tp::registerTypes();
+ Tp::enableDebug(true);
+ Tp::enableWarnings(true);
AccountsWindow w;
w.show();
diff --git a/examples/call/call-handler.cpp b/examples/call/call-handler.cpp
index 825c64c..2e8c0fb 100644
--- a/examples/call/call-handler.cpp
+++ b/examples/call/call-handler.cpp
@@ -36,7 +36,7 @@
#include <QDebug>
#include <QMessageBox>
-using namespace Telepathy;
+using namespace Tp;
CallHandler::CallHandler(QObject *parent)
: QObject(parent)
@@ -56,22 +56,22 @@ void CallHandler::addOutgoingCall(const ContactPtr &contact)
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
TELEPATHY_INTERFACE_CHANNEL_TYPE_STREAMED_MEDIA);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
- Telepathy::HandleTypeContact);
+ HandleTypeContact);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandle"),
contact->handle()[0]);
ConnectionPtr conn = contact->manager()->connection();
connect(conn->ensureChannel(request),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(onOutgoingChannelCreated(Telepathy::PendingOperation*)));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(onOutgoingChannelCreated(Tp::PendingOperation*)));
}
void CallHandler::addIncomingCall(const StreamedMediaChannelPtr &chan)
{
mChannels.append(chan);
connect(chan->becomeReady(),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(onIncomingChannelReady(Telepathy::PendingOperation*)));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(onIncomingChannelReady(Tp::PendingOperation*)));
}
void CallHandler::onOutgoingChannelCreated(PendingOperation *op)
@@ -92,8 +92,8 @@ void CallHandler::onOutgoingChannelCreated(PendingOperation *op)
pc->objectPath(), pc->immutableProperties());
mChannels.append(chan);
connect(chan->becomeReady(),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(onOutgoingChannelReady(Telepathy::PendingOperation*)));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(onOutgoingChannelReady(Tp::PendingOperation*)));
}
void CallHandler::onOutgoingChannelReady(PendingOperation *op)
diff --git a/examples/call/call-handler.h b/examples/call/call-handler.h
index 6973cec..c8db08f 100644
--- a/examples/call/call-handler.h
+++ b/examples/call/call-handler.h
@@ -27,7 +27,7 @@
#include <TelepathyQt4/Channel>
#include <TelepathyQt4/Contact>
-namespace Telepathy {
+namespace Tp {
class PendingOperation;
class StreamedMediaChannel;
}
@@ -42,17 +42,17 @@ public:
CallHandler(QObject *parent = 0);
virtual ~CallHandler();
- void addOutgoingCall(const Telepathy::ContactPtr &contact);
- void addIncomingCall(const Telepathy::StreamedMediaChannelPtr &chan);
+ void addOutgoingCall(const Tp::ContactPtr &contact);
+ void addIncomingCall(const Tp::StreamedMediaChannelPtr &chan);
private Q_SLOTS:
- void onOutgoingChannelCreated(Telepathy::PendingOperation *);
- void onOutgoingChannelReady(Telepathy::PendingOperation *);
- void onIncomingChannelReady(Telepathy::PendingOperation *);
+ void onOutgoingChannelCreated(Tp::PendingOperation *);
+ void onOutgoingChannelReady(Tp::PendingOperation *);
+ void onIncomingChannelReady(Tp::PendingOperation *);
void onCallTerminated(QObject *);
private:
- QList<Telepathy::StreamedMediaChannelPtr> mChannels;
+ QList<Tp::StreamedMediaChannelPtr> mChannels;
QList<CallWidget *> mCalls;
};
diff --git a/examples/call/call-roster-widget.cpp b/examples/call/call-roster-widget.cpp
index 2747b7e..a7a3381 100644
--- a/examples/call/call-roster-widget.cpp
+++ b/examples/call/call-roster-widget.cpp
@@ -37,7 +37,7 @@
#include <QAction>
#include <QDebug>
-using namespace Telepathy;
+using namespace Tp;
CallRosterWidget::CallRosterWidget(CallHandler *callHandler, QWidget *parent)
: RosterWidget(parent),
diff --git a/examples/call/call-roster-widget.h b/examples/call/call-roster-widget.h
index 40d9dd4..6b38e99 100644
--- a/examples/call/call-roster-widget.h
+++ b/examples/call/call-roster-widget.h
@@ -26,7 +26,7 @@
#include <examples/roster/roster-widget.h>
-namespace Telepathy {
+namespace Tp {
class Channel;
}
@@ -43,7 +43,7 @@ public:
protected:
virtual RosterItem *createItemForContact(
- const Telepathy::ContactPtr &contact,
+ const Tp::ContactPtr &contact,
bool &exists);
virtual void updateActions(RosterItem *item);
diff --git a/examples/call/call-widget.cpp b/examples/call/call-widget.cpp
index ce4dcdd..0d9e522 100644
--- a/examples/call/call-widget.cpp
+++ b/examples/call/call-widget.cpp
@@ -39,7 +39,7 @@
#include <QStatusBar>
#include <QVBoxLayout>
-using namespace Telepathy;
+using namespace Tp;
CallWidget::CallWidget(const StreamedMediaChannelPtr &chan,
const ContactPtr &contact,
@@ -58,15 +58,15 @@ CallWidget::CallWidget(const StreamedMediaChannelPtr &chan,
setupGui();
connect(mChan->becomeReady(StreamedMediaChannel::FeatureStreams),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(onChannelReady(Telepathy::PendingOperation*)));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(onChannelReady(Tp::PendingOperation*)));
connect(mChan.data(),
- SIGNAL(invalidated(Telepathy::DBusProxy *, const QString &, const QString &)),
- SLOT(onChannelInvalidated(Telepathy::DBusProxy *, const QString &, const QString &)));
+ SIGNAL(invalidated(Tp::DBusProxy *, const QString &, const QString &)),
+ SLOT(onChannelInvalidated(Tp::DBusProxy *, const QString &, const QString &)));
connect(mTfChan,
- SIGNAL(statusChanged(Telepathy::FarsightChannel::Status)),
- SLOT(onTfChannelStatusChanged(Telepathy::FarsightChannel::Status)));
+ SIGNAL(statusChanged(Tp::FarsightChannel::Status)),
+ SLOT(onTfChannelStatusChanged(Tp::FarsightChannel::Status)));
}
CallWidget::~CallWidget()
@@ -178,30 +178,30 @@ void CallWidget::onChannelReady(PendingOperation *op)
}
connect(mChan.data(),
- SIGNAL(streamAdded(const Telepathy::MediaStreamPtr &)),
- SLOT(onStreamAdded(const Telepathy::MediaStreamPtr &)));
+ SIGNAL(streamAdded(const Tp::MediaStreamPtr &)),
+ SLOT(onStreamAdded(const Tp::MediaStreamPtr &)));
connect(mChan.data(),
- SIGNAL(streamRemoved(const Telepathy::MediaStreamPtr &)),
- SLOT(onStreamRemoved(const Telepathy::MediaStreamPtr &)));
+ SIGNAL(streamRemoved(const Tp::MediaStreamPtr &)),
+ SLOT(onStreamRemoved(const Tp::MediaStreamPtr &)));
connect(mChan.data(),
- SIGNAL(streamDirectionChanged(const Telepathy::MediaStreamPtr &,
- Telepathy::MediaStreamDirection,
- Telepathy::MediaStreamPendingSend)),
- SLOT(onStreamDirectionChanged(const Telepathy::MediaStreamPtr &,
- Telepathy::MediaStreamDirection,
- Telepathy::MediaStreamPendingSend)));
+ SIGNAL(streamDirectionChanged(const Tp::MediaStreamPtr &,
+ Tp::MediaStreamDirection,
+ Tp::MediaStreamPendingSend)),
+ SLOT(onStreamDirectionChanged(const Tp::MediaStreamPtr &,
+ Tp::MediaStreamDirection,
+ Tp::MediaStreamPendingSend)));
connect(mChan.data(),
- SIGNAL(streamStateChanged(const Telepathy::MediaStreamPtr &,
- Telepathy::MediaStreamState)),
- SLOT(onStreamStateChanged(const Telepathy::MediaStreamPtr &,
- Telepathy::MediaStreamState)));
+ SIGNAL(streamStateChanged(const Tp::MediaStreamPtr &,
+ Tp::MediaStreamState)),
+ SLOT(onStreamStateChanged(const Tp::MediaStreamPtr &,
+ Tp::MediaStreamState)));
MediaStreams streams = mChan->streams();
qDebug() << "CallWidget::onChannelReady: number of streams:" << streams.size();
if (streams.size() > 0) {
foreach (const MediaStreamPtr &stream, streams) {
qDebug() << " type:" <<
- (stream->type() == Telepathy::MediaStreamTypeAudio ? "Audio" : "Video");
+ (stream->type() == Tp::MediaStreamTypeAudio ? "Audio" : "Video");
qDebug() << " direction:" << stream->direction();
qDebug() << " state:" << stream->state();
@@ -240,9 +240,9 @@ void CallWidget::onStreamCreated(PendingOperation *op)
QPushButton *btn = 0;
// we cannot create the stream for some reason, update buttons
- if (!streamForType(Telepathy::MediaStreamTypeAudio)) {
+ if (!streamForType(Tp::MediaStreamTypeAudio)) {
btn = mBtnSendAudio;
- } else if (!streamForType(Telepathy::MediaStreamTypeVideo)) {
+ } else if (!streamForType(Tp::MediaStreamTypeVideo)) {
btn = mBtnSendVideo;
} else {
Q_ASSERT(false);
@@ -265,7 +265,7 @@ void CallWidget::onStreamCreated(PendingOperation *op)
void CallWidget::onStreamAdded(const MediaStreamPtr &stream)
{
qDebug() << "CallWidget::onStreamAdded:" <<
- (stream->type() == Telepathy::MediaStreamTypeAudio ? "Audio" : "Video") <<
+ (stream->type() == Tp::MediaStreamTypeAudio ? "Audio" : "Video") <<
"stream created";
qDebug() << " direction:" << stream->direction();
qDebug() << " state:" << stream->state();
@@ -279,15 +279,15 @@ void CallWidget::onStreamAdded(const MediaStreamPtr &stream)
void CallWidget::onStreamRemoved(const MediaStreamPtr &stream)
{
qDebug() << "CallWidget::onStreamRemoved:" <<
- (stream->type() == Telepathy::MediaStreamTypeAudio ? "Audio" : "Video") <<
+ (stream->type() == Tp::MediaStreamTypeAudio ? "Audio" : "Video") <<
"stream removed";
- if (stream->type() == Telepathy::MediaStreamTypeAudio) {
+ if (stream->type() == Tp::MediaStreamTypeAudio) {
mBtnSendAudio->blockSignals(true);
mBtnSendAudio->setChecked(false);
mBtnSendAudio->blockSignals(false);
mLblAudioDirection->setText(QLatin1String("Direction: None"));
mLblAudioState->setText(QLatin1String("State: Disconnected"));
- } else if (stream->type() == Telepathy::MediaStreamTypeVideo) {
+ } else if (stream->type() == Tp::MediaStreamTypeVideo) {
mBtnSendVideo->blockSignals(true);
mBtnSendVideo->setChecked(false);
mBtnSendVideo->blockSignals(false);
@@ -297,60 +297,60 @@ void CallWidget::onStreamRemoved(const MediaStreamPtr &stream)
}
void CallWidget::onStreamDirectionChanged(const MediaStreamPtr &stream,
- Telepathy::MediaStreamDirection direction,
- Telepathy::MediaStreamPendingSend pendingSend)
+ Tp::MediaStreamDirection direction,
+ Tp::MediaStreamPendingSend pendingSend)
{
qDebug() << "CallWidget::onStreamDirectionChanged:" <<
- (stream->type() == Telepathy::MediaStreamTypeAudio ? "Audio" : "Video") <<
+ (stream->type() == Tp::MediaStreamTypeAudio ? "Audio" : "Video") <<
"stream direction changed to" << direction;
QLabel *lbl = 0;
QPushButton *btn = 0;
- if (stream->type() == Telepathy::MediaStreamTypeAudio) {
+ if (stream->type() == Tp::MediaStreamTypeAudio) {
lbl = mLblAudioDirection;
btn = mBtnSendAudio;
- } else if (stream->type() == Telepathy::MediaStreamTypeVideo) {
+ } else if (stream->type() == Tp::MediaStreamTypeVideo) {
lbl = mLblVideoDirection;
btn = mBtnSendVideo;
} else {
Q_ASSERT(false);
}
- if (direction == Telepathy::MediaStreamDirectionSend) {
+ if (direction == Tp::MediaStreamDirectionSend) {
lbl->setText(QLatin1String("Direction: Sending"));
- } else if (direction == Telepathy::MediaStreamDirectionReceive) {
+ } else if (direction == Tp::MediaStreamDirectionReceive) {
lbl->setText(QLatin1String("Direction: Receiving"));
- } else if (direction == (Telepathy::MediaStreamDirectionSend | Telepathy::MediaStreamDirectionReceive)) {
+ } else if (direction == (Tp::MediaStreamDirectionSend | Tp::MediaStreamDirectionReceive)) {
lbl->setText(QLatin1String("Direction: Sending/Receiving"));
} else {
lbl->setText(QLatin1String("Direction: None"));
}
btn->blockSignals(true);
- btn->setChecked(direction & Telepathy::MediaStreamDirectionSend);
+ btn->setChecked(direction & Tp::MediaStreamDirectionSend);
btn->blockSignals(false);
}
void CallWidget::onStreamStateChanged(const MediaStreamPtr &stream,
- Telepathy::MediaStreamState state)
+ Tp::MediaStreamState state)
{
qDebug() << "CallWidget::onStreamStateChanged:" <<
- (stream->type() == Telepathy::MediaStreamTypeAudio ? "Audio" : "Video") <<
+ (stream->type() == Tp::MediaStreamTypeAudio ? "Audio" : "Video") <<
"stream state changed to" << state;
QLabel *lbl = 0;
- if (stream->type() == Telepathy::MediaStreamTypeAudio) {
+ if (stream->type() == Tp::MediaStreamTypeAudio) {
lbl = mLblAudioState;
- } else if (stream->type() == Telepathy::MediaStreamTypeVideo) {
+ } else if (stream->type() == Tp::MediaStreamTypeVideo) {
lbl = mLblVideoState;
} else {
Q_ASSERT(false);
}
- if (state == Telepathy::MediaStreamStateDisconnected) {
+ if (state == Tp::MediaStreamStateDisconnected) {
lbl->setText(QLatin1String("State: Disconnected"));
- } else if (state == Telepathy::MediaStreamStateConnecting) {
+ } else if (state == Tp::MediaStreamStateConnecting) {
lbl->setText(QLatin1String("State: Connecting"));
- } else if (state == Telepathy::MediaStreamStateConnected) {
+ } else if (state == Tp::MediaStreamStateConnected) {
lbl->setText(QLatin1String("State: Connected"));
}
}
@@ -380,17 +380,17 @@ void CallWidget::onBtnHangupClicked()
void CallWidget::onBtnSendAudioToggled(bool checked)
{
MediaStreamPtr stream =
- streamForType(Telepathy::MediaStreamTypeAudio);
+ streamForType(Tp::MediaStreamTypeAudio);
qDebug() << "CallWidget::onBtnSendAudioToggled: checked:" << checked;
if (!stream) {
if (mPmsAudio) {
return;
}
qDebug() << "CallWidget::onBtnSendAudioToggled: creating audio stream";
- mPmsAudio = mChan->requestStream(mContact, Telepathy::MediaStreamTypeAudio);
+ mPmsAudio = mChan->requestStream(mContact, Tp::MediaStreamTypeAudio);
connect(mPmsAudio,
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(onStreamCreated(Telepathy::PendingOperation*)));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(onStreamCreated(Tp::PendingOperation*)));
} else {
updateStreamDirection(stream);
}
@@ -399,23 +399,23 @@ void CallWidget::onBtnSendAudioToggled(bool checked)
void CallWidget::onBtnSendVideoToggled(bool checked)
{
MediaStreamPtr stream =
- streamForType(Telepathy::MediaStreamTypeVideo);
+ streamForType(Tp::MediaStreamTypeVideo);
qDebug() << "CallWidget::onBtnSendVideoToggled: checked:" << checked;
if (!stream) {
if (mPmsVideo) {
return;
}
qDebug() << "CallWidget::onBtnSendVideoToggled: creating video stream";
- mPmsVideo = mChan->requestStream(mContact, Telepathy::MediaStreamTypeVideo);
+ mPmsVideo = mChan->requestStream(mContact, Tp::MediaStreamTypeVideo);
connect(mPmsVideo,
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(onStreamCreated(Telepathy::PendingOperation*)));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(onStreamCreated(Tp::PendingOperation*)));
} else {
updateStreamDirection(stream);
}
}
-MediaStreamPtr CallWidget::streamForType(Telepathy::MediaStreamType type) const
+MediaStreamPtr CallWidget::streamForType(Tp::MediaStreamType type) const
{
MediaStreams streams = mChan->streams();
foreach (const MediaStreamPtr &stream, streams) {
@@ -429,38 +429,38 @@ MediaStreamPtr CallWidget::streamForType(Telepathy::MediaStreamType type) const
void CallWidget::updateStreamDirection(const MediaStreamPtr &stream)
{
bool checked = false;
- if (stream->type() == Telepathy::MediaStreamTypeAudio) {
+ if (stream->type() == Tp::MediaStreamTypeAudio) {
checked = mBtnSendAudio->isChecked();
- } else if (stream->type() == Telepathy::MediaStreamTypeVideo) {
+ } else if (stream->type() == Tp::MediaStreamTypeVideo) {
checked = mBtnSendVideo->isChecked();
} else {
Q_ASSERT(false);
}
qDebug() << "CallWidget::updateStreamDirection: updating" <<
- (stream->type() == Telepathy::MediaStreamTypeAudio ? "audio" : "video") <<
+ (stream->type() == Tp::MediaStreamTypeAudio ? "audio" : "video") <<
"stream direction";
if (checked) {
- if (!(stream->direction() & Telepathy::MediaStreamDirectionSend)) {
- int dir = stream->direction() | Telepathy::MediaStreamDirectionSend;
- stream->requestDirection((Telepathy::MediaStreamDirection) dir);
+ if (!(stream->direction() & Tp::MediaStreamDirectionSend)) {
+ int dir = stream->direction() | Tp::MediaStreamDirectionSend;
+ stream->requestDirection((Tp::MediaStreamDirection) dir);
qDebug() << "CallWidget::updateStreamDirection: start sending" <<
- (stream->type() == Telepathy::MediaStreamTypeAudio ? "audio" : "video");
+ (stream->type() == Tp::MediaStreamTypeAudio ? "audio" : "video");
} else {
qDebug() << "CallWidget::updateStreamDirection:" <<
- (stream->type() == Telepathy::MediaStreamTypeAudio ? "audio" : "video") <<
+ (stream->type() == Tp::MediaStreamTypeAudio ? "audio" : "video") <<
"stream updated";
}
} else {
- if (stream->direction() & Telepathy::MediaStreamDirectionSend) {
- int dir = stream->direction() & ~Telepathy::MediaStreamDirectionSend;
+ if (stream->direction() & Tp::MediaStreamDirectionSend) {
+ int dir = stream->direction() & ~Tp::MediaStreamDirectionSend;
qDebug() << "CallWidget::updateStreamDirection: stop sending " <<
- (stream->type() == Telepathy::MediaStreamTypeAudio ? "audio" : "video");
- stream->requestDirection((Telepathy::MediaStreamDirection) dir);
+ (stream->type() == Tp::MediaStreamTypeAudio ? "audio" : "video");
+ stream->requestDirection((Tp::MediaStreamDirection) dir);
} else {
qDebug() << "CallWidget::updateStreamDirection:" <<
- (stream->type() == Telepathy::MediaStreamTypeAudio ? "audio" : "video") <<
+ (stream->type() == Tp::MediaStreamTypeAudio ? "audio" : "video") <<
"stream updated";
}
}
@@ -470,12 +470,12 @@ void CallWidget::callEnded(const QString &message)
{
mStatusBar->showMessage(message);
disconnect(mChan.data(),
- SIGNAL(invalidated(Telepathy::DBusProxy *, const QString &, const QString &)),
+ SIGNAL(invalidated(Tp::DBusProxy *, const QString &, const QString &)),
this,
- SLOT(onChannelInvalidated(Telepathy::DBusProxy *, const QString &, const QString &)));
+ SLOT(onChannelInvalidated(Tp::DBusProxy *, const QString &, const QString &)));
disconnect(mTfChan,
- SIGNAL(statusChanged(Telepathy::FarsightChannel::Status)),
+ SIGNAL(statusChanged(Tp::FarsightChannel::Status)),
this,
- SLOT(onTfChannelStatusChanged(Telepathy::FarsightChannel::Status)));
+ SLOT(onTfChannelStatusChanged(Tp::FarsightChannel::Status)));
setEnabled(false);
}
diff --git a/examples/call/call-widget.h b/examples/call/call-widget.h
index 74a13e7..b7fb36e 100644
--- a/examples/call/call-widget.h
+++ b/examples/call/call-widget.h
@@ -31,7 +31,7 @@
#include "farsight-channel.h"
-namespace Telepathy {
+namespace Tp {
class DBusProxy;
class MediaStream;
class PendingMediaStreams;
@@ -47,27 +47,27 @@ class CallWidget : public QWidget
Q_OBJECT
public:
- CallWidget(const Telepathy::StreamedMediaChannelPtr &channel,
- const Telepathy::ContactPtr &contact,
+ CallWidget(const Tp::StreamedMediaChannelPtr &channel,
+ const Tp::ContactPtr &contact,
QWidget *parent = 0);
virtual ~CallWidget();
- Telepathy::StreamedMediaChannelPtr channel() const { return mChan; }
- Telepathy::ContactPtr contact() const { return mContact; }
+ Tp::StreamedMediaChannelPtr channel() const { return mChan; }
+ Tp::ContactPtr contact() const { return mContact; }
private Q_SLOTS:
- void onChannelReady(Telepathy::PendingOperation *);
- void onChannelInvalidated(Telepathy::DBusProxy *,
+ void onChannelReady(Tp::PendingOperation *);
+ void onChannelInvalidated(Tp::DBusProxy *,
const QString &, const QString &);
- void onStreamCreated(Telepathy::PendingOperation *);
- void onStreamAdded(const Telepathy::MediaStreamPtr &);
- void onStreamRemoved(const Telepathy::MediaStreamPtr &);
- void onStreamDirectionChanged(const Telepathy::MediaStreamPtr &,
- Telepathy::MediaStreamDirection,
- Telepathy::MediaStreamPendingSend);
- void onStreamStateChanged(const Telepathy::MediaStreamPtr &,
- Telepathy::MediaStreamState);
- void onTfChannelStatusChanged(Telepathy::FarsightChannel::Status);
+ void onStreamCreated(Tp::PendingOperation *);
+ void onStreamAdded(const Tp::MediaStreamPtr &);
+ void onStreamRemoved(const Tp::MediaStreamPtr &);
+ void onStreamDirectionChanged(const Tp::MediaStreamPtr &,
+ Tp::MediaStreamDirection,
+ Tp::MediaStreamPendingSend);
+ void onStreamStateChanged(const Tp::MediaStreamPtr &,
+ Tp::MediaStreamState);
+ void onTfChannelStatusChanged(Tp::FarsightChannel::Status);
void onBtnHangupClicked();
void onBtnSendAudioToggled(bool);
@@ -77,17 +77,17 @@ private:
void createActions();
void setupGui();
- Telepathy::MediaStreamPtr streamForType(Telepathy::MediaStreamType type) const;
- void updateStreamDirection(const Telepathy::MediaStreamPtr &stream);
+ Tp::MediaStreamPtr streamForType(Tp::MediaStreamType type) const;
+ void updateStreamDirection(const Tp::MediaStreamPtr &stream);
void callEnded(const QString &message);
- Telepathy::StreamedMediaChannelPtr mChan;
- Telepathy::ContactPtr mContact;
- Telepathy::FarsightChannel *mTfChan;
+ Tp::StreamedMediaChannelPtr mChan;
+ Tp::ContactPtr mContact;
+ Tp::FarsightChannel *mTfChan;
- Telepathy::PendingMediaStreams *mPmsAudio;
- Telepathy::PendingMediaStreams *mPmsVideo;
+ Tp::PendingMediaStreams *mPmsAudio;
+ Tp::PendingMediaStreams *mPmsVideo;
QPushButton *mBtnHangup;
QPushButton *mBtnSendAudio;
diff --git a/examples/call/call-window.cpp b/examples/call/call-window.cpp
index 715ad84..2e19592 100644
--- a/examples/call/call-window.cpp
+++ b/examples/call/call-window.cpp
@@ -35,7 +35,7 @@
#include <QDebug>
-using namespace Telepathy;
+using namespace Tp;
CallWindow::CallWindow(const QString &username, const QString &password,
QWidget *parent)
@@ -47,8 +47,8 @@ CallWindow::CallWindow(const QString &username, const QString &password,
mCM = ConnectionManager::create("gabble");
connect(mCM->becomeReady(),
- SIGNAL(finished(Telepathy::PendingOperation *)),
- SLOT(onCMReady(Telepathy::PendingOperation *)));
+ SIGNAL(finished(Tp::PendingOperation *)),
+ SLOT(onCMReady(Tp::PendingOperation *)));
mCallHandler = new CallHandler(this);
@@ -70,7 +70,7 @@ void CallWindow::setupGui()
setCentralWidget(mRoster);
}
-void CallWindow::onCMReady(Telepathy::PendingOperation *op)
+void CallWindow::onCMReady(Tp::PendingOperation *op)
{
if (op->isError()) {
qWarning() << "CM cannot become ready";
@@ -83,11 +83,11 @@ void CallWindow::onCMReady(Telepathy::PendingOperation *op)
params.insert("password", QVariant(mPassword));
PendingConnection *pconn = mCM->requestConnection("jabber", params);
connect(pconn,
- SIGNAL(finished(Telepathy::PendingOperation *)),
- SLOT(onConnectionCreated(Telepathy::PendingOperation *)));
+ SIGNAL(finished(Tp::PendingOperation *)),
+ SLOT(onConnectionCreated(Tp::PendingOperation *)));
}
-void CallWindow::onConnectionCreated(Telepathy::PendingOperation *op)
+void CallWindow::onConnectionCreated(Tp::PendingOperation *op)
{
if (op->isError()) {
qWarning() << "Unable to create connection";
@@ -100,14 +100,14 @@ void CallWindow::onConnectionCreated(Telepathy::PendingOperation *op)
ConnectionPtr conn = pconn->connection();
mConn = conn;
connect(conn->requestConnect(Connection::FeatureSelfContact),
- SIGNAL(finished(Telepathy::PendingOperation *)),
- SLOT(onConnectionConnected(Telepathy::PendingOperation *)));
+ SIGNAL(finished(Tp::PendingOperation *)),
+ SLOT(onConnectionConnected(Tp::PendingOperation *)));
connect(conn.data(),
- SIGNAL(invalidated(Telepathy::DBusProxy *, const QString &, const QString &)),
- SLOT(onConnectionInvalidated(Telepathy::DBusProxy *, const QString &, const QString &)));
+ SIGNAL(invalidated(Tp::DBusProxy *, const QString &, const QString &)),
+ SLOT(onConnectionInvalidated(Tp::DBusProxy *, const QString &, const QString &)));
}
-void CallWindow::onConnectionConnected(Telepathy::PendingOperation *op)
+void CallWindow::onConnectionConnected(Tp::PendingOperation *op)
{
if (op->isError()) {
qWarning() << "Connection cannot become connected";
@@ -118,24 +118,24 @@ void CallWindow::onConnectionConnected(Telepathy::PendingOperation *op)
ConnectionPtr conn = ConnectionPtr(qobject_cast<Connection *>(pr->object()));
if (conn->interfaces().contains(TELEPATHY_INTERFACE_CONNECTION_INTERFACE_CAPABILITIES)) {
- Telepathy::CapabilityPair capability = {
+ Tp::CapabilityPair capability = {
TELEPATHY_INTERFACE_CHANNEL_TYPE_STREAMED_MEDIA,
- Telepathy::ChannelMediaCapabilityAudio |
- Telepathy::ChannelMediaCapabilityVideo |
- Telepathy::ChannelMediaCapabilityNATTraversalSTUN |
- Telepathy::ChannelMediaCapabilityNATTraversalGTalkP2P
+ Tp::ChannelMediaCapabilityAudio |
+ Tp::ChannelMediaCapabilityVideo |
+ Tp::ChannelMediaCapabilityNATTraversalSTUN |
+ Tp::ChannelMediaCapabilityNATTraversalGTalkP2P
};
qDebug() << "CallWindow::onConnectionConnected: advertising capabilities";
conn->capabilitiesInterface()->AdvertiseCapabilities(
- Telepathy::CapabilityPairList() << capability,
+ Tp::CapabilityPairList() << capability,
QStringList());
}
if (conn->interfaces().contains(TELEPATHY_INTERFACE_CONNECTION_INTERFACE_REQUESTS)) {
qDebug() << "CallWindow::onConnectionConnected: connecting to Connection.Interface.NewChannels";
connect(conn->requestsInterface(),
- SIGNAL(NewChannels(const Telepathy::ChannelDetailsList&)),
- SLOT(onNewChannels(const Telepathy::ChannelDetailsList&)));
+ SIGNAL(NewChannels(const Tp::ChannelDetailsList&)),
+ SLOT(onNewChannels(const Tp::ChannelDetailsList&)));
}
mRoster->addConnection(conn);
@@ -150,10 +150,10 @@ void CallWindow::onConnectionInvalidated(DBusProxy *proxy,
mConn.reset();
}
-void CallWindow::onNewChannels(const Telepathy::ChannelDetailsList &channels)
+void CallWindow::onNewChannels(const Tp::ChannelDetailsList &channels)
{
qDebug() << "CallWindow::onNewChannels";
- foreach (const Telepathy::ChannelDetails &details, channels) {
+ foreach (const Tp::ChannelDetails &details, channels) {
QString channelType = details.properties.value(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType")).toString();
bool requested = details.properties.value(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".Requested")).toBool();
qDebug() << " channelType:" << channelType;
diff --git a/examples/call/call-window.h b/examples/call/call-window.h
index fd5a344..aa7b1d0 100644
--- a/examples/call/call-window.h
+++ b/examples/call/call-window.h
@@ -27,7 +27,7 @@
#include <TelepathyQt4/Connection>
#include <TelepathyQt4/Types>
-namespace Telepathy {
+namespace Tp {
class ConnectionManager;
class DBusProxy;
class PendingOperation;
@@ -46,18 +46,18 @@ public:
virtual ~CallWindow();
private Q_SLOTS:
- void onCMReady(Telepathy::PendingOperation *);
- void onConnectionCreated(Telepathy::PendingOperation *);
- void onConnectionConnected(Telepathy::PendingOperation *);
- void onConnectionInvalidated(Telepathy::DBusProxy *,
+ void onCMReady(Tp::PendingOperation *);
+ void onConnectionCreated(Tp::PendingOperation *);
+ void onConnectionConnected(Tp::PendingOperation *);
+ void onConnectionInvalidated(Tp::DBusProxy *,
const QString &, const QString &);
- void onNewChannels(const Telepathy::ChannelDetailsList &);
+ void onNewChannels(const Tp::ChannelDetailsList &);
private:
void setupGui();
- Telepathy::ConnectionManagerPtr mCM;
- Telepathy::ConnectionPtr mConn;
+ Tp::ConnectionManagerPtr mCM;
+ Tp::ConnectionPtr mConn;
QString mUsername;
QString mPassword;
CallHandler *mCallHandler;
diff --git a/examples/call/farsight-channel.cpp b/examples/call/farsight-channel.cpp
index eded9a0..ae5ea33 100644
--- a/examples/call/farsight-channel.cpp
+++ b/examples/call/farsight-channel.cpp
@@ -1,5 +1,5 @@
/*
- * Very basic Telepathy-Qt <-> Telepathy-Farsight integration.
+ * Very basic Tp-Qt <-> Tp-Farsight integration.
*
* Copyright © 2008-2009 Collabora Ltd. <http://www.collabora.co.uk/>
* Copyright © 2009 Nokia Corporation
@@ -33,7 +33,7 @@
#include <TelepathyQt4/Connection>
#include <TelepathyQt4/StreamedMediaChannel>
-namespace Telepathy {
+namespace Tp {
struct FarsightChannel::Private
{
@@ -345,4 +345,4 @@ VideoWidget *FarsightChannel::videoWidget() const
return mPriv->videoOutput;
}
-} // Telepathy
+} // Tp
diff --git a/examples/call/farsight-channel.h b/examples/call/farsight-channel.h
index f054e46..a010f0a 100644
--- a/examples/call/farsight-channel.h
+++ b/examples/call/farsight-channel.h
@@ -1,5 +1,5 @@
/*
- * Very basic Telepathy-Qt <-> Telepathy-Farsight integration.
+ * Very basic Tp-Qt <-> Tp-Farsight integration.
*
* Copyright © 2008-2009 Collabora Ltd. <http://www.collabora.co.uk/>
* Copyright © 2009 Nokia Corporation
@@ -29,7 +29,7 @@
#include <telepathy-farsight/channel.h>
-namespace Telepathy {
+namespace Tp {
class Connection;
class VideoWidget;
@@ -57,7 +57,7 @@ public:
// TODO add a way to change input and output devices
Q_SIGNALS:
- void statusChanged(Telepathy::FarsightChannel::Status status);
+ void statusChanged(Tp::FarsightChannel::Status status);
private:
struct Private;
@@ -65,8 +65,8 @@ private:
Private *mPriv;
};
-} // Telepathy
+} // Tp
-Q_DECLARE_METATYPE(Telepathy::FarsightChannel::Status)
+Q_DECLARE_METATYPE(Tp::FarsightChannel::Status)
#endif
diff --git a/examples/call/main.cpp b/examples/call/main.cpp
index 4a156dc..02023a6 100644
--- a/examples/call/main.cpp
+++ b/examples/call/main.cpp
@@ -25,10 +25,10 @@ int main(int argc, char **argv)
app.setAttribute(Qt::AA_NativeWindows);
- Telepathy::registerTypes();
- Telepathy::enableDebug(true);
- Telepathy::enableWarnings(true);
- qRegisterMetaType<Telepathy::FarsightChannel::Status>();
+ Tp::registerTypes();
+ Tp::enableDebug(true);
+ Tp::enableWarnings(true);
+ qRegisterMetaType<Tp::FarsightChannel::Status>();
CallWindow w(argv[1], argv[2]);
w.show();
diff --git a/examples/call/video-widget.cpp b/examples/call/video-widget.cpp
index d3726cc..20f6b08 100644
--- a/examples/call/video-widget.cpp
+++ b/examples/call/video-widget.cpp
@@ -32,7 +32,7 @@
extern void qt_x11_set_global_double_buffer(bool);
-namespace Telepathy {
+namespace Tp {
struct VideoWidget::Private {
Private(VideoWidget *parent, GstBus *bus);
@@ -162,4 +162,4 @@ void VideoWidget::windowExposed()
}
}
-} // Telepathy
+} // Tp
diff --git a/examples/call/video-widget.h b/examples/call/video-widget.h
index 2824318..fbe0a04 100644
--- a/examples/call/video-widget.h
+++ b/examples/call/video-widget.h
@@ -26,7 +26,7 @@
#include <gst/gst.h>
-namespace Telepathy {
+namespace Tp {
class VideoWidget : public QWidget
{
@@ -51,6 +51,6 @@ private:
Private *mPriv;
};
-} // Telepathy
+} // Tp
#endif
diff --git a/examples/extensions/Makefile.am b/examples/extensions/Makefile.am
index 8e0c433..bfc460b 100644
--- a/examples/extensions/Makefile.am
+++ b/examples/extensions/Makefile.am
@@ -2,8 +2,8 @@
# Typically this would be in a top-level extensions/ directory.
# In this example we build an optional interface for Telepathy Connections,
-# so we specify Telepathy::Client::ConnectionInterface as the main interface for the
-# generated proxies with "--mainiface=Telepathy::Client::ConnectionInterface'. The
+# so we specify Tp::Client::ConnectionInterface as the main interface for the
+# generated proxies with "--mainiface=Tp::Client::ConnectionInterface'. The
# generated proxies will have a convenience constructors for associating the
# proxy with the same remote object an instance of the main interface class
# is associated with. We could instead have made an optional interface for any
@@ -103,7 +103,7 @@ _gen/cli-connection-body.hpp _gen/cli-connection.h: _gen/connection.xml \
--specxml=_gen/all.xml \
--ifacexml=$< \
--extraincludes='<TelepathyQt4/Connection>,"types.h"' \
- --mainiface='Telepathy::Client::ConnectionInterface'
+ --mainiface='Tp::Client::ConnectionInterface'
%.moc.hpp: %.h _gen/constants.h _gen/types.h
$(MOC) $(AM_CPPFLAGS) -i $< -o $@
diff --git a/examples/roster/main.cpp b/examples/roster/main.cpp
index 5d39880..7716f1f 100644
--- a/examples/roster/main.cpp
+++ b/examples/roster/main.cpp
@@ -16,9 +16,9 @@ int main(int argc, char **argv)
return 1;
}
- Telepathy::registerTypes();
- Telepathy::enableDebug(true);
- Telepathy::enableWarnings(true);
+ Tp::registerTypes();
+ Tp::enableDebug(true);
+ Tp::enableWarnings(true);
RosterWindow w(argv[1], argv[2]);
w.show();
diff --git a/examples/roster/roster-item.cpp b/examples/roster/roster-item.cpp
index 0e7ad88..a0e123d 100644
--- a/examples/roster/roster-item.cpp
+++ b/examples/roster/roster-item.cpp
@@ -21,7 +21,7 @@
#include "roster-item.h"
#include "_gen/roster-item.moc.hpp"
-using namespace Telepathy;
+using namespace Tp;
RosterItem::RosterItem(const ContactPtr &contact,
QListWidget *parent)
@@ -35,10 +35,10 @@ RosterItem::RosterItem(const ContactPtr &contact,
SIGNAL(simplePresenceChanged(const QString &, uint, const QString &)),
SLOT(onContactChanged()));
connect(contact.data(),
- SIGNAL(subscriptionStateChanged(Telepathy::Contact::PresenceState)),
+ SIGNAL(subscriptionStateChanged(Tp::Contact::PresenceState)),
SLOT(onContactChanged()));
connect(contact.data(),
- SIGNAL(publishStateChanged(Telepathy::Contact::PresenceState)),
+ SIGNAL(publishStateChanged(Tp::Contact::PresenceState)),
SLOT(onContactChanged()));
connect(contact.data(),
SIGNAL(blockStatusChanged(bool)),
diff --git a/examples/roster/roster-item.h b/examples/roster/roster-item.h
index 54af79a..073339f 100644
--- a/examples/roster/roster-item.h
+++ b/examples/roster/roster-item.h
@@ -32,11 +32,11 @@ class RosterItem : public QObject, public QListWidgetItem
Q_OBJECT
public:
- RosterItem(const Telepathy::ContactPtr &contact,
+ RosterItem(const Tp::ContactPtr &contact,
QListWidget *parent = 0);
~RosterItem();
- Telepathy::ContactPtr contact() const { return mContact; }
+ Tp::ContactPtr contact() const { return mContact; }
Q_SIGNALS:
void changed();
@@ -45,7 +45,7 @@ private Q_SLOTS:
void onContactChanged();
private:
- Telepathy::ContactPtr mContact;
+ Tp::ContactPtr mContact;
};
#endif
diff --git a/examples/roster/roster-widget.cpp b/examples/roster/roster-widget.cpp
index a4a5809..0f86efc 100644
--- a/examples/roster/roster-widget.cpp
+++ b/examples/roster/roster-widget.cpp
@@ -44,7 +44,7 @@
#include <QPushButton>
#include <QVBoxLayout>
-using namespace Telepathy;
+using namespace Tp;
RosterWidget::RosterWidget(QWidget *parent)
: QWidget(parent)
@@ -63,8 +63,8 @@ void RosterWidget::addConnection(const ConnectionPtr &conn)
{
mConns.append(conn);
connect(conn->becomeReady(Connection::FeatureRoster),
- SIGNAL(finished(Telepathy::PendingOperation *)),
- SLOT(onConnectionReady(Telepathy::PendingOperation *)));
+ SIGNAL(finished(Tp::PendingOperation *)),
+ SLOT(onConnectionReady(Tp::PendingOperation *)));
}
void RosterWidget::removeConnection(const ConnectionPtr &conn)
@@ -177,7 +177,7 @@ RosterItem *RosterWidget::createItemForContact(const ContactPtr &contact,
return new RosterItem(contact, mList);
}
-void RosterWidget::onConnectionReady(Telepathy::PendingOperation *op)
+void RosterWidget::onConnectionReady(Tp::PendingOperation *op)
{
if (op->isError()) {
qWarning() << "Connection cannot become ready";
@@ -187,8 +187,8 @@ void RosterWidget::onConnectionReady(Telepathy::PendingOperation *op)
PendingReady *pr = qobject_cast<PendingReady *>(op);
ConnectionPtr conn = ConnectionPtr(qobject_cast<Connection *>(pr->object()));
connect(conn->contactManager(),
- SIGNAL(presencePublicationRequested(const Telepathy::Contacts &)),
- SLOT(onPresencePublicationRequested(const Telepathy::Contacts &)));
+ SIGNAL(presencePublicationRequested(const Tp::Contacts &)),
+ SLOT(onPresencePublicationRequested(const Tp::Contacts &)));
qDebug() << "Connection ready";
RosterItem *item;
@@ -236,8 +236,8 @@ void RosterWidget::onAddButtonClicked()
PendingContacts *pcontacts = mConns.first()->contactManager()->contactsForIdentifiers(
QStringList() << username);
connect(pcontacts,
- SIGNAL(finished(Telepathy::PendingOperation *)),
- SLOT(onContactRetrieved(Telepathy::PendingOperation *)));
+ SIGNAL(finished(Tp::PendingOperation *)),
+ SLOT(onContactRetrieved(Tp::PendingOperation *)));
}
void RosterWidget::onAuthActionTriggered(bool checked)
@@ -303,7 +303,7 @@ void RosterWidget::onBlockActionTriggered(bool checked)
item->contact()->block(checked);
}
-void RosterWidget::onContactRetrieved(Telepathy::PendingOperation *op)
+void RosterWidget::onContactRetrieved(Tp::PendingOperation *op)
{
PendingContacts *pcontacts = qobject_cast<PendingContacts *>(op);
QList<ContactPtr> contacts = pcontacts->contacts();
diff --git a/examples/roster/roster-widget.h b/examples/roster/roster-widget.h
index 361d30b..52348f2 100644
--- a/examples/roster/roster-widget.h
+++ b/examples/roster/roster-widget.h
@@ -26,7 +26,7 @@
#include <TelepathyQt4/Contact>
#include <TelepathyQt4/Connection>
-namespace Telepathy {
+namespace Tp {
class Connection;
class PendingOperation;
}
@@ -48,35 +48,35 @@ public:
RosterWidget(QWidget *parent = 0);
virtual ~RosterWidget();
- QList<Telepathy::ConnectionPtr> connections() const { return mConns; }
- void addConnection(const Telepathy::ConnectionPtr &conn);
- void removeConnection(const Telepathy::ConnectionPtr &conn);
+ QList<Tp::ConnectionPtr> connections() const { return mConns; }
+ void addConnection(const Tp::ConnectionPtr &conn);
+ void removeConnection(const Tp::ConnectionPtr &conn);
QListWidget *listWidget() const { return mList; }
protected:
virtual RosterItem *createItemForContact(
- const Telepathy::ContactPtr &contact,
+ const Tp::ContactPtr &contact,
bool &exists);
virtual void updateActions(RosterItem *item) { }
private Q_SLOTS:
- void onConnectionReady(Telepathy::PendingOperation *);
- void onPresencePublicationRequested(const Telepathy::Contacts &);
+ void onConnectionReady(Tp::PendingOperation *);
+ void onPresencePublicationRequested(const Tp::Contacts &);
void onItemSelectionChanged();
void onAddButtonClicked();
void onAuthActionTriggered(bool);
void onDenyActionTriggered(bool);
void onRemoveActionTriggered(bool);
void onBlockActionTriggered(bool);
- void onContactRetrieved(Telepathy::PendingOperation *op);
+ void onContactRetrieved(Tp::PendingOperation *op);
void updateActions();
private:
void createActions();
void setupGui();
- QList<Telepathy::ConnectionPtr> mConns;
+ QList<Tp::ConnectionPtr> mConns;
QAction *mAuthAction;
QAction *mRemoveAction;
QAction *mDenyAction;
diff --git a/examples/roster/roster-window.cpp b/examples/roster/roster-window.cpp
index 1c0430f..7280062 100644
--- a/examples/roster/roster-window.cpp
+++ b/examples/roster/roster-window.cpp
@@ -31,7 +31,7 @@
#include <QDebug>
-using namespace Telepathy;
+using namespace Tp;
RosterWindow::RosterWindow(const QString &username, const QString &password,
QWidget *parent)
@@ -45,8 +45,8 @@ RosterWindow::RosterWindow(const QString &username, const QString &password,
mCM = ConnectionManager::create("gabble");
connect(mCM->becomeReady(),
- SIGNAL(finished(Telepathy::PendingOperation *)),
- SLOT(onCMReady(Telepathy::PendingOperation *)));
+ SIGNAL(finished(Tp::PendingOperation *)),
+ SLOT(onCMReady(Tp::PendingOperation *)));
resize(240, 320);
}
@@ -64,7 +64,7 @@ void RosterWindow::setupGui()
setCentralWidget(mRoster);
}
-void RosterWindow::onCMReady(Telepathy::PendingOperation *op)
+void RosterWindow::onCMReady(Tp::PendingOperation *op)
{
if (op->isError()) {
qWarning() << "CM cannot become ready";
@@ -77,11 +77,11 @@ void RosterWindow::onCMReady(Telepathy::PendingOperation *op)
params.insert("password", QVariant(mPassword));
PendingConnection *pconn = mCM->requestConnection("jabber", params);
connect(pconn,
- SIGNAL(finished(Telepathy::PendingOperation *)),
- SLOT(onConnectionCreated(Telepathy::PendingOperation *)));
+ SIGNAL(finished(Tp::PendingOperation *)),
+ SLOT(onConnectionCreated(Tp::PendingOperation *)));
}
-void RosterWindow::onConnectionCreated(Telepathy::PendingOperation *op)
+void RosterWindow::onConnectionCreated(Tp::PendingOperation *op)
{
if (op->isError()) {
qWarning() << "Unable to create connection";
@@ -94,14 +94,14 @@ void RosterWindow::onConnectionCreated(Telepathy::PendingOperation *op)
ConnectionPtr conn = pconn->connection();
mConns.append(conn);
connect(conn->requestConnect(),
- SIGNAL(finished(Telepathy::PendingOperation *)),
- SLOT(onConnectionConnected(Telepathy::PendingOperation *)));
+ SIGNAL(finished(Tp::PendingOperation *)),
+ SLOT(onConnectionConnected(Tp::PendingOperation *)));
connect(conn.data(),
- SIGNAL(invalidated(Telepathy::DBusProxy *, const QString &, const QString &)),
- SLOT(onConnectionInvalidated(Telepathy::DBusProxy *, const QString &, const QString &)));
+ SIGNAL(invalidated(Tp::DBusProxy *, const QString &, const QString &)),
+ SLOT(onConnectionInvalidated(Tp::DBusProxy *, const QString &, const QString &)));
}
-void RosterWindow::onConnectionConnected(Telepathy::PendingOperation *op)
+void RosterWindow::onConnectionConnected(Tp::PendingOperation *op)
{
if (op->isError()) {
qWarning() << "Connection cannot become connected";
diff --git a/examples/roster/roster-window.h b/examples/roster/roster-window.h
index 96743f2..aa844f7 100644
--- a/examples/roster/roster-window.h
+++ b/examples/roster/roster-window.h
@@ -26,7 +26,7 @@
#include <TelepathyQt4/Connection>
-namespace Telepathy {
+namespace Tp {
class ConnectionManager;
class DBusProxy;
class PendingOperation;
@@ -44,17 +44,17 @@ public:
virtual ~RosterWindow();
private Q_SLOTS:
- void onCMReady(Telepathy::PendingOperation *);
- void onConnectionCreated(Telepathy::PendingOperation *);
- void onConnectionConnected(Telepathy::PendingOperation *);
- void onConnectionInvalidated(Telepathy::DBusProxy *,
+ void onCMReady(Tp::PendingOperation *);
+ void onConnectionCreated(Tp::PendingOperation *);
+ void onConnectionConnected(Tp::PendingOperation *);
+ void onConnectionInvalidated(Tp::DBusProxy *,
const QString &, const QString &);
private:
void setupGui();
- Telepathy::ConnectionManagerPtr mCM;
- QList<Telepathy::ConnectionPtr> mConns;
+ Tp::ConnectionManagerPtr mCM;
+ QList<Tp::ConnectionPtr> mConns;
QString mUsername;
QString mPassword;
RosterWidget *mRoster;
diff --git a/tests/dbus/account-basics.cpp b/tests/dbus/account-basics.cpp
index 7d65aec..482b8c5 100644
--- a/tests/dbus/account-basics.cpp
+++ b/tests/dbus/account-basics.cpp
@@ -12,7 +12,7 @@
#include <tests/lib/test.h>
-using namespace Telepathy;
+using namespace Tp;
class TestAccountBasics : public Test
{
@@ -24,7 +24,7 @@ public:
{ }
protected Q_SLOTS:
- void onAvatarChanged(const Telepathy::Avatar &);
+ void onAvatarChanged(const Tp::Avatar &);
private Q_SLOTS:
void initTestCase();
@@ -39,7 +39,7 @@ private:
AccountManagerPtr mAM;
};
-void TestAccountBasics::onAvatarChanged(const Telepathy::Avatar &avatar)
+void TestAccountBasics::onAvatarChanged(const Tp::Avatar &avatar)
{
qDebug() << "on avatar changed";
QCOMPARE(avatar.avatarData, QByteArray("asdfg"));
@@ -63,8 +63,8 @@ void TestAccountBasics::init()
void TestAccountBasics::testBasics()
{
QVERIFY(connect(mAM->becomeReady(),
- SIGNAL(finished(Telepathy::PendingOperation *)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation *))));
+ SIGNAL(finished(Tp::PendingOperation *)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation *))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mAM->isReady(), true);
@@ -73,8 +73,8 @@ void TestAccountBasics::testBasics()
PendingAccount *pacc = mAM->createAccount("foo",
"bar", "foobar", parameters);
QVERIFY(connect(pacc,
- SIGNAL(finished(Telepathy::PendingOperation *)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation *))));
+ SIGNAL(finished(Tp::PendingOperation *)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation *))));
QCOMPARE(mLoop->exec(), 0);
QVERIFY(pacc->account());
@@ -92,33 +92,33 @@ void TestAccountBasics::testBasics()
AccountPtr acc = mAM->accountForPath(
"/org/freedesktop/Telepathy/Account/foo/bar/Account0");
QVERIFY(connect(acc->becomeReady(),
- SIGNAL(finished(Telepathy::PendingOperation *)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation *))));
+ SIGNAL(finished(Tp::PendingOperation *)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation *))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(acc->displayName(), QString("foobar (account 0)"));
QVERIFY(connect(acc->becomeReady(Account::FeatureAvatar),
- SIGNAL(finished(Telepathy::PendingOperation *)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation *))));
+ SIGNAL(finished(Tp::PendingOperation *)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation *))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(acc->isReady(Account::FeatureAvatar), true);
QCOMPARE(acc->avatar().MIMEType, QString("image/png"));
QVERIFY(connect(acc.data(),
- SIGNAL(avatarChanged(const Telepathy::Avatar &)),
- SLOT(onAvatarChanged(const Telepathy::Avatar &))));
+ SIGNAL(avatarChanged(const Tp::Avatar &)),
+ SLOT(onAvatarChanged(const Tp::Avatar &))));
- Telepathy::Avatar avatar = { QByteArray("asdfg"), "image/jpeg" };
+ Tp::Avatar avatar = { QByteArray("asdfg"), "image/jpeg" };
QVERIFY(connect(acc->setAvatar(avatar),
- SIGNAL(finished(Telepathy::PendingOperation *)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation *))));
+ SIGNAL(finished(Tp::PendingOperation *)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation *))));
QCOMPARE(mLoop->exec(), 0);
QVERIFY(connect(acc->becomeReady(Account::FeatureAvatar),
- SIGNAL(finished(Telepathy::PendingOperation *)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation *))));
+ SIGNAL(finished(Tp::PendingOperation *)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation *))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(acc->isReady(Account::FeatureAvatar), true);
@@ -128,22 +128,22 @@ void TestAccountBasics::testBasics()
pacc = mAM->createAccount("spurious",
"normal", "foobar", parameters);
QVERIFY(connect(pacc,
- SIGNAL(finished(Telepathy::PendingOperation *)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation *))));
+ SIGNAL(finished(Tp::PendingOperation *)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation *))));
QCOMPARE(mLoop->exec(), 0);
acc = mAM->accountForPath(
"/org/freedesktop/Telepathy/Account/spurious/normal/Account0");
QVERIFY(connect(acc->becomeReady(),
- SIGNAL(finished(Telepathy::PendingOperation *)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation *))));
+ SIGNAL(finished(Tp::PendingOperation *)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation *))));
QCOMPARE(mLoop->exec(), 0);
acc = mAM->accountForPath(
"/org/freedesktop/Telepathy/Account/spurious/normal/Account0");
QVERIFY(connect(acc->becomeReady(Account::FeatureProtocolInfo),
- SIGNAL(finished(Telepathy::PendingOperation *)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation *))));
+ SIGNAL(finished(Tp::PendingOperation *)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation *))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(acc->isReady(Account::FeatureProtocolInfo), true);
@@ -154,16 +154,16 @@ void TestAccountBasics::testBasics()
QCOMPARE(protocolInfo->hasParameter("register"), true);
QVERIFY(connect(acc->becomeReady(Account::FeatureAvatar),
- SIGNAL(finished(Telepathy::PendingOperation *)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation *))));
+ SIGNAL(finished(Tp::PendingOperation *)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation *))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(acc->isReady(Account::FeatureAvatar), true);
QCOMPARE(acc->avatar().MIMEType, QString("image/png"));
QVERIFY(connect(acc->becomeReady(Account::FeatureAvatar | Account::FeatureProtocolInfo),
- SIGNAL(finished(Telepathy::PendingOperation *)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation *))));
+ SIGNAL(finished(Tp::PendingOperation *)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation *))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(acc->isReady(Account::FeatureAvatar | Account::FeatureProtocolInfo), true);
diff --git a/tests/dbus/chan-basics.cpp b/tests/dbus/chan-basics.cpp
index 2f51b47..a524b26 100644
--- a/tests/dbus/chan-basics.cpp
+++ b/tests/dbus/chan-basics.cpp
@@ -18,7 +18,7 @@
#include <tests/lib/echo2/conn.h>
#include <tests/lib/test.h>
-using namespace Telepathy;
+using namespace Tp;
class TestChanBasics : public Test
{
@@ -32,9 +32,9 @@ public:
protected Q_SLOTS:
void expectConnReady(uint, uint);
void expectConnInvalidated();
- void expectPendingHandleFinished(Telepathy::PendingOperation*);
- void expectCreateChannelFinished(Telepathy::PendingOperation *);
- void expectEnsureChannelFinished(Telepathy::PendingOperation *);
+ void expectPendingHandleFinished(Tp::PendingOperation*);
+ void expectCreateChannelFinished(Tp::PendingOperation *);
+ void expectEnsureChannelFinished(Tp::PendingOperation *);
private Q_SLOTS:
void initTestCase();
@@ -205,8 +205,8 @@ void TestChanBasics::initTestCase()
Features features = Features() << Connection::FeatureSelfContact;
QVERIFY(connect(mConn->becomeReady(features),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mConn->isReady(features), true);
@@ -236,15 +236,15 @@ void TestChanBasics::testRequestHandle()
QStringList ids = QStringList() << "alice";
// Request handles for the identifiers and wait for the request to process
- PendingHandles *pending = mConn->requestHandles(Telepathy::HandleTypeContact, ids);
+ PendingHandles *pending = mConn->requestHandles(Tp::HandleTypeContact, ids);
QVERIFY(connect(pending,
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectPendingHandleFinished(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectPendingHandleFinished(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QVERIFY(disconnect(pending,
- SIGNAL(finished(Telepathy::PendingOperation*)),
+ SIGNAL(finished(Tp::PendingOperation*)),
this,
- SLOT(expectPendingHandleFinished(Telepathy::PendingOperation*))));
+ SLOT(expectPendingHandleFinished(Tp::PendingOperation*))));
QVERIFY(mHandle != 0);
}
@@ -254,18 +254,18 @@ void TestChanBasics::testCreateChannel()
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
TELEPATHY_INTERFACE_CHANNEL_TYPE_TEXT);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
- Telepathy::HandleTypeContact);
+ Tp::HandleTypeContact);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandle"),
mHandle);
QVERIFY(connect(mConn->createChannel(request),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectCreateChannelFinished(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectCreateChannelFinished(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
if (mChan) {
QVERIFY(connect(mChan->becomeReady(),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mChan->isReady(), true);
QCOMPARE(mChan->isRequested(), true);
@@ -294,18 +294,18 @@ void TestChanBasics::testEnsureChannel()
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
TELEPATHY_INTERFACE_CHANNEL_TYPE_TEXT);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
- Telepathy::HandleTypeContact);
+ Tp::HandleTypeContact);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandle"),
mHandle);
QVERIFY(connect(mConn->ensureChannel(request),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectEnsureChannelFinished(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectEnsureChannelFinished(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
if (mChan) {
QVERIFY(connect(mChan->becomeReady(),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mChan->isReady(), true);
QCOMPARE(mChan->isRequested(), true);
@@ -325,8 +325,8 @@ void TestChanBasics::testEnsureChannel()
QCOMPARE(ids, toCheck);
QVERIFY(connect(mChan->requestClose(),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mChan->isValid(), false);
@@ -344,13 +344,13 @@ void TestChanBasics::cleanupTestCase()
if (mConn) {
// Disconnect and wait for the readiness change
QVERIFY(connect(mConn->requestDisconnect(),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
if (mConn->isValid()) {
QVERIFY(connect(mConn.data(),
- SIGNAL(invalidated(Telepathy::DBusProxy *,
+ SIGNAL(invalidated(Tp::DBusProxy *,
const QString &, const QString &)),
SLOT(expectConnInvalidated())));
QCOMPARE(mLoop->exec(), 0);
diff --git a/tests/dbus/chan-group.cpp b/tests/dbus/chan-group.cpp
index 9ff942c..ebda8a1 100644
--- a/tests/dbus/chan-group.cpp
+++ b/tests/dbus/chan-group.cpp
@@ -20,7 +20,7 @@
#include <tests/lib/csh/conn.h>
#include <tests/lib/test.h>
-using namespace Telepathy;
+using namespace Tp;
class TestChanGroup : public Test
{
@@ -35,17 +35,17 @@ public:
protected Q_SLOTS:
void expectConnReady(uint, uint);
void expectConnInvalidated();
- void expectPendingRoomHandlesFinished(Telepathy::PendingOperation*);
- void expectPendingContactHandlesFinished(Telepathy::PendingOperation*);
- void expectCreateChannelFinished(Telepathy::PendingOperation *);
- void expectPendingContactsFinished(Telepathy::PendingOperation *);
+ void expectPendingRoomHandlesFinished(Tp::PendingOperation*);
+ void expectPendingContactHandlesFinished(Tp::PendingOperation*);
+ void expectCreateChannelFinished(Tp::PendingOperation *);
+ void expectPendingContactsFinished(Tp::PendingOperation *);
void onChannelGroupFlagsChanged(uint, uint, uint);
void onGroupMembersChanged(
- const Telepathy::Contacts &groupMembersAdded,
- const Telepathy::Contacts &groupLocalPendingMembersAdded,
- const Telepathy::Contacts &groupRemotePendingMembersAdded,
- const Telepathy::Contacts &groupMembersRemoved,
- const Telepathy::Channel::GroupMemberChangeDetails &details);
+ const Tp::Contacts &groupMembersAdded,
+ const Tp::Contacts &groupLocalPendingMembersAdded,
+ const Tp::Contacts &groupRemotePendingMembersAdded,
+ const Tp::Contacts &groupMembersRemoved,
+ const Tp::Channel::GroupMemberChangeDetails &details);
private Q_SLOTS:
void initTestCase();
@@ -312,8 +312,8 @@ void TestChanGroup::initTestCase()
mConn->requestConnect();
QVERIFY(connect(mConn->becomeReady(),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mConn->isReady(), true);
@@ -346,15 +346,15 @@ void TestChanGroup::testRequestHandle()
}
// Request handles for the identifiers and wait for the request to process
- PendingHandles *pending = mConn->requestHandles(Telepathy::HandleTypeRoom, ids);
+ PendingHandles *pending = mConn->requestHandles(Tp::HandleTypeRoom, ids);
QVERIFY(connect(pending,
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectPendingRoomHandlesFinished(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectPendingRoomHandlesFinished(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QVERIFY(disconnect(pending,
- SIGNAL(finished(Telepathy::PendingOperation*)),
+ SIGNAL(finished(Tp::PendingOperation*)),
this,
- SLOT(expectPendingRoomHandlesFinished(Telepathy::PendingOperation*))));
+ SLOT(expectPendingRoomHandlesFinished(Tp::PendingOperation*))));
}
void TestChanGroup::testCreateChannel()
@@ -400,19 +400,19 @@ void TestChanGroup::doTestCreateChannel()
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
TELEPATHY_INTERFACE_CHANNEL_TYPE_TEXT);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
- Telepathy::HandleTypeRoom);
+ Tp::HandleTypeRoom);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandle"),
mRoomHandles[mRoomNumber]);
QVERIFY(connect(mConn->createChannel(request),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectCreateChannelFinished(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectCreateChannelFinished(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QVERIFY(mChan);
QVERIFY(connect(mChan->becomeReady(),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mChan->isReady(), true);
@@ -436,17 +436,17 @@ void TestChanGroup::doTestCreateChannel()
QVERIFY(connect(mChan.data(),
SIGNAL(groupMembersChanged(
- const Telepathy::Contacts &,
- const Telepathy::Contacts &,
- const Telepathy::Contacts &,
- const Telepathy::Contacts &,
- const Telepathy::Channel::GroupMemberChangeDetails &)),
+ const Tp::Contacts &,
+ const Tp::Contacts &,
+ const Tp::Contacts &,
+ const Tp::Contacts &,
+ const Tp::Channel::GroupMemberChangeDetails &)),
SLOT(onGroupMembersChanged(
- const Telepathy::Contacts &,
- const Telepathy::Contacts &,
- const Telepathy::Contacts &,
- const Telepathy::Contacts &,
- const Telepathy::Channel::GroupMemberChangeDetails &))));
+ const Tp::Contacts &,
+ const Tp::Contacts &,
+ const Tp::Contacts &,
+ const Tp::Contacts &,
+ const Tp::Channel::GroupMemberChangeDetails &))));
if (mChan->groupContacts().count() != 5) {
// wait the initial contacts to be added to the group
@@ -470,15 +470,15 @@ void TestChanGroup::doTestCreateChannel()
QString("john@#room%1").arg(mRoomNumber) <<
QString("mary@#room%1").arg(mRoomNumber) <<
QString("another anonymous coward@#room%1").arg(mRoomNumber);
- QVERIFY(connect(mConn->requestHandles(Telepathy::HandleTypeContact, ids),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectPendingContactHandlesFinished(Telepathy::PendingOperation*))));
+ QVERIFY(connect(mConn->requestHandles(Tp::HandleTypeContact, ids),
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectPendingContactHandlesFinished(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
// Wait for the contacts to be built
QVERIFY(connect(mConn->contactManager()->contactsForHandles(mContactHandles),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectPendingContactsFinished(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectPendingContactsFinished(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mContacts.size(), 3);
@@ -573,13 +573,13 @@ void TestChanGroup::cleanupTestCase()
if (mConn) {
// Disconnect and wait for the readiness change
QVERIFY(connect(mConn->requestDisconnect(),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
if (mConn->isValid()) {
QVERIFY(connect(mConn.data(),
- SIGNAL(invalidated(Telepathy::DBusProxy *,
+ SIGNAL(invalidated(Tp::DBusProxy *,
const QString &, const QString &)),
SLOT(expectConnInvalidated())));
QCOMPARE(mLoop->exec(), 0);
diff --git a/tests/dbus/cm-basics.cpp b/tests/dbus/cm-basics.cpp
index 37fcefe..4e15d15 100644
--- a/tests/dbus/cm-basics.cpp
+++ b/tests/dbus/cm-basics.cpp
@@ -16,7 +16,7 @@
#include <tests/lib/simple-manager.h>
#include <tests/lib/test.h>
-using namespace Telepathy;
+using namespace Tp;
class TestCmBasics : public Test
{
@@ -38,7 +38,7 @@ private Q_SLOTS:
private:
TpBaseConnectionManager *mCMService;
- Telepathy::ConnectionManagerPtr mCM;
+ Tp::ConnectionManagerPtr mCM;
};
void TestCmBasics::initTestCase()
@@ -73,15 +73,15 @@ void TestCmBasics::init()
void TestCmBasics::testBasics()
{
QVERIFY(connect(mCM->becomeReady(),
- SIGNAL(finished(Telepathy::PendingOperation *)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation *))));
+ SIGNAL(finished(Tp::PendingOperation *)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation *))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mCM->isReady(), true);
// calling becomeReady() twice is a no-op
QVERIFY(connect(mCM->becomeReady(),
- SIGNAL(finished(Telepathy::PendingOperation *)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation *))));
+ SIGNAL(finished(Tp::PendingOperation *)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation *))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mCM->isReady(), true);
diff --git a/tests/dbus/conn-basics.cpp b/tests/dbus/conn-basics.cpp
index 3cf332b..947b82a 100644
--- a/tests/dbus/conn-basics.cpp
+++ b/tests/dbus/conn-basics.cpp
@@ -15,7 +15,7 @@
#include <tests/lib/contacts-conn.h>
#include <tests/lib/test.h>
-using namespace Telepathy;
+using namespace Tp;
class TestConnBasics : public Test
{
@@ -29,7 +29,7 @@ public:
protected Q_SLOTS:
void expectConnReady(uint, uint);
void expectConnInvalidated();
- void expectPresenceAvailable(const Telepathy::SimplePresence &);
+ void expectPresenceAvailable(const Tp::SimplePresence &);
private Q_SLOTS:
void initTestCase();
@@ -74,9 +74,9 @@ void TestConnBasics::expectConnInvalidated()
mLoop->exit(0);
}
-void TestConnBasics::expectPresenceAvailable(const Telepathy::SimplePresence &presence)
+void TestConnBasics::expectPresenceAvailable(const Tp::SimplePresence &presence)
{
- if (presence.type == Telepathy::ConnectionPresenceTypeAvailable) {
+ if (presence.type == Tp::ConnectionPresenceTypeAvailable) {
mLoop->exit(0);
return;
}
@@ -127,8 +127,8 @@ void TestConnBasics::init()
qDebug() << "waiting connection to become ready";
QVERIFY(connect(mConn->becomeReady(),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mConn->isReady(), true);
qDebug() << "connection is now ready";
@@ -151,8 +151,8 @@ void TestConnBasics::testSimplePresence()
Features features = Features() << Connection::FeatureSimplePresence;
QCOMPARE(mConn->isReady(features), false);
QVERIFY(connect(mConn->becomeReady(features),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mConn->isReady(features), true);
@@ -164,13 +164,13 @@ void TestConnBasics::cleanup()
if (mConn) {
// Disconnect and wait for the readiness change
QVERIFY(connect(mConn->requestDisconnect(),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
if (mConn->isValid()) {
QVERIFY(connect(mConn.data(),
- SIGNAL(invalidated(Telepathy::DBusProxy *,
+ SIGNAL(invalidated(Tp::DBusProxy *,
const QString &, const QString &)),
SLOT(expectConnInvalidated())));
QCOMPARE(mLoop->exec(), 0);
diff --git a/tests/dbus/conn-requests.cpp b/tests/dbus/conn-requests.cpp
index f307d09..11ab493 100644
--- a/tests/dbus/conn-requests.cpp
+++ b/tests/dbus/conn-requests.cpp
@@ -18,7 +18,7 @@
#include <tests/lib/echo2/conn.h>
#include <tests/lib/test.h>
-using namespace Telepathy;
+using namespace Tp;
class TestConnRequests : public Test
{
@@ -31,9 +31,9 @@ public:
protected Q_SLOTS:
void expectConnInvalidated();
- void expectPendingHandleFinished(Telepathy::PendingOperation*);
- void expectCreateChannelFinished(Telepathy::PendingOperation *);
- void expectEnsureChannelFinished(Telepathy::PendingOperation *);
+ void expectPendingHandleFinished(Tp::PendingOperation*);
+ void expectCreateChannelFinished(Tp::PendingOperation *);
+ void expectEnsureChannelFinished(Tp::PendingOperation *);
private Q_SLOTS:
void initTestCase();
@@ -177,8 +177,8 @@ void TestConnRequests::initTestCase()
QCOMPARE(mConn->isReady(), false);
QVERIFY(connect(mConn->requestConnect(),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mConn->isReady(), true);
@@ -198,15 +198,15 @@ void TestConnRequests::testRequestHandle()
QStringList ids = QStringList() << "alice";
// Request handles for the identifiers and wait for the request to process
- PendingHandles *pending = mConn->requestHandles(Telepathy::HandleTypeContact, ids);
+ PendingHandles *pending = mConn->requestHandles(Tp::HandleTypeContact, ids);
QVERIFY(connect(pending,
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectPendingHandleFinished(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectPendingHandleFinished(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QVERIFY(disconnect(pending,
- SIGNAL(finished(Telepathy::PendingOperation*)),
+ SIGNAL(finished(Tp::PendingOperation*)),
this,
- SLOT(expectPendingHandleFinished(Telepathy::PendingOperation*))));
+ SLOT(expectPendingHandleFinished(Tp::PendingOperation*))));
QVERIFY(mHandle != 0);
}
@@ -216,12 +216,12 @@ void TestConnRequests::testCreateChannel()
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
TELEPATHY_INTERFACE_CHANNEL_TYPE_TEXT);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
- Telepathy::HandleTypeContact);
+ Tp::HandleTypeContact);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandle"),
mHandle);
QVERIFY(connect(mConn->createChannel(request),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectCreateChannelFinished(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectCreateChannelFinished(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
}
@@ -231,12 +231,12 @@ void TestConnRequests::testEnsureChannel()
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
TELEPATHY_INTERFACE_CHANNEL_TYPE_TEXT);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
- Telepathy::HandleTypeContact);
+ Tp::HandleTypeContact);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandle"),
mHandle);
QVERIFY(connect(mConn->ensureChannel(request),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectEnsureChannelFinished(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectEnsureChannelFinished(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
}
@@ -250,13 +250,13 @@ void TestConnRequests::cleanupTestCase()
if (mConn) {
// Disconnect and wait for the readiness change
QVERIFY(connect(mConn->requestDisconnect(),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
if (mConn->isValid()) {
QVERIFY(connect(mConn.data(),
- SIGNAL(invalidated(Telepathy::DBusProxy *,
+ SIGNAL(invalidated(Tp::DBusProxy *,
const QString &, const QString &)),
SLOT(expectConnInvalidated())));
QCOMPARE(mLoop->exec(), 0);
diff --git a/tests/dbus/conn-roster.cpp b/tests/dbus/conn-roster.cpp
index f2a37bd..e541aef 100644
--- a/tests/dbus/conn-roster.cpp
+++ b/tests/dbus/conn-roster.cpp
@@ -18,7 +18,7 @@
#include <tests/lib/contactlist/conn.h>
#include <tests/lib/test.h>
-using namespace Telepathy;
+using namespace Tp;
class TestConnRoster : public Test
{
@@ -31,8 +31,8 @@ public:
protected Q_SLOTS:
void expectConnInvalidated();
- void expectPendingContactsFinished(Telepathy::PendingOperation *);
- void expectPresenceStateChanged(Telepathy::Contact::PresenceState);
+ void expectPendingContactsFinished(Tp::PendingOperation *);
+ void expectPresenceStateChanged(Tp::Contact::PresenceState);
private Q_SLOTS:
void initTestCase();
@@ -128,8 +128,8 @@ void TestConnRoster::init()
mConn = Connection::create(mConnName, mConnPath);
QVERIFY(connect(mConn->requestConnect(),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mConn->isReady(), true);
QCOMPARE(mConn->status(), static_cast<uint>(Connection::StatusConnected));
@@ -139,9 +139,9 @@ void TestConnRoster::testRoster()
{
Features features = Features() << Connection::FeatureRoster;
QVERIFY(connect(mConn->becomeReady(features),
- SIGNAL(finished(Telepathy::PendingOperation*)),
+ SIGNAL(finished(Tp::PendingOperation*)),
this,
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mConn->isReady(features), true);
@@ -178,18 +178,18 @@ void TestConnRoster::testRoster()
// Wait for the contacts to be built
ids = QStringList() << QString("john at example.com") << QString("mary at example.com");
QVERIFY(connect(mConn->contactManager()->contactsForIdentifiers(ids),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectPendingContactsFinished(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectPendingContactsFinished(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
int i = 0;
foreach (const ContactPtr &contact, mContacts) {
QVERIFY(connect(contact.data(),
- SIGNAL(subscriptionStateChanged(Telepathy::Contact::PresenceState)),
- SLOT(expectPresenceStateChanged(Telepathy::Contact::PresenceState))));
+ SIGNAL(subscriptionStateChanged(Tp::Contact::PresenceState)),
+ SLOT(expectPresenceStateChanged(Tp::Contact::PresenceState))));
QVERIFY(connect(contact.data(),
- SIGNAL(publishStateChanged(Telepathy::Contact::PresenceState)),
- SLOT(expectPresenceStateChanged(Telepathy::Contact::PresenceState))));
+ SIGNAL(publishStateChanged(Tp::Contact::PresenceState)),
+ SLOT(expectPresenceStateChanged(Tp::Contact::PresenceState))));
if ((i % 2) == 0) {
contact->requestPresenceSubscription("please add me");
} else {
@@ -234,8 +234,8 @@ void TestConnRoster::testRoster()
Contact::PresenceState expectedPresenceState;
foreach (const ContactPtr &contact, pendingPublish) {
QVERIFY(connect(contact.data(),
- SIGNAL(publishStateChanged(Telepathy::Contact::PresenceState)),
- SLOT(expectPresenceStateChanged(Telepathy::Contact::PresenceState))));
+ SIGNAL(publishStateChanged(Tp::Contact::PresenceState)),
+ SLOT(expectPresenceStateChanged(Tp::Contact::PresenceState))));
if ((i % 2) == 0) {
expectedPresenceState = Contact::PresenceStateYes;
@@ -258,13 +258,13 @@ void TestConnRoster::cleanup()
if (mConn) {
// Disconnect and wait for the readiness change
QVERIFY(connect(mConn->requestDisconnect(),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
if (mConn->isValid()) {
QVERIFY(connect(mConn.data(),
- SIGNAL(invalidated(Telepathy::DBusProxy *,
+ SIGNAL(invalidated(Tp::DBusProxy *,
const QString &, const QString &)),
SLOT(expectConnInvalidated())));
QCOMPARE(mLoop->exec(), 0);
diff --git a/tests/dbus/contacts.cpp b/tests/dbus/contacts.cpp
index 8651f3c..d2d9c57 100644
--- a/tests/dbus/contacts.cpp
+++ b/tests/dbus/contacts.cpp
@@ -21,7 +21,7 @@
#include <tests/lib/simple-conn.h>
#include <tests/lib/test.h>
-using namespace Telepathy;
+using namespace Tp;
class TestContacts : public Test
{
@@ -36,7 +36,7 @@ public:
protected Q_SLOTS:
void expectConnReady(uint newStatus, uint newStatusReason);
void expectConnInvalidated();
- void expectPendingContactsFinished(Telepathy::PendingOperation *);
+ void expectPendingContactsFinished(Tp::PendingOperation *);
private Q_SLOTS:
void initTestCase();
@@ -59,7 +59,7 @@ private:
ContactsConnection *mConnService;
ConnectionPtr mConn;
QList<ContactPtr> mContacts;
- Telepathy::UIntList mInvalidHandles;
+ Tp::UIntList mInvalidHandles;
};
void TestContacts::expectConnReady(uint newStatus, uint newStatusReason)
@@ -160,8 +160,8 @@ void TestContacts::initTestCase()
Features features = Features() << Connection::FeatureSelfContact;
QVERIFY(connect(mConn->becomeReady(features),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mConn->isReady(features), true);
@@ -217,14 +217,14 @@ void TestContacts::testSelfContact()
QVERIFY(!selfContact->isAvatarTokenKnown());
QCOMPARE(selfContact->presenceStatus(), QString("available"));
- QCOMPARE(selfContact->presenceType(), uint(Telepathy::ConnectionPresenceTypeAvailable));
+ QCOMPARE(selfContact->presenceType(), uint(Tp::ConnectionPresenceTypeAvailable));
QCOMPARE(selfContact->presenceMessage(), QString(""));
}
void TestContacts::testForHandles()
{
- Telepathy::UIntList handles;
+ Tp::UIntList handles;
TpHandleRepoIface *serviceRepo =
tp_base_connection_get_handles(TP_BASE_CONNECTION(mConnService), TP_HANDLE_TYPE_CONTACT);
@@ -258,8 +258,8 @@ void TestContacts::testForHandles()
// Wait for the contacts to be built
QVERIFY(connect(pending,
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectPendingContactsFinished(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectPendingContactsFinished(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
// There should be 3 resulting contacts and 2 handles found to be invalid
@@ -293,8 +293,8 @@ void TestContacts::testForHandles()
pending = mConn->contactManager()->contactsForHandles(handles);
QVERIFY(connect(pending,
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectPendingContactsFinished(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectPendingContactsFinished(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
// Check that we got the correct number of contacts back
@@ -339,8 +339,8 @@ void TestContacts::testForIdentifiers()
// Check that a request with just the invalid IDs fails
PendingContacts *fails = mConn->contactManager()->contactsForIdentifiers(invalidIDs);
QVERIFY(connect(fails,
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
toCheck = fails->invalidIdentifiers().keys();
toCheck.sort();
@@ -350,8 +350,8 @@ void TestContacts::testForIdentifiers()
// A request with both valid and invalid IDs should succeed
fails = mConn->contactManager()->contactsForIdentifiers(invalidIDs + validIDs + invalidIDs);
QVERIFY(connect(fails,
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(fails->validIdentifiers(), validIDs);
toCheck = fails->invalidIdentifiers().keys();
@@ -374,8 +374,8 @@ void TestContacts::testForIdentifiers()
// Finish it
QVERIFY(connect(pending,
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectPendingContactsFinished(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectPendingContactsFinished(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
// Check that there are 3 contacts consistent with the request
@@ -395,7 +395,7 @@ void TestContacts::testForIdentifiers()
// Make the contacts go out of scope, starting releasing their handles, and finish that (but
// save their handles first)
- Telepathy::UIntList saveHandles = Telepathy::UIntList() << mContacts[0]->handle()[0]
+ Tp::UIntList saveHandles = Tp::UIntList() << mContacts[0]->handle()[0]
<< mContacts[1]->handle()[0]
<< mContacts[2]->handle()[0];
mContacts.clear();
@@ -454,7 +454,7 @@ void TestContacts::testFeatures()
tp_base_connection_get_handles(TP_BASE_CONNECTION(mConnService), TP_HANDLE_TYPE_CONTACT);
// Get test handles
- Telepathy::UIntList handles;
+ Tp::UIntList handles;
for (int i = 0; i < 3; i++) {
handles.push_back(tp_handle_ensure(serviceRepo, ids[i].toLatin1().constData(), NULL, NULL));
QVERIFY(handles[i] != 0);
@@ -471,8 +471,8 @@ void TestContacts::testFeatures()
// Build contacts
PendingContacts *pending = mConn->contactManager()->contactsForHandles(handles, features);
QVERIFY(connect(pending,
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectPendingContactsFinished(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectPendingContactsFinished(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
// Check the contact contents
@@ -505,9 +505,9 @@ void TestContacts::testFeatures()
QCOMPARE(mContacts[1]->presenceStatus(), QString("busy"));
QCOMPARE(mContacts[2]->presenceStatus(), QString("away"));
- QCOMPARE(mContacts[0]->presenceType(), uint(Telepathy::ConnectionPresenceTypeAvailable));
- QCOMPARE(mContacts[1]->presenceType(), uint(Telepathy::ConnectionPresenceTypeBusy));
- QCOMPARE(mContacts[2]->presenceType(), uint(Telepathy::ConnectionPresenceTypeAway));
+ QCOMPARE(mContacts[0]->presenceType(), uint(Tp::ConnectionPresenceTypeAvailable));
+ QCOMPARE(mContacts[1]->presenceType(), uint(Tp::ConnectionPresenceTypeBusy));
+ QCOMPARE(mContacts[2]->presenceType(), uint(Tp::ConnectionPresenceTypeAway));
// Change some of the contacts to a new set of attributes
contacts_connection_change_aliases(mConnService, 2, handles.toVector().constData(),
@@ -545,9 +545,9 @@ void TestContacts::testFeatures()
QCOMPARE(mContacts[1]->presenceStatus(), QString("available"));
QCOMPARE(mContacts[2]->presenceStatus(), QString("away"));
- QCOMPARE(mContacts[0]->presenceType(), uint(Telepathy::ConnectionPresenceTypeAway));
- QCOMPARE(mContacts[1]->presenceType(), uint(Telepathy::ConnectionPresenceTypeAvailable));
- QCOMPARE(mContacts[2]->presenceType(), uint(Telepathy::ConnectionPresenceTypeAway));
+ QCOMPARE(mContacts[0]->presenceType(), uint(Tp::ConnectionPresenceTypeAway));
+ QCOMPARE(mContacts[1]->presenceType(), uint(Tp::ConnectionPresenceTypeAvailable));
+ QCOMPARE(mContacts[2]->presenceType(), uint(Tp::ConnectionPresenceTypeAway));
QCOMPARE(mContacts[0]->presenceMessage(), QString(latterMessages[0]));
QCOMPARE(mContacts[1]->presenceMessage(), QString(latterMessages[1]));
@@ -573,7 +573,7 @@ void TestContacts::testFeaturesNotRequested()
QStringList ids = QStringList() << "alice" << "bob" << "chris";
TpHandleRepoIface *serviceRepo =
tp_base_connection_get_handles(TP_BASE_CONNECTION(mConnService), TP_HANDLE_TYPE_CONTACT);
- Telepathy::UIntList handles;
+ Tp::UIntList handles;
for (int i = 0; i < 3; i++) {
handles.push_back(tp_handle_ensure(serviceRepo, ids[i].toLatin1().constData(), NULL, NULL));
QVERIFY(handles[i] != 0);
@@ -582,8 +582,8 @@ void TestContacts::testFeaturesNotRequested()
// Build contacts (note: no features)
PendingContacts *pending = mConn->contactManager()->contactsForHandles(handles);
QVERIFY(connect(pending,
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectPendingContactsFinished(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectPendingContactsFinished(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
// Check that the feature accessors return sensible fallback values (note: the warnings are
@@ -601,7 +601,7 @@ void TestContacts::testFeaturesNotRequested()
QCOMPARE(contact->avatarToken(), QString(""));
QCOMPARE(contact->presenceStatus(), QString("unknown"));
- QCOMPARE(contact->presenceType(), uint(Telepathy::ConnectionPresenceTypeUnknown));
+ QCOMPARE(contact->presenceType(), uint(Tp::ConnectionPresenceTypeUnknown));
QCOMPARE(contact->presenceMessage(), QString(""));
}
@@ -644,7 +644,7 @@ void TestContacts::testUpgrade()
TpHandleRepoIface *serviceRepo =
tp_base_connection_get_handles(TP_BASE_CONNECTION(mConnService), TP_HANDLE_TYPE_CONTACT);
- Telepathy::UIntList handles;
+ Tp::UIntList handles;
for (int i = 0; i < 3; i++) {
handles.push_back(tp_handle_ensure(serviceRepo, ids[i].toLatin1().constData(), NULL, NULL));
QVERIFY(handles[i] != 0);
@@ -659,8 +659,8 @@ void TestContacts::testUpgrade()
// Wait for the contacts to be built
QVERIFY(connect(pending,
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectPendingContactsFinished(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectPendingContactsFinished(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
// There should be 3 resulting contacts - save them for future reference
@@ -686,8 +686,8 @@ void TestContacts::testUpgrade()
// Wait for the contacts to be built
QVERIFY(connect(pending,
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectPendingContactsFinished(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectPendingContactsFinished(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
// Check that we got the correct contacts back
@@ -715,9 +715,9 @@ void TestContacts::testUpgrade()
QCOMPARE(mContacts[1]->presenceStatus(), QString("busy"));
QCOMPARE(mContacts[2]->presenceStatus(), QString("away"));
- QCOMPARE(mContacts[0]->presenceType(), uint(Telepathy::ConnectionPresenceTypeAvailable));
- QCOMPARE(mContacts[1]->presenceType(), uint(Telepathy::ConnectionPresenceTypeBusy));
- QCOMPARE(mContacts[2]->presenceType(), uint(Telepathy::ConnectionPresenceTypeAway));
+ QCOMPARE(mContacts[0]->presenceType(), uint(Tp::ConnectionPresenceTypeAvailable));
+ QCOMPARE(mContacts[1]->presenceType(), uint(Tp::ConnectionPresenceTypeBusy));
+ QCOMPARE(mContacts[2]->presenceType(), uint(Tp::ConnectionPresenceTypeAway));
// Make the contacts go out of scope, starting releasing their handles, and finish that
saveContacts.clear();
@@ -764,8 +764,8 @@ void TestContacts::testSelfContactFallback()
Features features = Features() << Connection::FeatureSelfContact;
QVERIFY(connect(conn->becomeReady(features),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(conn->isReady(features), true);
@@ -797,13 +797,13 @@ void TestContacts::cleanupTestCase()
if (mConn) {
// Disconnect and wait for the readiness change
QVERIFY(connect(mConn->requestDisconnect(),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
if (mConn->isValid()) {
QVERIFY(connect(mConn.data(),
- SIGNAL(invalidated(Telepathy::DBusProxy *, QString, QString)),
+ SIGNAL(invalidated(Tp::DBusProxy *, QString, QString)),
SLOT(expectConnInvalidated())));
QCOMPARE(mLoop->exec(), 0);
}
diff --git a/tests/dbus/handles.cpp b/tests/dbus/handles.cpp
index 54f1530..83575be 100644
--- a/tests/dbus/handles.cpp
+++ b/tests/dbus/handles.cpp
@@ -17,7 +17,7 @@
#include <tests/lib/simple-conn.h>
#include <tests/lib/test.h>
-using namespace Telepathy;
+using namespace Tp;
class TestHandles : public Test
{
@@ -31,7 +31,7 @@ public:
protected Q_SLOTS:
void expectConnReady(uint newStatus, uint newStatusReason);
void expectConnInvalidated();
- void expectPendingHandlesFinished(Telepathy::PendingOperation*);
+ void expectPendingHandlesFinished(Tp::PendingOperation*);
private Q_SLOTS:
void initTestCase();
@@ -141,8 +141,8 @@ void TestHandles::initTestCase()
mConn->requestConnect();
QVERIFY(connect(mConn->becomeReady(),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mConn->isReady(), true);
@@ -170,15 +170,15 @@ void TestHandles::testRequestAndRelease()
QStringList ids = QStringList() << "alice" << "bob" << "chris";
// Request handles for the identifiers and wait for the request to process
- PendingHandles *pending = mConn->requestHandles(Telepathy::HandleTypeContact, ids);
+ PendingHandles *pending = mConn->requestHandles(Tp::HandleTypeContact, ids);
QVERIFY(connect(pending,
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectPendingHandlesFinished(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectPendingHandlesFinished(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QVERIFY(disconnect(pending,
- SIGNAL(finished(Telepathy::PendingOperation*)),
+ SIGNAL(finished(Tp::PendingOperation*)),
this,
- SLOT(expectPendingHandlesFinished(Telepathy::PendingOperation*))));
+ SLOT(expectPendingHandlesFinished(Tp::PendingOperation*))));
ReferencedHandles handles = mHandles;
mHandles = ReferencedHandles();
@@ -194,7 +194,7 @@ void TestHandles::testRequestAndRelease()
}
// Save the handles to a non-referenced normal container
- Telepathy::UIntList saveHandles = handles.toList();
+ Tp::UIntList saveHandles = handles.toList();
// Start releasing the handles, RAII style, and complete the asynchronous process doing that
handles = ReferencedHandles();
@@ -218,13 +218,13 @@ void TestHandles::cleanupTestCase()
if (mConn) {
// Disconnect and wait for the readiness change
QVERIFY(connect(mConn->requestDisconnect(),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
if (mConn->isValid()) {
QVERIFY(connect(mConn.data(),
- SIGNAL(invalidated(Telepathy::DBusProxy *, const QString &, const QString &)),
+ SIGNAL(invalidated(Tp::DBusProxy *, const QString &, const QString &)),
SLOT(expectConnInvalidated())));
QCOMPARE(mLoop->exec(), 0);
}
diff --git a/tests/dbus/stateful-proxy.cpp b/tests/dbus/stateful-proxy.cpp
index 820f0f3..ffeeb84 100644
--- a/tests/dbus/stateful-proxy.cpp
+++ b/tests/dbus/stateful-proxy.cpp
@@ -30,9 +30,9 @@
#include "tests/lib/test.h"
-using namespace Telepathy;
-using namespace Telepathy;
-using Telepathy::Client::DBus::IntrospectableInterface;
+using namespace Tp;
+using namespace Tp;
+using Tp::Client::DBus::IntrospectableInterface;
// expose protected functions for testing
class MyStatefulDBusProxy : public StatefulDBusProxy
@@ -79,7 +79,7 @@ private Q_SLOTS:
protected Q_SLOTS:
// these would be public, but then QtTest would think they were tests
- void expectInvalidated(Telepathy::DBusProxy *,
+ void expectInvalidated(Tp::DBusProxy *,
const QString &, const QString &);
// anything other than 0 or 1 is OK
@@ -183,10 +183,10 @@ void TestStatefulProxy::testBasics()
}
QVERIFY(connect(mProxy, SIGNAL(invalidated(
- Telepathy::DBusProxy *,
+ Tp::DBusProxy *,
const QString &, const QString &)),
this, SLOT(expectInvalidated(
- Telepathy::DBusProxy *,
+ Tp::DBusProxy *,
const QString &, const QString &))));
mProxy->invalidate("com.example.DomainSpecificError",
"Because I said so");
@@ -212,10 +212,10 @@ void TestStatefulProxy::testBasics()
// the signal doesn't arrive instantly
QCOMPARE(mLoop->exec(), EXPECT_INVALIDATED_SUCCESS);
QVERIFY(disconnect(mProxy, SIGNAL(invalidated(
- Telepathy::DBusProxy *,
+ Tp::DBusProxy *,
const QString &, const QString &)),
this, SLOT(expectInvalidated(
- Telepathy::DBusProxy *,
+ Tp::DBusProxy *,
const QString &, const QString &))));
QCOMPARE(mInvalidated, 1);
@@ -274,18 +274,18 @@ void TestStatefulProxy::testNameOwnerChanged()
QCOMPARE(mProxy->invalidationMessage(), QString());
QVERIFY(connect(mProxy, SIGNAL(invalidated(
- Telepathy::DBusProxy *,
+ Tp::DBusProxy *,
const QString &, const QString &)),
this, SLOT(expectInvalidated(
- Telepathy::DBusProxy *,
+ Tp::DBusProxy *,
const QString &, const QString &))));
QDBusConnection::disconnectFromBus("another unique name");
QCOMPARE(mLoop->exec(), EXPECT_INVALIDATED_SUCCESS);
QVERIFY(disconnect(mProxy, SIGNAL(invalidated(
- Telepathy::DBusProxy *,
+ Tp::DBusProxy *,
const QString &, const QString &)),
this, SLOT(expectInvalidated(
- Telepathy::DBusProxy *,
+ Tp::DBusProxy *,
const QString &, const QString &))));
QCOMPARE(mInvalidated, 1);
diff --git a/tests/dbus/streamed-media-chan.cpp b/tests/dbus/streamed-media-chan.cpp
index f38d22e..4890a9a 100644
--- a/tests/dbus/streamed-media-chan.cpp
+++ b/tests/dbus/streamed-media-chan.cpp
@@ -14,7 +14,7 @@
#include <tests/lib/callable/conn.h>
#include <tests/lib/test.h>
-using namespace Telepathy;
+using namespace Tp;
class TestStreamedMediaChan : public Test
{
@@ -26,24 +26,24 @@ public:
{ }
protected Q_SLOTS:
- void expectRequestContactsFinished(Telepathy::PendingOperation *);
- void expectCreateChannelFinished(Telepathy::PendingOperation *);
- void expectRequestStreamsFinished(Telepathy::PendingOperation *);
+ void expectRequestContactsFinished(Tp::PendingOperation *);
+ void expectCreateChannelFinished(Tp::PendingOperation *);
+ void expectRequestStreamsFinished(Tp::PendingOperation *);
void onGroupMembersChanged(
- const Telepathy::Contacts &,
- const Telepathy::Contacts &,
- const Telepathy::Contacts &,
- const Telepathy::Contacts &,
- const Telepathy::Channel::GroupMemberChangeDetails &);
- void onStreamRemoved(const Telepathy::MediaStreamPtr &);
- void onStreamDirectionChanged(const Telepathy::MediaStreamPtr &,
- Telepathy::MediaStreamDirection,
- Telepathy::MediaStreamPendingSend);
- void onStreamStateChanged(const Telepathy::MediaStreamPtr &,
- Telepathy::MediaStreamState);
- void onChanInvalidated(Telepathy::DBusProxy *,
+ const Tp::Contacts &,
+ const Tp::Contacts &,
+ const Tp::Contacts &,
+ const Tp::Contacts &,
+ const Tp::Channel::GroupMemberChangeDetails &);
+ void onStreamRemoved(const Tp::MediaStreamPtr &);
+ void onStreamDirectionChanged(const Tp::MediaStreamPtr &,
+ Tp::MediaStreamDirection,
+ Tp::MediaStreamPendingSend);
+ void onStreamStateChanged(const Tp::MediaStreamPtr &,
+ Tp::MediaStreamState);
+ void onChanInvalidated(Tp::DBusProxy *,
const QString &, const QString &);
- void onNewChannels(const Telepathy::ChannelDetailsList &);
+ void onNewChannels(const Tp::ChannelDetailsList &);
private Q_SLOTS:
void initTestCase();
@@ -74,10 +74,10 @@ private:
Channel::GroupMemberChangeDetails mDetails;
MediaStreamPtr mStreamRemovedReturn;
MediaStreamPtr mSDCStreamReturn;
- Telepathy::MediaStreamDirection mSDCDirectionReturn;
- Telepathy::MediaStreamPendingSend mSDCPendingReturn;
+ Tp::MediaStreamDirection mSDCDirectionReturn;
+ Tp::MediaStreamPendingSend mSDCPendingReturn;
MediaStreamPtr mSSCStreamReturn;
- Telepathy::MediaStreamState mSSCStateReturn;
+ Tp::MediaStreamState mSSCStateReturn;
};
void TestStreamedMediaChan::expectRequestContactsFinished(PendingOperation *op)
@@ -181,8 +181,8 @@ void TestStreamedMediaChan::onStreamRemoved(const MediaStreamPtr &stream)
}
void TestStreamedMediaChan::onStreamDirectionChanged(const MediaStreamPtr &stream,
- Telepathy::MediaStreamDirection direction,
- Telepathy::MediaStreamPendingSend pendingSend)
+ Tp::MediaStreamDirection direction,
+ Tp::MediaStreamPendingSend pendingSend)
{
qDebug() << "stream" << stream.data() << "direction changed to" << direction;
mSDCStreamReturn = stream;
@@ -192,7 +192,7 @@ void TestStreamedMediaChan::onStreamDirectionChanged(const MediaStreamPtr &strea
}
void TestStreamedMediaChan::onStreamStateChanged(const MediaStreamPtr &stream,
- Telepathy::MediaStreamState state)
+ Tp::MediaStreamState state)
{
qDebug() << "stream" << stream.data() << "state changed to" << state;
mSSCStreamReturn = stream;
@@ -200,17 +200,17 @@ void TestStreamedMediaChan::onStreamStateChanged(const MediaStreamPtr &stream,
mLoop->exit(0);
}
-void TestStreamedMediaChan::onChanInvalidated(Telepathy::DBusProxy *proxy,
+void TestStreamedMediaChan::onChanInvalidated(Tp::DBusProxy *proxy,
const QString &errorName, const QString &errorMessage)
{
qDebug() << "chan invalidated:" << errorName << "-" << errorMessage;
mLoop->exit(0);
}
-void TestStreamedMediaChan::onNewChannels(const Telepathy::ChannelDetailsList &channels)
+void TestStreamedMediaChan::onNewChannels(const Tp::ChannelDetailsList &channels)
{
qDebug() << "new channels";
- foreach (const Telepathy::ChannelDetails &details, channels) {
+ foreach (const Tp::ChannelDetails &details, channels) {
QString channelType = details.properties.value(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType")).toString();
bool requested = details.properties.value(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".Requested")).toBool();
qDebug() << " channelType:" << channelType;
@@ -262,8 +262,8 @@ void TestStreamedMediaChan::initTestCase()
QCOMPARE(mConn->isReady(), false);
QVERIFY(connect(mConn->requestConnect(Connection::FeatureSelfContact),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mConn->isReady(), true);
QCOMPARE(static_cast<uint>(mConn->status()),
@@ -282,17 +282,17 @@ void TestStreamedMediaChan::init()
mChangedRemoved.clear();
mStreamRemovedReturn.reset();
mSDCStreamReturn.reset();
- mSDCDirectionReturn = (Telepathy::MediaStreamDirection) -1;
- mSDCPendingReturn = (Telepathy::MediaStreamPendingSend) -1;
- mSSCStateReturn = (Telepathy::MediaStreamState) -1;
+ mSDCDirectionReturn = (Tp::MediaStreamDirection) -1;
+ mSDCPendingReturn = (Tp::MediaStreamPendingSend) -1;
+ mSSCStateReturn = (Tp::MediaStreamState) -1;
mSSCStreamReturn.reset();
}
void TestStreamedMediaChan::testOutgoingCall()
{
QVERIFY(connect(mConn->contactManager()->contactsForIdentifiers(QStringList() << "alice"),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectRequestContactsFinished(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectRequestContactsFinished(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QVERIFY(mRequestContactsReturn.size() == 1);
ContactPtr otherContact = mRequestContactsReturn.first();
@@ -302,18 +302,18 @@ void TestStreamedMediaChan::testOutgoingCall()
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
TELEPATHY_INTERFACE_CHANNEL_TYPE_STREAMED_MEDIA);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
- Telepathy::HandleTypeContact);
+ Tp::HandleTypeContact);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandle"),
otherContact->handle()[0]);
QVERIFY(connect(mConn->createChannel(request),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectCreateChannelFinished(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectCreateChannelFinished(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QVERIFY(mChan);
QVERIFY(connect(mChan->becomeReady(StreamedMediaChannel::FeatureStreams),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QVERIFY(mChan->isReady(StreamedMediaChannel::FeatureStreams));
@@ -326,38 +326,38 @@ void TestStreamedMediaChan::testOutgoingCall()
QVERIFY(connect(mChan.data(),
SIGNAL(groupMembersChanged(
- const Telepathy::Contacts &,
- const Telepathy::Contacts &,
- const Telepathy::Contacts &,
- const Telepathy::Contacts &,
- const Telepathy::Channel::GroupMemberChangeDetails &)),
+ const Tp::Contacts &,
+ const Tp::Contacts &,
+ const Tp::Contacts &,
+ const Tp::Contacts &,
+ const Tp::Channel::GroupMemberChangeDetails &)),
SLOT(onGroupMembersChanged(
- const Telepathy::Contacts &,
- const Telepathy::Contacts &,
- const Telepathy::Contacts &,
- const Telepathy::Contacts &,
- const Telepathy::Channel::GroupMemberChangeDetails &))));
+ const Tp::Contacts &,
+ const Tp::Contacts &,
+ const Tp::Contacts &,
+ const Tp::Contacts &,
+ const Tp::Channel::GroupMemberChangeDetails &))));
// RequestStreams with bad type must fail
- QVERIFY(connect(mChan->requestStream(otherContact, (Telepathy::MediaStreamType) -1),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectRequestStreamsFinished(Telepathy::PendingOperation*))));
+ QVERIFY(connect(mChan->requestStream(otherContact, (Tp::MediaStreamType) -1),
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectRequestStreamsFinished(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 2);
QCOMPARE(mRequestStreamsReturn.size(), 0);
// Request audio stream
QVERIFY(connect(mChan->requestStreams(otherContact,
- QList<Telepathy::MediaStreamType>() << Telepathy::MediaStreamTypeAudio),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectRequestStreamsFinished(Telepathy::PendingOperation*))));
+ QList<Tp::MediaStreamType>() << Tp::MediaStreamTypeAudio),
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectRequestStreamsFinished(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mRequestStreamsReturn.size(), 1);
MediaStreamPtr stream = mRequestStreamsReturn.first();
QCOMPARE(stream->contact(), otherContact);
- QCOMPARE(stream->type(), Telepathy::MediaStreamTypeAudio);
- QCOMPARE(stream->state(), Telepathy::MediaStreamStateDisconnected);
- QCOMPARE(stream->direction(), Telepathy::MediaStreamDirectionSend);
- QCOMPARE(stream->pendingSend(), Telepathy::MediaStreamPendingRemoteSend);
+ QCOMPARE(stream->type(), Tp::MediaStreamTypeAudio);
+ QCOMPARE(stream->state(), Tp::MediaStreamStateDisconnected);
+ QCOMPARE(stream->direction(), Tp::MediaStreamDirectionSend);
+ QCOMPARE(stream->pendingSend(), Tp::MediaStreamPendingRemoteSend);
QCOMPARE(mChan->streams().size(), 1);
QVERIFY(mChan->streams().contains(stream));
@@ -378,34 +378,34 @@ void TestStreamedMediaChan::testOutgoingCall()
QVERIFY(mChan->groupContacts().contains(otherContact));
// Request video stream
- QVERIFY(connect(mChan->requestStream(otherContact, Telepathy::MediaStreamTypeVideo),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectRequestStreamsFinished(Telepathy::PendingOperation*))));
+ QVERIFY(connect(mChan->requestStream(otherContact, Tp::MediaStreamTypeVideo),
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectRequestStreamsFinished(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mRequestStreamsReturn.size(), 1);
stream = mRequestStreamsReturn.first();
QCOMPARE(stream->contact(), otherContact);
- QCOMPARE(stream->type(), Telepathy::MediaStreamTypeVideo);
- QCOMPARE(stream->state(), Telepathy::MediaStreamStateDisconnected);
- QCOMPARE(stream->direction(), Telepathy::MediaStreamDirectionSend);
- QCOMPARE(stream->pendingSend(), Telepathy::MediaStreamPendingRemoteSend);
+ QCOMPARE(stream->type(), Tp::MediaStreamTypeVideo);
+ QCOMPARE(stream->state(), Tp::MediaStreamStateDisconnected);
+ QCOMPARE(stream->direction(), Tp::MediaStreamDirectionSend);
+ QCOMPARE(stream->pendingSend(), Tp::MediaStreamPendingRemoteSend);
QCOMPARE(mChan->streams().size(), 2);
QVERIFY(mChan->streams().contains(stream));
- QCOMPARE(mChan->streamsForType(Telepathy::MediaStreamTypeAudio).size(), 1);
- QCOMPARE(mChan->streamsForType(Telepathy::MediaStreamTypeVideo).size(), 1);
+ QCOMPARE(mChan->streamsForType(Tp::MediaStreamTypeAudio).size(), 1);
+ QCOMPARE(mChan->streamsForType(Tp::MediaStreamTypeVideo).size(), 1);
// test stream removal
- stream = mChan->streamsForType(Telepathy::MediaStreamTypeAudio).first();
+ stream = mChan->streamsForType(Tp::MediaStreamTypeAudio).first();
QVERIFY(stream);
QVERIFY(connect(mChan.data(),
- SIGNAL(streamRemoved(const Telepathy::MediaStreamPtr &)),
- SLOT(onStreamRemoved(const Telepathy::MediaStreamPtr &))));
+ SIGNAL(streamRemoved(const Tp::MediaStreamPtr &)),
+ SLOT(onStreamRemoved(const Tp::MediaStreamPtr &))));
QVERIFY(connect(mChan->removeStream(stream),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
if (mChan->streams().size() == 2) {
// wait stream removed signal
@@ -413,28 +413,28 @@ void TestStreamedMediaChan::testOutgoingCall()
}
QCOMPARE(mStreamRemovedReturn, stream);
QCOMPARE(mChan->streams().size(), 1);
- QCOMPARE(mChan->streamsForType(Telepathy::MediaStreamTypeAudio).size(), 0);
- QCOMPARE(mChan->streamsForType(Telepathy::MediaStreamTypeVideo).size(), 1);
+ QCOMPARE(mChan->streamsForType(Tp::MediaStreamTypeAudio).size(), 0);
+ QCOMPARE(mChan->streamsForType(Tp::MediaStreamTypeVideo).size(), 1);
// test stream direction/state changed
- stream = mChan->streamsForType(Telepathy::MediaStreamTypeVideo).first();
+ stream = mChan->streamsForType(Tp::MediaStreamTypeVideo).first();
QVERIFY(stream);
QVERIFY(connect(mChan.data(),
- SIGNAL(streamDirectionChanged(const Telepathy::MediaStreamPtr &,
- Telepathy::MediaStreamDirection,
- Telepathy::MediaStreamPendingSend)),
- SLOT(onStreamDirectionChanged(const Telepathy::MediaStreamPtr &,
- Telepathy::MediaStreamDirection,
- Telepathy::MediaStreamPendingSend))));
+ SIGNAL(streamDirectionChanged(const Tp::MediaStreamPtr &,
+ Tp::MediaStreamDirection,
+ Tp::MediaStreamPendingSend)),
+ SLOT(onStreamDirectionChanged(const Tp::MediaStreamPtr &,
+ Tp::MediaStreamDirection,
+ Tp::MediaStreamPendingSend))));
QVERIFY(connect(mChan.data(),
- SIGNAL(streamStateChanged(const Telepathy::MediaStreamPtr &,
- Telepathy::MediaStreamState)),
- SLOT(onStreamStateChanged(const Telepathy::MediaStreamPtr &,
- Telepathy::MediaStreamState))));
- QVERIFY(connect(stream->requestDirection(Telepathy::MediaStreamDirectionReceive),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SIGNAL(streamStateChanged(const Tp::MediaStreamPtr &,
+ Tp::MediaStreamState)),
+ SLOT(onStreamStateChanged(const Tp::MediaStreamPtr &,
+ Tp::MediaStreamState))));
+ QVERIFY(connect(stream->requestDirection(Tp::MediaStreamDirectionReceive),
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
if (!mSDCStreamReturn) {
// wait direction and state changed signal
@@ -442,11 +442,11 @@ void TestStreamedMediaChan::testOutgoingCall()
QCOMPARE(mLoop->exec(), 0);
}
QCOMPARE(mSDCStreamReturn, stream);
- QVERIFY(mSDCDirectionReturn & Telepathy::MediaStreamDirectionReceive);
- QVERIFY(stream->direction() & Telepathy::MediaStreamDirectionReceive);
+ QVERIFY(mSDCDirectionReturn & Tp::MediaStreamDirectionReceive);
+ QVERIFY(stream->direction() & Tp::MediaStreamDirectionReceive);
QCOMPARE(stream->pendingSend(), mSDCPendingReturn);
QCOMPARE(mSSCStreamReturn, stream);
- QCOMPARE(mSSCStateReturn, Telepathy::MediaStreamStateConnected);
+ QCOMPARE(mSSCStateReturn, Tp::MediaStreamStateConnected);
}
void TestStreamedMediaChan::testOutgoingCallBusy()
@@ -454,8 +454,8 @@ void TestStreamedMediaChan::testOutgoingCallBusy()
// This identifier contains the magic string (busy), which means the example
// will simulate rejection of the call as busy rather than accepting it.
QVERIFY(connect(mConn->contactManager()->contactsForIdentifiers(QStringList() << "alice (busy)"),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectRequestContactsFinished(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectRequestContactsFinished(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QVERIFY(mRequestContactsReturn.size() == 1);
ContactPtr otherContact = mRequestContactsReturn.first();
@@ -465,18 +465,18 @@ void TestStreamedMediaChan::testOutgoingCallBusy()
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
TELEPATHY_INTERFACE_CHANNEL_TYPE_STREAMED_MEDIA);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
- Telepathy::HandleTypeContact);
+ Tp::HandleTypeContact);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandle"),
otherContact->handle()[0]);
QVERIFY(connect(mConn->createChannel(request),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectCreateChannelFinished(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectCreateChannelFinished(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QVERIFY(mChan);
QVERIFY(connect(mChan->becomeReady(StreamedMediaChannel::FeatureStreams),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QVERIFY(mChan->isReady(StreamedMediaChannel::FeatureStreams));
@@ -489,15 +489,15 @@ void TestStreamedMediaChan::testOutgoingCallBusy()
// Request audio stream
QVERIFY(connect(mChan->requestStreams(otherContact,
- QList<Telepathy::MediaStreamType>() << Telepathy::MediaStreamTypeAudio),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectRequestStreamsFinished(Telepathy::PendingOperation*))));
+ QList<Tp::MediaStreamType>() << Tp::MediaStreamTypeAudio),
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectRequestStreamsFinished(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QVERIFY(connect(mChan.data(),
- SIGNAL(invalidated(Telepathy::DBusProxy *,
+ SIGNAL(invalidated(Tp::DBusProxy *,
const QString &, const QString &)),
- SLOT(onChanInvalidated(Telepathy::DBusProxy *,
+ SLOT(onChanInvalidated(Tp::DBusProxy *,
const QString &, const QString &))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mChan->groupContacts().size(), 0);
@@ -511,8 +511,8 @@ void TestStreamedMediaChan::testOutgoingCallNoAnswer()
// This identifier contains the magic string (no answer), which means the example
// will never answer.
QVERIFY(connect(mConn->contactManager()->contactsForIdentifiers(QStringList() << "alice (no answer)"),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectRequestContactsFinished(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectRequestContactsFinished(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QVERIFY(mRequestContactsReturn.size() == 1);
ContactPtr otherContact = mRequestContactsReturn.first();
@@ -522,18 +522,18 @@ void TestStreamedMediaChan::testOutgoingCallNoAnswer()
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
TELEPATHY_INTERFACE_CHANNEL_TYPE_STREAMED_MEDIA);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
- Telepathy::HandleTypeContact);
+ Tp::HandleTypeContact);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandle"),
otherContact->handle()[0]);
QVERIFY(connect(mConn->createChannel(request),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectCreateChannelFinished(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectCreateChannelFinished(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QVERIFY(mChan);
QVERIFY(connect(mChan->becomeReady(StreamedMediaChannel::FeatureStreams),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QVERIFY(mChan->isReady(StreamedMediaChannel::FeatureStreams));
@@ -546,9 +546,9 @@ void TestStreamedMediaChan::testOutgoingCallNoAnswer()
// Request audio stream
QVERIFY(connect(mChan->requestStreams(otherContact,
- QList<Telepathy::MediaStreamType>() << Telepathy::MediaStreamTypeAudio),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectRequestStreamsFinished(Telepathy::PendingOperation*))));
+ QList<Tp::MediaStreamType>() << Tp::MediaStreamTypeAudio),
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectRequestStreamsFinished(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
/* After the initial flurry of D-Bus messages, alice still hasn't answered */
@@ -556,17 +556,17 @@ void TestStreamedMediaChan::testOutgoingCallNoAnswer()
QVERIFY(connect(mChan.data(),
SIGNAL(groupMembersChanged(
- const Telepathy::Contacts &,
- const Telepathy::Contacts &,
- const Telepathy::Contacts &,
- const Telepathy::Contacts &,
- const Telepathy::Channel::GroupMemberChangeDetails &)),
+ const Tp::Contacts &,
+ const Tp::Contacts &,
+ const Tp::Contacts &,
+ const Tp::Contacts &,
+ const Tp::Channel::GroupMemberChangeDetails &)),
SLOT(onGroupMembersChanged(
- const Telepathy::Contacts &,
- const Telepathy::Contacts &,
- const Telepathy::Contacts &,
- const Telepathy::Contacts &,
- const Telepathy::Channel::GroupMemberChangeDetails &))));
+ const Tp::Contacts &,
+ const Tp::Contacts &,
+ const Tp::Contacts &,
+ const Tp::Contacts &,
+ const Tp::Channel::GroupMemberChangeDetails &))));
// wait the contact to appear on RP
while (mChan->groupRemotePendingContacts().size() == 0) {
mLoop->processEvents();
@@ -579,9 +579,9 @@ void TestStreamedMediaChan::testOutgoingCallNoAnswer()
mChan->requestClose();
QVERIFY(connect(mChan.data(),
- SIGNAL(invalidated(Telepathy::DBusProxy *,
+ SIGNAL(invalidated(Tp::DBusProxy *,
const QString &, const QString &)),
- SLOT(onChanInvalidated(Telepathy::DBusProxy *,
+ SLOT(onChanInvalidated(Tp::DBusProxy *,
const QString &, const QString &))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mChan->groupContacts().size(), 0);
@@ -595,8 +595,8 @@ void TestStreamedMediaChan::testOutgoingCallTerminate()
// This identifier contains the magic string (terminate), which means the example
// will simulate answering the call but then terminating it.
QVERIFY(connect(mConn->contactManager()->contactsForIdentifiers(QStringList() << "alice (terminate)"),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectRequestContactsFinished(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectRequestContactsFinished(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QVERIFY(mRequestContactsReturn.size() == 1);
ContactPtr otherContact = mRequestContactsReturn.first();
@@ -606,18 +606,18 @@ void TestStreamedMediaChan::testOutgoingCallTerminate()
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
TELEPATHY_INTERFACE_CHANNEL_TYPE_STREAMED_MEDIA);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
- Telepathy::HandleTypeContact);
+ Tp::HandleTypeContact);
request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandle"),
otherContact->handle()[0]);
QVERIFY(connect(mConn->createChannel(request),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectCreateChannelFinished(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectCreateChannelFinished(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QVERIFY(mChan);
QVERIFY(connect(mChan->becomeReady(StreamedMediaChannel::FeatureStreams),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QVERIFY(mChan->isReady(StreamedMediaChannel::FeatureStreams));
@@ -630,23 +630,23 @@ void TestStreamedMediaChan::testOutgoingCallTerminate()
QVERIFY(connect(mChan.data(),
SIGNAL(groupMembersChanged(
- const Telepathy::Contacts &,
- const Telepathy::Contacts &,
- const Telepathy::Contacts &,
- const Telepathy::Contacts &,
- const Telepathy::Channel::GroupMemberChangeDetails &)),
+ const Tp::Contacts &,
+ const Tp::Contacts &,
+ const Tp::Contacts &,
+ const Tp::Contacts &,
+ const Tp::Channel::GroupMemberChangeDetails &)),
SLOT(onGroupMembersChanged(
- const Telepathy::Contacts &,
- const Telepathy::Contacts &,
- const Telepathy::Contacts &,
- const Telepathy::Contacts &,
- const Telepathy::Channel::GroupMemberChangeDetails &))));
+ const Tp::Contacts &,
+ const Tp::Contacts &,
+ const Tp::Contacts &,
+ const Tp::Contacts &,
+ const Tp::Channel::GroupMemberChangeDetails &))));
// Request audio stream
QVERIFY(connect(mChan->requestStreams(otherContact,
- QList<Telepathy::MediaStreamType>() << Telepathy::MediaStreamTypeAudio),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectRequestStreamsFinished(Telepathy::PendingOperation*))));
+ QList<Tp::MediaStreamType>() << Tp::MediaStreamTypeAudio),
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectRequestStreamsFinished(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
// wait the contact to appear on RP
@@ -666,9 +666,9 @@ void TestStreamedMediaChan::testOutgoingCallTerminate()
// wait the contact to terminate the call
QVERIFY(connect(mChan.data(),
- SIGNAL(invalidated(Telepathy::DBusProxy *,
+ SIGNAL(invalidated(Tp::DBusProxy *,
const QString &, const QString &)),
- SLOT(onChanInvalidated(Telepathy::DBusProxy *,
+ SLOT(onChanInvalidated(Tp::DBusProxy *,
const QString &, const QString &))));
QCOMPARE(mLoop->exec(), 0);
}
@@ -678,8 +678,8 @@ void TestStreamedMediaChan::testIncomingCall()
{
mConn->setSelfPresence("away", "preparing for a test");
QVERIFY(connect(mConn->requestsInterface(),
- SIGNAL(NewChannels(const Telepathy::ChannelDetailsList&)),
- SLOT(onNewChannels(const Telepathy::ChannelDetailsList&))));
+ SIGNAL(NewChannels(const Tp::ChannelDetailsList&)),
+ SLOT(onNewChannels(const Tp::ChannelDetailsList&))));
mConn->setSelfPresence("available", "call me?");
QCOMPARE(mLoop->exec(), 0);
@@ -687,8 +687,8 @@ void TestStreamedMediaChan::testIncomingCall()
QCOMPARE(mChan->streams().size(), 0);
QVERIFY(connect(mChan->becomeReady(StreamedMediaChannel::FeatureStreams),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QVERIFY(mChan->isReady(StreamedMediaChannel::FeatureStreams));
@@ -704,8 +704,8 @@ void TestStreamedMediaChan::testIncomingCall()
QCOMPARE(otherContact, mChan->initiatorContact());
QVERIFY(connect(mChan->acceptCall(),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mChan->groupContacts().size(), 2);
QCOMPARE(mChan->groupLocalPendingContacts().size(), 0);
@@ -716,44 +716,44 @@ void TestStreamedMediaChan::testIncomingCall()
QCOMPARE(mChan->streams().size(), 1);
MediaStreamPtr stream = mChan->streams().first();
QCOMPARE(stream->channel(), mChan);
- QCOMPARE(stream->type(), Telepathy::MediaStreamTypeAudio);
+ QCOMPARE(stream->type(), Tp::MediaStreamTypeAudio);
// RequestStreams with bad type must fail
- QVERIFY(connect(mChan->requestStream(otherContact, (Telepathy::MediaStreamType) -1),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectRequestStreamsFinished(Telepathy::PendingOperation*))));
+ QVERIFY(connect(mChan->requestStream(otherContact, (Tp::MediaStreamType) -1),
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectRequestStreamsFinished(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 2);
QCOMPARE(mRequestStreamsReturn.size(), 0);
// Request video stream
- QVERIFY(connect(mChan->requestStream(otherContact, Telepathy::MediaStreamTypeVideo),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectRequestStreamsFinished(Telepathy::PendingOperation*))));
+ QVERIFY(connect(mChan->requestStream(otherContact, Tp::MediaStreamTypeVideo),
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectRequestStreamsFinished(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mRequestStreamsReturn.size(), 1);
stream = mRequestStreamsReturn.first();
QCOMPARE(stream->contact(), otherContact);
- QCOMPARE(stream->type(), Telepathy::MediaStreamTypeVideo);
- QCOMPARE(stream->state(), Telepathy::MediaStreamStateDisconnected);
- QCOMPARE(stream->direction(), Telepathy::MediaStreamDirectionSend);
- QCOMPARE(stream->pendingSend(), Telepathy::MediaStreamPendingRemoteSend);
+ QCOMPARE(stream->type(), Tp::MediaStreamTypeVideo);
+ QCOMPARE(stream->state(), Tp::MediaStreamStateDisconnected);
+ QCOMPARE(stream->direction(), Tp::MediaStreamDirectionSend);
+ QCOMPARE(stream->pendingSend(), Tp::MediaStreamPendingRemoteSend);
QCOMPARE(mChan->streams().size(), 2);
QVERIFY(mChan->streams().contains(stream));
- QCOMPARE(mChan->streamsForType(Telepathy::MediaStreamTypeAudio).size(), 1);
- QCOMPARE(mChan->streamsForType(Telepathy::MediaStreamTypeVideo).size(), 1);
+ QCOMPARE(mChan->streamsForType(Tp::MediaStreamTypeAudio).size(), 1);
+ QCOMPARE(mChan->streamsForType(Tp::MediaStreamTypeVideo).size(), 1);
// test stream removal
- stream = mChan->streamsForType(Telepathy::MediaStreamTypeAudio).first();
+ stream = mChan->streamsForType(Tp::MediaStreamTypeAudio).first();
QVERIFY(stream);
QVERIFY(connect(mChan.data(),
- SIGNAL(streamRemoved(const Telepathy::MediaStreamPtr &)),
- SLOT(onStreamRemoved(const Telepathy::MediaStreamPtr &))));
+ SIGNAL(streamRemoved(const Tp::MediaStreamPtr &)),
+ SLOT(onStreamRemoved(const Tp::MediaStreamPtr &))));
QVERIFY(connect(mChan->removeStreams(MediaStreams() << stream),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
if (mChan->streams().size() == 2) {
// wait stream removed signal
@@ -761,28 +761,28 @@ void TestStreamedMediaChan::testIncomingCall()
}
QCOMPARE(mStreamRemovedReturn, stream);
QCOMPARE(mChan->streams().size(), 1);
- QCOMPARE(mChan->streamsForType(Telepathy::MediaStreamTypeAudio).size(), 0);
- QCOMPARE(mChan->streamsForType(Telepathy::MediaStreamTypeVideo).size(), 1);
+ QCOMPARE(mChan->streamsForType(Tp::MediaStreamTypeAudio).size(), 0);
+ QCOMPARE(mChan->streamsForType(Tp::MediaStreamTypeVideo).size(), 1);
// test stream direction/state changed
- stream = mChan->streamsForType(Telepathy::MediaStreamTypeVideo).first();
+ stream = mChan->streamsForType(Tp::MediaStreamTypeVideo).first();
QVERIFY(stream);
QVERIFY(connect(mChan.data(),
- SIGNAL(streamDirectionChanged(const Telepathy::MediaStreamPtr &,
- Telepathy::MediaStreamDirection,
- Telepathy::MediaStreamPendingSend)),
- SLOT(onStreamDirectionChanged(const Telepathy::MediaStreamPtr &,
- Telepathy::MediaStreamDirection,
- Telepathy::MediaStreamPendingSend))));
+ SIGNAL(streamDirectionChanged(const Tp::MediaStreamPtr &,
+ Tp::MediaStreamDirection,
+ Tp::MediaStreamPendingSend)),
+ SLOT(onStreamDirectionChanged(const Tp::MediaStreamPtr &,
+ Tp::MediaStreamDirection,
+ Tp::MediaStreamPendingSend))));
QVERIFY(connect(mChan.data(),
- SIGNAL(streamStateChanged(const Telepathy::MediaStreamPtr &,
- Telepathy::MediaStreamState)),
- SLOT(onStreamStateChanged(const Telepathy::MediaStreamPtr &,
- Telepathy::MediaStreamState))));
+ SIGNAL(streamStateChanged(const Tp::MediaStreamPtr &,
+ Tp::MediaStreamState)),
+ SLOT(onStreamStateChanged(const Tp::MediaStreamPtr &,
+ Tp::MediaStreamState))));
QVERIFY(connect(stream->requestDirection(false, true),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
if (!mSDCStreamReturn) {
// wait direction and state changed signal
@@ -790,11 +790,11 @@ void TestStreamedMediaChan::testIncomingCall()
QCOMPARE(mLoop->exec(), 0);
}
QCOMPARE(mSDCStreamReturn, stream);
- QVERIFY(mSDCDirectionReturn & Telepathy::MediaStreamDirectionSend);
- QVERIFY(stream->direction() & Telepathy::MediaStreamDirectionSend);
+ QVERIFY(mSDCDirectionReturn & Tp::MediaStreamDirectionSend);
+ QVERIFY(stream->direction() & Tp::MediaStreamDirectionSend);
QCOMPARE(stream->pendingSend(), mSDCPendingReturn);
QCOMPARE(mSSCStreamReturn, stream);
- QCOMPARE(mSSCStateReturn, Telepathy::MediaStreamStateConnected);
+ QCOMPARE(mSSCStateReturn, Tp::MediaStreamStateConnected);
}
void TestStreamedMediaChan::cleanup()
@@ -807,13 +807,13 @@ void TestStreamedMediaChan::cleanupTestCase()
{
if (mConn) {
QVERIFY(connect(mConn->requestDisconnect(),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
if (mConn->isValid()) {
QVERIFY(connect(mConn.data(),
- SIGNAL(invalidated(Telepathy::DBusProxy *,
+ SIGNAL(invalidated(Tp::DBusProxy *,
const QString &, const QString &)),
mLoop,
SLOT(quit())));
diff --git a/tests/dbus/text-chan.cpp b/tests/dbus/text-chan.cpp
index 286cb2a..ffedd50 100644
--- a/tests/dbus/text-chan.cpp
+++ b/tests/dbus/text-chan.cpp
@@ -19,17 +19,17 @@
#include <tests/lib/echo2/chan.h>
#include <tests/lib/test.h>
-using namespace Telepathy;
-using Telepathy::UIntList;
+using namespace Tp;
+using Tp::UIntList;
struct SentMessageDetails
{
SentMessageDetails(const Message &message,
- const Telepathy::MessageSendingFlags flags,
+ const Tp::MessageSendingFlags flags,
const QString &token)
: message(message), flags(flags), token(token) { }
Message message;
- Telepathy::MessageSendingFlags flags;
+ Tp::MessageSendingFlags flags;
QString token;
};
@@ -46,10 +46,10 @@ public:
{ }
protected Q_SLOTS:
- void onMessageReceived(const Telepathy::ReceivedMessage &);
- void onMessageRemoved(const Telepathy::ReceivedMessage &);
- void onMessageSent(const Telepathy::Message &,
- Telepathy::MessageSendingFlags, const QString &);
+ void onMessageReceived(const Tp::ReceivedMessage &);
+ void onMessageRemoved(const Tp::ReceivedMessage &);
+ void onMessageSent(const Tp::Message &,
+ Tp::MessageSendingFlags, const QString &);
private Q_SLOTS:
void initTestCase();
@@ -93,8 +93,8 @@ void TestTextChan::onMessageRemoved(const ReceivedMessage &message)
removed << message;
}
-void TestTextChan::onMessageSent(const Telepathy::Message &message,
- Telepathy::MessageSendingFlags flags, const QString &token)
+void TestTextChan::onMessageSent(const Tp::Message &message,
+ Tp::MessageSendingFlags flags, const QString &token)
{
sent << SentMessageDetails(message, flags, token);
}
@@ -102,9 +102,9 @@ void TestTextChan::onMessageSent(const Telepathy::Message &message,
void TestTextChan::sendText(const char *text)
{
QVERIFY(connect(mChan->send(QLatin1String(text),
- Telepathy::ChannelTextMessageTypeNormal),
- SIGNAL(finished(Telepathy::PendingOperation *)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation *))));
+ Tp::ChannelTextMessageTypeNormal),
+ SIGNAL(finished(Tp::PendingOperation *)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation *))));
QCOMPARE(mLoop->exec(), 0);
}
@@ -149,8 +149,8 @@ void TestTextChan::initTestCase()
mConn->requestConnect();
QVERIFY(connect(mConn->requestConnect(),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mConn->isReady(), true);
QCOMPARE(static_cast<uint>(mConn->status()),
@@ -196,8 +196,8 @@ void TestTextChan::commonTest(bool withMessages)
ChannelPtr asChannel = ChannelPtr(dynamic_cast<Channel*>(mChan.data()));
QVERIFY(connect(asChannel->becomeReady(),
- SIGNAL(finished(Telepathy::PendingOperation *)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation *))));
+ SIGNAL(finished(Tp::PendingOperation *)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation *))));
QCOMPARE(mLoop->exec(), 0);
QVERIFY(asChannel->isReady());
@@ -210,20 +210,20 @@ void TestTextChan::commonTest(bool withMessages)
QVERIFY(!mChan->isReady(features));
QVERIFY(connect(mChan.data(),
- SIGNAL(messageReceived(const Telepathy::ReceivedMessage &)),
- SLOT(onMessageReceived(const Telepathy::ReceivedMessage &))));
+ SIGNAL(messageReceived(const Tp::ReceivedMessage &)),
+ SLOT(onMessageReceived(const Tp::ReceivedMessage &))));
QCOMPARE(received.size(), 0);
QVERIFY(connect(mChan.data(),
- SIGNAL(pendingMessageRemoved(const Telepathy::ReceivedMessage &)),
- SLOT(onMessageRemoved(const Telepathy::ReceivedMessage &))));
+ SIGNAL(pendingMessageRemoved(const Tp::ReceivedMessage &)),
+ SLOT(onMessageRemoved(const Tp::ReceivedMessage &))));
QCOMPARE(removed.size(), 0);
QVERIFY(connect(mChan.data(),
- SIGNAL(messageSent(const Telepathy::Message &,
- Telepathy::MessageSendingFlags,
+ SIGNAL(messageSent(const Tp::Message &,
+ Tp::MessageSendingFlags,
const QString &)),
- SLOT(onMessageSent(const Telepathy::Message &,
- Telepathy::MessageSendingFlags,
+ SLOT(onMessageSent(const Tp::Message &,
+ Tp::MessageSendingFlags,
const QString &))));
QCOMPARE(sent.size(), 0);
@@ -232,8 +232,8 @@ void TestTextChan::commonTest(bool withMessages)
// Make the Sent signal become ready
features = Features() << TextChannel::FeatureMessageSentSignal;
QVERIFY(connect(mChan->becomeReady(features),
- SIGNAL(finished(Telepathy::PendingOperation *)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation *))));
+ SIGNAL(finished(Tp::PendingOperation *)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation *))));
QCOMPARE(mLoop->exec(), 0);
QVERIFY(asChannel->isReady());
@@ -252,7 +252,7 @@ void TestTextChan::commonTest(bool withMessages)
Message m(sent.at(0).message);
QCOMPARE(static_cast<uint>(m.messageType()),
- static_cast<uint>(Telepathy::ChannelTextMessageTypeNormal));
+ static_cast<uint>(Tp::ChannelTextMessageTypeNormal));
QVERIFY(!m.isTruncated());
QVERIFY(!m.hasNonTextContent());
QCOMPARE(m.messageToken(), QString::fromAscii(""));
@@ -268,8 +268,8 @@ void TestTextChan::commonTest(bool withMessages)
// Make capabilities become ready
features = Features() << TextChannel::FeatureMessageCapabilities;
QVERIFY(connect(mChan->becomeReady(features),
- SIGNAL(finished(Telepathy::PendingOperation *)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation *))));
+ SIGNAL(finished(Tp::PendingOperation *)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation *))));
QCOMPARE(mLoop->exec(), 0);
QVERIFY(asChannel->isReady());
@@ -282,8 +282,8 @@ void TestTextChan::commonTest(bool withMessages)
if (withMessages) {
QCOMPARE(mChan->supportedContentTypes(), QStringList() << "*/*");
QCOMPARE(static_cast<uint>(mChan->messagePartSupport()),
- static_cast<uint>(Telepathy::MessagePartSupportFlagOneAttachment |
- Telepathy::MessagePartSupportFlagMultipleAttachments));
+ static_cast<uint>(Tp::MessagePartSupportFlagOneAttachment |
+ Tp::MessagePartSupportFlagMultipleAttachments));
QCOMPARE(static_cast<uint>(mChan->deliveryReportingSupport()), 0U);
} else {
QCOMPARE(mChan->supportedContentTypes(), QStringList() << "text/plain");
@@ -296,8 +296,8 @@ void TestTextChan::commonTest(bool withMessages)
QCOMPARE(mChan->messageQueue().size(), 0);
features = Features() << TextChannel::FeatureMessageQueue;
QVERIFY(connect(mChan->becomeReady(features),
- SIGNAL(finished(Telepathy::PendingOperation *)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation *))));
+ SIGNAL(finished(Tp::PendingOperation *)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation *))));
QCOMPARE(mLoop->exec(), 0);
QVERIFY(asChannel->isReady());
@@ -313,7 +313,7 @@ void TestTextChan::commonTest(bool withMessages)
ReceivedMessage r(received.at(0));
QCOMPARE(static_cast<uint>(r.messageType()),
- static_cast<uint>(Telepathy::ChannelTextMessageTypeNormal));
+ static_cast<uint>(Tp::ChannelTextMessageTypeNormal));
QVERIFY(!r.isTruncated());
QVERIFY(!r.hasNonTextContent());
QCOMPARE(r.messageToken(), QString::fromAscii(""));
@@ -338,7 +338,7 @@ void TestTextChan::commonTest(bool withMessages)
r = received.at(1);
QCOMPARE(static_cast<uint>(r.messageType()),
- static_cast<uint>(Telepathy::ChannelTextMessageTypeNormal));
+ static_cast<uint>(Tp::ChannelTextMessageTypeNormal));
QVERIFY(!r.isTruncated());
QVERIFY(!r.hasNonTextContent());
QCOMPARE(r.messageToken(), QString::fromAscii(""));
@@ -436,13 +436,13 @@ void TestTextChan::cleanupTestCase()
if (mConn) {
// Disconnect and wait for the readiness change
QVERIFY(connect(mConn->requestDisconnect(),
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
if (mConn->isValid()) {
QVERIFY(connect(mConn.data(),
- SIGNAL(invalidated(Telepathy::DBusProxy *,
+ SIGNAL(invalidated(Tp::DBusProxy *,
const QString &, const QString &)),
mLoop,
SLOT(quit())));
diff --git a/tests/key-file.cpp b/tests/key-file.cpp
index 5d56ce8..3676d3d 100644
--- a/tests/key-file.cpp
+++ b/tests/key-file.cpp
@@ -2,7 +2,7 @@
#include <TelepathyQt4/KeyFile>
-using namespace Telepathy;
+using namespace Tp;
class TestKeyFile : public QObject
{
diff --git a/tests/lib/test.cpp b/tests/lib/test.cpp
index 1dfb6bc..ba9b057 100644
--- a/tests/lib/test.cpp
+++ b/tests/lib/test.cpp
@@ -9,9 +9,9 @@
#include <TelepathyQt4/DBus>
#include <TelepathyQt4/PendingVoidMethodCall>
-using Telepathy::PendingOperation;
-using Telepathy::PendingVoidMethodCall;
-using Telepathy::Client::DBus::PeerInterface;
+using Tp::PendingOperation;
+using Tp::PendingVoidMethodCall;
+using Tp::Client::DBus::PeerInterface;
Test::Test(QObject *parent)
: QObject(parent), mLoop(new QEventLoop(this))
@@ -25,9 +25,9 @@ Test::~Test()
void Test::initTestCaseImpl()
{
- Telepathy::registerTypes();
- Telepathy::enableDebug(true);
- Telepathy::enableWarnings(true);
+ Tp::registerTypes();
+ Tp::enableDebug(true);
+ Tp::enableWarnings(true);
QVERIFY(QDBusConnection::sessionBus().isConnected());
}
@@ -68,7 +68,7 @@ void Test::expectSuccessfulCall(QDBusPendingCallWatcher *watcher)
mLoop->exit(0);
}
-void Test::processDBusQueue(Telepathy::DBusProxy *proxy)
+void Test::processDBusQueue(Tp::DBusProxy *proxy)
{
// Call method Ping on the D-Bus Peer interface
PeerInterface peer(proxy);
@@ -76,8 +76,8 @@ void Test::processDBusQueue(Telepathy::DBusProxy *proxy)
// Wait for the reply to the Ping call
QVERIFY(connect(call,
- SIGNAL(finished(Telepathy::PendingOperation*)),
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SIGNAL(finished(Tp::PendingOperation*)),
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
}
diff --git a/tests/lib/test.h b/tests/lib/test.h
index 8c21864..9a0993b 100644
--- a/tests/lib/test.h
+++ b/tests/lib/test.h
@@ -5,7 +5,7 @@
#include <TelepathyQt4/PendingOperation>
#include <TelepathyQt4/Constants>
-namespace Telepathy
+namespace Tp
{
class DBusProxy;
}
@@ -21,11 +21,11 @@ public:
virtual ~Test();
QEventLoop *mLoop;
- void processDBusQueue(Telepathy::DBusProxy *proxy);
+ void processDBusQueue(Tp::DBusProxy *proxy);
protected Q_SLOTS:
void expectSuccessfulCall(QDBusPendingCallWatcher*);
- void expectSuccessfulCall(Telepathy::PendingOperation*);
+ void expectSuccessfulCall(Tp::PendingOperation*);
virtual void initTestCaseImpl();
virtual void initImpl();
diff --git a/tests/manager-file.cpp b/tests/manager-file.cpp
index ed7e821..43be13f 100644
--- a/tests/manager-file.cpp
+++ b/tests/manager-file.cpp
@@ -3,7 +3,7 @@
#include <TelepathyQt4/Constants>
#include <TelepathyQt4/ManagerFile>
-using namespace Telepathy;
+using namespace Tp;
bool containsParam(const ParamSpecList ¶ms, const char *name);
const ParamSpec *getParam(const ParamSpecList ¶ms, const QString &name);
diff --git a/tests/pinocchio/cm-basics.cpp b/tests/pinocchio/cm-basics.cpp
index 08ea129..0c70be4 100644
--- a/tests/pinocchio/cm-basics.cpp
+++ b/tests/pinocchio/cm-basics.cpp
@@ -10,17 +10,17 @@
#include <tests/pinocchio/lib.h>
-using namespace Telepathy;
+using namespace Tp;
class TestCmBasics : public PinocchioTest
{
Q_OBJECT
private:
- Telepathy::ConnectionManagerPtr mCM;
+ Tp::ConnectionManagerPtr mCM;
protected Q_SLOTS:
- void onListNames(Telepathy::PendingOperation*);
+ void onListNames(Tp::PendingOperation*);
private Q_SLOTS:
void initTestCase();
@@ -47,9 +47,9 @@ void TestCmBasics::init()
initImpl();
}
-void TestCmBasics::onListNames(Telepathy::PendingOperation *operation)
+void TestCmBasics::onListNames(Tp::PendingOperation *operation)
{
- Telepathy::PendingStringList *p = static_cast<Telepathy::PendingStringList*>(operation);
+ Tp::PendingStringList *p = static_cast<Tp::PendingStringList*>(operation);
QCOMPARE(p->result().contains("pinocchio"), QBool(true));
mLoop->exit(0);
}
@@ -58,27 +58,27 @@ void TestCmBasics::onListNames(Telepathy::PendingOperation *operation)
void TestCmBasics::testBasics()
{
connect(ConnectionManager::listNames(),
- SIGNAL(finished(Telepathy::PendingOperation *)),
+ SIGNAL(finished(Tp::PendingOperation *)),
this,
- SLOT(onListNames(Telepathy::PendingOperation *)));
+ SLOT(onListNames(Tp::PendingOperation *)));
QCOMPARE(mLoop->exec(), 0);
mCM = ConnectionManager::create("pinocchio");
QCOMPARE(mCM->isReady(), false);
connect(mCM->becomeReady(),
- SIGNAL(finished(Telepathy::PendingOperation *)),
+ SIGNAL(finished(Tp::PendingOperation *)),
this,
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation *)));
+ SLOT(expectSuccessfulCall(Tp::PendingOperation *)));
qDebug() << "enter main loop";
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mCM->isReady(), true);
// calling becomeReady() twice is a no-op
connect(mCM->becomeReady(),
- SIGNAL(finished(Telepathy::PendingOperation *)),
+ SIGNAL(finished(Tp::PendingOperation *)),
this,
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation *)));
+ SLOT(expectSuccessfulCall(Tp::PendingOperation *)));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mCM->isReady(), true);
@@ -118,9 +118,9 @@ void TestCmBasics::testBasics()
PendingConnection *pconn = mCM->requestConnection("dummy", parameters);
connect(pconn,
- SIGNAL(finished(Telepathy::PendingOperation *)),
+ SIGNAL(finished(Tp::PendingOperation *)),
this,
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation *)));
+ SLOT(expectSuccessfulCall(Tp::PendingOperation *)));
QCOMPARE(mLoop->exec(), 0);
QVERIFY(pconn->connection());
diff --git a/tests/pinocchio/conn-basics.cpp b/tests/pinocchio/conn-basics.cpp
index 7ae5e9a..4c44464 100644
--- a/tests/pinocchio/conn-basics.cpp
+++ b/tests/pinocchio/conn-basics.cpp
@@ -11,12 +11,12 @@
#include <tests/pinocchio/lib.h>
-using Telepathy::Connection;
-using Telepathy::ConnectionPtr;
-using Telepathy::Client::ConnectionManagerInterface;
-using Telepathy::Client::DBus::PeerInterface;
-using Telepathy::Client::DBus::PropertiesInterface;
-using Telepathy::Features;
+using Tp::Connection;
+using Tp::ConnectionPtr;
+using Tp::Client::ConnectionManagerInterface;
+using Tp::Client::DBus::PeerInterface;
+using Tp::Client::DBus::PropertiesInterface;
+using Tp::Features;
class TestConnBasics : public PinocchioTest
{
@@ -143,15 +143,15 @@ void TestConnBasics::testConnect()
qDebug() << "calling Connect()";
QVERIFY(connect(mConn->requestConnect(),
- SIGNAL(finished(Telepathy::PendingOperation*)),
+ SIGNAL(finished(Tp::PendingOperation*)),
this,
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QVERIFY(connect(mConn->becomeReady(),
- SIGNAL(finished(Telepathy::PendingOperation*)),
+ SIGNAL(finished(Tp::PendingOperation*)),
this,
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mConn->isReady(), true);
@@ -169,9 +169,9 @@ void TestConnBasics::testConnect()
Features features = Features() << Connection::FeatureSimplePresence;
QVERIFY(connect(mConn->becomeReady(features),
- SIGNAL(finished(Telepathy::PendingOperation*)),
+ SIGNAL(finished(Tp::PendingOperation*)),
this,
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mConn->isReady(features), true);
QVERIFY(mConn->missingFeatures() == features);
@@ -179,7 +179,7 @@ void TestConnBasics::testConnect()
QCOMPARE(static_cast<uint>(mConn->status()),
static_cast<uint>(Connection::StatusConnected));
QCOMPARE(static_cast<uint>(mConn->statusReason()),
- static_cast<uint>(Telepathy::ConnectionStatusReasonRequested));
+ static_cast<uint>(Tp::ConnectionStatusReasonRequested));
QStringList interfaces = mConn->interfaces();
QVERIFY(interfaces.contains(QLatin1String(
@@ -190,15 +190,15 @@ void TestConnBasics::testConnect()
TELEPATHY_INTERFACE_CONNECTION_INTERFACE_CAPABILITIES)));
QVERIFY(connect(mConn->requestDisconnect(),
- SIGNAL(finished(Telepathy::PendingOperation*)),
+ SIGNAL(finished(Tp::PendingOperation*)),
this,
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(static_cast<uint>(mConn->status()),
static_cast<uint>(Connection::StatusDisconnected));
QCOMPARE(static_cast<uint>(mConn->statusReason()),
- static_cast<uint>(Telepathy::ConnectionStatusReasonRequested));
+ static_cast<uint>(Tp::ConnectionStatusReasonRequested));
mConn.reset();
}
@@ -210,15 +210,15 @@ void TestConnBasics::testAlreadyConnected()
qDebug() << "calling Connect()";
QVERIFY(connect(mConn->requestConnect(),
- SIGNAL(finished(Telepathy::PendingOperation*)),
+ SIGNAL(finished(Tp::PendingOperation*)),
this,
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QVERIFY(connect(mConn->becomeReady(),
- SIGNAL(finished(Telepathy::PendingOperation*)),
+ SIGNAL(finished(Tp::PendingOperation*)),
this,
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
QCOMPARE(mConn->isReady(), true);
@@ -246,9 +246,9 @@ void TestConnBasics::testAlreadyConnected()
this, SLOT(expectReady(uint, uint))));
QVERIFY(connect(mConn->requestDisconnect(),
- SIGNAL(finished(Telepathy::PendingOperation*)),
+ SIGNAL(finished(Tp::PendingOperation*)),
this,
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
mConn.reset();
diff --git a/tests/pinocchio/handles.cpp b/tests/pinocchio/handles.cpp
index 188f122..d9670a7 100644
--- a/tests/pinocchio/handles.cpp
+++ b/tests/pinocchio/handles.cpp
@@ -17,8 +17,8 @@
#include <tests/pinocchio/lib.h>
-using namespace Telepathy;
-using namespace Telepathy::Client;
+using namespace Tp;
+using namespace Tp::Client;
class TestHandles : public PinocchioTest
{
@@ -42,7 +42,7 @@ protected Q_SLOTS:
// these ought to be private, but if they were, QTest would think they
// were test cases. So, they're protected instead
void expectConnReady(uint, uint);
- void expectPendingHandlesFinished(Telepathy::PendingOperation*);
+ void expectPendingHandlesFinished(Tp::PendingOperation*);
private Q_SLOTS:
void initTestCase();
@@ -117,9 +117,9 @@ void TestHandles::initTestCase()
// Connecting one connects them all
QVERIFY(connect(mConn1a->requestConnect(),
- SIGNAL(finished(Telepathy::PendingOperation*)),
+ SIGNAL(finished(Tp::PendingOperation*)),
this,
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
ConnectionPtr connections[3] = {mConn1a, mConn1b, mConn2};
@@ -176,36 +176,36 @@ void TestHandles::testBasics()
// Get a reference to compare against (synchronously, don't do this in real applications)
QStringList ids = QStringList() << "friend" << "buddy" << "associate" << "dude" << "guy";
ConnectionInterface iface(mConn1a->busName(), mConn1a->objectPath());
- Telepathy::UIntList shouldBe = iface.RequestHandles(Telepathy::HandleTypeContact, ids);
+ Tp::UIntList shouldBe = iface.RequestHandles(Tp::HandleTypeContact, ids);
// Try and get the same handles asynchronously using the convenience API
- PendingHandles *pending = mConn1a->requestHandles(Telepathy::HandleTypeContact, ids);
+ PendingHandles *pending = mConn1a->requestHandles(Tp::HandleTypeContact, ids);
// Check that the closure is consistent with what we asked for
QVERIFY(pending->isRequest());
QCOMPARE(pending->namesRequested(), ids);
QCOMPARE(pending->connection(), mConn1a);
- QCOMPARE(pending->handleType(), static_cast<uint>(Telepathy::HandleTypeContact));
+ QCOMPARE(pending->handleType(), static_cast<uint>(Tp::HandleTypeContact));
// Finish the request and extract the resulting ReferencedHandles
- QVERIFY(connect(pending, SIGNAL(finished(Telepathy::PendingOperation*)),
- this, SLOT(expectPendingHandlesFinished(Telepathy::PendingOperation*))));
+ QVERIFY(connect(pending, SIGNAL(finished(Tp::PendingOperation*)),
+ this, SLOT(expectPendingHandlesFinished(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
- QVERIFY(disconnect(pending, SIGNAL(finished(Telepathy::PendingOperation*)),
- this, SLOT(expectPendingHandlesFinished(Telepathy::PendingOperation*))));
+ QVERIFY(disconnect(pending, SIGNAL(finished(Tp::PendingOperation*)),
+ this, SLOT(expectPendingHandlesFinished(Tp::PendingOperation*))));
ReferencedHandles handles = mHandles;
mHandles = ReferencedHandles();
// Check that the ReferencedHandles are what we asked for
QCOMPARE(handles.connection(), mConn1a);
- QCOMPARE(handles.handleType(), static_cast<uint>(Telepathy::HandleTypeContact));
+ QCOMPARE(handles.handleType(), static_cast<uint>(Tp::HandleTypeContact));
QVERIFY(handles == shouldBe);
// Check that a copy of the received ReferencedHandles is also what we asked for (it's supposed
// to be equivalent with one that we already verified as being that)
ReferencedHandles copy = handles;
QCOMPARE(copy.connection(), mConn1a);
- QCOMPARE(copy.handleType(), static_cast<uint>(Telepathy::HandleTypeContact));
+ QCOMPARE(copy.handleType(), static_cast<uint>(Tp::HandleTypeContact));
QVERIFY(copy == handles);
QVERIFY(copy == shouldBe);
@@ -221,12 +221,12 @@ void TestHandles::testReferences()
QStringList ids = QStringList() << "mate" << "contact" << "partner" << "bloke" << "fellow";
// Get referenced handles for all 5 of the IDs
- PendingHandles *allPending = mConn1a->requestHandles(Telepathy::HandleTypeContact, ids);
- QVERIFY(connect(allPending, SIGNAL(finished(Telepathy::PendingOperation*)),
- this, SLOT(expectPendingHandlesFinished(Telepathy::PendingOperation*))));
+ PendingHandles *allPending = mConn1a->requestHandles(Tp::HandleTypeContact, ids);
+ QVERIFY(connect(allPending, SIGNAL(finished(Tp::PendingOperation*)),
+ this, SLOT(expectPendingHandlesFinished(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
- QVERIFY(disconnect(allPending, SIGNAL(finished(Telepathy::PendingOperation*)),
- this, SLOT(expectPendingHandlesFinished(Telepathy::PendingOperation*))));
+ QVERIFY(disconnect(allPending, SIGNAL(finished(Tp::PendingOperation*)),
+ this, SLOT(expectPendingHandlesFinished(Tp::PendingOperation*))));
ReferencedHandles allHandles = mHandles;
mHandles = ReferencedHandles();
@@ -234,20 +234,20 @@ void TestHandles::testReferences()
QCOMPARE(allHandles.size(), 5);
// ... and that they're valid at this point by inspecting them
- QDBusReply<QStringList> inspectReply = iface.InspectHandles(Telepathy::HandleTypeContact,
- Telepathy::UIntList::fromStdList(std::list<uint>(allHandles.begin(),
+ QDBusReply<QStringList> inspectReply = iface.InspectHandles(Tp::HandleTypeContact,
+ Tp::UIntList::fromStdList(std::list<uint>(allHandles.begin(),
allHandles.end())));
QVERIFY(inspectReply.isValid());
QCOMPARE(inspectReply.value().size(), 5);
// Get another fresh reference to the middle three using the Connection
- PendingHandles *middlePending = mConn1a->referenceHandles(Telepathy::HandleTypeContact,
- Telepathy::UIntList() << allHandles[1] << allHandles[2] << allHandles[3]);
- QVERIFY(connect(middlePending, SIGNAL(finished(Telepathy::PendingOperation*)),
- this, SLOT(expectPendingHandlesFinished(Telepathy::PendingOperation*))));
+ PendingHandles *middlePending = mConn1a->referenceHandles(Tp::HandleTypeContact,
+ Tp::UIntList() << allHandles[1] << allHandles[2] << allHandles[3]);
+ QVERIFY(connect(middlePending, SIGNAL(finished(Tp::PendingOperation*)),
+ this, SLOT(expectPendingHandlesFinished(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
- QVERIFY(disconnect(middlePending, SIGNAL(finished(Telepathy::PendingOperation*)),
- this, SLOT(expectPendingHandlesFinished(Telepathy::PendingOperation*))));
+ QVERIFY(disconnect(middlePending, SIGNAL(finished(Tp::PendingOperation*)),
+ this, SLOT(expectPendingHandlesFinished(Tp::PendingOperation*))));
ReferencedHandles middleHandles = mHandles;
mHandles = ReferencedHandles();
@@ -276,14 +276,14 @@ void TestHandles::testReferences()
mLoop->processEvents();
// Now check that our middle and last handles can still be inspected
- inspectReply = iface.InspectHandles(Telepathy::HandleTypeContact,
- Telepathy::UIntList::fromStdList(std::list<uint>(middleHandles.begin(),
+ inspectReply = iface.InspectHandles(Tp::HandleTypeContact,
+ Tp::UIntList::fromStdList(std::list<uint>(middleHandles.begin(),
middleHandles.end())));
QVERIFY(inspectReply.isValid());
QCOMPARE(inspectReply.value().size(), 3);
- inspectReply = iface.InspectHandles(Telepathy::HandleTypeContact,
- Telepathy::UIntList::fromStdList(std::list<uint>(lastHandles.begin(),
+ inspectReply = iface.InspectHandles(Tp::HandleTypeContact,
+ Tp::UIntList::fromStdList(std::list<uint>(lastHandles.begin(),
lastHandles.end())));
QVERIFY(inspectReply.isValid());
QCOMPARE(inspectReply.value().size(), 3);
@@ -294,8 +294,8 @@ void TestHandles::testReferences()
// However, the telepathy-python 0.15.3 ReleaseHandles implementation is made of cheese. I know
// how to fix it, but until we've released tp-python with the fix, and added a dependency on
// that new version of tp-python for the tests, we can't enable this.
- // inspectReply = iface.InspectHandles(Telepathy::HandleTypeContact,
- // Telepathy::UIntList() << firstHandle);
+ // inspectReply = iface.InspectHandles(Tp::HandleTypeContact,
+ // Tp::UIntList() << firstHandle);
// QVERIFY(!inspectReply.isValid());
Q_UNUSED(firstHandle);
}
@@ -310,9 +310,9 @@ void TestHandles::cleanupTestCase()
// Disconnecting one disconnects them all, because they all poke the same
// remote Connection
QVERIFY(connect(mConn1a->requestDisconnect(),
- SIGNAL(finished(Telepathy::PendingOperation*)),
+ SIGNAL(finished(Tp::PendingOperation*)),
this,
- SLOT(expectSuccessfulCall(Telepathy::PendingOperation*))));
+ SLOT(expectSuccessfulCall(Tp::PendingOperation*))));
QCOMPARE(mLoop->exec(), 0);
delete mCM;
diff --git a/tests/pinocchio/lib.cpp b/tests/pinocchio/lib.cpp
index 789a756..227dbb8 100644
--- a/tests/pinocchio/lib.cpp
+++ b/tests/pinocchio/lib.cpp
@@ -8,8 +8,8 @@
#include <TelepathyQt4/Debug>
#include <TelepathyQt4/DBus>
-using Telepathy::Client::DBus::DBusDaemonInterface;
-using Telepathy::PendingOperation;
+using Tp::Client::DBus::DBusDaemonInterface;
+using Tp::PendingOperation;
PinocchioTest::PinocchioTest(QObject *parent)
: Test(parent)
diff --git a/tests/prototype/prototype.cpp b/tests/prototype/prototype.cpp
index cf61db5..733a862 100644
--- a/tests/prototype/prototype.cpp
+++ b/tests/prototype/prototype.cpp
@@ -69,7 +69,7 @@ namespace
/** Workaround for varying strictness of object path <-> string conversion
* in different Qt 4.5 snapshots */
- QStringList objectPathListToStringList(Telepathy::ObjectPathList list)
+ QStringList objectPathListToStringList(Tp::ObjectPathList list)
{
QStringList ret;
// qDebug() << __PRETTY_FUNCTION__ << "ListCount: " << list.count();
@@ -82,10 +82,10 @@ namespace
QStringList validAccounts()
{
- Telepathy::registerTypes();
- Telepathy::Client::DBus::PropertiesInterface* m_propertiesInterface = new Telepathy::Client::DBus::PropertiesInterface(
+ Tp::registerTypes();
+ Tp::Client::DBus::PropertiesInterface* m_propertiesInterface = new Tp::Client::DBus::PropertiesInterface(
"org.freedesktop.Telepathy.AccountManager",
- "/org/freedesktop/Telepathy/AccountManager",
+ "/org.freedesktop.Telepathy/AccountManager",
NULL );
QDBusPendingReply<QDBusVariant> get = m_propertiesInterface->Get( "org.freedesktop.Telepathy.AccountManager", "ValidAccounts");
get.waitForFinished();
@@ -97,7 +97,7 @@ namespace
return QStringList();
}
- Telepathy::ObjectPathList object_path_list_valid = qdbus_cast<Telepathy::ObjectPathList>( get.value().variant());
+ Tp::ObjectPathList object_path_list_valid = qdbus_cast<Tp::ObjectPathList>( get.value().variant());
if (object_path_list_valid.size() == 0)
{
@@ -131,7 +131,7 @@ void UnitTests::testMissionControlBindings()
{
QSKIP( "The interface NMC4Interface is not included and therefore cannot be tested!", SkipAll );
#if 0 // The interface is currently not created. We don't use it anywhere..
- Telepathy::Client::NMC4Interface mission_control( "org.freedesktop.Telepathy.MissionControl", "/org/freedesktop/Telepathy/MissionControl", this );
+ Tp::Client::NMC4Interface mission_control( "org.freedesktop.Telepathy.MissionControl", "/org.freedesktop.Telepathy/MissionControl", this );
QDBusPendingReply<uint> reply = mission_control.GetPresenceActual();
reply.waitForFinished();
@@ -175,10 +175,10 @@ void UnitTests::testMissionControlBindings()
void UnitTests::testConnectToJabberServer()
{
- Telepathy::registerTypes();
+ Tp::registerTypes();
// 1. Connect to connection manager
- Telepathy::Client::ConnectionManagerInterface cm_interface( "org.freedesktop.Telepathy.ConnectionManager.gabble",
- "/org/freedesktop/Telepathy/ConnectionManager/gabble",
+ Tp::Client::ConnectionManagerInterface cm_interface( "org.freedesktop.Telepathy.ConnectionManager.gabble",
+ "/org.freedesktop.Telepathy/ConnectionManager/gabble",
this );
@@ -186,7 +186,7 @@ void UnitTests::testConnectToJabberServer()
parameter_map.insert( "account", "basyskom at localhost" );
parameter_map.insert( "password", "basyskom" );
parameter_map.insert( "server", "localhost" );
- parameter_map.insert( "resource", "Telepathy" );
+ parameter_map.insert( "resource", "Tp" );
parameter_map.insert( "port", static_cast<uint>(5222) );
// 2. Request a connection to the Jabber server
@@ -214,7 +214,7 @@ void UnitTests::testConnectToJabberServer()
qDebug() << "Connection object path : " << connection_object_path.path();
#endif
- Telepathy::Client::ConnectionInterface connection_interface( connection_service_name,
+ Tp::Client::ConnectionInterface connection_interface( connection_service_name,
connection_object_path.path(),
this );
@@ -235,7 +235,7 @@ void UnitTests::testConnectToJabberServer()
QTest::qWait( 1000 );
- QDBusPendingReply<Telepathy::ChannelInfoList> channel_info_list_reply = connection_interface.ListChannels();
+ QDBusPendingReply<Tp::ChannelInfoList> channel_info_list_reply = connection_interface.ListChannels();
channel_info_list_reply.waitForFinished();
if ( !channel_info_list_reply.isValid() )
@@ -251,8 +251,8 @@ void UnitTests::testConnectToJabberServer()
#if 0
qDebug() << "Available channels:";
- Telepathy::ChannelInfoList channel_list = channel_info_list_reply.value();
- foreach( Telepathy::ChannelInfo channel, channel_list )
+ Tp::ChannelInfoList channel_list = channel_info_list_reply.value();
+ foreach( Tp::ChannelInfo channel, channel_list )
{
qDebug() << "Channel: " << channel.channel.path();
qDebug() << "Type : " << channel.channelType;
@@ -298,12 +298,12 @@ void UnitTests::testAccountManager_createAccount()
parameter_map.insert( "account", "basyskom at localhost" );
parameter_map.insert( "password", "basyskom" );
parameter_map.insert( "server", "localhost" );
- parameter_map.insert( "resource", "Telepathy" );
+ parameter_map.insert( "resource", "Tp" );
parameter_map.insert( "port", static_cast<uint>(5222) );
- Telepathy::registerTypes();
- Telepathy::Client::AccountManagerInterface accountmanager_interface( "org.freedesktop.Telepathy.AccountManager",
- "/org/freedesktop/Telepathy/AccountManager",
+ Tp::registerTypes();
+ Tp::Client::AccountManagerInterface accountmanager_interface( "org.freedesktop.Telepathy.AccountManager",
+ "/org.freedesktop.Telepathy/AccountManager",
this );
QSignalSpy spy_validity_changed( &accountmanager_interface, SIGNAL( AccountValidityChanged( const QDBusObjectPath&, bool ) ) );
@@ -361,13 +361,13 @@ void UnitTests::testAccountManager_listAccount()
void UnitTests::testAccountManager_showProperties()
{
- Telepathy::registerTypes();
+ Tp::registerTypes();
QStringList object_path_list_valid = validAccounts();
QVERIFY2( object_path_list_valid.count() > 0, "No accounts found. Possible reason: testAcountManager_createAccount() was not called before!" );
bool found_correct_display_name = false;
foreach( QString path, object_path_list_valid )
{
- Telepathy::Client::AccountInterface account_interface( "org.freedesktop.Telepathy.AccountManager",
+ Tp::Client::AccountInterface account_interface( "org.freedesktop.Telepathy.AccountManager",
path,
this );
#ifdef ENABLE_DEBUG_OUTPUT_
@@ -377,17 +377,17 @@ void UnitTests::testAccountManager_showProperties()
qDebug() << "Account Enabled :" << account_interface.Enabled();
qDebug() << "Nickname :" << account_interface.Nickname();
qDebug() << "Parameters :" << account_interface.Parameters();
- Telepathy::SimplePresence automatic_presence = account_interface.AutomaticPresence();
+ Tp::SimplePresence automatic_presence = account_interface.AutomaticPresence();
qDebug() << "* Auto Presence type :" << automatic_presence.type;
qDebug() << "* Auto Presence status :" << automatic_presence.status;
qDebug() << "Connection :" << account_interface.Connection().path();
qDebug() << "ConnectionStatus:" << account_interface.ConnectionStatus();
qDebug() << "Connect. Reason :" << account_interface.ConnectionStatusReason();
- Telepathy::SimplePresence current_presence = account_interface.CurrentPresence();
+ Tp::SimplePresence current_presence = account_interface.CurrentPresence();
qDebug() << "* Current Presence type :" << current_presence.type;
qDebug() << "* Current Presence status :" << current_presence.status;
qDebug() << "Auto Connect :" << account_interface.ConnectAutomatically();
- Telepathy::SimplePresence requested_presence = account_interface.RequestedPresence();
+ Tp::SimplePresence requested_presence = account_interface.RequestedPresence();
qDebug() << "* Requested Presence type :" << requested_presence.type;
qDebug() << "* Requested Presence status :" << requested_presence.status;
qDebug() << "Normalized Name :" << account_interface.NormalizedName();
@@ -404,16 +404,16 @@ void UnitTests::testAccountManager_showProperties()
void UnitTests::testAccountManager_removeAccount()
{
{
- Telepathy::Client::AccountManagerInterface accountmanager_interface( "org.freedesktop.Telepathy.AccountManager",
- "/org/freedesktop/Telepathy/AccountManager",
+ Tp::Client::AccountManagerInterface accountmanager_interface( "org.freedesktop.Telepathy.AccountManager",
+ "/org.freedesktop.Telepathy/AccountManager",
this );
- Telepathy::registerTypes();
+ Tp::registerTypes();
QStringList object_path_list_valid = objectPathListToStringList(accountmanager_interface.ValidAccounts());
QVERIFY2( object_path_list_valid.count() > 0, "No accounts found. Possible reason: testAcountManager_createAccount() was not called before!" );
foreach( QString path, object_path_list_valid )
{
- Telepathy::Client::AccountInterface account_interface( "org.freedesktop.Telepathy.AccountManager",
+ Tp::Client::AccountInterface account_interface( "org.freedesktop.Telepathy.AccountManager",
path,
this );
@@ -448,15 +448,15 @@ void UnitTests::testAccountManager_removeAccount()
}
{
// Check whether there are really no accounts left..
- Telepathy::Client::AccountManagerInterface accountmanager_interface( "org.freedesktop.Telepathy.AccountManager",
- "/org/freedesktop/Telepathy/AccountManager",
+ Tp::Client::AccountManagerInterface accountmanager_interface( "org.freedesktop.Telepathy.AccountManager",
+ "/org.freedesktop.Telepathy/AccountManager",
this );
- Telepathy::registerTypes();
+ Tp::registerTypes();
QStringList object_path_list_valid = objectPathListToStringList(accountmanager_interface.ValidAccounts());
int accounts_left = 0;
foreach( QString path, object_path_list_valid )
{
- Telepathy::Client::AccountInterface account_interface( "org.freedesktop.Telepathy.AccountManager",
+ Tp::Client::AccountInterface account_interface( "org.freedesktop.Telepathy.AccountManager",
path,
this );
if ( account_interface.DisplayName() != g_displayName )
@@ -478,7 +478,7 @@ void UnitTests::testPrototypeAccountManager()
parameter_map.insert( "account", "basyskom at localhost" );
parameter_map.insert( "password", "basyskom" );
parameter_map.insert( "server", "localhost" );
- parameter_map.insert( "resource", "Telepathy" );
+ parameter_map.insert( "resource", "Tp" );
parameter_map.insert( "port", static_cast<uint>(5222) );
#if 1// Disable this temporarily if the accounts were not deleted properly
if ( 0 != account_manager->count() )
@@ -579,7 +579,7 @@ void UnitTests::testPrototype_ContactHandling()
qDebug() << "testPrototypeContactHandling Create First Connection";
#endif // ENABLE_DEBUG_OUTPUT_
- QSignalSpy spy_status_changed( connection, SIGNAL( signalStatusChanged( TpPrototype::Connection*, Telepathy::ConnectionStatus, Telepathy::ConnectionStatus ) ) );
+ QSignalSpy spy_status_changed( connection, SIGNAL( signalStatusChanged( TpPrototype::Connection*, Tp::ConnectionStatus, Tp::ConnectionStatus ) ) );
QCOMPARE( spy_status_changed.isValid(), true );
QVERIFY( connection->requestConnect() == true );
@@ -604,7 +604,7 @@ void UnitTests::testPrototype_ContactHandling()
#ifdef ENABLE_DEBUG_OUTPUT_
qDebug() << "testPrototypeContactHandling Creation Second Connection";
#endif// ENABLE_DEBUG_OUTPUT_
- //spy_status_changed( connection2, SIGNAL( signalStatusChanged( TpPrototype::Connection*, Telepathy::ConnectionStatus, Telepathy::ConnectionStatus ) );
+ //spy_status_changed( connection2, SIGNAL( signalStatusChanged( TpPrototype::Connection*, Tp::ConnectionStatus, Tp::ConnectionStatus ) );
QCOMPARE( spy_status_changed.isValid(), true );
QVERIFY( connection2->requestConnect() == true );
@@ -674,7 +674,7 @@ void UnitTests::testPrototype_OwnPresenceChanged()
qDebug() << "testPrototypeContactHandling Create First Connection";
#endif
- QSignalSpy spyConnectionStatusChanged( connection, SIGNAL(signalStatusChanged (TpPrototype::Connection* , Telepathy::ConnectionStatus, Telepathy::ConnectionStatus ) ) );
+ QSignalSpy spyConnectionStatusChanged( connection, SIGNAL(signalStatusChanged (TpPrototype::Connection* , Tp::ConnectionStatus, Tp::ConnectionStatus ) ) );
QVERIFY( connection->requestConnect() == true );
QVERIFY2( waitForSignal( &spyConnectionStatusChanged, 2 ), "Received no signal after connectRequest ");
@@ -684,7 +684,7 @@ void UnitTests::testPrototype_OwnPresenceChanged()
// The presence manager is invalid if no valid presence interface is available
QVERIFY2( true == presence_manager->isValid(), "No compatible presence interface found!" );
- Telepathy::SimpleStatusSpecMap status_map = presence_manager->statuses();
+ Tp::SimpleStatusSpecMap status_map = presence_manager->statuses();
QVERIFY2( status_map.count() != 0, "No presence information returned!" );
QStringList keys = status_map.keys();
@@ -702,7 +702,7 @@ void UnitTests::testPrototype_OwnPresenceChanged()
QVERIFY( keys.contains( "away" ) );
QVERIFY( keys.contains( "offline" ) );
- QSignalSpy spy_state_changed( presence_manager, SIGNAL( signalOwnPresenceUpdated( const TpPrototype::Account*, const Telepathy::SimplePresence& ) ) );
+ QSignalSpy spy_state_changed( presence_manager, SIGNAL( signalOwnPresenceUpdated( const TpPrototype::Account*, const Tp::SimplePresence& ) ) );
QCOMPARE( spy_state_changed.isValid(), true );
@@ -737,7 +737,7 @@ void UnitTests::testPrototype_OwnPresenceChanged()
QCOMPARE( firstSignalEmited.count(), 2 );
- Telepathy::SimplePresence emitedPresence = firstSignalEmited.at(1).value<Telepathy::SimplePresence>() ;
+ Tp::SimplePresence emitedPresence = firstSignalEmited.at(1).value<Tp::SimplePresence>() ;
QCOMPARE( emitedPresence.status , testDataPresenceChangeStatus.at(count) );
QCOMPARE( emitedPresence.statusMessage , testDataPresenceChangeStatusMessage.at(count) );
@@ -775,13 +775,13 @@ void UnitTests::testTextChatFunction()
TpPrototype::Connection* conn_1 = acc_1->connection();
QVERIFY( conn_1 );
- QSignalSpy spy_conn_1_status_changed( conn_1, SIGNAL( signalStatusChanged( TpPrototype::Connection*, Telepathy::ConnectionStatus, Telepathy::ConnectionStatus ) ) );
+ QSignalSpy spy_conn_1_status_changed( conn_1, SIGNAL( signalStatusChanged( TpPrototype::Connection*, Tp::ConnectionStatus, Tp::ConnectionStatus ) ) );
QCOMPARE( spy_conn_1_status_changed.isValid(), true );
QTest::qWait( 1000 );
QVERIFY( conn_1->requestConnect() == true );
- QSignalSpy spy_conn_2_status_changed( conn_2, SIGNAL( signalStatusChanged( TpPrototype::Connection*, Telepathy::ConnectionStatus, Telepathy::ConnectionStatus ) ) );
+ QSignalSpy spy_conn_2_status_changed( conn_2, SIGNAL( signalStatusChanged( TpPrototype::Connection*, Tp::ConnectionStatus, Tp::ConnectionStatus ) ) );
QCOMPARE( spy_conn_2_status_changed.isValid(), true );
QTest::qWait( 1000 );
@@ -829,7 +829,7 @@ void UnitTests::testTextChatFunction()
// Send message to account2 from account1
- QString message("get in touch with Telepathy QT4");
+ QString message("get in touch with Tp QT4");
QSignalSpy spy_message(contact_manager_2 , SIGNAL( signalTextChannelOpenedForContact( TpPrototype::Contact* contact ) ));
@@ -907,7 +907,7 @@ void UnitTests::testReconnect()
QVERIFY( connection );
qDebug() << "testPrototypeContactHandling Create First Connection";
- QSignalSpy spy_status_changed( connection, SIGNAL( signalStatusChanged( TpPrototype::Connection*, Telepathy::ConnectionStatus, Telepathy::ConnectionStatus ) ) );
+ QSignalSpy spy_status_changed( connection, SIGNAL( signalStatusChanged( TpPrototype::Connection*, Tp::ConnectionStatus, Tp::ConnectionStatus ) ) );
QCOMPARE( spy_status_changed.isValid(), true );
QTest::qWait( 1000 );
@@ -964,7 +964,7 @@ void UnitTests::testCapabilityManager()
QVERIFY( connection->capabilitiesManager() == NULL );
QVERIFY( connection->requestConnect() == true );
- QSignalSpy spyConnectionStatusChanged( connection, SIGNAL(signalStatusChanged (TpPrototype::Connection* , Telepathy::ConnectionStatus, Telepathy::ConnectionStatus ) ) );
+ QSignalSpy spyConnectionStatusChanged( connection, SIGNAL(signalStatusChanged (TpPrototype::Connection* , Tp::ConnectionStatus, Tp::ConnectionStatus ) ) );
QVERIFY2( waitForSignal( &spyConnectionStatusChanged, 2 ), "Received no signal after connectRequest ");
TpPrototype::CapabilitiesManager* cap_manager = connection->capabilitiesManager();
@@ -984,7 +984,7 @@ void UnitTests::testCapabilityManager()
#ifdef ENABLE_DEBUG_OUTPUT_
qDebug() << "Contact: " << contact->name();
#endif
- foreach( Telepathy::ContactCapability cap, contact->capabilities() )
+ foreach( Tp::ContactCapability cap, contact->capabilities() )
{
#ifdef ENABLE_DEBUG_OUTPUT_
qDebug() << "capabilitiesChannelType:" << cap.channelType << "capabilitiesGenericFlags:" << cap.genericFlags << "capabilitiesTypeSpecificFlags:" << cap.typeSpecificFlags;
@@ -994,7 +994,7 @@ void UnitTests::testCapabilityManager()
}
}
- foreach( Telepathy::ContactCapability cap, cap_manager->capabilities() )
+ foreach( Tp::ContactCapability cap, cap_manager->capabilities() )
{
#ifdef ENABLE_DEBUG_OUTPUT_
qDebug() << "My capabilities: capabilitiesChannelType:" << cap.channelType << "capabilitiesGenericFlags:" << cap.genericFlags << "capabilitiesTypeSpecificFlags:" << cap.typeSpecificFlags;
@@ -1005,18 +1005,18 @@ void UnitTests::testCapabilityManager()
// Now checking setting of capabilities and whether we receive a signal after that..
- QSignalSpy spy_own_capability_changed( cap_manager, SIGNAL( signalOwnCapabilityChanged( const Telepathy::CapabilityChange& ) ) );
+ QSignalSpy spy_own_capability_changed( cap_manager, SIGNAL( signalOwnCapabilityChanged( const Tp::CapabilityChange& ) ) );
QCOMPARE( spy_own_capability_changed.isValid(), true );
- Telepathy::CapabilityPair new_capability = { "org.freedesktop.Telepathy.Channel.Type.StreamedMedia", 15 }; // See Telepathy D-Bus spec section "Channel_Media_Capabilities"
- Telepathy::CapabilityPairList capability_list;
+ Tp::CapabilityPair new_capability = { "org.freedesktop.Telepathy.Channel.Type.StreamedMedia", 15 }; // See Tp D-Bus spec section "Channel_Media_Capabilities"
+ Tp::CapabilityPairList capability_list;
capability_list << new_capability;
QVERIFY( cap_manager->setCapabilities( capability_list ) );
QVERIFY2( waitForSignal( &spy_own_capability_changed ), "Received no signal after changing my capability! ");
bool found_media_stream_channel = false;
- foreach( Telepathy::ContactCapability cap, cap_manager->capabilities() )
+ foreach( Tp::ContactCapability cap, cap_manager->capabilities() )
{
#ifdef ENABLE_DEBUG_OUTPUT_
qDebug() << "My changed capabilities: capabilitiesChannelType:" << cap.channelType << "capabilitiesGenericFlags:" << cap.genericFlags << "capabilitiesTypeSpecificFlags:" << cap.typeSpecificFlags;
@@ -1059,7 +1059,7 @@ void UnitTests::testAvatarManager()
TpPrototype::Connection* connection = account->connection();
QVERIFY( connection );
- QSignalSpy spyConnectionStatusChanged( connection, SIGNAL(signalStatusChanged (TpPrototype::Connection* , Telepathy::ConnectionStatus, Telepathy::ConnectionStatus ) ) );
+ QSignalSpy spyConnectionStatusChanged( connection, SIGNAL(signalStatusChanged (TpPrototype::Connection* , Tp::ConnectionStatus, Tp::ConnectionStatus ) ) );
QVERIFY( connection->requestConnect() == true );
QVERIFY2( waitForSignal( &spyConnectionStatusChanged, 2 ), "Received no signal after connectRequest ");
@@ -1156,7 +1156,7 @@ void UnitTests::testStreamedMedia_receiveCall()
TpPrototype::Connection* connection = account->connection();
QVERIFY( connection );
- QSignalSpy spyConnectionStatusChanged( connection, SIGNAL(signalStatusChanged (TpPrototype::Connection* , Telepathy::ConnectionStatus, Telepathy::ConnectionStatus ) ) );
+ QSignalSpy spyConnectionStatusChanged( connection, SIGNAL(signalStatusChanged (TpPrototype::Connection* , Tp::ConnectionStatus, Tp::ConnectionStatus ) ) );
QVERIFY( connection->requestConnect() == true );
QVERIFY2( waitForSignal( &spyConnectionStatusChanged, 2 ), "Received no signal after connectRequest ");
@@ -1168,11 +1168,11 @@ void UnitTests::testStreamedMedia_receiveCall()
TpPrototype::CapabilitiesManager* capabilities_manager = connection->capabilitiesManager();
QVERIFY( NULL != capabilities_manager );
- Telepathy::CapabilityPair new_capability = { "org.freedesktop.Telepathy.Channel.Type.StreamedMedia",
- Telepathy::ChannelMediaCapabilityAudio
- | Telepathy::ChannelMediaCapabilityVideo
- | Telepathy::ChannelMediaCapabilityNATTraversalGTalkP2P }; // See Telepathy D-Bus spec section "Channel_Media_Capabilities"
- Telepathy::CapabilityPairList capability_list;
+ Tp::CapabilityPair new_capability = { "org.freedesktop.Telepathy.Channel.Type.StreamedMedia",
+ Tp::ChannelMediaCapabilityAudio
+ | Tp::ChannelMediaCapabilityVideo
+ | Tp::ChannelMediaCapabilityNATTraversalGTalkP2P }; // See Tp D-Bus spec section "Channel_Media_Capabilities"
+ Tp::CapabilityPairList capability_list;
capability_list << new_capability;
capabilities_manager->setCapabilities( capability_list );
@@ -1250,7 +1250,7 @@ void UnitTests::testStreamedMedia_outgoingCall()
TpPrototype::Connection* connection = account->connection();
QVERIFY( connection );
- QSignalSpy spyConnectionStatusChanged( connection, SIGNAL(signalStatusChanged (TpPrototype::Connection* , Telepathy::ConnectionStatus, Telepathy::ConnectionStatus ) ) );
+ QSignalSpy spyConnectionStatusChanged( connection, SIGNAL(signalStatusChanged (TpPrototype::Connection* , Tp::ConnectionStatus, Tp::ConnectionStatus ) ) );
QVERIFY( connection->requestConnect() == true );
QVERIFY2( waitForSignal( &spyConnectionStatusChanged, 2 ), "Received no signal after connectRequest ");
@@ -1267,7 +1267,7 @@ void UnitTests::testStreamedMedia_outgoingCall()
QList<QPointer<TpPrototype::Contact> > ,
QList<QPointer<TpPrototype::Contact> > ,
TpPrototype::Contact* ,
- Telepathy::ChannelGroupChangeReason )
+ Tp::ChannelGroupChangeReason )
) );
QCOMPARE( spy_for_contacts.isValid(), true );
waitForSignal( &spy_for_contacts );
@@ -1283,12 +1283,12 @@ void UnitTests::testStreamedMedia_outgoingCall()
TpPrototype::StreamedMediaChannel* media_channel = contact->streamedMediaChannel();
QVERIFY( NULL != media_channel );
- media_channel->requestChannel( QList<Telepathy::MediaStreamType>() << Telepathy::MediaStreamTypeAudio );
+ media_channel->requestChannel( QList<Tp::MediaStreamType>() << Tp::MediaStreamTypeAudio );
QTest::qWait( 50000 );
#if 0
- media_channel->requestChannel( QList<Telepathy::MediaStreamType>() << Telepathy::MediaStreamTypeAudio );
+ media_channel->requestChannel( QList<Tp::MediaStreamType>() << Tp::MediaStreamTypeAudio );
QTest::qWait( 10000 );
#endif
@@ -1322,7 +1322,7 @@ void UnitTests::testBlockingSupport()
TpPrototype::Connection* connection = account->connection();
QVERIFY( connection );
- QSignalSpy spyConnectionStatusChanged( connection, SIGNAL(signalStatusChanged (TpPrototype::Connection* , Telepathy::ConnectionStatus, Telepathy::ConnectionStatus ) ) );
+ QSignalSpy spyConnectionStatusChanged( connection, SIGNAL(signalStatusChanged (TpPrototype::Connection* , Tp::ConnectionStatus, Tp::ConnectionStatus ) ) );
QVERIFY( connection->requestConnect() == true );
QVERIFY2( waitForSignal( &spyConnectionStatusChanged, 2 ), "Received no signal after connectRequest ");
@@ -1339,7 +1339,7 @@ void UnitTests::testBlockingSupport()
QList<QPointer<TpPrototype::Contact> > ,
QList<QPointer<TpPrototype::Contact> > ,
TpPrototype::Contact* ,
- Telepathy::ChannelGroupChangeReason )
+ Tp::ChannelGroupChangeReason )
) );
QCOMPARE( spy_for_contacts.isValid(), true );
waitForSignal( &spy_for_contacts );
diff --git a/tests/prototype/prototype.h b/tests/prototype/prototype.h
index 2883819..74af22f 100644
--- a/tests/prototype/prototype.h
+++ b/tests/prototype/prototype.h
@@ -38,7 +38,7 @@ public:
*/
void testMissionControlBindings();
- /** Connects and disconnects to jabber server. Uses and testing of Qt bindings for Telepathy */
+ /** Connects and disconnects to jabber server. Uses and testing of Qt bindings for Tp */
void testConnectToJabberServer();
/** Tests whether the existing connection managers can be discovered. */
diff --git a/tools/libqt4codegen.py b/tools/libqt4codegen.py
index de30d05..cf57408 100644
--- a/tools/libqt4codegen.py
+++ b/tools/libqt4codegen.py
@@ -85,7 +85,7 @@ def binding_from_usage(sig, tptype, custom_lists, external=False, explicit_own_n
custom_type = True
if external:
- tptype = 'Telepathy::' + tptype
+ tptype = 'Tp::' + tptype
elif explicit_own_ns:
tptype = explicit_own_ns + '::' + tptype
diff --git a/tools/qt4-client-gen.py b/tools/qt4-client-gen.py
index fea4aa5..868bc68 100644
--- a/tools/qt4-client-gen.py
+++ b/tools/qt4-client-gen.py
@@ -39,7 +39,7 @@ class Generator(object):
self.mainiface = opts.get('--mainiface', None)
self.must_define = opts.get('--must-define', None)
self.dbus_proxy = opts.get('--dbus-proxy',
- 'Telepathy::DBusProxy')
+ 'Tp::DBusProxy')
ifacedom = xml.dom.minidom.parse(opts['--ifacexml'])
specdom = xml.dom.minidom.parse(opts['--specxml'])
except KeyError, k:
@@ -148,7 +148,7 @@ namespace %s
*
* Proxy class providing a 1:1 mapping of the D-Bus interface "%(dbusname)s."
*/
-class %(name)s : public Telepathy::AbstractInterface
+class %(name)s : public Tp::AbstractInterface
{
Q_OBJECT
@@ -198,12 +198,12 @@ public:
self.b("""
%(name)s::%(name)s(const QString& busName, const QString& objectPath, QObject *parent)
- : Telepathy::AbstractInterface(busName, objectPath, staticInterfaceName(), QDBusConnection::sessionBus(), parent)
+ : Tp::AbstractInterface(busName, objectPath, staticInterfaceName(), QDBusConnection::sessionBus(), parent)
{
}
%(name)s::%(name)s(const QDBusConnection& connection, const QString& busName, const QString& objectPath, QObject *parent)
- : Telepathy::AbstractInterface(busName, objectPath, staticInterfaceName(), connection, parent)
+ : Tp::AbstractInterface(busName, objectPath, staticInterfaceName(), connection, parent)
{
}
""" % {'name' : name})
@@ -222,14 +222,14 @@ public:
self.b("""
%(name)s::%(name)s(%(dbus_proxy)s *proxy)
- : Telepathy::AbstractInterface(proxy, staticInterfaceName())
+ : Tp::AbstractInterface(proxy, staticInterfaceName())
{
}
""" % {'name' : name,
'dbus_proxy' : self.dbus_proxy})
# Main interface
- mainiface = self.mainiface or 'Telepathy::AbstractInterface'
+ mainiface = self.mainiface or 'Tp::AbstractInterface'
if mainiface != self.namespace + '::' + name:
self.h("""
@@ -255,12 +255,12 @@ public:
self.b("""
%(name)s::%(name)s(const %(mainiface)s& mainInterface)
- : Telepathy::AbstractInterface(mainInterface.service(), mainInterface.path(), staticInterfaceName(), mainInterface.connection(), mainInterface.parent())
+ : Tp::AbstractInterface(mainInterface.service(), mainInterface.path(), staticInterfaceName(), mainInterface.connection(), mainInterface.parent())
{
}
%(name)s::%(name)s(const %(mainiface)s& mainInterface, QObject *parent)
- : Telepathy::AbstractInterface(mainInterface.service(), mainInterface.path(), staticInterfaceName(), mainInterface.connection(), parent)
+ : Tp::AbstractInterface(mainInterface.service(), mainInterface.path(), staticInterfaceName(), mainInterface.connection(), parent)
{
}
""" % {'name' : name,
@@ -301,11 +301,11 @@ Q_SIGNALS:\
# specific signals in order to remove its signal match rules)
self.h("""
protected:
- virtual void invalidate(Telepathy::DBusProxy *, const QString &, const QString &);
+ virtual void invalidate(Tp::DBusProxy *, const QString &, const QString &);
""")
self.b("""
-void %(name)s::invalidate(Telepathy::DBusProxy *proxy,
+void %(name)s::invalidate(Tp::DBusProxy *proxy,
const QString &error, const QString &message)
{
""" % {'name' : name})
@@ -314,7 +314,7 @@ void %(name)s::invalidate(Telepathy::DBusProxy *proxy,
self.do_signal_disconnect(signal)
self.b("""
- Telepathy::AbstractInterface::invalidate(proxy, error, message);
+ Tp::AbstractInterface::invalidate(proxy, error, message);
}
""")
--
1.5.6.5
More information about the telepathy-commits
mailing list