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

37
ntcore/src/main/native/include/networktables/NetworkTableEntry.inl
View File

@@ -16,7 +16,9 @@ inline NetworkTableEntry::NetworkTableEntry() : m_handle{0} {}
inline NetworkTableEntry::NetworkTableEntry(NT_Entry handle)
: m_handle{handle} {}
inline NT_Entry NetworkTableEntry::GetHandle() const { return m_handle; }
inline NT_Entry NetworkTableEntry::GetHandle() const {
return m_handle;
}
inline bool NetworkTableEntry::Exists() const {
return GetEntryType(m_handle) != NT_UNASSIGNED;
@@ -48,32 +50,37 @@ inline std::shared_ptr<Value> NetworkTableEntry::GetValue() const {
inline bool NetworkTableEntry::GetBoolean(bool defaultValue) const {
auto value = GetEntryValue(m_handle);
if (!value || value->type() != NT_BOOLEAN) return defaultValue;
if (!value || value->type() != NT_BOOLEAN)
return defaultValue;
return value->GetBoolean();
}
inline double NetworkTableEntry::GetDouble(double defaultValue) const {
auto value = GetEntryValue(m_handle);
if (!value || value->type() != NT_DOUBLE) return defaultValue;
if (!value || value->type() != NT_DOUBLE)
return defaultValue;
return value->GetDouble();
}
inline std::string NetworkTableEntry::GetString(StringRef defaultValue) const {
auto value = GetEntryValue(m_handle);
if (!value || value->type() != NT_STRING) return defaultValue;
if (!value || value->type() != NT_STRING)
return defaultValue;
return value->GetString();
}
inline std::string NetworkTableEntry::GetRaw(StringRef defaultValue) const {
auto value = GetEntryValue(m_handle);
if (!value || value->type() != NT_RAW) return defaultValue;
if (!value || value->type() != NT_RAW)
return defaultValue;
return value->GetString();
}
inline std::vector<int> NetworkTableEntry::GetBooleanArray(
ArrayRef<int> defaultValue) const {
auto value = GetEntryValue(m_handle);
if (!value || value->type() != NT_BOOLEAN_ARRAY) return defaultValue;
if (!value || value->type() != NT_BOOLEAN_ARRAY)
return defaultValue;
return value->GetBooleanArray();
}
@@ -86,7 +93,8 @@ inline std::vector<int> NetworkTableEntry::GetBooleanArray(
inline std::vector<double> NetworkTableEntry::GetDoubleArray(
ArrayRef<double> defaultValue) const {
auto value = GetEntryValue(m_handle);
if (!value || value->type() != NT_DOUBLE_ARRAY) return defaultValue;
if (!value || value->type() != NT_DOUBLE_ARRAY)
return defaultValue;
return value->GetDoubleArray();
}
@@ -99,7 +107,8 @@ inline std::vector<double> NetworkTableEntry::GetDoubleArray(
inline std::vector<std::string> NetworkTableEntry::GetStringArray(
ArrayRef<std::string> defaultValue) const {
auto value = GetEntryValue(m_handle);
if (!value || value->type() != NT_STRING_ARRAY) return defaultValue;
if (!value || value->type() != NT_STRING_ARRAY)
return defaultValue;
return value->GetStringArray();
}
@@ -280,15 +289,21 @@ inline void NetworkTableEntry::ClearFlags(unsigned int flags) {
SetEntryFlags(m_handle, GetFlags() & ~flags);
}
inline void NetworkTableEntry::SetPersistent() { SetFlags(kPersistent); }
inline void NetworkTableEntry::SetPersistent() {
SetFlags(kPersistent);
}
inline void NetworkTableEntry::ClearPersistent() { ClearFlags(kPersistent); }
inline void NetworkTableEntry::ClearPersistent() {
ClearFlags(kPersistent);
}
inline bool NetworkTableEntry::IsPersistent() const {
return (GetFlags() & kPersistent) != 0;
}
inline void NetworkTableEntry::Delete() { DeleteEntry(m_handle); }
inline void NetworkTableEntry::Delete() {
DeleteEntry(m_handle);
}
inline void NetworkTableEntry::CreateRpc(
std::function<void(const RpcAnswer& answer)> callback) {

31
ntcore/src/main/native/include/networktables/NetworkTableInstance.inl
View File

@@ -24,10 +24,13 @@ inline NetworkTableInstance NetworkTableInstance::Create() {
}
inline void NetworkTableInstance::Destroy(NetworkTableInstance inst) {
if (inst.m_handle != 0) DestroyInstance(inst.m_handle);
if (inst.m_handle != 0)
DestroyInstance(inst.m_handle);
}
inline NT_Inst NetworkTableInstance::GetHandle() const { return m_handle; }
inline NT_Inst NetworkTableInstance::GetHandle() const {
return m_handle;
}
inline NetworkTableEntry NetworkTableInstance::GetEntry(const Twine& name) {
return NetworkTableEntry{::nt::GetEntry(m_handle, name)};
@@ -81,9 +84,13 @@ inline unsigned int NetworkTableInstance::GetNetworkMode() const {
return ::nt::GetNetworkMode(m_handle);
}
inline void NetworkTableInstance::StartLocal() { ::nt::StartLocal(m_handle); }
inline void NetworkTableInstance::StartLocal() {
::nt::StartLocal(m_handle);
}
inline void NetworkTableInstance::StopLocal() { ::nt::StopLocal(m_handle); }
inline void NetworkTableInstance::StopLocal() {
::nt::StopLocal(m_handle);
}
inline void NetworkTableInstance::StartServer(const Twine& persist_filename,
const char* listen_address,
@@ -91,9 +98,13 @@ inline void NetworkTableInstance::StartServer(const Twine& persist_filename,
::nt::StartServer(m_handle, persist_filename, listen_address, port);
}
inline void NetworkTableInstance::StopServer() { ::nt::StopServer(m_handle); }
inline void NetworkTableInstance::StopServer() {
::nt::StopServer(m_handle);
}
inline void NetworkTableInstance::StartClient() { ::nt::StartClient(m_handle); }
inline void NetworkTableInstance::StartClient() {
::nt::StartClient(m_handle);
}
inline void NetworkTableInstance::StartClient(const char* server_name,
unsigned int port) {
@@ -110,7 +121,9 @@ inline void NetworkTableInstance::StartClientTeam(unsigned int team,
::nt::StartClientTeam(m_handle, team, port);
}
inline void NetworkTableInstance::StopClient() { ::nt::StopClient(m_handle); }
inline void NetworkTableInstance::StopClient() {
::nt::StopClient(m_handle);
}
inline void NetworkTableInstance::SetServer(const char* server_name,
unsigned int port) {
@@ -139,7 +152,9 @@ inline void NetworkTableInstance::SetUpdateRate(double interval) {
::nt::SetUpdateRate(m_handle, interval);
}
inline void NetworkTableInstance::Flush() const { ::nt::Flush(m_handle); }
inline void NetworkTableInstance::Flush() const {
::nt::Flush(m_handle);
}
inline std::vector<ConnectionInfo> NetworkTableInstance::GetConnections()
const {

3
ntcore/src/main/native/include/networktables/RpcCall.inl
View File

@@ -18,7 +18,8 @@ inline RpcCall::RpcCall(RpcCall&& other) noexcept : RpcCall() {
inline RpcCall::~RpcCall() {
// automatically cancel result if user didn't request it
if (m_call != 0) CancelResult();
if (m_call != 0)
CancelResult();
}
inline bool RpcCall::GetResult(std::string* result) {