diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-11-08 12:34:37 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-11-08 12:34:37 +0100 |
| commit | 85b39c9b481a3fe4d860a7dc47e7aa569e349a1b (patch) | |
| tree | 2789c506aa47abcb47514aa964f2da8121da6613 /tests/service-mocks/media-player-mpris-mock | |
| parent | eb8b3669b5e493ddd8ca4f18379a46d6c0ac57ca (diff) | |
| parent | 6c745ba6709b7567d3929046bb9ecd9797048e70 (diff) | |
| download | ayatana-indicator-sound-85b39c9b481a3fe4d860a7dc47e7aa569e349a1b.tar.gz ayatana-indicator-sound-85b39c9b481a3fe4d860a7dc47e7aa569e349a1b.tar.bz2 ayatana-indicator-sound-85b39c9b481a3fe4d860a7dc47e7aa569e349a1b.zip | |
Merge branch 'tari01-pr/rename-com-ubuntu-accountsservece-sound-gschema'
Attributes GH PR #48: https://github.com/AyatanaIndicators/ayatana-indicator-sound/pull/48
Diffstat (limited to 'tests/service-mocks/media-player-mpris-mock')
5 files changed, 11 insertions, 11 deletions
diff --git a/tests/service-mocks/media-player-mpris-mock/CMakeLists.txt b/tests/service-mocks/media-player-mpris-mock/CMakeLists.txt index f0c06e6..4f58791 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) @@ -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 8a19db8..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 @@ -28,8 +28,8 @@ 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 - constexpr const char ACCOUNTS_SOUND_INTERFACE[] = "com.ubuntu.AccountsService.Sound"; +#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"; #endif @@ -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[]) { |