diff --git a/makespec/BUILDVERSION b/makespec/BUILDVERSION index e1c3d7b5..dc2f5ce1 100644 --- a/makespec/BUILDVERSION +++ b/makespec/BUILDVERSION @@ -1 +1 @@ -4216 +4217 diff --git a/src/core/handler/ConnectionHandler.cpp b/src/core/handler/ConnectionHandler.cpp index 81004e85..be64c069 100644 --- a/src/core/handler/ConnectionHandler.cpp +++ b/src/core/handler/ConnectionHandler.cpp @@ -411,10 +411,10 @@ namespace Qv2ray::core::handlers { if (!connections.contains(id)) { - return make_tuple(0, 0); + return { 0, 0 }; } - return make_tuple(connections[id].upLinkData, connections[id].downLinkData); + return { connections[id].upLinkData, connections[id].downLinkData }; } QvConnectionHandler::~QvConnectionHandler() @@ -468,14 +468,14 @@ namespace Qv2ray::core::handlers if (GetOutboundData(outBoundRoot, &host, &port, &outboundType)) { *ok = true; - return make_tuple(outboundType, host, port); + return { outboundType, host, port }; } else { LOG(MODULE_CORE_HANDLER, "Unknown outbound type: " + outboundType + ", cannot deduce host and port.") } } - return make_tuple(tr("N/A"), tr("N/A"), 0); + return { tr("N/A"), tr("N/A"), 0 }; } void QvConnectionHandler::OnLatencyDataArrived(const QvTCPingResultObject &result) @@ -531,7 +531,7 @@ namespace Qv2ray::core::handlers return result; } - return make_tuple(groups[id].address, groups[id].lastUpdated, groups[id].updateInterval); + return { groups[id].address, groups[id].lastUpdated, groups[id].updateInterval }; } bool QvConnectionHandler::SetSubscriptionData(const GroupId &id, const QString &address, float updateInterval) @@ -581,7 +581,7 @@ namespace Qv2ray::core::handlers auto [protocol, host, port] = GetConnectionData(conn); if (port != 0) { - typeMap[make_tuple(protocol, host, port)] = conn; + typeMap[{ protocol, host, port }] = conn; } } // diff --git a/src/ui/w_SubscriptionManager.cpp b/src/ui/w_SubscriptionManager.cpp index 7606a9ad..20cc75bc 100644 --- a/src/ui/w_SubscriptionManager.cpp +++ b/src/ui/w_SubscriptionManager.cpp @@ -27,7 +27,7 @@ QvMessageBusSlotImpl(SubscribeEditor) tuple SubscribeEditor::GetSelectedConfig() { - return make_tuple(ConnectionManager->GetDisplayName(currentConnectionId), ConnectionManager->GetConnectionRoot(currentConnectionId)); + return { ConnectionManager->GetDisplayName(currentConnectionId), ConnectionManager->GetConnectionRoot(currentConnectionId) }; } SubscribeEditor::~SubscribeEditor() diff --git a/src/ui/widgets/ConnectionItemWidget.hpp b/src/ui/widgets/ConnectionItemWidget.hpp index 4120d176..63f061f4 100644 --- a/src/ui/widgets/ConnectionItemWidget.hpp +++ b/src/ui/widgets/ConnectionItemWidget.hpp @@ -39,7 +39,7 @@ class ConnectionItemWidget } inline const tuple Identifier() const { - return make_tuple(groupId, connectionId); + return { groupId, connectionId }; } inline bool IsConnection() const {