Windows: Fix some const type conversion warnings.

hrydgard · Feb 14, 2021 · 47b3384 · 47b3384
1 parent bfd86e4
commit 47b3384
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/Windows/Debugger/Debugger_VFPUDlg.cpp b/Windows/Debugger/Debugger_VFPUDlg.cpp
@@ -32,23 +32,23 @@ CVFPUDlg::CVFPUDlg(HINSTANCE _hInstance, HWND _hParent, DebugInterface *cpu_) :
 	ZeroMemory (&tcItem,sizeof (tcItem));
 	tcItem.mask			= TCIF_TEXT;
 	tcItem.dwState		= 0;
-	tcItem.pszText		= L"Float";
+	tcItem.pszText		= (LPTSTR)L"Float";
 	tcItem.cchTextMax	= (int)wcslen(tcItem.pszText)+1;
 	tcItem.iImage		= 0;
 	TabCtrl_InsertItem(tabs, TabCtrl_GetItemCount(tabs),&tcItem);
-	tcItem.pszText		= L"HalfFloat";
+	tcItem.pszText		= (LPTSTR)L"HalfFloat";
 	tcItem.cchTextMax	= (int)wcslen(tcItem.pszText)+1;
 	TabCtrl_InsertItem(tabs, TabCtrl_GetItemCount(tabs),&tcItem);
-	tcItem.pszText		= L"Hex";
+	tcItem.pszText		= (LPTSTR)L"Hex";
 	tcItem.cchTextMax	= (int)wcslen(tcItem.pszText)+1;
 	TabCtrl_InsertItem(tabs, TabCtrl_GetItemCount(tabs),&tcItem);
-	tcItem.pszText		= L"Bytes";
+	tcItem.pszText		= (LPTSTR)L"Bytes";
 	tcItem.cchTextMax	= (int)wcslen(tcItem.pszText)+1;
 	TabCtrl_InsertItem(tabs, TabCtrl_GetItemCount(tabs),&tcItem);
-	tcItem.pszText		= L"Shorts";
+	tcItem.pszText		= (LPTSTR)L"Shorts";
 	tcItem.cchTextMax	= (int)wcslen(tcItem.pszText)+1;
 	TabCtrl_InsertItem(tabs, TabCtrl_GetItemCount(tabs),&tcItem);
-	tcItem.pszText		= L"Ints";
+	tcItem.pszText		= (LPTSTR)L"Ints";
 	tcItem.cchTextMax	= (int)wcslen(tcItem.pszText)+1;
 	TabCtrl_InsertItem(tabs, TabCtrl_GetItemCount(tabs),&tcItem);
 	mode=0;

diff --git a/Windows/GEDebugger/CtrlDisplayListView.cpp b/Windows/GEDebugger/CtrlDisplayListView.cpp
@@ -1,3 +1,5 @@
+#include <algorithm>
+#include <tchar.h>
 #include "Common/System/Display.h"
 #include "Windows/GEDebugger/CtrlDisplayListView.h"
 #include "Windows/GEDebugger/GEDebugger.h"
@@ -7,9 +9,7 @@
 #include "GPU/Debugger/Breakpoints.h"
 #include "GPU/GPUState.h"
 
-#include <algorithm>
-
-const PTCHAR CtrlDisplayListView::windowClass = _T("CtrlDisplayListView");
+LPCTSTR CtrlDisplayListView::windowClass = _T("CtrlDisplayListView");
 
 const int POPUP_SUBMENU_ID_DISPLAYLISTVIEW = 8;
 extern HMENU g_hPopupMenus;

diff --git a/Windows/GEDebugger/CtrlDisplayListView.h b/Windows/GEDebugger/CtrlDisplayListView.h
@@ -1,14 +1,14 @@
 #pragma once
 
+#include <algorithm>
 #include "Common/CommonWindows.h"
 #include "GPU/Common/GPUDebugInterface.h"
-#include <algorithm>
 
 class CtrlDisplayListView
 {
 	HWND wnd;
 	RECT rect;
-	static const PTCHAR windowClass;
+	static LPCTSTR windowClass;
 	DisplayList list;
 
 	HFONT font;
@@ -85,4 +85,4 @@ class CtrlDisplayListView
 
 	void scrollAddressIntoView();
 	bool curAddressIsVisible();
-};
+};