From 56a3380b46f406ffaf093405ac2db4515b0a4f80 Mon Sep 17 00:00:00 2001 From: "FWoltermann@gmail.com" Date: Mon, 28 May 2012 16:44:39 +0000 Subject: Removes the ArrayList classes, and replaces all instances with std::vector implementations. --- nGenEx/VideoDX9Enum.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'nGenEx/VideoDX9Enum.h') diff --git a/nGenEx/VideoDX9Enum.h b/nGenEx/VideoDX9Enum.h index 57e00cd..e4e6f54 100644 --- a/nGenEx/VideoDX9Enum.h +++ b/nGenEx/VideoDX9Enum.h @@ -18,8 +18,8 @@ #include #include "Video.h" -#include "ArrayList.h" #include "List.h" +#include // +--------------------------------------------------------------------+ @@ -72,8 +72,8 @@ public: bool req_fullscreen; private: - HRESULT EnumerateDevices(VideoDX9AdapterInfo* adapter_info, ArrayList& adapter_format_list); - HRESULT EnumerateDeviceCombos(VideoDX9DeviceInfo* device_info, ArrayList& adapter_format_list); + HRESULT EnumerateDevices(VideoDX9AdapterInfo* adapter_info, std::vector& adapter_format_list); + HRESULT EnumerateDeviceCombos(VideoDX9DeviceInfo* device_info, std::vector& adapter_format_list); void BuildDepthStencilFormatList(VideoDX9DeviceCombo* device_combo); void BuildMultiSampleTypeList(VideoDX9DeviceCombo* device_combo); @@ -82,7 +82,7 @@ private: void BuildPresentIntervalList(VideoDX9DeviceInfo* device_info, VideoDX9DeviceCombo* device_combo); IDirect3D9* d3d; - ArrayList allowed_adapter_format_list; + std::vector allowed_adapter_format_list; List adapter_info_list; int adapter_index; @@ -170,11 +170,11 @@ struct VideoDX9DeviceCombo D3DFORMAT back_buffer_format; bool is_windowed; - ArrayList vertex_processing_list; - ArrayList depth_stencil_fmt_list; - ArrayList multisample_type_list; - ArrayList multisample_qual_list; - ArrayList present_interval_list; + std::vector vertex_processing_list; + std::vector depth_stencil_fmt_list; + std::vector multisample_type_list; + std::vector multisample_qual_list; + std::vector present_interval_list; List conflict_list; }; -- cgit v1.1