From 6742bd3e231a79742fb9f6a13121bbee9b958616 Mon Sep 17 00:00:00 2001 From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz> Date: Wed, 20 Dec 2017 20:46:25 +0100 Subject: [PATCH] update includes in xml --- alib2xml/src/common/XmlComposerHelper.h | 4 ++-- alib2xml/src/common/XmlParserHelper.h | 4 ++-- alib2xml/src/container/xml/ObjectsBitset.h | 2 +- alib2xml/src/container/xml/ObjectsTuple.h | 4 ++-- alib2xml/src/container/xml/ObjectsVariant.h | 2 +- alib2xml/src/core/xmlApi.hpp | 10 +++++----- alib2xml/src/exception/xml/CommonException.h | 2 +- alib2xml/src/factory/XmlDataFactory.hpp | 4 ++-- alib2xml/src/registry/XmlComposerRegistry.hpp | 8 ++++---- alib2xml/src/registry/XmlContainerParserRegistry.cpp | 2 +- alib2xml/src/registry/XmlContainerParserRegistry.hpp | 12 ++++++------ alib2xml/src/registry/XmlParserRegistry.hpp | 6 +++--- alib2xml/src/registry/XmlRegistry.h | 2 +- alib2xml/src/sax/FromXMLParserHelper.h | 4 ++-- alib2xml/src/sax/SaxComposeInterface.cpp | 6 +++--- alib2xml/src/sax/SaxComposeInterface.h | 2 +- alib2xml/src/sax/SaxParseInterface.cpp | 6 +++--- alib2xml/src/sax/SaxParseInterface.h | 2 +- alib2xml/src/sax/Token.cpp | 2 +- alib2xml/src/sax/Token.h | 2 +- alib2xml/test-src/primitive/PrimitiveTest.cpp | 2 +- alib2xml/test-src/sax/SaxTest.cpp | 4 ++-- 22 files changed, 46 insertions(+), 46 deletions(-) diff --git a/alib2xml/src/common/XmlComposerHelper.h b/alib2xml/src/common/XmlComposerHelper.h index 56959174c4..8575ed854b 100644 --- a/alib2xml/src/common/XmlComposerHelper.h +++ b/alib2xml/src/common/XmlComposerHelper.h @@ -8,8 +8,8 @@ #ifndef _XML_COMPOSER_HELPER_HPP_ #define _XML_COMPOSER_HELPER_HPP_ -#include <string> -#include <memory> +#include <alib/string> +#include <alib/memory> #include <abstraction/OperationAbstraction.hpp> namespace abstraction { diff --git a/alib2xml/src/common/XmlParserHelper.h b/alib2xml/src/common/XmlParserHelper.h index 63aafec34e..ab52575eba 100644 --- a/alib2xml/src/common/XmlParserHelper.h +++ b/alib2xml/src/common/XmlParserHelper.h @@ -8,8 +8,8 @@ #ifndef _XML_PARSER_HELPER_HPP_ #define _XML_PARSER_HELPER_HPP_ -#include <string> -#include <memory> +#include <alib/string> +#include <alib/memory> #include <abstraction/OperationAbstraction.hpp> namespace abstraction { diff --git a/alib2xml/src/container/xml/ObjectsBitset.h b/alib2xml/src/container/xml/ObjectsBitset.h index c4177f51ff..8276fed937 100644 --- a/alib2xml/src/container/xml/ObjectsBitset.h +++ b/alib2xml/src/container/xml/ObjectsBitset.h @@ -8,7 +8,7 @@ #ifndef OBJECTS_BITSET_H_ #define OBJECTS_BITSET_H_ -#include <bitset> +#include <alib/bitset> #include <core/xmlApi.hpp> #include <primitive/xml/Bool.h> diff --git a/alib2xml/src/container/xml/ObjectsTuple.h b/alib2xml/src/container/xml/ObjectsTuple.h index 534eb55476..9d638c346c 100644 --- a/alib2xml/src/container/xml/ObjectsTuple.h +++ b/alib2xml/src/container/xml/ObjectsTuple.h @@ -8,8 +8,8 @@ #ifndef _XML_OBJECTS_TUPLE_H_ #define _XML_OBJECTS_TUPLE_H_ -#include <tuple> -#include <string> +#include <alib/tuple> +#include <alib/string> #include <core/xmlApi.hpp> diff --git a/alib2xml/src/container/xml/ObjectsVariant.h b/alib2xml/src/container/xml/ObjectsVariant.h index 835dc4fd27..18be602e1c 100644 --- a/alib2xml/src/container/xml/ObjectsVariant.h +++ b/alib2xml/src/container/xml/ObjectsVariant.h @@ -8,7 +8,7 @@ #ifndef _XML_OBJECTS_VARIANT_H_ #define _XML_OBJECTS_VARIANT_H_ -#include <variant> +#include <alib/variant> #include <exception/CommonException.h> #include <core/xmlApi.hpp> diff --git a/alib2xml/src/core/xmlApi.hpp b/alib2xml/src/core/xmlApi.hpp index e2a72879f3..6408bb0f98 100644 --- a/alib2xml/src/core/xmlApi.hpp +++ b/alib2xml/src/core/xmlApi.hpp @@ -8,11 +8,11 @@ #ifndef XML_API_HPP_ #define XML_API_HPP_ -#include <functional> -#include <deque> -#include <map> -#include <string> -#include <memory> +#include <alib/functional> +#include <alib/deque> +#include <alib/map> +#include <alib/string> +#include <alib/memory> #include "sax/Token.h" #include "sax/FromXMLParserHelper.h" diff --git a/alib2xml/src/exception/xml/CommonException.h b/alib2xml/src/exception/xml/CommonException.h index 33665963b2..6f10d5aa91 100644 --- a/alib2xml/src/exception/xml/CommonException.h +++ b/alib2xml/src/exception/xml/CommonException.h @@ -9,7 +9,7 @@ #define _XML_COMMON_EXCEPTION_H_ #include <exception/CommonException.h> -#include <string> +#include <alib/string> #include <core/xmlApi.hpp> namespace alib { diff --git a/alib2xml/src/factory/XmlDataFactory.hpp b/alib2xml/src/factory/XmlDataFactory.hpp index 36c8a387de..ffad09f98a 100644 --- a/alib2xml/src/factory/XmlDataFactory.hpp +++ b/alib2xml/src/factory/XmlDataFactory.hpp @@ -8,8 +8,8 @@ #ifndef XML_DATA_FACTORY_HPP_ #define XML_DATA_FACTORY_HPP_ -#include <string> -#include <deque> +#include <alib/string> +#include <alib/deque> #include <measure> #include <sax/Token.h> diff --git a/alib2xml/src/registry/XmlComposerRegistry.hpp b/alib2xml/src/registry/XmlComposerRegistry.hpp index 89b4ed56d5..90bbe6696e 100644 --- a/alib2xml/src/registry/XmlComposerRegistry.hpp +++ b/alib2xml/src/registry/XmlComposerRegistry.hpp @@ -8,10 +8,10 @@ #ifndef _XML_COMPOSER_REGISTRY_HPP_ #define _XML_COMPOSER_REGISTRY_HPP_ -#include <memory> -#include <string> -#include <set> -#include <map> +#include <alib/memory> +#include <alib/string> +#include <alib/set> +#include <alib/map> #include <exception/CommonException.h> #include <abstraction/OperationAbstraction.hpp> diff --git a/alib2xml/src/registry/XmlContainerParserRegistry.cpp b/alib2xml/src/registry/XmlContainerParserRegistry.cpp index 24ff67bded..f696ab1384 100644 --- a/alib2xml/src/registry/XmlContainerParserRegistry.cpp +++ b/alib2xml/src/registry/XmlContainerParserRegistry.cpp @@ -6,7 +6,7 @@ */ #include <registry/XmlContainerParserRegistry.hpp> -#include <foreach> +#include <alib/foreach> namespace abstraction { diff --git a/alib2xml/src/registry/XmlContainerParserRegistry.hpp b/alib2xml/src/registry/XmlContainerParserRegistry.hpp index 31b385bb70..29f462baa6 100644 --- a/alib2xml/src/registry/XmlContainerParserRegistry.hpp +++ b/alib2xml/src/registry/XmlContainerParserRegistry.hpp @@ -8,12 +8,12 @@ #ifndef _XML_CONTAINER_REGISTRY_HPP_ #define _XML_CONTAINER_REGISTRY_HPP_ -#include <functional> -#include <memory> -#include <vector> -#include <string> -#include <set> -#include <map> +#include <alib/functional> +#include <alib/memory> +#include <alib/vector> +#include <alib/string> +#include <alib/set> +#include <alib/map> #include <exception/CommonException.h> #include <abstraction/OperationAbstraction.hpp> diff --git a/alib2xml/src/registry/XmlParserRegistry.hpp b/alib2xml/src/registry/XmlParserRegistry.hpp index 46f9a2538e..81841b08a6 100644 --- a/alib2xml/src/registry/XmlParserRegistry.hpp +++ b/alib2xml/src/registry/XmlParserRegistry.hpp @@ -8,9 +8,9 @@ #ifndef _XML_PARSER_REGISTRY_HPP_ #define _XML_PARSER_REGISTRY_HPP_ -#include <memory> -#include <string> -#include <map> +#include <alib/memory> +#include <alib/string> +#include <alib/map> #include <exception/CommonException.h> #include <abstraction/OperationAbstraction.hpp> diff --git a/alib2xml/src/registry/XmlRegistry.h b/alib2xml/src/registry/XmlRegistry.h index 634cb2c2e5..391753507b 100644 --- a/alib2xml/src/registry/XmlRegistry.h +++ b/alib2xml/src/registry/XmlRegistry.h @@ -15,7 +15,7 @@ #include <abstraction/UnaryOperationAbstraction.hpp> #include <abstraction/BinaryOperationAbstraction.hpp> -#include <deque> +#include <alib/deque> #include <sax/Token.h> namespace abstraction { diff --git a/alib2xml/src/sax/FromXMLParserHelper.h b/alib2xml/src/sax/FromXMLParserHelper.h index 000be9b8b1..eafe664ce0 100644 --- a/alib2xml/src/sax/FromXMLParserHelper.h +++ b/alib2xml/src/sax/FromXMLParserHelper.h @@ -10,8 +10,8 @@ #include <tclap/MultiArg.h> #include <tclap/ValueArg.h> -#include <string> -#include <deque> +#include <alib/string> +#include <alib/deque> #include "Token.h" namespace sax { diff --git a/alib2xml/src/sax/SaxComposeInterface.cpp b/alib2xml/src/sax/SaxComposeInterface.cpp index 28f38712dc..eda471667b 100644 --- a/alib2xml/src/sax/SaxComposeInterface.cpp +++ b/alib2xml/src/sax/SaxComposeInterface.cpp @@ -7,11 +7,11 @@ #include "SaxComposeInterface.h" -#include <string> -#include <iostream> +#include <alib/string> +#include <alib/iostream> #include <fstream> #include <sstream> -#include <deque> +#include <alib/deque> #include "ComposerException.h" #include <measure> diff --git a/alib2xml/src/sax/SaxComposeInterface.h b/alib2xml/src/sax/SaxComposeInterface.h index 343e37ec28..c894e9ab0d 100644 --- a/alib2xml/src/sax/SaxComposeInterface.h +++ b/alib2xml/src/sax/SaxComposeInterface.h @@ -9,7 +9,7 @@ #define SAX_COMPOSE_INTERFACE_H_ #include <libxml/xmlwriter.h> -#include <deque> +#include <alib/deque> #include "Token.h" namespace sax { diff --git a/alib2xml/src/sax/SaxParseInterface.cpp b/alib2xml/src/sax/SaxParseInterface.cpp index bf88dbf791..204fade129 100644 --- a/alib2xml/src/sax/SaxParseInterface.cpp +++ b/alib2xml/src/sax/SaxParseInterface.cpp @@ -7,11 +7,11 @@ #include "SaxParseInterface.h" -#include <string> +#include <alib/string> #include <cstring> #include <cstdlib> -#include <iostream> -#include <algorithm> +#include <alib/iostream> +#include <alib/algorithm> #include <exception/CommonException.h> #include <measure> diff --git a/alib2xml/src/sax/SaxParseInterface.h b/alib2xml/src/sax/SaxParseInterface.h index efde5ec404..d844330fd3 100644 --- a/alib2xml/src/sax/SaxParseInterface.h +++ b/alib2xml/src/sax/SaxParseInterface.h @@ -9,7 +9,7 @@ #define SAX_PARSE_INTERFACE_H_ #include <libxml/xmlreader.h> -#include <deque> +#include <alib/deque> #include "Token.h" namespace sax { diff --git a/alib2xml/src/sax/Token.cpp b/alib2xml/src/sax/Token.cpp index 631c25c200..5b1f3ea64c 100644 --- a/alib2xml/src/sax/Token.cpp +++ b/alib2xml/src/sax/Token.cpp @@ -7,7 +7,7 @@ #include "Token.h" #include <sstream> -#include <iostream> +#include <alib/iostream> namespace sax { diff --git a/alib2xml/src/sax/Token.h b/alib2xml/src/sax/Token.h index 9d85e119ba..895e151ba9 100644 --- a/alib2xml/src/sax/Token.h +++ b/alib2xml/src/sax/Token.h @@ -8,7 +8,7 @@ #ifndef TOKEN_H_ #define TOKEN_H_ -#include <string> +#include <alib/string> #include <ostream> namespace sax { diff --git a/alib2xml/test-src/primitive/PrimitiveTest.cpp b/alib2xml/test-src/primitive/PrimitiveTest.cpp index e84505ab9d..9e5e73b346 100644 --- a/alib2xml/test-src/primitive/PrimitiveTest.cpp +++ b/alib2xml/test-src/primitive/PrimitiveTest.cpp @@ -1,4 +1,4 @@ -#include <list> +#include <alib/list> #include "PrimitiveTest.h" #include <primitive/Primitive.h> diff --git a/alib2xml/test-src/sax/SaxTest.cpp b/alib2xml/test-src/sax/SaxTest.cpp index 66c3576513..e3532c4236 100644 --- a/alib2xml/test-src/sax/SaxTest.cpp +++ b/alib2xml/test-src/sax/SaxTest.cpp @@ -1,6 +1,6 @@ #include "SaxTest.h" -#include <string> -#include <iostream> +#include <alib/string> +#include <alib/iostream> #include "sax/SaxParseInterface.h" #include "sax/SaxComposeInterface.h" -- GitLab