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

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

View File

@@ -30,7 +30,8 @@ static void encoder_reset_callback(const char* name, void* param,
static void encoder_reverse_callback(const char* name, void* param,
const struct HAL_Value* value) {
GazeboEncoder* encoder = static_cast<GazeboEncoder*>(param);
if (encoder->IsInitialized()) encoder->SetReverse(value->data.v_boolean);
if (encoder->IsInitialized())
encoder->SetReverse(value->data.v_boolean);
}
GazeboEncoder::GazeboEncoder(int index, HALSimGazebo* halsim) {
@@ -56,7 +57,8 @@ void GazeboEncoder::Control(const char* command) {
}
gazebo::msgs::String msg;
msg.set_data(command);
if (m_pub) m_pub->Publish(msg);
if (m_pub)
m_pub->Publish(msg);
}
void GazeboEncoder::Listen() {

View File

@@ -21,7 +21,8 @@ static void init_callback(const char* name, void* param,
static void output_callback(const char* name, void* param,
const struct HAL_Value* value) {
GazeboPCM* pcm = static_cast<GazeboPCM*>(param);
if (pcm->IsInitialized()) pcm->Publish(value->data.v_boolean);
if (pcm->IsInitialized())
pcm->Publish(value->data.v_boolean);
}
GazeboPCM::GazeboPCM(int index, int channel, HALSimGazebo* halsim) {
@@ -44,7 +45,8 @@ void GazeboPCM::Publish(bool value) {
}
gazebo::msgs::Bool msg;
msg.set_data(value);
if (m_pub) m_pub->Publish(msg);
if (m_pub)
m_pub->Publish(msg);
}
void GazeboPCM_SetPressureSwitch(int index, bool value) {

View File

@@ -21,7 +21,8 @@ static void init_callback(const char* name, void* param,
static void speed_callback(const char* name, void* param,
const struct HAL_Value* value) {
GazeboPWM* pwm = static_cast<GazeboPWM*>(param);
if (pwm->IsInitialized()) pwm->Publish(value->data.v_double);
if (pwm->IsInitialized())
pwm->Publish(value->data.v_double);
}
GazeboPWM::GazeboPWM(int port, HALSimGazebo* halsim) {
@@ -39,5 +40,6 @@ void GazeboPWM::Publish(double value) {
}
gazebo::msgs::Float64 msg;
msg.set_data(value);
if (m_pub) m_pub->Publish(msg);
if (m_pub)
m_pub->Publish(msg);
}