From ee3994384a5ce6f2bb6929e305ed8db498ee1578 Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Sun, 10 May 2020 20:14:30 +0200 Subject: Examples/RegularExpressionDialog: remove deprecated options Remove the two deprecated (and non-functional) options OptimizeOnFirstUsageOption and DontAutomaticallyOptimizeOption. Change-Id: Id5191cee84bf7b1ae65f828a981f93d98db23f53 Reviewed-by: Samuel Gaist Reviewed-by: Giuseppe D'Angelo --- .../tools/regularexpression/regularexpressiondialog.cpp | 11 ----------- .../widgets/tools/regularexpression/regularexpressiondialog.h | 2 -- 2 files changed, 13 deletions(-) (limited to 'examples/widgets') diff --git a/examples/widgets/tools/regularexpression/regularexpressiondialog.cpp b/examples/widgets/tools/regularexpression/regularexpressiondialog.cpp index 9d75caae91..51025b7100 100644 --- a/examples/widgets/tools/regularexpression/regularexpressiondialog.cpp +++ b/examples/widgets/tools/regularexpression/regularexpressiondialog.cpp @@ -219,8 +219,6 @@ RegularExpressionDialog::RegularExpressionDialog(QWidget *parent) connect(invertedGreedinessOptionCheckBox, &QCheckBox::toggled, this, &RegularExpressionDialog::refresh); connect(dontCaptureOptionCheckBox, &QCheckBox::toggled, this, &RegularExpressionDialog::refresh); connect(useUnicodePropertiesOptionCheckBox, &QCheckBox::toggled, this, &RegularExpressionDialog::refresh); - connect(optimizeOnFirstUsageOptionCheckBox, &QCheckBox::toggled, this, &RegularExpressionDialog::refresh); - connect(dontAutomaticallyOptimizeOptionCheckBox, &QCheckBox::toggled, this, &RegularExpressionDialog::refresh); connect(offsetSpinBox, &QSpinBox::valueChanged, this, &RegularExpressionDialog::refresh); @@ -309,10 +307,6 @@ void RegularExpressionDialog::refresh() patternOptions |= QRegularExpression::DontCaptureOption; if (useUnicodePropertiesOptionCheckBox->isChecked()) patternOptions |= QRegularExpression::UseUnicodePropertiesOption; - if (optimizeOnFirstUsageOptionCheckBox->isChecked()) - patternOptions |= QRegularExpression::OptimizeOnFirstUsageOption; - if (dontAutomaticallyOptimizeOptionCheckBox->isChecked()) - patternOptions |= QRegularExpression::DontAutomaticallyOptimizeOption; rx.setPatternOptions(patternOptions); @@ -400,8 +394,6 @@ QWidget *RegularExpressionDialog::setupLeftUi() invertedGreedinessOptionCheckBox = new QCheckBox(tr("Inverted greediness")); dontCaptureOptionCheckBox = new QCheckBox(tr("Don't capture")); useUnicodePropertiesOptionCheckBox = new QCheckBox(tr("Use unicode properties (/u)")); - optimizeOnFirstUsageOptionCheckBox = new QCheckBox(tr("Optimize on first usage")); - dontAutomaticallyOptimizeOptionCheckBox = new QCheckBox(tr("Don't automatically optimize")); QGridLayout *patternOptionsCheckBoxLayout = new QGridLayout; int gridRow = 0; @@ -415,9 +407,6 @@ QWidget *RegularExpressionDialog::setupLeftUi() patternOptionsCheckBoxLayout->addWidget(dontCaptureOptionCheckBox, gridRow, 2); ++gridRow; patternOptionsCheckBoxLayout->addWidget(useUnicodePropertiesOptionCheckBox, gridRow, 1); - patternOptionsCheckBoxLayout->addWidget(optimizeOnFirstUsageOptionCheckBox, gridRow, 2); - ++gridRow; - patternOptionsCheckBoxLayout->addWidget(dontAutomaticallyOptimizeOptionCheckBox, gridRow, 1); layout->addRow(tr("Pattern options:"), patternOptionsCheckBoxLayout); diff --git a/examples/widgets/tools/regularexpression/regularexpressiondialog.h b/examples/widgets/tools/regularexpression/regularexpressiondialog.h index 8fe85afe56..b0db4d884c 100644 --- a/examples/widgets/tools/regularexpression/regularexpressiondialog.h +++ b/examples/widgets/tools/regularexpression/regularexpressiondialog.h @@ -92,8 +92,6 @@ private: QCheckBox *invertedGreedinessOptionCheckBox; QCheckBox *dontCaptureOptionCheckBox; QCheckBox *useUnicodePropertiesOptionCheckBox; - QCheckBox *optimizeOnFirstUsageOptionCheckBox; - QCheckBox *dontAutomaticallyOptimizeOptionCheckBox; QSpinBox *offsetSpinBox; -- cgit v1.2.3