aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2014-01-30 13:28:48 -0600
committerCharles Kerr <charles.kerr@canonical.com>2014-01-30 13:28:48 -0600
commit0f384f4c9607b785d7df4da8566fe2b869ef11e4 (patch)
tree5f257829ddefb9e0817d882469c99f69e6b62619
parentb56293e7b4fb4b253da17119ad153990744dac3b (diff)
downloadayatana-indicator-datetime-0f384f4c9607b785d7df4da8566fe2b869ef11e4.tar.gz
ayatana-indicator-datetime-0f384f4c9607b785d7df4da8566fe2b869ef11e4.tar.bz2
ayatana-indicator-datetime-0f384f4c9607b785d7df4da8566fe2b869ef11e4.zip
as per review, there were a few places that accidentally passed a shared_ptr<X>& instead of a const shared_ptr<X>&
-rw-r--r--include/datetime/exporter.h4
-rw-r--r--include/datetime/menu.h2
-rw-r--r--src/exporter.cpp4
-rw-r--r--src/menu.cpp4
4 files changed, 7 insertions, 7 deletions
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_)
{