diff --git a/Telegram/SourceFiles/mtproto/connection_resolving.cpp b/Telegram/SourceFiles/mtproto/connection_resolving.cpp index d7f5cba21..4d9d535c4 100644 --- a/Telegram/SourceFiles/mtproto/connection_resolving.cpp +++ b/Telegram/SourceFiles/mtproto/connection_resolving.cpp @@ -178,7 +178,7 @@ TimeMs ResolvingConnection::pingTime() const { } TimeMs ResolvingConnection::fullConnectTimeout() const { - return kOneConnectionTimeout * std::max(_proxy.resolvedIPs.size(), 1U); + return kOneConnectionTimeout * qMax(int(_proxy.resolvedIPs.size()), 1); } void ResolvingConnection::sendData(mtpBuffer &buffer) { diff --git a/Telegram/SourceFiles/mtproto/special_config_request.cpp b/Telegram/SourceFiles/mtproto/special_config_request.cpp index 8b8b21423..4d04783df 100644 --- a/Telegram/SourceFiles/mtproto/special_config_request.cpp +++ b/Telegram/SourceFiles/mtproto/special_config_request.cpp @@ -129,18 +129,6 @@ QByteArray ConcatenateDnsTxtFields(const std::vector &response) { } // namespace -struct ServiceWebRequest { - ServiceWebRequest(not_null reply); - ServiceWebRequest(ServiceWebRequest &&other); - ServiceWebRequest &operator=(ServiceWebRequest &&other); - ~ServiceWebRequest(); - - void destroy(); - - QPointer reply; - -}; - ServiceWebRequest::ServiceWebRequest(not_null reply) : reply(reply.get()) { } diff --git a/Telegram/SourceFiles/mtproto/special_config_request.h b/Telegram/SourceFiles/mtproto/special_config_request.h index ddeabbf01..d56744ae5 100644 --- a/Telegram/SourceFiles/mtproto/special_config_request.h +++ b/Telegram/SourceFiles/mtproto/special_config_request.h @@ -11,7 +11,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL namespace MTP { -struct ServiceWebRequest; +struct ServiceWebRequest { + ServiceWebRequest(not_null reply); + ServiceWebRequest(ServiceWebRequest &&other); + ServiceWebRequest &operator=(ServiceWebRequest &&other); + ~ServiceWebRequest(); + + void destroy(); + + QPointer reply; + +}; class SpecialConfigRequest : public QObject { public: