tests: Remove namespace usings from headers

12 files changed, 31 insertions, 47 deletions

diff --git a/tests/mock_factory.h b/tests/mock_factory.h
index 1e93c04..6943451 100644
--- a/tests/mock_factory.h
+++ b/tests/mock_factory.h
@@ -3,36 +3,34 @@
 #include "nvapi_tests_private.h"
 #include "../src/resource_factory.h"
 
-using namespace dxvk;
-
-class MockFactory : public ResourceFactory {
+class MockFactory : public dxvk::ResourceFactory {
 
   public:
-    MockFactory(std::unique_ptr<IDXGIFactory1> dxgiFactory1Mock, std::unique_ptr<Vulkan> vulkanMock,
-        std::unique_ptr<Nvml> nvmlMock, std::unique_ptr<Lfx> lfxMock)
+    MockFactory(std::unique_ptr<IDXGIFactory1> dxgiFactory1Mock, std::unique_ptr<dxvk::Vulkan> vulkanMock,
+        std::unique_ptr<dxvk::Nvml> nvmlMock, std::unique_ptr<dxvk::Lfx> lfxMock)
         : m_dxgiFactoryMock(std::move(dxgiFactory1Mock)), m_vulkanMock(std::move(vulkanMock)),
           m_nvmlMock(std::move(nvmlMock)), m_lfxMock(std::move(lfxMock)){};
 
-    Com<IDXGIFactory1> CreateDXGIFactory1() override {
-        Com<IDXGIFactory1> dxgiFactory = m_dxgiFactoryMock.get();
+    dxvk::Com<IDXGIFactory1> CreateDXGIFactory1() override {
+        dxvk::Com<IDXGIFactory1> dxgiFactory = m_dxgiFactoryMock.get();
         return dxgiFactory;
     };
 
-    std::unique_ptr<Vulkan> CreateVulkan() override {
+    std::unique_ptr<dxvk::Vulkan> CreateVulkan() override {
         return std::move(m_vulkanMock);
     }
 
-    std::unique_ptr<Nvml> CreateNvml() override {
+    std::unique_ptr<dxvk::Nvml> CreateNvml() override {
         return std::move(m_nvmlMock);
     }
 
-    std::unique_ptr<Lfx> CreateLfx() override {
+    std::unique_ptr<dxvk::Lfx> CreateLfx() override {
         return std::move(m_lfxMock);
     }
 
   private:
     std::unique_ptr<IDXGIFactory1> m_dxgiFactoryMock;
-    std::unique_ptr<Vulkan> m_vulkanMock;
-    std::unique_ptr<Nvml> m_nvmlMock;
-    std::unique_ptr<Lfx> m_lfxMock;
+    std::unique_ptr<dxvk::Vulkan> m_vulkanMock;
+    std::unique_ptr<dxvk::Nvml> m_nvmlMock;
+    std::unique_ptr<dxvk::Lfx> m_lfxMock;
 };
diff --git a/tests/nvapi_d3d.cpp b/tests/nvapi_d3d.cpp
index fcd5cd7..dde90ec 100644
--- a/tests/nvapi_d3d.cpp
+++ b/tests/nvapi_d3d.cpp
@@ -3,7 +3,6 @@
 #include "nvapi_d3d_mocks.h"
 
 using namespace trompeloeil;
-using namespace dxvk;
 
 TEST_CASE("D3D methods succeed", "[.d3d]") {
     UnknownMock unknown;
diff --git a/tests/nvapi_d3d11.cpp b/tests/nvapi_d3d11.cpp
index 72ac94b..7f6ac88 100644
--- a/tests/nvapi_d3d11.cpp
+++ b/tests/nvapi_d3d11.cpp
@@ -3,7 +3,6 @@
 #include "nvapi_d3d11_mocks.h"
 
 using namespace trompeloeil;
-using namespace dxvk;
 
 TEST_CASE("D3D11 methods succeed", "[.d3d11]") {
     D3D11DxvkDeviceMock device;
diff --git a/tests/nvapi_d3d11_mocks.h b/tests/nvapi_d3d11_mocks.h
index 4127a0b..6b0c909 100644
--- a/tests/nvapi_d3d11_mocks.h
+++ b/tests/nvapi_d3d11_mocks.h
@@ -3,12 +3,9 @@
 #include "nvapi_tests_private.h"
 #include "../src/dxvk/dxvk_interfaces.h"
 
-using namespace trompeloeil;
-using namespace dxvk;
-
 class ID3D11DxvkDevice : public ID3D11Device, public ID3D11VkExtDevice1 {};
 
-class D3D11DxvkDeviceMock : public mock_interface<ID3D11DxvkDevice> {
+class D3D11DxvkDeviceMock : public trompeloeil::mock_interface<ID3D11DxvkDevice> {
     MAKE_MOCK2(QueryInterface, HRESULT(REFIID, void**), override);
     MAKE_MOCK0(AddRef, ULONG(), override);
     MAKE_MOCK0(Release, ULONG(), override);
@@ -63,7 +60,7 @@ class D3D11DxvkDeviceMock : public mock_interface<ID3D11DxvkDevice> {
 
 class ID3D11DxvkDeviceContext : public ID3D11DeviceContext, public ID3D11VkExtContext1 {};
 
-class D3D11DxvkDeviceContextMock : public mock_interface<ID3D11DxvkDeviceContext> {
+class D3D11DxvkDeviceContextMock : public trompeloeil::mock_interface<ID3D11DxvkDeviceContext> {
     MAKE_MOCK2(QueryInterface, HRESULT(REFIID, void**), override);
     MAKE_MOCK0(AddRef, ULONG(), override);
     MAKE_MOCK0(Release, ULONG(), override);
@@ -188,7 +185,7 @@ class D3D11DxvkDeviceContextMock : public mock_interface<ID3D11DxvkDeviceContext
     IMPLEMENT_MOCK10(LaunchCubinShaderNVX);
 };
 
-class D3D11BufferMock : public mock_interface<ID3D11Buffer> {
+class D3D11BufferMock : public trompeloeil::mock_interface<ID3D11Buffer> {
     MAKE_MOCK2(QueryInterface, HRESULT(REFIID, void**), override);
     MAKE_MOCK0(AddRef, ULONG(), override);
     MAKE_MOCK0(Release, ULONG(), override);
diff --git a/tests/nvapi_d3d12.cpp b/tests/nvapi_d3d12.cpp
index 364ebb8..b16d634 100644
--- a/tests/nvapi_d3d12.cpp
+++ b/tests/nvapi_d3d12.cpp
@@ -4,7 +4,6 @@
 #include "nvapi_d3d12_mocks.h"
 
 using namespace trompeloeil;
-using namespace dxvk;
 
 TEST_CASE("D3D12 methods succeed", "[.d3d12]") {
     D3D12Vkd3dDeviceMock device;
diff --git a/tests/nvapi_d3d12_mocks.h b/tests/nvapi_d3d12_mocks.h
index a7a24aa..ebca5ab 100644
--- a/tests/nvapi_d3d12_mocks.h
+++ b/tests/nvapi_d3d12_mocks.h
@@ -3,12 +3,9 @@
 #include "nvapi_tests_private.h"
 #include "../src/vkd3d-proton/vkd3d-proton_interfaces.h"
 
-using namespace trompeloeil;
-using namespace dxvk;
-
 class ID3D12Vkd3dDevice : public ID3D12Device, public ID3D12DeviceExt {};
 
-class D3D12Vkd3dDeviceMock : public mock_interface<ID3D12Vkd3dDevice> {
+class D3D12Vkd3dDeviceMock : public trompeloeil::mock_interface<ID3D12Vkd3dDevice> {
     MAKE_MOCK2(QueryInterface, HRESULT(REFIID, void**), override);
     MAKE_MOCK0(AddRef, ULONG(), override);
     MAKE_MOCK0(Release, ULONG(), override);
@@ -64,7 +61,7 @@ class D3D12Vkd3dDeviceMock : public mock_interface<ID3D12Vkd3dDevice> {
 
 class ID3D12Vkd3dGraphicsCommandList : public ID3D12GraphicsCommandList1, public ID3D12GraphicsCommandListExt {};
 
-class D3D12Vkd3dGraphicsCommandListMock : public mock_interface<ID3D12Vkd3dGraphicsCommandList> {
+class D3D12Vkd3dGraphicsCommandListMock : public trompeloeil::mock_interface<ID3D12Vkd3dGraphicsCommandList> {
     MAKE_MOCK2(QueryInterface, HRESULT(REFIID, void**), override);
     MAKE_MOCK0(AddRef, ULONG(), override);
     MAKE_MOCK0(Release, ULONG(), override);
diff --git a/tests/nvapi_d3d_mocks.h b/tests/nvapi_d3d_mocks.h
index 13acf5f..d1e7ac7 100644
--- a/tests/nvapi_d3d_mocks.h
+++ b/tests/nvapi_d3d_mocks.h
@@ -3,16 +3,13 @@
 #include "nvapi_tests_private.h"
 #include "../src/d3d/lfx.h"
 
-using namespace trompeloeil;
-using namespace dxvk;
-
-class UnknownMock : public mock_interface<IUnknown> {
+class UnknownMock : public trompeloeil::mock_interface<IUnknown> {
     MAKE_MOCK2(QueryInterface, HRESULT(REFIID, void**), override);
     MAKE_MOCK0(AddRef, ULONG(), override);
     MAKE_MOCK0(Release, ULONG(), override);
 };
 
-class LfxMock : public mock_interface<Lfx> {
+class LfxMock : public trompeloeil::mock_interface<dxvk::Lfx> {
     IMPLEMENT_CONST_MOCK0(IsAvailable);
     IMPLEMENT_MOCK0(WaitAndBeginFrame);
     IMPLEMENT_MOCK1(SetTargetFrameTime);
diff --git a/tests/nvapi_drs.cpp b/tests/nvapi_drs.cpp
index d37b856..3bb539e 100644
--- a/tests/nvapi_drs.cpp
+++ b/tests/nvapi_drs.cpp
@@ -1,7 +1,6 @@
 #include "nvapi_tests_private.h"
 #include "../inc/NvApiDriverSettings.h"
 
-using namespace dxvk;
 using namespace trompeloeil;
 
 TEST_CASE("DRS methods succeed", "[.drs]") {
diff --git a/tests/nvapi_sysinfo.cpp b/tests/nvapi_sysinfo.cpp
index a91a682..0a6b31b 100644
--- a/tests/nvapi_sysinfo.cpp
+++ b/tests/nvapi_sysinfo.cpp
@@ -3,7 +3,6 @@
 #include "nvapi_sysinfo_mocks.h"
 
 using namespace trompeloeil;
-using namespace dxvk;
 
 TEST_CASE("GetInterfaceVersionString returns OK", "[.sysinfo]") {
     NvAPI_ShortString desc;
diff --git a/tests/nvapi_sysinfo_mocks.h b/tests/nvapi_sysinfo_mocks.h
index ee0db72..b2d45ee 100644
--- a/tests/nvapi_sysinfo_mocks.h
+++ b/tests/nvapi_sysinfo_mocks.h
@@ -5,10 +5,7 @@
 #include "../src/sysinfo/vulkan.h"
 #include "../src/sysinfo/nvml.h"
 
-using namespace trompeloeil;
-using namespace dxvk;
-
-class DXGIFactory1Mock : public mock_interface<IDXGIFactory1> {
+class DXGIFactory1Mock : public trompeloeil::mock_interface<IDXGIFactory1> {
     MAKE_MOCK2(QueryInterface, HRESULT(REFIID, void**), override);
     MAKE_MOCK0(AddRef, ULONG(), override);
     MAKE_MOCK0(Release, ULONG(), override);
@@ -27,7 +24,7 @@ class DXGIFactory1Mock : public mock_interface<IDXGIFactory1> {
 
 class IDXGIDxvkAdapter : public IDXGIAdapter1, public IDXGIVkInteropAdapter {};
 
-class DXGIDxvkAdapterMock : public mock_interface<IDXGIDxvkAdapter> {
+class DXGIDxvkAdapterMock : public trompeloeil::mock_interface<IDXGIDxvkAdapter> {
     MAKE_MOCK2(QueryInterface, HRESULT(REFIID, void**), override);
     MAKE_MOCK0(AddRef, ULONG(), override);
     MAKE_MOCK0(Release, ULONG(), override);
@@ -42,7 +39,7 @@ class DXGIDxvkAdapterMock : public mock_interface<IDXGIDxvkAdapter> {
     IMPLEMENT_MOCK2(GetVulkanHandles);
 };
 
-class DXGIOutputMock : public mock_interface<IDXGIOutput> {
+class DXGIOutputMock : public trompeloeil::mock_interface<IDXGIOutput> {
     MAKE_MOCK2(QueryInterface, HRESULT(REFIID, void**), override);
     MAKE_MOCK0(AddRef, ULONG(), override);
     MAKE_MOCK0(Release, ULONG(), override);
@@ -64,14 +61,14 @@ class DXGIOutputMock : public mock_interface<IDXGIOutput> {
     IMPLEMENT_MOCK1(GetFrameStatistics);
 };
 
-class VulkanMock : public mock_interface<Vulkan> {
+class VulkanMock : public trompeloeil::mock_interface<dxvk::Vulkan> {
     IMPLEMENT_CONST_MOCK0(IsAvailable);
     IMPLEMENT_CONST_MOCK2(GetDeviceExtensions);
     IMPLEMENT_CONST_MOCK3(GetPhysicalDeviceProperties2);
     IMPLEMENT_CONST_MOCK3(GetPhysicalDeviceMemoryProperties2);
 };
 
-class NvmlMock : public mock_interface<Nvml> {
+class NvmlMock : public trompeloeil::mock_interface<dxvk::Nvml> {
     IMPLEMENT_CONST_MOCK0(IsAvailable);
     IMPLEMENT_CONST_MOCK1(ErrorString);
     IMPLEMENT_CONST_MOCK2(DeviceGetHandleByPciBusId_v2);
diff --git a/tests/resource_factory_util.cpp b/tests/resource_factory_util.cpp
index cfa15c8..eee221a 100644
--- a/tests/resource_factory_util.cpp
+++ b/tests/resource_factory_util.cpp
@@ -1,5 +1,8 @@
 #include "resource_factory_util.h"
 
+using namespace trompeloeil;
+using namespace dxvk;
+
 void SetupResourceFactory(
     std::unique_ptr<DXGIFactory1Mock> dxgiFactory,
     std::unique_ptr<Vulkan> vulkan,
diff --git a/tests/resource_factory_util.h b/tests/resource_factory_util.h
index 9a3e4fa..a7db8cd 100644
--- a/tests/resource_factory_util.h
+++ b/tests/resource_factory_util.h
@@ -7,11 +7,11 @@
 
 void SetupResourceFactory(
     std::unique_ptr<DXGIFactory1Mock> dxgiFactory,
-    std::unique_ptr<Vulkan> vulkan,
-    std::unique_ptr<Nvml> nvml,
-    std::unique_ptr<Lfx> lfx);
+    std::unique_ptr<dxvk::Vulkan> vulkan,
+    std::unique_ptr<dxvk::Nvml> nvml,
+    std::unique_ptr<dxvk::Lfx> lfx);
 
-[[nodiscard]] std::array<std::unique_ptr<expectation>, 17> ConfigureDefaultTestEnvironment(
+[[nodiscard]] std::array<std::unique_ptr<trompeloeil::expectation>, 17> ConfigureDefaultTestEnvironment(
     DXGIFactory1Mock& dxgiFactory,
     VulkanMock& vulkan,
     NvmlMock& nvml,
@@ -19,7 +19,7 @@ void SetupResourceFactory(
     DXGIDxvkAdapterMock& adapter,
     DXGIOutputMock& output);
 
-[[nodiscard]] std::array<std::unique_ptr<expectation>, 29> ConfigureExtendedTestEnvironment(
+[[nodiscard]] std::array<std::unique_ptr<trompeloeil::expectation>, 29> ConfigureExtendedTestEnvironment(
     DXGIFactory1Mock& dxgiFactory,
     VulkanMock& vulkan,
     NvmlMock& nvml,