Browse Source

Fix code style issues

Rémi Verschelde 6 years ago
parent
commit
c3b0ee5941

+ 0 - 1
core/io/file_access_pack.h

@@ -223,7 +223,6 @@ public:
 
 	virtual String get_filesystem_type() const;
 
-
 	DirAccessPack();
 	~DirAccessPack();
 };

+ 1 - 1
core/io/resource_format_binary.cpp

@@ -342,7 +342,7 @@ Error ResourceInteractiveLoaderBinary::parse_variant(Variant &r_v) {
 					int erindex = f->get_32();
 
 					if (erindex < 0 || erindex >= external_resources.size()) {
-						WARN_PRINT("Broken external resource! (index out of size");
+						WARN_PRINT("Broken external resource! (index out of size)");
 						r_v = Variant();
 					} else {
 

+ 1 - 1
core/os/dir_access.h

@@ -98,7 +98,7 @@ public:
 	virtual Error rename(String p_from, String p_to) = 0;
 	virtual Error remove(String p_name) = 0;
 
-	virtual String get_filesystem_type() const=0 ;
+	virtual String get_filesystem_type() const = 0;
 	static String get_full_path(const String &p_path, AccessType p_access);
 	static DirAccess *create_for_path(const String &p_path);
 

+ 0 - 1
drivers/unix/dir_access_unix.h

@@ -84,7 +84,6 @@ public:
 
 	virtual String get_filesystem_type() const;
 
-
 	DirAccessUnix();
 	~DirAccessUnix();
 };

+ 17 - 17
drivers/windows/dir_access_windows.cpp

@@ -347,27 +347,27 @@ size_t DirAccessWindows::get_space_left() {
 }
 
 String DirAccessWindows::get_filesystem_type() const {
-	String path = fix_path(const_cast<DirAccessWindows*>(this)->get_current_dir());
-	print_line("fixed path: "+path);
+	String path = fix_path(const_cast<DirAccessWindows *>(this)->get_current_dir());
+	print_line("fixed path: " + path);
 	int unit_end = path.find(":");
-	ERR_FAIL_COND_V(unit_end==-1,String());
-	String unit = path.substr(0,unit_end+1) + "\\";
-	print_line("unit: "+unit);
+	ERR_FAIL_COND_V(unit_end == -1, String());
+	String unit = path.substr(0, unit_end + 1) + "\\";
+	print_line("unit: " + unit);
 
 	WCHAR szVolumeName[100];
 	WCHAR szFileSystemName[10];
-	DWORD dwSerialNumber       = 0;
-	DWORD dwMaxFileNameLength  = 0;
-	DWORD dwFileSystemFlags    = 0;
-
-	if(::GetVolumeInformationW(unit.c_str(),
-				    szVolumeName,
-				    sizeof(szVolumeName),
-				    &dwSerialNumber,
-				    &dwMaxFileNameLength,
-				    &dwFileSystemFlags,
-				    szFileSystemName,
-				  sizeof(szFileSystemName)) == TRUE) {
+	DWORD dwSerialNumber = 0;
+	DWORD dwMaxFileNameLength = 0;
+	DWORD dwFileSystemFlags = 0;
+
+	if (::GetVolumeInformationW(unit.c_str(),
+				szVolumeName,
+				sizeof(szVolumeName),
+				&dwSerialNumber,
+				&dwMaxFileNameLength,
+				&dwFileSystemFlags,
+				szFileSystemName,
+				sizeof(szFileSystemName)) == TRUE) {
 
 		return String(szFileSystemName);
 	}

+ 0 - 1
drivers/windows/dir_access_windows.h

@@ -84,7 +84,6 @@ public:
 
 	virtual String get_filesystem_type() const;
 
-
 	DirAccessWindows();
 	~DirAccessWindows();
 };

+ 1 - 3
editor/editor_file_system.cpp

@@ -1810,13 +1810,11 @@ EditorFileSystem::EditorFileSystem() {
 		da->make_dir("res://.import");
 	}
 	//this should probably also work on Unix and use the string it returns for FAT32
-	using_fat_32 = da->get_filesystem_type()=="FAT32";
+	using_fat_32 = da->get_filesystem_type() == "FAT32";
 	memdelete(da);
 
 	scan_total = 0;
 	update_script_classes_queued = false;
-
-
 }
 
 EditorFileSystem::~EditorFileSystem() {

+ 0 - 1
platform/android/dir_access_jandroid.cpp

@@ -217,7 +217,6 @@ String DirAccessJAndroid::get_filesystem_type() const {
 	return "APK";
 }
 
-
 //FileType get_file_type() const;
 size_t DirAccessJAndroid::get_space_left() {
 

+ 1 - 1
scene/animation/animation_tree.cpp

@@ -686,7 +686,7 @@ bool AnimationTree::_update_caches(AnimationPlayer *player) {
 
 					} break;
 					default: {
-						ERR_PRINT("Animation corrupted (invalid track type");
+						ERR_PRINT("Animation corrupted (invalid track type)");
 						continue;
 					}
 				}