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

14
wpigui/src/main/native/include/wpigui.h
View File

@@ -271,7 +271,9 @@ class Texture {
Texture& operator=(const Texture&) = delete;
Texture& operator=(Texture&& oth) {
if (m_texture) DeleteTexture(m_texture);
if (m_texture) {
DeleteTexture(m_texture);
}
m_texture = oth.m_texture;
oth.m_texture = 0;
m_format = oth.m_format;
@@ -281,7 +283,9 @@ class Texture {
}
~Texture() {
if (m_texture) DeleteTexture(m_texture);
if (m_texture) {
DeleteTexture(m_texture);
}
}
/**
@@ -351,8 +355,9 @@ class Texture {
static Texture CreateFromFile(const char* filename) {
Texture texture;
if (!CreateTextureFromFile(filename, &texture.m_texture, &texture.m_width,
&texture.m_height))
&texture.m_height)) {
return {};
}
return texture;
}
@@ -367,8 +372,9 @@ class Texture {
static Texture CreateFromImage(const unsigned char* data, int len) {
Texture texture;
if (!CreateTextureFromImage(data, len, &texture.m_texture, &texture.m_width,
&texture.m_height))
&texture.m_height)) {
return {};
}
return texture;
}