RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Moved regexp for excluding digits to single place.

This commit is contained in:
23rd 2022-12-29 12:42:51 +03:00
parent 0eec470387
commit 297fd0f0c8
6 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/intro/intro_code.cpp
View File

@ -391,7 +391,7 @@ void CodeWidget::submitCode() {
const auto text = QString(
_code->getLastText()
).remove(
QRegularExpression("[^\\d]")
TextUtilities::RegExpDigitsExclude()
).mid(0, getData()->codeLength);
if (_sentRequest

4
Telegram/SourceFiles/passport/passport_panel_controller.cpp
View File

@ -487,7 +487,9 @@ EditContactScheme GetContactScheme(Scope::Type type) {
return Ui::FormatPhone(value);
};
result.postprocess = [](QString value) {
return value.replace(QRegularExpression("[^\\d]"), QString());
return value.replace(
TextUtilities::RegExpDigitsExclude(),
QString());
};
return result;
} break;

1
Telegram/SourceFiles/ui/text/format_values.cpp
View File

@ -10,7 +10,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "lang/lang_keys.h"
#include "countries/countries_instance.h"
#include <QRegularExpression>
#include <QtCore/QLocale>
#include <locale>
#include <sstream>

4
Telegram/SourceFiles/ui/widgets/fields/special_fields.cpp
View File

@ -136,7 +136,7 @@ void PhonePartInput::correctValue(
int &nowCursor) {
if (!now.isEmpty() && (_lastDigits != now)) {
_lastDigits = now;
_lastDigits.replace(QRegularExpression("[^\\d]"), QString());
_lastDigits.replace(TextUtilities::RegExpDigitsExclude(), QString());
updatePattern(_groupsCallback(_code + _lastDigits));
}
@ -359,7 +359,7 @@ void PhoneInput::correctValue(
QString &now,
int &nowCursor) {
auto digits = now;
digits.replace(QRegularExpression("[^\\d]"), QString());
digits.replace(TextUtilities::RegExpDigitsExclude(), QString());
_pattern = _groupsCallback(digits);
QString newPlaceholder;

4
Telegram/SourceFiles/ui/widgets/sent_code_field.cpp
View File

@ -34,9 +34,7 @@ void SentCodeField::setChangedCallback(Fn<void()> changedCallback) {
QString SentCodeField::getDigitsOnly() const {
return QString(
getLastText()
).remove(
QRegularExpression("[^\\d]")
);
).remove(TextUtilities::RegExpDigitsExclude());
}
void SentCodeField::fix() {

2
Telegram/lib_ui

@ -1 +1 @@
Subproject commit 28fd4eea95f4012f1b864d385259ee2de2284ff9
Subproject commit 3fea35ff19b52da94fa3ed17695f00b79bfb1917