Skip to content

Commit

Permalink
Remove empty lines around braces with the formatting script
Browse files Browse the repository at this point in the history
  • Loading branch information
aaronfranke committed Nov 17, 2020
1 parent 66e3060 commit 02161aa
Show file tree
Hide file tree
Showing 221 changed files with 0 additions and 399 deletions.
3 changes: 0 additions & 3 deletions core/core_bind.h
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ class _ResourceSaver : public Object {

public:
enum SaverFlags {

FLAG_RELATIVE_PATHS = 1,
FLAG_BUNDLE_RESOURCES = 2,
FLAG_CHANGE_PATH = 4,
Expand Down Expand Up @@ -361,7 +360,6 @@ class _File : public Reference {

public:
enum ModeFlags {

READ = 1,
WRITE = 2,
READ_WRITE = 3,
Expand Down Expand Up @@ -561,7 +559,6 @@ class _Thread : public Reference {

public:
enum Priority {

PRIORITY_LOW,
PRIORITY_NORMAL,
PRIORITY_HIGH,
Expand Down
2 changes: 0 additions & 2 deletions core/input/input_event.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ enum ButtonList {
};

enum JoyButtonList {

JOY_INVALID_BUTTON = -1,

// SDL Buttons
Expand Down Expand Up @@ -112,7 +111,6 @@ enum JoyButtonList {
};

enum JoyAxisList {

JOY_INVALID_AXIS = -1,

// SDL Axes
Expand Down
1 change: 0 additions & 1 deletion core/io/file_access_zip.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ static voidpf godot_alloc(voidpf opaque, uInt items, uInt size) {
static void godot_free(voidpf opaque, voidpf address) {
memfree(address);
}

} // extern "C"

void ZipArchive::close_handle(unzFile p_file) const {
Expand Down
4 changes: 0 additions & 4 deletions core/io/http_client.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ class HTTPClient : public Reference {

public:
enum ResponseCode {

// 1xx informational
RESPONSE_CONTINUE = 100,
RESPONSE_SWITCHING_PROTOCOLS = 101,
Expand Down Expand Up @@ -116,7 +115,6 @@ class HTTPClient : public Reference {
};

enum Method {

METHOD_GET,
METHOD_HEAD,
METHOD_POST,
Expand All @@ -131,7 +129,6 @@ class HTTPClient : public Reference {
};

enum Status {

STATUS_DISCONNECTED,
STATUS_RESOLVING, // Resolving hostname (if passed a hostname)
STATUS_CANT_RESOLVE,
Expand All @@ -150,7 +147,6 @@ class HTTPClient : public Reference {
static const int HOST_MIN_LEN = 4;

enum Port {

PORT_HTTP = 80,
PORT_HTTPS = 443,

Expand Down
1 change: 0 additions & 1 deletion core/io/image.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ const char *Image::format_names[Image::FORMAT_MAX] = {
"ETC2_RGB8A1",
"ETC2_RA_AS_RG",
"FORMAT_DXT5_RA_AS_RG",

};

SavePNGFunc Image::save_png_func = nullptr;
Expand Down
2 changes: 0 additions & 2 deletions core/io/image.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ class Image : public Resource {
};

enum Format {

FORMAT_L8, //luminance
FORMAT_LA8, //luminance-alpha
FORMAT_R8,
Expand Down Expand Up @@ -111,7 +110,6 @@ class Image : public Resource {

static const char *format_names[FORMAT_MAX];
enum Interpolation {

INTERPOLATE_NEAREST,
INTERPOLATE_BILINEAR,
INTERPOLATE_CUBIC,
Expand Down
2 changes: 0 additions & 2 deletions core/io/ip.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,13 @@ class IP : public Object {

public:
enum ResolverStatus {

RESOLVER_STATUS_NONE,
RESOLVER_STATUS_WAITING,
RESOLVER_STATUS_DONE,
RESOLVER_STATUS_ERROR,
};

enum Type {

TYPE_NONE = 0,
TYPE_IPV4 = 1,
TYPE_IPV6 = 2,
Expand Down
1 change: 0 additions & 1 deletion core/io/ip_address.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
#include "ip_address.h"
/*
IP_Address::operator Variant() const {
return operator String();
}*/

Expand Down
1 change: 0 additions & 1 deletion core/io/json.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ class JSON {
};

enum Expecting {

EXPECT_OBJECT,
EXPECT_OBJECT_KEY,
EXPECT_COLON,
Expand Down
1 change: 0 additions & 1 deletion core/io/multiplayer_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ class MultiplayerAPI : public Reference {
};

enum RPCMode {

RPC_MODE_DISABLED, // No rpc for this method, calls to this will be blocked (default)
RPC_MODE_REMOTE, // Using rpc() on it will call method / set property in all remote peers
RPC_MODE_MASTER, // Using rpc() on it will call method on wherever the master is, be it local or remote
Expand Down
2 changes: 0 additions & 2 deletions core/io/resource_format_binary.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
#define print_bl(m_what) (void)(m_what)

enum {

//numbering must be different from variant, in case new variant types are added (variant must be always contiguous for jumptable optimization)
VARIANT_NIL = 1,
VARIANT_BOOL = 2,
Expand Down Expand Up @@ -90,7 +89,6 @@ enum {
FORMAT_VERSION = 3,
FORMAT_VERSION_CAN_RENAME_DEPS = 1,
FORMAT_VERSION_NO_NODEPATH_PROPERTY = 3,

};

void ResourceLoaderBinary::_advance_padding(uint32_t p_len) {
Expand Down
1 change: 0 additions & 1 deletion core/io/resource_saver.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ class ResourceSaver {

public:
enum SaverFlags {

FLAG_RELATIVE_PATHS = 1,
FLAG_BUNDLE_RESOURCES = 2,
FLAG_CHANGE_PATH = 4,
Expand Down
1 change: 0 additions & 1 deletion core/io/stream_peer_tcp.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ class StreamPeerTCP : public StreamPeer {

public:
enum Status {

STATUS_NONE,
STATUS_CONNECTING,
STATUS_CONNECTED,
Expand Down
2 changes: 0 additions & 2 deletions core/math/geometry_3d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,6 @@ Vector<Vector<Face3>> Geometry3D::separate_objects(Vector<Face3> p_array) {
/*** GEOMETRY WRAPPER ***/

enum _CellFlags {

_CELL_SOLID = 1,
_CELL_EXTERIOR = 2,
_CELL_STEP_MASK = 0x1C,
Expand All @@ -262,7 +261,6 @@ enum _CellFlags {
_CELL_PREV_Z_POS = 5 << 5,
_CELL_PREV_Z_NEG = 6 << 5,
_CELL_PREV_FIRST = 7 << 5,

};

static inline void _plot_face(uint8_t ***p_cell_status, int x, int y, int z, int len_x, int len_y, int len_z, const Vector3 &voxelsize, const Face3 &p_face) {
Expand Down
5 changes: 0 additions & 5 deletions core/math/math_defs.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,35 +66,30 @@ enum ClockDirection {
};

enum Orientation {

HORIZONTAL,
VERTICAL
};

enum HAlign {

HALIGN_LEFT,
HALIGN_CENTER,
HALIGN_RIGHT
};

enum VAlign {

VALIGN_TOP,
VALIGN_CENTER,
VALIGN_BOTTOM
};

enum Margin {

MARGIN_LEFT,
MARGIN_TOP,
MARGIN_RIGHT,
MARGIN_BOTTOM
};

enum Corner {

CORNER_TOP_LEFT,
CORNER_TOP_RIGHT,
CORNER_BOTTOM_RIGHT,
Expand Down
10 changes: 0 additions & 10 deletions core/math/math_fieldwise.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,7 @@ Variant fieldwise_assign(const Variant &p_target, const Variant &p_source, const
/* clang-format off */

switch (p_source.get_type()) {

case Variant::VECTOR2: {

SETUP_TYPE(Vector2)

/**/ TRY_TRANSFER_FIELD("x", x)
Expand All @@ -59,7 +57,6 @@ Variant fieldwise_assign(const Variant &p_target, const Variant &p_source, const
}

case Variant::RECT2: {

SETUP_TYPE(Rect2)

/**/ TRY_TRANSFER_FIELD("x", position.x)
Expand All @@ -71,7 +68,6 @@ Variant fieldwise_assign(const Variant &p_target, const Variant &p_source, const
}

case Variant::VECTOR3: {

SETUP_TYPE(Vector3)

/**/ TRY_TRANSFER_FIELD("x", x)
Expand All @@ -82,7 +78,6 @@ Variant fieldwise_assign(const Variant &p_target, const Variant &p_source, const
}

case Variant::PLANE: {

SETUP_TYPE(Plane)

/**/ TRY_TRANSFER_FIELD("x", normal.x)
Expand All @@ -94,7 +89,6 @@ Variant fieldwise_assign(const Variant &p_target, const Variant &p_source, const
}

case Variant::QUAT: {

SETUP_TYPE(Quat)

/**/ TRY_TRANSFER_FIELD("x", x)
Expand All @@ -106,7 +100,6 @@ Variant fieldwise_assign(const Variant &p_target, const Variant &p_source, const
}

case Variant::AABB: {

SETUP_TYPE(AABB)

/**/ TRY_TRANSFER_FIELD("px", position.x)
Expand All @@ -120,7 +113,6 @@ Variant fieldwise_assign(const Variant &p_target, const Variant &p_source, const
}

case Variant::TRANSFORM2D: {

SETUP_TYPE(Transform2D)

/**/ TRY_TRANSFER_FIELD("xx", elements[0][0])
Expand All @@ -134,7 +126,6 @@ Variant fieldwise_assign(const Variant &p_target, const Variant &p_source, const
}

case Variant::BASIS: {

SETUP_TYPE(Basis)

/**/ TRY_TRANSFER_FIELD("xx", elements[0][0])
Expand All @@ -151,7 +142,6 @@ Variant fieldwise_assign(const Variant &p_target, const Variant &p_source, const
}

case Variant::TRANSFORM: {

SETUP_TYPE(Transform)

/**/ TRY_TRANSFER_FIELD("xx", basis.elements[0][0])
Expand Down
1 change: 0 additions & 1 deletion core/math/octree.h
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,6 @@ void Octree<T, use_pairs, AL>::_insert_element(Element *p_element, Octant *p_oct

if (p_octant->aabb.size.x / OCTREE_DIVISOR < element_size) {
//if (p_octant->aabb.size.x*0.5 < element_size) {

/* at smallest possible size for the element */
typename Element::OctantOwner owner;
owner.octant = p_octant;
Expand Down
3 changes: 0 additions & 3 deletions core/object/callable_method_pointer.h
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ Callable create_custom_callable_function_pointer(T *p_instance,
const char *p_func_text,
#endif
void (T::*p_method)(P...)) {

typedef CallableCustomMethodPointer<T, P...> CCMP; // Messes with memnew otherwise.
CCMP *ccmp = memnew(CCMP(p_instance, p_method));
#ifdef DEBUG_METHODS_ENABLED
Expand Down Expand Up @@ -170,7 +169,6 @@ Callable create_custom_callable_function_pointer(T *p_instance,
const char *p_func_text,
#endif
R (T::*p_method)(P...)) {

typedef CallableCustomMethodPointerRet<T, R, P...> CCMP; // Messes with memnew otherwise.
CCMP *ccmp = memnew(CCMP(p_instance, p_method));
#ifdef DEBUG_METHODS_ENABLED
Expand Down Expand Up @@ -226,7 +224,6 @@ Callable create_custom_callable_function_pointer(T *p_instance,
const char *p_func_text,
#endif
R (T::*p_method)(P...) const) {

typedef CallableCustomMethodPointerRetC<T, R, P...> CCMP; // Messes with memnew otherwise.
CCMP *ccmp = memnew(CCMP(p_instance, p_method));
#ifdef DEBUG_METHODS_ENABLED
Expand Down
1 change: 0 additions & 1 deletion core/object/method_bind.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
#include "core/variant/binder_common.h"

enum MethodFlags {

METHOD_FLAG_NORMAL = 1,
METHOD_FLAG_EDITOR = 2,
METHOD_FLAG_NOSCRIPT = 4,
Expand Down
2 changes: 0 additions & 2 deletions core/object/object.h
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ enum PropertyHint {
};

enum PropertyUsageFlags {

PROPERTY_USAGE_STORAGE = 1,
PROPERTY_USAGE_EDITOR = 2,
PROPERTY_USAGE_NETWORK = 4,
Expand Down Expand Up @@ -406,7 +405,6 @@ class ScriptInstance;
class Object {
public:
enum ConnectFlags {

CONNECT_DEFERRED = 1,
CONNECT_PERSIST = 2, // hint for scene to save this connection
CONNECT_ONESHOT = 4,
Expand Down
1 change: 0 additions & 1 deletion core/object/script_language.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ struct SortNetData {

class ScriptServer {
enum {

MAX_LANGUAGES = 16
};

Expand Down
1 change: 0 additions & 1 deletion core/os/file_access.h
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ class FileAccess {
virtual void _set_access_type(AccessType p_access);

enum ModeFlags {

READ = 1,
WRITE = 2,
READ_WRITE = 3,
Expand Down
1 change: 0 additions & 1 deletion core/os/keyboard.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ struct _KeyCodeText {
};

static const _KeyCodeText _keycodes[] = {

/* clang-format off */
{KEY_ESCAPE ,"Escape"},
{KEY_TAB ,"Tab"},
Expand Down
Loading

0 comments on commit 02161aa

Please sign in to comment.