Merge pull request #27188 from samH-FIT/MacroUpdate

Made use of semicolons after GDCLASS more consistent, added semicolons where I found them missing. 

49 files changed, 154 insertions, 118 deletions

diff --git a/editor/animation_bezier_editor.h b/editor/animation_bezier_editor.h
index 66c818f09d..49aab48719 100644
--- a/editor/animation_bezier_editor.h
+++ b/editor/animation_bezier_editor.h
@@ -35,7 +35,7 @@
 
 class AnimationBezierTrackEdit : public Control {
 
-	GDCLASS(AnimationBezierTrackEdit, Control)
+	GDCLASS(AnimationBezierTrackEdit, Control);
 
 	enum HandleMode {
 		HANDLE_MODE_FREE,
diff --git a/editor/animation_track_editor.h b/editor/animation_track_editor.h
index 0f1363b34f..1452d5519c 100644
--- a/editor/animation_track_editor.h
+++ b/editor/animation_track_editor.h
@@ -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;
@@ -123,7 +123,7 @@ class AnimationTrackEditor;
 
 class AnimationTrackEdit : public Control {
 
-	GDCLASS(AnimationTrackEdit, Control)
+	GDCLASS(AnimationTrackEdit, Control);
 
 	enum {
 		MENU_CALL_MODE_CONTINUOUS,
@@ -237,7 +237,8 @@ public:
 };
 
 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();
@@ -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;
@@ -271,7 +272,7 @@ public:
 };
 
 class AnimationTrackEditor : public VBoxContainer {
-	GDCLASS(AnimationTrackEditor, VBoxContainer)
+	GDCLASS(AnimationTrackEditor, VBoxContainer);
 
 	enum {
 		EDIT_COPY_TRACKS,
diff --git a/editor/animation_track_editor_plugins.h b/editor/animation_track_editor_plugins.h
index a1ea7435b1..5f0ea6196c 100644
--- a/editor/animation_track_editor_plugins.h
+++ b/editor/animation_track_editor_plugins.h
@@ -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;
 
@@ -46,7 +46,7 @@ public:
 };
 
 class AnimationTrackEditColor : public AnimationTrackEdit {
-	GDCLASS(AnimationTrackEditColor, AnimationTrackEdit)
+	GDCLASS(AnimationTrackEditColor, AnimationTrackEdit);
 
 public:
 	virtual int get_key_height() const;
@@ -57,7 +57,7 @@ public:
 };
 
 class AnimationTrackEditAudio : public AnimationTrackEdit {
-	GDCLASS(AnimationTrackEditAudio, AnimationTrackEdit)
+	GDCLASS(AnimationTrackEditAudio, AnimationTrackEdit);
 
 	ObjectID id;
 
@@ -78,7 +78,7 @@ public:
 };
 
 class AnimationTrackEditSpriteFrame : public AnimationTrackEdit {
-	GDCLASS(AnimationTrackEditSpriteFrame, AnimationTrackEdit)
+	GDCLASS(AnimationTrackEditSpriteFrame, AnimationTrackEdit);
 
 	ObjectID id;
 
@@ -92,7 +92,7 @@ public:
 };
 
 class AnimationTrackEditSubAnim : public AnimationTrackEdit {
-	GDCLASS(AnimationTrackEditSubAnim, AnimationTrackEdit)
+	GDCLASS(AnimationTrackEditSubAnim, AnimationTrackEdit);
 
 	ObjectID id;
 
@@ -106,7 +106,7 @@ public:
 };
 
 class AnimationTrackEditTypeAudio : public AnimationTrackEdit {
-	GDCLASS(AnimationTrackEditTypeAudio, AnimationTrackEdit)
+	GDCLASS(AnimationTrackEditTypeAudio, AnimationTrackEdit);
 
 	void _preview_changed(ObjectID p_which);
 
@@ -134,7 +134,7 @@ public:
 };
 
 class AnimationTrackEditTypeAnimation : public AnimationTrackEdit {
-	GDCLASS(AnimationTrackEditTypeAnimation, AnimationTrackEdit)
+	GDCLASS(AnimationTrackEditTypeAnimation, AnimationTrackEdit);
 
 	ObjectID id;
 
@@ -149,7 +149,7 @@ public:
 };
 
 class AnimationTrackEditVolumeDB : public AnimationTrackEdit {
-	GDCLASS(AnimationTrackEditVolumeDB, AnimationTrackEdit)
+	GDCLASS(AnimationTrackEditVolumeDB, AnimationTrackEdit);
 
 public:
 	virtual void draw_bg(int p_clip_left, int p_clip_right);
@@ -159,7 +159,8 @@ public:
 };
 
 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();
diff --git a/editor/audio_stream_preview.h b/editor/audio_stream_preview.h
index 3b8975e3aa..fca0aabac1 100644
--- a/editor/audio_stream_preview.h
+++ b/editor/audio_stream_preview.h
@@ -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;
@@ -52,7 +52,7 @@ public:
 };
 
 class AudioStreamPreviewGenerator : public Node {
-	GDCLASS(AudioStreamPreviewGenerator, Node)
+	GDCLASS(AudioStreamPreviewGenerator, Node);
 
 	static AudioStreamPreviewGenerator *singleton;
 
diff --git a/editor/create_dialog.h b/editor/create_dialog.h
index 03c4b25f5c..0eddbc3ceb 100644
--- a/editor/create_dialog.h
+++ b/editor/create_dialog.h
@@ -44,7 +44,7 @@
 
 class CreateDialog : public ConfirmationDialog {
 
-	GDCLASS(CreateDialog, ConfirmationDialog)
+	GDCLASS(CreateDialog, ConfirmationDialog);
 
 	Vector<String> favorite_list;
 	Tree *favorites;
diff --git a/editor/editor_audio_buses.h b/editor/editor_audio_buses.h
index 20890fd3b5..8781e6ff6c 100644
--- a/editor/editor_audio_buses.h
+++ b/editor/editor_audio_buses.h
@@ -52,7 +52,7 @@ class EditorAudioBuses;
 
 class EditorAudioBus : public PanelContainer {
 
-	GDCLASS(EditorAudioBus, PanelContainer)
+	GDCLASS(EditorAudioBus, PanelContainer);
 
 	Ref<Texture> disabled_vu;
 	LineEdit *track_name;
@@ -155,7 +155,7 @@ public:
 
 class EditorAudioBuses : public VBoxContainer {
 
-	GDCLASS(EditorAudioBuses, VBoxContainer)
+	GDCLASS(EditorAudioBuses, VBoxContainer);
 
 	HBoxContainer *top_hb;
 
diff --git a/editor/editor_export.h b/editor/editor_export.h
index bd864c528c..7c01abe0e9 100644
--- a/editor/editor_export.h
+++ b/editor/editor_export.h
@@ -44,7 +44,8 @@ struct EditorProgress;
 
 class EditorExportPreset : public Reference {
 
-	GDCLASS(EditorExportPreset, Reference)
+	GDCLASS(EditorExportPreset, Reference);
+
 public:
 	enum ExportFilter {
 		EXPORT_ALL_RESOURCES,
@@ -152,7 +153,7 @@ struct SharedObject {
 
 class EditorExportPlatform : public Reference {
 
-	GDCLASS(EditorExportPlatform, Reference)
+	GDCLASS(EditorExportPlatform, Reference);
 
 public:
 	typedef Error (*EditorExportSaveFunction)(void *p_userdata, const String &p_path, const Vector<uint8_t> &p_data, int p_file, int p_total);
@@ -272,7 +273,7 @@ public:
 };
 
 class EditorExportPlugin : public Reference {
-	GDCLASS(EditorExportPlugin, Reference)
+	GDCLASS(EditorExportPlugin, Reference);
 
 	friend class EditorExportPlatform;
 
@@ -388,7 +389,7 @@ public:
 
 class EditorExportPlatformPC : public EditorExportPlatform {
 
-	GDCLASS(EditorExportPlatformPC, EditorExportPlatform)
+	GDCLASS(EditorExportPlatformPC, EditorExportPlatform);
 
 	Ref<ImageTexture> logo;
 	String name;
@@ -440,7 +441,7 @@ public:
 
 class EditorExportTextSceneToBinaryPlugin : public EditorExportPlugin {
 
-	GDCLASS(EditorExportTextSceneToBinaryPlugin, EditorExportPlugin)
+	GDCLASS(EditorExportTextSceneToBinaryPlugin, EditorExportPlugin);
 
 public:
 	virtual void _export_file(const String &p_path, const String &p_type, const Set<String> &p_features);
diff --git a/editor/editor_inspector.h b/editor/editor_inspector.h
index 494e8b5833..0550509ba2 100644
--- a/editor/editor_inspector.h
+++ b/editor/editor_inspector.h
@@ -48,7 +48,8 @@ public:
 
 class EditorProperty : public Container {
 
-	GDCLASS(EditorProperty, Container)
+	GDCLASS(EditorProperty, Container);
+
 private:
 	String label;
 	int text_size;
@@ -167,7 +168,7 @@ public:
 };
 
 class EditorInspectorPlugin : public Reference {
-	GDCLASS(EditorInspectorPlugin, Reference)
+	GDCLASS(EditorInspectorPlugin, Reference);
 
 	friend class EditorInspector;
 	struct AddedEditor {
diff --git a/editor/editor_plugin.h b/editor/editor_plugin.h
index c28e607c89..0d700cd9b6 100644
--- a/editor/editor_plugin.h
+++ b/editor/editor_plugin.h
@@ -60,7 +60,8 @@ class EditorToolAddons;
 class ScriptEditor;
 
 class EditorInterface : public Node {
-	GDCLASS(EditorInterface, Node)
+	GDCLASS(EditorInterface, Node);
+
 protected:
 	static void _bind_methods();
 	static EditorInterface *singleton;
diff --git a/editor/editor_profiler.h b/editor/editor_profiler.h
index e62213887d..46c13d257a 100644
--- a/editor/editor_profiler.h
+++ b/editor/editor_profiler.h
@@ -42,7 +42,7 @@
 
 class EditorProfiler : public VBoxContainer {
 
-	GDCLASS(EditorProfiler, VBoxContainer)
+	GDCLASS(EditorProfiler, VBoxContainer);
 
 public:
 	struct Metric {
diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp
index 45acd1b6d4..d5f4d54e5c 100644
--- a/editor/editor_properties.cpp
+++ b/editor/editor_properties.cpp
@@ -599,7 +599,8 @@ EditorPropertyFlags::EditorPropertyFlags() {
 ///////////////////// LAYERS /////////////////////////
 
 class EditorPropertyLayersGrid : public Control {
-	GDCLASS(EditorPropertyLayersGrid, Control)
+	GDCLASS(EditorPropertyLayersGrid, Control);
+
 public:
 	uint32_t value;
 	Vector<Rect2> flag_rects;
diff --git a/editor/editor_properties.h b/editor/editor_properties.h
index 574767890c..02d9349f2d 100644
--- a/editor/editor_properties.h
+++ b/editor/editor_properties.h
@@ -40,7 +40,7 @@
 #include "scene/gui/color_picker.h"
 
 class EditorPropertyNil : public EditorProperty {
-	GDCLASS(EditorPropertyNil, EditorProperty)
+	GDCLASS(EditorPropertyNil, EditorProperty);
 	LineEdit *text;
 
 public:
@@ -49,7 +49,7 @@ public:
 };
 
 class EditorPropertyText : public EditorProperty {
-	GDCLASS(EditorPropertyText, EditorProperty)
+	GDCLASS(EditorPropertyText, EditorProperty);
 	LineEdit *text;
 
 	bool updating;
@@ -66,7 +66,7 @@ public:
 };
 
 class EditorPropertyMultilineText : public EditorProperty {
-	GDCLASS(EditorPropertyMultilineText, EditorProperty)
+	GDCLASS(EditorPropertyMultilineText, EditorProperty);
 	TextEdit *text;
 
 	AcceptDialog *big_text_dialog;
@@ -87,7 +87,7 @@ public:
 };
 
 class EditorPropertyTextEnum : public EditorProperty {
-	GDCLASS(EditorPropertyTextEnum, EditorProperty)
+	GDCLASS(EditorPropertyTextEnum, EditorProperty);
 	OptionButton *options;
 
 	void _option_selected(int p_which);
@@ -102,7 +102,7 @@ public:
 };
 
 class EditorPropertyPath : public EditorProperty {
-	GDCLASS(EditorPropertyPath, EditorProperty)
+	GDCLASS(EditorPropertyPath, EditorProperty);
 	Vector<String> extensions;
 	bool folder;
 	bool global;
@@ -127,7 +127,8 @@ public:
 };
 
 class EditorPropertyClassName : public EditorProperty {
-	GDCLASS(EditorPropertyClassName, EditorProperty)
+	GDCLASS(EditorPropertyClassName, EditorProperty);
+
 private:
 	CreateDialog *dialog;
 	Button *property;
@@ -146,7 +147,8 @@ public:
 };
 
 class EditorPropertyMember : public EditorProperty {
-	GDCLASS(EditorPropertyMember, EditorProperty)
+	GDCLASS(EditorPropertyMember, EditorProperty);
+
 public:
 	enum Type {
 		MEMBER_METHOD_OF_VARIANT_TYPE, ///< a method of a type
@@ -179,7 +181,7 @@ public:
 };
 
 class EditorPropertyCheck : public EditorProperty {
-	GDCLASS(EditorPropertyCheck, EditorProperty)
+	GDCLASS(EditorPropertyCheck, EditorProperty);
 	CheckBox *checkbox;
 
 	void _checkbox_pressed();
@@ -193,7 +195,7 @@ public:
 };
 
 class EditorPropertyEnum : public EditorProperty {
-	GDCLASS(EditorPropertyEnum, EditorProperty)
+	GDCLASS(EditorPropertyEnum, EditorProperty);
 	OptionButton *options;
 
 	void _option_selected(int p_which);
@@ -209,7 +211,7 @@ public:
 };
 
 class EditorPropertyFlags : public EditorProperty {
-	GDCLASS(EditorPropertyFlags, EditorProperty)
+	GDCLASS(EditorPropertyFlags, EditorProperty);
 	VBoxContainer *vbox;
 	Vector<CheckBox *> flags;
 	Vector<int> flag_indices;
@@ -228,7 +230,8 @@ public:
 class EditorPropertyLayersGrid;
 
 class EditorPropertyLayers : public EditorProperty {
-	GDCLASS(EditorPropertyLayers, EditorProperty)
+	GDCLASS(EditorPropertyLayers, EditorProperty);
+
 public:
 	enum LayerType {
 		LAYER_PHYSICS_2D,
@@ -257,7 +260,7 @@ public:
 };
 
 class EditorPropertyInteger : public EditorProperty {
-	GDCLASS(EditorPropertyInteger, EditorProperty)
+	GDCLASS(EditorPropertyInteger, EditorProperty);
 	EditorSpinSlider *spin;
 	bool setting;
 	void _value_changed(double p_val);
@@ -272,7 +275,7 @@ public:
 };
 
 class EditorPropertyObjectID : public EditorProperty {
-	GDCLASS(EditorPropertyObjectID, EditorProperty)
+	GDCLASS(EditorPropertyObjectID, EditorProperty);
 	Button *edit;
 	String base_type;
 	void _edit_pressed();
@@ -287,7 +290,7 @@ public:
 };
 
 class EditorPropertyFloat : public EditorProperty {
-	GDCLASS(EditorPropertyFloat, EditorProperty)
+	GDCLASS(EditorPropertyFloat, EditorProperty);
 	EditorSpinSlider *spin;
 	bool setting;
 	void _value_changed(double p_val);
@@ -302,7 +305,7 @@ public:
 };
 
 class EditorPropertyEasing : public EditorProperty {
-	GDCLASS(EditorPropertyEasing, EditorProperty)
+	GDCLASS(EditorPropertyEasing, EditorProperty);
 	Control *easing_draw;
 	PopupMenu *preset;
 	bool full;
@@ -335,7 +338,7 @@ public:
 };
 
 class EditorPropertyVector2 : public EditorProperty {
-	GDCLASS(EditorPropertyVector2, EditorProperty)
+	GDCLASS(EditorPropertyVector2, EditorProperty);
 	EditorSpinSlider *spin[2];
 	bool setting;
 	void _value_changed(double p_val, const String &p_name);
@@ -351,7 +354,7 @@ public:
 };
 
 class EditorPropertyRect2 : public EditorProperty {
-	GDCLASS(EditorPropertyRect2, EditorProperty)
+	GDCLASS(EditorPropertyRect2, EditorProperty);
 	EditorSpinSlider *spin[4];
 	bool setting;
 	void _value_changed(double p_val, const String &p_name);
@@ -367,7 +370,7 @@ public:
 };
 
 class EditorPropertyVector3 : public EditorProperty {
-	GDCLASS(EditorPropertyVector3, EditorProperty)
+	GDCLASS(EditorPropertyVector3, EditorProperty);
 	EditorSpinSlider *spin[3];
 	bool setting;
 	void _value_changed(double p_val, const String &p_name);
@@ -383,7 +386,7 @@ public:
 };
 
 class EditorPropertyPlane : public EditorProperty {
-	GDCLASS(EditorPropertyPlane, EditorProperty)
+	GDCLASS(EditorPropertyPlane, EditorProperty);
 	EditorSpinSlider *spin[4];
 	bool setting;
 	void _value_changed(double p_val, const String &p_name);
@@ -399,7 +402,7 @@ public:
 };
 
 class EditorPropertyQuat : public EditorProperty {
-	GDCLASS(EditorPropertyQuat, EditorProperty)
+	GDCLASS(EditorPropertyQuat, EditorProperty);
 	EditorSpinSlider *spin[4];
 	bool setting;
 	void _value_changed(double p_val, const String &p_name);
@@ -415,7 +418,7 @@ public:
 };
 
 class EditorPropertyAABB : public EditorProperty {
-	GDCLASS(EditorPropertyAABB, EditorProperty)
+	GDCLASS(EditorPropertyAABB, EditorProperty);
 	EditorSpinSlider *spin[6];
 	bool setting;
 	void _value_changed(double p_val, const String &p_name);
@@ -431,7 +434,7 @@ public:
 };
 
 class EditorPropertyTransform2D : public EditorProperty {
-	GDCLASS(EditorPropertyTransform2D, EditorProperty)
+	GDCLASS(EditorPropertyTransform2D, EditorProperty);
 	EditorSpinSlider *spin[6];
 	bool setting;
 	void _value_changed(double p_val, const String &p_name);
@@ -447,7 +450,7 @@ public:
 };
 
 class EditorPropertyBasis : public EditorProperty {
-	GDCLASS(EditorPropertyBasis, EditorProperty)
+	GDCLASS(EditorPropertyBasis, EditorProperty);
 	EditorSpinSlider *spin[9];
 	bool setting;
 	void _value_changed(double p_val, const String &p_name);
@@ -463,7 +466,7 @@ public:
 };
 
 class EditorPropertyTransform : public EditorProperty {
-	GDCLASS(EditorPropertyTransform, EditorProperty)
+	GDCLASS(EditorPropertyTransform, EditorProperty);
 	EditorSpinSlider *spin[12];
 	bool setting;
 	void _value_changed(double p_val, const String &p_name);
@@ -479,7 +482,7 @@ public:
 };
 
 class EditorPropertyColor : public EditorProperty {
-	GDCLASS(EditorPropertyColor, EditorProperty)
+	GDCLASS(EditorPropertyColor, EditorProperty);
 	ColorPickerButton *picker;
 	void _color_changed(const Color &p_color);
 	void _popup_closed();
@@ -494,7 +497,7 @@ public:
 };
 
 class EditorPropertyNodePath : public EditorProperty {
-	GDCLASS(EditorPropertyNodePath, EditorProperty)
+	GDCLASS(EditorPropertyNodePath, EditorProperty);
 	Button *assign;
 	Button *clear;
 	SceneTreeDialog *scene_tree;
@@ -517,7 +520,7 @@ public:
 };
 
 class EditorPropertyRID : public EditorProperty {
-	GDCLASS(EditorPropertyRID, EditorProperty)
+	GDCLASS(EditorPropertyRID, EditorProperty);
 	Label *label;
 
 public:
@@ -526,7 +529,7 @@ public:
 };
 
 class EditorPropertyResource : public EditorProperty {
-	GDCLASS(EditorPropertyResource, EditorProperty)
+	GDCLASS(EditorPropertyResource, EditorProperty);
 
 	enum MenuOption {
 
@@ -605,7 +608,7 @@ public:
 /// \brief The EditorInspectorDefaultPlugin class
 ///
 class EditorInspectorDefaultPlugin : public EditorInspectorPlugin {
-	GDCLASS(EditorInspectorDefaultPlugin, EditorInspectorPlugin)
+	GDCLASS(EditorInspectorDefaultPlugin, EditorInspectorPlugin);
 
 public:
 	virtual bool can_handle(Object *p_object);
diff --git a/editor/editor_properties_array_dict.h b/editor/editor_properties_array_dict.h
index ff759105c3..18519c754a 100644
--- a/editor/editor_properties_array_dict.h
+++ b/editor/editor_properties_array_dict.h
@@ -78,7 +78,7 @@ public:
 };
 
 class EditorPropertyArray : public EditorProperty {
-	GDCLASS(EditorPropertyArray, EditorProperty)
+	GDCLASS(EditorPropertyArray, EditorProperty);
 
 	PopupMenu *change_type;
 	bool updating;
@@ -117,7 +117,7 @@ public:
 };
 
 class EditorPropertyDictionary : public EditorProperty {
-	GDCLASS(EditorPropertyDictionary, EditorProperty)
+	GDCLASS(EditorPropertyDictionary, EditorProperty);
 
 	PopupMenu *change_type;
 	bool updating;
diff --git a/editor/editor_spin_slider.h b/editor/editor_spin_slider.h
index ceff878e7f..1523c20f48 100644
--- a/editor/editor_spin_slider.h
+++ b/editor/editor_spin_slider.h
@@ -36,7 +36,7 @@
 #include "scene/gui/texture_rect.h"
 
 class EditorSpinSlider : public Range {
-	GDCLASS(EditorSpinSlider, Range)
+	GDCLASS(EditorSpinSlider, Range);
 
 	String label;
 	int updown_offset;
diff --git a/editor/export_template_manager.h b/editor/export_template_manager.h
index 608830c990..ad3ab507b3 100644
--- a/editor/export_template_manager.h
+++ b/editor/export_template_manager.h
@@ -41,7 +41,7 @@
 class ExportTemplateVersion;
 
 class ExportTemplateManager : public ConfirmationDialog {
-	GDCLASS(ExportTemplateManager, ConfirmationDialog)
+	GDCLASS(ExportTemplateManager, ConfirmationDialog);
 
 	AcceptDialog *template_downloader;
 	VBoxContainer *template_list;
diff --git a/editor/find_in_files.h b/editor/find_in_files.h
index 5f728a104b..178b9a2080 100644
--- a/editor/find_in_files.h
+++ b/editor/find_in_files.h
@@ -36,7 +36,8 @@
 
 // Performs the actual search
 class FindInFiles : public Node {
-	GDCLASS(FindInFiles, Node)
+	GDCLASS(FindInFiles, Node);
+
 public:
 	static const char *SIGNAL_RESULT_FOUND;
 	static const char *SIGNAL_FINISHED;
@@ -93,7 +94,8 @@ class HBoxContainer;
 
 // Prompts search parameters
 class FindInFilesDialog : public AcceptDialog {
-	GDCLASS(FindInFilesDialog, AcceptDialog)
+	GDCLASS(FindInFilesDialog, AcceptDialog);
+
 public:
 	static const char *SIGNAL_FIND_REQUESTED;
 	static const char *SIGNAL_REPLACE_REQUESTED;
@@ -138,7 +140,8 @@ class ProgressBar;
 
 // Display search results
 class FindInFilesPanel : public Control {
-	GDCLASS(FindInFilesPanel, Control)
+	GDCLASS(FindInFilesPanel, Control);
+
 public:
 	static const char *SIGNAL_RESULT_SELECTED;
 	static const char *SIGNAL_FILES_MODIFIED;
diff --git a/editor/import/editor_import_plugin.h b/editor/import/editor_import_plugin.h
index d396dd6d5b..b3eb7ae83b 100644
--- a/editor/import/editor_import_plugin.h
+++ b/editor/import/editor_import_plugin.h
@@ -34,7 +34,8 @@
 #include "core/io/resource_importer.h"
 
 class EditorImportPlugin : public ResourceImporter {
-	GDCLASS(EditorImportPlugin, Reference)
+	GDCLASS(EditorImportPlugin, Reference);
+
 protected:
 	static void _bind_methods();
 
diff --git a/editor/import/resource_importer_bitmask.h b/editor/import/resource_importer_bitmask.h
index 166fa998e4..6ae7608ff2 100644
--- a/editor/import/resource_importer_bitmask.h
+++ b/editor/import/resource_importer_bitmask.h
@@ -37,7 +37,7 @@
 class StreamBitMap;
 
 class ResourceImporterBitMap : public ResourceImporter {
-	GDCLASS(ResourceImporterBitMap, ResourceImporter)
+	GDCLASS(ResourceImporterBitMap, ResourceImporter);
 
 public:
 	virtual String get_importer_name() const;
diff --git a/editor/import/resource_importer_csv_translation.h b/editor/import/resource_importer_csv_translation.h
index 6785b68d87..c2753b326f 100644
--- a/editor/import/resource_importer_csv_translation.h
+++ b/editor/import/resource_importer_csv_translation.h
@@ -34,7 +34,8 @@
 #include "core/io/resource_importer.h"
 
 class ResourceImporterCSVTranslation : public ResourceImporter {
-	GDCLASS(ResourceImporterCSVTranslation, ResourceImporter)
+	GDCLASS(ResourceImporterCSVTranslation, ResourceImporter);
+
 public:
 	virtual String get_importer_name() const;
 	virtual String get_visible_name() const;
diff --git a/editor/import/resource_importer_image.h b/editor/import/resource_importer_image.h
index 3d5b99db2c..beadf5a8ea 100644
--- a/editor/import/resource_importer_image.h
+++ b/editor/import/resource_importer_image.h
@@ -35,7 +35,8 @@
 #include "core/io/resource_importer.h"
 
 class ResourceImporterImage : public ResourceImporter {
-	GDCLASS(ResourceImporterImage, ResourceImporter)
+	GDCLASS(ResourceImporterImage, ResourceImporter);
+
 public:
 	virtual String get_importer_name() const;
 	virtual String get_visible_name() const;
diff --git a/editor/import/resource_importer_layered_texture.h b/editor/import/resource_importer_layered_texture.h
index 6b393886b7..d6acbbabca 100644
--- a/editor/import/resource_importer_layered_texture.h
+++ b/editor/import/resource_importer_layered_texture.h
@@ -37,7 +37,7 @@
 class StreamTexture;
 
 class ResourceImporterLayeredTexture : public ResourceImporter {
-	GDCLASS(ResourceImporterLayeredTexture, ResourceImporter)
+	GDCLASS(ResourceImporterLayeredTexture, ResourceImporter);
 
 	bool is_3d;
 	static const char *compression_formats[];
diff --git a/editor/import/resource_importer_obj.h b/editor/import/resource_importer_obj.h
index b2a53f582c..b96bc1b656 100644
--- a/editor/import/resource_importer_obj.h
+++ b/editor/import/resource_importer_obj.h
@@ -47,7 +47,8 @@ public:
 };
 
 class ResourceImporterOBJ : public ResourceImporter {
-	GDCLASS(ResourceImporterOBJ, ResourceImporter)
+	GDCLASS(ResourceImporterOBJ, ResourceImporter);
+
 public:
 	virtual String get_importer_name() const;
 	virtual String get_visible_name() const;
diff --git a/editor/import/resource_importer_scene.h b/editor/import/resource_importer_scene.h
index b10c4da2e5..e89f862c1b 100644
--- a/editor/import/resource_importer_scene.h
+++ b/editor/import/resource_importer_scene.h
@@ -90,7 +90,7 @@ public:
 };
 
 class ResourceImporterScene : public ResourceImporter {
-	GDCLASS(ResourceImporterScene, ResourceImporter)
+	GDCLASS(ResourceImporterScene, ResourceImporter);
 
 	Set<Ref<EditorSceneImporter> > importers;
 
diff --git a/editor/import/resource_importer_texture.h b/editor/import/resource_importer_texture.h
index ef74e4e41e..da712bf84d 100644
--- a/editor/import/resource_importer_texture.h
+++ b/editor/import/resource_importer_texture.h
@@ -37,7 +37,7 @@
 class StreamTexture;
 
 class ResourceImporterTexture : public ResourceImporter {
-	GDCLASS(ResourceImporterTexture, ResourceImporter)
+	GDCLASS(ResourceImporterTexture, ResourceImporter);
 
 protected:
 	enum {
diff --git a/editor/import/resource_importer_texture_atlas.h b/editor/import/resource_importer_texture_atlas.h
index 042deacfe3..3c6fc343c4 100644
--- a/editor/import/resource_importer_texture_atlas.h
+++ b/editor/import/resource_importer_texture_atlas.h
@@ -34,7 +34,7 @@
 #include "core/image.h"
 #include "core/io/resource_importer.h"
 class ResourceImporterTextureAtlas : public ResourceImporter {
-	GDCLASS(ResourceImporterTextureAtlas, ResourceImporter)
+	GDCLASS(ResourceImporterTextureAtlas, ResourceImporter);
 
 	struct PackData {
 		Rect2 region;
diff --git a/editor/import/resource_importer_wav.h b/editor/import/resource_importer_wav.h
index f993f9e7bc..24481ea46b 100644
--- a/editor/import/resource_importer_wav.h
+++ b/editor/import/resource_importer_wav.h
@@ -34,7 +34,8 @@
 #include "core/io/resource_importer.h"
 
 class ResourceImporterWAV : public ResourceImporter {
-	GDCLASS(ResourceImporterWAV, ResourceImporter)
+	GDCLASS(ResourceImporterWAV, ResourceImporter);
+
 public:
 	virtual String get_importer_name() const;
 	virtual String get_visible_name() const;
diff --git a/editor/import_dock.cpp b/editor/import_dock.cpp
index b307ec649a..6918fe7977 100644
--- a/editor/import_dock.cpp
+++ b/editor/import_dock.cpp
@@ -32,7 +32,8 @@
 #include "editor_node.h"
 
 class ImportDockParameters : public Object {
-	GDCLASS(ImportDockParameters, Object)
+	GDCLASS(ImportDockParameters, Object);
+
 public:
 	Map<StringName, Variant> values;
 	List<PropertyInfo> properties;
diff --git a/editor/import_dock.h b/editor/import_dock.h
index 77a34e80eb..c839e19d67 100644
--- a/editor/import_dock.h
+++ b/editor/import_dock.h
@@ -43,7 +43,7 @@
 
 class ImportDockParameters;
 class ImportDock : public VBoxContainer {
-	GDCLASS(ImportDock, VBoxContainer)
+	GDCLASS(ImportDock, VBoxContainer);
 
 	Label *imported;
 	OptionButton *import_as;
diff --git a/editor/pane_drag.h b/editor/pane_drag.h
index c9631bb870..36c5953d84 100644
--- a/editor/pane_drag.h
+++ b/editor/pane_drag.h
@@ -35,7 +35,7 @@
 
 class PaneDrag : public Control {
 
-	GDCLASS(PaneDrag, Control)
+	GDCLASS(PaneDrag, Control);
 
 	bool mouse_over;
 
diff --git a/editor/plugins/animation_blend_space_1d_editor.h b/editor/plugins/animation_blend_space_1d_editor.h
index ae4db184e4..4a924b46c1 100644
--- a/editor/plugins/animation_blend_space_1d_editor.h
+++ b/editor/plugins/animation_blend_space_1d_editor.h
@@ -43,7 +43,7 @@
 
 class AnimationNodeBlendSpace1DEditor : public AnimationTreeNodeEditorPlugin {
 
-	GDCLASS(AnimationNodeBlendSpace1DEditor, AnimationTreeNodeEditorPlugin)
+	GDCLASS(AnimationNodeBlendSpace1DEditor, AnimationTreeNodeEditorPlugin);
 
 	Ref<AnimationNodeBlendSpace1D> blend_space;
 
diff --git a/editor/plugins/animation_tree_editor_plugin.h b/editor/plugins/animation_tree_editor_plugin.h
index 4a7f933bbf..4ecbf2e05e 100644
--- a/editor/plugins/animation_tree_editor_plugin.h
+++ b/editor/plugins/animation_tree_editor_plugin.h
@@ -41,7 +41,8 @@
 #include "scene/gui/tree.h"
 
 class AnimationTreeNodeEditorPlugin : public VBoxContainer {
-	GDCLASS(AnimationTreeNodeEditorPlugin, VBoxContainer)
+	GDCLASS(AnimationTreeNodeEditorPlugin, VBoxContainer);
+
 public:
 	virtual bool can_edit(const Ref<AnimationNode> &p_node) = 0;
 	virtual void edit(const Ref<AnimationNode> &p_node) = 0;
diff --git a/editor/plugins/curve_editor_plugin.h b/editor/plugins/curve_editor_plugin.h
index b034368b6a..be774a9696 100644
--- a/editor/plugins/curve_editor_plugin.h
+++ b/editor/plugins/curve_editor_plugin.h
@@ -37,7 +37,8 @@
 
 // Edits a y(x) curve
 class CurveEditor : public Control {
-	GDCLASS(CurveEditor, Control)
+	GDCLASS(CurveEditor, Control);
+
 public:
 	CurveEditor();
 
@@ -120,14 +121,16 @@ private:
 };
 
 class EditorInspectorPluginCurve : public EditorInspectorPlugin {
-	GDCLASS(EditorInspectorPluginCurve, EditorInspectorPlugin)
+	GDCLASS(EditorInspectorPluginCurve, EditorInspectorPlugin);
+
 public:
 	virtual bool can_handle(Object *p_object);
 	virtual void parse_begin(Object *p_object);
 };
 
 class CurveEditorPlugin : public EditorPlugin {
-	GDCLASS(CurveEditorPlugin, EditorPlugin)
+	GDCLASS(CurveEditorPlugin, EditorPlugin);
+
 public:
 	CurveEditorPlugin(EditorNode *p_node);
 
@@ -135,7 +138,8 @@ public:
 };
 
 class CurvePreviewGenerator : public EditorResourcePreviewGenerator {
-	GDCLASS(CurvePreviewGenerator, EditorResourcePreviewGenerator)
+	GDCLASS(CurvePreviewGenerator, EditorResourcePreviewGenerator);
+
 public:
 	virtual bool handles(const String &p_type) const;
 	virtual Ref<Texture> generate(const Ref<Resource> &p_from, const Size2 p_size) const;
diff --git a/editor/plugins/editor_preview_plugins.h b/editor/plugins/editor_preview_plugins.h
index 16b1f3082b..12d693b10a 100644
--- a/editor/plugins/editor_preview_plugins.h
+++ b/editor/plugins/editor_preview_plugins.h
@@ -36,7 +36,8 @@
 void post_process_preview(Ref<Image> p_image);
 
 class EditorTexturePreviewPlugin : public EditorResourcePreviewGenerator {
-	GDCLASS(EditorTexturePreviewPlugin, EditorResourcePreviewGenerator)
+	GDCLASS(EditorTexturePreviewPlugin, EditorResourcePreviewGenerator);
+
 public:
 	virtual bool handles(const String &p_type) const;
 	virtual bool generate_small_preview_automatically() const;
@@ -46,7 +47,8 @@ public:
 };
 
 class EditorImagePreviewPlugin : public EditorResourcePreviewGenerator {
-	GDCLASS(EditorImagePreviewPlugin, EditorResourcePreviewGenerator)
+	GDCLASS(EditorImagePreviewPlugin, EditorResourcePreviewGenerator);
+
 public:
 	virtual bool handles(const String &p_type) const;
 	virtual bool generate_small_preview_automatically() const;
@@ -56,7 +58,8 @@ public:
 };
 
 class EditorBitmapPreviewPlugin : public EditorResourcePreviewGenerator {
-	GDCLASS(EditorBitmapPreviewPlugin, EditorResourcePreviewGenerator)
+	GDCLASS(EditorBitmapPreviewPlugin, EditorResourcePreviewGenerator);
+
 public:
 	virtual bool handles(const String &p_type) const;
 	virtual bool generate_small_preview_automatically() const;
@@ -77,7 +80,7 @@ public:
 
 class EditorMaterialPreviewPlugin : public EditorResourcePreviewGenerator {
 
-	GDCLASS(EditorMaterialPreviewPlugin, EditorResourcePreviewGenerator)
+	GDCLASS(EditorMaterialPreviewPlugin, EditorResourcePreviewGenerator);
 
 	RID scenario;
 	RID sphere;
@@ -123,7 +126,7 @@ public:
 
 class EditorMeshPreviewPlugin : public EditorResourcePreviewGenerator {
 
-	GDCLASS(EditorMeshPreviewPlugin, EditorResourcePreviewGenerator)
+	GDCLASS(EditorMeshPreviewPlugin, EditorResourcePreviewGenerator);
 
 	RID scenario;
 	RID mesh_instance;
@@ -151,7 +154,7 @@ public:
 
 class EditorFontPreviewPlugin : public EditorResourcePreviewGenerator {
 
-	GDCLASS(EditorFontPreviewPlugin, EditorResourcePreviewGenerator)
+	GDCLASS(EditorFontPreviewPlugin, EditorResourcePreviewGenerator);
 
 	RID viewport;
 	RID viewport_texture;
diff --git a/editor/plugins/gradient_editor_plugin.h b/editor/plugins/gradient_editor_plugin.h
index 91790abee8..a87a5fe0ba 100644
--- a/editor/plugins/gradient_editor_plugin.h
+++ b/editor/plugins/gradient_editor_plugin.h
@@ -36,7 +36,7 @@
 #include "scene/gui/gradient_edit.h"
 
 class GradientEditor : public GradientEdit {
-	GDCLASS(GradientEditor, GradientEdit)
+	GDCLASS(GradientEditor, GradientEdit);
 
 	bool editing;
 	Ref<Gradient> gradient;
@@ -54,7 +54,8 @@ public:
 };
 
 class EditorInspectorPluginGradient : public EditorInspectorPlugin {
-	GDCLASS(EditorInspectorPluginGradient, EditorInspectorPlugin)
+	GDCLASS(EditorInspectorPluginGradient, EditorInspectorPlugin);
+
 public:
 	virtual bool can_handle(Object *p_object);
 	virtual void parse_begin(Object *p_object);
diff --git a/editor/plugins/material_editor_plugin.h b/editor/plugins/material_editor_plugin.h
index c3f14c27e5..1405127ab3 100644
--- a/editor/plugins/material_editor_plugin.h
+++ b/editor/plugins/material_editor_plugin.h
@@ -78,7 +78,7 @@ public:
 };
 
 class EditorInspectorPluginMaterial : public EditorInspectorPlugin {
-	GDCLASS(EditorInspectorPluginMaterial, EditorInspectorPlugin)
+	GDCLASS(EditorInspectorPluginMaterial, EditorInspectorPlugin);
 	Ref<Environment> env;
 
 public:
@@ -99,7 +99,8 @@ public:
 };
 
 class SpatialMaterialConversionPlugin : public EditorResourceConversionPlugin {
-	GDCLASS(SpatialMaterialConversionPlugin, EditorResourceConversionPlugin)
+	GDCLASS(SpatialMaterialConversionPlugin, EditorResourceConversionPlugin);
+
 public:
 	virtual String converts_to() const;
 	virtual bool handles(const Ref<Resource> &p_resource) const;
@@ -107,7 +108,8 @@ public:
 };
 
 class ParticlesMaterialConversionPlugin : public EditorResourceConversionPlugin {
-	GDCLASS(ParticlesMaterialConversionPlugin, EditorResourceConversionPlugin)
+	GDCLASS(ParticlesMaterialConversionPlugin, EditorResourceConversionPlugin);
+
 public:
 	virtual String converts_to() const;
 	virtual bool handles(const Ref<Resource> &p_resource) const;
@@ -115,7 +117,8 @@ public:
 };
 
 class CanvasItemMaterialConversionPlugin : public EditorResourceConversionPlugin {
-	GDCLASS(CanvasItemMaterialConversionPlugin, EditorResourceConversionPlugin)
+	GDCLASS(CanvasItemMaterialConversionPlugin, EditorResourceConversionPlugin);
+
 public:
 	virtual String converts_to() const;
 	virtual bool handles(const Ref<Resource> &p_resource) const;
diff --git a/editor/plugins/mesh_editor_plugin.h b/editor/plugins/mesh_editor_plugin.h
index 8ada2dac90..4c2a81ed70 100644
--- a/editor/plugins/mesh_editor_plugin.h
+++ b/editor/plugins/mesh_editor_plugin.h
@@ -73,7 +73,8 @@ public:
 };
 
 class EditorInspectorPluginMesh : public EditorInspectorPlugin {
-	GDCLASS(EditorInspectorPluginMesh, EditorInspectorPlugin)
+	GDCLASS(EditorInspectorPluginMesh, EditorInspectorPlugin);
+
 public:
 	virtual bool can_handle(Object *p_object);
 	virtual void parse_begin(Object *p_object);
diff --git a/editor/plugins/particles_editor_plugin.h b/editor/plugins/particles_editor_plugin.h
index b1b3e3c1c0..b1c53dcf94 100644
--- a/editor/plugins/particles_editor_plugin.h
+++ b/editor/plugins/particles_editor_plugin.h
@@ -42,7 +42,7 @@
 
 class ParticlesEditorBase : public Control {
 
-	GDCLASS(ParticlesEditorBase, Control)
+	GDCLASS(ParticlesEditorBase, Control);
 
 protected:
 	Spatial *base_node;
diff --git a/editor/plugins/root_motion_editor_plugin.h b/editor/plugins/root_motion_editor_plugin.h
index e7fd597235..af5d8fc122 100644
--- a/editor/plugins/root_motion_editor_plugin.h
+++ b/editor/plugins/root_motion_editor_plugin.h
@@ -37,7 +37,7 @@
 #include "scene/animation/animation_tree.h"
 
 class EditorPropertyRootMotion : public EditorProperty {
-	GDCLASS(EditorPropertyRootMotion, EditorProperty)
+	GDCLASS(EditorPropertyRootMotion, EditorProperty);
 	Button *assign;
 	Button *clear;
 	NodePath base_hint;
@@ -60,7 +60,7 @@ public:
 };
 
 class EditorInspectorRootMotionPlugin : public EditorInspectorPlugin {
-	GDCLASS(EditorInspectorRootMotionPlugin, EditorInspectorPlugin)
+	GDCLASS(EditorInspectorRootMotionPlugin, EditorInspectorPlugin);
 
 public:
 	virtual bool can_handle(Object *p_object);
diff --git a/editor/plugins/script_editor_plugin.h b/editor/plugins/script_editor_plugin.h
index 0d9168261a..4ad2156779 100644
--- a/editor/plugins/script_editor_plugin.h
+++ b/editor/plugins/script_editor_plugin.h
@@ -50,7 +50,7 @@
 
 class ScriptEditorQuickOpen : public ConfirmationDialog {
 
-	GDCLASS(ScriptEditorQuickOpen, ConfirmationDialog)
+	GDCLASS(ScriptEditorQuickOpen, ConfirmationDialog);
 
 	LineEdit *search_box;
 	Tree *search_options;
@@ -77,7 +77,7 @@ class ScriptEditorDebugger;
 
 class ScriptEditorBase : public VBoxContainer {
 
-	GDCLASS(ScriptEditorBase, VBoxContainer)
+	GDCLASS(ScriptEditorBase, VBoxContainer);
 
 protected:
 	static void _bind_methods();
diff --git a/editor/plugins/spatial_editor_plugin.h b/editor/plugins/spatial_editor_plugin.h
index ebaa930eb0..701b9e8144 100644
--- a/editor/plugins/spatial_editor_plugin.h
+++ b/editor/plugins/spatial_editor_plugin.h
@@ -431,7 +431,8 @@ public:
 
 class SpatialEditorViewportContainer : public Container {
 
-	GDCLASS(SpatialEditorViewportContainer, Container)
+	GDCLASS(SpatialEditorViewportContainer, Container);
+
 public:
 	enum View {
 		VIEW_USE_1_VIEWPORT,
diff --git a/editor/plugins/style_box_editor_plugin.h b/editor/plugins/style_box_editor_plugin.h
index 95d21b2c44..d31a28b3e4 100644
--- a/editor/plugins/style_box_editor_plugin.h
+++ b/editor/plugins/style_box_editor_plugin.h
@@ -56,7 +56,8 @@ public:
 };
 
 class EditorInspectorPluginStyleBox : public EditorInspectorPlugin {
-	GDCLASS(EditorInspectorPluginStyleBox, EditorInspectorPlugin)
+	GDCLASS(EditorInspectorPluginStyleBox, EditorInspectorPlugin);
+
 public:
 	virtual bool can_handle(Object *p_object);
 	virtual void parse_begin(Object *p_object);
diff --git a/editor/plugins/text_editor.h b/editor/plugins/text_editor.h
index e91909e0ea..277e93fd39 100644
--- a/editor/plugins/text_editor.h
+++ b/editor/plugins/text_editor.h
@@ -35,7 +35,7 @@
 
 class TextEditor : public ScriptEditorBase {
 
-	GDCLASS(TextEditor, ScriptEditorBase)
+	GDCLASS(TextEditor, ScriptEditorBase);
 
 private:
 	CodeTextEditor *code_editor;
diff --git a/editor/plugins/texture_editor_plugin.h b/editor/plugins/texture_editor_plugin.h
index bcbda1fbd7..ed25783303 100644
--- a/editor/plugins/texture_editor_plugin.h
+++ b/editor/plugins/texture_editor_plugin.h
@@ -54,7 +54,8 @@ public:
 };
 
 class EditorInspectorPluginTexture : public EditorInspectorPlugin {
-	GDCLASS(EditorInspectorPluginTexture, EditorInspectorPlugin)
+	GDCLASS(EditorInspectorPluginTexture, EditorInspectorPlugin);
+
 public:
 	virtual bool can_handle(Object *p_object);
 	virtual void parse_begin(Object *p_object);
diff --git a/editor/plugins/tile_set_editor_plugin.h b/editor/plugins/tile_set_editor_plugin.h
index 1176e1bb92..b417414ae0 100644
--- a/editor/plugins/tile_set_editor_plugin.h
+++ b/editor/plugins/tile_set_editor_plugin.h
@@ -46,7 +46,7 @@ class TileSetEditor : public HSplitContainer {
 	friend class TileSetEditorPlugin;
 	friend class TilesetEditorContext;
 
-	GDCLASS(TileSetEditor, HSplitContainer)
+	GDCLASS(TileSetEditor, HSplitContainer);
 
 	enum TextureToolButtons {
 		TOOL_TILESET_ADD_TEXTURE,
diff --git a/editor/plugins/visual_shader_editor_plugin.cpp b/editor/plugins/visual_shader_editor_plugin.cpp
index a1b903576e..7d0c67b5ed 100644
--- a/editor/plugins/visual_shader_editor_plugin.cpp
+++ b/editor/plugins/visual_shader_editor_plugin.cpp
@@ -2350,7 +2350,7 @@ VisualShaderEditorPlugin::~VisualShaderEditorPlugin() {
 ////////////////
 
 class VisualShaderNodePluginInputEditor : public OptionButton {
-	GDCLASS(VisualShaderNodePluginInputEditor, OptionButton)
+	GDCLASS(VisualShaderNodePluginInputEditor, OptionButton);
 
 	Ref<VisualShaderNodeInput> input;
 
@@ -2395,7 +2395,8 @@ public:
 };
 
 class VisualShaderNodePluginDefaultEditor : public VBoxContainer {
-	GDCLASS(VisualShaderNodePluginDefaultEditor, VBoxContainer)
+	GDCLASS(VisualShaderNodePluginDefaultEditor, VBoxContainer);
+
 public:
 	void _property_changed(const String &prop, const Variant &p_value, const String &p_field, bool p_changing = false) {
 
diff --git a/editor/plugins/visual_shader_editor_plugin.h b/editor/plugins/visual_shader_editor_plugin.h
index 1b009b61d5..567706b808 100644
--- a/editor/plugins/visual_shader_editor_plugin.h
+++ b/editor/plugins/visual_shader_editor_plugin.h
@@ -42,7 +42,8 @@
 
 class VisualShaderNodePlugin : public Reference {
 
-	GDCLASS(VisualShaderNodePlugin, Reference)
+	GDCLASS(VisualShaderNodePlugin, Reference);
+
 protected:
 	static void _bind_methods();
 
@@ -245,14 +246,14 @@ public:
 
 class VisualShaderNodePluginDefault : public VisualShaderNodePlugin {
 
-	GDCLASS(VisualShaderNodePluginDefault, VisualShaderNodePlugin)
+	GDCLASS(VisualShaderNodePluginDefault, VisualShaderNodePlugin);
 
 public:
 	virtual Control *create_editor(const Ref<VisualShaderNode> &p_node);
 };
 
 class EditorPropertyShaderMode : public EditorProperty {
-	GDCLASS(EditorPropertyShaderMode, EditorProperty)
+	GDCLASS(EditorPropertyShaderMode, EditorProperty);
 	OptionButton *options;
 
 	void _option_selected(int p_which);
@@ -268,7 +269,7 @@ public:
 };
 
 class EditorInspectorShaderModePlugin : public EditorInspectorPlugin {
-	GDCLASS(EditorInspectorShaderModePlugin, EditorInspectorPlugin)
+	GDCLASS(EditorInspectorShaderModePlugin, EditorInspectorPlugin);
 
 public:
 	virtual bool can_handle(Object *p_object);
@@ -278,7 +279,7 @@ public:
 };
 
 class VisualShaderNodePortPreview : public Control {
-	GDCLASS(VisualShaderNodePortPreview, Control)
+	GDCLASS(VisualShaderNodePortPreview, Control);
 	Ref<VisualShader> shader;
 	VisualShader::Type type;
 	int node;
diff --git a/editor/property_editor.h b/editor/property_editor.h
index 6a709d348b..a8ef1d6fc1 100644
--- a/editor/property_editor.h
+++ b/editor/property_editor.h
@@ -56,7 +56,7 @@ class PropertySelector;
 
 class EditorResourceConversionPlugin : public Reference {
 
-	GDCLASS(EditorResourceConversionPlugin, Reference)
+	GDCLASS(EditorResourceConversionPlugin, Reference);
 
 protected:
 	static void _bind_methods();
diff --git a/editor/property_selector.h b/editor/property_selector.h
index cc5b1d4884..a6c1ec6498 100644
--- a/editor/property_selector.h
+++ b/editor/property_selector.h
@@ -36,7 +36,7 @@
 #include "scene/gui/rich_text_label.h"
 
 class PropertySelector : public ConfirmationDialog {
-	GDCLASS(PropertySelector, ConfirmationDialog)
+	GDCLASS(PropertySelector, ConfirmationDialog);
 
 	LineEdit *search_box;
 	Tree *search_options;
diff --git a/editor/quick_open.h b/editor/quick_open.h
index 14d857fa1c..b6a2e50e88 100644
--- a/editor/quick_open.h
+++ b/editor/quick_open.h
@@ -37,7 +37,7 @@
 #include "scene/gui/tree.h"
 class EditorQuickOpen : public ConfirmationDialog {
 
-	GDCLASS(EditorQuickOpen, ConfirmationDialog)
+	GDCLASS(EditorQuickOpen, ConfirmationDialog);
 
 	LineEdit *search_box;
 	Tree *search_options;