diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2014-09-19 14:34:50 +0000 |
|---|---|---|
| committer | CI bot <ps-jenkins@lists.canonical.com> | 2014-09-19 14:34:50 +0000 |
| commit | 16a4e034c30f2bc6b151b04707d3ec1a490dba44 (patch) | |
| tree | f726165c9979fcb13ce478fd2dafa1ae1efad52b /tests/test-snap.cpp | |
| parent | ac54aebec5fa0ba95fb2d583316c0a64ce3384dd (diff) | |
| parent | b3d8778a52576b66ab00b08aa939612136a49a01 (diff) | |
| download | ayatana-indicator-datetime-16a4e034c30f2bc6b151b04707d3ec1a490dba44.tar.gz ayatana-indicator-datetime-16a4e034c30f2bc6b151b04707d3ec1a490dba44.tar.bz2 ayatana-indicator-datetime-16a4e034c30f2bc6b151b04707d3ec1a490dba44.zip | |
Fix flint++ warnings
Approved by: Ted Gould, PS Jenkins bot
Diffstat (limited to 'tests/test-snap.cpp')
| -rw-r--r-- | tests/test-snap.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/test-snap.cpp b/tests/test-snap.cpp index 5afaab1..21202f4 100644 --- a/tests/test-snap.cpp +++ b/tests/test-snap.cpp @@ -96,7 +96,7 @@ protected: DbusTestDbusMockObject * screen_obj = nullptr; DbusTestDbusMockObject * haptic_obj = nullptr; - void SetUp() + void SetUp() override { GError * error = nullptr; char * str = nullptr; @@ -269,18 +269,18 @@ protected: dbus_test_service_start_tasks(service); g_setenv("DBUS_SYSTEM_BUS_ADDRESS", g_getenv("DBUS_SESSION_BUS_ADDRESS"), TRUE); - session_bus = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL); + session_bus = g_bus_get_sync(G_BUS_TYPE_SESSION, nullptr, nullptr); ASSERT_NE(nullptr, session_bus); g_dbus_connection_set_exit_on_close(session_bus, false); g_object_add_weak_pointer(G_OBJECT(session_bus), (gpointer *)&session_bus); - system_bus = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, NULL); + system_bus = g_bus_get_sync(G_BUS_TYPE_SYSTEM, nullptr, nullptr); ASSERT_NE(nullptr, system_bus); g_dbus_connection_set_exit_on_close(system_bus, FALSE); g_object_add_weak_pointer(G_OBJECT(system_bus), (gpointer *)&system_bus); } - virtual void TearDown() + void TearDown() override { g_clear_object(&haptic_mock); g_clear_object(&screen_mock); |