Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-10-01 01:26:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix Qt deprecation warnings

Browse Source
This commit is contained in:
Janek Bevendorff 2017-03-10 15:05:02 +01:00
parent da0afd3939
commit 2872f1706c
No known key found for this signature in database
GPG Key ID: CFEC2F6850BFFA53
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/http/Service.cpp
View File

@ -29,6 +29,8 @@
#include "core/Uuid.h"
#include "core/PasswordGenerator.h"
#include <algorithm>
static const unsigned char KEEPASSHTTP_UUID_DATA[] = {
0x34, 0x69, 0x7a, 0x40, 0x8a, 0x5b, 0x41, 0xc0,
0x9f, 0x36, 0x89, 0x7d, 0x62, 0x3e, 0xcb, 0x31
@ -387,7 +389,7 @@ QList<KeepassHttpProtocol::Entry> Service::findMatchingEntries(const QString& /*
priorities.insert(entry, sortPriority(entry, host, submitUrl, baseSubmitURL));
//Sort by priorities
qSort(pwEntries.begin(), pwEntries.end(), SortEntries(priorities, HttpSettings::sortByTitle() ? "Title" : "UserName"));
std::sort(pwEntries.begin(), pwEntries.end(), SortEntries(priorities, HttpSettings::sortByTitle() ? "Title" : "UserName"));
}
//if (pwEntries.count() > 0)

2
tests/TestGroupModel.cpp
View File

@ -131,7 +131,7 @@ void TestGroupModel::test()
QCOMPARE(spyMoved.count(), 3);
QVERIFY(index12.isValid());
QCOMPARE(model->data(index12).toString(), QString("group12"));
QCOMPARE(model->data(index12.child(0, 0)).toString(), QString("group121"));
QCOMPARE(model->data(index12.model()->index(0, 0, index12)).toString(), QString("group121"));
delete group12;
QCOMPARE(spyAboutToAdd.count(), 1);