Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-03 03:01:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

artf4107: clang-modernize was run on WPILib

Browse Source 
Loops were converted to their range-based equivalents, variable types were replaced with auto where the type was already specified on the same line, the override keyword was added, and instances of NULL and assignments of 0 to pointers were replaced with nullptr.

Change-Id: If281e46a2e2e1c37f278d56df9915236d4b2c864
This commit is contained in:
Tyler Veness
2015-06-23 04:49:51 -07:00
parent 7a711a21f9
commit b1befed14f
113 changed files with 604 additions and 618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
wpilibc/wpilibC++Sim/src/Joystick.cpp
View File

@@ -26,10 +26,10 @@ static bool joySticksInitialized = false;
* @param port The port on the driver station that the joystick is plugged into.
*/
Joystick::Joystick(uint32_t port)
: m_ds (NULL)
: m_ds (nullptr)
, m_port (port)
, m_axes (NULL)
, m_buttons (NULL)
, m_axes (nullptr)
, m_buttons (nullptr)
{
InitJoystick(kNumAxisTypes, kNumButtonTypes);
@@ -54,10 +54,10 @@ Joystick::Joystick(uint32_t port)
* @param numButtonTypes The number of button types in the enum.
*/
Joystick::Joystick(uint32_t port, uint32_t numAxisTypes, uint32_t numButtonTypes)
: m_ds (NULL)
: m_ds (nullptr)
, m_port (port)
, m_axes (NULL)
, m_buttons (NULL)
, m_axes (nullptr)
, m_buttons (nullptr)
{
InitJoystick(numAxisTypes, numButtonTypes);
}
@@ -67,7 +67,7 @@ void Joystick::InitJoystick(uint32_t numAxisTypes, uint32_t numButtonTypes)
if ( !joySticksInitialized )
{
for (unsigned i = 0; i < DriverStation::kJoystickPorts; i++)
joysticks[i] = NULL;
joysticks[i] = nullptr;
joySticksInitialized = true;
}
joysticks[m_port] = this;
@@ -80,7 +80,7 @@ void Joystick::InitJoystick(uint32_t numAxisTypes, uint32_t numButtonTypes)
Joystick * Joystick::GetStickForPort(uint32_t port)
{
Joystick *stick = joysticks[port];
if (stick == NULL)
if (stick == nullptr)
{
stick = new Joystick(port);
joysticks[port] = stick;