Compare commits

..

8 Commits

Author SHA1 Message Date
Synku 8c652b220c Update '.gitmodules'
4 years ago
Synku e83456c171 Update '.gitmodules'
4 years ago
dsc 690725d31d Wownero fork
4 years ago
mrdeveloper ceb8436b51 Contacts: import via csv file
4 years ago
mrdeveloper 7ac697267d Contacts: import via csv file
4 years ago
dsc 5561eacdf2 Commit cd1cd5cb75
4 years ago
dsc 6e95b31a70 Commit cd1cd5cb75
4 years ago
mrdeveloper 346634ec09 Contacts: import via csv file
4 years ago

@ -1 +1 @@
Subproject commit 9d6a7bcc14e512ccb04f5f286c1710fca19e4762
Subproject commit 3cbb44a2fd79ce9c667006e2e42e61513993e59a

@ -182,6 +182,8 @@ QMap<QString, QString> AddressBookModel::readCSV(const QString &path) {
QString csv = Utils::barrayToString(Utils::fileOpen(path));
QTextStream stream(&csv);
QMap<QString, QString> map;
<<<<<<< HEAD
<<<<<<< HEAD
while(!stream.atEnd()) {
QStringList line = stream.readLine().split(",");
@ -193,6 +195,21 @@ QMap<QString, QString> AddressBookModel::readCSV(const QString &path) {
description = description.replace("\"", "");
if(!description.isEmpty() && !address.isEmpty()) {
map[description] = address;
=======
while(!stream.atEnd()) {
QStringList line = stream.readLine().split(",");
=======
while(!stream.atEnd()) {
QStringList line = stream.readLine().split(",");
>>>>>>> Contacts: import via csv file
QString name = line.at(0);
QString address = line.at(1);
if(!name.isEmpty() && !address.isEmpty()) {
map[name] = address;
<<<<<<< HEAD
>>>>>>> Contacts: import via csv file
=======
>>>>>>> Contacts: import via csv file
}
}
return map;

Loading…
Cancel
Save