mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-21 03:18:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix code style issues

Browse Source
This commit is contained in:
Rémi Verschelde 2019-01-26 22:35:31 +01:00
parent 16fa788510
commit c3b0ee5941
9 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/io/file_access_pack.h
View File

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

2
core/io/resource_format_binary.cpp
View File

@ -342,7 +342,7 @@ Error ResourceInteractiveLoaderBinary::parse_variant(Variant &r_v) {
int erindex = f->get_32(); int erindex = f->get_32();
if (erindex < 0 || erindex >= external_resources.size()) { 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(); r_v = Variant();
} else { } else {

2
core/os/dir_access.h
View File

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

1
drivers/unix/dir_access_unix.h
View File

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

32
drivers/windows/dir_access_windows.cpp
View File

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

1
drivers/windows/dir_access_windows.h
View File

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

4
editor/editor_file_system.cpp
View File

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

1
platform/android/dir_access_jandroid.cpp
View File

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

2
scene/animation/animation_tree.cpp
View File

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