From 1f169bfb3f46814948e132566451289c2e418eae Mon Sep 17 00:00:00 2001
From: Sebastien Braun
Date: Thu, 4 Nov 2010 15:26:55 +0100
Subject: Replace stray uint{16,32}_t references by quint{16,32}

---
 src/input/inputEvent.h | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/input/inputEvent.h b/src/input/inputEvent.h
index afb33e5..4e132eb 100644
--- a/src/input/inputEvent.h
+++ b/src/input/inputEvent.h
@@ -99,36 +99,36 @@ public:
 	 * Generates an event for a mouse pointer movement.
 	 * \param x,y X and Y coordinates of the mouse pointer.
 	 */
-	static InputEvent mouseMotion(uint16_t x, uint16_t y)
+	static InputEvent mouseMotion(quint16 x, quint16 y)
 	{
-		return InputEvent(ET_POINTER, 0, ((uint32_t)x << 16) | y);
+		return InputEvent(ET_POINTER, 0, ((quint32)x << 16) | y);
 	}
 
 	/* @} */
 
 	/** \name Event Types */
 	/* @{ */
-	static const uint16_t ET_KEY = 0; /**< The event is related to the keyboard */
-	static const uint16_t ET_BUTTON = 1; /**< The event is related to a mouse button */
-	static const uint16_t ET_POINTER = 2; /**< The event is related to the mouse pointer */
-	static const uint16_t ET_SPECIAL = 3; /**< The event is a special system event */
+	static const quint16 ET_KEY = 0; /**< The event is related to the keyboard */
+	static const quint16 ET_BUTTON = 1; /**< The event is related to a mouse button */
+	static const quint16 ET_POINTER = 2; /**< The event is related to the mouse pointer */
+	static const quint16 ET_SPECIAL = 3; /**< The event is a special system event */
 	/* @} */
 
 	/** \name Event Codes */
 	/* @{ */
-	static const uint16_t EC_PRESS = 0; /**< The event is a press (keyboard or mouse button) */
-	static const uint16_t EC_RELEASE = 1; /**< The event is a release (keyboard or mouse button) */
-	static const uint16_t EC_REBOOT = 2; /**< The event is a request to reboot (special system event) */
-	static const uint16_t EC_SYSRQ = 3; /**< The event is a request to perform a Magic-SysRq function (special system event) */
-	static const uint16_t EC_KILL_X = 4; /**< The event is a request to kill the X Server (special system event) */
-	static const uint16_t EC_SAY_HELLO = 5; /**< The event is a request to write a line to the log file (special system event) */
+	static const quint16 EC_PRESS = 0; /**< The event is a press (keyboard or mouse button) */
+	static const quint16 EC_RELEASE = 1; /**< The event is a release (keyboard or mouse button) */
+	static const quint16 EC_REBOOT = 2; /**< The event is a request to reboot (special system event) */
+	static const quint16 EC_SYSRQ = 3; /**< The event is a request to perform a Magic-SysRq function (special system event) */
+	static const quint16 EC_KILL_X = 4; /**< The event is a request to kill the X Server (special system event) */
+	static const quint16 EC_SAY_HELLO = 5; /**< The event is a request to write a line to the log file (special system event) */
 	/* @} */
 
 	/** \name Mouse Button Flags */
 	/* @{ */
-	static const uint16_t EB_LEFT = 1; /**< The left mouse button */
-	static const uint16_t EB_MIDDLE = 2; /**< The middle mouse button */
-	static const uint16_t EB_RIGHT = 4; /**< The right mouse button */
+	static const quint16 EB_LEFT = 1; /**< The left mouse button */
+	static const quint16 EB_MIDDLE = 2; /**< The middle mouse button */
+	static const quint16 EB_RIGHT = 4; /**< The right mouse button */
 	/* @} */
 
 	static const quint32 MODIFIER_MASK =
@@ -140,7 +140,7 @@ public:
 	/**
 	 * Return the event type, as defined by the \c ET_* constants.
 	 */
-	uint16_t type() const
+	quint16 type() const
 	{
 		return _type;
 	}
@@ -148,7 +148,7 @@ public:
 	/**
 	 * Return the event code, as defined by the \c EC_* constants.
 	 */
-	uint16_t code() const
+	quint16 code() const
 	{
 		return _code;
 	}
@@ -165,7 +165,7 @@ public:
 	 * - If the event type is \c ET_SPECIAL, the interpretation
 	 *   depends on the event code.
 	 */
-	uint32_t value() const
+	quint32 value() const
 	{
 		return _value;
 	}
@@ -222,7 +222,7 @@ public:
 	 * The mouse button that generated this event.
 	 * \return one of the \c EB_* constants.
 	 */
-	uint16_t pressedButton() const
+	quint16 pressedButton() const
 	{
 		assert(_type == ET_BUTTON);
 		return (_value >> 16);
@@ -233,7 +233,7 @@ public:
 	 * event was generated.
 	 * \return a bitwise or of \c EB_* constants.
 	 */
-	uint16_t heldButtons() const
+	quint16 heldButtons() const
 	{
 		assert(_type == ET_BUTTON);
 		return (_value & 0xffff);
@@ -242,7 +242,7 @@ public:
 	/**
 	 * The X coordinate the pointer was moved to.
 	 */
-	uint16_t xCoord() const
+	quint16 xCoord() const
 	{
 		assert(_type == ET_POINTER);
 		return (_value >> 16);
@@ -251,7 +251,7 @@ public:
 	/**
 	 * The Y coordinate the pointer was moved to.
 	 */
-	uint16_t yCoord() const
+	quint16 yCoord() const
 	{
 		assert(_type == ET_POINTER);
 		return (_value & 0xffff);
@@ -284,7 +284,7 @@ public:
 	 * to their internal representation as defined in \ref "Mouse Button Flags".
 	 * \returns A bitwise or of \c EB_* values.
 	 */
-	static uint16_t mouseButtonsFromQt(int b);
+	static quint16 mouseButtonsFromQt(int b);
 
 	/**
 	 * Converts an event type as given by the \c ET_* constants to
-- 
cgit v1.2.3-55-g7522