From db27cf4cdc9bbd6f966164f1a563039df39eb8e6 Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Tue, 2 Oct 2018 13:14:58 +0200
Subject: [PATCH] remove tree wrapper

---
 alib2data/src/tree/Tree.h                                 | 8 +-------
 alib2data/src/tree/xml/ranked/PostfixRankedTree.cpp       | 4 +---
 .../tree/xml/ranked/PrefixRankedBarNonlinearPattern.cpp   | 4 +---
 alib2data/src/tree/xml/ranked/PrefixRankedBarPattern.cpp  | 4 +---
 alib2data/src/tree/xml/ranked/PrefixRankedBarTree.cpp     | 4 +---
 .../src/tree/xml/ranked/PrefixRankedNonlinearPattern.cpp  | 4 +---
 alib2data/src/tree/xml/ranked/PrefixRankedPattern.cpp     | 4 +---
 alib2data/src/tree/xml/ranked/PrefixRankedTree.cpp        | 4 +---
 alib2data/src/tree/xml/ranked/RankedNonlinearPattern.cpp  | 4 +---
 alib2data/src/tree/xml/ranked/RankedPattern.cpp           | 4 +---
 alib2data/src/tree/xml/ranked/RankedTree.cpp              | 4 +---
 alib2data/src/tree/xml/unranked/PrefixBarTree.cpp         | 4 +---
 .../src/tree/xml/unranked/UnrankedNonlinearPattern.cpp    | 4 +---
 alib2data/src/tree/xml/unranked/UnrankedPattern.cpp       | 4 +---
 alib2data/src/tree/xml/unranked/UnrankedTree.cpp          | 4 +---
 15 files changed, 15 insertions(+), 49 deletions(-)

diff --git a/alib2data/src/tree/Tree.h b/alib2data/src/tree/Tree.h
index 289484438e..5ab8a8ef60 100644
--- a/alib2data/src/tree/Tree.h
+++ b/alib2data/src/tree/Tree.h
@@ -8,18 +8,12 @@
 #ifndef TREE_H_
 #define TREE_H_
 
-#include <base/WrapperBase.hpp>
-#include "TreeBase.h"
-
 namespace tree {
 
 /**
  * Wrapper around tree.
  */
-class Tree : public base::WrapperBase < TreeBase > {
-	using base::WrapperBase < TreeBase >::WrapperBase;
-
-};
+class Tree;
 
 } /* namespace tree */
 
diff --git a/alib2data/src/tree/xml/ranked/PostfixRankedTree.cpp b/alib2data/src/tree/xml/ranked/PostfixRankedTree.cpp
index 36f09c7a28..75a43cee89 100644
--- a/alib2data/src/tree/xml/ranked/PostfixRankedTree.cpp
+++ b/alib2data/src/tree/xml/ranked/PostfixRankedTree.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "PostfixRankedTree.h"
-#include <tree/Tree.h>
 #include <object/Object.h>
 
 #include <registration/XmlRegistration.hpp>
@@ -16,7 +15,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < tree::PostfixRankedTree < > > ( );
 static auto xmlRead = registration::XmlReaderRegister < tree::PostfixRankedTree < > > ( );
 
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < tree::Tree, tree::PostfixRankedTree < > > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, tree::PostfixRankedTree < > > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, tree::PostfixRankedTree < > > ( );
 
 } /* namespace */
diff --git a/alib2data/src/tree/xml/ranked/PrefixRankedBarNonlinearPattern.cpp b/alib2data/src/tree/xml/ranked/PrefixRankedBarNonlinearPattern.cpp
index 5c0c40ae29..360ef3eeb2 100644
--- a/alib2data/src/tree/xml/ranked/PrefixRankedBarNonlinearPattern.cpp
+++ b/alib2data/src/tree/xml/ranked/PrefixRankedBarNonlinearPattern.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "PrefixRankedBarNonlinearPattern.h"
-#include <tree/Tree.h>
 #include <object/Object.h>
 
 #include <registration/XmlRegistration.hpp>
