matthew/ostinato
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use uint64 for find/replace QVariant instead of string

Browse Source
This commit is contained in:
Srivats P 2021-12-11 15:57:02 +05:30
parent f0c7ef50f7
commit 4aedc61c8e
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
client/findreplace.cpp
View File

@ -146,13 +146,6 @@ void FindReplaceDialog::on_buttonBox_accepted()
action_->fieldIndex = fieldAttrib.index; action_->fieldIndex = fieldAttrib.index;
action_->fieldBitSize = fieldAttrib.bitSize; action_->fieldBitSize = fieldAttrib.bitSize;
// TODO: Change <= 64 to uint64 instead of string
// XXX: All find/replace value/mask QVariants are set to
// 64-bit decimal number encoded as string
// - The action user is expected to convert to appropriate type
// (fieldBitSize is included as a hint)
// - QVariant can only do decimal conversions (not hex)
if (fieldAttrib.bitSize == 128) { // IPv6 address if (fieldAttrib.bitSize == 128) { // IPv6 address
if (matchAny->isChecked()) { if (matchAny->isChecked()) {
action_->findMask.setValue(UInt128(0)); action_->findMask.setValue(UInt128(0));
@ -174,21 +167,21 @@ void FindReplaceDialog::on_buttonBox_accepted()
ipUtils::ip6StringToUInt128(replaceValue->text())); ipUtils::ip6StringToUInt128(replaceValue->text()));
} else { // everything else } else { // everything else
if (matchAny->isChecked()) { if (matchAny->isChecked()) {
action_->findMask.setValue(QString("0")); action_->findMask.setValue(0);
action_->findValue.setValue(QString("0")); action_->findValue.setValue(0);
} else { } else {
action_->findMask.setValue(QString::number( action_->findMask.setValue(
useFindMask->isChecked() ? useFindMask->isChecked() ?
findMask->text().toULongLong(nullptr, 0) : findMask->text().toULongLong(nullptr, 0) :
quint64(~0))); ~quint64(0));
action_->findValue.setValue(QString::number( action_->findValue.setValue(
findValue->text().toULongLong(nullptr, 0))); findValue->text().toULongLong(nullptr, 0));
} }
action_->replaceMask.setValue(QString::number( action_->replaceMask.setValue(
useReplaceMask->isChecked() ? useReplaceMask->isChecked() ?
replaceMask->text().toULongLong(nullptr, 0) : replaceMask->text().toULongLong(nullptr, 0) :
quint64(~0))); ~quint64(0));
action_->replaceValue.setValue(QString::number( action_->replaceValue.setValue(QString::number(
replaceValue->text().toULongLong(nullptr, 0))); replaceValue->text().toULongLong(nullptr, 0)));
} }