aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2014-01-22 00:41:16 -0600
committerCharles Kerr <charles.kerr@canonical.com>2014-01-22 00:41:16 -0600
commitf0fee18c0baf7ef0fb27351db716ee3708c021c6 (patch)
treeb40da926d2c58d45094c1604d9b8514239e6f08e /include
parentd611929649cc4ef6b04ad9c453f14c85e1108842 (diff)
downloadayatana-indicator-datetime-f0fee18c0baf7ef0fb27351db716ee3708c021c6.tar.gz
ayatana-indicator-datetime-f0fee18c0baf7ef0fb27351db716ee3708c021c6.tar.bz2
ayatana-indicator-datetime-f0fee18c0baf7ef0fb27351db716ee3708c021c6.zip
copyediting: rename Service as Exporter & tweak comments
Diffstat (limited to 'include')
-rw-r--r--include/datetime/exporter.h (renamed from include/datetime/service.h)16
1 files changed, 9 insertions, 7 deletions
diff --git a/include/datetime/service.h b/include/datetime/exporter.h
index c7171b7..a32b941 100644
--- a/include/datetime/service.h
+++ b/include/datetime/exporter.h
@@ -20,6 +20,7 @@
#ifndef INDICATOR_DATETIME_EXPORTER_H
#define INDICATOR_DATETIME_EXPORTER_H
+#include <datetime/actions.h>
#include <datetime/menu.h>
#include <core/signal.h>
@@ -36,15 +37,16 @@ namespace datetime {
/**
* \brief Exports actions and menus to DBus.
*/
-class Service
+class Exporter
{
public:
- Service() =default;
- ~Service();
+ Exporter() =default;
+ ~Exporter();
core::Signal<> name_lost;
- void publish (GActionGroup* actions, std::vector<std::shared_ptr<Menu>>& menus);
+ 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);
@@ -57,12 +59,12 @@ private:
guint m_own_id = 0;
guint m_exported_actions_id = 0;
GDBusConnection * m_dbus_connection = nullptr;
- GActionGroup* m_actions = 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
- Service(const Service&) =delete;
- Service& operator=(const Service&) =delete;
+ Exporter(const Exporter&) =delete;
+ Exporter& operator=(const Exporter&) =delete;
};
} // namespace datetime