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(-) (limited to 'tests') 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