diff --git a/src/common/protocolinfo.cpp b/src/common/protocolinfo.cpp index 9ba6219..c31c686 100644 --- a/src/common/protocolinfo.cpp +++ b/src/common/protocolinfo.cpp @@ -1,76 +1,70 @@ /* SPDX-FileCopyrightText: 2010 Tobias Koenig SPDX-License-Identifier: LGPL-2.0-or-later */ #include "protocolinfo.h" #include "davmanager_p.h" #include "davprotocolbase_p.h" #include "libkdav_debug.h" using namespace KDAV; bool ProtocolInfo::useMultiget(KDAV::Protocol protocol) { return DavManager::davProtocol(protocol)->useMultiget(); } QString ProtocolInfo::principalHomeSet(KDAV::Protocol protocol) { return DavManager::davProtocol(protocol)->principalHomeSet(); } QString ProtocolInfo::principalHomeSetNS(KDAV::Protocol protocol) { return DavManager::davProtocol(protocol)->principalHomeSetNS(); } -QLatin1String ProtocolInfo::protocolName(KDAV::Protocol protocol) +QString ProtocolInfo::protocolName(KDAV::Protocol protocol) { - QLatin1String protocolName(""); - switch (protocol) { case KDAV::CalDav: - protocolName = QLatin1String("CalDav"); - break; + return QStringLiteral("CalDav"); case KDAV::CardDav: - protocolName = QLatin1String("CardDav"); - break; + return QStringLiteral("CardDav"); case KDAV::GroupDav: - protocolName = QLatin1String("GroupDav"); - break; + return QStringLiteral("GroupDav"); } - - return protocolName; + return {}; } KDAV::Protocol ProtocolInfo::protocolByName(const QString &name) { Protocol protocol = KDAV::CalDav; if (name == QLatin1String("CalDav")) { protocol = KDAV::CalDav; } else if (name == QLatin1String("CardDav")) { protocol = KDAV::CardDav; } else if (name == QLatin1String("GroupDav")) { protocol = KDAV::GroupDav; } else { qCCritical(KDAV_LOG) << "Unexpected protocol name : " << name; } return protocol; } QString ProtocolInfo::contactsMimeType(KDAV::Protocol protocol) { QString ret; if (protocol == KDAV::CardDav) { ret = QStringLiteral("text/vcard"); } else if (protocol == KDAV::GroupDav) { ret = QStringLiteral("text/x-vcard"); } return ret; } diff --git a/src/common/protocolinfo.h b/src/common/protocolinfo.h index d47de50..3426ec1 100644 --- a/src/common/protocolinfo.h +++ b/src/common/protocolinfo.h @@ -1,56 +1,56 @@ /* SPDX-FileCopyrightText: 2019 Volker Krause SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef KDAV_PROTOCOLINFO_H #define KDAV_PROTOCOLINFO_H #include "kdav_export.h" #include "enums.h" class QLatin1String; namespace KDAV { /** Information about a DAV protocol. */ namespace ProtocolInfo { /** * Returns whether the @p protocol dialect supports the MULTIGET command. * * If MULTIGET is supported, the content of all dav resources * can be fetched in ResourceBase::retrieveItems() already and * there is no need to call ResourceBase::retrieveItem() for every single * dav resource. */ KDAV_EXPORT Q_REQUIRED_RESULT bool useMultiget(KDAV::Protocol protocol); /** Returns the principal home set of @p protocol. */ KDAV_EXPORT Q_REQUIRED_RESULT QString principalHomeSet(KDAV::Protocol protocol); /** Returns the principal home set namespace of @p protocol. */ KDAV_EXPORT Q_REQUIRED_RESULT QString principalHomeSetNS(KDAV::Protocol protocol); /** * Returns the untranslated name of the given DAV @p protocol dialect. */ - KDAV_EXPORT Q_REQUIRED_RESULT QLatin1String protocolName(KDAV::Protocol protocol); + KDAV_EXPORT Q_REQUIRED_RESULT QString protocolName(KDAV::Protocol protocol); /** * Returns the protocol matching the given name. This is the opposite of * Utils::protocolName(). */ KDAV_EXPORT Q_REQUIRED_RESULT KDAV::Protocol protocolByName(const QString &name); /** * Returns the mimetype that shall be used for contact DAV resources using @p protocol. */ KDAV_EXPORT Q_REQUIRED_RESULT QString contactsMimeType(KDAV::Protocol protocol); } } #endif // KDAV_PROTOCOLINFO_H