From 2bfe66e840d225ba295bf989defc574b269a7b10 Mon Sep 17 00:00:00 2001 From: Christian Kieschnick Date: Fri, 4 Jan 2019 12:38:34 +0100 Subject: [PATCH] Another attempt to make GCC happy --- src/keeshare/ShareObserver.cpp | 4 ++-- tests/TestSharing.cpp | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/keeshare/ShareObserver.cpp b/src/keeshare/ShareObserver.cpp index e30fd0966..45f3049c4 100644 --- a/src/keeshare/ShareObserver.cpp +++ b/src/keeshare/ShareObserver.cpp @@ -80,7 +80,7 @@ QPair check(QByteArray& data, certificate = sign.certificate; auto key = sign.certificate.sshKey(); key.openKey(QString()); - const auto signer = Signature{}; + const auto signer = Signature(); if (!signer.verify(data, sign.signature, key)) { qCritical("Invalid signature for sharing container %s.", qPrintable(reference.path)); return {Invalid, KeeShareSettings::Certificate()}; @@ -429,7 +429,7 @@ ShareObserver::Result ShareObserver::importInsecureContainerInto(const KeeShareS auto foreign = KeeShare::foreign(); const auto own = KeeShare::own(); - const auto sign = KeeShareSettings::Sign{}; // invalid sign + const auto sign = KeeShareSettings::Sign(); // invalid sign auto trust = check(payload, reference, own.certificate, foreign.certificates, sign); switch(trust.first) { case UntrustedForever: diff --git a/tests/TestSharing.cpp b/tests/TestSharing.cpp index 78f37f15f..beff9f15e 100644 --- a/tests/TestSharing.cpp +++ b/tests/TestSharing.cpp @@ -108,32 +108,32 @@ void TestSharing::testNullObjects() const QString empty; QXmlStreamReader reader(empty); - const auto nullKey = KeeShareSettings::Key{}; + const auto nullKey = KeeShareSettings::Key(); QVERIFY(nullKey.isNull()); const auto xmlKey = KeeShareSettings::Key::deserialize(reader); QVERIFY(xmlKey.isNull()); - const auto certificate = KeeShareSettings::Certificate{}; + const auto certificate = KeeShareSettings::Certificate(); QVERIFY(certificate.isNull()); const auto xmlCertificate = KeeShareSettings::Certificate::deserialize(reader); QVERIFY(xmlCertificate.isNull()); - const auto own = KeeShareSettings::Own{}; + const auto own = KeeShareSettings::Own(); QVERIFY(own.isNull()); const auto xmlOwn = KeeShareSettings::Own::deserialize(empty); QVERIFY(xmlOwn.isNull()); - const auto active = KeeShareSettings::Active{}; + const auto active = KeeShareSettings::Active(); QVERIFY(active.isNull()); const auto xmlActive = KeeShareSettings::Active::deserialize(empty); QVERIFY(xmlActive.isNull()); - const auto foreign = KeeShareSettings::Foreign{}; + const auto foreign = KeeShareSettings::Foreign(); QVERIFY(foreign.certificates.isEmpty()); const auto xmlForeign = KeeShareSettings::Foreign::deserialize(empty); QVERIFY(xmlForeign.certificates.isEmpty()); - const auto reference = KeeShareSettings::Reference{}; + const auto reference = KeeShareSettings::Reference(); QVERIFY(reference.isNull()); const auto xmlReference = KeeShareSettings::Reference::deserialize(empty); QVERIFY(xmlReference.isNull());