ClangCodeModel: Modernize

Change-Id: Ie001a2d8ed9c82ac5fedf8e59bd56d7bbdddf919
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

7 files changed, 15 insertions, 17 deletions

diff --git a/src/plugins/clangcodemodel/clangbackendreceiver.cpp b/src/plugins/clangcodemodel/clangbackendreceiver.cpp
index 39c7415a84..34e3136830 100644
--- a/src/plugins/clangcodemodel/clangbackendreceiver.cpp
+++ b/src/plugins/clangcodemodel/clangbackendreceiver.cpp
@@ -221,7 +221,7 @@ CppTools::CursorInfo::Range toCursorInfoRange(const SourceRangeContainer &source
     const SourceLocationContainer &end = sourceRange.end;
     const unsigned length = end.column - start.column;
 
-    return CppTools::CursorInfo::Range(start.line, start.column, length);
+    return {start.line, start.column, length};
 }
 
 static
diff --git a/src/plugins/clangcodemodel/clangcompletioncontextanalyzer.h b/src/plugins/clangcodemodel/clangcompletioncontextanalyzer.h
index b51029492f..08574e5018 100644
--- a/src/plugins/clangcodemodel/clangcompletioncontextanalyzer.h
+++ b/src/plugins/clangcodemodel/clangcompletioncontextanalyzer.h
@@ -39,6 +39,7 @@ class ClangCompletionAssistInterface;
 class ClangCompletionContextAnalyzer
 {
 public:
+    ClangCompletionContextAnalyzer() = delete;
     ClangCompletionContextAnalyzer(const ClangCompletionAssistInterface *assistInterface,
                                    CPlusPlus::LanguageFeatures languageFeatures);
     void analyze();
@@ -61,8 +62,6 @@ public:
     bool addSnippets() const { return m_addSnippets; }
 
 private:
-    ClangCompletionContextAnalyzer();
-
     int startOfFunctionCall(int endOfExpression) const;
 
     void setActionAndClangPosition(CompletionAction action,
diff --git a/src/plugins/clangcodemodel/clangdiagnosticmanager.cpp b/src/plugins/clangcodemodel/clangdiagnosticmanager.cpp
index 8bc0b925c2..8fcbe3477b 100644
--- a/src/plugins/clangcodemodel/clangdiagnosticmanager.cpp
+++ b/src/plugins/clangcodemodel/clangdiagnosticmanager.cpp
@@ -91,7 +91,7 @@ QChar selectionEndChar(const QChar startSymbol)
         return QLatin1Char('"');
     if (startSymbol == '<')
         return QLatin1Char('>');
-    return QChar();
+    return {};
 }
 
 void selectToLocationEnd(QTextCursor &cursor)
diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
index aaca6380d2..706c5101a3 100644
--- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
+++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
@@ -209,12 +209,12 @@ TextEditor::BlockRange
 toTextEditorBlock(QTextDocument *textDocument,
                   const ClangBackEnd::SourceRangeContainer &sourceRangeContainer)
 {
-    return TextEditor::BlockRange(::Utils::Text::positionInText(textDocument,
-                                                                sourceRangeContainer.start.line,
-                                                                sourceRangeContainer.start.column),
-                                  ::Utils::Text::positionInText(textDocument,
-                                                                sourceRangeContainer.end.line,
-                                                                sourceRangeContainer.end.column));
+    return {::Utils::Text::positionInText(textDocument,
+                                          sourceRangeContainer.start.line,
+                                          sourceRangeContainer.start.column),
+            ::Utils::Text::positionInText(textDocument,
+                                          sourceRangeContainer.end.line,
+                                          sourceRangeContainer.end.column)};
 }
 
 QList<TextEditor::BlockRange>
diff --git a/src/plugins/clangcodemodel/clangfollowsymbol.cpp b/src/plugins/clangcodemodel/clangfollowsymbol.cpp
index e5c66f6c6b..96df23ab20 100644
--- a/src/plugins/clangcodemodel/clangfollowsymbol.cpp
+++ b/src/plugins/clangcodemodel/clangfollowsymbol.cpp
@@ -35,6 +35,8 @@
 #include <utils/textutils.h>
 #include <utils/algorithm.h>
 
+#include <memory>
+
 namespace ClangCodeModel {
 namespace Internal {
 
@@ -199,7 +201,7 @@ void ClangFollowSymbol::findLink(const CppTools::CursorInEditor &data,
     if (m_watcher)
         m_watcher->cancel();
 
-    m_watcher.reset(new FutureSymbolWatcher());
+    m_watcher = std::make_unique<FutureSymbolWatcher>();
 
     QObject::connect(m_watcher.get(), &FutureSymbolWatcher::finished, [=, filePath=data.filePath(),
                      callback=std::move(processLinkCallback)]() mutable {
diff --git a/src/plugins/clangcodemodel/clanghighlightingresultreporter.cpp b/src/plugins/clangcodemodel/clanghighlightingresultreporter.cpp
index 125d4405a7..27eeea1af4 100644
--- a/src/plugins/clangcodemodel/clanghighlightingresultreporter.cpp
+++ b/src/plugins/clangcodemodel/clanghighlightingresultreporter.cpp
@@ -138,10 +138,7 @@ TextEditor::HighlightingResult toHighlightingResult(
 {
     const auto textStyles = toTextStyles(tokenInfo.types);
 
-    return TextEditor::HighlightingResult(tokenInfo.line,
-                                          tokenInfo.column,
-                                          tokenInfo.length,
-                                          textStyles);
+    return {tokenInfo.line, tokenInfo.column, tokenInfo.length, textStyles};
 }
 
 } // anonymous
diff --git a/src/plugins/clangcodemodel/clangoverviewmodel.cpp b/src/plugins/clangcodemodel/clangoverviewmodel.cpp
index e182fa7e88..8c92e2f246 100644
--- a/src/plugins/clangcodemodel/clangoverviewmodel.cpp
+++ b/src/plugins/clangcodemodel/clangoverviewmodel.cpp
@@ -233,8 +233,8 @@ bool OverviewModel::isGenerated(const QModelIndex &) const
     auto item = static_cast<TokenTreeItem *>(itemForIndex(sourceIndex));
     if (!item)
         return {};
-    return ::Utils::LineColumn(static_cast<int>(item->token.line),
-                               static_cast<int>(item->token.column));
+    return {static_cast<int>(item->token.line),
+            static_cast<int>(item->token.column)};
 }
 
 OverviewModel::Range OverviewModel::rangeFromIndex(const QModelIndex &sourceIndex) const