@@ -16,7 +15,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < tree::PrefixRankedBarNonlinearPattern < > > ( );
 static auto xmlRead = registration::XmlReaderRegister < tree::PrefixRankedBarNonlinearPattern < > > ( );
 
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < tree::Tree, tree::PrefixRankedBarNonlinearPattern < > > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, tree::PrefixRankedBarNonlinearPattern < > > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, tree::PrefixRankedBarNonlinearPattern < > > ( );
 
 } /* namespace */
diff --git a/alib2data/src/tree/xml/ranked/PrefixRankedBarPattern.cpp b/alib2data/src/tree/xml/ranked/PrefixRankedBarPattern.cpp
index 360776d1fa..73886e7986 100644
--- a/alib2data/src/tree/xml/ranked/PrefixRankedBarPattern.cpp
+++ b/alib2data/src/tree/xml/ranked/PrefixRankedBarPattern.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "PrefixRankedBarPattern.h"
-#include <tree/Tree.h>
 #include <object/Object.h>
 
 #include <registration/XmlRegistration.hpp>
@@ -16,7 +15,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < tree::PrefixRankedBarPattern < > > ( );
 static auto xmlRead = registration::XmlReaderRegister < tree::PrefixRankedBarPattern < > > ( );
 
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < tree::Tree, tree::PrefixRankedBarPattern < > > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, tree::PrefixRankedBarPattern < > > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, tree::PrefixRankedBarPattern < > > ( );
 
 } /* namespace */
diff --git a/alib2data/src/tree/xml/ranked/PrefixRankedBarTree.cpp b/alib2data/src/tree/xml/ranked/PrefixRankedBarTree.cpp
index 9b57599975..9606803924 100644
--- a/alib2data/src/tree/xml/ranked/PrefixRankedBarTree.cpp
+++ b/alib2data/src/tree/xml/ranked/PrefixRankedBarTree.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "PrefixRankedBarTree.h"
-#include <tree/Tree.h>
 #include <object/Object.h>
 
 #include <registration/XmlRegistration.hpp>
@@ -16,7 +15,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < tree::PrefixRankedBarTree < > > ( );
 static auto xmlRead = registration::XmlReaderRegister < tree::PrefixRankedBarTree < > > ( );
 
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < tree::Tree, tree::PrefixRankedBarTree < > > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, tree::PrefixRankedBarTree < > > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, tree::PrefixRankedBarTree < > > ( );
 
 } /* namespace */
diff --git a/alib2data/src/tree/xml/ranked/PrefixRankedNonlinearPattern.cpp b/alib2data/src/tree/xml/ranked/PrefixRankedNonlinearPattern.cpp
index cc8d3ea9a0..147759dfee 100644
--- a/alib2data/src/tree/xml/ranked/PrefixRankedNonlinearPattern.cpp
+++ b/alib2data/src/tree/xml/ranked/PrefixRankedNonlinearPattern.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "PrefixRankedNonlinearPattern.h"
-#include <tree/Tree.h>
 #include <object/Object.h>
 
 #include <registration/XmlRegistration.hpp>
@@ -16,7 +15,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < tree::PrefixRankedNonlinearPattern < > > ( );
 static auto xmlRead = registration::XmlReaderRegister < tree::PrefixRankedNonlinearPattern < > > ( );
 
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < tree::Tree, tree::PrefixRankedNonlinearPattern < > > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, tree::PrefixRankedNonlinearPattern < > > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, tree::PrefixRankedNonlinearPattern < > > ( );
 
 } /* namespace */
diff --git a/alib2data/src/tree/xml/ranked/PrefixRankedPattern.cpp b/alib2data/src/tree/xml/ranked/PrefixRankedPattern.cpp
index 71b582d100..0433bc758f 100644
--- a/alib2data/src/tree/xml/ranked/PrefixRankedPattern.cpp
+++ b/alib2data/src/tree/xml/ranked/PrefixRankedPattern.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "PrefixRankedPattern.h"
-#include <tree/Tree.h>
 #include <object/Object.h>
 
 #include <registration/XmlRegistration.hpp>
