From bd7996354a399f0b6fd655e1f8a23570615df185 Mon Sep 17 00:00:00 2001
From: Maarten ter Huurne <maarten@treewalker.org>
Date: Wed, 3 Sep 2008 00:27:24 +0000
Subject: [PATCH] Removed "INT" typedef: it was not used in any plugin spec. It
was used DX9 video plugin, but for arguments where MSDN lists a plain "int",
so I replaced "INT" by "int" to make things clearer.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@435 8ced0084-cf51-0410-be5f-012b33b47a6e
---
Source/PluginSpecs/PluginSpecs.h | 1 -
Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp | 2 +-
.../Plugins/Plugin_VideoDX9/Src/W32Util/PropertySheet.cpp | 2 +-
.../Plugins/Plugin_VideoDX9/Src/W32Util/PropertySheet.h | 8 ++++----
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/Source/PluginSpecs/PluginSpecs.h b/Source/PluginSpecs/PluginSpecs.h
index 527579cb11..4876226493 100644
--- a/Source/PluginSpecs/PluginSpecs.h
+++ b/Source/PluginSpecs/PluginSpecs.h
@@ -39,7 +39,6 @@
#define BOOL unsigned int
#define HWND void*
#define HINSTANCE void*
-#define INT int
#define CHAR char
#endif
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp b/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp
index ea3f36afb1..e192f59d1d 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp
@@ -63,7 +63,7 @@ namespace D3D
// We definitely don't want to get it cleartype'd, anyway.
int m_dwFontHeight = 36;
- INT nHeight = -MulDiv( m_dwFontHeight, (INT)(GetDeviceCaps(hDC, LOGPIXELSY) * m_fTextScale), 72 );
+ int nHeight = -MulDiv( m_dwFontHeight, int(GetDeviceCaps(hDC, LOGPIXELSY) * m_fTextScale), 72 );
int dwBold = FW_NORMAL; ///FW_BOLD
HFONT hFont = CreateFont( nHeight, 0, 0, 0, dwBold, 0,
FALSE, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS,
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/W32Util/PropertySheet.cpp b/Source/Plugins/Plugin_VideoDX9/Src/W32Util/PropertySheet.cpp
index e938850539..8d176941e6 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/W32Util/PropertySheet.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/W32Util/PropertySheet.cpp
@@ -139,7 +139,7 @@ namespace W32Util
//StringCchCopy(TitleLogFont.lfFaceName, 32, TEXT("Verdana Bold"));
HDC hdc = GetDC(NULL); //gets the screen DC
- INT FontSize = 12;
+ int FontSize = 12;
TitleLogFont.lfHeight = 0 - GetDeviceCaps(hdc, LOGPIXELSY) * FontSize / 72;
hTitleFont = CreateFontIndirect(&TitleLogFont);
ReleaseDC(NULL, hdc);
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/W32Util/PropertySheet.h b/Source/Plugins/Plugin_VideoDX9/Src/W32Util/PropertySheet.h
index 5fcb171745..0a1783b3b6 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/W32Util/PropertySheet.h
+++ b/Source/Plugins/Plugin_VideoDX9/Src/W32Util/PropertySheet.h
@@ -22,9 +22,9 @@ namespace W32Util
class WizExteriorPage : public Tab
{
- INT captionID;
+ int captionID;
public:
- WizExteriorPage(INT caption) {captionID = caption;}
+ WizExteriorPage(int caption) {captionID = caption;}
void Init(HWND hDlg);
};
@@ -32,7 +32,7 @@ namespace W32Util
class WizFirstPage : public WizExteriorPage
{
public:
- WizFirstPage(INT caption) : WizExteriorPage(caption) {}
+ WizFirstPage(int caption) : WizExteriorPage(caption) {}
bool HasPrev() {return false;}
};
@@ -40,7 +40,7 @@ namespace W32Util
class WizLastPage : public WizExteriorPage
{
public:
- WizLastPage(INT caption) : WizExteriorPage(caption) {}
+ WizLastPage(int caption) : WizExteriorPage(caption) {}
bool HasNext() {return false;}
bool HasFinish() {return true;}
};