1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Examples/RegularExpressionDialog: remove deprecated options

Browse Source 
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>
This commit is contained in:
Christian Ehrlicher 2020-05-10 20:14:30 +02:00
parent eaa6191307
commit ee3994384a
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
examples/widgets/tools/regularexpression/regularexpressiondialog.cpp
View File

@ -219,8 +219,6 @@ RegularExpressionDialog::RegularExpressionDialog(QWidget *parent)
connect(invertedGreedinessOptionCheckBox, &QCheckBox::toggled, this, &RegularExpressionDialog::refresh); connect(invertedGreedinessOptionCheckBox, &QCheckBox::toggled, this, &RegularExpressionDialog::refresh);
connect(dontCaptureOptionCheckBox, &QCheckBox::toggled, this, &RegularExpressionDialog::refresh); connect(dontCaptureOptionCheckBox, &QCheckBox::toggled, this, &RegularExpressionDialog::refresh);
connect(useUnicodePropertiesOptionCheckBox, &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, connect(offsetSpinBox, &QSpinBox::valueChanged,
this, &RegularExpressionDialog::refresh); this, &RegularExpressionDialog::refresh);
@ -309,10 +307,6 @@ void RegularExpressionDialog::refresh()
patternOptions |= QRegularExpression::DontCaptureOption; patternOptions |= QRegularExpression::DontCaptureOption;
if (useUnicodePropertiesOptionCheckBox->isChecked()) if (useUnicodePropertiesOptionCheckBox->isChecked())
patternOptions |= QRegularExpression::UseUnicodePropertiesOption; patternOptions |= QRegularExpression::UseUnicodePropertiesOption;
if (optimizeOnFirstUsageOptionCheckBox->isChecked())
patternOptions |= QRegularExpression::OptimizeOnFirstUsageOption;
if (dontAutomaticallyOptimizeOptionCheckBox->isChecked())
patternOptions |= QRegularExpression::DontAutomaticallyOptimizeOption;
rx.setPatternOptions(patternOptions); rx.setPatternOptions(patternOptions);
@ -400,8 +394,6 @@ QWidget *RegularExpressionDialog::setupLeftUi()
invertedGreedinessOptionCheckBox = new QCheckBox(tr("Inverted greediness")); invertedGreedinessOptionCheckBox = new QCheckBox(tr("Inverted greediness"));
dontCaptureOptionCheckBox = new QCheckBox(tr("Don't capture")); dontCaptureOptionCheckBox = new QCheckBox(tr("Don't capture"));
useUnicodePropertiesOptionCheckBox = new QCheckBox(tr("Use unicode properties (/u)")); 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; QGridLayout *patternOptionsCheckBoxLayout = new QGridLayout;
int gridRow = 0; int gridRow = 0;
@ -415,9 +407,6 @@ QWidget *RegularExpressionDialog::setupLeftUi()
patternOptionsCheckBoxLayout->addWidget(dontCaptureOptionCheckBox, gridRow, 2); patternOptionsCheckBoxLayout->addWidget(dontCaptureOptionCheckBox, gridRow, 2);
++gridRow; ++gridRow;
patternOptionsCheckBoxLayout->addWidget(useUnicodePropertiesOptionCheckBox, gridRow, 1); patternOptionsCheckBoxLayout->addWidget(useUnicodePropertiesOptionCheckBox, gridRow, 1);
patternOptionsCheckBoxLayout->addWidget(optimizeOnFirstUsageOptionCheckBox, gridRow, 2);
++gridRow;
patternOptionsCheckBoxLayout->addWidget(dontAutomaticallyOptimizeOptionCheckBox, gridRow, 1);
layout->addRow(tr("Pattern options:"), patternOptionsCheckBoxLayout); layout->addRow(tr("Pattern options:"), patternOptionsCheckBoxLayout);

2
examples/widgets/tools/regularexpression/regularexpressiondialog.h
View File

@ -92,8 +92,6 @@ private:
QCheckBox *invertedGreedinessOptionCheckBox; QCheckBox *invertedGreedinessOptionCheckBox;
QCheckBox *dontCaptureOptionCheckBox; QCheckBox *dontCaptureOptionCheckBox;
QCheckBox *useUnicodePropertiesOptionCheckBox; QCheckBox *useUnicodePropertiesOptionCheckBox;
QCheckBox *optimizeOnFirstUsageOptionCheckBox;
QCheckBox *dontAutomaticallyOptimizeOptionCheckBox;
QSpinBox *offsetSpinBox; QSpinBox *offsetSpinBox;