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 +++++++++++++++++++++++++++++++++++++++++++++
 include/datetime/service.h  | 72 -------------------------------------------
 2 files changed, 74 insertions(+), 72 deletions(-)
 create mode 100644 include/datetime/exporter.h
 delete mode 100644 include/datetime/service.h

(limited to 'include')

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
diff --git a/include/datetime/service.h b/include/datetime/service.h
deleted file mode 100644
index c7171b7..0000000
--- a/include/datetime/service.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * 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/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 Service
-{
-public:
-    Service() =default;
-    ~Service();
-
-    core::Signal<> name_lost;
-
-    void publish (GActionGroup* 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;
-    GActionGroup* m_actions = nullptr;
-    std::vector<std::shared_ptr<Menu>> m_menus;
-
-    // we've got raw pointers and gsignal tags in here, so disable copying
-    Service(const Service&) =delete;
-    Service& operator=(const Service&) =delete;
-};
-
-} // namespace datetime
-} // namespace indicator
-} // namespace unity
-
-#endif // INDICATOR_DATETIME_EXPORTER_H
-- 
cgit v1.2.3