From b3d8778a52576b66ab00b08aa939612136a49a01 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Wed, 17 Sep 2014 11:51:51 -0500
Subject: fix flint++ warnings

---
 src/engine-eds.cpp          |  2 +-
 src/planner-snooze.cpp      |  2 +-
 src/sound.cpp               | 10 +++++-----
 src/wakeup-timer-powerd.cpp |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/engine-eds.cpp b/src/engine-eds.cpp
index 58be0c4..c282a5c 100644
--- a/src/engine-eds.cpp
+++ b/src/engine-eds.cpp
@@ -285,7 +285,7 @@ private:
         if (e_cal_client_get_view_finish (E_CAL_CLIENT(client), res, &view, &error))
         {
             // add the view to our collection
-            e_cal_client_view_set_flags(view, E_CAL_CLIENT_VIEW_FLAGS_NONE, NULL);
+            e_cal_client_view_set_flags(view, E_CAL_CLIENT_VIEW_FLAGS_NONE, nullptr);
             e_cal_client_view_start(view, &error);
             g_debug("got a view for %s", e_cal_client_get_local_attachment_store(E_CAL_CLIENT(client)));
             auto self = static_cast<Impl*>(gself);
diff --git a/src/planner-snooze.cpp b/src/planner-snooze.cpp
index 51ad0d2..29d5f06 100644
--- a/src/planner-snooze.cpp
+++ b/src/planner-snooze.cpp
@@ -46,7 +46,7 @@ public:
     {
     }
 
-    virtual core::Property<std::vector<Appointment>>& appointments()
+    core::Property<std::vector<Appointment>>& appointments()
     {
         return m_appointments;
     }
diff --git a/src/sound.cpp b/src/sound.cpp
index c6a7b0a..3a4b26f 100644
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -113,17 +113,17 @@ private:
         else if ((GST_MESSAGE_TYPE(msg) == GST_MESSAGE_STREAM_START) && (self->m_loop))
         {
             /* Set the media role if audio sink is pulsesink */
-            GstElement *audio_sink = NULL;
-            g_object_get(self->m_play, "audio-sink", &audio_sink, NULL);
+            GstElement *audio_sink = nullptr;
+            g_object_get(self->m_play, "audio-sink", &audio_sink, nullptr);
             if (audio_sink)
             {
-                GstPluginFeature *feature = NULL;
+                GstPluginFeature *feature = nullptr;
                 feature = GST_PLUGIN_FEATURE_CAST(GST_ELEMENT_GET_CLASS(audio_sink)->elementfactory);
                 if (feature && g_strcmp0(gst_plugin_feature_get_name(feature), "pulsesink") == 0)
                 {
                     std::string role_str("props,media.role=alarm");
-                    GstStructure *props = gst_structure_from_string(role_str.c_str(), NULL);
-                    g_object_set(audio_sink, "stream-properties", props, NULL);
+                    GstStructure *props = gst_structure_from_string(role_str.c_str(), nullptr);
+                    g_object_set(audio_sink, "stream-properties", props, nullptr);
                     gst_structure_free(props);
                 }
                 gst_object_unref(audio_sink);
diff --git a/src/wakeup-timer-powerd.cpp b/src/wakeup-timer-powerd.cpp
index 42d93e7..3c4b322 100644
--- a/src/wakeup-timer-powerd.cpp
+++ b/src/wakeup-timer-powerd.cpp
@@ -195,7 +195,7 @@ private:
         }
         else
         {
-            const char* s = NULL;
+            const char* s = nullptr;
             g_variant_get(ret, "(&s)", &s);
             g_debug("%s %s::requestWakeup() sent cookie %s",
                     G_STRLOC, BUS_POWERD_NAME, s);
-- 
cgit v1.2.3