@@ -16,7 +15,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < tree::PrefixRankedPattern < > > ( );
 static auto xmlRead = registration::XmlReaderRegister < tree::PrefixRankedPattern < > > ( );
 
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < tree::Tree, tree::PrefixRankedPattern < > > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, tree::PrefixRankedPattern < > > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, tree::PrefixRankedPattern < > > ( );
 
 } /* namespace */
diff --git a/alib2data/src/tree/xml/ranked/PrefixRankedTree.cpp b/alib2data/src/tree/xml/ranked/PrefixRankedTree.cpp
index 2bed6ee9e5..8545018915 100644
--- a/alib2data/src/tree/xml/ranked/PrefixRankedTree.cpp
+++ b/alib2data/src/tree/xml/ranked/PrefixRankedTree.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "PrefixRankedTree.h"
-#include <tree/Tree.h>
 #include <object/Object.h>
 
 #include <registration/XmlRegistration.hpp>
@@ -16,7 +15,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < tree::PrefixRankedTree < > > ( );
 static auto xmlRead = registration::XmlReaderRegister < tree::PrefixRankedTree < > > ( );
 
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < tree::Tree, tree::PrefixRankedTree < > > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, tree::PrefixRankedTree < > > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, tree::PrefixRankedTree < > > ( );
 
 } /* namespace */
diff --git a/alib2data/src/tree/xml/ranked/RankedNonlinearPattern.cpp b/alib2data/src/tree/xml/ranked/RankedNonlinearPattern.cpp
index c4d6c5dce9..c739583b90 100644
--- a/alib2data/src/tree/xml/ranked/RankedNonlinearPattern.cpp
+++ b/alib2data/src/tree/xml/ranked/RankedNonlinearPattern.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "RankedNonlinearPattern.h"
-#include <tree/Tree.h>
 #include <object/Object.h>
 
 #include <registration/XmlRegistration.hpp>
@@ -16,7 +15,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < tree::RankedNonlinearPattern < > > ( );
 static auto xmlRead = registration::XmlReaderRegister < tree::RankedNonlinearPattern < > > ( );
 
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < tree::Tree, tree::RankedNonlinearPattern < > > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, tree::RankedNonlinearPattern < > > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, tree::RankedNonlinearPattern < > > ( );
 
 } /* namespace */
diff --git a/alib2data/src/tree/xml/ranked/RankedPattern.cpp b/alib2data/src/tree/xml/ranked/RankedPattern.cpp
index 8817ae3ca4..ee5d495937 100644
--- a/alib2data/src/tree/xml/ranked/RankedPattern.cpp
+++ b/alib2data/src/tree/xml/ranked/RankedPattern.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "RankedPattern.h"
-#include <tree/Tree.h>
 #include <object/Object.h>
 
 #include <registration/XmlRegistration.hpp>
@@ -16,7 +15,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < tree::RankedPattern < > > ( );
 static auto xmlRead = registration::XmlReaderRegister < tree::RankedPattern < > > ( );
 
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < tree::Tree, tree::RankedPattern < > > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, tree::RankedPattern < > > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, tree::RankedPattern < > > ( );
 
 } /* namespace */
diff --git a/alib2data/src/tree/xml/ranked/RankedTree.cpp b/alib2data/src/tree/xml/ranked/RankedTree.cpp
index 47296deea3..581e318742 100644
--- a/alib2data/src/tree/xml/ranked/RankedTree.cpp
+++ b/alib2data/src/tree/xml/ranked/RankedTree.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "RankedTree.h"
-#include <tree/Tree.h>
 #include <object/Object.h>
 
 #include <registration/XmlRegistration.hpp>
