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

Use override

This commit is contained in:
Marius Kittler 2018-12-21 17:31:50 +01:00
parent af5d9147b4
commit c04fdd6cc2
6 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
io/entry.h
View File

@ -120,18 +120,18 @@ public:
NodeEntry(const std::string &label, NodeEntry *parent = nullptr); NodeEntry(const std::string &label, NodeEntry *parent = nullptr);
NodeEntry(std::istream &stream); NodeEntry(std::istream &stream);
NodeEntry(const NodeEntry &other); NodeEntry(const NodeEntry &other);
~NodeEntry(); ~NodeEntry() override;
virtual EntryType type() const; EntryType type() const override;
const std::vector<Entry *> &children() const; const std::vector<Entry *> &children() const;
void deleteChildren(int begin, int end); void deleteChildren(int begin, int end);
void replaceChild(std::size_t at, Entry *newChild); void replaceChild(std::size_t at, Entry *newChild);
Entry *entryByPath(std::list<std::string> &path, bool includeThis = true, EntryType *creationType = nullptr); Entry *entryByPath(std::list<std::string> &path, bool includeThis = true, EntryType *creationType = nullptr);
bool isExpandedByDefault() const; bool isExpandedByDefault() const;
void setExpandedByDefault(bool expandedByDefault); void setExpandedByDefault(bool expandedByDefault);
virtual void make(std::ostream &stream) const; void make(std::ostream &stream) const override;
virtual NodeEntry *clone() const; NodeEntry *clone() const override;
void accumulateStatistics(EntryStatistics &stats) const; void accumulateStatistics(EntryStatistics &stats) const override;
private: private:
std::vector<Entry *> m_children; std::vector<Entry *> m_children;
@ -174,14 +174,14 @@ public:
AccountEntry(const std::string &label, NodeEntry *parent = nullptr); AccountEntry(const std::string &label, NodeEntry *parent = nullptr);
AccountEntry(std::istream &stream); AccountEntry(std::istream &stream);
AccountEntry(const AccountEntry &other); AccountEntry(const AccountEntry &other);
~AccountEntry(); ~AccountEntry() override;
virtual EntryType type() const; EntryType type() const override;
const std::vector<Field> &fields() const; const std::vector<Field> &fields() const;
std::vector<Field> &fields(); std::vector<Field> &fields();
virtual void make(std::ostream &stream) const; void make(std::ostream &stream) const override;
virtual AccountEntry *clone() const; AccountEntry *clone() const override;
void accumulateStatistics(EntryStatistics &stats) const; void accumulateStatistics(EntryStatistics &stats) const override;
private: private:
std::vector<Field> m_fields; std::vector<Field> m_fields;

4
tests/entrytests.cpp
View File

@ -26,8 +26,8 @@ class EntryTests : public TestFixture {
CPPUNIT_TEST_SUITE_END(); CPPUNIT_TEST_SUITE_END();
public: public:
void setUp(); void setUp() override;
void tearDown(); void tearDown() override;
void testNewEntryCorrectlyInitialized(); void testNewEntryCorrectlyInitialized();
void testNesting(); void testNesting();

4
tests/fieldtests.cpp
View File

@ -25,8 +25,8 @@ class FieldTests : public TestFixture {
CPPUNIT_TEST_SUITE_END(); CPPUNIT_TEST_SUITE_END();
public: public:
void setUp(); void setUp() override;
void tearDown(); void tearDown() override;
void testNewFieldCorrectlyInitialized(); void testNewFieldCorrectlyInitialized();
void testMutation(); void testMutation();

4
tests/opensslrandomdevice.cpp
View File

@ -22,8 +22,8 @@ class OpenSslRandomDeviceTests : public TestFixture {
CPPUNIT_TEST_SUITE_END(); CPPUNIT_TEST_SUITE_END();
public: public:
void setUp(); void setUp() override;
void tearDown(); void tearDown() override;
void testUsageWithStandardClasses(); void testUsageWithStandardClasses();
}; };

4
tests/opensslutils.cpp
View File

@ -25,8 +25,8 @@ class OpenSslUtilsTests : public TestFixture {
CPPUNIT_TEST_SUITE_END(); CPPUNIT_TEST_SUITE_END();
public: public:
void setUp(); void setUp() override;
void tearDown(); void tearDown() override;
void testComputeSha256Sum(); void testComputeSha256Sum();
void testGenerateRandomNumber(); void testGenerateRandomNumber();

4
tests/passwordfiletests.cpp
View File

@ -24,8 +24,8 @@ class PasswordFileTests : public TestFixture {
CPPUNIT_TEST_SUITE_END(); CPPUNIT_TEST_SUITE_END();
public: public:
void setUp(); void setUp() override;
void tearDown(); void tearDown() override;
void testReading(); void testReading();
void testReading(const string &context, const string &testfile1path, const string &testfile1password, const string &testfile2, void testReading(const string &context, const string &testfile1path, const string &testfile1password, const string &testfile2,