Martchus
/
syncthingtray
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't use functions deprecated in Qt 5.14.0

This commit is contained in:
Martchus 2019-12-18 00:07:52 +01:00
parent 7c3a9634ae
commit 131050b275
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
connector/tests/connectiontests.cpp
View File

@ -480,10 +480,16 @@ void ConnectionTests::checkDirectories() const
CPPUNIT_ASSERT_EQUAL(QStringLiteral("idle"), dir1.statusString());
CPPUNIT_ASSERT_EQUAL(SyncthingDirType::SendReceive, dir1.dirType);
CPPUNIT_ASSERT(!dir1.paused);
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
const auto devIds = dir1.deviceIds.toSet();
const auto devNames = dir1.deviceNames.toSet();
#else
const auto devIds = QSet(dir1.deviceIds.begin(), dir1.deviceIds.end());
const auto devNames = QSet(dir1.deviceNames.begin(), dir1.deviceNames.end());
#endif
CPPUNIT_ASSERT_EQUAL(QSet<QString>({ QStringLiteral("MMGUI6U-WUEZQCP-XZZ6VYB-LCT4TVC-ER2HAVX-QYT6X7D-S6ZSG2B-323KLQ7"),
QStringLiteral("6EIS2PN-J2IHWGS-AXS3YUL-HC5FT3K-77ZXTLL-AKQLJ4C-7SWVPUS-AZW4RQ4") }),
dir1.deviceIds.toSet());
CPPUNIT_ASSERT_EQUAL(QSet<QString>({ QStringLiteral("Test dev 2"), QStringLiteral("Test dev 1") }), dir1.deviceNames.toSet());
QStringLiteral("6EIS2PN-J2IHWGS-AXS3YUL-HC5FT3K-77ZXTLL-AKQLJ4C-7SWVPUS-AZW4RQ4") }), devIds);
CPPUNIT_ASSERT_EQUAL(QSet<QString>({ QStringLiteral("Test dev 2"), QStringLiteral("Test dev 1") }), devNames);
const SyncthingDir &dir2 = dirInfo.back();
CPPUNIT_ASSERT_EQUAL(QStringLiteral("test2"), dir2.id);
CPPUNIT_ASSERT_EQUAL(QStringLiteral("Test dir 2"), dir2.label);
@ -493,9 +499,16 @@ void ConnectionTests::checkDirectories() const
CPPUNIT_ASSERT_EQUAL(QStringLiteral("paused"), dir2.statusString());
CPPUNIT_ASSERT_EQUAL(SyncthingDirType::SendReceive, dir2.dirType);
CPPUNIT_ASSERT(dir2.paused);
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
const auto devIds2 = dir2.deviceIds.toSet();
const auto devNames2 = dir2.deviceNames.toSet();
#else
const auto devIds2 = QSet(dir2.deviceIds.begin(), dir2.deviceIds.end());
const auto devNames2 = QSet(dir2.deviceNames.begin(), dir2.deviceNames.end());
#endif
CPPUNIT_ASSERT_EQUAL(
QSet<QString>({ QStringLiteral("MMGUI6U-WUEZQCP-XZZ6VYB-LCT4TVC-ER2HAVX-QYT6X7D-S6ZSG2B-323KLQ7") }), dir2.deviceIds.toSet());
CPPUNIT_ASSERT_EQUAL(QSet<QString>({ QStringLiteral("Test dev 2") }), dir2.deviceNames.toSet());
QSet<QString>({ QStringLiteral("MMGUI6U-WUEZQCP-XZZ6VYB-LCT4TVC-ER2HAVX-QYT6X7D-S6ZSG2B-323KLQ7") }), devIds2);
CPPUNIT_ASSERT_EQUAL(QSet<QString>({ QStringLiteral("Test dev 2") }), devNames2);
}
void ConnectionTests::testReconnecting()

2
testhelper/helper.h
View File

@ -45,7 +45,7 @@ inline std::ostream &operator<<(std::ostream &o, const QStringList &qstringlist)
*/
inline std::ostream &operator<<(std::ostream &o, const QSet<QString> &qstringset)
{
return o << qstringset.toList().join(QStringLiteral(", ")).toLocal8Bit().data();
return o << qstringset.values().join(QStringLiteral(", ")).toLocal8Bit().data();
}
namespace CppUtilities {