diff options
32 files changed, 61 insertions, 61 deletions
diff --git a/src/main.cpp b/src/main.cpp index cf4e96f..31654c9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -42,7 +42,7 @@ #include <locale.h> #include <cstdlib> // exit() -namespace uin = unity::indicator::notifications; +namespace ain = ayatana::indicator::notifications; using namespace ayatana::indicator::datetime; diff --git a/src/snap.cpp b/src/snap.cpp index 9beb379..58ebd3b 100644 --- a/src/snap.cpp +++ b/src/snap.cpp @@ -37,7 +37,7 @@ #include <unistd.h> // getuid() #include <sys/types.h> // getuid() -namespace uin = unity::indicator::notifications; +namespace ain = ayatana::indicator::notifications; namespace ayatana { namespace indicator { @@ -51,7 +51,7 @@ class Snap::Impl { public: - Impl(const std::shared_ptr<unity::indicator::notifications::Engine>& engine, + Impl(const std::shared_ptr<ayatana::indicator::notifications::Engine>& engine, const std::shared_ptr<const Settings>& settings): m_engine(engine), m_settings(settings), @@ -90,33 +90,33 @@ public: const bool interactive = appointment.is_ubuntu_alarm() && m_engine->supports_actions(); // force the system to stay awake - auto awake = std::make_shared<uin::Awake>(m_engine->app_name()); + auto awake = std::make_shared<ain::Awake>(m_engine->app_name()); // calendar events are muted in silent mode; alarm clocks never are - std::shared_ptr<uin::Sound> sound; + std::shared_ptr<ain::Sound> sound; if (appointment.is_ubuntu_alarm() || !silent_mode()) { // create the sound. const auto role = appointment.is_ubuntu_alarm() ? "alarm" : "alert"; const auto uri = get_alarm_uri(alarm, m_settings); const auto volume = m_settings->alarm_volume.get(); const bool loop = interactive; - sound = std::make_shared<uin::Sound>(role, uri, volume, loop); + sound = std::make_shared<ain::Sound>(role, uri, volume, loop); } // create the haptic feedback... - std::shared_ptr<uin::Haptic> haptic; + std::shared_ptr<ain::Haptic> haptic; if (should_vibrate()) { const auto haptic_mode = m_settings->alarm_haptic.get(); if (haptic_mode == "pulse") - haptic = std::make_shared<uin::Haptic>(uin::Haptic::MODE_PULSE); + haptic = std::make_shared<ain::Haptic>(ain::Haptic::MODE_PULSE); } // show a notification... const auto minutes = std::chrono::minutes(m_settings->alarm_duration.get()); - uin::Builder b; + ain::Builder b; b.set_body (appointment.summary); b.set_icon_name ("alarm-clock"); - b.add_hint (uin::Builder::HINT_NONSHAPED_ICON); + b.add_hint (ain::Builder::HINT_NONSHAPED_ICON); const char * timefmt; if (is_locale_12h()) { @@ -134,8 +134,8 @@ public: g_free (title); b.set_timeout (std::chrono::duration_cast<std::chrono::seconds>(minutes)); if (interactive) { - b.add_hint (uin::Builder::HINT_SNAP); - b.add_hint (uin::Builder::HINT_AFFIRMATIVE_HINT); + b.add_hint (ain::Builder::HINT_SNAP); + b.add_hint (ain::Builder::HINT_AFFIRMATIVE_HINT); b.add_action ("ok", _("OK")); b.add_action ("snooze", _("Snooze")); } diff --git a/tests/actions-mock.h b/tests/actions-mock.h index 9421708..59a0912 100644 --- a/tests/actions-mock.h +++ b/tests/actions-mock.h @@ -24,7 +24,7 @@ #include <set> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -105,6 +105,6 @@ private: } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana #endif // INDICATOR_DATETIME_ACTIONS_MOCK_H diff --git a/tests/manual-test-snap.cpp b/tests/manual-test-snap.cpp index d04cf14..95775c8 100644 --- a/tests/manual-test-snap.cpp +++ b/tests/manual-test-snap.cpp @@ -26,9 +26,9 @@ #include <glib.h> -using namespace unity::indicator::datetime; +using namespace ayatana::indicator::datetime; -namespace uin = unity::indicator::notifications; +namespace ain = ayatana::indicator::notifications; /*** **** @@ -91,7 +91,7 @@ int main(int argc, const char* argv[]) auto settings = std::make_shared<LiveSettings>(); settings->alarm_volume.set(volume); - auto notification_engine = std::make_shared<uin::Engine>("indicator-datetime-service"); + auto notification_engine = std::make_shared<ain::Engine>("indicator-datetime-service"); Snap snap (notification_engine, settings); snap(a, a.alarms.front(), on_snooze, on_ok); g_main_loop_run(loop); diff --git a/tests/planner-mock.h b/tests/planner-mock.h index 53109cf..a324bd4 100644 --- a/tests/planner-mock.h +++ b/tests/planner-mock.h @@ -22,7 +22,7 @@ #include <datetime/planner-range.h> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -51,6 +51,6 @@ private: } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana #endif // INDICATOR_DATETIME_PLANNER_MOCK_H diff --git a/tests/print-to.h b/tests/print-to.h index 357925f..19367ac 100644 --- a/tests/print-to.h +++ b/tests/print-to.h @@ -24,7 +24,7 @@ #include <datetime/appointment.h> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -73,6 +73,6 @@ PrintTo(const Appointment& appointment, std::ostream* os) } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana #endif diff --git a/tests/state-fixture.h b/tests/state-fixture.h index 341df8b..e450735 100644 --- a/tests/state-fixture.h +++ b/tests/state-fixture.h @@ -25,7 +25,7 @@ #include "actions-mock.h" #include "state-mock.h" -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -77,6 +77,6 @@ protected: } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana #endif /* INDICATOR_DATETIME_TESTS_STATE_FIXTURE_H */ diff --git a/tests/state-mock.h b/tests/state-mock.h index caa6393..3a0b95f 100644 --- a/tests/state-mock.h +++ b/tests/state-mock.h @@ -25,7 +25,7 @@ #include <datetime/clock-mock.h> #include <datetime/state.h> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -62,6 +62,6 @@ public: } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana #endif /* INDICATOR_DATETIME_STATE_MOCK_H */ diff --git a/tests/test-actions.cpp b/tests/test-actions.cpp index 2a8e370..7899d15 100644 --- a/tests/test-actions.cpp +++ b/tests/test-actions.cpp @@ -21,7 +21,7 @@ #include "state-fixture.h" -using namespace unity::indicator::datetime; +using namespace ayatana::indicator::datetime; class ActionsFixture: public StateFixture { diff --git a/tests/test-alarm-queue.cpp b/tests/test-alarm-queue.cpp index aa35668..42edf74 100644 --- a/tests/test-alarm-queue.cpp +++ b/tests/test-alarm-queue.cpp @@ -24,7 +24,7 @@ #include "state-fixture.h" -using namespace unity::indicator::datetime; +using namespace ayatana::indicator::datetime; class AlarmQueueFixture: public StateFixture { diff --git a/tests/test-clock.cpp b/tests/test-clock.cpp index 5601d35..c1d91da 100644 --- a/tests/test-clock.cpp +++ b/tests/test-clock.cpp @@ -30,7 +30,7 @@ **** ***/ -using namespace unity::indicator::datetime; +using namespace ayatana::indicator::datetime; class ClockFixture: public TestDBusFixture { diff --git a/tests/test-datetime.cpp b/tests/test-datetime.cpp index 41f78fb..8e75e73 100644 --- a/tests/test-datetime.cpp +++ b/tests/test-datetime.cpp @@ -21,7 +21,7 @@ #include "glib-fixture.h" -using namespace unity::indicator::datetime; +using namespace ayatana::indicator::datetime; /*** **** diff --git a/tests/test-eds-ics-all-day-events.cpp b/tests/test-eds-ics-all-day-events.cpp index 0d3173d..8e7eff7 100644 --- a/tests/test-eds-ics-all-day-events.cpp +++ b/tests/test-eds-ics-all-day-events.cpp @@ -31,7 +31,7 @@ #include "timezone-mock.h" #include "wakeup-timer-mock.h" -using namespace unity::indicator::datetime; +using namespace ayatana::indicator::datetime; using VAlarmFixture = GlibFixture; /*** diff --git a/tests/test-eds-ics-missing-trigger.cpp b/tests/test-eds-ics-missing-trigger.cpp index 4a26181..2b53c31 100644 --- a/tests/test-eds-ics-missing-trigger.cpp +++ b/tests/test-eds-ics-missing-trigger.cpp @@ -31,7 +31,7 @@ #include "timezone-mock.h" #include "wakeup-timer-mock.h" -using namespace unity::indicator::datetime; +using namespace ayatana::indicator::datetime; using VAlarmFixture = GlibFixture; /*** diff --git a/tests/test-eds-ics-nonrepeating-events.cpp b/tests/test-eds-ics-nonrepeating-events.cpp index 819c422..6b92846 100644 --- a/tests/test-eds-ics-nonrepeating-events.cpp +++ b/tests/test-eds-ics-nonrepeating-events.cpp @@ -31,7 +31,7 @@ #include "timezone-mock.h" #include "wakeup-timer-mock.h" -using namespace unity::indicator::datetime; +using namespace ayatana::indicator::datetime; using VAlarmFixture = GlibFixture; /*** diff --git a/tests/test-eds-ics-repeating-events.cpp b/tests/test-eds-ics-repeating-events.cpp index 92ef15c..76a708d 100644 --- a/tests/test-eds-ics-repeating-events.cpp +++ b/tests/test-eds-ics-repeating-events.cpp @@ -31,7 +31,7 @@ #include "timezone-mock.h" #include "wakeup-timer-mock.h" -using namespace unity::indicator::datetime; +using namespace ayatana::indicator::datetime; using VAlarmFixture = GlibFixture; /*** diff --git a/tests/test-eds-ics-repeating-valarms.cpp b/tests/test-eds-ics-repeating-valarms.cpp index 47f29e7..0ce1433 100644 --- a/tests/test-eds-ics-repeating-valarms.cpp +++ b/tests/test-eds-ics-repeating-valarms.cpp @@ -31,7 +31,7 @@ #include "timezone-mock.h" #include "wakeup-timer-mock.h" -using namespace unity::indicator::datetime; +using namespace ayatana::indicator::datetime; using VAlarmFixture = GlibFixture; /*** diff --git a/tests/test-eds-ics-tzids-2.cpp b/tests/test-eds-ics-tzids-2.cpp index 8b4e80b..c0572d0 100644 --- a/tests/test-eds-ics-tzids-2.cpp +++ b/tests/test-eds-ics-tzids-2.cpp @@ -31,7 +31,7 @@ #include "timezone-mock.h" #include "wakeup-timer-mock.h" -using namespace unity::indicator::datetime; +using namespace ayatana::indicator::datetime; using VAlarmFixture = GlibFixture; /*** diff --git a/tests/test-eds-ics-tzids.cpp b/tests/test-eds-ics-tzids.cpp index 02a152b..41d8214 100644 --- a/tests/test-eds-ics-tzids.cpp +++ b/tests/test-eds-ics-tzids.cpp @@ -31,7 +31,7 @@ #include "timezone-mock.h" #include "wakeup-timer-mock.h" -using namespace unity::indicator::datetime; +using namespace ayatana::indicator::datetime; using VAlarmFixture = GlibFixture; /*** diff --git a/tests/test-exporter.cpp b/tests/test-exporter.cpp index d5118ac..bc8c70a 100644 --- a/tests/test-exporter.cpp +++ b/tests/test-exporter.cpp @@ -30,7 +30,7 @@ #include <set> #include <string> -using namespace unity::indicator::datetime; +using namespace ayatana::indicator::datetime; class ExporterFixture: public GlibFixture { diff --git a/tests/test-formatter.cpp b/tests/test-formatter.cpp index 75c5600..e9aa4e9 100644 --- a/tests/test-formatter.cpp +++ b/tests/test-formatter.cpp @@ -29,7 +29,7 @@ #include <langinfo.h> #include <locale.h> -using namespace unity::indicator::datetime; +using namespace ayatana::indicator::datetime; /*** **** diff --git a/tests/test-locations.cpp b/tests/test-locations.cpp index 61a6ffd..8a4cdfa 100644 --- a/tests/test-locations.cpp +++ b/tests/test-locations.cpp @@ -23,11 +23,11 @@ #include <datetime/locations-settings.h> -using unity::indicator::datetime::Location; -using unity::indicator::datetime::Locations; -using unity::indicator::datetime::Settings; -using unity::indicator::datetime::SettingsLocations; -using unity::indicator::datetime::Timezones; +using ayatana::indicator::datetime::Location; +using ayatana::indicator::datetime::Locations; +using ayatana::indicator::datetime::Settings; +using ayatana::indicator::datetime::SettingsLocations; +using ayatana::indicator::datetime::Timezones; /*** **** diff --git a/tests/test-menus.cpp b/tests/test-menus.cpp index fb9c50a..6e88b7b 100644 --- a/tests/test-menus.cpp +++ b/tests/test-menus.cpp @@ -28,7 +28,7 @@ #include <gio/gio.h> -using namespace unity::indicator::datetime; +using namespace ayatana::indicator::datetime; class MenuFixture: public StateFixture { diff --git a/tests/test-planner.cpp b/tests/test-planner.cpp index 1e8ac66..760eab5 100644 --- a/tests/test-planner.cpp +++ b/tests/test-planner.cpp @@ -29,7 +29,7 @@ #include <langinfo.h> #include <locale.h> -using namespace unity::indicator::datetime; +using namespace ayatana::indicator::datetime; /*** **** diff --git a/tests/test-settings.cpp b/tests/test-settings.cpp index 44037f7..26acaa4 100644 --- a/tests/test-settings.cpp +++ b/tests/test-settings.cpp @@ -22,7 +22,7 @@ #include <datetime/settings-live.h> #include <datetime/settings-shared.h> -using namespace unity::indicator::datetime; +using namespace ayatana::indicator::datetime; /*** **** diff --git a/tests/test-snap.cpp b/tests/test-snap.cpp index 06447a8..7559802 100644 --- a/tests/test-snap.cpp +++ b/tests/test-snap.cpp @@ -32,7 +32,7 @@ #include <unistd.h> // getuid() #include <sys/types.h> // getuid() -using namespace unity::indicator::datetime; +using namespace ayatana::indicator::datetime; #include "glib-fixture.h" @@ -45,7 +45,7 @@ namespace static constexpr char const * APP_NAME {"indicator-datetime-service"}; } -using namespace unity::indicator::datetime; +using namespace ayatana::indicator::datetime; class SnapFixture: public GlibFixture { @@ -380,7 +380,7 @@ TEST_F(SnapFixture, InteractiveDuration) static constexpr int duration_minutes = 120; auto settings = std::make_shared<Settings>(); settings->alarm_duration.set(duration_minutes); - auto ne = std::make_shared<unity::indicator::notifications::Engine>(APP_NAME); + auto ne = std::make_shared<ayatana::indicator::notifications::Engine>(APP_NAME); Snap snap (ne, settings); make_interactive(); @@ -430,7 +430,7 @@ TEST_F(SnapFixture, InteractiveDuration) TEST_F(SnapFixture, InhibitSleep) { auto settings = std::make_shared<Settings>(); - auto ne = std::make_shared<unity::indicator::notifications::Engine>(APP_NAME); + auto ne = std::make_shared<ayatana::indicator::notifications::Engine>(APP_NAME); auto snap = new Snap (ne, settings); make_interactive(); @@ -485,7 +485,7 @@ TEST_F(SnapFixture, InhibitSleep) TEST_F(SnapFixture, ForceScreen) { auto settings = std::make_shared<Settings>(); - auto ne = std::make_shared<unity::indicator::notifications::Engine>(APP_NAME); + auto ne = std::make_shared<ayatana::indicator::notifications::Engine>(APP_NAME); auto snap = new Snap (ne, settings); make_interactive(); @@ -526,7 +526,7 @@ TEST_F(SnapFixture, ForceScreen) TEST_F(SnapFixture,Vibrate) { auto settings = std::make_shared<Settings>(); - auto ne = std::make_shared<unity::indicator::notifications::Engine>(APP_NAME); + auto ne = std::make_shared<ayatana::indicator::notifications::Engine>(APP_NAME); auto func = [this](const Appointment&, const Alarm&){g_idle_add(quit_idle, loop);}; GError * error = nullptr; diff --git a/tests/test-timezone-geoclue.cpp b/tests/test-timezone-geoclue.cpp index 3cc1393..c520409 100644 --- a/tests/test-timezone-geoclue.cpp +++ b/tests/test-timezone-geoclue.cpp @@ -21,7 +21,7 @@ #include <datetime/timezone-geoclue.h> -using unity::indicator::datetime::GeoclueTimezone; +using ayatana::indicator::datetime::GeoclueTimezone; // This test looks small because the interesting // work is all happening in GeoclueFixture... diff --git a/tests/test-timezone-timedated.cpp b/tests/test-timezone-timedated.cpp index 7300649..2fdec12 100644 --- a/tests/test-timezone-timedated.cpp +++ b/tests/test-timezone-timedated.cpp @@ -22,7 +22,7 @@ #include <datetime/timezone-timedated.h> -using unity::indicator::datetime::TimedatedTimezone; +using ayatana::indicator::datetime::TimedatedTimezone; /*** **** diff --git a/tests/test-timezones.cpp b/tests/test-timezones.cpp index 9e5c9cf..362fcf7 100644 --- a/tests/test-timezones.cpp +++ b/tests/test-timezones.cpp @@ -27,7 +27,7 @@ #include <cstdio> // fopen() #include <unistd.h> // sync() -using namespace unity::indicator::datetime; +using namespace ayatana::indicator::datetime; typedef GeoclueFixture TimezonesFixture; diff --git a/tests/timedated-fixture.h b/tests/timedated-fixture.h index 5ec425d..00269e0 100644 --- a/tests/timedated-fixture.h +++ b/tests/timedated-fixture.h @@ -25,7 +25,7 @@ #include "state-mock.h" #include "glib-fixture.h" -using namespace unity::indicator::datetime; +using namespace ayatana::indicator::datetime; class MockLiveActions: public LiveActions { @@ -44,7 +44,7 @@ protected: **** ***/ -using namespace unity::indicator::datetime; +using namespace ayatana::indicator::datetime; class TimedateFixture: public GlibFixture { diff --git a/tests/timezone-mock.h b/tests/timezone-mock.h index 55151aa..4fe647c 100644 --- a/tests/timezone-mock.h +++ b/tests/timezone-mock.h @@ -22,7 +22,7 @@ #include <datetime/timezone.h> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -36,6 +36,6 @@ public: } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana #endif // INDICATOR_DATETIME_TIMEZONE_MOCK_H diff --git a/tests/wakeup-timer-mock.h b/tests/wakeup-timer-mock.h index 8a59c97..9263d40 100644 --- a/tests/wakeup-timer-mock.h +++ b/tests/wakeup-timer-mock.h @@ -23,7 +23,7 @@ #include <datetime/clock.h> #include <datetime/wakeup-timer.h> -namespace unity { +namespace ayatana { namespace indicator { namespace datetime { @@ -73,6 +73,6 @@ private: } // namespace datetime } // namespace indicator -} // namespace unity +} // namespace ayatana #endif // INDICATOR_DATETIME_WAKEUP_TIMER_MOCK_H |