aboutsummaryrefslogtreecommitdiff
path: root/tests/test-settings.cpp
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/test-settings.cpp
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/test-settings.cpp')
-rw-r--r--tests/test-settings.cpp4
1 files changed, 2 insertions, 2 deletions
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);