From a9e3fb12ccd2898a1527607ea90ba95609f25552 Mon Sep 17 00:00:00 2001
From: rude <none@none>
Date: Tue, 28 Jul 2009 17:21:29 +0200
Subject: [PATCH] Moved FileData to love::filesystem.

---
 platform/msvc2008/love.vcproj                 | 28 ++------
 .../filesystem/{physfs => }/FileData.cpp      |  3 -
 src/modules/filesystem/FileData.h             | 39 ++++++-----
 src/modules/filesystem/physfs/FileData.h      | 68 -------------------
 4 files changed, 26 insertions(+), 112 deletions(-)
 rename src/modules/filesystem/{physfs => }/FileData.cpp (98%)
 delete mode 100644 src/modules/filesystem/physfs/FileData.h

diff --git a/platform/msvc2008/love.vcproj b/platform/msvc2008/love.vcproj
index 95acd0382..8e6521773 100644
--- a/platform/msvc2008/love.vcproj
+++ b/platform/msvc2008/love.vcproj
@@ -602,6 +602,10 @@
 					RelativePath="..\..\src\modules\filesystem\File.h"
 					>
 				</File>
+				<File
+					RelativePath="..\..\src\modules\filesystem\FileData.cpp"
+					>
+				</File>
 				<File
 					RelativePath="..\..\src\modules\filesystem\FileData.h"
 					>
@@ -633,30 +637,6 @@
 						RelativePath="..\..\src\modules\filesystem\physfs\File.h"
 						>
 					</File>
-					<File
-						RelativePath="..\..\src\modules\filesystem\physfs\FileData.cpp"
-						>
-						<FileConfiguration
-							Name="Debug|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)\filesystem\physfs\"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Release|Win32"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-								ObjectFile="$(IntDir)\filesystem\physfs\"
-							/>
-						</FileConfiguration>
-					</File>
-					<File
-						RelativePath="..\..\src\modules\filesystem\physfs\FileData.h"
-						>
-					</File>
 					<File
 						RelativePath="..\..\src\modules\filesystem\physfs\Filesystem.cpp"
 						>
diff --git a/src/modules/filesystem/physfs/FileData.cpp b/src/modules/filesystem/FileData.cpp
similarity index 98%
rename from src/modules/filesystem/physfs/FileData.cpp
rename to src/modules/filesystem/FileData.cpp
index 45b6da8c7..f406e0b5b 100644
--- a/src/modules/filesystem/physfs/FileData.cpp
+++ b/src/modules/filesystem/FileData.cpp
@@ -26,8 +26,6 @@
 namespace love
 {
 namespace filesystem
-{
-namespace physfs
 {
 	FileData::FileData(int size, const std::string & filename)
 		: data(new char[size]), size(size), filename(filename)
@@ -61,6 +59,5 @@ namespace physfs
 		return extension;
 	}
 
-} // physfs
 } // filesystem
 } // love
diff --git a/src/modules/filesystem/FileData.h b/src/modules/filesystem/FileData.h
index 996672bc7..3e2452564 100644
--- a/src/modules/filesystem/FileData.h
+++ b/src/modules/filesystem/FileData.h
@@ -22,10 +22,8 @@
 #define LOVE_FILESYSTEM_FILE_DATA_H
 
 // LOVE
-#include <common/Data.h>
-
-// STD
 #include <string>
+#include <common/Data.h>
 
 namespace love
 {	
@@ -34,24 +32,31 @@ namespace filesystem
 	class FileData : public Data
 	{
 	private:
+
+		// The actual data.
+		char * data;
+
+		// Size of the data.
+		int size;
+
+		// The filename used for error purposes.
+		std::string filename;
+
+		// The extension (without dot). Used to identify file type.
+		std::string extension;
+
 	public:
 
-		/**
-		* Destructor.
-		**/
-		virtual ~FileData(){};
+		FileData(int size, const std::string & filename);
 
-		/**
-		* Gets a filename for this FileData. 
-		* @return The filename for this FileData, with extension.
-		**/
-		virtual const std::string & getFilename() const = 0;
+		virtual ~FileData();
 
-		/**
-		* Gets the file extension for this FileData, or empty string if none.
-		* @return The file extension for this FileData (without the dot).
-		**/
-		virtual const std::string & getExtension() const = 0;
+		// Implements Data.
+		void * getData() const;
+		int getSize() const;
+
+		const std::string & getFilename() const;
+		const std::string & getExtension() const;
 
 	}; // FileData
 
diff --git a/src/modules/filesystem/physfs/FileData.h b/src/modules/filesystem/physfs/FileData.h
deleted file mode 100644
index f873c7fc8..000000000
--- a/src/modules/filesystem/physfs/FileData.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
-* Copyright (c) 2006-2009 LOVE Development Team
-* 
-* This software is provided 'as-is', without any express or implied
-* warranty.  In no event will the authors be held liable for any damages
-* arising from the use of this software.
-* 
-* Permission is granted to anyone to use this software for any purpose,
-* including commercial applications, and to alter it and redistribute it
-* freely, subject to the following restrictions:
-* 
-* 1. The origin of this software must not be misrepresented; you must not
-*    claim that you wrote the original software. If you use this software
-*    in a product, an acknowledgment in the product documentation would be
-*    appreciated but is not required.
-* 2. Altered source versions must be plainly marked as such, and must not be
-*    misrepresented as being the original software.
-* 3. This notice may not be removed or altered from any source distribution.
-**/
-
-#ifndef LOVE_FILESYSTEM_PHYSFS_FILE_DATA_H
-#define LOVE_FILESYSTEM_PHYSFS_FILE_DATA_H
-
-// LOVE
-#include <filesystem/FileData.h>
-
-namespace love
-{	
-namespace filesystem
-{
-namespace physfs
-{
-	class FileData : public love::filesystem::FileData
-	{
-	private:
-
-		// The actual data.
-		char * data;
-
-		// Size of the data.
-		int size;
-
-		// The filename used for error purposes.
-		std::string filename;
-
-		// The extension (without dot). Used to identify file type.
-		std::string extension;
-
-	public:
-
-		FileData(int size, const std::string & filename);
-
-		virtual ~FileData();
-
-		// Implements Data.
-		void * getData() const;
-		int getSize() const;
-
-		const std::string & getFilename() const;
-		const std::string & getExtension() const;
-
-	}; // FileData
-
-} // physfs
-} // filesystem
-} // love
-
-#endif // LOVE_FILESYSTEM_PHYSFS_FILE_DATA_H
\ No newline at end of file