diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2020-02-19 23:26:24 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2020-02-21 08:28:34 +0000 |
| commit | a83f0c5d74e45899f2412def152959147a12e2b1 (patch) | |
| tree | a14abcccd87b0169f3f15e803ed50467ca05fcb6 /src/plugins/clearcase | |
| parent | e445f7aac3600b36af6b604852583891e473fcfe (diff) | |
VCS: Replace QRegExp with QRegularExpression in VcsBaseEditor
Change-Id: I8e8a6649e441597e29e88506d494ec69260bebd1
Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Diffstat (limited to 'src/plugins/clearcase')
| -rw-r--r-- | src/plugins/clearcase/clearcaseeditor.cpp | 11 | ||||
| -rw-r--r-- | src/plugins/clearcase/clearcaseeditor.h | 4 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/plugins/clearcase/clearcaseeditor.cpp b/src/plugins/clearcase/clearcaseeditor.cpp index 341cc92ad8..3996d61617 100644 --- a/src/plugins/clearcase/clearcaseeditor.cpp +++ b/src/plugins/clearcase/clearcaseeditor.cpp @@ -47,10 +47,8 @@ ClearCaseEditorWidget::ClearCaseEditorWidget() : // Diff formats: // "+++ D:\depot\...\mainwindow.cpp@@\main\3" (versioned) // "+++ D:\depot\...\mainwindow.cpp[TAB]Sun May 01 14:22:37 2011" (local) - QRegExp diffFilePattern(QLatin1String("^[-+]{3} ([^\\t]+)(?:@@|\\t)")); - diffFilePattern.setMinimal(true); - setDiffFilePattern(diffFilePattern); - setLogEntryPattern(QRegExp(QLatin1String("version \"([^\"]+)\""))); + setDiffFilePattern("^[-+]{3} ([^\\t]+?)(?:@@|\\t)"); + setLogEntryPattern("version \"([^\"]+)\""); setAnnotateRevisionTextFormat(tr("Annotate version \"%1\"")); setAnnotationEntryPattern("([^|]*)\\|[^\\n]*\\n"); setAnnotationSeparatorPattern("\\n-{30}"); @@ -66,8 +64,9 @@ QString ClearCaseEditorWidget::changeUnderCursor(const QTextCursor &c) const QString change = cursor.selectedText(); // Annotation output has number, log output has revision numbers // as r1, r2... - if (m_versionNumberPattern.indexIn(change) != -1) - return m_versionNumberPattern.cap(); + const QRegularExpressionMatch match = m_versionNumberPattern.match(change); + if (match.hasMatch()) + return match.captured(); return QString(); } diff --git a/src/plugins/clearcase/clearcaseeditor.h b/src/plugins/clearcase/clearcaseeditor.h index e97a6ecb22..3bab6b13a0 100644 --- a/src/plugins/clearcase/clearcaseeditor.h +++ b/src/plugins/clearcase/clearcaseeditor.h @@ -28,7 +28,7 @@ #include <vcsbase/vcsbaseeditor.h> -#include <QRegExp> +#include <QRegularExpression> namespace ClearCase { namespace Internal { @@ -45,7 +45,7 @@ private: VcsBase::BaseAnnotationHighlighter *createAnnotationHighlighter( const QSet<QString> &changes) const override; - QRegExp m_versionNumberPattern; + const QRegularExpression m_versionNumberPattern; }; } // namespace Internal |