summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordknn <yoann.blein@free.fr>2012-08-06 14:40:13 (GMT)
committerdknn <yoann.blein@free.fr>2012-09-22 09:32:38 (GMT)
commitd62f8088b8cc42417f97a3b5c3f99bf9288593d4 (patch)
tree46861355d40bfe5e18088496abc9654e0dbaa00c /Swift/QtUI/QtChatView.h
parent343f88e3048887e83cc91bb710510b3aa618f779 (diff)
downloadswift-contrib-d62f8088b8cc42417f97a3b5c3f99bf9288593d4.zip
swift-contrib-d62f8088b8cc42417f97a3b5c3f99bf9288593d4.tar.bz2
Add support for multiple sharing and control in chat view
Diffstat (limited to 'Swift/QtUI/QtChatView.h')
-rw-r--r--Swift/QtUI/QtChatView.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/Swift/QtUI/QtChatView.h b/Swift/QtUI/QtChatView.h
index 9080808..403dec0 100644
--- a/Swift/QtUI/QtChatView.h
+++ b/Swift/QtUI/QtChatView.h
@@ -17,6 +17,7 @@
#include "ChatSnippet.h"
#include <Swift/Controllers/UIInterfaces/ChatWindow.h>
+#include <Swiften/ScreenSharing/ScreenSharing.h>
class QWebPage;
class QUrl;
@@ -43,7 +44,8 @@ namespace Swift {
QString getLastSentMessage();
void addToJSEnvironment(const QString&, QObject*);
void setFileTransferProgress(QString id, const int percentageDone);
- void setFileTransferStatus(QString id, const ChatWindow::FileTransferState state, const QString& msg);
+ void setFileTransferStatus(QString id, const ChatWindow::FileTransferState state, const QString& /*msg*/);
+ void setScreenSharingStatus(QString id, ScreenSharing::SCState state, const QString& msg);
void setWhiteboardSessionStatus(QString id, const ChatWindow::WhiteboardSessionState state);
void setMUCInvitationJoined(QString id);
void showEmoticons(bool show);