Refactoring

sanny32 · sanny32 · commit e90c16e49129 · 2025-11-13T08:28:15.000+03:00
diff --git a/omodsim/controls/numericlineedit.cpp b/omodsim/controls/numericlineedit.cpp
@@ -13,8 +13,8 @@
 ///
 NumericLineEdit::NumericLineEdit(QWidget* parent)
     : QLineEdit(parent)
-    ,_paddingZeroes(false)
-    ,_paddingZeroWidth(0)
+    ,_leadingZeroes(false)
+    ,_leadingZeroWidth(0)
 {
     setInputMode(Int32Mode);
     setValue(0);
@@ -31,8 +31,8 @@ NumericLineEdit::NumericLineEdit(QWidget* parent)
 ///
 NumericLineEdit::NumericLineEdit(NumericLineEdit::InputMode mode, QWidget *parent)
     : QLineEdit(parent)
-    ,_paddingZeroes(false)
-    ,_paddingZeroWidth(0)
+    ,_leadingZeroes(false)
+    ,_leadingZeroWidth(0)
 {
     setInputMode(mode);
     setValue(0);
@@ -43,21 +43,21 @@ NumericLineEdit::NumericLineEdit(NumericLineEdit::InputMode mode, QWidget *paren
 }
 
 ///
-/// \brief NumericLineEdit::paddingZeroes
+/// \brief NumericLineEdit::leadingZeroes
 /// \return
 ///
-bool NumericLineEdit::paddingZeroes() const
+bool NumericLineEdit::leadingZeroes() const
 {
-    return _paddingZeroes;
+    return _leadingZeroes;
 }
 
 ///
 /// \brief NumberLineEdit::enablePaddingZero
 /// \param on
 ///
-void NumericLineEdit::setPaddingZeroes(bool on)
+void NumericLineEdit::setLeadingZeroes(bool on)
 {
-    _paddingZeroes = on;
+    _leadingZeroes = on;
 }
 
 ///
@@ -157,9 +157,9 @@ void NumericLineEdit::internalSetValue(QVariant value)
     {
         case Int32Mode:
             value = qBound(_minValue.toInt(), value.toInt(), _maxValue.toInt());
-            if(_paddingZeroes)
+            if(_leadingZeroes)
             {
-                const auto text = QStringLiteral("%1").arg(value.toInt(), _paddingZeroWidth, 10, QLatin1Char('0'));
+                const auto text = QStringLiteral("%1").arg(value.toInt(), _leadingZeroWidth, 10, QLatin1Char('0'));
                 if(text != QLineEdit::text())
                     QLineEdit::setText(text);
             }
@@ -173,9 +173,9 @@ void NumericLineEdit::internalSetValue(QVariant value)
 
         case UInt32Mode:
             value = qBound(_minValue.toUInt(), value.toUInt(), _maxValue.toUInt());
-            if(_paddingZeroes)
+            if(_leadingZeroes)
             {
-                const auto text = QStringLiteral("%1").arg(value.toUInt(), _paddingZeroWidth, 10, QLatin1Char('0'));
+                const auto text = QStringLiteral("%1").arg(value.toUInt(), _leadingZeroWidth, 10, QLatin1Char('0'));
                 if(text != QLineEdit::text())
                     QLineEdit::setText(text);
             }
@@ -191,9 +191,9 @@ void NumericLineEdit::internalSetValue(QVariant value)
         {
             value = qBound(_minValue.toInt() > 0 ? _minValue.toUInt() : 0, value.toUInt(), _maxValue.toUInt());
             const QString prefix = (hasFocus() ? "" : "0x");
-            if(_paddingZeroes)
+            if(_leadingZeroes)
             {
-                const auto text = prefix + QStringLiteral("%1").arg(value.toUInt(), _paddingZeroWidth, 16, QLatin1Char('0')).toUpper();
+                const auto text = prefix + QStringLiteral("%1").arg(value.toUInt(), _leadingZeroWidth, 16, QLatin1Char('0')).toUpper();
                 if(text != QLineEdit::text())
                     QLineEdit::setText(text);
             }
@@ -236,9 +236,9 @@ void NumericLineEdit::internalSetValue(QVariant value)
         case Int64Mode:
         {
             value = qBound(_minValue.toLongLong(), value.toLongLong(), _maxValue.toLongLong());
-            if(_paddingZeroes)
+            if(_leadingZeroes)
             {
-                const auto text = QStringLiteral("%1").arg(value.toLongLong(), _paddingZeroWidth, 10, QLatin1Char('0'));
+                const auto text = QStringLiteral("%1").arg(value.toLongLong(), _leadingZeroWidth, 10, QLatin1Char('0'));
                 if(text != QLineEdit::text())
                     QLineEdit::setText(text);
             }
@@ -254,9 +254,9 @@ void NumericLineEdit::internalSetValue(QVariant value)
         case UInt64Mode:
         {
             value = qBound(_minValue.toULongLong(), value.toULongLong(), _maxValue.toULongLong());
-            if(_paddingZeroes)
+            if(_leadingZeroes)
             {
-                const auto text = QStringLiteral("%1").arg(value.toULongLong(), _paddingZeroWidth, 10, QLatin1Char('0'));
+                const auto text = QStringLiteral("%1").arg(value.toULongLong(), _leadingZeroWidth, 10, QLatin1Char('0'));
                 if(text != QLineEdit::text())
                     QLineEdit::setText(text);
             }
@@ -493,7 +493,7 @@ void NumericLineEdit::on_rangeChanged(const QVariant& bottom, const QVariant& to
         case Int32Mode:
         {
             const int nums = QString::number(top.toInt()).length();
-            _paddingZeroWidth = qMax(1, nums);
+            _leadingZeroWidth = qMax(1, nums);
             setMaxLength(qMax(2, nums + 1));
             setValidator(new QIntValidator(bottom.toInt(), top.toInt(), this));
 
@@ -503,7 +503,7 @@ void NumericLineEdit::on_rangeChanged(const QVariant& bottom, const QVariant& to
         case UInt32Mode:
         {
             const int nums = QString::number(top.toUInt()).length();
-            _paddingZeroWidth = qMax(1, nums);
+            _leadingZeroWidth = qMax(1, nums);
             setMaxLength(qMax(1, nums));
             setValidator(new QUIntValidator(bottom.toUInt(), top.toUInt(), this));
         }
@@ -512,7 +512,7 @@ void NumericLineEdit::on_rangeChanged(const QVariant& bottom, const QVariant& to
         case HexMode:
         {
             const int nums = QString::number(top.toUInt(), 16).length();
-            _paddingZeroWidth = qMax(1, nums);
+            _leadingZeroWidth = qMax(1, nums);
             setMaxLength(qMax(1, nums + 2));
             setValidator(new QHexValidator(bottom.toUInt(), top.toUInt(), this));
         }
@@ -531,7 +531,7 @@ void NumericLineEdit::on_rangeChanged(const QVariant& bottom, const QVariant& to
         case Int64Mode:
         {
             const int nums = QString::number(top.toLongLong()).length();
-            _paddingZeroWidth = qMax(1, nums);
+            _leadingZeroWidth = qMax(1, nums);
             setMaxLength(qMax(2, nums + 1));
             setValidator(new QInt64Validator(bottom.toLongLong(), top.toLongLong(), this));
         }
@@ -540,7 +540,7 @@ void NumericLineEdit::on_rangeChanged(const QVariant& bottom, const QVariant& to
         case UInt64Mode:
         {
             const int nums = QString::number(top.toULongLong()).length();
-            _paddingZeroWidth = qMax(1, nums);
+            _leadingZeroWidth = qMax(1, nums);
             setMaxLength(qMax(1, nums));
             setValidator(new QUIntValidator(bottom.toULongLong(), top.toULongLong(), this));
         }
diff --git a/omodsim/controls/numericlineedit.h b/omodsim/controls/numericlineedit.h
@@ -33,8 +33,8 @@ class NumericLineEdit : public QLineEdit
     void setValue(T value)
     { internalSetValue(value); }
 
-    bool paddingZeroes() const;
-    void setPaddingZeroes(bool on);
+    bool leadingZeroes() const;
+    void setLeadingZeroes(bool on);
 
     template<typename T>
     QRange<T> range() const
@@ -84,8 +84,8 @@ private slots:
     QVariant _minValue;
     QVariant _maxValue;
     InputMode _inputMode;
-    bool _paddingZeroes;
-    int _paddingZeroWidth;
+    bool _leadingZeroes;
+    int _leadingZeroWidth;
     QString _codepage;
 };
 
diff --git a/omodsim/dialogs/dialogforcemultipleregisters.cpp b/omodsim/dialogs/dialogforcemultipleregisters.cpp
@@ -605,7 +605,7 @@ NumericLineEdit* DialogForceMultipleRegisters::createNumEdit(int idx)
         case DataDisplayMode::Hex:
             numEdit = new NumericLineEdit(NumericLineEdit::HexMode, ui->tableWidget);
             numEdit->setInputRange(0, USHRT_MAX);
-            numEdit->setPaddingZeroes(true);
+            numEdit->setLeadingZeroes(true);
             numEdit->setValue(toByteOrderValue(_data[idx], _writeParams.Order));
         break;
 
@@ -619,7 +619,7 @@ NumericLineEdit* DialogForceMultipleRegisters::createNumEdit(int idx)
         case DataDisplayMode::UInt16:
             numEdit = new NumericLineEdit(NumericLineEdit::UInt32Mode, ui->tableWidget);
             numEdit->setInputRange(0, USHRT_MAX);
-            numEdit->setPaddingZeroes(true);
+            numEdit->setLeadingZeroes(true);
             numEdit->setValue(toByteOrderValue(_data[idx], _writeParams.Order));
         break;
 
diff --git a/omodsim/dialogs/dialogforcemultipleregisters.h b/omodsim/dialogs/dialogforcemultipleregisters.h
@@ -40,7 +40,7 @@ private slots:
     void setupLineEdit(NumericLineEdit* edit, NumericLineEdit::InputMode mode,
                        bool padding = false, T min = std::numeric_limits<T>::lowest() , T max = std::numeric_limits<T>::max())
     {
-        edit->setPaddingZeroes(padding);
+        edit->setLeadingZeroes(padding);
         edit->setInputMode(mode);
 
         const QVariant minValue = QVariant::fromValue<T>(min);
diff --git a/omodsim/dialogs/dialogwriteholdingregister.cpp b/omodsim/dialogs/dialogwriteholdingregister.cpp
@@ -61,7 +61,7 @@ DialogWriteHoldingRegister::DialogWriteHoldingRegister(ModbusWriteParams& writeP
         case DataDisplayMode::Hex:
             ui->lineEditValue->setInputRange(0, USHRT_MAX);
             ui->labelValue->setText("Value, (HEX): ");
-            ui->lineEditValue->setPaddingZeroes(true);
+            ui->lineEditValue->setLeadingZeroes(true);
             ui->lineEditValue->setInputMode(NumericLineEdit::HexMode);
             ui->lineEditValue->setValue(_writeParams.Value.toUInt());
         break;
diff --git a/omodsim/formmodsim.cpp b/omodsim/formmodsim.cpp
@@ -36,7 +36,7 @@ FormModSim::FormModSim(int id, ModbusMultiServer& server, QSharedPointer<DataSim
 
     ui->lineEditDeviceId->setInputRange(ModbusLimits::slaveRange());
     ui->lineEditDeviceId->setValue(1);
-    ui->lineEditDeviceId->setPaddingZeroes(true);
+    ui->lineEditDeviceId->setLeadingZeroes(true);
     server.addDeviceId(ui->lineEditDeviceId->value<int>());
 
     ui->stackedWidget->setCurrentIndex(0);
@@ -45,7 +45,7 @@ FormModSim::FormModSim(int id, ModbusMultiServer& server, QSharedPointer<DataSim
 
     const auto mbDefs = _mbMultiServer.getModbusDefinitions();
 
-    ui->lineEditAddress->setPaddingZeroes(true);
+    ui->lineEditAddress->setLeadingZeroes(true);
     ui->lineEditAddress->setInputRange(ModbusLimits::addressRange(mbDefs.AddrSpace, true));
     ui->lineEditAddress->setValue(0);
 

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@`
`13`	`13`	`///`
`14`	`14`	`NumericLineEdit::NumericLineEdit(QWidget* parent)`
`15`	`15`	`: QLineEdit(parent)`
`16`		`- ,_paddingZeroes(false)`
`17`		`- ,_paddingZeroWidth(0)`
	`16`	`+ ,_leadingZeroes(false)`
	`17`	`+ ,_leadingZeroWidth(0)`
`18`	`18`	`{`
`19`	`19`	`setInputMode(Int32Mode);`
`20`	`20`	`setValue(0);`
`@@ -31,8 +31,8 @@ NumericLineEdit::NumericLineEdit(QWidget* parent)`
`31`	`31`	`///`
`32`	`32`	`NumericLineEdit::NumericLineEdit(NumericLineEdit::InputMode mode, QWidget *parent)`
`33`	`33`	`: QLineEdit(parent)`
`34`		`- ,_paddingZeroes(false)`
`35`		`- ,_paddingZeroWidth(0)`
	`34`	`+ ,_leadingZeroes(false)`
	`35`	`+ ,_leadingZeroWidth(0)`
`36`	`36`	`{`
`37`	`37`	`setInputMode(mode);`
`38`	`38`	`setValue(0);`
`@@ -43,21 +43,21 @@ NumericLineEdit::NumericLineEdit(NumericLineEdit::InputMode mode, QWidget *paren`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`///`
`46`		`-/// \brief NumericLineEdit::paddingZeroes`
	`46`	`+/// \brief NumericLineEdit::leadingZeroes`
`47`	`47`	`/// \return`
`48`	`48`	`///`
`49`		`-bool NumericLineEdit::paddingZeroes() const`
	`49`	`+bool NumericLineEdit::leadingZeroes() const`
`50`	`50`	`{`
`51`		`- return _paddingZeroes;`
	`51`	`+ return _leadingZeroes;`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`///`
`55`	`55`	`/// \brief NumberLineEdit::enablePaddingZero`
`56`	`56`	`/// \param on`
`57`	`57`	`///`
`58`		`-void NumericLineEdit::setPaddingZeroes(bool on)`
	`58`	`+void NumericLineEdit::setLeadingZeroes(bool on)`
`59`	`59`	`{`
`60`		`- _paddingZeroes = on;`
	`60`	`+ _leadingZeroes = on;`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`///`
`@@ -157,9 +157,9 @@ void NumericLineEdit::internalSetValue(QVariant value)`
`157`	`157`	`{`
`158`	`158`	`case Int32Mode:`
`159`	`159`	`value = qBound(_minValue.toInt(), value.toInt(), _maxValue.toInt());`
`160`		`- if(_paddingZeroes)`
	`160`	`+ if(_leadingZeroes)`
`161`	`161`	`{`
`162`		`- const auto text = QStringLiteral("%1").arg(value.toInt(), _paddingZeroWidth, 10, QLatin1Char('0'));`
	`162`	`+ const auto text = QStringLiteral("%1").arg(value.toInt(), _leadingZeroWidth, 10, QLatin1Char('0'));`
`163`	`163`	`if(text != QLineEdit::text())`
`164`	`164`	`QLineEdit::setText(text);`
`165`	`165`	`}`
`@@ -173,9 +173,9 @@ void NumericLineEdit::internalSetValue(QVariant value)`
`173`	`173`
`174`	`174`	`case UInt32Mode:`
`175`	`175`	`value = qBound(_minValue.toUInt(), value.toUInt(), _maxValue.toUInt());`
`176`		`- if(_paddingZeroes)`
	`176`	`+ if(_leadingZeroes)`
`177`	`177`	`{`
`178`		`- const auto text = QStringLiteral("%1").arg(value.toUInt(), _paddingZeroWidth, 10, QLatin1Char('0'));`
	`178`	`+ const auto text = QStringLiteral("%1").arg(value.toUInt(), _leadingZeroWidth, 10, QLatin1Char('0'));`
`179`	`179`	`if(text != QLineEdit::text())`
`180`	`180`	`QLineEdit::setText(text);`
`181`	`181`	`}`
`@@ -191,9 +191,9 @@ void NumericLineEdit::internalSetValue(QVariant value)`
`191`	`191`	`{`
`192`	`192`	`value = qBound(_minValue.toInt() > 0 ? _minValue.toUInt() : 0, value.toUInt(), _maxValue.toUInt());`
`193`	`193`	`const QString prefix = (hasFocus() ? "" : "0x");`
`194`		`- if(_paddingZeroes)`
	`194`	`+ if(_leadingZeroes)`
`195`	`195`	`{`
`196`		`- const auto text = prefix + QStringLiteral("%1").arg(value.toUInt(), _paddingZeroWidth, 16, QLatin1Char('0')).toUpper();`
	`196`	`+ const auto text = prefix + QStringLiteral("%1").arg(value.toUInt(), _leadingZeroWidth, 16, QLatin1Char('0')).toUpper();`
`197`	`197`	`if(text != QLineEdit::text())`
`198`	`198`	`QLineEdit::setText(text);`
`199`	`199`	`}`
`@@ -236,9 +236,9 @@ void NumericLineEdit::internalSetValue(QVariant value)`
`236`	`236`	`case Int64Mode:`
`237`	`237`	`{`
`238`	`238`	`value = qBound(_minValue.toLongLong(), value.toLongLong(), _maxValue.toLongLong());`
`239`		`- if(_paddingZeroes)`
	`239`	`+ if(_leadingZeroes)`
`240`	`240`	`{`
`241`		`- const auto text = QStringLiteral("%1").arg(value.toLongLong(), _paddingZeroWidth, 10, QLatin1Char('0'));`
	`241`	`+ const auto text = QStringLiteral("%1").arg(value.toLongLong(), _leadingZeroWidth, 10, QLatin1Char('0'));`
`242`	`242`	`if(text != QLineEdit::text())`
`243`	`243`	`QLineEdit::setText(text);`
`244`	`244`	`}`
`@@ -254,9 +254,9 @@ void NumericLineEdit::internalSetValue(QVariant value)`
`254`	`254`	`case UInt64Mode:`
`255`	`255`	`{`
`256`	`256`	`value = qBound(_minValue.toULongLong(), value.toULongLong(), _maxValue.toULongLong());`
`257`		`- if(_paddingZeroes)`
	`257`	`+ if(_leadingZeroes)`
`258`	`258`	`{`
`259`		`- const auto text = QStringLiteral("%1").arg(value.toULongLong(), _paddingZeroWidth, 10, QLatin1Char('0'));`
	`259`	`+ const auto text = QStringLiteral("%1").arg(value.toULongLong(), _leadingZeroWidth, 10, QLatin1Char('0'));`
`260`	`260`	`if(text != QLineEdit::text())`
`261`	`261`	`QLineEdit::setText(text);`
`262`	`262`	`}`
`@@ -493,7 +493,7 @@ void NumericLineEdit::on_rangeChanged(const QVariant& bottom, const QVariant& to`
`493`	`493`	`case Int32Mode:`
`494`	`494`	`{`
`495`	`495`	`const int nums = QString::number(top.toInt()).length();`
`496`		`- _paddingZeroWidth = qMax(1, nums);`
	`496`	`+ _leadingZeroWidth = qMax(1, nums);`
`497`	`497`	`setMaxLength(qMax(2, nums + 1));`
`498`	`498`	`setValidator(new QIntValidator(bottom.toInt(), top.toInt(), this));`
`499`	`499`
`@@ -503,7 +503,7 @@ void NumericLineEdit::on_rangeChanged(const QVariant& bottom, const QVariant& to`
`503`	`503`	`case UInt32Mode:`
`504`	`504`	`{`
`505`	`505`	`const int nums = QString::number(top.toUInt()).length();`
`506`		`- _paddingZeroWidth = qMax(1, nums);`
	`506`	`+ _leadingZeroWidth = qMax(1, nums);`
`507`	`507`	`setMaxLength(qMax(1, nums));`
`508`	`508`	`setValidator(new QUIntValidator(bottom.toUInt(), top.toUInt(), this));`
`509`	`509`	`}`
`@@ -512,7 +512,7 @@ void NumericLineEdit::on_rangeChanged(const QVariant& bottom, const QVariant& to`
`512`	`512`	`case HexMode:`
`513`	`513`	`{`
`514`	`514`	`const int nums = QString::number(top.toUInt(), 16).length();`
`515`		`- _paddingZeroWidth = qMax(1, nums);`
	`515`	`+ _leadingZeroWidth = qMax(1, nums);`
`516`	`516`	`setMaxLength(qMax(1, nums + 2));`
`517`	`517`	`setValidator(new QHexValidator(bottom.toUInt(), top.toUInt(), this));`
`518`	`518`	`}`
`@@ -531,7 +531,7 @@ void NumericLineEdit::on_rangeChanged(const QVariant& bottom, const QVariant& to`
`531`	`531`	`case Int64Mode:`
`532`	`532`	`{`
`533`	`533`	`const int nums = QString::number(top.toLongLong()).length();`
`534`		`- _paddingZeroWidth = qMax(1, nums);`
	`534`	`+ _leadingZeroWidth = qMax(1, nums);`
`535`	`535`	`setMaxLength(qMax(2, nums + 1));`
`536`	`536`	`setValidator(new QInt64Validator(bottom.toLongLong(), top.toLongLong(), this));`
`537`	`537`	`}`
`@@ -540,7 +540,7 @@ void NumericLineEdit::on_rangeChanged(const QVariant& bottom, const QVariant& to`
`540`	`540`	`case UInt64Mode:`
`541`	`541`	`{`
`542`	`542`	`const int nums = QString::number(top.toULongLong()).length();`
`543`		`- _paddingZeroWidth = qMax(1, nums);`
	`543`	`+ _leadingZeroWidth = qMax(1, nums);`
`544`	`544`	`setMaxLength(qMax(1, nums));`
`545`	`545`	`setValidator(new QUIntValidator(bottom.toULongLong(), top.toULongLong(), this));`
`546`	`546`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ private slots:`
`40`	`40`	`void setupLineEdit(NumericLineEdit* edit, NumericLineEdit::InputMode mode,`
`41`	`41`	`bool padding = false, T min = std::numeric_limits<T>::lowest() , T max = std::numeric_limits<T>::max())`
`42`	`42`	`{`
`43`		`- edit->setPaddingZeroes(padding);`
	`43`	`+ edit->setLeadingZeroes(padding);`
`44`	`44`	`edit->setInputMode(mode);`
`45`	`45`
`46`	`46`	`const QVariant minValue = QVariant::fromValue<T>(min);`