summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorChristian Ehrlicher <ch.ehrlicher@gmx.de>2020-05-10 20:14:30 +0200
committerKai Koehne <kai.koehne@qt.io>2020-07-14 07:33:06 +0000
commit2e2f1c0b1ba1a3e556e07b3120587cd62ea1f2ba (patch)
tree825a72986388a4ef3d18463d5d6018ea4138b067 /examples
parent225c2c8ce29f9e3025cbd38d2ed4ad06edf9da62 (diff)
Examples/RegularExpressionDialog: remove deprecated options
Remove the two deprecated (and non-functional) options OptimizeOnFirstUsageOption and DontAutomaticallyOptimizeOption. Change-Id: Id5191cee84bf7b1ae65f828a981f93d98db23f53 Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> (cherry picked from commit ee3994384a5ce6f2bb6929e305ed8db498ee1578) Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'examples')
-rw-r--r--examples/widgets/tools/regularexpression/regularexpressiondialog.cpp11
-rw-r--r--examples/widgets/tools/regularexpression/regularexpressiondialog.h2
2 files changed, 0 insertions, 13 deletions
diff --git a/examples/widgets/tools/regularexpression/regularexpressiondialog.cpp b/examples/widgets/tools/regularexpression/regularexpressiondialog.cpp
index 6398098eee..0607f7a1b5 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, QOverload<int>::of(&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;