diff --git a/src/plugins/cppeditor/cppfunctiondecldeflink.cpp b/src/plugins/cppeditor/cppfunctiondecldeflink.cpp index 0a17c83053dbf01de843aed8323d34f6fefea797..7d1764ac5211ae6a4e2978a6be4f00f137b323f6 100644 --- a/src/plugins/cppeditor/cppfunctiondecldeflink.cpp +++ b/src/plugins/cppeditor/cppfunctiondecldeflink.cpp @@ -913,6 +913,8 @@ Utils::ChangeSet FunctionDeclDefLink::changes(const Snapshot &snapshot, int targ it.next(); const QList<SemanticInfo::Use> &uses = localSymbols.uses.value(it.key()); foreach (const SemanticInfo::Use &use, uses) { + if (use.isInvalid()) + continue; const int useStart = targetFile->position(use.line, use.column); if (useStart <= endOfArguments) continue; diff --git a/src/plugins/cppeditor/cppinsertdecldef.cpp b/src/plugins/cppeditor/cppinsertdecldef.cpp index cf534e9d21b106023106d75dd22c866b18f3b396..6f0ce4660402a8e42c0a40f7dd1956634b0bf063 100644 --- a/src/plugins/cppeditor/cppinsertdecldef.cpp +++ b/src/plugins/cppeditor/cppinsertdecldef.cpp @@ -1096,6 +1096,9 @@ void ExtractFunction::match(const CppQuickFixInterface &interface, QuickFixOpera bool usedInsideExtraction = false; const QList<SemanticInfo::Use> &uses = it.value(); foreach (const SemanticInfo::Use &use, uses) { + if (use.isInvalid()) + continue; + const int position = file->position(use.line, use.column); if (position < analyser.m_extractionStart) usedBeforeExtraction = true; diff --git a/src/plugins/cpptools/cppchecksymbols.cpp b/src/plugins/cpptools/cppchecksymbols.cpp index c8245a0881aed3213d462ce3a9f4af2009418d2a..c6283ed2e455f35f6d113c0b63349fe57522e580 100644 --- a/src/plugins/cpptools/cppchecksymbols.cpp +++ b/src/plugins/cpptools/cppchecksymbols.cpp @@ -1104,7 +1104,7 @@ static const int chunkSize = 50; void CheckSymbols::addUse(const Use &use) { - if (!use.line) + if (use.isInvalid()) return; if (! enclosingFunctionDefinition()) { diff --git a/src/plugins/cpptools/cppchecksymbols.h b/src/plugins/cpptools/cppchecksymbols.h index ce8e9fecb0f734ad1eb2dfdf2c45f424fb6e82b5..8b1694aed2539ba8ef387460817a590faf360bce 100644 --- a/src/plugins/cpptools/cppchecksymbols.h +++ b/src/plugins/cpptools/cppchecksymbols.h @@ -79,8 +79,8 @@ public: for (int i = from; i < to; ++i) { const Use use = future.resultAt(i); - if (! use.line) - continue; // skip it, it's an invalid use. + if (use.isInvalid()) + continue; const int blockNumber = use.line - 1; chunks[blockNumber].append(use);