No longer expose a distinct subtype for native files.

love2d · Jan 4, 2025 · e40485d · e40485d
1 parent 3963265
commit e40485d
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 8 deletions.
diff --git a/src/modules/event/sdl/Event.cpp b/src/modules/event/sdl/Event.cpp
@@ -485,8 +485,8 @@ Message *Event::convert(const SDL_Event &e)
 			}
 			else
 			{
-				auto *file = new love::filesystem::NativeFile(filepath, love::filesystem::File::MODE_CLOSED);
-				vargs.emplace_back(&love::filesystem::NativeFile::type, file);
+				auto *file = filesystem->openNativeFile(filepath, love::filesystem::File::MODE_CLOSED);
+				vargs.emplace_back(&love::filesystem::File::type, file);
 				vargs.emplace_back(x);
 				vargs.emplace_back(y);
 				msg = new Message("filedropped", vargs);

diff --git a/src/modules/filesystem/Filesystem.cpp b/src/modules/filesystem/Filesystem.cpp
@@ -68,7 +68,7 @@ bool Filesystem::isAndroidSaveExternal() const
 	return useExternal;
 }
 
-NativeFile *Filesystem::openNativeFile(const char *path, File::Mode mode) const
+File *Filesystem::openNativeFile(const char *path, File::Mode mode) const
 {
 	return new NativeFile(path, mode);
 }

diff --git a/src/modules/filesystem/Filesystem.h b/src/modules/filesystem/Filesystem.h
@@ -175,7 +175,7 @@ class Filesystem : public Module
 	 **/
 	virtual File *openFile(const char *filename, File::Mode mode) const = 0;
 
-	NativeFile *openNativeFile(const char *path, File::Mode mode) const;
+	File *openNativeFile(const char *path, File::Mode mode) const;
 
 	/**
 	 * Creates a new FileData object. Data will be copied.

diff --git a/src/modules/filesystem/NativeFile.cpp b/src/modules/filesystem/NativeFile.cpp
@@ -41,8 +41,6 @@ namespace love
 namespace filesystem
 {
 
-love::Type NativeFile::type("NativeFile", &File::type);
-
 NativeFile::NativeFile(const std::string &filename, Mode mode)
 	: filename(filename)
 	, file(nullptr)

diff --git a/src/modules/filesystem/NativeFile.h b/src/modules/filesystem/NativeFile.h
@@ -37,8 +37,6 @@ class NativeFile : public File
 {
 public:
 
-	static love::Type type;
-
 	NativeFile(const std::string &filename, Mode mode);
 	virtual ~NativeFile();
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,8 +37,6 @@ class NativeFile : public File @@
     {
     public:
-    	static love::Type type;
     	NativeFile(const std::string &filename, Mode mode);
     	virtual ~NativeFile();
@@ Expand Down @@