aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2014-02-02 15:29:29 -0600
committerCharles Kerr <charles.kerr@canonical.com>2014-02-02 15:29:29 -0600
commit33425752728cef43c566a2ace5a54a3a31f6b36f (patch)
tree676726b5f8f334f4ac37a6ad92697889e8137f04 /tests
parent835daa7778171256a02d8695776d0b8262b7b637 (diff)
downloadayatana-indicator-datetime-33425752728cef43c566a2ace5a54a3a31f6b36f.tar.gz
ayatana-indicator-datetime-33425752728cef43c566a2ace5a54a3a31f6b36f.tar.bz2
ayatana-indicator-datetime-33425752728cef43c566a2ace5a54a3a31f6b36f.zip
copyediting: use 'nullptr' instead of 'NULL' in c++ source
Diffstat (limited to 'tests')
-rw-r--r--tests/geoclue-fixture.h2
-rw-r--r--tests/test-clock.cpp4
-rw-r--r--tests/test-settings.cpp4
-rw-r--r--tests/test-utils.cpp2
4 files changed, 6 insertions, 6 deletions
diff --git a/tests/geoclue-fixture.h b/tests/geoclue-fixture.h
index 7e29018..0c597d3 100644
--- a/tests/geoclue-fixture.h
+++ b/tests/geoclue-fixture.h
@@ -95,7 +95,7 @@ class GeoclueFixture : public GlibFixture
// I've looked and can't find where this extra ref is coming from.
// is there an unbalanced ref to the bus in the test harness?!
- while (bus != NULL)
+ while (bus != nullptr)
{
g_object_unref (bus);
wait_msec (1000);
diff --git a/tests/test-clock.cpp b/tests/test-clock.cpp
index 4287e1c..a4924b3 100644
--- a/tests/test-clock.cpp
+++ b/tests/test-clock.cpp
@@ -37,12 +37,12 @@ class ClockFixture: public TestDBusFixture
void emitPrepareForSleep()
{
g_dbus_connection_emit_signal(g_bus_get_sync(G_BUS_TYPE_SYSTEM, nullptr, nullptr),
- NULL,
+ nullptr,
"/org/freedesktop/login1", // object path
"org.freedesktop.login1.Manager", // interface
"PrepareForSleep", // signal name
g_variant_new("(b)", FALSE),
- NULL);
+ nullptr);
}
};
diff --git a/tests/test-settings.cpp b/tests/test-settings.cpp
index 980e7fa..707247d 100644
--- a/tests/test-settings.cpp
+++ b/tests/test-settings.cpp
@@ -167,8 +167,8 @@ TEST_F(SettingsFixture, Locations)
{
const auto key = SETTINGS_LOCATIONS_S;
- const gchar* astrv[] = {"America/Los_Angeles Oakland", "America/Chicago Oklahoma City", "Europe/London London", NULL};
- const gchar* bstrv[] = {"America/Denver", "Europe/London London", "Europe/Berlin Berlin", NULL};
+ const gchar* astrv[] = {"America/Los_Angeles Oakland", "America/Chicago Oklahoma City", "Europe/London London", nullptr};
+ const gchar* bstrv[] = {"America/Denver", "Europe/London London", "Europe/Berlin Berlin", nullptr};
const std::vector<std::string> av = strv_to_vector(astrv);
const std::vector<std::string> bv = strv_to_vector(bstrv);
diff --git a/tests/test-utils.cpp b/tests/test-utils.cpp
index 036c13f..97f07ed 100644
--- a/tests/test-utils.cpp
+++ b/tests/test-utils.cpp
@@ -59,7 +59,7 @@ namespace
const char* location;
const char* expected_name;
} beautify_timezone_test_cases[] = {
- { "America/Chicago", NULL, "Chicago" },
+ { "America/Chicago", nullptr, "Chicago" },
{ "America/Chicago", "America/Chicago", "Chicago" },
{ "America/Chicago", "America/Chigago Chicago", "Chicago" },
{ "America/Chicago", "America/Chicago Oklahoma City", "Oklahoma City" },