From 7ad4589f5deefab54c7169b461f4c68622d53b41 Mon Sep 17 00:00:00 2001 From: Marcus Tillmanns Date: Tue, 5 Sep 2023 09:03:55 +0200 Subject: [PATCH] LSP: Fix compilation with Qt 6.2.4 Change-Id: I1f81d35529317107c63727a92d940a3991ddc59d Reviewed-by: hjk --- src/libs/languageserverprotocol/jsonobject.cpp | 4 ++-- src/libs/languageserverprotocol/jsonobject.h | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/libs/languageserverprotocol/jsonobject.cpp b/src/libs/languageserverprotocol/jsonobject.cpp index aed754a10f7..d591e06cb67 100644 --- a/src/libs/languageserverprotocol/jsonobject.cpp +++ b/src/libs/languageserverprotocol/jsonobject.cpp @@ -17,12 +17,12 @@ JsonObject &JsonObject::operator=(JsonObject &&other) QJsonObject::iterator JsonObject::insert(const std::string_view key, const JsonObject &object) { - return m_jsonObject.insert(QLatin1String(key), object.m_jsonObject); + return m_jsonObject.insert(QLatin1String(key.data()), object.m_jsonObject); } QJsonObject::iterator JsonObject::insert(const std::string_view key, const QJsonValue &value) { - return m_jsonObject.insert(QLatin1String(key), value); + return m_jsonObject.insert(QLatin1String(key.data()), value); } } // namespace LanguageServerProtocol diff --git a/src/libs/languageserverprotocol/jsonobject.h b/src/libs/languageserverprotocol/jsonobject.h index fd87d6c4663..11c764c82c7 100644 --- a/src/libs/languageserverprotocol/jsonobject.h +++ b/src/libs/languageserverprotocol/jsonobject.h @@ -52,11 +52,11 @@ protected: iterator insertVariant(const std::string_view key, const V &variant); // QJSonObject redirections - QJsonValue value(const std::string_view key) const { return m_jsonObject.value(QLatin1String(key)); } - bool contains(const std::string_view key) const { return m_jsonObject.contains(QLatin1String(key)); } - iterator find(const std::string_view key) { return m_jsonObject.find(QLatin1String(key)); } - const_iterator find(const std::string_view key) const { return m_jsonObject.find(QLatin1String(key)); } - void remove(const std::string_view key) { m_jsonObject.remove(QLatin1String(key)); } + QJsonValue value(const std::string_view key) const { return m_jsonObject.value(QLatin1String(key.data())); } + bool contains(const std::string_view key) const { return m_jsonObject.contains(QLatin1String(key.data())); } + iterator find(const std::string_view key) { return m_jsonObject.find(QLatin1String(key.data())); } + const_iterator find(const std::string_view key) const { return m_jsonObject.find(QLatin1String(key.data())); } + void remove(const std::string_view key) { m_jsonObject.remove(QLatin1String(key.data())); } QStringList keys() const { return m_jsonObject.keys(); } // convenience value access @@ -129,7 +129,7 @@ QList JsonObject::array(const std::string_view key) const if (const std::optional> &array = optionalArray(key)) return *array; qCDebug(conversionLog) << QString("Expected array under %1 in:") - .arg(QLatin1String(key)) << *this; + .arg(QLatin1String(key.data())) << *this; return {}; }