StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

fix(import): don't use java-style iterator before first element

Browse Source 
Fix #4962
This commit is contained in:
Anthony Bilinski 2018-03-20 23:35:27 -07:00
parent 4951f90964
commit acea7c315f
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/widget/form/addfriendform.cpp
View File

@ -245,17 +245,19 @@ void AddFriendForm::onImportOpenClicked()
} }
contactsToImport = QString::fromUtf8(contactFile.readAll()).split('\n'); contactsToImport = QString::fromUtf8(contactFile.readAll()).split('\n');
QMutableListIterator<QString> it(contactsToImport);
qDebug() << "Import list:"; qDebug() << "Import list:";
while (it.hasNext()) { for (auto it = contactsToImport.begin(); it != contactsToImport.end();) {
const QString id = it.value().trimmed(); const QString id = it->trimmed();
const bool valid = !id.isEmpty() && checkIsValidId(id); if (checkIsValidId(id)) {
if (valid) { *it = id;
it.value() = id; qDebug() << *it;
++it;
} else { } else {
it.remove(); if (!id.isEmpty()) {
qDebug() << "Invalid ID:" << *it;
}
it = contactsToImport.erase(it);
} }
qDebug() << it.next();
} }
if (contactsToImport.isEmpty()) { if (contactsToImport.isEmpty()) {