diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2014-09-17 11:51:51 -0500 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2014-09-17 11:51:51 -0500 |
| commit | b3d8778a52576b66ab00b08aa939612136a49a01 (patch) | |
| tree | 4dc77aeee18620be145cd1765b8eb0902af40b3e /tests/test-snap.cpp | |
| parent | 790f43bcea23f926f6617e0fe41026a3adaee8cc (diff) | |
| download | ayatana-indicator-datetime-b3d8778a52576b66ab00b08aa939612136a49a01.tar.gz ayatana-indicator-datetime-b3d8778a52576b66ab00b08aa939612136a49a01.tar.bz2 ayatana-indicator-datetime-b3d8778a52576b66ab00b08aa939612136a49a01.zip | |
fix flint++ warnings
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); |