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

11
glass/src/app/native/cpp/NetworkTablesSettings.cpp
View File

@@ -26,7 +26,9 @@ NetworkTablesSettings::NetworkTablesSettings(NT_Inst inst,
}
void NetworkTablesSettings::Update() {
if (!m_restart) return;
if (!m_restart) {
return;
}
m_restart = false;
nt::StopClient(m_inst);
nt::StopServer(m_inst);
@@ -40,8 +42,9 @@ void NetworkTablesSettings::Update() {
wpi::SmallVector<wpi::StringRef, 4> serverNames;
wpi::SmallVector<std::pair<wpi::StringRef, unsigned int>, 4> servers;
serverTeam.split(serverNames, ',', -1, false);
for (auto&& serverName : serverNames)
for (auto&& serverName : serverNames) {
servers.emplace_back(serverName, NT_DEFAULT_PORT);
}
nt::StartClient(m_inst, servers);
}
} else if (*m_pMode == 2) {
@@ -64,5 +67,7 @@ void NetworkTablesSettings::Display() {
default:
break;
}
if (ImGui::Button("Apply")) m_restart = true;
if (ImGui::Button("Apply")) {
m_restart = true;
}
}

14
glass/src/app/native/cpp/main.cpp
View File

@@ -45,7 +45,9 @@ static void NtInitialize() {
nt::AddPolledConnectionListener(poller, true);
gui::AddEarlyExecute([poller] {
auto win = gui::GetSystemWindow();
if (!win) return;
if (!win) {
return;
}
bool timedOut;
for (auto&& event : nt::PollConnectionListener(poller, 0, &timedOut)) {
if (event.connected) {
@@ -118,14 +120,18 @@ int main() {
ImGui::BeginMainMenuBar();
gui::EmitViewMenu();
if (ImGui::BeginMenu("View")) {
if (ImGui::MenuItem("Reset Time")) glass::ResetTime();
if (ImGui::MenuItem("Reset Time")) {
glass::ResetTime();
}
ImGui::EndMenu();
}
if (ImGui::BeginMenu("NetworkTables")) {
if (gNetworkTablesSettingsWindow)
if (gNetworkTablesSettingsWindow) {
gNetworkTablesSettingsWindow->DisplayMenuItem("NetworkTables Settings");
if (gNetworkTablesWindow)
}
if (gNetworkTablesWindow) {
gNetworkTablesWindow->DisplayMenuItem("NetworkTables View");
}
ImGui::Separator();
gNtProvider->DisplayMenu();
ImGui::EndMenu();