Merge pull request #29027 from akien-mga/clang-format-8.0

Travis: Update clang-format to version 8.0

.travis.yml

@@ -23,9 +23,9 @@ matrix:
       addons:
         apt:
           sources:
-            - llvm-toolchain-xenial-6.0
+            - llvm-toolchain-xenial-8
           packages:
-            - clang-format-6.0
+            - clang-format-8
 
     - env: PLATFORM=x11 TOOLS=yes TARGET=debug CACHE_NAME=${PLATFORM}-tools-mono-gcc-8 MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" EXTRA_ARGS="module_mono_enabled=yes mono_glue=no warnings=extra werror=yes"
       os: linux

core/io/resource_importer.cpp

@@ -302,7 +302,6 @@ String ResourceFormatImporter::get_import_group_file(const String &p_path) const
 	PathAndType pat;
 	_get_path_and_type(p_path, pat, &valid);
 	return valid ? pat.group_file : String();
-
 }
 
 bool ResourceFormatImporter::is_import_valid(const String &p_path) const {

misc/travis/clang-format.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-CLANG_FORMAT=clang-format-6.0
+CLANG_FORMAT=clang-format-8
 
 if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
     # Check the whole commit range against $TRAVIS_BRANCH, the base merge branch

scene/audio/audio_stream_player.cpp

@@ -32,7 +32,6 @@
 
 #include "core/engine.h"
 
-
 void AudioStreamPlayer::_mix_to_bus(const AudioFrame *p_frames, int p_amount) {
 
 	int bus_index = AudioServer::get_singleton()->thread_find_bus_index(bus);
@@ -66,10 +65,8 @@ void AudioStreamPlayer::_mix_to_bus(const AudioFrame *p_frames,int p_amount) {
 	}
 }
 
-
 void AudioStreamPlayer::_mix_internal(bool p_fadeout) {
 
-
 	//get data
 	AudioFrame *buffer = mix_buffer.ptrw();
 	int buffer_size = mix_buffer.size();
@@ -95,7 +92,6 @@ void AudioStreamPlayer::_mix_internal(bool p_fadeout) {
 	mix_volume_db = target_volume;
 
 	_mix_to_bus(buffer, buffer_size);
-
 }
 
 void AudioStreamPlayer::_mix_audio() {

scene/audio/audio_stream_player.h

@@ -112,7 +112,6 @@ public:
 
 	Ref<AudioStreamPlayback> get_stream_playback();
 
-
 	AudioStreamPlayer();
 	~AudioStreamPlayer();
 };

scene/resources/bit_map.cpp

@@ -649,10 +649,8 @@ void BitMap::blit(const Vector2& p_pos,const Ref<BitMap>& p_bitmap) {
 			}
 		}
 	}
-
 }
 
-
 void BitMap::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("create", "size"), &BitMap::create);

scene/resources/resource_format_text.cpp

@@ -449,7 +449,6 @@ Error ResourceInteractiveLoaderText::poll() {
 			//remember ID for saving
 			res->set_id_for_path(local_path, index);
 #endif
-
 		}
 
 		ExtResource er;
@@ -1545,9 +1544,6 @@ Error ResourceFormatSaverTextInstance::save(const String &p_path, const RES &p_r
 	}
 
 	{
-
-
-
 	}
 
 #ifdef TOOLS_ENABLED
@@ -1598,7 +1594,6 @@ Error ResourceFormatSaverTextInstance::save(const String &p_path, const RES &p_r
 
 	sorted_er.sort();
 
-
 	for (int i = 0; i < sorted_er.size(); i++) {
 		String p = sorted_er[i].resource->get_path();
 

scene/resources/resource_format_text.h

@@ -175,7 +175,6 @@ class ResourceFormatSaverTextInstance {
 		bool operator<(const ResourceSort &p_right) const {
 			return index < p_right.index;
 		}
-
 	};
 
 	void _find_resources(const Variant &p_variant, bool p_main = false);