From 384e727b89627fdb381500be29fc3880493ed634 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 8 Nov 2021 12:30:56 +0100 Subject: Rename com.ubuntu.AccountsService.Sound --- data/CMakeLists.txt | 2 +- src/CMakeLists.txt | 2 +- src/accounts-service-access.vala | 2 +- tests/dbus-types/CMakeLists.txt | 4 ++-- tests/dbus-types/com.lomiri.AccountsService.Sound.xml | 9 +++++++++ tests/dbus-types/com.ubuntu.AccountsService.Sound.xml | 9 --------- tests/integration/CMakeLists.txt | 2 +- tests/integration/utils/dbus-pulse-volume.cpp | 2 +- tests/service-mocks/accounts-mock/AccountsDefs.h | 2 +- tests/service-mocks/accounts-mock/CMakeLists.txt | 4 ++-- .../accounts-mock/com.lomiri.AccountsService.Sound.Mock.xml | 8 ++++++++ .../accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml | 8 -------- .../service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h | 2 +- 13 files changed, 28 insertions(+), 28 deletions(-) create mode 100644 tests/dbus-types/com.lomiri.AccountsService.Sound.xml delete mode 100644 tests/dbus-types/com.ubuntu.AccountsService.Sound.xml create mode 100644 tests/service-mocks/accounts-mock/com.lomiri.AccountsService.Sound.Mock.xml delete mode 100644 tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 0e30f7c..8e53533 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -102,7 +102,7 @@ DESTINATION "${POLKIT_LIB_DIR}/localauthority/10-vendor.d" # Accounts Service Iface: Greeter Sound ####################################### -if(EXISTS "/usr/share/accountsservice/interfaces/com.ubuntu.AccountsService.Sound.xml") +if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.Sound.xml") # Nothing to do here... # Using files from Ubuntu specific package 'accountsservice-ubuntu-schemas'. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 761e87b..49d2715 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -23,7 +23,7 @@ else() set (HAS_LOMIRI_ACCTSERVICE_SYSTEMSOUND_SETTINGS OFF) endif() -if(EXISTS "/usr/share/accountsservice/interfaces/com.ubuntu.AccountsService.Sound.xml") +if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.Sound.xml") set (HAVE_UT_ACCTSERVICE_SOUND_SETTINGS ON) set (VALA_DEFINE_ACCTSERVICE_SOUND_SETTINGS "--define=HAS_UT_ACCTSERVICE_SOUND_SETTINGS") else() diff --git a/src/accounts-service-access.vala b/src/accounts-service-access.vala index 9973704..4287d86 100644 --- a/src/accounts-service-access.vala +++ b/src/accounts-service-access.vala @@ -144,7 +144,7 @@ public class AccountsServiceAccess : Object if (user_path_variant.check_format_string ("(o)", true)) { user_path_variant.get ("(o)", out user_path); #if HAS_UT_ACCTSERVICE_SOUND_SETTINGS - _user_proxy = yield new DBusProxy.for_bus (BusType.SYSTEM, DBusProxyFlags.GET_INVALIDATED_PROPERTIES, null, "org.freedesktop.Accounts", user_path, "com.ubuntu.AccountsService.Sound"); + _user_proxy = yield new DBusProxy.for_bus (BusType.SYSTEM, DBusProxyFlags.GET_INVALIDATED_PROPERTIES, null, "org.freedesktop.Accounts", user_path, "com.lomiri.AccountsService.Sound"); #else _user_proxy = yield new DBusProxy.for_bus (BusType.SYSTEM, DBusProxyFlags.GET_INVALIDATED_PROPERTIES, null, "org.freedesktop.Accounts", user_path, "org.ayatana.AccountsService.Sound"); #endif diff --git a/tests/dbus-types/CMakeLists.txt b/tests/dbus-types/CMakeLists.txt index 5323f51..cbe382a 100644 --- a/tests/dbus-types/CMakeLists.txt +++ b/tests/dbus-types/CMakeLists.txt @@ -14,8 +14,8 @@ set(dbusinterface_accounts_xml "org.freedesktop.Accounts.xml") set_source_files_properties(${dbusinterface_accounts_xml} PROPERTIES CLASSNAME AccountsInterface) -if(EXISTS "/usr/share/accountsservice/interfaces/com.ubuntu.AccountsService.Sound.xml") - set(dbusinterface_accountssound_xml "com.ubuntu.AccountsService.Sound.xml") +if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.Sound.xml") + set(dbusinterface_accountssound_xml "com.lomiri.AccountsService.Sound.xml") else() set(dbusinterface_accountssound_xml "org.ayatana.AccountsService.Sound.xml") endif() diff --git a/tests/dbus-types/com.lomiri.AccountsService.Sound.xml b/tests/dbus-types/com.lomiri.AccountsService.Sound.xml new file mode 100644 index 0000000..fb97049 --- /dev/null +++ b/tests/dbus-types/com.lomiri.AccountsService.Sound.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/tests/dbus-types/com.ubuntu.AccountsService.Sound.xml b/tests/dbus-types/com.ubuntu.AccountsService.Sound.xml deleted file mode 100644 index 27c915a..0000000 --- a/tests/dbus-types/com.ubuntu.AccountsService.Sound.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/tests/integration/CMakeLists.txt b/tests/integration/CMakeLists.txt index e803a87..eef04f2 100644 --- a/tests/integration/CMakeLists.txt +++ b/tests/integration/CMakeLists.txt @@ -37,7 +37,7 @@ add_definitions(-DSOUND_SERVICE_BIN="${CMAKE_BINARY_DIR}/src/ayatana-indicator-s -DTEST_HOME="${TEST_HOME}" ) -if(EXISTS "/usr/share/accountsservice/interfaces/com.ubuntu.AccountsService.Sound.xml") +if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.Sound.xml") add_definitions(-DHAS_UT_ACCTSERVICE_SOUND_SETTINGS) endif() diff --git a/tests/integration/utils/dbus-pulse-volume.cpp b/tests/integration/utils/dbus-pulse-volume.cpp index cdbba6d..b99a509 100644 --- a/tests/integration/utils/dbus-pulse-volume.cpp +++ b/tests/integration/utils/dbus-pulse-volume.cpp @@ -141,7 +141,7 @@ bool DBusPulseVolume::setVolume(QString const & role, double volume) QDBusVariant dbusVar(QVariant::fromValue(volume)); QDBusReply set_vol = accounts_interface_->call(QLatin1String("Set"), #ifdef HAS_UT_ACCTSERVICE_SOUND_SETTINGS - QVariant::fromValue(QString("com.ubuntu.AccountsService.Sound")), + QVariant::fromValue(QString("com.lomiri.AccountsService.Sound")), #else QVariant::fromValue(QString("org.ayatana.AccountsService.Sound")), #endif diff --git a/tests/service-mocks/accounts-mock/AccountsDefs.h b/tests/service-mocks/accounts-mock/AccountsDefs.h index 0a1806d..9726a9a 100644 --- a/tests/service-mocks/accounts-mock/AccountsDefs.h +++ b/tests/service-mocks/accounts-mock/AccountsDefs.h @@ -29,7 +29,7 @@ namespace testing constexpr const char USER_PATH[] = "/org/freedesktop/Accounts/UserTest"; constexpr const char ACCOUNTS_PATH[] = "/org/freedesktop/Accounts"; #ifdef HAS_UT_ACCTSERVICE_SOUND_SETTINGS - constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "com.ubuntu.AccountsService.Sound"; + constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "com.lomiri.AccountsService.Sound"; #else constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "org.ayatana.AccountsService.Sound"; #endif diff --git a/tests/service-mocks/accounts-mock/CMakeLists.txt b/tests/service-mocks/accounts-mock/CMakeLists.txt index 421e155..e737a07 100644 --- a/tests/service-mocks/accounts-mock/CMakeLists.txt +++ b/tests/service-mocks/accounts-mock/CMakeLists.txt @@ -7,9 +7,9 @@ include_directories(${Qt5DBus_INCLUDE_DIRS} add_definitions(-DQT_NO_KEYWORDS=1) -if(EXISTS "/usr/share/accountsservice/interfaces/com.ubuntu.AccountsService.Sound.xml") +if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.Sound.xml") add_definitions(-DHAS_UT_ACCTSERVICE_SOUND_SETTINGS) - set(dbusinterface_sound_xml "com.ubuntu.AccountsService.Sound.Mock.xml") + set(dbusinterface_sound_xml "com.lomiri.AccountsService.Sound.Mock.xml") else() set(dbusinterface_sound_xml "org.ayatana.AccountsService.Sound.Mock.xml") endif() diff --git a/tests/service-mocks/accounts-mock/com.lomiri.AccountsService.Sound.Mock.xml b/tests/service-mocks/accounts-mock/com.lomiri.AccountsService.Sound.Mock.xml new file mode 100644 index 0000000..d51abd2 --- /dev/null +++ b/tests/service-mocks/accounts-mock/com.lomiri.AccountsService.Sound.Mock.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml b/tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml deleted file mode 100644 index da9e8aa..0000000 --- a/tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h index 8a19db8..b43f162 100644 --- a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h +++ b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h @@ -29,7 +29,7 @@ namespace testing constexpr const char USER_PATH[] = "/org/freedesktop/Accounts/UserTest"; constexpr const char ACCOUNTS_PATH[] = "/org/freedesktop/Accounts"; #ifdef HAS_UT_ACCTSERVICE_SOUND_SETTINGS - constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "com.ubuntu.AccountsService.Sound"; + constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "com.lomiri.AccountsService.Sound"; #else constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "org.ayatana.AccountsService.Sound"; #endif -- cgit v1.2.3 From 20f7eec2ed0eb5be9c9fbab7e800c44b0233576b Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 8 Nov 2021 12:31:30 +0100 Subject: d/copyright: Update copyright attributions for renamed files. --- debian/copyright | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/copyright b/debian/copyright index 7bdcd9e..89bd33a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -152,7 +152,7 @@ Files: AUTHORS src/gmenuharness/CMakeLists.txt tests/CMakeLists.txt tests/dbus-types/CMakeLists.txt - tests/dbus-types/com.ubuntu.AccountsService.Sound.xml + tests/dbus-types/com.lomiri.AccountsService.Sound.xml tests/dbus-types/org.PulseAudio.Ext.StreamRestore1.xml tests/dbus-types/org.ayatana.AccountsService.Sound.xml tests/dbus-types/org.freedesktop.Accounts.xml @@ -166,7 +166,7 @@ Files: AUTHORS tests/manual tests/service-mocks/CMakeLists.txt tests/service-mocks/accounts-mock/CMakeLists.txt - tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml + tests/service-mocks/accounts-mock/com.lomiri.AccountsService.Sound.Mock.xml tests/service-mocks/accounts-mock/org.ayatana.AccountsService.Sound.Mock.xml tests/service-mocks/accounts-mock/org.freedesktop.Accounts.Mock.xml tests/service-mocks/media-player-mpris-mock/CMakeLists.txt -- cgit v1.2.3 From dc87c5b56a3f37b865267d5f2647ee69fef560ff Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Wed, 3 Nov 2021 21:46:56 +0100 Subject: Drop unused HAVE_UT_ACCTSERVICE_SOUND_SETTINGS --- src/CMakeLists.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 49d2715..b39bf34 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -24,10 +24,7 @@ else() endif() if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.Sound.xml") - set (HAVE_UT_ACCTSERVICE_SOUND_SETTINGS ON) set (VALA_DEFINE_ACCTSERVICE_SOUND_SETTINGS "--define=HAS_UT_ACCTSERVICE_SOUND_SETTINGS") -else() - set (HAVE_UT_ACCTSERVICE_SOUND_SETTINGS OFF) endif() vapi_gen(accounts-service -- cgit v1.2.3 From 240aadeb1ae8dcbf06f618ffb51342f81f7f77db Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Wed, 3 Nov 2021 21:54:40 +0100 Subject: Rename HAS_UT_ACCTSERVICE_SOUND_SETTINGS --- src/CMakeLists.txt | 2 +- src/accounts-service-access.vala | 2 +- tests/integration/CMakeLists.txt | 2 +- tests/integration/utils/dbus-pulse-volume.cpp | 2 +- tests/service-mocks/accounts-mock/AccountsDefs.h | 2 +- tests/service-mocks/accounts-mock/CMakeLists.txt | 2 +- tests/service-mocks/media-player-mpris-mock/CMakeLists.txt | 2 +- tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b39bf34..37074e0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -24,7 +24,7 @@ else() endif() if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.Sound.xml") - set (VALA_DEFINE_ACCTSERVICE_SOUND_SETTINGS "--define=HAS_UT_ACCTSERVICE_SOUND_SETTINGS") + set (VALA_DEFINE_ACCTSERVICE_SOUND_SETTINGS "--define=HAS_LOMIRI_ACCTSERVICE_SOUND_SETTINGS") endif() vapi_gen(accounts-service diff --git a/src/accounts-service-access.vala b/src/accounts-service-access.vala index 4287d86..19a27c6 100644 --- a/src/accounts-service-access.vala +++ b/src/accounts-service-access.vala @@ -143,7 +143,7 @@ public class AccountsServiceAccess : Object string user_path; if (user_path_variant.check_format_string ("(o)", true)) { user_path_variant.get ("(o)", out user_path); -#if HAS_UT_ACCTSERVICE_SOUND_SETTINGS +#if HAS_LOMIRI_ACCTSERVICE_SOUND_SETTINGS _user_proxy = yield new DBusProxy.for_bus (BusType.SYSTEM, DBusProxyFlags.GET_INVALIDATED_PROPERTIES, null, "org.freedesktop.Accounts", user_path, "com.lomiri.AccountsService.Sound"); #else _user_proxy = yield new DBusProxy.for_bus (BusType.SYSTEM, DBusProxyFlags.GET_INVALIDATED_PROPERTIES, null, "org.freedesktop.Accounts", user_path, "org.ayatana.AccountsService.Sound"); diff --git a/tests/integration/CMakeLists.txt b/tests/integration/CMakeLists.txt index eef04f2..8193341 100644 --- a/tests/integration/CMakeLists.txt +++ b/tests/integration/CMakeLists.txt @@ -38,7 +38,7 @@ add_definitions(-DSOUND_SERVICE_BIN="${CMAKE_BINARY_DIR}/src/ayatana-indicator-s ) if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.Sound.xml") - add_definitions(-DHAS_UT_ACCTSERVICE_SOUND_SETTINGS) + add_definitions(-DHAS_LOMIRI_ACCTSERVICE_SOUND_SETTINGS) endif() set(GLIB_REQUIRED_VERSION 2.26) diff --git a/tests/integration/utils/dbus-pulse-volume.cpp b/tests/integration/utils/dbus-pulse-volume.cpp index b99a509..2338de1 100644 --- a/tests/integration/utils/dbus-pulse-volume.cpp +++ b/tests/integration/utils/dbus-pulse-volume.cpp @@ -140,7 +140,7 @@ bool DBusPulseVolume::setVolume(QString const & role, double volume) { QDBusVariant dbusVar(QVariant::fromValue(volume)); QDBusReply set_vol = accounts_interface_->call(QLatin1String("Set"), -#ifdef HAS_UT_ACCTSERVICE_SOUND_SETTINGS +#ifdef HAS_LOMIRI_ACCTSERVICE_SOUND_SETTINGS QVariant::fromValue(QString("com.lomiri.AccountsService.Sound")), #else QVariant::fromValue(QString("org.ayatana.AccountsService.Sound")), diff --git a/tests/service-mocks/accounts-mock/AccountsDefs.h b/tests/service-mocks/accounts-mock/AccountsDefs.h index 9726a9a..660f240 100644 --- a/tests/service-mocks/accounts-mock/AccountsDefs.h +++ b/tests/service-mocks/accounts-mock/AccountsDefs.h @@ -28,7 +28,7 @@ namespace testing constexpr const char ACCOUNTS_SERVICE[] = "org.freedesktop.Accounts"; constexpr const char USER_PATH[] = "/org/freedesktop/Accounts/UserTest"; constexpr const char ACCOUNTS_PATH[] = "/org/freedesktop/Accounts"; -#ifdef HAS_UT_ACCTSERVICE_SOUND_SETTINGS +#ifdef HAS_LOMIRI_ACCTSERVICE_SOUND_SETTINGS constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "com.lomiri.AccountsService.Sound"; #else constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "org.ayatana.AccountsService.Sound"; diff --git a/tests/service-mocks/accounts-mock/CMakeLists.txt b/tests/service-mocks/accounts-mock/CMakeLists.txt index e737a07..bcb9608 100644 --- a/tests/service-mocks/accounts-mock/CMakeLists.txt +++ b/tests/service-mocks/accounts-mock/CMakeLists.txt @@ -8,7 +8,7 @@ include_directories(${Qt5DBus_INCLUDE_DIRS} add_definitions(-DQT_NO_KEYWORDS=1) if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.AccountsService.Sound.xml") - add_definitions(-DHAS_UT_ACCTSERVICE_SOUND_SETTINGS) + add_definitions(-DHAS_LOMIRI_ACCTSERVICE_SOUND_SETTINGS) set(dbusinterface_sound_xml "com.lomiri.AccountsService.Sound.Mock.xml") else() set(dbusinterface_sound_xml "org.ayatana.AccountsService.Sound.Mock.xml") diff --git a/tests/service-mocks/media-player-mpris-mock/CMakeLists.txt b/tests/service-mocks/media-player-mpris-mock/CMakeLists.txt index f0c06e6..e4ccc71 100644 --- a/tests/service-mocks/media-player-mpris-mock/CMakeLists.txt +++ b/tests/service-mocks/media-player-mpris-mock/CMakeLists.txt @@ -9,7 +9,7 @@ include_directories(${Qt5DBus_INCLUDE_DIRS} "${CMAKE_SOURCE_DIR}/tests/service-mocks") if(EXISTS "/usr/share/accountsservice/interfaces/com.ubuntu.AccountsService.SecurityPrivacy.xml") - add_definitions(-DHAS_UT_ACCTSERVICE_SOUND_SETTINGS) + add_definitions(-DHAS_LOMIRI_ACCTSERVICE_SOUND_SETTINGS) endif() add_definitions(-DQT_NO_KEYWORDS=1) diff --git a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h index b43f162..8fd3bda 100644 --- a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h +++ b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h @@ -28,7 +28,7 @@ namespace testing constexpr const char MEDIA_PLAYER_MPRIS_SERVICE[] = "org.freedesktop.Accounts"; constexpr const char USER_PATH[] = "/org/freedesktop/Accounts/UserTest"; constexpr const char ACCOUNTS_PATH[] = "/org/freedesktop/Accounts"; -#ifdef HAS_UT_ACCTSERVICE_SOUND_SETTINGS +#ifdef HAS_LOMIRI_ACCTSERVICE_SOUND_SETTINGS constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "com.lomiri.AccountsService.Sound"; #else constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "org.ayatana.AccountsService.Sound"; -- cgit v1.2.3 From 6c745ba6709b7567d3929046bb9ecd9797048e70 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Wed, 3 Nov 2021 22:13:55 +0100 Subject: Use 'ayatana' namespace for unit tests. --- tests/service-mocks/DBusPropertiesNotifier.cpp | 2 +- tests/service-mocks/DBusPropertiesNotifier.h | 4 ++-- tests/service-mocks/accounts-mock/AccountsDefs.h | 4 ++-- tests/service-mocks/accounts-mock/AccountsMock.cpp | 2 +- tests/service-mocks/accounts-mock/AccountsMock.h | 4 ++-- tests/service-mocks/accounts-mock/AccountsServiceSoundMock.cpp | 2 +- tests/service-mocks/accounts-mock/AccountsServiceSoundMock.h | 4 ++-- tests/service-mocks/accounts-mock/CMakeLists.txt | 4 ++-- tests/service-mocks/accounts-mock/main.cpp | 2 +- tests/service-mocks/media-player-mpris-mock/CMakeLists.txt | 4 ++-- tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h | 4 ++-- tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.cpp | 2 +- tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.h | 4 ++-- tests/service-mocks/media-player-mpris-mock/main.cpp | 2 +- 14 files changed, 22 insertions(+), 22 deletions(-) diff --git a/tests/service-mocks/DBusPropertiesNotifier.cpp b/tests/service-mocks/DBusPropertiesNotifier.cpp index 686e4e9..00313a7 100644 --- a/tests/service-mocks/DBusPropertiesNotifier.cpp +++ b/tests/service-mocks/DBusPropertiesNotifier.cpp @@ -20,7 +20,7 @@ #include -using namespace ubuntu::indicators::testing; +using namespace ayatana::indicators::testing; void DBusPropertiesNotifier::notifyPropertyChanged(QDBusConnection const & connection, QString const & interface, diff --git a/tests/service-mocks/DBusPropertiesNotifier.h b/tests/service-mocks/DBusPropertiesNotifier.h index 9fa013b..236a051 100644 --- a/tests/service-mocks/DBusPropertiesNotifier.h +++ b/tests/service-mocks/DBusPropertiesNotifier.h @@ -19,7 +19,7 @@ #include -namespace ubuntu +namespace ayatana { namespace indicators @@ -45,4 +45,4 @@ public: } // namespace indicators -} // namespace ubuntu +} // namespace ayatana diff --git a/tests/service-mocks/accounts-mock/AccountsDefs.h b/tests/service-mocks/accounts-mock/AccountsDefs.h index 660f240..bf66208 100644 --- a/tests/service-mocks/accounts-mock/AccountsDefs.h +++ b/tests/service-mocks/accounts-mock/AccountsDefs.h @@ -17,7 +17,7 @@ */ #pragma once -namespace ubuntu +namespace ayatana { namespace indicators @@ -37,4 +37,4 @@ namespace testing } // namespace indicators -} // namespace ubuntu +} // namespace ayatana diff --git a/tests/service-mocks/accounts-mock/AccountsMock.cpp b/tests/service-mocks/accounts-mock/AccountsMock.cpp index 5c92dc5..af2065a 100644 --- a/tests/service-mocks/accounts-mock/AccountsMock.cpp +++ b/tests/service-mocks/accounts-mock/AccountsMock.cpp @@ -20,7 +20,7 @@ #include "AccountsMock.h" #include "AccountsDefs.h" -using namespace ubuntu::indicators::testing; +using namespace ayatana::indicators::testing; AccountsMock::AccountsMock(QObject* parent) : QObject(parent) diff --git a/tests/service-mocks/accounts-mock/AccountsMock.h b/tests/service-mocks/accounts-mock/AccountsMock.h index 72372e0..e8efbdb 100644 --- a/tests/service-mocks/accounts-mock/AccountsMock.h +++ b/tests/service-mocks/accounts-mock/AccountsMock.h @@ -21,7 +21,7 @@ #include #include -namespace ubuntu +namespace ayatana { namespace indicators @@ -47,4 +47,4 @@ public: } // namespace indicators -} // namespace ubuntu +} // namespace ayatana diff --git a/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.cpp b/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.cpp index b0e4862..e4f83ed 100644 --- a/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.cpp +++ b/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.cpp @@ -22,7 +22,7 @@ #include "AccountsServiceSoundMock.h" #include "AccountsDefs.h" -using namespace ubuntu::indicators::testing; +using namespace ayatana::indicators::testing; AccountsServiceSoundMock::AccountsServiceSoundMock(QObject* parent) : QObject(parent) diff --git a/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.h b/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.h index fd5104e..bcc2413 100644 --- a/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.h +++ b/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.h @@ -22,7 +22,7 @@ #include "DBusPropertiesNotifier.h" -namespace ubuntu +namespace ayatana { namespace indicators @@ -59,4 +59,4 @@ private: } // namespace indicators -} // namespace ubuntu +} // namespace ayatana diff --git a/tests/service-mocks/accounts-mock/CMakeLists.txt b/tests/service-mocks/accounts-mock/CMakeLists.txt index bcb9608..1549249 100644 --- a/tests/service-mocks/accounts-mock/CMakeLists.txt +++ b/tests/service-mocks/accounts-mock/CMakeLists.txt @@ -22,13 +22,13 @@ qt5_add_dbus_interface(interface_files ${dbusinterface_sound_xml} accountsservic qt5_add_dbus_adaptor(adaptor_files ${dbusinterface_sound_xml} AccountsServiceSoundMock.h - ubuntu::indicators::testing::AccountsServiceSoundMock + ayatana::indicators::testing::AccountsServiceSoundMock AccountsServiceSoundMockAdaptor) qt5_add_dbus_adaptor(adaptor_files ${CMAKE_SOURCE_DIR}/tests/dbus-types/org.freedesktop.Accounts.xml AccountsMock.h - ubuntu::indicators::testing::AccountsMock + ayatana::indicators::testing::AccountsMock AccountsMockAdaptor) add_executable( diff --git a/tests/service-mocks/accounts-mock/main.cpp b/tests/service-mocks/accounts-mock/main.cpp index d6cd1d3..f937022 100644 --- a/tests/service-mocks/accounts-mock/main.cpp +++ b/tests/service-mocks/accounts-mock/main.cpp @@ -26,7 +26,7 @@ #include "AccountsMock.h" #include "AccountsMockAdaptor.h" -using namespace ubuntu::indicators::testing; +using namespace ayatana::indicators::testing; int main(int argc, char *argv[]) { diff --git a/tests/service-mocks/media-player-mpris-mock/CMakeLists.txt b/tests/service-mocks/media-player-mpris-mock/CMakeLists.txt index e4ccc71..4f58791 100644 --- a/tests/service-mocks/media-player-mpris-mock/CMakeLists.txt +++ b/tests/service-mocks/media-player-mpris-mock/CMakeLists.txt @@ -23,13 +23,13 @@ qt5_add_dbus_interface(interface_files ${dbusinterface_mediaplayermpris_xml} Med qt5_add_dbus_adaptor(adaptor_files org.mpris.MediaPlayer2.Player.xml MediaPlayerMprisMock.h - ubuntu::indicators::testing::MediaPlayerMprisMock + ayatana::indicators::testing::MediaPlayerMprisMock MediaPlayerMprisMockAdaptor) qt5_add_dbus_adaptor(adaptor_files org.mpris.MediaPlayer2.xml MediaPlayerMprisMock.h - ubuntu::indicators::testing::MediaPlayerMprisMock + ayatana::indicators::testing::MediaPlayerMprisMock MediaPlayer2MockAdaptor) add_executable( diff --git a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h index 8fd3bda..24fa986 100644 --- a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h +++ b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisDefs.h @@ -17,7 +17,7 @@ */ #pragma once -namespace ubuntu +namespace ayatana { namespace indicators @@ -37,5 +37,5 @@ namespace testing } // namespace indicators -} // namespace ubuntu +} // namespace ayatana diff --git a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.cpp b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.cpp index 25fe0b7..9ec9905 100644 --- a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.cpp +++ b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.cpp @@ -19,7 +19,7 @@ #include "MediaPlayerMprisMock.h" -using namespace ubuntu::indicators::testing; +using namespace ayatana::indicators::testing; MediaPlayerMprisMock::MediaPlayerMprisMock(QString const &playerName, QObject* parent) : QObject(parent) diff --git a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.h b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.h index 58dce8d..0a45075 100644 --- a/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.h +++ b/tests/service-mocks/media-player-mpris-mock/MediaPlayerMprisMock.h @@ -23,7 +23,7 @@ #include "DBusPropertiesNotifier.h" -namespace ubuntu +namespace ayatana { namespace indicators @@ -74,4 +74,4 @@ private: } // namespace indicators -} // namespace ubuntu +} // namespace ayatana diff --git a/tests/service-mocks/media-player-mpris-mock/main.cpp b/tests/service-mocks/media-player-mpris-mock/main.cpp index 8945673..877f59f 100644 --- a/tests/service-mocks/media-player-mpris-mock/main.cpp +++ b/tests/service-mocks/media-player-mpris-mock/main.cpp @@ -25,7 +25,7 @@ #include "MediaPlayerMprisMockAdaptor.h" #include "MediaPlayer2MockAdaptor.h" -using namespace ubuntu::indicators::testing; +using namespace ayatana::indicators::testing; int main(int argc, char *argv[]) { -- cgit v1.2.3