diff options
| -rw-r--r-- | src/plugins/cppeditor/cppcheckundefinedsymbols.h | 11 | ||||
| -rw-r--r-- | src/plugins/cppeditor/cppeditor.cpp | 6 |
2 files changed, 5 insertions, 12 deletions
diff --git a/src/plugins/cppeditor/cppcheckundefinedsymbols.h b/src/plugins/cppeditor/cppcheckundefinedsymbols.h index e4dd960f50..6788dd4284 100644 --- a/src/plugins/cppeditor/cppcheckundefinedsymbols.h +++ b/src/plugins/cppeditor/cppcheckundefinedsymbols.h @@ -30,6 +30,8 @@ #ifndef CPLUSPLUS_CHECKUNDEFINEDSYMBOLS_H #define CPLUSPLUS_CHECKUNDEFINEDSYMBOLS_H +#include "cppsemanticinfo.h" + #include <cplusplus/CppDocument.h> #include <cplusplus/LookupContext.h> #include <ASTVisitor.h> @@ -45,14 +47,7 @@ public: QList<Document::DiagnosticMessage> operator()(AST *ast); - struct Use { // ### remove me - unsigned line; - unsigned column; - unsigned length; - - Use(unsigned line = 0, unsigned column = 0, unsigned length = 0) - : line(line), column(column), length(length) {} - }; + typedef CppEditor::Internal::SemanticInfo::Use Use; QList<Use> typeUsages() const; diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp index bb89ca7187..5838f74251 100644 --- a/src/plugins/cppeditor/cppeditor.cpp +++ b/src/plugins/cppeditor/cppeditor.cpp @@ -2062,11 +2062,9 @@ SemanticInfo SemanticHighlighter::semanticInfo(const Source &source) if (TranslationUnit *unit = doc->translationUnit()) { CheckUndefinedSymbols checkUndefinedSymbols(unit, context); diagnosticMessages = checkUndefinedSymbols(unit->ast()); - typeUsages.clear(); - foreach (const CheckUndefinedSymbols::Use &use, checkUndefinedSymbols.typeUsages()) // ### remove me - typeUsages.append(SemanticInfo::Use(use.line, use.column, use.length)); + typeUsages = checkUndefinedSymbols.typeUsages(); - FindObjCKeywords findObjCKeywords(unit); + FindObjCKeywords findObjCKeywords(unit); // ### remove me objcKeywords = findObjCKeywords(); } } |