summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk>2010-11-09 16:20:27 (GMT)
committerAndre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk>2010-11-09 16:20:27 (GMT)
commit0e1db5e80b8d0667d7c684b3ea561da22093dfe8 (patch)
tree6315d95d6a46243158d29d4185182523722f4234
parentd77fd10630ce9442c35e3fc62069ba112cc0f59c (diff)
downloadtelepathy-qt4-0e1db5e80b8d0667d7c684b3ea561da22093dfe8.tar.gz
telepathy-qt4-0e1db5e80b8d0667d7c684b3ea561da22093dfe8.tar.xz
Account: Deprecate createConferenceMediaCall and added new createConferenceStreamedMediaCall.
-rw-r--r--TelepathyQt4/account.cpp30
-rw-r--r--TelepathyQt4/account.h14
2 files changed, 40 insertions, 4 deletions
diff --git a/TelepathyQt4/account.cpp b/TelepathyQt4/account.cpp
index 7251bc1..15d7c7b 100644
--- a/TelepathyQt4/account.cpp
+++ b/TelepathyQt4/account.cpp
@@ -2215,7 +2215,7 @@ PendingChannelRequest *Account::createFileTransfer(
* when the call has finished.
* \sa ensureChannel(), createChannel()
*/
-PendingChannelRequest *Account::createConferenceMediaCall(
+PendingChannelRequest *Account::createConferenceStreamedMediaCall(
const QList<ChannelPtr> &channels,
const QStringList &initialInviteeContactsIdentifiers,
const QDateTime &userActionTime,
@@ -2232,6 +2232,19 @@ PendingChannelRequest *Account::createConferenceMediaCall(
}
/**
+ * \deprecated Use createConferenceStreamedMediaCall() instead.
+ */
+PendingChannelRequest *Account::createConferenceMediaCall(
+ const QList<ChannelPtr> &channels,
+ const QStringList &initialInviteeContactsIdentifiers,
+ const QDateTime &userActionTime,
+ const QString &preferredHandler)
+{
+ return createConferenceStreamedMediaCall(channels, initialInviteeContactsIdentifiers,
+ userActionTime, preferredHandler);
+}
+
+/**
* Start a request to create a conference media call with the given
* channels \a channels.
*
@@ -2250,7 +2263,7 @@ PendingChannelRequest *Account::createConferenceMediaCall(
* when the call has finished.
* \sa ensureChannel(), createChannel()
*/
-PendingChannelRequest *Account::createConferenceMediaCall(
+PendingChannelRequest *Account::createConferenceStreamedMediaCall(
const QList<ChannelPtr> &channels,
const QList<ContactPtr> &initialInviteeContacts,
const QDateTime &userActionTime,
@@ -2269,6 +2282,19 @@ PendingChannelRequest *Account::createConferenceMediaCall(
}
/**
+ * \deprecated Use createConferenceStreamedMediaCall() instead.
+ */
+PendingChannelRequest *Account::createConferenceMediaCall(
+ const QList<ChannelPtr> &channels,
+ const QList<ContactPtr> &initialInviteeContacts,
+ const QDateTime &userActionTime,
+ const QString &preferredHandler)
+{
+ return createConferenceStreamedMediaCall(channels, initialInviteeContacts,
+ userActionTime, preferredHandler);
+}
+
+/**
* Start a request to create a conference text chat with the given
* channels \a channels.
*
diff --git a/TelepathyQt4/account.h b/TelepathyQt4/account.h
index 7e38234..ccf01c0 100644
--- a/TelepathyQt4/account.h
+++ b/TelepathyQt4/account.h
@@ -303,12 +303,22 @@ public:
const QDateTime &userActionTime = QDateTime::currentDateTime(),
const QString &preferredHandler = QString());
- PendingChannelRequest *createConferenceMediaCall(
+ TELEPATHY_QT4_DEPRECATED PendingChannelRequest *createConferenceMediaCall(
const QList<ChannelPtr> &channels,
const QStringList &initialInviteeContactsIdentifiers = QStringList(),
const QDateTime &userActionTime = QDateTime::currentDateTime(),
const QString &preferredHandler = QString());
- PendingChannelRequest *createConferenceMediaCall(
+ TELEPATHY_QT4_DEPRECATED PendingChannelRequest *createConferenceMediaCall(
+ const QList<ChannelPtr> &channels,
+ const QList<ContactPtr> &initialInviteeContacts = QList<ContactPtr>(),
+ const QDateTime &userActionTime = QDateTime::currentDateTime(),
+ const QString &preferredHandler = QString());
+ PendingChannelRequest *createConferenceStreamedMediaCall(
+ const QList<ChannelPtr> &channels,
+ const QStringList &initialInviteeContactsIdentifiers = QStringList(),
+ const QDateTime &userActionTime = QDateTime::currentDateTime(),
+ const QString &preferredHandler = QString());
+ PendingChannelRequest *createConferenceStreamedMediaCall(
const QList<ChannelPtr> &channels,
const QList<ContactPtr> &initialInviteeContacts = QList<ContactPtr>(),
const QDateTime &userActionTime = QDateTime::currentDateTime(),