diff options
| -rw-r--r-- | core/io/file_access_pack.h | 1 | ||||
| -rw-r--r-- | core/io/resource_format_binary.cpp | 2 | ||||
| -rw-r--r-- | core/os/dir_access.h | 2 | ||||
| -rw-r--r-- | drivers/unix/dir_access_unix.h | 1 | ||||
| -rw-r--r-- | drivers/windows/dir_access_windows.cpp | 34 | ||||
| -rw-r--r-- | drivers/windows/dir_access_windows.h | 1 | ||||
| -rw-r--r-- | editor/editor_file_system.cpp | 4 | ||||
| -rw-r--r-- | platform/android/dir_access_jandroid.cpp | 1 | ||||
| -rw-r--r-- | scene/animation/animation_tree.cpp | 2 |
9 files changed, 21 insertions, 27 deletions
diff --git a/core/io/file_access_pack.h b/core/io/file_access_pack.h index ae5e83d405..a90672ce26 100644 --- a/core/io/file_access_pack.h +++ b/core/io/file_access_pack.h @@ -223,7 +223,6 @@ public: virtual String get_filesystem_type() const; - DirAccessPack(); ~DirAccessPack(); }; diff --git a/core/io/resource_format_binary.cpp b/core/io/resource_format_binary.cpp index e27dea37d6..4d4134b745 100644 --- a/core/io/resource_format_binary.cpp +++ b/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 { diff --git a/core/os/dir_access.h b/core/os/dir_access.h index 36ccbc9b4d..bde19bd5ae 100644 --- a/core/os/dir_access.h +++ b/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); diff --git a/drivers/unix/dir_access_unix.h b/drivers/unix/dir_access_unix.h index b85ae719ff..579cb0e798 100644 --- a/drivers/unix/dir_access_unix.h +++ b/drivers/unix/dir_access_unix.h @@ -84,7 +84,6 @@ public: virtual String get_filesystem_type() const; - DirAccessUnix(); ~DirAccessUnix(); }; diff --git a/drivers/windows/dir_access_windows.cpp b/drivers/windows/dir_access_windows.cpp index 8ac4e53c65..499bb4f34b 100644 --- a/drivers/windows/dir_access_windows.cpp +++ b/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); } diff --git a/drivers/windows/dir_access_windows.h b/drivers/windows/dir_access_windows.h index b8599d5c26..10eee07f0c 100644 --- a/drivers/windows/dir_access_windows.h +++ b/drivers/windows/dir_access_windows.h @@ -84,7 +84,6 @@ public: virtual String get_filesystem_type() const; - DirAccessWindows(); ~DirAccessWindows(); }; diff --git a/editor/editor_file_system.cpp b/editor/editor_file_system.cpp index d958ecebf6..fe8d57d1a1 100644 --- a/editor/editor_file_system.cpp +++ b/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() { diff --git a/platform/android/dir_access_jandroid.cpp b/platform/android/dir_access_jandroid.cpp index 62cc7a380f..4b3d93aaa7 100644 --- a/platform/android/dir_access_jandroid.cpp +++ b/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() { diff --git a/scene/animation/animation_tree.cpp b/scene/animation/animation_tree.cpp index dc022bcd70..c32001dbcd 100644 --- a/scene/animation/animation_tree.cpp +++ b/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; } } |