Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2026-01-07 19:45:58 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1770 from pasdam/feature/useQuuid

Browse source 
Replaced Uuid with QUuid
This commit is contained in:
Jonathan White 2018-07-08 20:32:54 -04:00 • committed by GitHub
commit 470a74ee24
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
53 changed files with 438 additions and 645 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/gui/csvImport/CsvImportWidget.cpp
View file

@ -203,8 +203,8 @@ void CsvImportWidget::load(const QString& filename, Database* const db)
m_parserModel->setFilename(filename);
m_ui->labelFilename->setText(filename);
Group* group = m_db->rootGroup();
group->setUuid(Uuid::random());
group->setNotes(tr("Imported from CSV file\nOriginal data: %1").arg(filename));
group->setUuid(QUuid::createUuid());
group->setNotes(tr("Imported from CSV file").append("\n").append(tr("Original data: ")) + filename);
parse();
}
@ -247,7 +247,7 @@ void CsvImportWidget::writeDatabase()
continue;
}
Entry* entry = new Entry();
entry->setUuid(Uuid::random());
entry->setUuid(QUuid::createUuid());
entry->setGroup(splitGroups(m_parserModel->data(m_parserModel->index(r, 0)).toString()));
entry->setTitle(m_parserModel->data(m_parserModel->index(r, 1)).toString());
entry->setUsername(m_parserModel->data(m_parserModel->index(r, 2)).toString());
@ -339,7 +339,7 @@ Group* CsvImportWidget::splitGroups(QString label)
Group* brandNew = new Group();
brandNew->setParent(current);
brandNew->setName(groupName);
brandNew->setUuid(Uuid::random());
brandNew->setUuid(QUuid::createUuid());
current = brandNew;
} else {
Q_ASSERT(children != nullptr);