Skip to content

Remove invalid XML1.0 characters from Role/City... fields #1380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lauris71 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Remove invalid XML1.0 characters from Role/City... fields #1380

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
28314fe
Remove invalid XML1.0 characters from Role/City... fields
Jan 2, 2026
a562d02
Use iterator
Jan 2, 2026
7c5d330
Use reserve/append instead of resize
Jan 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 21 additions & 7 deletions client/dialogs/RoleAddressDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,19 @@

class RoleAddressDialog::Private: public Ui::RoleAddressDialog {};

static QString cleanUp(const QString& src) {
QString dst;
dst.reserve(src.size());
size_t dlen = 0;
for (auto s = src.cbegin(); s != src.cend(); s++) {
if ((*s <= ' ') && (*s != QChar(0x9)) && (*s != QChar(0xa)) && (*s != QChar(0xd))) continue;
if ((*s == QChar(0xfffe)) || (*s == QChar(0xffff))) continue;
dst.append(*s);
}
dst.resize(dlen);
return dst;
}

RoleAddressDialog::RoleAddressDialog(QWidget *parent)
: QDialog(parent)
, d(new Private)
Expand Down Expand Up @@ -57,8 +70,9 @@ RoleAddressDialog::RoleAddressDialog(QWidget *parent)
line->setCompleter(completer);
connect(line, &QLineEdit::editingFinished, this, [line, s = std::move(s)] {
QStringList list = s;
list.removeAll(line->text());
list.insert(0, line->text());
QString text = cleanUp(line->text());
list.removeAll(text);
list.insert(0, text);
if(list.size() > 10)
list.removeLast();
s.clear(); // Uses on Windows MULTI_STRING registry
Expand All @@ -81,10 +95,10 @@ int RoleAddressDialog::get(QString &city, QString &country, QString &state, QStr
int result = QDialog::exec();
if(result == QDialog::Rejected)
return result;
role = d->Role->text();
city = d->City->text();
state = d->State->text();
country = d->Country->text();
zip = d->Zip->text();
role = cleanUp(d->Role->text());
city = cleanUp(d->City->text());
state = cleanUp(d->State->text());
country = cleanUp(d->Country->text());
zip = cleanUp(d->Zip->text());
return result;
}
Loading