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

6
wpilibc/wpilibC++/src/SmartDashboard/SendableChooser.cpp
View File

@@ -44,13 +44,13 @@ void SendableChooser::AddDefault(const char *name, void *object) {
/**
* Returns the selected option. If there is none selected, it will return the
* default. If there is none selected
* and no default, then it will return {@code NULL}.
* and no default, then it will return {@code nullptr}.
* @return the option selected
*/
void *SendableChooser::GetSelected() {
std::string selected = m_table->GetString(kSelected, m_defaultChoice);
if (selected == "")
return NULL;
return nullptr;
else
return m_choices[selected];
}
@@ -58,7 +58,7 @@ void *SendableChooser::GetSelected() {
void SendableChooser::InitTable(ITable *subtable) {
StringArray keys;
m_table = subtable;
if (m_table != NULL) {
if (m_table != nullptr) {
std::map<std::string, void *>::iterator iter;
for (iter = m_choices.begin(); iter != m_choices.end(); iter++) {
keys.add(iter->first);