Merge branch 'master' into refactor-vertex-group-namesrefactor-vertex-group-names

1 files changed, 6 insertions, 8 deletions

diff --git a/intern/ghost/intern/GHOST_DisplayManagerX11.h b/intern/ghost/intern/GHOST_DisplayManagerX11.h
index e0fc1cc1210..52702a397d7 100644
--- a/intern/ghost/intern/GHOST_DisplayManagerX11.h
+++ b/intern/ghost/intern/GHOST_DisplayManagerX11.h
@@ -43,7 +43,7 @@ class GHOST_DisplayManagerX11 : public GHOST_DisplayManager {
    * \param numDisplays: The number of displays on this system.
    * \return Indication of success.
    */
-  GHOST_TSuccess getNumDisplays(GHOST_TUns8 &numDisplays) const;
+  GHOST_TSuccess getNumDisplays(uint8_t &numDisplays) const;
 
   /**
    * Returns the number of display settings for this display device.
@@ -51,7 +51,7 @@ class GHOST_DisplayManagerX11 : public GHOST_DisplayManager {
    * \param numSetting: The number of settings of the display device with this index.
    * \return Indication of success.
    */
-  GHOST_TSuccess getNumDisplaySettings(GHOST_TUns8 display, GHOST_TInt32 &numSettings) const;
+  GHOST_TSuccess getNumDisplaySettings(uint8_t display, int32_t &numSettings) const;
 
   /**
    * Returns the current setting for this display device.
@@ -60,8 +60,8 @@ class GHOST_DisplayManagerX11 : public GHOST_DisplayManager {
    * \param setting: The setting of the display device with this index.
    * \return Indication of success.
    */
-  GHOST_TSuccess getDisplaySetting(GHOST_TUns8 display,
-                                   GHOST_TInt32 index,
+  GHOST_TSuccess getDisplaySetting(uint8_t display,
+                                   int32_t index,
                                    GHOST_DisplaySetting &setting) const;
 
   /**
@@ -70,8 +70,7 @@ class GHOST_DisplayManagerX11 : public GHOST_DisplayManager {
    * \param setting: The current setting of the display device with this index.
    * \return Indication of success.
    */
-  GHOST_TSuccess getCurrentDisplaySetting(GHOST_TUns8 display,
-                                          GHOST_DisplaySetting &setting) const;
+  GHOST_TSuccess getCurrentDisplaySetting(uint8_t display, GHOST_DisplaySetting &setting) const;
 
   /**
    * Changes the current setting for this display device.
@@ -79,8 +78,7 @@ class GHOST_DisplayManagerX11 : public GHOST_DisplayManager {
    * \param setting: The current setting of the display device with this index.
    * \return Indication of success.
    */
-  GHOST_TSuccess setCurrentDisplaySetting(GHOST_TUns8 display,
-                                          const GHOST_DisplaySetting &setting);
+  GHOST_TSuccess setCurrentDisplaySetting(uint8_t display, const GHOST_DisplaySetting &setting);
 
  private:
   GHOST_SystemX11 *m_system;