diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2011-12-05 15:48:37 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-12-05 17:06:10 +0100 |
| commit | c1f643e387788f905f5f8b0466c70ccebb9bc58e (patch) | |
| tree | 1185aa2bc4d406fc4ee62495458b4a9c3ecbc6ba /src/plugins/find/searchresultwidget.cpp | |
| parent | 0a59f347946a44583dc4f6271bbfa93b481d84dd (diff) | |
| download | qt-creator-c1f643e387788f905f5f8b0466c70ccebb9bc58e.tar.gz | |
Fix search next/prev in search results.
Broke with ebb9e252779aff1ff874565c2b056f1c8319c2c8
Change-Id: Ifb5821d4712e780df70bc1ec798123dd7b63b108
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Diffstat (limited to 'src/plugins/find/searchresultwidget.cpp')
| -rw-r--r-- | src/plugins/find/searchresultwidget.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/plugins/find/searchresultwidget.cpp b/src/plugins/find/searchresultwidget.cpp index 34205ef4c7..556bd2409b 100644 --- a/src/plugins/find/searchresultwidget.cpp +++ b/src/plugins/find/searchresultwidget.cpp @@ -117,7 +117,7 @@ public: } m_view->setCurrentIndex(m_incrementalFindStart); bool wrapped = false; - IFindSupport::Result result = find(txt, findFlags, &wrapped); + IFindSupport::Result result = find(txt, findFlags, true/*startFromCurrent*/, &wrapped); if (wrapped != m_incrementalWrappedState) { m_incrementalWrappedState = wrapped; showWrapIndicator(m_view); @@ -128,7 +128,7 @@ public: IFindSupport::Result findStep(const QString &txt, Find::FindFlags findFlags) { bool wrapped = false; - IFindSupport::Result result = find(txt, findFlags, &wrapped); + IFindSupport::Result result = find(txt, findFlags, false/*startFromNext*/, &wrapped); if (wrapped) showWrapIndicator(m_view); if (result == IFindSupport::Found) { @@ -138,7 +138,8 @@ public: return result; } - IFindSupport::Result find(const QString &txt, Find::FindFlags findFlags, bool *wrapped) + IFindSupport::Result find(const QString &txt, Find::FindFlags findFlags, + bool startFromCurrentIndex, bool *wrapped) { if (wrapped) *wrapped = false; @@ -150,11 +151,13 @@ public: index = m_view->model()->find(QRegExp(txt, (sensitive ? Qt::CaseSensitive : Qt::CaseInsensitive)), m_view->currentIndex(), Find::textDocumentFlagsForFindFlags(findFlags), + startFromCurrentIndex, wrapped); } else { index = m_view->model()->find(txt, m_view->currentIndex(), Find::textDocumentFlagsForFindFlags(findFlags), + startFromCurrentIndex, wrapped); } if (index.isValid()) { |