X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fpeerfactory.cpp;h=498495c719a310430ce3f33f5c61e23bcefec102;hp=0dc0140d38b7eb054c892d072636822371e99068;hb=c1cf157116de7fc3da96203aa6f03c38c7ebb650;hpb=db9bba48e1674f169d1ed3cf184e5fa56dbe3a80 diff --git a/src/common/peerfactory.cpp b/src/common/peerfactory.cpp index 0dc0140d..498495c7 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-2018 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -23,7 +23,6 @@ #include "protocols/datastream/datastreampeer.h" #include "protocols/legacy/legacypeer.h" - PeerFactory::ProtoList PeerFactory::supportedProtocols() { ProtoList result; @@ -32,29 +31,29 @@ PeerFactory::ProtoList PeerFactory::supportedProtocols() 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) { + 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); - case Protocol::DataStreamProtocol: - if (DataStreamPeer::acceptsFeatures(features)) - return new DataStreamPeer(authHandler, socket, features, parent); - break; - default: - break; + switch (proto) { + case Protocol::LegacyProtocol: + return new LegacyPeer(authHandler, socket, level, parent); + case Protocol::DataStreamProtocol: + if (DataStreamPeer::acceptsFeatures(features)) + return new DataStreamPeer(authHandler, socket, features, level, parent); + break; + default: + break; } } - return 0; + return nullptr; }