diff options
| author | con <qtc-committer@nokia.com> | 2010-06-11 08:57:38 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2010-06-11 11:07:48 +0200 |
| commit | f232cd4ead41ac7f129f0d360363d8546a0c49ab (patch) | |
| tree | 18dab8e4d8e28c691ecbef2bb8d82c61b1a36e1d /src/libs/utils/filesearch.h | |
| parent | 3b4b2c3ef60e98106d24bbe4e5f9e40f3d4d1731 (diff) | |
| download | qt-creator-f232cd4ead41ac7f129f0d360363d8546a0c49ab.tar.gz | |
Fixes: Multi-file regexp replace didn't replace placeholders e.g. \1
Diffstat (limited to 'src/libs/utils/filesearch.h')
| -rw-r--r-- | src/libs/utils/filesearch.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/libs/utils/filesearch.h b/src/libs/utils/filesearch.h index e7f91a6719..f2860e34e0 100644 --- a/src/libs/utils/filesearch.h +++ b/src/libs/utils/filesearch.h @@ -43,8 +43,15 @@ class QTCREATOR_UTILS_EXPORT FileSearchResult { public: FileSearchResult() {} - FileSearchResult(QString fileName, int lineNumber, QString matchingLine, int matchStart, int matchLength) - : fileName(fileName), lineNumber(lineNumber), matchingLine(matchingLine), matchStart(matchStart), matchLength(matchLength) + FileSearchResult(QString fileName, int lineNumber, QString matchingLine, + int matchStart, int matchLength, + QStringList regexpCapturedTexts) + : fileName(fileName), + lineNumber(lineNumber), + matchingLine(matchingLine), + matchStart(matchStart), + matchLength(matchLength), + regexpCapturedTexts(regexpCapturedTexts) { } QString fileName; @@ -52,6 +59,7 @@ public: QString matchingLine; int matchStart; int matchLength; + QStringList regexpCapturedTexts; }; QTCREATOR_UTILS_EXPORT QFuture<FileSearchResult> findInFiles(const QString &searchTerm, const QStringList &files, @@ -60,6 +68,8 @@ QTCREATOR_UTILS_EXPORT QFuture<FileSearchResult> findInFiles(const QString &sear QTCREATOR_UTILS_EXPORT QFuture<FileSearchResult> findInFilesRegExp(const QString &searchTerm, const QStringList &files, QTextDocument::FindFlags flags, QMap<QString, QString> fileToContentsMap = QMap<QString, QString>()); +QTCREATOR_UTILS_EXPORT QString expandRegExpReplacement(const QString &replaceText, const QStringList &capturedTexts); + } // namespace Utils #endif // FILESEARCH_H |