From 99b85d69e7318ae1b7cd3e847be0422a5fa46812 Mon Sep 17 00:00:00 2001 From: pantor Date: Sun, 25 Jul 2021 14:24:49 +0200 Subject: [PATCH] remove headers in files, add central header --- include/inja/config.hpp | 2 -- include/inja/environment.hpp | 2 -- include/inja/exceptions.hpp | 2 -- include/inja/function_storage.hpp | 2 -- include/inja/inja.hpp | 24 +++++++++++++++- include/inja/lexer.hpp | 2 -- include/inja/node.hpp | 2 -- include/inja/parser.hpp | 2 -- include/inja/renderer.hpp | 2 -- include/inja/statistics.hpp | 2 -- include/inja/template.hpp | 2 -- include/inja/token.hpp | 2 -- include/inja/utils.hpp | 2 -- single_include/inja/inja.hpp | 48 +++++++++++++++---------------- 14 files changed, 46 insertions(+), 50 deletions(-) diff --git a/include/inja/config.hpp b/include/inja/config.hpp index 01bfa6d7..42b55c8a 100644 --- a/include/inja/config.hpp +++ b/include/inja/config.hpp @@ -1,5 +1,3 @@ -// Copyright (c) 2021 Pantor. All rights reserved. - #ifndef INCLUDE_INJA_CONFIG_HPP_ #define INCLUDE_INJA_CONFIG_HPP_ diff --git a/include/inja/environment.hpp b/include/inja/environment.hpp index 2b6248b5..c4bd7deb 100644 --- a/include/inja/environment.hpp +++ b/include/inja/environment.hpp @@ -1,5 +1,3 @@ -// Copyright (c) 2021 Pantor. All rights reserved. - #ifndef INCLUDE_INJA_ENVIRONMENT_HPP_ #define INCLUDE_INJA_ENVIRONMENT_HPP_ diff --git a/include/inja/exceptions.hpp b/include/inja/exceptions.hpp index 9b349a4d..9991f0d2 100644 --- a/include/inja/exceptions.hpp +++ b/include/inja/exceptions.hpp @@ -1,5 +1,3 @@ -// Copyright (c) 2021 Pantor. All rights reserved. - #ifndef INCLUDE_INJA_EXCEPTIONS_HPP_ #define INCLUDE_INJA_EXCEPTIONS_HPP_ diff --git a/include/inja/function_storage.hpp b/include/inja/function_storage.hpp index b4bd092d..3e8e5132 100644 --- a/include/inja/function_storage.hpp +++ b/include/inja/function_storage.hpp @@ -1,5 +1,3 @@ -// Copyright (c) 2021 Pantor. All rights reserved. - #ifndef INCLUDE_INJA_FUNCTION_STORAGE_HPP_ #define INCLUDE_INJA_FUNCTION_STORAGE_HPP_ diff --git a/include/inja/inja.hpp b/include/inja/inja.hpp index ed830e70..5e2643b6 100644 --- a/include/inja/inja.hpp +++ b/include/inja/inja.hpp @@ -1,4 +1,26 @@ -// Copyright (c) 2021 Pantor. All rights reserved. +/* + ___ _ Version 3.2 + |_ _|_ __ (_) __ _ https://github.com/pantor/inja + | || '_ \ | |/ _` | Licensed under the MIT License . + | || | | || | (_| | + |___|_| |_|/ |\__,_| Copyright (c) 2018-2021 Lars Berscheid + |__/ +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ #ifndef INCLUDE_INJA_INJA_HPP_ #define INCLUDE_INJA_INJA_HPP_ diff --git a/include/inja/lexer.hpp b/include/inja/lexer.hpp index 158f8b27..58768e41 100644 --- a/include/inja/lexer.hpp +++ b/include/inja/lexer.hpp @@ -1,5 +1,3 @@ -// Copyright (c) 2020 Pantor. All rights reserved. - #ifndef INCLUDE_INJA_LEXER_HPP_ #define INCLUDE_INJA_LEXER_HPP_ diff --git a/include/inja/node.hpp b/include/inja/node.hpp index 43a6ef3f..cafd83ca 100644 --- a/include/inja/node.hpp +++ b/include/inja/node.hpp @@ -1,5 +1,3 @@ -// Copyright (c) 2021 Pantor. All rights reserved. - #ifndef INCLUDE_INJA_NODE_HPP_ #define INCLUDE_INJA_NODE_HPP_ diff --git a/include/inja/parser.hpp b/include/inja/parser.hpp index 0c1f8671..6eea8571 100644 --- a/include/inja/parser.hpp +++ b/include/inja/parser.hpp @@ -1,5 +1,3 @@ -// Copyright (c) 2021 Pantor. All rights reserved. - #ifndef INCLUDE_INJA_PARSER_HPP_ #define INCLUDE_INJA_PARSER_HPP_ diff --git a/include/inja/renderer.hpp b/include/inja/renderer.hpp index ef951b99..cd490822 100644 --- a/include/inja/renderer.hpp +++ b/include/inja/renderer.hpp @@ -1,5 +1,3 @@ -// Copyright (c) 2021 Pantor. All rights reserved. - #ifndef INCLUDE_INJA_RENDERER_HPP_ #define INCLUDE_INJA_RENDERER_HPP_ diff --git a/include/inja/statistics.hpp b/include/inja/statistics.hpp index 48d129ac..3ab4c370 100644 --- a/include/inja/statistics.hpp +++ b/include/inja/statistics.hpp @@ -1,5 +1,3 @@ -// Copyright (c) 2021 Pantor. All rights reserved. - #ifndef INCLUDE_INJA_STATISTICS_HPP_ #define INCLUDE_INJA_STATISTICS_HPP_ diff --git a/include/inja/template.hpp b/include/inja/template.hpp index cc32bfe5..45b276bd 100644 --- a/include/inja/template.hpp +++ b/include/inja/template.hpp @@ -1,5 +1,3 @@ -// Copyright (c) 2021 Pantor. All rights reserved. - #ifndef INCLUDE_INJA_TEMPLATE_HPP_ #define INCLUDE_INJA_TEMPLATE_HPP_ diff --git a/include/inja/token.hpp b/include/inja/token.hpp index 3fb4c235..1904c4dd 100644 --- a/include/inja/token.hpp +++ b/include/inja/token.hpp @@ -1,5 +1,3 @@ -// Copyright (c) 2021 Pantor. All rights reserved. - #ifndef INCLUDE_INJA_TOKEN_HPP_ #define INCLUDE_INJA_TOKEN_HPP_ diff --git a/include/inja/utils.hpp b/include/inja/utils.hpp index 4336833d..d993f3f5 100644 --- a/include/inja/utils.hpp +++ b/include/inja/utils.hpp @@ -1,5 +1,3 @@ -// Copyright (c) 2021 Pantor. All rights reserved. - #ifndef INCLUDE_INJA_UTILS_HPP_ #define INCLUDE_INJA_UTILS_HPP_ diff --git a/single_include/inja/inja.hpp b/single_include/inja/inja.hpp index 03e19a06..cebda1f6 100644 --- a/single_include/inja/inja.hpp +++ b/single_include/inja/inja.hpp @@ -1,4 +1,26 @@ -// Copyright (c) 2021 Pantor. All rights reserved. +/* + ___ _ Version 3.2 + |_ _|_ __ (_) __ _ https://github.com/pantor/inja + | || '_ \ | |/ _` | Licensed under the MIT License . + | || | | || | (_| | + |___|_| |_|/ |\__,_| Copyright (c) 2018-2021 Lars Berscheid + |__/ +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ #ifndef INCLUDE_INJA_INJA_HPP_ #define INCLUDE_INJA_INJA_HPP_ @@ -20,8 +42,6 @@ #endif // #include "environment.hpp" -// Copyright (c) 2021 Pantor. All rights reserved. - #ifndef INCLUDE_INJA_ENVIRONMENT_HPP_ #define INCLUDE_INJA_ENVIRONMENT_HPP_ @@ -34,8 +54,6 @@ #include // #include "config.hpp" -// Copyright (c) 2021 Pantor. All rights reserved. - #ifndef INCLUDE_INJA_CONFIG_HPP_ #define INCLUDE_INJA_CONFIG_HPP_ @@ -1534,8 +1552,6 @@ struct RenderConfig { #endif // INCLUDE_INJA_CONFIG_HPP_ // #include "function_storage.hpp" -// Copyright (c) 2021 Pantor. All rights reserved. - #ifndef INCLUDE_INJA_FUNCTION_STORAGE_HPP_ #define INCLUDE_INJA_FUNCTION_STORAGE_HPP_ @@ -1681,8 +1697,6 @@ class FunctionStorage { #endif // INCLUDE_INJA_FUNCTION_STORAGE_HPP_ // #include "parser.hpp" -// Copyright (c) 2021 Pantor. All rights reserved. - #ifndef INCLUDE_INJA_PARSER_HPP_ #define INCLUDE_INJA_PARSER_HPP_ @@ -1696,8 +1710,6 @@ class FunctionStorage { // #include "config.hpp" // #include "exceptions.hpp" -// Copyright (c) 2021 Pantor. All rights reserved. - #ifndef INCLUDE_INJA_EXCEPTIONS_HPP_ #define INCLUDE_INJA_EXCEPTIONS_HPP_ @@ -1750,8 +1762,6 @@ struct JsonError : public InjaError { // #include "function_storage.hpp" // #include "lexer.hpp" -// Copyright (c) 2020 Pantor. All rights reserved. - #ifndef INCLUDE_INJA_LEXER_HPP_ #define INCLUDE_INJA_LEXER_HPP_ @@ -1761,8 +1771,6 @@ struct JsonError : public InjaError { // #include "config.hpp" // #include "token.hpp" -// Copyright (c) 2021 Pantor. All rights reserved. - #ifndef INCLUDE_INJA_TOKEN_HPP_ #define INCLUDE_INJA_TOKEN_HPP_ @@ -1840,8 +1848,6 @@ struct Token { #endif // INCLUDE_INJA_TOKEN_HPP_ // #include "utils.hpp" -// Copyright (c) 2021 Pantor. All rights reserved. - #ifndef INCLUDE_INJA_UTILS_HPP_ #define INCLUDE_INJA_UTILS_HPP_ @@ -2355,8 +2361,6 @@ class Lexer { #endif // INCLUDE_INJA_LEXER_HPP_ // #include "node.hpp" -// Copyright (c) 2021 Pantor. All rights reserved. - #ifndef INCLUDE_INJA_NODE_HPP_ #define INCLUDE_INJA_NODE_HPP_ @@ -2735,8 +2739,6 @@ class SetStatementNode : public StatementNode { #endif // INCLUDE_INJA_NODE_HPP_ // #include "template.hpp" -// Copyright (c) 2021 Pantor. All rights reserved. - #ifndef INCLUDE_INJA_TEMPLATE_HPP_ #define INCLUDE_INJA_TEMPLATE_HPP_ @@ -2748,8 +2750,6 @@ class SetStatementNode : public StatementNode { // #include "node.hpp" // #include "statistics.hpp" -// Copyright (c) 2021 Pantor. All rights reserved. - #ifndef INCLUDE_INJA_STATISTICS_HPP_ #define INCLUDE_INJA_STATISTICS_HPP_ @@ -3489,8 +3489,6 @@ class Parser { #endif // INCLUDE_INJA_PARSER_HPP_ // #include "renderer.hpp" -// Copyright (c) 2021 Pantor. All rights reserved. - #ifndef INCLUDE_INJA_RENDERER_HPP_ #define INCLUDE_INJA_RENDERER_HPP_