aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2014-01-30 12:45:50 -0600
committerCharles Kerr <charles.kerr@canonical.com>2014-01-30 12:45:50 -0600
commitd2caa37e18191c31d866dd3042b676c135bae50d (patch)
tree603cdc81a45c1d6e5250e72954f3876b56ca24e1 /include
parent9752ca1cd3e75e1245ebb8dcb4719503e332a352 (diff)
downloadayatana-indicator-datetime-d2caa37e18191c31d866dd3042b676c135bae50d.tar.gz
ayatana-indicator-datetime-d2caa37e18191c31d866dd3042b676c135bae50d.tar.bz2
ayatana-indicator-datetime-d2caa37e18191c31d866dd3042b676c135bae50d.zip
as per review, don't inline getters
Diffstat (limited to 'include')
-rw-r--r--include/datetime/actions.h4
-rw-r--r--include/datetime/locations.h4
-rw-r--r--include/datetime/menu.h8
3 files changed, 8 insertions, 8 deletions
diff --git a/include/datetime/actions.h b/include/datetime/actions.h
index 3686b95..6817b4c 100644
--- a/include/datetime/actions.h
+++ b/include/datetime/actions.h
@@ -50,8 +50,8 @@ public:
virtual void open_appointment(const std::string& uid) =0;
virtual void set_location(const std::string& zone, const std::string& name)=0;
void set_calendar_date(const DateTime&);
- GActionGroup* action_group() { return G_ACTION_GROUP(m_actions); }
- std::shared_ptr<State> state() { return m_state; }
+ GActionGroup* action_group();
+ std::shared_ptr<State> state();
protected:
Actions(const std::shared_ptr<State>& state);
diff --git a/include/datetime/locations.h b/include/datetime/locations.h
index ee67615..fc776bb 100644
--- a/include/datetime/locations.h
+++ b/include/datetime/locations.h
@@ -39,9 +39,9 @@ namespace datetime {
class Location
{
public:
- const std::string& zone() const { return m_zone; }
+ const std::string& zone() const;
- const std::string& name() const { return m_name; }
+ const std::string& name() const;
bool operator== (const Location& that) const
{
diff --git a/include/datetime/menu.h b/include/datetime/menu.h
index fcd709f..f097b02 100644
--- a/include/datetime/menu.h
+++ b/include/datetime/menu.h
@@ -43,9 +43,9 @@ class Menu
public:
enum Profile { Desktop, DesktopGreeter, Phone, PhoneGreeter, NUM_PROFILES };
enum Section { Calendar, Appointments, Locations, Settings, NUM_SECTIONS };
- const std::string& name() const { return m_name; }
- Profile profile() const { return m_profile; }
- GMenuModel* menu_model() { return G_MENU_MODEL(m_menu); }
+ const std::string& name() const;
+ Profile profile() const;
+ GMenuModel* menu_model();
protected:
Menu (Profile profile_in, const std::string& name_in): m_profile(profile_in), m_name(name_in) {}
@@ -72,7 +72,7 @@ class MenuFactory
public:
MenuFactory (std::shared_ptr<Actions>& actions, std::shared_ptr<State>& state);
std::shared_ptr<Menu> buildMenu(Menu::Profile profile);
- std::shared_ptr<State> state() { return m_state; }
+ std::shared_ptr<State> state();
private:
std::shared_ptr<Actions> m_actions;