X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fpeerfactory.cpp;h=cd0987b4e9669edc799981c06a8be7fc2ac60cab;hp=655a6e11291c963f33adf44836b72a50e250ba4f;hb=e67887343c433cc35bc26ad6a9392588f427e746;hpb=02cfb595a6b78faf332ddbe2d7b997eb0e0293fb diff --git a/src/common/peerfactory.cpp b/src/common/peerfactory.cpp index 655a6e11..cd0987b4 100644 --- a/src/common/peerfactory.cpp +++ b/src/common/peerfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2014 by the Quassel Project * + * Copyright (C) 2005-2015 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -27,34 +27,34 @@ PeerFactory::ProtoList PeerFactory::supportedProtocols() { ProtoList result; - result.append(ProtoDescriptor(Protocol::LegacyProtocol, 0)); result.append(ProtoDescriptor(Protocol::DataStreamProtocol, DataStreamPeer::supportedFeatures())); + result.append(ProtoDescriptor(Protocol::LegacyProtocol, 0)); return result; } -RemotePeer *PeerFactory::createPeer(const ProtoDescriptor &protocol, AuthHandler *authHandler, QTcpSocket *socket, QObject *parent) +RemotePeer *PeerFactory::createPeer(const ProtoDescriptor &protocol, AuthHandler *authHandler, QTcpSocket *socket, Compressor::CompressionLevel level, QObject *parent) { - return createPeer(ProtoList() << protocol, authHandler, socket, parent); + return createPeer(ProtoList() << protocol, authHandler, socket, level, parent); } -RemotePeer *PeerFactory::createPeer(const ProtoList &protocols, AuthHandler *authHandler, QTcpSocket *socket, QObject *parent) +RemotePeer *PeerFactory::createPeer(const ProtoList &protocols, AuthHandler *authHandler, QTcpSocket *socket, Compressor::CompressionLevel level, QObject *parent) { foreach(const ProtoDescriptor &protodesc, protocols) { Protocol::Type proto = protodesc.first; quint16 features = protodesc.second; switch(proto) { case Protocol::LegacyProtocol: - return new LegacyPeer(authHandler, socket, parent); + return new LegacyPeer(authHandler, socket, level, parent); case Protocol::DataStreamProtocol: if (DataStreamPeer::acceptsFeatures(features)) - return new DataStreamPeer(authHandler, socket, features, parent); + return new DataStreamPeer(authHandler, socket, features, level, parent); break; default: break; } } - return 0; + return nullptr; }