From f44ee891beaad397481dd88da41cb80e6539774f Mon Sep 17 00:00:00 2001 From: Rémi Verschelde Date: Sat, 14 Jan 2017 18:03:38 +0100 Subject: Style: Fix statements ending with ';;' --- core/image.cpp | 8 ++++---- core/input_map.cpp | 6 +++--- core/io/compression.cpp | 2 +- core/map.h | 2 +- core/math/geometry.h | 2 +- core/os/mutex.cpp | 2 +- core/path_db.cpp | 2 +- core/resource.cpp | 6 +++--- core/script_debugger_local.cpp | 2 +- core/set.h | 2 +- core/ustring.cpp | 4 ++-- core/variant.cpp | 2 +- core/variant_call.cpp | 18 +++++++++--------- core/variant_parser.cpp | 16 ++++++++-------- 14 files changed, 37 insertions(+), 37 deletions(-) (limited to 'core') diff --git a/core/image.cpp b/core/image.cpp index a34278ac3..ed505b0f7 100644 --- a/core/image.cpp +++ b/core/image.cpp @@ -764,7 +764,7 @@ void Image::flip_y() { bool gm=mipmaps; if (gm) - clear_mipmaps();; + clear_mipmaps(); @@ -791,7 +791,7 @@ void Image::flip_y() { if (gm) - generate_mipmaps();; + generate_mipmaps(); } @@ -804,7 +804,7 @@ void Image::flip_x() { bool gm=mipmaps; if (gm) - clear_mipmaps();; + clear_mipmaps(); { @@ -829,7 +829,7 @@ void Image::flip_x() { } if (gm) - generate_mipmaps();; + generate_mipmaps(); } diff --git a/core/input_map.cpp b/core/input_map.cpp index cc14daa8e..8473bce80 100644 --- a/core/input_map.cpp +++ b/core/input_map.cpp @@ -199,7 +199,7 @@ Array InputMap::_get_action_list(const StringName& p_action) { if (al) { for(const List::Element *E=al->front();E;E=E->next()) { - ret.push_back(E->get());; + ret.push_back(E->get()); } } @@ -239,7 +239,7 @@ const Map& InputMap::get_action_map() const { void InputMap::load_from_globals() { - input_map.clear();; + input_map.clear(); List pinfo; GlobalConfig::get_singleton()->get_property_list(&pinfo); @@ -254,7 +254,7 @@ void InputMap::load_from_globals() { add_action(name); - Array va = GlobalConfig::get_singleton()->get(pi.name);; + Array va = GlobalConfig::get_singleton()->get(pi.name); for(int i=0;ip_src_size) { deflateEnd(&strm); return -1; diff --git a/core/map.h b/core/map.h index 944838916..d1a4c209a 100644 --- a/core/map.h +++ b/core/map.h @@ -428,7 +428,7 @@ private: Element *aux=node->parent->left; if (aux->color==RED) { _set_color(aux,BLACK); - _set_color(node->parent,RED);; + _set_color(node->parent,RED); _rotate_right(node->parent); aux=node->parent->left; } diff --git a/core/math/geometry.h b/core/math/geometry.h index d5b3a3068..25f5e11fc 100644 --- a/core/math/geometry.h +++ b/core/math/geometry.h @@ -297,7 +297,7 @@ public: if (inters_d<0 || inters_d>rel_l) return false; - Vector3 result=p_from+normal*inters_d;; + Vector3 result=p_from+normal*inters_d; if (r_res) *r_res=result; diff --git a/core/os/mutex.cpp b/core/os/mutex.cpp index f5f7f757c..acdcb492d 100644 --- a/core/os/mutex.cpp +++ b/core/os/mutex.cpp @@ -47,7 +47,7 @@ Mutex::~Mutex() { } -Mutex *_global_mutex=NULL;; +Mutex *_global_mutex=NULL; void _global_lock() { diff --git a/core/path_db.cpp b/core/path_db.cpp index de3a4ccee..679372898 100644 --- a/core/path_db.cpp +++ b/core/path_db.cpp @@ -334,7 +334,7 @@ NodePath::NodePath(const String& p_path) { StringName property; Vector subpath; - int absolute=(path[0]=='/')?1:0;; + int absolute=(path[0]=='/')?1:0; bool last_is_slash=true; int slices=0; int subpath_pos=path.find(":"); diff --git a/core/resource.cpp b/core/resource.cpp index df18d9584..4b09a506f 100644 --- a/core/resource.cpp +++ b/core/resource.cpp @@ -200,7 +200,7 @@ void Resource::set_path(const String& p_path, bool p_take_over) { if (path_cache!="") { ResourceCache::lock->write_lock(); - ResourceCache::resources[path_cache]=this;; + ResourceCache::resources[path_cache]=this; ResourceCache::lock->write_unlock(); } @@ -534,9 +534,9 @@ void ResourceCache::reload_externals() { bool ResourceCache::has(const String& p_path) { - lock->read_lock();; + lock->read_lock(); bool b = resources.has(p_path); - lock->read_unlock();; + lock->read_unlock(); return b; diff --git a/core/script_debugger_local.cpp b/core/script_debugger_local.cpp index 5cce68af1..22aceac4c 100644 --- a/core/script_debugger_local.cpp +++ b/core/script_debugger_local.cpp @@ -287,7 +287,7 @@ void ScriptDebuggerLocal::profiling_end() { for(int i=0;iparent->left; if (aux->color==RED) { _set_color(aux,BLACK); - _set_color(node->parent,RED);; + _set_color(node->parent,RED); _rotate_right(node->parent); aux=node->parent->left; } diff --git a/core/ustring.cpp b/core/ustring.cpp index bfcdcb39e..71934b295 100644 --- a/core/ustring.cpp +++ b/core/ustring.cpp @@ -1257,7 +1257,7 @@ _FORCE_INLINE static int parse_utf8_char(const char *p_utf8,unsigned int *p_ucs4 unichar=*p_utf8; else { - unichar=(0xFF >> (len +1)) & *p_utf8;; + unichar=(0xFF >> (len +1)) & *p_utf8; for (int i=1;i> (len +1)) & *p_utf8;; + unichar=(0xFF >> (len +1)) & *p_utf8; for (int i=1;i data = img.get_data(); int len = data.size(); PoolVector::Read r = data.read(); - const uint8_t *ptr=r.ptr();; + const uint8_t *ptr=r.ptr(); for (int i=0;i0) @@ -2133,7 +2133,7 @@ Error VariantWriter::write(const Variant& p_variant, StoreStringFunc p_store_str PoolVector data = p_variant; int len = data.size(); PoolVector::Read r = data.read(); - const uint8_t *ptr=r.ptr();; + const uint8_t *ptr=r.ptr(); for (int i=0;i0) @@ -2152,7 +2152,7 @@ Error VariantWriter::write(const Variant& p_variant, StoreStringFunc p_store_str PoolVector data = p_variant; int len = data.size(); PoolVector::Read r = data.read(); - const int *ptr=r.ptr();; + const int *ptr=r.ptr(); for (int i=0;i data = p_variant; int len = data.size(); PoolVector::Read r = data.read(); - const real_t *ptr=r.ptr();; + const real_t *ptr=r.ptr(); for (int i=0;i data = p_variant; int len = data.size(); PoolVector::Read r = data.read(); - const String *ptr=r.ptr();; + const String *ptr=r.ptr(); String s; //write_string("\n"); @@ -2213,7 +2213,7 @@ Error VariantWriter::write(const Variant& p_variant, StoreStringFunc p_store_str PoolVector data = p_variant; int len = data.size(); PoolVector::Read r = data.read(); - const Vector2 *ptr=r.ptr();; + const Vector2 *ptr=r.ptr(); for (int i=0;i data = p_variant; int len = data.size(); PoolVector::Read r = data.read(); - const Vector3 *ptr=r.ptr();; + const Vector3 *ptr=r.ptr(); for (int i=0;i data = p_variant; int len = data.size(); PoolVector::Read r = data.read(); - const Color *ptr=r.ptr();; + const Color *ptr=r.ptr(); for (int i=0;i