Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add braces to C++ single-line loops and conditionals (NFC) (#2973)

Browse Source 
This makes code easier to read and more consistent between C++ and Java.
Also update clang-format settings to always add a line break (even if no braces are used).
This commit is contained in:
Peter Johnson
2020-12-28 12:58:06 -08:00
committed by GitHub
parent 0291a3ff56
commit 2aed432b4b
634 changed files with 10716 additions and 3938 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
glass/src/lib/native/cpp/other/DeviceTree.cpp
View File

@@ -16,27 +16,37 @@ using namespace glass;
void DeviceTreeModel::Update() {
for (auto&& display : m_displays) {
if (display.first) display.first->Update();
if (display.first) {
display.first->Update();
}
}
}
bool DeviceTreeModel::Exists() {
for (auto&& display : m_displays) {
if (display.first && display.first->Exists()) return true;
if (display.first && display.first->Exists()) {
return true;
}
}
return false;
}
void DeviceTreeModel::Display() {
for (auto&& display : m_displays) {
if (display.second) display.second(display.first);
if (display.second) {
display.second(display.first);
}
}
}
void glass::HideDevice(const char* id) { gContext->deviceHidden[id] = true; }
void glass::HideDevice(const char* id) {
gContext->deviceHidden[id] = true;
}
bool glass::BeginDevice(const char* id, ImGuiTreeNodeFlags flags) {
if (gContext->deviceHidden[id]) return false;
if (gContext->deviceHidden[id]) {
return false;
}
PushID(id);
@@ -49,11 +59,15 @@ bool glass::BeginDevice(const char* id, ImGuiTreeNodeFlags flags) {
bool open = CollapsingHeader(label, flags);
PopupEditName("name", name);
if (!open) PopID();
if (!open) {
PopID();
}
return open;
}
void glass::EndDevice() { PopID(); }
void glass::EndDevice() {
PopID();
}
static bool DeviceBooleanImpl(const char* name, bool readonly, bool* value) {
if (readonly) {
@@ -82,10 +96,11 @@ static bool DeviceDoubleImpl(const char* name, bool readonly, double* value) {
static bool DeviceEnumImpl(const char* name, bool readonly, int* value,
const char** options, int32_t numOptions) {
if (readonly) {
if (*value < 0 || *value >= numOptions)
if (*value < 0 || *value >= numOptions) {
ImGui::LabelText(name, "%d (unknown)", *value);
else
} else {
ImGui::LabelText(name, "%s", options[*value]);
}
return false;
} else {
return ImGui::Combo(name, value, options, numOptions);