Browse Source

Move all love::Type initialisation to their respective (new) files

Previously Data, Stream, Drawable and Image (and for some reason Filesystem) had types in types.cpp

--HG--
branch : dynamiccore2
Bart van Strien 8 years ago
parent
commit
06f4d6363e

+ 29 - 0
src/common/Data.cpp

@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) 2006-2016 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.
+ **/
+
+// LOVE
+#include "Data.h"
+
+namespace love
+{
+
+love::Type Data::type("Data", &Object::type);
+
+} // love

+ 29 - 0
src/common/Stream.cpp

@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) 2006-2015 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.
+ **/
+
+// LOVE
+#include "Stream.h"
+
+namespace love
+{
+
+love::Type Stream::type("Stream", &Object::type);
+
+} // love

+ 0 - 13
src/common/types.cpp

@@ -78,16 +78,3 @@ Type *Type::byName(const char *name)
 }
 
 } // love
-
-// FIXME: Move this to the relevant files
-#include "Data.h"
-#include "Stream.h"
-#include "graphics/Drawable.h"
-#include "filesystem/Filesystem.h"
-#include "image/Image.h"
-
-love::Type love::Data::type("Data", &Object::type);
-love::Type love::Stream::type("Stream", &Object::type);
-love::Type love::graphics::Drawable::type("Drawable", &Object::type);
-love::Type love::filesystem::Filesystem::type("filesystem", &Module::type);
-love::Type love::image::Image::type("image", &Module::type);

+ 2 - 0
src/modules/filesystem/Filesystem.cpp

@@ -42,6 +42,8 @@ namespace love
 namespace filesystem
 {
 
+love::Type Filesystem::type("filesystem", &Module::type);
+
 Filesystem::Filesystem()
 {
 }

+ 32 - 0
src/modules/graphics/Drawable.cpp

@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) 2006-2016 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.
+ **/
+
+// LOVE
+#include "Drawable.h"
+
+namespace love
+{
+namespace graphics
+{
+
+love::Type Drawable::type("Drawable", &Object::type);
+
+} // graphics
+} // love

+ 32 - 0
src/modules/image/Image.cpp

@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) 2006-2016 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.
+ **/
+
+// LOVE
+#include "Image.h"
+
+namespace love
+{
+namespace image
+{
+
+love::Type Image::type("image", &Module::type);
+
+} // image
+} // love