Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-28 02:11:43 +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

18
wpilibc/wpilibC++/src/Buttons/Trigger.cpp
View File

@@ -13,12 +13,12 @@
#include "Buttons/ToggleButtonScheduler.h"
#include "Buttons/CancelButtonScheduler.h"
Trigger::Trigger() { m_table = NULL; }
Trigger::Trigger() { m_table = nullptr; }
bool Trigger::Grab() {
if (Get())
return true;
else if (m_table != NULL) {
else if (m_table != nullptr) {
// if (m_table->isConnected())//TODO is connected on button?
return m_table->GetBoolean("pressed");
/*else
@@ -28,29 +28,27 @@ bool Trigger::Grab() {
}
void Trigger::WhenActive(Command *command) {
PressedButtonScheduler *pbs =
new PressedButtonScheduler(Grab(), this, command);
auto pbs = new PressedButtonScheduler(Grab(), this, command);
pbs->Start();
}
void Trigger::WhileActive(Command *command) {
HeldButtonScheduler *hbs = new HeldButtonScheduler(Grab(), this, command);
auto hbs = new HeldButtonScheduler(Grab(), this, command);
hbs->Start();
}
void Trigger::WhenInactive(Command *command) {
ReleasedButtonScheduler *rbs =
new ReleasedButtonScheduler(Grab(), this, command);
auto rbs = new ReleasedButtonScheduler(Grab(), this, command);
rbs->Start();
}
void Trigger::CancelWhenActive(Command *command) {
CancelButtonScheduler *cbs = new CancelButtonScheduler(Grab(), this, command);
auto cbs = new CancelButtonScheduler(Grab(), this, command);
cbs->Start();
}
void Trigger::ToggleWhenActive(Command *command) {
ToggleButtonScheduler *tbs = new ToggleButtonScheduler(Grab(), this, command);
auto tbs = new ToggleButtonScheduler(Grab(), this, command);
tbs->Start();
}
@@ -58,7 +56,7 @@ std::string Trigger::GetSmartDashboardType() const { return "Button"; }
void Trigger::InitTable(ITable *table) {
m_table = table;
if (m_table != NULL) {
if (m_table != nullptr) {
m_table->PutBoolean("pressed", Get());
}
}