~ubuntu-branches/ubuntu/lucid/kmess/lucid

« back to all changes in this revision

Viewing changes to src/chat/chatmaster.h

  • Committer: Bazaar Package Importer
  • Author(s): Mark Purcell
  • Date: 2009-12-05 21:19:26 UTC
  • mfrom: (1.1.7 upstream) (0.1.8 sid)
  • Revision ID: james.westby@ubuntu.com-20091205211926-r26u8j38kysf6o2p
Tags: 2.0.2-1
* New upstream release 
  - Fixes friendly names (LP: #485640)
* Update Homepage: http://kmess.org
* Add Build-Depends: libphonon-dev | libqt4-phonon-dev (ubuntu friendly)
* kmess.1 fix lintian:hyphen-used-as-minus-sign

Show diffs side-by-side

added added

removed removed

Lines of Context:
21
21
#include "../network/chatmessage.h"
22
22
#include "../network/chatinformation.h"
23
23
#include "../network/mimemessage.h"
 
24
#include "../contact/contactbase.h"
24
25
 
25
26
#include <QList>
26
27
 
115
116
    // Deliver a message from a Application to the switchboard connection.
116
117
    void               slotDeliverMimeMessage(const MimeMessage &message, const QString &handle, bool privateChatRequired);
117
118
    // The switchboard or p2p application received a Ink message.
118
 
    void               slotGotInkMessage( const QString &inkData, const QString &handle );
 
119
    void               slotGotInkMessage( const QString &inkData, const QString &handle, InkFormat format );
119
120
    // The switchboard received a Mime message
120
121
    void               slotGotMessage(const MimeMessage &message, const QString &handle);
121
122
    // The switchboard received a P2P message