From 5e2942a5bda66ec80a76b88113a17e7d9b69c504 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Tue, 16 Jun 2015 13:59:08 +0200 Subject: Clang: Use member instead of pointer It makes the resource allocation much more clear. Change-Id: Ib276e089dc3db551171373d72e9b54c9d87b4c8c Reviewed-by: Nikolai Kosjar --- src/plugins/clangcodemodel/clangcompletion.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/plugins/clangcodemodel/clangcompletion.cpp') diff --git a/src/plugins/clangcodemodel/clangcompletion.cpp b/src/plugins/clangcodemodel/clangcompletion.cpp index 9d358231c6..25c18b905b 100644 --- a/src/plugins/clangcodemodel/clangcompletion.cpp +++ b/src/plugins/clangcodemodel/clangcompletion.cpp @@ -299,10 +299,9 @@ namespace Internal { // ----------------------------- // ClangCompletionAssistProvider // ----------------------------- -ClangCompletionAssistProvider::ClangCompletionAssistProvider(IpcCommunicator::Ptr ipcCommunicator) +ClangCompletionAssistProvider::ClangCompletionAssistProvider(IpcCommunicator &ipcCommunicator) : m_ipcCommunicator(ipcCommunicator) { - QTC_CHECK(m_ipcCommunicator); } IAssistProvider::RunType ClangCompletionAssistProvider::runType() const @@ -642,7 +641,7 @@ const TextEditor::TextEditorWidget *ClangCompletionAssistInterface::textEditorWi } ClangCompletionAssistInterface::ClangCompletionAssistInterface( - IpcCommunicator::Ptr ipcCommunicator, + IpcCommunicator &ipcCommunicator, const TextEditorWidget *textEditorWidget, int position, const QString &fileName, @@ -661,7 +660,7 @@ ClangCompletionAssistInterface::ClangCompletionAssistInterface( m_unsavedFiles = Utils::createUnsavedFiles(mmi->workingCopy()); } -IpcCommunicator::Ptr ClangCompletionAssistInterface::ipcCommunicator() const +IpcCommunicator &ClangCompletionAssistInterface::ipcCommunicator() const { return m_ipcCommunicator; } @@ -1111,8 +1110,8 @@ void ClangCompletionAssistProcessor::sendFileContent(const QString &projectFileP : modifiedFileContent; const bool hasUnsavedContent = true; // TODO - IpcCommunicator::Ptr ipcCommunicator = m_interface->ipcCommunicator(); - ipcCommunicator->registerFilesForCodeCompletion( + IpcCommunicator &ipcCommunicator = m_interface->ipcCommunicator(); + ipcCommunicator.registerFilesForCodeCompletion( {FileContainer(filePath, projectFilePath, Utf8String::fromByteArray(unsavedContent), @@ -1129,7 +1128,7 @@ void ClangCompletionAssistProcessor::sendCompletionRequest(int position, const QString filePath = m_interface->fileName(); const QString projectFilePath = Utils::projectFilePathForFile(filePath); sendFileContent(projectFilePath, modifiedFileContent); - m_interface->ipcCommunicator()->completeCode(this, filePath, line, column, projectFilePath); + m_interface->ipcCommunicator().completeCode(this, filePath, line, column, projectFilePath); } TextEditor::IAssistProposal *ClangCompletionAssistProcessor::createProposal() const -- cgit v1.2.1