diff --git a/connections/clients/windows/bluetooth_classic_server_socket_test.cc b/connections/clients/windows/bluetooth_classic_server_socket_test.cc index c764908b..7e7b3580 100644 --- a/connections/clients/windows/bluetooth_classic_server_socket_test.cc +++ b/connections/clients/windows/bluetooth_classic_server_socket_test.cc @@ -30,15 +30,14 @@ namespace location::nearby::windows { -using location::nearby::ByteArray; -using location::nearby::CountDownLatch; -using location::nearby::connections::AdvertisingOptions; -using location::nearby::connections::ConnectionListener; -using location::nearby::connections::ConnectionRequestInfo; -using location::nearby::connections::Core; -using location::nearby::connections::ServiceControllerRouter; -using location::nearby::connections::Status; -using location::nearby::connections::Strategy; +using ::location::nearby::ByteArray; +using ::location::nearby::connections::AdvertisingOptions; +using ::location::nearby::connections::ConnectionListener; +using ::location::nearby::connections::ConnectionRequestInfo; +using ::location::nearby::connections::Core; +using ::location::nearby::connections::ServiceControllerRouter; +using ::location::nearby::connections::Status; +using ::location::nearby::connections::Strategy; constexpr absl::string_view SERVICE_ID = "com.google.location.nearby.apps.helloconnections"; diff --git a/connections/clients/windows/medium_selector_w.h b/connections/clients/windows/medium_selector_w.h index 9cf056c3..15321380 100644 --- a/connections/clients/windows/medium_selector_w.h +++ b/connections/clients/windows/medium_selector_w.h @@ -18,7 +18,7 @@ namespace location::nearby::windows { -using MediumW = location::nearby::proto::connections::Medium; +using MediumW = ::location::nearby::proto::connections::Medium; // Generic type: allows definition of a feature T for every Medium. template diff --git a/connections/implementation/analytics/throughput_recorder.h b/connections/implementation/analytics/throughput_recorder.h index 312c3b67..c76ac7d0 100644 --- a/connections/implementation/analytics/throughput_recorder.h +++ b/connections/implementation/analytics/throughput_recorder.h @@ -28,7 +28,7 @@ namespace location { namespace nearby { namespace analytics { -using Medium = location::nearby::proto::connections::Medium; +using Medium = ::location::nearby::proto::connections::Medium; using PayloadType = connections::PayloadType; class ThroughputRecorder { diff --git a/connections/implementation/base_bwu_handler_test.cc b/connections/implementation/base_bwu_handler_test.cc index f882566e..991bd524 100644 --- a/connections/implementation/base_bwu_handler_test.cc +++ b/connections/implementation/base_bwu_handler_test.cc @@ -29,7 +29,7 @@ namespace { // pure virtual functions in order to test BaseBwuHandler's bookkeeping logic. class BwuHandlerImpl : public BaseBwuHandler { public: - using Medium = location::nearby::proto::connections::Medium; + using Medium = ::location::nearby::proto::connections::Medium; // The arguments passed to the BwuHandler methods. Not all values are set // for every method. diff --git a/connections/implementation/fake_bwu_handler.h b/connections/implementation/fake_bwu_handler.h index 12114869..3e6b4614 100644 --- a/connections/implementation/fake_bwu_handler.h +++ b/connections/implementation/fake_bwu_handler.h @@ -37,7 +37,7 @@ namespace connections { // HandleInitializeUpgradedMediumForEndpoint call. class FakeBwuHandler : public BaseBwuHandler { public: - using Medium = location::nearby::proto::connections::Medium; + using Medium = ::location::nearby::proto::connections::Medium; // The arguments passed to the BwuHandler methods. Not all values are set for // every method. diff --git a/connections/implementation/fake_endpoint_channel.h b/connections/implementation/fake_endpoint_channel.h index f2f63bca..4c68b0d2 100644 --- a/connections/implementation/fake_endpoint_channel.h +++ b/connections/implementation/fake_endpoint_channel.h @@ -28,7 +28,7 @@ namespace connections { // output can be set. class FakeEndpointChannel : public EndpointChannel { public: - using Medium = location::nearby::proto::connections::Medium; + using Medium = ::location::nearby::proto::connections::Medium; FakeEndpointChannel(Medium medium, const std::string& service_id) : medium_(medium), service_id_(service_id) {} diff --git a/connections/implementation/internal_payload_factory.cc b/connections/implementation/internal_payload_factory.cc index 618e492b..dbcf00d5 100644 --- a/connections/implementation/internal_payload_factory.cc +++ b/connections/implementation/internal_payload_factory.cc @@ -292,8 +292,8 @@ class IncomingFileInternalPayload : public InternalPayload { } // namespace -using location::nearby::api::ImplementationPlatform; -using location::nearby::api::OSName; +using ::location::nearby::api::ImplementationPlatform; +using ::location::nearby::api::OSName; std::unique_ptr CreateOutgoingInternalPayload( Payload payload) { diff --git a/connections/implementation/mediums/webrtc/signaling_frames.cc b/connections/implementation/mediums/webrtc/signaling_frames.cc index c3498eea..c8077c51 100644 --- a/connections/implementation/mediums/webrtc/signaling_frames.cc +++ b/connections/implementation/mediums/webrtc/signaling_frames.cc @@ -19,7 +19,7 @@ namespace nearby { namespace connections { namespace mediums { namespace webrtc_frames { -using WebRtcSignalingFrame = location::nearby::mediums::WebRtcSignalingFrame; +using WebRtcSignalingFrame = ::location::nearby::mediums::WebRtcSignalingFrame; namespace { diff --git a/connections/implementation/offline_frames_validator.cc b/connections/implementation/offline_frames_validator.cc index f7c8d00e..47c99ad4 100644 --- a/connections/implementation/offline_frames_validator.cc +++ b/connections/implementation/offline_frames_validator.cc @@ -39,7 +39,7 @@ using WifiAwareCredentials = UpgradePathInfo::WifiAwareCredentials; using WifiDirectCredentials = UpgradePathInfo::WifiDirectCredentials; using BluetoothCredentials = UpgradePathInfo::BluetoothCredentials; using WebRtcCredentials = UpgradePathInfo::WebRtcCredentials; -using Medium = location::nearby::connections::Medium; +using Medium = ::location::nearby::connections::Medium; constexpr absl::string_view kIpv4PatternString{ "^([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\." diff --git a/connections/medium_selector.h b/connections/medium_selector.h index 3d66458a..4fd92590 100644 --- a/connections/medium_selector.h +++ b/connections/medium_selector.h @@ -20,7 +20,7 @@ namespace location { namespace nearby { namespace connections { -using Medium = location::nearby::proto::connections::Medium; +using Medium = ::location::nearby::proto::connections::Medium; // Generic type: allows definition of a feature T for every Medium. template diff --git a/internal/platform/byte_array_test.cc b/internal/platform/byte_array_test.cc index 5b05978e..b7c29bce 100644 --- a/internal/platform/byte_array_test.cc +++ b/internal/platform/byte_array_test.cc @@ -21,7 +21,7 @@ namespace { -using location::nearby::ByteArray; +using ::location::nearby::ByteArray; TEST(ByteArrayTest, DefaultSizeIsZero) { ByteArray bytes; diff --git a/internal/platform/implementation/ios/Tests/GNCMultiThreadExecutorTest.mm b/internal/platform/implementation/ios/Tests/GNCMultiThreadExecutorTest.mm index f27dd5c5..37a9e086 100644 --- a/internal/platform/implementation/ios/Tests/GNCMultiThreadExecutorTest.mm +++ b/internal/platform/implementation/ios/Tests/GNCMultiThreadExecutorTest.mm @@ -23,9 +23,9 @@ #include "internal/platform/implementation/submittable_executor.h" #include "internal/platform/runnable.h" -using location::nearby::Runnable; -using location::nearby::api::ImplementationPlatform; -using MultiThreadExecutor = location::nearby::api::SubmittableExecutor; +using ::location::nearby::Runnable; +using ::location::nearby::api::ImplementationPlatform; +using MultiThreadExecutor = ::location::nearby::api::SubmittableExecutor; @interface GNCMultiThreadExecutorTest : XCTestCase @property(atomic) int counter; diff --git a/internal/platform/implementation/ios/Tests/GNCScheduledExecutorTest.mm b/internal/platform/implementation/ios/Tests/GNCScheduledExecutorTest.mm index 1c7b3e39..9b247101 100644 --- a/internal/platform/implementation/ios/Tests/GNCScheduledExecutorTest.mm +++ b/internal/platform/implementation/ios/Tests/GNCScheduledExecutorTest.mm @@ -23,9 +23,9 @@ #include "internal/platform/implementation/scheduled_executor.h" #include "internal/platform/runnable.h" -using location::nearby::Runnable; -using location::nearby::api::ImplementationPlatform; -using location::nearby::api::ScheduledExecutor; +using ::location::nearby::Runnable; +using ::location::nearby::api::ImplementationPlatform; +using ::location::nearby::api::ScheduledExecutor; @interface GNCScheduledExecutorTest : XCTestCase @property(atomic) int counter; diff --git a/internal/platform/implementation/ios/Tests/GNCSingleThreadExecutorTest.mm b/internal/platform/implementation/ios/Tests/GNCSingleThreadExecutorTest.mm index 1a347321..8265ea05 100644 --- a/internal/platform/implementation/ios/Tests/GNCSingleThreadExecutorTest.mm +++ b/internal/platform/implementation/ios/Tests/GNCSingleThreadExecutorTest.mm @@ -23,9 +23,9 @@ #include "internal/platform/implementation/submittable_executor.h" #include "internal/platform/runnable.h" -using location::nearby::Runnable; -using location::nearby::api::ImplementationPlatform; -using SingleThreadExecutor = location::nearby::api::SubmittableExecutor; +using ::location::nearby::Runnable; +using ::location::nearby::api::ImplementationPlatform; +using SingleThreadExecutor = ::location::nearby::api::SubmittableExecutor; @interface GNCSingleThreadExecutorTest : XCTestCase @property(atomic) int counter; diff --git a/internal/platform/implementation/ios/Tests/GNCUtilsTest.mm b/internal/platform/implementation/ios/Tests/GNCUtilsTest.mm index fb924ee7..b9791def 100644 --- a/internal/platform/implementation/ios/Tests/GNCUtilsTest.mm +++ b/internal/platform/implementation/ios/Tests/GNCUtilsTest.mm @@ -17,10 +17,10 @@ #include "internal/platform/byte_array.h" #include "internal/platform/implementation/ios/utils.h" -using location::nearby::ByteArray; -using location::nearby::ByteArrayFromNSData; -using location::nearby::CppStringFromObjCString; -using location::nearby::ObjCStringFromCppString; +using ::location::nearby::ByteArray; +using ::location::nearby::ByteArrayFromNSData; +using ::location::nearby::CppStringFromObjCString; +using ::location::nearby::ObjCStringFromCppString; @interface GNCUtilsTest : XCTestCase @end diff --git a/internal/platform/implementation/windows/bluetooth_classic_medium_test.cc b/internal/platform/implementation/windows/bluetooth_classic_medium_test.cc index 5c735700..f731723a 100644 --- a/internal/platform/implementation/windows/bluetooth_classic_medium_test.cc +++ b/internal/platform/implementation/windows/bluetooth_classic_medium_test.cc @@ -35,7 +35,7 @@ // STOP/HANG AND IS INTENDED SOLELY FOR DEBUG AND DEMONSTRATION PURPOSES. DO NOT // ATTEMPT TO BUILD AND RUN THIS TEST ON GOOGLE3 YOU HAVE BEEN WARNED -using location::nearby::windows::BluetoothDevice; +using ::location::nearby::windows::BluetoothDevice; typedef std::map DeviceMap; diff --git a/internal/platform/implementation/windows/utils_test.cc b/internal/platform/implementation/windows/utils_test.cc index 62594bc3..71ab7d15 100644 --- a/internal/platform/implementation/windows/utils_test.cc +++ b/internal/platform/implementation/windows/utils_test.cc @@ -19,7 +19,7 @@ #include "gtest/gtest.h" -// using location::nearby::windows::uint64_to_mac_address_string; +// using ::location::nearby::windows::uint64_to_mac_address_string; namespace location { namespace nearby { namespace windows { diff --git a/internal/platform/wifi_utils.h b/internal/platform/wifi_utils.h index a7b90454..ceca9730 100644 --- a/internal/platform/wifi_utils.h +++ b/internal/platform/wifi_utils.h @@ -20,7 +20,7 @@ namespace location { namespace nearby { -using location::nearby::api::WifiBandType; +using ::location::nearby::api::WifiBandType; class WifiUtils { public: diff --git a/presence/implementation/mediums/ble_test.cc b/presence/implementation/mediums/ble_test.cc index 6fa3ec0c..c9d1610a 100644 --- a/presence/implementation/mediums/ble_test.cc +++ b/presence/implementation/mediums/ble_test.cc @@ -35,22 +35,22 @@ namespace nearby { namespace presence { namespace { -using FeatureFlags = location::nearby::FeatureFlags::Flags; -using BleOperationStatus = location::nearby::api::ble_v2::BleOperationStatus; +using FeatureFlags = ::location::nearby::FeatureFlags::Flags; +using BleOperationStatus = ::location::nearby::api::ble_v2::BleOperationStatus; using BleV2MediumStatus = - location::nearby::MediumEnvironment::BleV2MediumStatus; + ::location::nearby::MediumEnvironment::BleV2MediumStatus; using ScanningSession = - location::nearby::api::ble_v2::BleMedium::ScanningSession; -using TxPowerLevel = location::nearby::api::ble_v2::TxPowerLevel; + ::location::nearby::api::ble_v2::BleMedium::ScanningSession; +using TxPowerLevel = ::location::nearby::api::ble_v2::TxPowerLevel; using ScanningCallback = - location::nearby::api::ble_v2::BleMedium::ScanningCallback; -using Uuid = location::nearby::Uuid; -using location::nearby::api::ble_v2::BleAdvertisementData; -using location::nearby::api::ble_v2::BlePeripheral; + ::location::nearby::api::ble_v2::BleMedium::ScanningCallback; +using Uuid = ::location::nearby::Uuid; +using ::location::nearby::api::ble_v2::BleAdvertisementData; +using ::location::nearby::api::ble_v2::BlePeripheral; using AdvertisingCallback = - location::nearby::api::ble_v2::BleMedium::AdvertisingCallback; + ::location::nearby::api::ble_v2::BleMedium::AdvertisingCallback; using AdvertisingSession = - location::nearby::api::ble_v2::BleMedium::AdvertisingSession; + ::location::nearby::api::ble_v2::BleMedium::AdvertisingSession; constexpr FeatureFlags kTestCases[] = { FeatureFlags{}, diff --git a/presence/implementation/scan_manager_test.cc b/presence/implementation/scan_manager_test.cc index 72506ae8..5428dc45 100644 --- a/presence/implementation/scan_manager_test.cc +++ b/presence/implementation/scan_manager_test.cc @@ -45,7 +45,7 @@ using AdvertisingSession = using AdvertisingCallback = ::location::nearby::api::ble_v2::BleMedium::AdvertisingCallback; -using CountDownLatch = location::nearby::CountDownLatch; +using CountDownLatch = ::location::nearby::CountDownLatch; class ScanManagerTest : public testing::Test { protected: diff --git a/presence/implementation/service_controller_impl_test.cc b/presence/implementation/service_controller_impl_test.cc index 68e239e4..bf40050d 100644 --- a/presence/implementation/service_controller_impl_test.cc +++ b/presence/implementation/service_controller_impl_test.cc @@ -29,9 +29,9 @@ namespace nearby { namespace presence { namespace { -using FeatureFlags = location::nearby::FeatureFlags::Flags; +using FeatureFlags = ::location::nearby::FeatureFlags::Flags; using internal::IdentityType; -using location::nearby::MediumEnvironment; +using ::location::nearby::MediumEnvironment; constexpr FeatureFlags kTestCases[] = { FeatureFlags{},