Skip to content

Commit

Permalink
Made use of semicolons more consitent, fixed formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
LightIncorporated authored and akien-mga committed Jun 19, 2019
1 parent 43a9b8c commit 38d3bfe
Show file tree
Hide file tree
Showing 143 changed files with 463 additions and 380 deletions.
6 changes: 3 additions & 3 deletions core/bind/core_bind.h
Original file line number Diff line number Diff line change
Expand Up @@ -694,7 +694,7 @@ VARIANT_ENUM_CAST(_Thread::Priority);

class _ClassDB : public Object {

GDCLASS(_ClassDB, Object)
GDCLASS(_ClassDB, Object);

protected:
static void _bind_methods();
Expand Down Expand Up @@ -779,7 +779,7 @@ class _Engine : public Object {
class _JSON;

class JSONParseResult : public Reference {
GDCLASS(JSONParseResult, Reference)
GDCLASS(JSONParseResult, Reference);

friend class _JSON;

Expand Down Expand Up @@ -807,7 +807,7 @@ class JSONParseResult : public Reference {
};

class _JSON : public Object {
GDCLASS(_JSON, Object)
GDCLASS(_JSON, Object);

protected:
static void _bind_methods();
Expand Down
3 changes: 2 additions & 1 deletion core/io/resource_importer.h
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ class ResourceFormatImporter : public ResourceFormatLoader {

class ResourceImporter : public Reference {

GDCLASS(ResourceImporter, Reference)
GDCLASS(ResourceImporter, Reference);

public:
virtual String get_importer_name() const = 0;
virtual String get_visible_name() const = 0;
Expand Down
2 changes: 1 addition & 1 deletion core/io/resource_loader.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class ResourceInteractiveLoader : public Reference {

class ResourceFormatLoader : public Reference {

GDCLASS(ResourceFormatLoader, Reference)
GDCLASS(ResourceFormatLoader, Reference);

protected:
static void _bind_methods();
Expand Down
2 changes: 1 addition & 1 deletion core/io/resource_saver.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
*/

class ResourceFormatSaver : public Reference {
GDCLASS(ResourceFormatSaver, Reference)
GDCLASS(ResourceFormatSaver, Reference);

protected:
static void _bind_methods();
Expand Down
2 changes: 1 addition & 1 deletion core/math/a_star.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

class AStar : public Reference {

GDCLASS(AStar, Reference)
GDCLASS(AStar, Reference);

uint64_t pass;

Expand Down
3 changes: 2 additions & 1 deletion core/math/expression.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
#include "core/reference.h"

class Expression : public Reference {
GDCLASS(Expression, Reference)
GDCLASS(Expression, Reference);

public:
enum BuiltinFunc {
MATH_SIN,
Expand Down
30 changes: 15 additions & 15 deletions core/os/input_event.h
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ enum MidiMessageList {
*/

class InputEvent : public Resource {
GDCLASS(InputEvent, Resource)
GDCLASS(InputEvent, Resource);

int device;

Expand Down Expand Up @@ -210,7 +210,7 @@ class InputEvent : public Resource {
};

class InputEventWithModifiers : public InputEvent {
GDCLASS(InputEventWithModifiers, InputEvent)
GDCLASS(InputEventWithModifiers, InputEvent);

bool shift;
bool alt;
Expand Down Expand Up @@ -256,7 +256,7 @@ class InputEventWithModifiers : public InputEvent {

class InputEventKey : public InputEventWithModifiers {

GDCLASS(InputEventKey, InputEventWithModifiers)
GDCLASS(InputEventKey, InputEventWithModifiers);

bool pressed; /// otherwise release

Expand Down Expand Up @@ -295,7 +295,7 @@ class InputEventKey : public InputEventWithModifiers {

class InputEventMouse : public InputEventWithModifiers {

GDCLASS(InputEventMouse, InputEventWithModifiers)
GDCLASS(InputEventMouse, InputEventWithModifiers);

int button_mask;

Expand All @@ -320,7 +320,7 @@ class InputEventMouse : public InputEventWithModifiers {

class InputEventMouseButton : public InputEventMouse {

GDCLASS(InputEventMouseButton, InputEventMouse)
GDCLASS(InputEventMouseButton, InputEventMouse);

float factor;
int button_index;
Expand Down Expand Up @@ -354,7 +354,7 @@ class InputEventMouseButton : public InputEventMouse {

class InputEventMouseMotion : public InputEventMouse {

GDCLASS(InputEventMouseMotion, InputEventMouse)
GDCLASS(InputEventMouseMotion, InputEventMouse);
Vector2 relative;
Vector2 speed;

Expand All @@ -378,7 +378,7 @@ class InputEventMouseMotion : public InputEventMouse {

class InputEventJoypadMotion : public InputEvent {

GDCLASS(InputEventJoypadMotion, InputEvent)
GDCLASS(InputEventJoypadMotion, InputEvent);
int axis; ///< Joypad axis
float axis_value; ///< -1 to 1

Expand All @@ -403,7 +403,7 @@ class InputEventJoypadMotion : public InputEvent {
};

class InputEventJoypadButton : public InputEvent {
GDCLASS(InputEventJoypadButton, InputEvent)
GDCLASS(InputEventJoypadButton, InputEvent);

int button_index;
bool pressed;
Expand Down Expand Up @@ -431,7 +431,7 @@ class InputEventJoypadButton : public InputEvent {
};

class InputEventScreenTouch : public InputEvent {
GDCLASS(InputEventScreenTouch, InputEvent)
GDCLASS(InputEventScreenTouch, InputEvent);
int index;
Vector2 pos;
bool pressed;
Expand All @@ -457,7 +457,7 @@ class InputEventScreenTouch : public InputEvent {

class InputEventScreenDrag : public InputEvent {

GDCLASS(InputEventScreenDrag, InputEvent)
GDCLASS(InputEventScreenDrag, InputEvent);
int index;
Vector2 pos;
Vector2 relative;
Expand Down Expand Up @@ -487,7 +487,7 @@ class InputEventScreenDrag : public InputEvent {

class InputEventAction : public InputEvent {

GDCLASS(InputEventAction, InputEvent)
GDCLASS(InputEventAction, InputEvent);

StringName action;
bool pressed;
Expand Down Expand Up @@ -519,7 +519,7 @@ class InputEventAction : public InputEvent {

class InputEventGesture : public InputEventWithModifiers {

GDCLASS(InputEventGesture, InputEventWithModifiers)
GDCLASS(InputEventGesture, InputEventWithModifiers);

Vector2 pos;

Expand All @@ -533,7 +533,7 @@ class InputEventGesture : public InputEventWithModifiers {

class InputEventMagnifyGesture : public InputEventGesture {

GDCLASS(InputEventMagnifyGesture, InputEventGesture)
GDCLASS(InputEventMagnifyGesture, InputEventGesture);
real_t factor;

protected:
Expand All @@ -551,7 +551,7 @@ class InputEventMagnifyGesture : public InputEventGesture {

class InputEventPanGesture : public InputEventGesture {

GDCLASS(InputEventPanGesture, InputEventGesture)
GDCLASS(InputEventPanGesture, InputEventGesture);
Vector2 delta;

protected:
Expand All @@ -568,7 +568,7 @@ class InputEventPanGesture : public InputEventGesture {
};

class InputEventMIDI : public InputEvent {
GDCLASS(InputEventMIDI, InputEvent)
GDCLASS(InputEventMIDI, InputEvent);

int channel;
int message;
Expand Down
2 changes: 1 addition & 1 deletion editor/animation_bezier_editor.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

class AnimationBezierTrackEdit : public Control {

GDCLASS(AnimationBezierTrackEdit, Control)
GDCLASS(AnimationBezierTrackEdit, Control);

enum HandleMode {
HANDLE_MODE_FREE,
Expand Down
11 changes: 6 additions & 5 deletions editor/animation_track_editor.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
#include "scene_tree_editor.h"

class AnimationTimelineEdit : public Range {
GDCLASS(AnimationTimelineEdit, Range)
GDCLASS(AnimationTimelineEdit, Range);

Ref<Animation> animation;
int name_limit;
Expand Down Expand Up @@ -123,7 +123,7 @@ class AnimationTrackEditor;

class AnimationTrackEdit : public Control {

GDCLASS(AnimationTrackEdit, Control)
GDCLASS(AnimationTrackEdit, Control);

enum {
MENU_CALL_MODE_CONTINUOUS,
Expand Down Expand Up @@ -237,7 +237,8 @@ class AnimationTrackEdit : public Control {
};

class AnimationTrackEditPlugin : public Reference {
GDCLASS(AnimationTrackEditPlugin, Reference)
GDCLASS(AnimationTrackEditPlugin, Reference);

public:
virtual AnimationTrackEdit *create_value_track_edit(Object *p_object, Variant::Type p_type, const String &p_property, PropertyHint p_hint, const String &p_hint_string, int p_usage);
virtual AnimationTrackEdit *create_audio_track_edit();
Expand All @@ -248,7 +249,7 @@ class AnimationTrackKeyEdit;
class AnimationBezierTrackEdit;

class AnimationTrackEditGroup : public Control {
GDCLASS(AnimationTrackEditGroup, Control)
GDCLASS(AnimationTrackEditGroup, Control);
Ref<Texture> icon;
String node_name;
NodePath node;
Expand All @@ -271,7 +272,7 @@ class AnimationTrackEditGroup : public Control {
};

class AnimationTrackEditor : public VBoxContainer {
GDCLASS(AnimationTrackEditor, VBoxContainer)
GDCLASS(AnimationTrackEditor, VBoxContainer);

enum {
EDIT_COPY_TRACKS,
Expand Down
19 changes: 10 additions & 9 deletions editor/animation_track_editor_plugins.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include "editor/animation_track_editor.h"

class AnimationTrackEditBool : public AnimationTrackEdit {
GDCLASS(AnimationTrackEditBool, AnimationTrackEdit)
GDCLASS(AnimationTrackEditBool, AnimationTrackEdit);
Ref<Texture> icon_checked;
Ref<Texture> icon_unchecked;

Expand All @@ -46,7 +46,7 @@ class AnimationTrackEditBool : public AnimationTrackEdit {
};

class AnimationTrackEditColor : public AnimationTrackEdit {
GDCLASS(AnimationTrackEditColor, AnimationTrackEdit)
GDCLASS(AnimationTrackEditColor, AnimationTrackEdit);

public:
virtual int get_key_height() const;
Expand All @@ -57,7 +57,7 @@ class AnimationTrackEditColor : public AnimationTrackEdit {
};

class AnimationTrackEditAudio : public AnimationTrackEdit {
GDCLASS(AnimationTrackEditAudio, AnimationTrackEdit)
GDCLASS(AnimationTrackEditAudio, AnimationTrackEdit);

ObjectID id;

Expand All @@ -78,7 +78,7 @@ class AnimationTrackEditAudio : public AnimationTrackEdit {
};

class AnimationTrackEditSpriteFrame : public AnimationTrackEdit {
GDCLASS(AnimationTrackEditSpriteFrame, AnimationTrackEdit)
GDCLASS(AnimationTrackEditSpriteFrame, AnimationTrackEdit);

ObjectID id;

Expand All @@ -92,7 +92,7 @@ class AnimationTrackEditSpriteFrame : public AnimationTrackEdit {
};

class AnimationTrackEditSubAnim : public AnimationTrackEdit {
GDCLASS(AnimationTrackEditSubAnim, AnimationTrackEdit)
GDCLASS(AnimationTrackEditSubAnim, AnimationTrackEdit);

ObjectID id;

Expand All @@ -106,7 +106,7 @@ class AnimationTrackEditSubAnim : public AnimationTrackEdit {
};

class AnimationTrackEditTypeAudio : public AnimationTrackEdit {
GDCLASS(AnimationTrackEditTypeAudio, AnimationTrackEdit)
GDCLASS(AnimationTrackEditTypeAudio, AnimationTrackEdit);

void _preview_changed(ObjectID p_which);

Expand Down Expand Up @@ -134,7 +134,7 @@ class AnimationTrackEditTypeAudio : public AnimationTrackEdit {
};

class AnimationTrackEditTypeAnimation : public AnimationTrackEdit {
GDCLASS(AnimationTrackEditTypeAnimation, AnimationTrackEdit)
GDCLASS(AnimationTrackEditTypeAnimation, AnimationTrackEdit);

ObjectID id;

Expand All @@ -149,7 +149,7 @@ class AnimationTrackEditTypeAnimation : public AnimationTrackEdit {
};

class AnimationTrackEditVolumeDB : public AnimationTrackEdit {
GDCLASS(AnimationTrackEditVolumeDB, AnimationTrackEdit)
GDCLASS(AnimationTrackEditVolumeDB, AnimationTrackEdit);

public:
virtual void draw_bg(int p_clip_left, int p_clip_right);
Expand All @@ -159,7 +159,8 @@ class AnimationTrackEditVolumeDB : public AnimationTrackEdit {
};

class AnimationTrackEditDefaultPlugin : public AnimationTrackEditPlugin {
GDCLASS(AnimationTrackEditDefaultPlugin, AnimationTrackEditPlugin)
GDCLASS(AnimationTrackEditDefaultPlugin, AnimationTrackEditPlugin);

public:
virtual AnimationTrackEdit *create_value_track_edit(Object *p_object, Variant::Type p_type, const String &p_property, PropertyHint p_hint, const String &p_hint_string, int p_usage);
virtual AnimationTrackEdit *create_audio_track_edit();
Expand Down
4 changes: 2 additions & 2 deletions editor/audio_stream_preview.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#include "servers/audio/audio_stream.h"

class AudioStreamPreview : public Reference {
GDCLASS(AudioStreamPreview, Reference)
GDCLASS(AudioStreamPreview, Reference);
friend class AudioStream;
Vector<uint8_t> preview;
float length;
Expand All @@ -52,7 +52,7 @@ class AudioStreamPreview : public Reference {
};

class AudioStreamPreviewGenerator : public Node {
GDCLASS(AudioStreamPreviewGenerator, Node)
GDCLASS(AudioStreamPreviewGenerator, Node);

static AudioStreamPreviewGenerator *singleton;

Expand Down
2 changes: 1 addition & 1 deletion editor/create_dialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

class CreateDialog : public ConfirmationDialog {

GDCLASS(CreateDialog, ConfirmationDialog)
GDCLASS(CreateDialog, ConfirmationDialog);

Vector<String> favorite_list;
Tree *favorites;
Expand Down
4 changes: 2 additions & 2 deletions editor/editor_audio_buses.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class EditorAudioBuses;

class EditorAudioBus : public PanelContainer {

GDCLASS(EditorAudioBus, PanelContainer)
GDCLASS(EditorAudioBus, PanelContainer);

Ref<Texture> disabled_vu;
LineEdit *track_name;
Expand Down Expand Up @@ -155,7 +155,7 @@ class EditorAudioBusDrop : public Control {

class EditorAudioBuses : public VBoxContainer {

GDCLASS(EditorAudioBuses, VBoxContainer)
GDCLASS(EditorAudioBuses, VBoxContainer);

HBoxContainer *top_hb;

Expand Down
Loading

0 comments on commit 38d3bfe

Please sign in to comment.