From f0fee18c0baf7ef0fb27351db716ee3708c021c6 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Wed, 22 Jan 2014 00:41:16 -0600
Subject: copyediting: rename Service as Exporter & tweak comments

---
 include/datetime/exporter.h | 74 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 include/datetime/exporter.h

(limited to 'include/datetime/exporter.h')

diff --git a/include/datetime/exporter.h b/include/datetime/exporter.h
new file mode 100644
index 0000000..a32b941
--- /dev/null
+++ b/include/datetime/exporter.h
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *   Charles Kerr <charles.kerr@canonical.com>
+ */
+
+#ifndef INDICATOR_DATETIME_EXPORTER_H
+#define INDICATOR_DATETIME_EXPORTER_H
+
+#include <datetime/actions.h>
+#include <datetime/menu.h>
+
+#include <core/signal.h>
+
+#include <gio/gio.h> // GActionGroup
+
+#include <memory> // std::shared_ptr
+#include <vector>
+
+namespace unity {
+namespace indicator {
+namespace datetime {
+
+/**
+ * \brief Exports actions and menus to DBus. 
+ */
+class Exporter
+{
+public:
+    Exporter() =default;
+    ~Exporter();
+
+    core::Signal<> name_lost;
+
+    void publish(std::shared_ptr<Actions>& actions,
+                 std::vector<std::shared_ptr<Menu>>& menus);
+
+private:
+    static void on_bus_acquired(GDBusConnection*, const gchar *name, gpointer gthis);
+    void on_bus_acquired(GDBusConnection*, const gchar *name);
+
+    static void on_name_lost(GDBusConnection*, const gchar *name, gpointer gthis);
+    void on_name_lost(GDBusConnection*, const gchar *name);
+
+    std::set<guint> m_exported_menu_ids;
+    guint m_own_id = 0;
+    guint m_exported_actions_id = 0;
+    GDBusConnection * m_dbus_connection = nullptr;
+    std::shared_ptr<Actions> m_actions;
+    std::vector<std::shared_ptr<Menu>> m_menus;
+
+    // we've got raw pointers and gsignal tags in here, so disable copying
+    Exporter(const Exporter&) =delete;
+    Exporter& operator=(const Exporter&) =delete;
+};
+
+} // namespace datetime
+} // namespace indicator
+} // namespace unity
+
+#endif // INDICATOR_DATETIME_EXPORTER_H
-- 
cgit v1.2.3


From 0f384f4c9607b785d7df4da8566fe2b869ef11e4 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Thu, 30 Jan 2014 13:28:48 -0600
Subject: as per review, there were a few places that accidentally passed a
 shared_ptr<X>& instead of a const shared_ptr<X>&

---
 include/datetime/exporter.h | 4 ++--
 include/datetime/menu.h     | 2 +-
 src/exporter.cpp            | 4 ++--
 src/menu.cpp                | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'include/datetime/exporter.h')

diff --git a/include/datetime/exporter.h b/include/datetime/exporter.h
index a32b941..c228cc1 100644
--- a/include/datetime/exporter.h
+++ b/include/datetime/exporter.h
@@ -45,8 +45,8 @@ public:
 
     core::Signal<> name_lost;
 
-    void publish(std::shared_ptr<Actions>& actions,
-                 std::vector<std::shared_ptr<Menu>>& menus);
+    void publish(const std::shared_ptr<Actions>& actions,
+                 const std::vector<std::shared_ptr<Menu>>& menus);
 
 private:
     static void on_bus_acquired(GDBusConnection*, const gchar *name, gpointer gthis);
diff --git a/include/datetime/menu.h b/include/datetime/menu.h
index 5821e33..a95be10 100644
--- a/include/datetime/menu.h
+++ b/include/datetime/menu.h
@@ -70,7 +70,7 @@ private:
 class MenuFactory
 {
 public:
-    MenuFactory (std::shared_ptr<Actions>& actions, std::shared_ptr<State>& state);
+    MenuFactory (const std::shared_ptr<Actions>& actions, const std::shared_ptr<State>& state);
     std::shared_ptr<Menu> buildMenu(Menu::Profile profile);
 
 private:
diff --git a/src/exporter.cpp b/src/exporter.cpp
index 86e3670..ccd6e5c 100644
--- a/src/exporter.cpp
+++ b/src/exporter.cpp
@@ -120,8 +120,8 @@ Exporter::on_name_lost(GDBusConnection* /*connection*/, const gchar* /*name*/)
 ***/
 
 void
-Exporter::publish(std::shared_ptr<Actions>& actions,
-                  std::vector<std::shared_ptr<Menu>>& menus)
+Exporter::publish(const std::shared_ptr<Actions>& actions,
+                  const std::vector<std::shared_ptr<Menu>>& menus)
 {
     m_actions = actions;
     m_menus = menus;
diff --git a/src/menu.cpp b/src/menu.cpp
index 696ed2b..42265c9 100644
--- a/src/menu.cpp
+++ b/src/menu.cpp
@@ -551,8 +551,8 @@ public:
 *****
 ****/
 
-MenuFactory::MenuFactory(std::shared_ptr<Actions>& actions_,
-                         std::shared_ptr<State>& state_):
+MenuFactory::MenuFactory(const std::shared_ptr<Actions>& actions_,
+                         const std::shared_ptr<State>& state_):
     m_actions(actions_),
     m_state(state_)
 {
-- 
cgit v1.2.3