diff --git a/src/plugins/cpptools/cpplocatorfilter.cpp b/src/plugins/cpptools/cpplocatorfilter.cpp index 0d60d8f646d430fa3e62d486908251eab8211818..913a411a7ffee0eee6efd978352fb005a2b334b5 100644 --- a/src/plugins/cpptools/cpplocatorfilter.cpp +++ b/src/plugins/cpptools/cpplocatorfilter.cpp @@ -135,5 +135,5 @@ QList<Locator::FilterEntry> CppLocatorFilter::matchesFor(const QString &origEntr void CppLocatorFilter::accept(Locator::FilterEntry selection) const { ModelItemInfo info = qvariant_cast<CppTools::Internal::ModelItemInfo>(selection.internalData); - TextEditor::BaseTextEditor::openEditorAt(info.fileName, info.line); + TextEditor::BaseTextEditor::openEditorAt(info.fileName, info.line, info.column); } diff --git a/src/plugins/cpptools/searchsymbols.cpp b/src/plugins/cpptools/searchsymbols.cpp index 99c2616489dd5a2ef59e43138233afb0f73eebce..ac13d4fd818dc881b470adec4630b0363c55aa62 100644 --- a/src/plugins/cpptools/searchsymbols.cpp +++ b/src/plugins/cpptools/searchsymbols.cpp @@ -213,5 +213,6 @@ void SearchSymbols::appendItem(const QString &name, items.append(ModelItemInfo(name, info, type, QString::fromUtf8(symbol->fileName(), symbol->fileNameLength()), symbol->line(), + symbol->column() - 1, // 1-based vs 0-based column icon)); } diff --git a/src/plugins/cpptools/searchsymbols.h b/src/plugins/cpptools/searchsymbols.h index 526371bf7906e6175de07d48023c6c659207fe1e..7c3c379e6887ae9cc75f75cc38d90b1258232dce 100644 --- a/src/plugins/cpptools/searchsymbols.h +++ b/src/plugins/cpptools/searchsymbols.h @@ -60,12 +60,14 @@ struct ModelItemInfo ItemType type, const QString &fileName, int line, + int column, const QIcon &icon) : symbolName(symbolName), symbolType(symbolType), type(type), fileName(fileName), line(line), + column(column), icon(icon) { } @@ -74,6 +76,7 @@ struct ModelItemInfo ItemType type; QString fileName; int line; + int column; QIcon icon; };