From 83806e736616640a63d8ac9f0d51cca48bf80789 Mon Sep 17 00:00:00 2001 From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz> Date: Fri, 20 Oct 2017 14:43:20 +0200 Subject: [PATCH] refactor includes --- alib2data/src/automaton/FSM/CompactNFA.cpp | 2 +- alib2data/src/automaton/FSM/DFA.cpp | 2 +- alib2data/src/automaton/FSM/EpsilonNFA.cpp | 2 +- alib2data/src/automaton/FSM/ExtendedNFA.cpp | 2 +- alib2data/src/automaton/FSM/MultiInitialStateNFA.cpp | 2 +- alib2data/src/automaton/FSM/NFA.cpp | 2 +- alib2data/src/automaton/PDA/DPDA.cpp | 2 +- alib2data/src/automaton/PDA/InputDrivenDPDA.cpp | 2 +- alib2data/src/automaton/PDA/InputDrivenNPDA.cpp | 2 +- alib2data/src/automaton/PDA/NPDA.cpp | 2 +- alib2data/src/automaton/PDA/NPDTA.cpp | 2 +- .../src/automaton/PDA/RealTimeHeightDeterministicDPDA.cpp | 2 +- .../src/automaton/PDA/RealTimeHeightDeterministicNPDA.cpp | 2 +- alib2data/src/automaton/PDA/SinglePopDPDA.cpp | 2 +- alib2data/src/automaton/PDA/SinglePopNPDA.cpp | 2 +- alib2data/src/automaton/PDA/VisiblyPushdownDPDA.cpp | 2 +- alib2data/src/automaton/PDA/VisiblyPushdownNPDA.cpp | 2 +- alib2data/src/automaton/TA/DFTA.cpp | 2 +- alib2data/src/automaton/TA/NFTA.cpp | 2 +- alib2data/src/grammar/ContextFree/CFG.cpp | 3 +-- alib2data/src/grammar/ContextFree/CNF.cpp | 2 +- alib2data/src/grammar/ContextFree/EpsilonFreeCFG.cpp | 2 +- alib2data/src/grammar/ContextFree/GNF.cpp | 2 +- alib2data/src/grammar/ContextFree/LG.cpp | 2 +- alib2data/src/grammar/ContextSensitive/CSG.cpp | 2 +- .../src/grammar/ContextSensitive/NonContractingGrammar.cpp | 2 +- alib2data/src/grammar/Regular/LeftLG.cpp | 2 +- alib2data/src/grammar/Regular/LeftRG.cpp | 2 +- alib2data/src/grammar/Regular/RightLG.cpp | 2 +- alib2data/src/grammar/Regular/RightRG.cpp | 2 +- .../Unrestricted/ContextPreservingUnrestrictedGrammar.cpp | 2 +- alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.cpp | 2 +- alib2data/src/regexp/formal/FormalRegExp.cpp | 2 +- alib2data/src/regexp/unbounded/UnboundedRegExp.cpp | 2 +- alib2data/src/string/CyclicString.cpp | 3 +-- alib2data/src/string/Epsilon.cpp | 2 +- alib2data/src/string/LinearString.cpp | 3 +-- alib2data/src/tree/ranked/PostfixRankedTree.cpp | 4 ++-- alib2data/src/tree/ranked/PrefixRankedBarNonlinearPattern.cpp | 4 ++-- alib2data/src/tree/ranked/PrefixRankedBarPattern.cpp | 4 ++-- alib2data/src/tree/ranked/PrefixRankedBarTree.cpp | 4 ++-- alib2data/src/tree/ranked/PrefixRankedNonlinearPattern.cpp | 4 ++-- alib2data/src/tree/ranked/PrefixRankedPattern.cpp | 4 ++-- alib2data/src/tree/ranked/PrefixRankedTree.cpp | 4 ++-- alib2data/src/tree/ranked/RankedNonlinearPattern.cpp | 4 ++-- alib2data/src/tree/ranked/RankedPattern.cpp | 4 ++-- alib2data/src/tree/ranked/RankedTree.cpp | 4 ++-- alib2data/src/tree/unranked/PrefixBarTree.cpp | 4 ++-- alib2data/src/tree/unranked/UnrankedNonlinearPattern.cpp | 4 ++-- alib2data/src/tree/unranked/UnrankedPattern.cpp | 4 ++-- alib2data/src/tree/unranked/UnrankedTree.cpp | 4 ++-- 51 files changed, 65 insertions(+), 68 deletions(-) diff --git a/alib2data/src/automaton/FSM/CompactNFA.cpp b/alib2data/src/automaton/FSM/CompactNFA.cpp index ba8f28c104..e9ca521672 100644 --- a/alib2data/src/automaton/FSM/CompactNFA.cpp +++ b/alib2data/src/automaton/FSM/CompactNFA.cpp @@ -6,7 +6,7 @@ */ #include "CompactNFA.h" -#include "../Automaton.h" +#include <automaton/Automaton.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/automaton/FSM/DFA.cpp b/alib2data/src/automaton/FSM/DFA.cpp index 35831b67cb..44ec98ba4f 100644 --- a/alib2data/src/automaton/FSM/DFA.cpp +++ b/alib2data/src/automaton/FSM/DFA.cpp @@ -6,7 +6,7 @@ */ #include "DFA.h" -#include "../Automaton.h" +#include <automaton/Automaton.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/automaton/FSM/EpsilonNFA.cpp b/alib2data/src/automaton/FSM/EpsilonNFA.cpp index 5fa2b72e95..37c2823922 100644 --- a/alib2data/src/automaton/FSM/EpsilonNFA.cpp +++ b/alib2data/src/automaton/FSM/EpsilonNFA.cpp @@ -6,7 +6,7 @@ */ #include "EpsilonNFA.h" -#include "../Automaton.h" +#include <automaton/Automaton.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/automaton/FSM/ExtendedNFA.cpp b/alib2data/src/automaton/FSM/ExtendedNFA.cpp index 989eee085e..804ad8905d 100644 --- a/alib2data/src/automaton/FSM/ExtendedNFA.cpp +++ b/alib2data/src/automaton/FSM/ExtendedNFA.cpp @@ -6,7 +6,7 @@ */ #include "ExtendedNFA.h" -#include "../Automaton.h" +#include <automaton/Automaton.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/automaton/FSM/MultiInitialStateNFA.cpp b/alib2data/src/automaton/FSM/MultiInitialStateNFA.cpp index 6923ee42d6..7399583d9b 100644 --- a/alib2data/src/automaton/FSM/MultiInitialStateNFA.cpp +++ b/alib2data/src/automaton/FSM/MultiInitialStateNFA.cpp @@ -6,7 +6,7 @@ */ #include "MultiInitialStateNFA.h" -#include "../Automaton.h" +#include <automaton/Automaton.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/automaton/FSM/NFA.cpp b/alib2data/src/automaton/FSM/NFA.cpp index 7ad981d711..a23a5ea80e 100644 --- a/alib2data/src/automaton/FSM/NFA.cpp +++ b/alib2data/src/automaton/FSM/NFA.cpp @@ -6,7 +6,7 @@ */ #include "NFA.h" -#include "../Automaton.h" +#include <automaton/Automaton.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/automaton/PDA/DPDA.cpp b/alib2data/src/automaton/PDA/DPDA.cpp index 68adf35948..8c1579591b 100644 --- a/alib2data/src/automaton/PDA/DPDA.cpp +++ b/alib2data/src/automaton/PDA/DPDA.cpp @@ -6,7 +6,7 @@ */ #include "DPDA.h" -#include "../Automaton.h" +#include <automaton/Automaton.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/automaton/PDA/InputDrivenDPDA.cpp b/alib2data/src/automaton/PDA/InputDrivenDPDA.cpp index 83b39556f5..ffabec3d8e 100644 --- a/alib2data/src/automaton/PDA/InputDrivenDPDA.cpp +++ b/alib2data/src/automaton/PDA/InputDrivenDPDA.cpp @@ -6,7 +6,7 @@ */ #include "InputDrivenDPDA.h" -#include "../Automaton.h" +#include <automaton/Automaton.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/automaton/PDA/InputDrivenNPDA.cpp b/alib2data/src/automaton/PDA/InputDrivenNPDA.cpp index 9a1861c2a9..9fe18cb1e4 100644 --- a/alib2data/src/automaton/PDA/InputDrivenNPDA.cpp +++ b/alib2data/src/automaton/PDA/InputDrivenNPDA.cpp @@ -6,7 +6,7 @@ */ #include "InputDrivenNPDA.h" -#include "../Automaton.h" +#include <automaton/Automaton.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/automaton/PDA/NPDA.cpp b/alib2data/src/automaton/PDA/NPDA.cpp index aab9fabe7b..2a21c815b0 100644 --- a/alib2data/src/automaton/PDA/NPDA.cpp +++ b/alib2data/src/automaton/PDA/NPDA.cpp @@ -6,7 +6,7 @@ */ #include "NPDA.h" -#include "../Automaton.h" +#include <automaton/Automaton.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/automaton/PDA/NPDTA.cpp b/alib2data/src/automaton/PDA/NPDTA.cpp index dd070691d0..a69b902701 100644 --- a/alib2data/src/automaton/PDA/NPDTA.cpp +++ b/alib2data/src/automaton/PDA/NPDTA.cpp @@ -6,7 +6,7 @@ */ #include "NPDTA.h" -#include "../Automaton.h" +#include <automaton/Automaton.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/automaton/PDA/RealTimeHeightDeterministicDPDA.cpp b/alib2data/src/automaton/PDA/RealTimeHeightDeterministicDPDA.cpp index e937cc3e90..2810a2adac 100644 --- a/alib2data/src/automaton/PDA/RealTimeHeightDeterministicDPDA.cpp +++ b/alib2data/src/automaton/PDA/RealTimeHeightDeterministicDPDA.cpp @@ -6,7 +6,7 @@ */ #include "RealTimeHeightDeterministicDPDA.h" -#include "../Automaton.h" +#include <automaton/Automaton.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/automaton/PDA/RealTimeHeightDeterministicNPDA.cpp b/alib2data/src/automaton/PDA/RealTimeHeightDeterministicNPDA.cpp index 9f9cfb4794..b4885eec50 100644 --- a/alib2data/src/automaton/PDA/RealTimeHeightDeterministicNPDA.cpp +++ b/alib2data/src/automaton/PDA/RealTimeHeightDeterministicNPDA.cpp @@ -6,7 +6,7 @@ */ #include "RealTimeHeightDeterministicNPDA.h" -#include "../Automaton.h" +#include <automaton/Automaton.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/automaton/PDA/SinglePopDPDA.cpp b/alib2data/src/automaton/PDA/SinglePopDPDA.cpp index 171439bd3e..0b28e30d68 100644 --- a/alib2data/src/automaton/PDA/SinglePopDPDA.cpp +++ b/alib2data/src/automaton/PDA/SinglePopDPDA.cpp @@ -6,7 +6,7 @@ */ #include "SinglePopDPDA.h" -#include "../Automaton.h" +#include <automaton/Automaton.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/automaton/PDA/SinglePopNPDA.cpp b/alib2data/src/automaton/PDA/SinglePopNPDA.cpp index 5a60f0ce9e..2b5332c234 100644 --- a/alib2data/src/automaton/PDA/SinglePopNPDA.cpp +++ b/alib2data/src/automaton/PDA/SinglePopNPDA.cpp @@ -6,7 +6,7 @@ */ #include "SinglePopNPDA.h" -#include "../Automaton.h" +#include <automaton/Automaton.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/automaton/PDA/VisiblyPushdownDPDA.cpp b/alib2data/src/automaton/PDA/VisiblyPushdownDPDA.cpp index 967810e813..970b430b1c 100644 --- a/alib2data/src/automaton/PDA/VisiblyPushdownDPDA.cpp +++ b/alib2data/src/automaton/PDA/VisiblyPushdownDPDA.cpp @@ -6,7 +6,7 @@ */ #include "VisiblyPushdownDPDA.h" -#include "../Automaton.h" +#include <automaton/Automaton.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/automaton/PDA/VisiblyPushdownNPDA.cpp b/alib2data/src/automaton/PDA/VisiblyPushdownNPDA.cpp index 3e515de0ec..246861a0a0 100644 --- a/alib2data/src/automaton/PDA/VisiblyPushdownNPDA.cpp +++ b/alib2data/src/automaton/PDA/VisiblyPushdownNPDA.cpp @@ -6,7 +6,7 @@ */ #include "VisiblyPushdownNPDA.h" -#include "../Automaton.h" +#include <automaton/Automaton.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/automaton/TA/DFTA.cpp b/alib2data/src/automaton/TA/DFTA.cpp index e3f3ba99e1..46acb95227 100644 --- a/alib2data/src/automaton/TA/DFTA.cpp +++ b/alib2data/src/automaton/TA/DFTA.cpp @@ -6,7 +6,7 @@ */ #include "DFTA.h" -#include "../Automaton.h" +#include <automaton/Automaton.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/automaton/TA/NFTA.cpp b/alib2data/src/automaton/TA/NFTA.cpp index 9dec532c3f..9772259d19 100644 --- a/alib2data/src/automaton/TA/NFTA.cpp +++ b/alib2data/src/automaton/TA/NFTA.cpp @@ -6,7 +6,7 @@ */ #include "NFTA.h" -#include "../Automaton.h" +#include <automaton/Automaton.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/grammar/ContextFree/CFG.cpp b/alib2data/src/grammar/ContextFree/CFG.cpp index 706d44d21d..257fb04dfc 100644 --- a/alib2data/src/grammar/ContextFree/CFG.cpp +++ b/alib2data/src/grammar/ContextFree/CFG.cpp @@ -6,10 +6,9 @@ */ #include "CFG.h" -#include "../Grammar.h" +#include <grammar/Grammar.h> #include <object/Object.h> -#include <registration/CastRegistration.hpp> #include <registration/ValuePrinterRegistration.hpp> #include <registration/XmlRegistration.hpp> #include <registration/CastRegistration.hpp> diff --git a/alib2data/src/grammar/ContextFree/CNF.cpp b/alib2data/src/grammar/ContextFree/CNF.cpp index 2f1730f97e..37a8db100c 100644 --- a/alib2data/src/grammar/ContextFree/CNF.cpp +++ b/alib2data/src/grammar/ContextFree/CNF.cpp @@ -6,7 +6,7 @@ */ #include "CNF.h" -#include "../Grammar.h" +#include <grammar/Grammar.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/grammar/ContextFree/EpsilonFreeCFG.cpp b/alib2data/src/grammar/ContextFree/EpsilonFreeCFG.cpp index 8dc447a084..4c3ed02a8a 100644 --- a/alib2data/src/grammar/ContextFree/EpsilonFreeCFG.cpp +++ b/alib2data/src/grammar/ContextFree/EpsilonFreeCFG.cpp @@ -6,7 +6,7 @@ */ #include "EpsilonFreeCFG.h" -#include "../Grammar.h" +#include <grammar/Grammar.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/grammar/ContextFree/GNF.cpp b/alib2data/src/grammar/ContextFree/GNF.cpp index 69e2f1daf3..f6e789a6db 100644 --- a/alib2data/src/grammar/ContextFree/GNF.cpp +++ b/alib2data/src/grammar/ContextFree/GNF.cpp @@ -6,7 +6,7 @@ */ #include "GNF.h" -#include "../Grammar.h" +#include <grammar/Grammar.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/grammar/ContextFree/LG.cpp b/alib2data/src/grammar/ContextFree/LG.cpp index 457e3fdd38..e6bb144761 100644 --- a/alib2data/src/grammar/ContextFree/LG.cpp +++ b/alib2data/src/grammar/ContextFree/LG.cpp @@ -6,7 +6,7 @@ */ #include "LG.h" -#include "../Grammar.h" +#include <grammar/Grammar.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/grammar/ContextSensitive/CSG.cpp b/alib2data/src/grammar/ContextSensitive/CSG.cpp index 96bc66d198..164ca5cf35 100644 --- a/alib2data/src/grammar/ContextSensitive/CSG.cpp +++ b/alib2data/src/grammar/ContextSensitive/CSG.cpp @@ -6,7 +6,7 @@ */ #include "CSG.h" -#include "../Grammar.h" +#include <grammar/Grammar.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/grammar/ContextSensitive/NonContractingGrammar.cpp b/alib2data/src/grammar/ContextSensitive/NonContractingGrammar.cpp index d7100d5cc6..2020860f32 100644 --- a/alib2data/src/grammar/ContextSensitive/NonContractingGrammar.cpp +++ b/alib2data/src/grammar/ContextSensitive/NonContractingGrammar.cpp @@ -6,7 +6,7 @@ */ #include "NonContractingGrammar.h" -#include "../Grammar.h" +#include <grammar/Grammar.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/grammar/Regular/LeftLG.cpp b/alib2data/src/grammar/Regular/LeftLG.cpp index 5f3f919040..bb2f2ff781 100644 --- a/alib2data/src/grammar/Regular/LeftLG.cpp +++ b/alib2data/src/grammar/Regular/LeftLG.cpp @@ -6,7 +6,7 @@ */ #include "LeftLG.h" -#include "../Grammar.h" +#include <grammar/Grammar.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/grammar/Regular/LeftRG.cpp b/alib2data/src/grammar/Regular/LeftRG.cpp index 6737cf67d1..b20181e804 100644 --- a/alib2data/src/grammar/Regular/LeftRG.cpp +++ b/alib2data/src/grammar/Regular/LeftRG.cpp @@ -6,7 +6,7 @@ */ #include "LeftRG.h" -#include "../Grammar.h" +#include <grammar/Grammar.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/grammar/Regular/RightLG.cpp b/alib2data/src/grammar/Regular/RightLG.cpp index ebcf2e8dba..984a00351f 100644 --- a/alib2data/src/grammar/Regular/RightLG.cpp +++ b/alib2data/src/grammar/Regular/RightLG.cpp @@ -6,7 +6,7 @@ */ #include "RightLG.h" -#include "../Grammar.h" +#include <grammar/Grammar.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/grammar/Regular/RightRG.cpp b/alib2data/src/grammar/Regular/RightRG.cpp index 4aa8b1e836..afca72418b 100644 --- a/alib2data/src/grammar/Regular/RightRG.cpp +++ b/alib2data/src/grammar/Regular/RightRG.cpp @@ -6,7 +6,7 @@ */ #include "RightRG.h" -#include "../Grammar.h" +#include <grammar/Grammar.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/grammar/Unrestricted/ContextPreservingUnrestrictedGrammar.cpp b/alib2data/src/grammar/Unrestricted/ContextPreservingUnrestrictedGrammar.cpp index 101de5ae82..208ced142d 100644 --- a/alib2data/src/grammar/Unrestricted/ContextPreservingUnrestrictedGrammar.cpp +++ b/alib2data/src/grammar/Unrestricted/ContextPreservingUnrestrictedGrammar.cpp @@ -6,7 +6,7 @@ */ #include "ContextPreservingUnrestrictedGrammar.h" -#include "../Grammar.h" +#include <grammar/Grammar.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.cpp b/alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.cpp index 025e9b5ad8..368fa468bd 100644 --- a/alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.cpp +++ b/alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.cpp @@ -6,7 +6,7 @@ */ #include "UnrestrictedGrammar.h" -#include "../Grammar.h" +#include <grammar/Grammar.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/regexp/formal/FormalRegExp.cpp b/alib2data/src/regexp/formal/FormalRegExp.cpp index 7b5cde8cb5..0327db3f7a 100644 --- a/alib2data/src/regexp/formal/FormalRegExp.cpp +++ b/alib2data/src/regexp/formal/FormalRegExp.cpp @@ -6,7 +6,7 @@ */ #include "FormalRegExp.h" -#include "../RegExp.h" +#include <regexp/RegExp.h> #include <object/Object.h> #include <registration/CastRegistration.hpp> diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExp.cpp b/alib2data/src/regexp/unbounded/UnboundedRegExp.cpp index e1392a2e88..41e6ef0fbd 100644 --- a/alib2data/src/regexp/unbounded/UnboundedRegExp.cpp +++ b/alib2data/src/regexp/unbounded/UnboundedRegExp.cpp @@ -6,7 +6,7 @@ */ #include "UnboundedRegExp.h" -#include "../RegExp.h" +#include <regexp/RegExp.h> #include <object/Object.h> #include <registration/CastRegistration.hpp> diff --git a/alib2data/src/string/CyclicString.cpp b/alib2data/src/string/CyclicString.cpp index 13841c1988..3da718ba64 100644 --- a/alib2data/src/string/CyclicString.cpp +++ b/alib2data/src/string/CyclicString.cpp @@ -6,10 +6,9 @@ */ #include "CyclicString.h" -#include "String.h" +#include <string/String.h> #include <object/Object.h> -#include <registration/CastRegistration.hpp> #include <registration/ValuePrinterRegistration.hpp> #include <registration/XmlRegistration.hpp> #include <registration/CastRegistration.hpp> diff --git a/alib2data/src/string/Epsilon.cpp b/alib2data/src/string/Epsilon.cpp index 22d24248bc..b11b673c64 100644 --- a/alib2data/src/string/Epsilon.cpp +++ b/alib2data/src/string/Epsilon.cpp @@ -7,7 +7,7 @@ #include "Epsilon.h" -#include "String.h" +#include <string/String.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/string/LinearString.cpp b/alib2data/src/string/LinearString.cpp index 90c065e9ee..cfb0e83bf1 100644 --- a/alib2data/src/string/LinearString.cpp +++ b/alib2data/src/string/LinearString.cpp @@ -7,10 +7,9 @@ #include "LinearString.h" -#include "String.h" +#include <string/String.h> #include <object/Object.h> -#include <registration/CastRegistration.hpp> #include <registration/ValuePrinterRegistration.hpp> #include <registration/XmlRegistration.hpp> #include <registration/CastRegistration.hpp> diff --git a/alib2data/src/tree/ranked/PostfixRankedTree.cpp b/alib2data/src/tree/ranked/PostfixRankedTree.cpp index 0597e02708..9728d62177 100644 --- a/alib2data/src/tree/ranked/PostfixRankedTree.cpp +++ b/alib2data/src/tree/ranked/PostfixRankedTree.cpp @@ -6,8 +6,8 @@ */ #include "PostfixRankedTree.h" -#include "../Tree.h" -#include "../RankedTreeWrapper.h" +#include <tree/Tree.h> +#include <tree/RankedTreeWrapper.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/tree/ranked/PrefixRankedBarNonlinearPattern.cpp b/alib2data/src/tree/ranked/PrefixRankedBarNonlinearPattern.cpp index dab4b564e1..d9a2c30d23 100644 --- a/alib2data/src/tree/ranked/PrefixRankedBarNonlinearPattern.cpp +++ b/alib2data/src/tree/ranked/PrefixRankedBarNonlinearPattern.cpp @@ -6,8 +6,8 @@ */ #include "PrefixRankedBarNonlinearPattern.h" -#include "../Tree.h" -#include "../RankedTreeWrapper.h" +#include <tree/Tree.h> +#include <tree/RankedTreeWrapper.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/tree/ranked/PrefixRankedBarPattern.cpp b/alib2data/src/tree/ranked/PrefixRankedBarPattern.cpp index e23080047d..3862afa776 100644 --- a/alib2data/src/tree/ranked/PrefixRankedBarPattern.cpp +++ b/alib2data/src/tree/ranked/PrefixRankedBarPattern.cpp @@ -6,8 +6,8 @@ */ #include "PrefixRankedBarPattern.h" -#include "../Tree.h" -#include "../RankedTreeWrapper.h" +#include <tree/Tree.h> +#include <tree/RankedTreeWrapper.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/tree/ranked/PrefixRankedBarTree.cpp b/alib2data/src/tree/ranked/PrefixRankedBarTree.cpp index 275354d0d7..9285b41f53 100644 --- a/alib2data/src/tree/ranked/PrefixRankedBarTree.cpp +++ b/alib2data/src/tree/ranked/PrefixRankedBarTree.cpp @@ -6,8 +6,8 @@ */ #include "PrefixRankedBarTree.h" -#include "../Tree.h" -#include "../RankedTreeWrapper.h" +#include <tree/Tree.h> +#include <tree/RankedTreeWrapper.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/tree/ranked/PrefixRankedNonlinearPattern.cpp b/alib2data/src/tree/ranked/PrefixRankedNonlinearPattern.cpp index 7e4b20dfa6..863c83e3b0 100644 --- a/alib2data/src/tree/ranked/PrefixRankedNonlinearPattern.cpp +++ b/alib2data/src/tree/ranked/PrefixRankedNonlinearPattern.cpp @@ -6,8 +6,8 @@ */ #include "PrefixRankedNonlinearPattern.h" -#include "../Tree.h" -#include "../RankedTreeWrapper.h" +#include <tree/Tree.h> +#include <tree/RankedTreeWrapper.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/tree/ranked/PrefixRankedPattern.cpp b/alib2data/src/tree/ranked/PrefixRankedPattern.cpp index 137a58edd3..9a78d43ce7 100644 --- a/alib2data/src/tree/ranked/PrefixRankedPattern.cpp +++ b/alib2data/src/tree/ranked/PrefixRankedPattern.cpp @@ -6,8 +6,8 @@ */ #include "PrefixRankedPattern.h" -#include "../Tree.h" -#include "../RankedTreeWrapper.h" +#include <tree/Tree.h> +#include <tree/RankedTreeWrapper.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/tree/ranked/PrefixRankedTree.cpp b/alib2data/src/tree/ranked/PrefixRankedTree.cpp index 5913b48174..f47260bab4 100644 --- a/alib2data/src/tree/ranked/PrefixRankedTree.cpp +++ b/alib2data/src/tree/ranked/PrefixRankedTree.cpp @@ -6,8 +6,8 @@ */ #include "PrefixRankedTree.h" -#include "../Tree.h" -#include "../RankedTreeWrapper.h" +#include <tree/Tree.h> +#include <tree/RankedTreeWrapper.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/tree/ranked/RankedNonlinearPattern.cpp b/alib2data/src/tree/ranked/RankedNonlinearPattern.cpp index 5a77c7c8f6..b5de7d4fda 100644 --- a/alib2data/src/tree/ranked/RankedNonlinearPattern.cpp +++ b/alib2data/src/tree/ranked/RankedNonlinearPattern.cpp @@ -6,8 +6,8 @@ */ #include "RankedNonlinearPattern.h" -#include "../Tree.h" -#include "../RankedTreeWrapper.h" +#include <tree/Tree.h> +#include <tree/RankedTreeWrapper.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/tree/ranked/RankedPattern.cpp b/alib2data/src/tree/ranked/RankedPattern.cpp index d267d91e2c..ce2f28c5b7 100644 --- a/alib2data/src/tree/ranked/RankedPattern.cpp +++ b/alib2data/src/tree/ranked/RankedPattern.cpp @@ -6,8 +6,8 @@ */ #include "RankedPattern.h" -#include "../Tree.h" -#include "../RankedTreeWrapper.h" +#include <tree/Tree.h> +#include <tree/RankedTreeWrapper.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/tree/ranked/RankedTree.cpp b/alib2data/src/tree/ranked/RankedTree.cpp index edea6f06be..7928779e03 100644 --- a/alib2data/src/tree/ranked/RankedTree.cpp +++ b/alib2data/src/tree/ranked/RankedTree.cpp @@ -6,8 +6,8 @@ */ #include "RankedTree.h" -#include "../Tree.h" -#include "../RankedTreeWrapper.h" +#include <tree/Tree.h> +#include <tree/RankedTreeWrapper.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/tree/unranked/PrefixBarTree.cpp b/alib2data/src/tree/unranked/PrefixBarTree.cpp index 6b01ede84a..43208bc99b 100644 --- a/alib2data/src/tree/unranked/PrefixBarTree.cpp +++ b/alib2data/src/tree/unranked/PrefixBarTree.cpp @@ -6,8 +6,8 @@ */ #include "PrefixBarTree.h" -#include "../Tree.h" -#include "../UnrankedTreeWrapper.h" +#include <tree/Tree.h> +#include <tree/UnrankedTreeWrapper.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/tree/unranked/UnrankedNonlinearPattern.cpp b/alib2data/src/tree/unranked/UnrankedNonlinearPattern.cpp index e2695db6b2..34d57f5361 100644 --- a/alib2data/src/tree/unranked/UnrankedNonlinearPattern.cpp +++ b/alib2data/src/tree/unranked/UnrankedNonlinearPattern.cpp @@ -6,8 +6,8 @@ */ #include "UnrankedNonlinearPattern.h" -#include "../Tree.h" -#include "../UnrankedTreeWrapper.h" +#include <tree/Tree.h> +#include <tree/UnrankedTreeWrapper.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/tree/unranked/UnrankedPattern.cpp b/alib2data/src/tree/unranked/UnrankedPattern.cpp index 4e39ff3d4a..b31b26112f 100644 --- a/alib2data/src/tree/unranked/UnrankedPattern.cpp +++ b/alib2data/src/tree/unranked/UnrankedPattern.cpp @@ -6,8 +6,8 @@ */ #include "UnrankedPattern.h" -#include "../Tree.h" -#include "../UnrankedTreeWrapper.h" +#include <tree/Tree.h> +#include <tree/UnrankedTreeWrapper.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> diff --git a/alib2data/src/tree/unranked/UnrankedTree.cpp b/alib2data/src/tree/unranked/UnrankedTree.cpp index 967d4bf327..f60a54e7bb 100644 --- a/alib2data/src/tree/unranked/UnrankedTree.cpp +++ b/alib2data/src/tree/unranked/UnrankedTree.cpp @@ -6,8 +6,8 @@ */ #include "UnrankedTree.h" -#include "../Tree.h" -#include "../UnrankedTreeWrapper.h" +#include <tree/Tree.h> +#include <tree/UnrankedTreeWrapper.h> #include <object/Object.h> #include <registration/ValuePrinterRegistration.hpp> -- GitLab