← Back to branch summary

~ubuntu-branches/ubuntu/trusty/kopete/trusty

« back to all changes in this revision

Viewing changes to protocols/testbed/testbedcontact.h

  • Committer: Package Import Robot
  • Author(s): Rohan Garg
  • Date: 2013-11-23 17:46:40 UTC
  • mfrom: (1.1.7)
  • Revision ID: package-import@ubuntu.com-20131123174640-gz1zjv1xqh81bi2h
Tags: 4:4.11.80-0ubuntu1
* New upstream beta release
* Bump build dependency to libotr5-dev
* Update symbols
* Update install files
* Drop new_linphone.diff, not required anymore

Show diffs side-by-side

added added

removed removed

Lines of Context:
protocols/testbed/testbedcontact.h
18
18
#define TESTBEDCONTACT_H
19
19
 
20
20
#include <qmap.h>
21
 
//Added by qt3to4:
22
21
#include <QList>
23
22
#include "kopetecontact.h"
24
23
#include "kopetemessage.h"
42
41
        enum Type { Null, Echo, Group };
43
42
 
44
43
        TestbedContact( Kopete::Account* _account, const QString &uniqueName, 
45
 
                        const QString &displayName, 
46
44
                        Kopete::MetaContact *parent );
47
45
 
48
46
    ~TestbedContact();
58
56
         * Return the actions for this contact
59
57
         */
60
58
        virtual QList<KAction *> *customContextMenuActions();
 
59
        using Kopete::Contact::customContextMenuActions;
61
60
        /**
62
61
         * Returns a Kopete::ChatSession associated with this contact
63
62
         */