diff options
| author | Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com> | 2010-06-15 13:20:47 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com> | 2010-06-15 13:22:33 +0200 |
| commit | 173cdff56c57e19921386c13c7c17457ad5b67c4 (patch) | |
| tree | 56baf6dfbf4e35a7ad73b331770b9d177bec0bfa /src/libs/cplusplus/MatchingText.cpp | |
| parent | 4f45855188e282c8c958fcfb39a886720d885683 (diff) | |
| parent | 83dba068ce27a2f74301abce8facab0bb2035c91 (diff) | |
| download | qt-creator-173cdff56c57e19921386c13c7c17457ad5b67c4.tar.gz | |
Merge branch '2.0'
Conflicts:
src/plugins/cppeditor/cppquickfix.cpp
src/plugins/mercurial/mercurialjobrunner.cpp
src/plugins/subversion/subversionplugin.cpp
Diffstat (limited to 'src/libs/cplusplus/MatchingText.cpp')
| -rw-r--r-- | src/libs/cplusplus/MatchingText.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/cplusplus/MatchingText.cpp b/src/libs/cplusplus/MatchingText.cpp index 0ae26f5b12..0ee23ac4e8 100644 --- a/src/libs/cplusplus/MatchingText.cpp +++ b/src/libs/cplusplus/MatchingText.cpp @@ -109,7 +109,7 @@ QString MatchingText::insertMatchingBrace(const QTextCursor &cursor, const QStri QTextDocument *doc = tc.document(); QString text = textToProcess; - const QString blockText = tc.block().text().mid(tc.columnNumber()); + const QString blockText = tc.block().text().mid(tc.positionInBlock()); const int length = qMin(blockText.length(), textToProcess.length()); const QChar previousChar = doc->characterAt(tc.selectionEnd() - 1); @@ -219,7 +219,7 @@ QString MatchingText::insertParagraphSeparator(const QTextCursor &tc) const if (tk[index - 1].isNot(T_LBRACE)) return QString(); // nothing to do. - const QString textBlock = tc.block().text().mid(tc.columnNumber()).trimmed(); + const QString textBlock = tc.block().text().mid(tc.positionInBlock()).trimmed(); if (! textBlock.isEmpty()) return QString(); |