feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

LSP: Fix compilation with Qt 6.2.4

Browse Source 
Change-Id: I1f81d35529317107c63727a92d940a3991ddc59d
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Marcus Tillmanns
2023-09-05 09:03:55 +02:00
parent a475632c66
commit 7ad4589f5d
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/languageserverprotocol/jsonobject.cpp
View File

@@ -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

12
src/libs/languageserverprotocol/jsonobject.h
View File

@@ -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<T> JsonObject::array(const std::string_view key) const
if (const std::optional<QList<T>> &array = optionalArray<T>(key))
return *array;
qCDebug(conversionLog) << QString("Expected array under %1 in:")
.arg(QLatin1String(key)) << *this;
.arg(QLatin1String(key.data())) << *this;
return {};
}