aboutsummaryrefslogtreecommitdiff
path: root/src/client/QXmppTransferManager.h
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@wifirst.fr>2012-09-11 07:58:27 +0200
committerJeremy Lainé <jeremy.laine@wifirst.fr>2012-09-11 07:58:27 +0200
commita2ec42b2376ad949d2aad121ae8b4376dc613d80 (patch)
tree5fe20ebf47e1e53ce4b5facd3cacb2162509fb5e /src/client/QXmppTransferManager.h
parent7aaa28a56371590ac4e23c6c8c4f4f2b823cacfb (diff)
parent67a3e2c205d340b9accd4746cc1367e1408c3b8f (diff)
downloadqxmpp-a2ec42b2376ad949d2aad121ae8b4376dc613d80.tar.gz
Merge branch 'master' of https://code.google.com/p/qxmpp
Diffstat (limited to 'src/client/QXmppTransferManager.h')
-rw-r--r--src/client/QXmppTransferManager.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/client/QXmppTransferManager.h b/src/client/QXmppTransferManager.h
index b9768a48..cff0c03a 100644
--- a/src/client/QXmppTransferManager.h
+++ b/src/client/QXmppTransferManager.h
@@ -59,6 +59,9 @@ public:
QString name() const;
void setName(const QString &name);
+ QString description() const;
+ void setDescription(const QString &description);
+
qint64 size() const;
void setSize(qint64 size);
@@ -248,7 +251,7 @@ signals:
void jobFinished(QXmppTransferJob *job);
public slots:
- QXmppTransferJob *sendFile(const QString &jid, const QString &filePath, const QString &sid = QString());
+ QXmppTransferJob *sendFile(const QString &jid, const QString &filePath, const QString &sid = QString(), const QString &description = QString());
QXmppTransferJob *sendFile(const QString &jid, QIODevice *device, const QXmppTransferFileInfo &fileInfo, const QString &sid = QString());
protected: