← Back to branch summary

~ubuntu-branches/ubuntu/vivid/quassel/vivid-updates

« back to all changes in this revision

Viewing changes to src/common/peerfactory.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2014-03-16 17:49:07 UTC
  • mfrom: (1.1.55)
  • Revision ID: package-import@ubuntu.com-20140316174907-0d5f03zhdmv03chp
Tags: 0.10~rc1-0ubuntu1
New upstream RC release

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/common/peerfactory.cpp
33
33
}
34
34
 
35
35
 
36
 
RemotePeer *PeerFactory::createPeer(const ProtoDescriptor &protocol, AuthHandler *authHandler, QTcpSocket *socket, QObject *parent)
 
36
RemotePeer *PeerFactory::createPeer(const ProtoDescriptor &protocol, AuthHandler *authHandler, QTcpSocket *socket, Compressor::CompressionLevel level, QObject *parent)
37
37
{
38
 
    return createPeer(ProtoList() << protocol, authHandler, socket, parent);
 
38
    return createPeer(ProtoList() << protocol, authHandler, socket, level, parent);
39
39
}
40
40
 
41
41
 
42
 
RemotePeer *PeerFactory::createPeer(const ProtoList &protocols, AuthHandler *authHandler, QTcpSocket *socket, QObject *parent)
 
42
RemotePeer *PeerFactory::createPeer(const ProtoList &protocols, AuthHandler *authHandler, QTcpSocket *socket, Compressor::CompressionLevel level, QObject *parent)
43
43
{
44
44
    foreach(const ProtoDescriptor &protodesc, protocols) {
45
45
        Protocol::Type proto = protodesc.first;
46
46
        quint16 features = protodesc.second;
47
47
        switch(proto) {
48
48
            case Protocol::LegacyProtocol:
49
 
                return new LegacyPeer(authHandler, socket, parent);
 
49
                return new LegacyPeer(authHandler, socket, level, parent);
50
50
            case Protocol::DataStreamProtocol:
51
51
                if (DataStreamPeer::acceptsFeatures(features))
52
 
                    return new DataStreamPeer(authHandler, socket, features, parent);
 
52
                    return new DataStreamPeer(authHandler, socket, features, level, parent);
53
53
                break;
54
54
            default:
55
55
                break;