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

LSP: add std namespace to nullptr_t usages

Browse Source 
Change-Id: I2bc3e7324c168201a4755bec6f79c5aa6ffc8540
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
David Schulz
2021-04-22 09:10:15 +02:00
parent b3c2120dff
commit 8bacd9bdc4
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -126,7 +126,7 @@ SemanticTokensResult::SemanticTokensResult(const QJsonValue &value)
if (value.isObject()) if (value.isObject())
emplace<SemanticTokens>(SemanticTokens(value.toObject())); emplace<SemanticTokens>(SemanticTokens(value.toObject()));
else else
emplace<nullptr_t>(nullptr); emplace<std::nullptr_t>(nullptr);
} }
SemanticTokensFullDeltaRequest::SemanticTokensFullDeltaRequest(const SemanticTokensDeltaParams &params) SemanticTokensFullDeltaRequest::SemanticTokensFullDeltaRequest(const SemanticTokensDeltaParams &params)
@@ -147,7 +147,7 @@ SemanticTokensDeltaResult::SemanticTokensDeltaResult(const QJsonValue &value)
else else
emplace<SemanticTokens>(object); emplace<SemanticTokens>(object);
} else { } else {
emplace<nullptr_t>(nullptr); emplace<std::nullptr_t>(nullptr);
} }
} }

10
src/libs/languageserverprotocol/semantictokens.h
View File

@@ -162,7 +162,7 @@ public:
}; };
class LANGUAGESERVERPROTOCOL_EXPORT SemanticTokensResult class LANGUAGESERVERPROTOCOL_EXPORT SemanticTokensResult
: public Utils::variant<SemanticTokens, nullptr_t> : public Utils::variant<SemanticTokens, std::nullptr_t>
{ {
public: public:
using variant::variant; using variant::variant;
@@ -170,7 +170,7 @@ public:
}; };
class LANGUAGESERVERPROTOCOL_EXPORT SemanticTokensFullRequest class LANGUAGESERVERPROTOCOL_EXPORT SemanticTokensFullRequest
: public Request<SemanticTokensResult, nullptr_t, SemanticTokensParams> : public Request<SemanticTokensResult, std::nullptr_t, SemanticTokensParams>
{ {
public: public:
explicit SemanticTokensFullRequest(const SemanticTokensParams &params); explicit SemanticTokensFullRequest(const SemanticTokensParams &params);
@@ -213,7 +213,7 @@ public:
}; };
class LANGUAGESERVERPROTOCOL_EXPORT SemanticTokensDeltaResult class LANGUAGESERVERPROTOCOL_EXPORT SemanticTokensDeltaResult
: public Utils::variant<SemanticTokens, SemanticTokensDelta, nullptr_t> : public Utils::variant<SemanticTokens, SemanticTokensDelta, std::nullptr_t>
{ {
public: public:
using variant::variant; using variant::variant;
@@ -221,7 +221,7 @@ public:
}; };
class LANGUAGESERVERPROTOCOL_EXPORT SemanticTokensFullDeltaRequest class LANGUAGESERVERPROTOCOL_EXPORT SemanticTokensFullDeltaRequest
: public Request<SemanticTokensDeltaResult, nullptr_t, SemanticTokensDeltaParams> : public Request<SemanticTokensDeltaResult, std::nullptr_t, SemanticTokensDeltaParams>
{ {
public: public:
explicit SemanticTokensFullDeltaRequest(const SemanticTokensDeltaParams &params); explicit SemanticTokensFullDeltaRequest(const SemanticTokensDeltaParams &params);
@@ -230,7 +230,7 @@ public:
}; };
class LANGUAGESERVERPROTOCOL_EXPORT SemanticTokensRangeRequest class LANGUAGESERVERPROTOCOL_EXPORT SemanticTokensRangeRequest
: public Request<SemanticTokensResult, nullptr_t, SemanticTokensRangeParams> : public Request<SemanticTokensResult, std::nullptr_t, SemanticTokensRangeParams>
{ {
public: public:
explicit SemanticTokensRangeRequest(const SemanticTokensRangeParams &params); explicit SemanticTokensRangeRequest(const SemanticTokensRangeParams &params);