changed: SDL inttypes -> stdinttypes

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@23128 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

6 files changed, 30 insertions, 32 deletions

diff --git a/guilib/GUITextureSDL.cpp b/guilib/GUITextureSDL.cpp
index cacd66d865..3dd9afb74b 100644
--- a/guilib/GUITextureSDL.cpp
+++ b/guilib/GUITextureSDL.cpp
@@ -68,7 +68,7 @@ void CGUITextureSDL::Draw(float *x, float *y, float *z, const CRect &texture, co
   }
   if (cached.surface)
   {
-    SDL_Rect dst = { (Sint16)b[0], (Sint16)b[1], 0, 0 };
+    SDL_Rect dst = { (int16_t)b[0], (int16_t)b[1], 0, 0 };
     g_graphicsContext.BlitToScreen(cached.surface, NULL, &dst);
   }
 }
diff --git a/guilib/common/LIRC.cpp b/guilib/common/LIRC.cpp
index 9b7bf2dcd2..e433cd71dd 100644
--- a/guilib/common/LIRC.cpp
+++ b/guilib/common/LIRC.cpp
@@ -194,7 +194,7 @@ void CRemoteControl::Update()
   if (!CheckDevice())
     return;
 
-  Uint32 now = SDL_GetTicks();
+  uint32_t now = SDL_GetTicks();
 
   // Read a line from the socket
   while (fgets(m_buf, sizeof(m_buf), m_file) != NULL)
@@ -231,7 +231,7 @@ void CRemoteControl::Update()
       m_skipHold = true;
       return;
     }
-    else if (now - m_firstClickTime >= (Uint32) g_advancedSettings.m_remoteRepeat && !m_skipHold)
+    else if (now - m_firstClickTime >= (uint32_t) g_advancedSettings.m_remoteRepeat && !m_skipHold)
     {
       m_isHolding = true;
     }
diff --git a/guilib/common/LIRC.h b/guilib/common/LIRC.h
index fc6882ab6d..3cb43f1fee 100644
--- a/guilib/common/LIRC.h
+++ b/guilib/common/LIRC.h
@@ -21,22 +21,22 @@ public:
   bool IsInitialized() const { return m_bInitialized; }
 
 private:
-  int   m_fd;
-  int   m_inotify_fd;
-  int   m_inotify_wd;
-  int   m_lastInitAttempt;
-  int   m_initRetryPeriod;
-  FILE* m_file;
-  bool  m_isHolding;
-  WORD  m_button;
-  char  m_buf[128];
-  bool  m_bInitialized;
-  bool  m_skipHold;
-  bool  m_used;
-  bool  m_bLogConnectFailure;
-  Uint32 m_firstClickTime;
-  CStdString m_deviceName;
-  bool CheckDevice();
+  int     m_fd;
+  int     m_inotify_fd;
+  int     m_inotify_wd;
+  int     m_lastInitAttempt;
+  int     m_initRetryPeriod;
+  FILE*   m_file;
+  bool    m_isHolding;
+  int32_t m_button;
+  char    m_buf[128];
+  bool    m_bInitialized;
+  bool    m_skipHold;
+  bool    m_used;
+  bool    m_bLogConnectFailure;
+  uint32_t    m_firstClickTime;
+  CStdString  m_deviceName;
+  bool        CheckDevice();
 };
 
 extern CRemoteControl g_RemoteControl;
diff --git a/guilib/common/SDLJoystick.cpp b/guilib/common/SDLJoystick.cpp
index 9ec94f5040..7c5704ca25 100644
--- a/guilib/common/SDLJoystick.cpp
+++ b/guilib/common/SDLJoystick.cpp
@@ -131,7 +131,7 @@ void CJoystick::Update()
     int numax = SDL_JoystickNumAxes(joy);
     numax = (numax>MAX_AXES)?MAX_AXES:numax;
     int axisval;
-    Uint8 hatval;
+    uint8_t hatval;
 
     // get button states first, they take priority over axis
     for (int b = 0 ; b<numb ; b++)
@@ -300,9 +300,9 @@ bool CJoystick::GetHat(int &id, int &position,bool consider_repeat)
   if (!consider_repeat)
     return true;
 
-  static Uint32 lastPressTicks = 0;
-  static Uint32 lastTicks = 0;
-  static Uint32 nowTicks = 0;
+  static uint32_t lastPressTicks = 0;
+  static uint32_t lastTicks = 0;
+  static uint32_t nowTicks = 0;
 
   if ((m_HatId>=0) && m_pressTicksHat)
   {
@@ -334,9 +334,9 @@ bool CJoystick::GetButton(int &id, bool consider_repeat)
     return true;
   }
 
-  static Uint32 lastPressTicks = 0;
-  static Uint32 lastTicks = 0;
-  static Uint32 nowTicks = 0;
+  static uint32_t lastPressTicks = 0;
+  static uint32_t lastTicks = 0;
+  static uint32_t nowTicks = 0;
 
   if ((m_ButtonId>=0) && m_pressTicksButton)
   {
diff --git a/guilib/common/SDLJoystick.h b/guilib/common/SDLJoystick.h
index 202593422e..7f4f23500a 100644
--- a/guilib/common/SDLJoystick.h
+++ b/guilib/common/SDLJoystick.h
@@ -59,14 +59,14 @@ private:
   int m_DefaultAmount[MAX_AXES];
   int m_AxisId;
   int m_ButtonId;
-  Uint8 m_HatState;
+  uint8_t m_HatState;
  	int m_HatId; 
   int m_JoyId;
   int m_NumAxes;
   int m_SafeRange; // dead zone
-  Uint32 m_pressTicksButton;
-  Uint32 m_pressTicksHat;
-  Uint8 m_ActiveFlags;
+  uint32_t m_pressTicksButton;
+  uint32_t m_pressTicksHat;
+  uint8_t m_ActiveFlags;
   std::vector<SDL_Joystick*> m_Joysticks;
   std::vector<std::string> m_JoystickNames;
 };
diff --git a/guilib/gui3d.h b/guilib/gui3d.h
index b12a85e573..65c1c46c3c 100644
--- a/guilib/gui3d.h
+++ b/guilib/gui3d.h
@@ -95,8 +95,6 @@ namespace XBMC
 
 #define DELETE_TEXTURE(texture) texture->Release()
 
-typedef uint32_t	Uint32;
-
 #endif // HAS_DX
 
 #ifdef HAS_GLES