diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2014-10-06 14:54:15 -0500 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2014-10-06 14:54:15 -0500 |
| commit | 5e05830765bdcae09db297918d3aa0620371ccf3 (patch) | |
| tree | 59c7ec75a0f03cf091ad5c0dc20210ecd48ff0a4 /tests | |
| parent | 460f8cc1f9e58f81566f289e5e01e8e598f38228 (diff) | |
| download | ayatana-indicator-display-5e05830765bdcae09db297918d3aa0620371ccf3.tar.gz ayatana-indicator-display-5e05830765bdcae09db297918d3aa0620371ccf3.tar.bz2 ayatana-indicator-display-5e05830765bdcae09db297918d3aa0620371ccf3.zip | |
fix warnings reported by flint++ -- explicit ctors, classes with virtual methods but no virtual dtor, #ifdef include guards
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/glib-fixture.h | 9 | ||||
| -rw-r--r-- | tests/gtestdbus-fixture.h | 10 |
2 files changed, 17 insertions, 2 deletions
diff --git a/tests/glib-fixture.h b/tests/glib-fixture.h index a8f3a76..d60a038 100644 --- a/tests/glib-fixture.h +++ b/tests/glib-fixture.h @@ -17,6 +17,9 @@ * Charles Kerr <charles.kerr@canonical.com> */ +#ifndef INDICATOR_TESTS_GLIB_FIXTURE_H +#define INDICATOR_TESTS_GLIB_FIXTURE_H + #include <map> #include <glib.h> @@ -140,4 +143,10 @@ class GlibFixture : public ::testing::Test } GMainLoop * loop; + + public: + + virtual ~GLibFixture() =default; }; + +#endif /* INDICATOR_TESTS_GLIB_FIXTURE_H */ diff --git a/tests/gtestdbus-fixture.h b/tests/gtestdbus-fixture.h index 541050e..c592033 100644 --- a/tests/gtestdbus-fixture.h +++ b/tests/gtestdbus-fixture.h @@ -17,6 +17,9 @@ * Charles Kerr <charles.kerr@canonical.com> */ +#ifndef INDICATOR_TESTS_GTESTDBUS_FIXTURE_H +#define INDICATOR_TESTS_GTESTDBUS_FIXTURE_H + #include "glib-fixture.h" /*** @@ -27,9 +30,10 @@ class GTestDBusFixture: public GlibFixture { public: - GTestDBusFixture() {} + GTestDBusFixture() =default; + virtual ~GTestDBusFixture() =default; - GTestDBusFixture(const std::vector<std::string>& service_dirs_in): service_dirs(service_dirs_in) {} + explicit GTestDBusFixture(const std::vector<std::string>& service_dirs_in): service_dirs(service_dirs_in) {} private: @@ -100,3 +104,5 @@ class GTestDBusFixture: public GlibFixture super::TearDown(); } }; + +#endif /* INDICATOR_TESTS_GTESTDBUS_FIXTURE_H */ |