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

Rename FieldEdit::setMask as FieldEdit::setMaskMode

Browse Source
This commit is contained in:
Srivats P 2021-12-11 13:40:44 +05:30
parent 975ce8093d
commit f0c7ef50f7
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
client/fieldedit.cpp
View File

@ -35,25 +35,25 @@ void FieldEdit::setType(FieldType type)
switch (type_) {
case kUInt64:
setValidator(&uint64Validator_);
if (isMask_)
if (isMaskMode_)
setText("0xFFFFFFFFFFFFFFFF");
break;
case kMacAddress:
setValidator(&macValidator_);
setPlaceholderText("00:00:00:00:00:00");
if (isMask_)
if (isMaskMode_)
setText("FF:FF:FF:FF:FF:FF");
break;
case kIp4Address:
setValidator(&ip4Validator_);
setPlaceholderText("0.0.0.0");
if (isMask_)
if (isMaskMode_)
setText("255.255.255.255");
break;
case kIp6Address:
setValidator(&ip6Validator_);
setPlaceholderText("::");
if (isMask_)
if (isMaskMode_)
setText("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
break;
default:
@ -68,14 +68,14 @@ void FieldEdit::setRange(quint64 min, quint64 max)
uint64Validator_.setRange(min, max);
if (type_ == kUInt64) {
setPlaceholderText(QString("%1 - %2").arg(min).arg(max));
if (isMask_)
if (isMaskMode_)
setText(QString::number(max, 16).toUpper().prepend("0x"));
}
}
void FieldEdit::setMask(bool isMask)
void FieldEdit::setMaskMode(bool maskMode)
{
isMask_ = isMask;
isMaskMode_ = maskMode;
}
QString FieldEdit::text() const

4
client/fieldedit.h
View File

@ -42,13 +42,13 @@ public:
void setType(FieldType type);
void setRange(quint64 min, quint64 max);
void setMask(bool isMask); // FIXME: rename
void setMaskMode(bool maskMode);
QString text() const;
private:
FieldType type_{kUInt64};
bool isMask_{false};
bool isMaskMode_{false};
IPv4AddressValidator ip4Validator_;
IPv6AddressValidator ip6Validator_;

4
client/findreplace.cpp
View File

@ -34,8 +34,8 @@ FindReplaceDialog::FindReplaceDialog(Action *action, QWidget *parent)
{
setupUi(this);
findMask->setMask(true);
replaceMask->setMask(true);
findMask->setMaskMode(true);
replaceMask->setMaskMode(true);
// Keep things simple and don't use mask(s) (default)
useFindMask->setChecked(false);