Fork ayatana-indicator-datetime from Ubuntu's indicator-datetime.

32 files changed, 63 insertions, 63 deletions

diff --git a/src/actions-live.cpp b/src/actions-live.cpp
index 90186c3..5f98dfd 100644
--- a/src/actions-live.cpp
+++ b/src/actions-live.cpp
@@ -23,7 +23,7 @@
 
 #include <glib.h>
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace datetime {
 
@@ -263,4 +263,4 @@ void LiveActions::set_location(const std::string& tzid, const std::string& name)
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
diff --git a/src/actions.cpp b/src/actions.cpp
index 930e100..e89b116 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -23,7 +23,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace datetime {
 
@@ -293,4 +293,4 @@ const std::shared_ptr<State> Actions::state() const
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
diff --git a/src/alarm-queue-simple.cpp b/src/alarm-queue-simple.cpp
index 921e8d2..652d744 100644
--- a/src/alarm-queue-simple.cpp
+++ b/src/alarm-queue-simple.cpp
@@ -22,7 +22,7 @@
 #include <cmath>
 #include <set>
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace datetime {
 
@@ -187,4 +187,4 @@ SimpleAlarmQueue::alarm_reached()
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
diff --git a/src/appointment.cpp b/src/appointment.cpp
index 1edd93c..dca57e6 100644
--- a/src/appointment.cpp
+++ b/src/appointment.cpp
@@ -19,7 +19,7 @@
 
 #include <datetime/appointment.h>
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace datetime {
 
@@ -51,4 +51,4 @@ bool Appointment::operator==(const Appointment& that) const
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
diff --git a/src/awake.cpp b/src/awake.cpp
index e1bec6c..5f7e2e0 100644
--- a/src/awake.cpp
+++ b/src/awake.cpp
@@ -24,7 +24,7 @@
 
 #include <limits>
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace notifications {
 
@@ -286,4 +286,4 @@ Awake::~Awake()
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
diff --git a/src/clock-live.cpp b/src/clock-live.cpp
index 89541ae..0ff60a8 100644
--- a/src/clock-live.cpp
+++ b/src/clock-live.cpp
@@ -29,7 +29,7 @@
  #define TFD_TIMER_CANCEL_ON_SET (1 << 1)
 #endif
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace datetime {
 
@@ -212,5 +212,5 @@ DateTime LiveClock::localtime() const
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
 
diff --git a/src/clock.cpp b/src/clock.cpp
index a04e074..a2ef387 100644
--- a/src/clock.cpp
+++ b/src/clock.cpp
@@ -28,7 +28,7 @@
 #include <string>
 #include <vector>
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace datetime {
 
@@ -229,4 +229,4 @@ Clock::~Clock()
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
diff --git a/src/date-time.cpp b/src/date-time.cpp
index 4930bf6..8aa3807 100644
--- a/src/date-time.cpp
+++ b/src/date-time.cpp
@@ -19,7 +19,7 @@
 
 #include <datetime/date-time.h>
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace datetime {
 
@@ -289,4 +289,4 @@ bool DateTime::is_same_minute(const DateTime& a, const DateTime& b)
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
diff --git a/src/engine-eds.cpp b/src/engine-eds.cpp
index c349703..0c833c6 100644
--- a/src/engine-eds.cpp
+++ b/src/engine-eds.cpp
@@ -30,7 +30,7 @@
 #include <map>
 #include <set>
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace datetime {
 
@@ -1072,4 +1072,4 @@ void EdsEngine::disable_ubuntu_alarm(const Appointment& appointment)
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
diff --git a/src/exporter.cpp b/src/exporter.cpp
index 05b21eb..305adfb 100644
--- a/src/exporter.cpp
+++ b/src/exporter.cpp
@@ -25,7 +25,7 @@
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace datetime {
 
@@ -260,5 +260,5 @@ void Exporter::publish(const std::shared_ptr<Actions>& actions,
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
 
diff --git a/src/formatter-desktop.cpp b/src/formatter-desktop.cpp
index dd5285d..dd4ff5b 100644
--- a/src/formatter-desktop.cpp
+++ b/src/formatter-desktop.cpp
@@ -20,7 +20,7 @@
 #include <datetime/formatter.h>
 #include <datetime/utils.h> // T_()
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace datetime {
 
@@ -187,4 +187,4 @@ const gchar* DesktopFormatter::getDateFormat(bool show_day, bool show_date, bool
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
diff --git a/src/formatter.cpp b/src/formatter.cpp
index 9aa9bbb..c6d0d4c 100644
--- a/src/formatter.cpp
+++ b/src/formatter.cpp
@@ -29,7 +29,7 @@
 #include <langinfo.h> // nl_langinfo()
 #include <string.h> // strstr()
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace datetime {
 
@@ -264,4 +264,4 @@ Formatter::relative_format(GDateTime* then_begin, GDateTime* then_end) const
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
diff --git a/src/haptic.cpp b/src/haptic.cpp
index 54a7d49..cc8ea0b 100644
--- a/src/haptic.cpp
+++ b/src/haptic.cpp
@@ -25,7 +25,7 @@
 #include <numeric>
 #include <vector>
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace notifications {
 
@@ -167,4 +167,4 @@ Haptic::~Haptic()
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
diff --git a/src/locations-settings.cpp b/src/locations-settings.cpp
index ef3085f..f1e2b42 100644
--- a/src/locations-settings.cpp
+++ b/src/locations-settings.cpp
@@ -25,7 +25,7 @@
 
 #include <algorithm> // std::find()
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace datetime {
 
@@ -89,4 +89,4 @@ SettingsLocations::reload()
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
diff --git a/src/locations.cpp b/src/locations.cpp
index 0690acd..94ccb23 100644
--- a/src/locations.cpp
+++ b/src/locations.cpp
@@ -21,7 +21,7 @@
 
 #include <glib.h>
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace datetime {
 
@@ -56,4 +56,4 @@ Location::Location(const std::string& zone_, const std::string& name_):
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
diff --git a/src/main.cpp b/src/main.cpp
index c7769c9..8bab754 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -44,7 +44,7 @@
 
 namespace uin = unity::indicator::notifications;
 
-using namespace unity::indicator::datetime;
+using namespace ayatana::indicator::datetime;
 
 
 namespace
diff --git a/src/menu.cpp b/src/menu.cpp
index ff894bc..250cb72 100644
--- a/src/menu.cpp
+++ b/src/menu.cpp
@@ -27,7 +27,7 @@
 
 #include <vector>
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace datetime {
 
@@ -600,4 +600,4 @@ MenuFactory::buildMenu(Menu::Profile profile)
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
diff --git a/src/notifications.cpp b/src/notifications.cpp
index 58a6e83..4856546 100644
--- a/src/notifications.cpp
+++ b/src/notifications.cpp
@@ -26,7 +26,7 @@
 #include <string>
 #include <vector>
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace notifications {
 
@@ -366,5 +366,5 @@ Engine::app_name() const
 
 } // namespace notifications
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
 
diff --git a/src/planner-aggregate.cpp b/src/planner-aggregate.cpp
index 7458f0c..23a1230 100644
--- a/src/planner-aggregate.cpp
+++ b/src/planner-aggregate.cpp
@@ -19,7 +19,7 @@
 
 #include <datetime/planner-aggregate.h>
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace datetime {
 
@@ -102,5 +102,5 @@ AggregatePlanner::add(const std::shared_ptr<Planner>& planner)
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
 
diff --git a/src/planner-month.cpp b/src/planner-month.cpp
index cdae26f..93c542a 100644
--- a/src/planner-month.cpp
+++ b/src/planner-month.cpp
@@ -19,7 +19,7 @@
 
 #include <datetime/planner-month.h>
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace datetime {
 
@@ -58,4 +58,4 @@ core::Property<std::vector<Appointment>>& MonthPlanner::appointments()
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
diff --git a/src/planner-range.cpp b/src/planner-range.cpp
index c223665..340fa20 100644
--- a/src/planner-range.cpp
+++ b/src/planner-range.cpp
@@ -19,7 +19,7 @@
 
 #include <datetime/planner-range.h>
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace datetime {
 
@@ -107,4 +107,4 @@ core::Property<std::pair<DateTime,DateTime>>& SimpleRangePlanner::range()
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
diff --git a/src/planner-snooze.cpp b/src/planner-snooze.cpp
index e4062d2..cb365ca 100644
--- a/src/planner-snooze.cpp
+++ b/src/planner-snooze.cpp
@@ -21,7 +21,7 @@
 
 #include <libedataserver/libedataserver.h> // e_uid_new()
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace datetime {
 
@@ -116,4 +116,4 @@ SnoozePlanner::appointments()
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
diff --git a/src/planner-upcoming.cpp b/src/planner-upcoming.cpp
index 338329c..918ebbe 100644
--- a/src/planner-upcoming.cpp
+++ b/src/planner-upcoming.cpp
@@ -19,7 +19,7 @@
 
 #include <datetime/planner-upcoming.h>
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace datetime {
 
@@ -58,4 +58,4 @@ core::Property<std::vector<Appointment>>& UpcomingPlanner::appointments()
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
diff --git a/src/planner.cpp b/src/planner.cpp
index 6ca9ca7..91bfe10 100644
--- a/src/planner.cpp
+++ b/src/planner.cpp
@@ -21,7 +21,7 @@
 
 #include <algorithm> 
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace datetime {
 
@@ -51,4 +51,4 @@ Planner::sort(std::vector<Appointment>& appts)
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
diff --git a/src/settings-live.cpp b/src/settings-live.cpp
index 8ea06a4..3475d5e 100644
--- a/src/settings-live.cpp
+++ b/src/settings-live.cpp
@@ -19,7 +19,7 @@
 
 #include <datetime/settings-live.h>
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace datetime {
 
@@ -318,4 +318,4 @@ void LiveSettings::update_key(const std::string& key)
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
diff --git a/src/snap.cpp b/src/snap.cpp
index 9e470bc..9beb379 100644
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -39,7 +39,7 @@
 
 namespace uin = unity::indicator::notifications;
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace datetime {
 
@@ -258,4 +258,4 @@ Snap::operator()(const Appointment& appointment,
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
diff --git a/src/sound.cpp b/src/sound.cpp
index a768a29..51b410a 100644
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -23,7 +23,7 @@
 
 #include <mutex> // std::call_once()
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace notifications {
 
@@ -164,4 +164,4 @@ Sound::~Sound()
 
 } // namespace notifications
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
diff --git a/src/timezone-geoclue.cpp b/src/timezone-geoclue.cpp
index ca9132f..9f8b4c4 100644
--- a/src/timezone-geoclue.cpp
+++ b/src/timezone-geoclue.cpp
@@ -27,7 +27,7 @@
 
 #define GEOCLUE_BUS_NAME "org.freedesktop.Geoclue.Master"
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace datetime {
 
@@ -287,5 +287,5 @@ GeoclueTimezone::~GeoclueTimezone()
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
 
diff --git a/src/timezone-timedated.cpp b/src/timezone-timedated.cpp
index fa99cd2..d38557b 100644
--- a/src/timezone-timedated.cpp
+++ b/src/timezone-timedated.cpp
@@ -24,7 +24,7 @@
 #include <cerrno>
 #include <cstdlib>
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace datetime {
 
@@ -209,4 +209,4 @@ TimedatedTimezone::~TimedatedTimezone()
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
diff --git a/src/timezones-live.cpp b/src/timezones-live.cpp
index c5dd43c..2979036 100644
--- a/src/timezones-live.cpp
+++ b/src/timezones-live.cpp
@@ -21,7 +21,7 @@
 
 #include <glib.h>
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace datetime {
 
@@ -68,4 +68,4 @@ void LiveTimezones::update_timezones()
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
diff --git a/src/wakeup-timer-mainloop.cpp b/src/wakeup-timer-mainloop.cpp
index 4f99c8c..56961f2 100644
--- a/src/wakeup-timer-mainloop.cpp
+++ b/src/wakeup-timer-mainloop.cpp
@@ -23,7 +23,7 @@
 
 #include <cstdlib> // abs()
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace datetime {
 
@@ -135,4 +135,4 @@ core::Signal<>& MainloopWakeupTimer::timeout()
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana
diff --git a/src/wakeup-timer-powerd.cpp b/src/wakeup-timer-powerd.cpp
index 27b037e..e66c94c 100644
--- a/src/wakeup-timer-powerd.cpp
+++ b/src/wakeup-timer-powerd.cpp
@@ -26,7 +26,7 @@
 
 #include <memory> // std::shared_ptr
 
-namespace unity {
+namespace ayatana {
 namespace indicator {
 namespace datetime {
 
@@ -308,4 +308,4 @@ core::Signal<>& PowerdWakeupTimer::timeout()
 
 } // namespace datetime
 } // namespace indicator
-} // namespace unity
+} // namespace ayatana