summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikolai Kosjar <nikolai.kosjar@qt.io>2019-10-31 16:20:45 +0100
committerNikolai Kosjar <nikolai.kosjar@qt.io>2019-11-04 13:18:27 +0000
commit9a567a48dd0ddc555ca1f614b0b1c87f54b37029 (patch)
tree5438730ebd30a0c32d3af5a00cf3c1d190d4d235
parent715db5ada817822616433642193e7a394bbfe61c (diff)
downloadqt-creator-9a567a48dd0ddc555ca1f614b0b1c87f54b37029.tar.gz
LanguageClient: Fix some bugprone-branch-clone
Change-Id: If1eb43168db65190983049f30bf217f0628e78e4 Reviewed-by: David Schulz <david.schulz@qt.io>
-rw-r--r--src/plugins/languageclient/languageclientcompletionassist.cpp2
-rw-r--r--src/plugins/languageclient/languageclientutils.cpp18
2 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/languageclient/languageclientcompletionassist.cpp b/src/plugins/languageclient/languageclientcompletionassist.cpp
index 91a77d6b7b..a88af2666a 100644
--- a/src/plugins/languageclient/languageclientcompletionassist.cpp
+++ b/src/plugins/languageclient/languageclientcompletionassist.cpp
@@ -143,7 +143,7 @@ QIcon LanguageClientCompletionItem::icon() const
case CompletionItemKind::Method:
case CompletionItemKind::Function:
case CompletionItemKind::Constructor: icon = iconForType(FuncPublic); break;
- case CompletionItemKind::Field: icon = iconForType(VarPublic); break;
+ case CompletionItemKind::Field:
case CompletionItemKind::Variable: icon = iconForType(VarPublic); break;
case CompletionItemKind::Class: icon = iconForType(Class); break;
case CompletionItemKind::Module: icon = iconForType(Namespace); break;
diff --git a/src/plugins/languageclient/languageclientutils.cpp b/src/plugins/languageclient/languageclientutils.cpp
index 22c43650ee..eeb64b406e 100644
--- a/src/plugins/languageclient/languageclientutils.cpp
+++ b/src/plugins/languageclient/languageclientutils.cpp
@@ -258,8 +258,8 @@ const QIcon symbolIcon(int type)
if (!icons.contains(kind)) {
switch (kind) {
case SymbolKind::File: icons[kind] = Utils::Icons::NEWFILE.icon(); break;
- case SymbolKind::Module: icons[kind] = iconForType(Namespace); break;
- case SymbolKind::Namespace: icons[kind] = iconForType(Namespace); break;
+ case SymbolKind::Module:
+ case SymbolKind::Namespace:
case SymbolKind::Package: icons[kind] = iconForType(Namespace); break;
case SymbolKind::Class: icons[kind] = iconForType(Class); break;
case SymbolKind::Method: icons[kind] = iconForType(FuncPublic); break;
@@ -269,18 +269,18 @@ const QIcon symbolIcon(int type)
case SymbolKind::Enum: icons[kind] = iconForType(Enum); break;
case SymbolKind::Interface: icons[kind] = iconForType(Class); break;
case SymbolKind::Function: icons[kind] = iconForType(FuncPublic); break;
- case SymbolKind::Variable: icons[kind] = iconForType(VarPublic); break;
- case SymbolKind::Constant: icons[kind] = iconForType(VarPublic); break;
- case SymbolKind::String: icons[kind] = iconForType(VarPublic); break;
- case SymbolKind::Number: icons[kind] = iconForType(VarPublic); break;
- case SymbolKind::Boolean: icons[kind] = iconForType(VarPublic); break;
+ case SymbolKind::Variable:
+ case SymbolKind::Constant:
+ case SymbolKind::String:
+ case SymbolKind::Number:
+ case SymbolKind::Boolean:
case SymbolKind::Array: icons[kind] = iconForType(VarPublic); break;
case SymbolKind::Object: icons[kind] = iconForType(Class); break;
- case SymbolKind::Key: icons[kind] = iconForType(Keyword); break;
+ case SymbolKind::Key:
case SymbolKind::Null: icons[kind] = iconForType(Keyword); break;
case SymbolKind::EnumMember: icons[kind] = iconForType(Enumerator); break;
case SymbolKind::Struct: icons[kind] = iconForType(Struct); break;
- case SymbolKind::Event: icons[kind] = iconForType(FuncPublic); break;
+ case SymbolKind::Event:
case SymbolKind::Operator: icons[kind] = iconForType(FuncPublic); break;
case SymbolKind::TypeParameter: icons[kind] = iconForType(VarPublic); break;
}