AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unnecessary type conversion

Browse Source 
Change-Id: I09e3e4596a8c79b3ece08c694010c76e05d8a22b
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
This commit is contained in:
Xiao YaoBing 2021-06-08 21:11:38 +08:00
parent bc71496a34
commit 87098106d0
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/widgets/widgets/qwidgetlinecontrol.cpp
View File

@ -1208,44 +1208,44 @@ QString QWidgetLineControl::maskString(int pos, const QString &str, bool clear)
if (strIndex < str.length()) { if (strIndex < str.length()) {
if (m_maskData[i].separator) { if (m_maskData[i].separator) {
s += m_maskData[i].maskChar; s += m_maskData[i].maskChar;
if (str[(int)strIndex] == m_maskData[i].maskChar) if (str[strIndex] == m_maskData[i].maskChar)
strIndex++; strIndex++;
++i; ++i;
} else { } else {
if (isValidInput(str[(int)strIndex], m_maskData[i].maskChar)) { if (isValidInput(str[strIndex], m_maskData[i].maskChar)) {
switch (m_maskData[i].caseMode) { switch (m_maskData[i].caseMode) {
case MaskInputData::Upper: case MaskInputData::Upper:
s += str[(int)strIndex].toUpper(); s += str[strIndex].toUpper();
break; break;
case MaskInputData::Lower: case MaskInputData::Lower:
s += str[(int)strIndex].toLower(); s += str[strIndex].toLower();
break; break;
default: default:
s += str[(int)strIndex]; s += str[strIndex];
} }
++i; ++i;
} else { } else {
// search for separator first // search for separator first
int n = findInMask(i, true, true, str[(int)strIndex]); int n = findInMask(i, true, true, str[strIndex]);
if (n != -1) { if (n != -1) {
if (str.length() != 1 || i == 0 || (i > 0 && (!m_maskData[i-1].separator || m_maskData[i-1].maskChar != str[(int)strIndex]))) { if (str.length() != 1 || i == 0 || (i > 0 && (!m_maskData[i-1].separator || m_maskData[i-1].maskChar != str[strIndex]))) {
s += QStringView{fill}.mid(i, n - i + 1); s += QStringView{fill}.mid(i, n - i + 1);
i = n + 1; // update i to find + 1 i = n + 1; // update i to find + 1
} }
} else { } else {
// search for valid m_blank if not // search for valid m_blank if not
n = findInMask(i, true, false, str[(int)strIndex]); n = findInMask(i, true, false, str[strIndex]);
if (n != -1) { if (n != -1) {
s += QStringView{fill}.mid(i, n - i); s += QStringView{fill}.mid(i, n - i);
switch (m_maskData[n].caseMode) { switch (m_maskData[n].caseMode) {
case MaskInputData::Upper: case MaskInputData::Upper:
s += str[(int)strIndex].toUpper(); s += str[strIndex].toUpper();
break; break;
case MaskInputData::Lower: case MaskInputData::Lower:
s += str[(int)strIndex].toLower(); s += str[strIndex].toLower();
break; break;
default: default:
s += str[(int)strIndex]; s += str[strIndex];
} }
i = n + 1; // updates i to find + 1 i = n + 1; // updates i to find + 1
} }