@@ -16,7 +15,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < tree::RankedTree < > > ( );
 static auto xmlRead = registration::XmlReaderRegister < tree::RankedTree < > > ( );
 
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < tree::Tree, tree::RankedTree < > > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, tree::RankedTree < > > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, tree::RankedTree < > > ( );
 
 } /* namespace */
diff --git a/alib2data/src/tree/xml/unranked/PrefixBarTree.cpp b/alib2data/src/tree/xml/unranked/PrefixBarTree.cpp
index 999f34ee34..3f88832584 100644
--- a/alib2data/src/tree/xml/unranked/PrefixBarTree.cpp
+++ b/alib2data/src/tree/xml/unranked/PrefixBarTree.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "PrefixBarTree.h"
-#include <tree/Tree.h>
 #include <object/Object.h>
 
 #include <registration/XmlRegistration.hpp>
@@ -16,7 +15,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < tree::PrefixBarTree < > > ( );
 static auto xmlRead = registration::XmlReaderRegister < tree::PrefixBarTree < > > ( );
 
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < tree::Tree, tree::PrefixBarTree < > > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, tree::PrefixBarTree < > > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, tree::PrefixBarTree < > > ( );
 
 } /* namespace */
diff --git a/alib2data/src/tree/xml/unranked/UnrankedNonlinearPattern.cpp b/alib2data/src/tree/xml/unranked/UnrankedNonlinearPattern.cpp
index 77de071ad2..6d861c2c81 100644
--- a/alib2data/src/tree/xml/unranked/UnrankedNonlinearPattern.cpp
+++ b/alib2data/src/tree/xml/unranked/UnrankedNonlinearPattern.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "UnrankedNonlinearPattern.h"
-#include <tree/Tree.h>
 #include <object/Object.h>
 
 #include <registration/XmlRegistration.hpp>
@@ -16,7 +15,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < tree::UnrankedNonlinearPattern < > > ( );
 static auto xmlRead = registration::XmlReaderRegister < tree::UnrankedNonlinearPattern < > > ( );
 
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < tree::Tree, tree::UnrankedNonlinearPattern < > > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, tree::UnrankedNonlinearPattern < > > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, tree::UnrankedNonlinearPattern < > > ( );
 
 } /* namespace */
diff --git a/alib2data/src/tree/xml/unranked/UnrankedPattern.cpp b/alib2data/src/tree/xml/unranked/UnrankedPattern.cpp
index f84704cbcd..afbee06192 100644
--- a/alib2data/src/tree/xml/unranked/UnrankedPattern.cpp
+++ b/alib2data/src/tree/xml/unranked/UnrankedPattern.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "UnrankedPattern.h"
-#include <tree/Tree.h>
 #include <object/Object.h>
 
 #include <registration/XmlRegistration.hpp>
@@ -16,7 +15,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < tree::UnrankedPattern < > > ( );
 static auto xmlRead = registration::XmlReaderRegister < tree::UnrankedPattern < > > ( );
 
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < tree::Tree, tree::UnrankedPattern < > > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, tree::UnrankedPattern < > > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, tree::UnrankedPattern < > > ( );
 
 } /* namespace */
diff --git a/alib2data/src/tree/xml/unranked/UnrankedTree.cpp b/alib2data/src/tree/xml/unranked/UnrankedTree.cpp
index b57cba92a8..c1af83997b 100644
--- a/alib2data/src/tree/xml/unranked/UnrankedTree.cpp
+++ b/alib2data/src/tree/xml/unranked/UnrankedTree.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "UnrankedTree.h"
-#include <tree/Tree.h>
 #include <object/Object.h>
 
 #include <registration/XmlRegistration.hpp>
@@ -16,7 +15,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < tree::UnrankedTree < > > ( );
 static auto xmlRead = registration::XmlReaderRegister < tree::UnrankedTree < > > ( );
 
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < tree::Tree, tree::UnrankedTree < > > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, tree::UnrankedTree < > > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, tree::UnrankedTree < > > ( );
 
 } /* namespace */
-- 
GitLab