aboutsummaryrefslogtreecommitdiff
path: root/src
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 /src
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 'src')
-rw-r--r--src/actions-live.cpp2
-rw-r--r--src/menu.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/actions-live.cpp b/src/actions-live.cpp
index c0fd8ff..32d41ad 100644
--- a/src/actions-live.cpp
+++ b/src/actions-live.cpp
@@ -160,7 +160,7 @@ on_datetime1_proxy_ready (GObject * object G_GNUC_UNUSED,
GError * err = nullptr;
auto proxy = g_dbus_proxy_new_for_bus_finish(res, &err);
- if (err != NULL)
+ if (err != nullptr)
{
if (!g_error_matches(err, G_IO_ERROR, G_IO_ERROR_CANCELLED))
g_warning("Could not grab DBus proxy for timedated: %s", err->message);
diff --git a/src/menu.cpp b/src/menu.cpp
index 91f7dd2..b3dcc53 100644
--- a/src/menu.cpp
+++ b/src/menu.cpp
@@ -270,7 +270,7 @@ private:
// add calendar
if (show_calendar)
{
- item = g_menu_item_new ("[calendar]", NULL);
+ item = g_menu_item_new ("[calendar]", nullptr);
v = g_variant_new_int64(0);
g_menu_item_set_action_and_target_value (item, "indicator.calendar", v);
g_menu_item_set_attribute (item, "x-canonical-type",