diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-19 11:24:58 +0200 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-19 11:24:58 +0200 |
commit | ca3192d18abaa983fd3e8d5949ddc0ad1f1f88e6 (patch) | |
tree | 345ae04a473a971465e9bcf6eb5ef7c32a9ee2a3 /servers | |
parent | 74b5d6839aa2008ba5cf0b71be156cf41494e8b3 (diff) |
Style: Fix unnecessary semicolons that confused clang-format
Diffstat (limited to 'servers')
-rw-r--r-- | servers/audio/audio_driver_dummy.cpp | 8 | ||||
-rw-r--r-- | servers/audio/audio_driver_dummy.h | 6 | ||||
-rw-r--r-- | servers/physics_2d/physics_server_2d_sw.cpp | 4 | ||||
-rw-r--r-- | servers/physics_2d/physics_server_2d_sw.h | 2 | ||||
-rw-r--r-- | servers/physics_3d/physics_server_3d_sw.cpp | 8 | ||||
-rw-r--r-- | servers/physics_3d/physics_server_3d_sw.h | 4 | ||||
-rw-r--r-- | servers/xr/xr_interface.cpp | 4 | ||||
-rw-r--r-- | servers/xr/xr_positional_tracker.cpp | 4 | ||||
-rw-r--r-- | servers/xr/xr_positional_tracker.h | 2 |
9 files changed, 9 insertions, 33 deletions
diff --git a/servers/audio/audio_driver_dummy.cpp b/servers/audio/audio_driver_dummy.cpp index c539b582da..ff0d2cad65 100644 --- a/servers/audio/audio_driver_dummy.cpp +++ b/servers/audio/audio_driver_dummy.cpp @@ -114,11 +114,3 @@ void AudioDriverDummy::finish() { memdelete(thread); thread = nullptr; }; - -AudioDriverDummy::AudioDriverDummy() { - thread = nullptr; -}; - -AudioDriverDummy::~AudioDriverDummy(){ - -}; diff --git a/servers/audio/audio_driver_dummy.h b/servers/audio/audio_driver_dummy.h index 3cf31e8be6..84a566e420 100644 --- a/servers/audio/audio_driver_dummy.h +++ b/servers/audio/audio_driver_dummy.h @@ -37,7 +37,7 @@ #include "core/os/thread.h" class AudioDriverDummy : public AudioDriver { - Thread *thread; + Thread *thread = nullptr; Mutex mutex; int32_t *samples_in; @@ -67,8 +67,8 @@ public: virtual void unlock(); virtual void finish(); - AudioDriverDummy(); - ~AudioDriverDummy(); + AudioDriverDummy() {} + ~AudioDriverDummy() {} }; #endif diff --git a/servers/physics_2d/physics_server_2d_sw.cpp b/servers/physics_2d/physics_server_2d_sw.cpp index e9b2ac6875..a686903763 100644 --- a/servers/physics_2d/physics_server_2d_sw.cpp +++ b/servers/physics_2d/physics_server_2d_sw.cpp @@ -1344,7 +1344,3 @@ PhysicsServer2DSW::PhysicsServer2DSW() { using_threads = int(ProjectSettings::get_singleton()->get("physics/2d/thread_model")) == 2; flushing_queries = false; }; - -PhysicsServer2DSW::~PhysicsServer2DSW(){ - -}; diff --git a/servers/physics_2d/physics_server_2d_sw.h b/servers/physics_2d/physics_server_2d_sw.h index d08f836fa9..f9b0bc716c 100644 --- a/servers/physics_2d/physics_server_2d_sw.h +++ b/servers/physics_2d/physics_server_2d_sw.h @@ -288,7 +288,7 @@ public: int get_process_info(ProcessInfo p_info); PhysicsServer2DSW(); - ~PhysicsServer2DSW(); + ~PhysicsServer2DSW() {} }; #endif diff --git a/servers/physics_3d/physics_server_3d_sw.cpp b/servers/physics_3d/physics_server_3d_sw.cpp index b625ae2271..1c2329f2dc 100644 --- a/servers/physics_3d/physics_server_3d_sw.cpp +++ b/servers/physics_3d/physics_server_3d_sw.cpp @@ -1320,10 +1320,6 @@ void PhysicsServer3DSW::step(real_t p_step) { #endif } -void PhysicsServer3DSW::sync(){ - -}; - void PhysicsServer3DSW::flush_queries() { #ifndef _3D_DISABLED @@ -1451,7 +1447,3 @@ PhysicsServer3DSW::PhysicsServer3DSW() { active = true; flushing_queries = false; }; - -PhysicsServer3DSW::~PhysicsServer3DSW(){ - -}; diff --git a/servers/physics_3d/physics_server_3d_sw.h b/servers/physics_3d/physics_server_3d_sw.h index 46341bb380..26230ef674 100644 --- a/servers/physics_3d/physics_server_3d_sw.h +++ b/servers/physics_3d/physics_server_3d_sw.h @@ -365,7 +365,7 @@ public: virtual void set_active(bool p_active); virtual void init(); virtual void step(real_t p_step); - virtual void sync(); + virtual void sync() {} virtual void flush_queries(); virtual void finish(); @@ -374,7 +374,7 @@ public: int get_process_info(ProcessInfo p_info); PhysicsServer3DSW(); - ~PhysicsServer3DSW(); + ~PhysicsServer3DSW() {} }; #endif diff --git a/servers/xr/xr_interface.cpp b/servers/xr/xr_interface.cpp index 5ffe50894a..e9858416ec 100644 --- a/servers/xr/xr_interface.cpp +++ b/servers/xr/xr_interface.cpp @@ -134,9 +134,9 @@ bool XRInterface::get_anchor_detection_is_enabled() const { return false; }; -void XRInterface::set_anchor_detection_is_enabled(bool p_enable){ +void XRInterface::set_anchor_detection_is_enabled(bool p_enable) { // don't do anything here, this needs to be implemented on AR interface to enable/disable things like plane detection etc. -}; +} int XRInterface::get_camera_feed_id() { // don't do anything here, this needs to be implemented on AR interface to enable/disable things like plane detection etc. diff --git a/servers/xr/xr_positional_tracker.cpp b/servers/xr/xr_positional_tracker.cpp index 20853c9027..ad5cee92ea 100644 --- a/servers/xr/xr_positional_tracker.cpp +++ b/servers/xr/xr_positional_tracker.cpp @@ -232,7 +232,3 @@ XRPositionalTracker::XRPositionalTracker() { hand = TRACKER_HAND_UNKNOWN; rumble = 0.0; }; - -XRPositionalTracker::~XRPositionalTracker(){ - -}; diff --git a/servers/xr/xr_positional_tracker.h b/servers/xr/xr_positional_tracker.h index d9d1f909e9..515359e9b1 100644 --- a/servers/xr/xr_positional_tracker.h +++ b/servers/xr/xr_positional_tracker.h @@ -96,7 +96,7 @@ public: Transform get_transform(bool p_adjust_by_reference_frame) const; XRPositionalTracker(); - ~XRPositionalTracker(); + ~XRPositionalTracker() {} }; VARIANT_ENUM_CAST(XRPositionalTracker::TrackerHand); |