From 80d85e28874d1d37e5a16dc0825a6d3c0167fa61 Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Tue, 20 Jul 2010 12:21:27 +0200
Subject: [PATCH] Locator Cpp filters can jump to a column too.

---
 src/plugins/cpptools/cpplocatorfilter.cpp | 2 +-
 src/plugins/cpptools/searchsymbols.cpp    | 1 +
 src/plugins/cpptools/searchsymbols.h      | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/plugins/cpptools/cpplocatorfilter.cpp b/src/plugins/cpptools/cpplocatorfilter.cpp
index 0d60d8f646d..913a411a7ff 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 99c2616489d..ac13d4fd818 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 526371bf790..7c3c379e688 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;
 };