diff options
author | hjk <hjk@qt.io> | 2020-02-03 11:13:27 +0100 |
---|---|---|
committer | hjk <hjk@qt.io> | 2020-02-04 07:55:01 +0000 |
commit | 36f23df6c32330ecaf2b82002a3a14fb7fb55cc5 (patch) | |
tree | 0ae17c6b82ed045745e42268c8fddd84cb30fe66 /src/plugins/cpptools/cpptoolsreuse.cpp | |
parent | 85d9756c006dd5020fce07194b58157cd35626a2 (diff) | |
download | qt-creator-36f23df6c32330ecaf2b82002a3a14fb7fb55cc5.tar.gz |
CppTools: Use unshared object for CppCodeModelSettings
There's nothing shared here, only ever one copy. Ideally, this
should be const outside CppToolsPlugin, but some settings
are modified directly.
Change-Id: I775b9151a244b3cc44d28bc992a041c42d234a18
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/cpptools/cpptoolsreuse.cpp')
-rw-r--r-- | src/plugins/cpptools/cpptoolsreuse.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/cpptools/cpptoolsreuse.cpp b/src/plugins/cpptools/cpptoolsreuse.cpp index 4769260d54..37a00673b3 100644 --- a/src/plugins/cpptools/cpptoolsreuse.cpp +++ b/src/plugins/cpptools/cpptoolsreuse.cpp @@ -294,14 +294,14 @@ const Macro *findCanonicalMacro(const QTextCursor &cursor, Document::Ptr documen return nullptr; } -QSharedPointer<CppCodeModelSettings> codeModelSettings() +CppCodeModelSettings *codeModelSettings() { return CppTools::Internal::CppToolsPlugin::instance()->codeModelSettings(); } int indexerFileSizeLimitInMb() { - const QSharedPointer<CppCodeModelSettings> settings = codeModelSettings(); + const CppCodeModelSettings *settings = codeModelSettings(); QTC_ASSERT(settings, return -1); if (settings->skipIndexingBigFiles()) @@ -335,7 +335,7 @@ bool fileSizeExceedsLimit(const QFileInfo &fileInfo, int sizeLimitInMb) UsePrecompiledHeaders getPchUsage() { - const QSharedPointer<CppCodeModelSettings> cms = codeModelSettings(); + const CppCodeModelSettings *cms = codeModelSettings(); if (cms->pchUsage() == CppCodeModelSettings::PchUse_None) return UsePrecompiledHeaders::No; return UsePrecompiledHeaders::Yes; |