From d38197bb676d8937f5d9acd534200195b2e541bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stig=20Bj=C3=B8rlykke?= Date: Thu, 7 Sep 2017 13:27:41 +0200 Subject: [PATCH] Qt: Construct QRegExp only once MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Interface Toolbar lineedit the QRegExp only needs to be constructed once, not for every validity check. Change-Id: I39e9ab9c57b4ac64a0b9b601fa72646d8c420274 Reviewed-on: https://code.wireshark.org/review/23425 Petri-Dish: Stig Bjørlykke Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke --- ui/qt/widgets/interface_toolbar_lineedit.cpp | 7 +++---- ui/qt/widgets/interface_toolbar_lineedit.h | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ui/qt/widgets/interface_toolbar_lineedit.cpp b/ui/qt/widgets/interface_toolbar_lineedit.cpp index b8ed7bd337..76c1bc5bb2 100644 --- a/ui/qt/widgets/interface_toolbar_lineedit.cpp +++ b/ui/qt/widgets/interface_toolbar_lineedit.cpp @@ -33,7 +33,7 @@ InterfaceToolbarLineEdit::InterfaceToolbarLineEdit(QWidget *parent, QString validation_regex, bool is_required) : QLineEdit(parent), - validation_regex_(validation_regex), + regex_expr_(validation_regex), is_required_(is_required), text_edited_(false) { @@ -95,10 +95,9 @@ bool InterfaceToolbarLineEdit::isValid() valid = false; } - if (!validation_regex_.isEmpty() && text().length() > 0) + if (!regex_expr_.isEmpty() && text().length() > 0) { - QRegExp expr(validation_regex_); - if (!expr.isValid() || expr.indexIn(text(), 0) == -1) + if (!regex_expr_.isValid() || regex_expr_.indexIn(text(), 0) == -1) { valid = false; } diff --git a/ui/qt/widgets/interface_toolbar_lineedit.h b/ui/qt/widgets/interface_toolbar_lineedit.h index e26a50c976..5e7736b049 100644 --- a/ui/qt/widgets/interface_toolbar_lineedit.h +++ b/ui/qt/widgets/interface_toolbar_lineedit.h @@ -50,7 +50,7 @@ private: void updateStyleSheet(bool is_valid); StockIconToolButton *apply_button_; - QString validation_regex_; + QRegExp regex_expr_; bool is_required_; bool text_edited_; };