[cleanup][PlatformDefs] remove UINT

7 files changed, 12 insertions, 14 deletions

diff --git a/xbmc/platform/linux/ConvUtils.h b/xbmc/platform/linux/ConvUtils.h
index 8d66850090..2ae78a4448 100644
--- a/xbmc/platform/linux/ConvUtils.h
+++ b/xbmc/platform/linux/ConvUtils.h
@@ -20,7 +20,7 @@
  *
  */
 
-#include "PlatformDefs.h" // UINT DWORD ...
+#include "PlatformDefs.h" // DWORD ...
 
 DWORD GetLastError();
 VOID  SetLastError(DWORD dwErrCode);
diff --git a/xbmc/platform/linux/PlatformDefs.h b/xbmc/platform/linux/PlatformDefs.h
index c38fd8646d..d67c6f120d 100644
--- a/xbmc/platform/linux/PlatformDefs.h
+++ b/xbmc/platform/linux/PlatformDefs.h
@@ -137,7 +137,6 @@ typedef unsigned char   BYTE;
 typedef char        CHAR;
 typedef wchar_t     WCHAR;
 typedef int         INT;
-typedef unsigned int  UINT;
 #define INVALID_HANDLE_VALUE     ((HANDLE)~0U)
 #ifdef UNICODE
 typedef CONST WCHAR*       LPCTSTR;
diff --git a/xbmc/platform/linux/sse4/CopyFrame.cpp b/xbmc/platform/linux/sse4/CopyFrame.cpp
index b8bdda6ae2..dea87fdadc 100644
--- a/xbmc/platform/linux/sse4/CopyFrame.cpp
+++ b/xbmc/platform/linux/sse4/CopyFrame.cpp
@@ -21,7 +21,6 @@
 #include "smmintrin.h"
 
 #define CACHED_BUFFER_SIZE 4096
-typedef unsigned int UINT;
 
 extern "C"
 {
@@ -32,16 +31,16 @@ extern "C"
  * ASSUMES PITCH IS A MULTIPLE OF 64B CACHE LINE SIZE, WIDTH MAY NOT BE
  */
 void copy_frame( void * pSrc, void * pDest, void * pCacheBlock,
-    UINT width, UINT height, UINT pitch )
+    unsigned int width, unsigned int height, unsigned int pitch )
 {
   __m128i         x0, x1, x2, x3;
   __m128i         *pLoad;
   __m128i         *pStore;
   __m128i         *pCache;
-  UINT            x, y, yLoad, yStore;
-  UINT            rowsPerBlock;
-  UINT            width64;
-  UINT            extraPitch;
+  unsigned int x, y, yLoad, yStore;
+  unsigned int rowsPerBlock;
+  unsigned int width64;
+  unsigned int extraPitch;
 
 
   rowsPerBlock = CACHED_BUFFER_SIZE / pitch;
diff --git a/xbmc/platform/linux/sse4/DllLibSSE4.h b/xbmc/platform/linux/sse4/DllLibSSE4.h
index ef145733b9..ec12876a8e 100644
--- a/xbmc/platform/linux/sse4/DllLibSSE4.h
+++ b/xbmc/platform/linux/sse4/DllLibSSE4.h
@@ -29,13 +29,13 @@ class DllLibSSE4Interface
 {
 public:
   virtual ~DllLibSSE4Interface() = default;
-  virtual void copy_frame(void * pSrc, void * pDest, void * pCacheBlock, UINT width, UINT height, UINT pitch) = 0;
+  virtual void copy_frame(void * pSrc, void * pDest, void * pCacheBlock, unsigned int width, unsigned int height, unsigned int pitch) = 0;
 };
 
 class DllLibSSE4 : public DllDynamic, DllLibSSE4Interface
 {
   DECLARE_DLL_WRAPPER(DllLibSSE4, DLL_PATH_LIBSSE4)
-  DEFINE_METHOD6(void, copy_frame, (void *p1, void *p2, void *p3, UINT p4, UINT p5, UINT p6))
+  DEFINE_METHOD6(void, copy_frame, (void *p1, void *p2, void *p3, unsigned int p4, unsigned int p5, unsigned int p6))
 
   BEGIN_METHOD_RESOLVE()
     RESOLVE_METHOD(copy_frame)
diff --git a/xbmc/settings/windows/GUIWindowSettingsScreenCalibration.h b/xbmc/settings/windows/GUIWindowSettingsScreenCalibration.h
index c9a0290f16..52fc63d104 100644
--- a/xbmc/settings/windows/GUIWindowSettingsScreenCalibration.h
+++ b/xbmc/settings/windows/GUIWindowSettingsScreenCalibration.h
@@ -43,7 +43,7 @@ protected:
   void ResetControls();
   void EnableControl(int iControl);
   void UpdateFromControl(int iControl);
-  UINT m_iCurRes;
+  unsigned int m_iCurRes;
   std::vector<RESOLUTION> m_Res;
   int m_iControl;
   float m_fPixelRatioBoxHeight;
diff --git a/xbmc/storage/cdioSupport.cpp b/xbmc/storage/cdioSupport.cpp
index eeca9361a6..765b157a20 100644
--- a/xbmc/storage/cdioSupport.cpp
+++ b/xbmc/storage/cdioSupport.cpp
@@ -468,7 +468,7 @@ int CCdIoSupport::ReadBlock(int superblock, uint32_t offset, uint8_t bufnum, tra
   unsigned int track_sec_count = ::cdio_get_track_sec_count(cdio, track_num);
   memset(buffer[bufnum], 0, CDIO_CD_FRAMESIZE);
 
-  if ( track_sec_count < (UINT)superblock)
+  if ( track_sec_count < static_cast<unsigned int>(superblock))
   {
     ::cdio_debug("reading block %u skipped track %d has only %u sectors\n",
                superblock, track_num, track_sec_count);
@@ -908,7 +908,7 @@ int CCdIoSupport::CddbDecDigitSum(int n)
 }
 
 // Return the number of seconds (discarding frame portion) of an MSF
-UINT CCdIoSupport::MsfSeconds(msf_t *msf)
+unsigned int CCdIoSupport::MsfSeconds(msf_t *msf)
 {
   CSingleLock lock(*m_cdio);
 
diff --git a/xbmc/storage/cdioSupport.h b/xbmc/storage/cdioSupport.h
index cfb1d7fc6c..3bd567db37 100644
--- a/xbmc/storage/cdioSupport.h
+++ b/xbmc/storage/cdioSupport.h
@@ -305,7 +305,7 @@ protected:
 
   uint32_t CddbDiscId();
   int CddbDecDigitSum(int n);
-  UINT MsfSeconds(msf_t *msf);
+  unsigned int MsfSeconds(msf_t *msf);
 
 private:
   char buffer[7][CDIO_CD_FRAMESIZE_RAW];  /* for CD-Data */