diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-11-09 13:30:40 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-11-09 13:30:40 +0100 |
| commit | 3666e3aaeb26f91097a473491ea4cf58219029ca (patch) | |
| tree | 2d1387557e243eacfe78698371c7726aa9a19350 /src/plugins/classview/classviewmanager.cpp | |
| parent | 951eb885af8692c2c4aac67d18e3cbf033b7e912 (diff) | |
| parent | dc82e49b62d6b851900689321828aee95f8eab54 (diff) | |
Merge remote-tracking branch 'origin/4.8'
Conflicts:
tests/unit/unittest/unittest.pro
Change-Id: I4f0ab05f96ee60900a3a35fad4c7331238367593
Diffstat (limited to 'src/plugins/classview/classviewmanager.cpp')
| -rw-r--r-- | src/plugins/classview/classviewmanager.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/classview/classviewmanager.cpp b/src/plugins/classview/classviewmanager.cpp index 9d09982065..d00343ccb3 100644 --- a/src/plugins/classview/classviewmanager.cpp +++ b/src/plugins/classview/classviewmanager.cpp @@ -421,7 +421,7 @@ void Manager::onDocumentUpdated(CPlusPlus::Document::Ptr doc) /*! Opens the text editor for the file \a fileName on \a line (1-based) and - \a column (1-based). + \a column (0-based). */ void Manager::gotoLocation(const QString &fileName, int line, int column) @@ -466,7 +466,8 @@ void Manager::gotoLocations(const QList<QVariant> &list) } } } - gotoLocation(loc.fileName(), loc.line(), loc.column()); + // line is 1-based, column is 0-based + gotoLocation(loc.fileName(), loc.line(), loc.column() - 1); } /*! |