diff --git a/io/entry.h b/io/entry.h index 6afb72d..07decbb 100644 --- a/io/entry.h +++ b/io/entry.h @@ -120,18 +120,18 @@ public: NodeEntry(const std::string &label, NodeEntry *parent = nullptr); NodeEntry(std::istream &stream); NodeEntry(const NodeEntry &other); - ~NodeEntry(); + ~NodeEntry() override; - virtual EntryType type() const; + EntryType type() const override; const std::vector &children() const; void deleteChildren(int begin, int end); void replaceChild(std::size_t at, Entry *newChild); Entry *entryByPath(std::list &path, bool includeThis = true, EntryType *creationType = nullptr); bool isExpandedByDefault() const; void setExpandedByDefault(bool expandedByDefault); - virtual void make(std::ostream &stream) const; - virtual NodeEntry *clone() const; - void accumulateStatistics(EntryStatistics &stats) const; + void make(std::ostream &stream) const override; + NodeEntry *clone() const override; + void accumulateStatistics(EntryStatistics &stats) const override; private: std::vector m_children; @@ -174,14 +174,14 @@ public: AccountEntry(const std::string &label, NodeEntry *parent = nullptr); AccountEntry(std::istream &stream); AccountEntry(const AccountEntry &other); - ~AccountEntry(); + ~AccountEntry() override; - virtual EntryType type() const; + EntryType type() const override; const std::vector &fields() const; std::vector &fields(); - virtual void make(std::ostream &stream) const; - virtual AccountEntry *clone() const; - void accumulateStatistics(EntryStatistics &stats) const; + void make(std::ostream &stream) const override; + AccountEntry *clone() const override; + void accumulateStatistics(EntryStatistics &stats) const override; private: std::vector m_fields; diff --git a/tests/entrytests.cpp b/tests/entrytests.cpp index 610d414..e0d78dc 100644 --- a/tests/entrytests.cpp +++ b/tests/entrytests.cpp @@ -26,8 +26,8 @@ class EntryTests : public TestFixture { CPPUNIT_TEST_SUITE_END(); public: - void setUp(); - void tearDown(); + void setUp() override; + void tearDown() override; void testNewEntryCorrectlyInitialized(); void testNesting(); diff --git a/tests/fieldtests.cpp b/tests/fieldtests.cpp index 4136a10..95266fa 100644 --- a/tests/fieldtests.cpp +++ b/tests/fieldtests.cpp @@ -25,8 +25,8 @@ class FieldTests : public TestFixture { CPPUNIT_TEST_SUITE_END(); public: - void setUp(); - void tearDown(); + void setUp() override; + void tearDown() override; void testNewFieldCorrectlyInitialized(); void testMutation(); diff --git a/tests/opensslrandomdevice.cpp b/tests/opensslrandomdevice.cpp index a80cd51..f83676b 100644 --- a/tests/opensslrandomdevice.cpp +++ b/tests/opensslrandomdevice.cpp @@ -22,8 +22,8 @@ class OpenSslRandomDeviceTests : public TestFixture { CPPUNIT_TEST_SUITE_END(); public: - void setUp(); - void tearDown(); + void setUp() override; + void tearDown() override; void testUsageWithStandardClasses(); }; diff --git a/tests/opensslutils.cpp b/tests/opensslutils.cpp index d1bb3f1..d8d3701 100644 --- a/tests/opensslutils.cpp +++ b/tests/opensslutils.cpp @@ -25,8 +25,8 @@ class OpenSslUtilsTests : public TestFixture { CPPUNIT_TEST_SUITE_END(); public: - void setUp(); - void tearDown(); + void setUp() override; + void tearDown() override; void testComputeSha256Sum(); void testGenerateRandomNumber(); diff --git a/tests/passwordfiletests.cpp b/tests/passwordfiletests.cpp index 38d5ec5..53fed24 100644 --- a/tests/passwordfiletests.cpp +++ b/tests/passwordfiletests.cpp @@ -24,8 +24,8 @@ class PasswordFileTests : public TestFixture { CPPUNIT_TEST_SUITE_END(); public: - void setUp(); - void tearDown(); + void setUp() override; + void tearDown() override; void testReading(); void testReading(const string &context, const string &testfile1path, const string &testfile1password, const string &testfile2,