From 06f4d6363e3cf4623825c719211bee6066dca95a Mon Sep 17 00:00:00 2001 From: Bart van Strien Date: Wed, 30 Nov 2016 12:55:08 +0100 Subject: [PATCH] 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 --- src/common/Data.cpp | 29 ++++++++++++++++++++++++ src/common/Stream.cpp | 29 ++++++++++++++++++++++++ src/common/types.cpp | 13 ----------- src/modules/filesystem/Filesystem.cpp | 2 ++ src/modules/graphics/Drawable.cpp | 32 +++++++++++++++++++++++++++ src/modules/image/Image.cpp | 32 +++++++++++++++++++++++++++ 6 files changed, 124 insertions(+), 13 deletions(-) create mode 100644 src/common/Data.cpp create mode 100644 src/common/Stream.cpp create mode 100644 src/modules/graphics/Drawable.cpp create mode 100644 src/modules/image/Image.cpp diff --git a/src/common/Data.cpp b/src/common/Data.cpp new file mode 100644 index 000000000..a3b2abb0e --- /dev/null +++ b/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 diff --git a/src/common/Stream.cpp b/src/common/Stream.cpp new file mode 100644 index 000000000..d9139e355 --- /dev/null +++ b/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 diff --git a/src/common/types.cpp b/src/common/types.cpp index e25fb2fa1..47cc512f2 100644 --- a/src/common/types.cpp +++ b/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); diff --git a/src/modules/filesystem/Filesystem.cpp b/src/modules/filesystem/Filesystem.cpp index 611d1eed5..d48d6c672 100644 --- a/src/modules/filesystem/Filesystem.cpp +++ b/src/modules/filesystem/Filesystem.cpp @@ -42,6 +42,8 @@ namespace love namespace filesystem { +love::Type Filesystem::type("filesystem", &Module::type); + Filesystem::Filesystem() { } diff --git a/src/modules/graphics/Drawable.cpp b/src/modules/graphics/Drawable.cpp new file mode 100644 index 000000000..ee77cbff2 --- /dev/null +++ b/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 diff --git a/src/modules/image/Image.cpp b/src/modules/image/Image.cpp new file mode 100644 index 000000000..648a0cd45 --- /dev/null +++ b/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