summaryrefslogtreecommitdiff
path: root/src/plugins/clangcodemodel/clangcompletion.cpp
diff options
context:
space:
mode:
authorMarco Bubke <marco.bubke@theqtcompany.com>2015-06-16 13:59:08 +0200
committerMarco Bubke <marco.bubke@theqtcompany.com>2015-07-01 11:52:54 +0000
commit5e2942a5bda66ec80a76b88113a17e7d9b69c504 (patch)
treeabfbdd52007bf454e3546449fa48ac308dfbf94d /src/plugins/clangcodemodel/clangcompletion.cpp
parentae9ce6981c33467118a2ccd8183423a2e0683214 (diff)
downloadqt-creator-5e2942a5bda66ec80a76b88113a17e7d9b69c504.tar.gz
Clang: Use member instead of pointer
It makes the resource allocation much more clear. Change-Id: Ib276e089dc3db551171373d72e9b54c9d87b4c8c Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Diffstat (limited to 'src/plugins/clangcodemodel/clangcompletion.cpp')
-rw-r--r--src/plugins/clangcodemodel/clangcompletion.cpp13
1 files changed, 6 insertions, 7 deletions
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