From 13c0fd6af42562d1c11b64e0a0ff48dc990757b8 Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Fri, 28 Sep 2018 22:42:38 +0200
Subject: [PATCH] remove not needed code
---
alib2data/src/label/FailStateLabel.h | 6 -----
alib2data/src/label/FinalStateLabel.h | 6 -----
alib2data/src/label/InitialStateLabel.h | 6 -----
alib2data/src/label/Label.h | 26 -------------------
alib2data/src/label/xml/FailStateLabel.cpp | 4 +--
alib2data/src/label/xml/FinalStateLabel.cpp | 4 +--
alib2data/src/label/xml/InitialStateLabel.cpp | 4 +--
alib2str/src/label/string/FailStateLabel.cpp | 4 +--
alib2str/src/label/string/FinalStateLabel.cpp | 4 +--
.../src/label/string/InitialStateLabel.cpp | 4 +--
alib2str/test-src/object/ObjectTest.cpp | 1 -
11 files changed, 6 insertions(+), 63 deletions(-)
delete mode 100644 alib2data/src/label/Label.h
diff --git a/alib2data/src/label/FailStateLabel.h b/alib2data/src/label/FailStateLabel.h
index d1df218fc9..3a1b730be0 100644
--- a/alib2data/src/label/FailStateLabel.h
+++ b/alib2data/src/label/FailStateLabel.h
@@ -25,7 +25,6 @@
#define FAIL_STATE_LABEL_H_
#include "LabelBase.h"
-#include "Label.h"
#include <object/Object.h>
namespace label {
@@ -113,11 +112,6 @@ inline FailStateLabel FailStateLabel::instance < FailStateLabel > ( ) {
return FailStateLabel ( );
}
-template < >
-inline Label FailStateLabel::instance < Label > ( ) {
- return Label ( FailStateLabel ( ) );
-}
-
template < >
inline object::Object FailStateLabel::instance < object::Object > ( ) {
return object::Object ( FailStateLabel ( ) );
diff --git a/alib2data/src/label/FinalStateLabel.h b/alib2data/src/label/FinalStateLabel.h
index a1023985e3..d76e3e3004 100644
--- a/alib2data/src/label/FinalStateLabel.h
+++ b/alib2data/src/label/FinalStateLabel.h
@@ -25,7 +25,6 @@
#define FINAL_STATE_LABEL_H_
#include "LabelBase.h"
-#include "Label.h"
#include <object/Object.h>
namespace label {
@@ -113,11 +112,6 @@ inline FinalStateLabel FinalStateLabel::instance < FinalStateLabel > ( ) {
return FinalStateLabel ( );
}
-template < >
-inline Label FinalStateLabel::instance < Label > ( ) {
- return Label ( FinalStateLabel ( ) );
-}
-
template < >
inline object::Object FinalStateLabel::instance < object::Object > ( ) {
return object::Object ( FinalStateLabel ( ) );
diff --git a/alib2data/src/label/InitialStateLabel.h b/alib2data/src/label/InitialStateLabel.h
index 30aca14062..24ef313067 100644
--- a/alib2data/src/label/InitialStateLabel.h
+++ b/alib2data/src/label/InitialStateLabel.h
@@ -25,7 +25,6 @@
#define INITIAL_STATE_LABEL_H_
#include "LabelBase.h"
-#include "Label.h"
#include <object/Object.h>
namespace label {
@@ -113,11 +112,6 @@ inline InitialStateLabel InitialStateLabel::instance < InitialStateLabel > ( ) {
return InitialStateLabel ( );
}
-template < >
-inline Label InitialStateLabel::instance < Label > ( ) {
- return Label ( InitialStateLabel ( ) );
-}
-
template < >
inline object::Object InitialStateLabel::instance < object::Object > ( ) {
return object::Object ( InitialStateLabel ( ) );
diff --git a/alib2data/src/label/Label.h b/alib2data/src/label/Label.h
deleted file mode 100644
index 3cbd5546ba..0000000000
--- a/alib2data/src/label/Label.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Label.h
- *
- * Created on: Apr 10, 2013
- * Author: Jan Travnicek
- */
-
-#ifndef LABEL_H_
-#define LABEL_H_
-
-#include <base/WrapperBase.hpp>
-#include "LabelBase.h"
-
-namespace label {
-
-/**
- * Wrapper around automata.
- */
-class Label : public base::WrapperBase < LabelBase > {
- using base::WrapperBase < LabelBase >::WrapperBase;
-
-};
-
-} /* namespace label */
-
-#endif /* LABEL_H_ */
diff --git a/alib2data/src/label/xml/FailStateLabel.cpp b/alib2data/src/label/xml/FailStateLabel.cpp
index 9127098fa0..b7e66cefb4 100644
--- a/alib2data/src/label/xml/FailStateLabel.cpp
+++ b/alib2data/src/label/xml/FailStateLabel.cpp
@@ -6,7 +6,6 @@
*/
#include "FailStateLabel.h"
-#include <label/Label.h>
#include <object/Object.h>
#include <registration/XmlRegistration.hpp>
@@ -41,7 +40,6 @@ namespace {
static auto xmlWrite = registration::XmlWriterRegister < label::FailStateLabel > ( );
static auto xmlRead = registration::XmlReaderRegister < label::FailStateLabel > ( );
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < label::Label, label::FailStateLabel > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, label::FailStateLabel > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, label::FailStateLabel > ( );
} /* namespace */
diff --git a/alib2data/src/label/xml/FinalStateLabel.cpp b/alib2data/src/label/xml/FinalStateLabel.cpp
index 2930a3792a..74fc0c8afe 100644
--- a/alib2data/src/label/xml/FinalStateLabel.cpp
+++ b/alib2data/src/label/xml/FinalStateLabel.cpp
@@ -6,7 +6,6 @@
*/
#include "FinalStateLabel.h"
-#include <label/Label.h>
#include <object/Object.h>
#include <registration/XmlRegistration.hpp>
@@ -41,7 +40,6 @@ namespace {
static auto xmlWrite = registration::XmlWriterRegister < label::FinalStateLabel > ( );
static auto xmlRead = registration::XmlReaderRegister < label::FinalStateLabel > ( );
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < label::Label, label::FinalStateLabel > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, label::FinalStateLabel > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, label::FinalStateLabel > ( );
} /* namespace */
diff --git a/alib2data/src/label/xml/InitialStateLabel.cpp b/alib2data/src/label/xml/InitialStateLabel.cpp
index 9f867faa6d..24c35be08f 100644
--- a/alib2data/src/label/xml/InitialStateLabel.cpp
+++ b/alib2data/src/label/xml/InitialStateLabel.cpp
@@ -6,7 +6,6 @@
*/
#include "InitialStateLabel.h"
-#include <label/Label.h>
#include <object/Object.h>
#include <registration/XmlRegistration.hpp>
@@ -41,7 +40,6 @@ namespace {
static auto xmlWrite = registration::XmlWriterRegister < label::InitialStateLabel > ( );
static auto xmlRead = registration::XmlReaderRegister < label::InitialStateLabel > ( );
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < label::Label, label::InitialStateLabel > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, label::InitialStateLabel > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, label::InitialStateLabel > ( );
} /* namespace */
diff --git a/alib2str/src/label/string/FailStateLabel.cpp b/alib2str/src/label/string/FailStateLabel.cpp
index e81fa18eaa..e989c59cb6 100644
--- a/alib2str/src/label/string/FailStateLabel.cpp
+++ b/alib2str/src/label/string/FailStateLabel.cpp
@@ -9,7 +9,6 @@
#include <label/FailStateLabel.h>
#include <primitive/string/String.h>
#include <object/Object.h>
-#include <label/Label.h>
#include <registration/StringRegistration.hpp>
@@ -31,7 +30,6 @@ void stringApi < label::FailStateLabel >::compose ( std::ostream & output, const
namespace {
-static auto stringWrite = registration::StringWriterRegister < label::Label, label::FailStateLabel > ( );
-static auto stringWrite2 = registration::StringWriterRegister < object::Object, label::FailStateLabel > ( );
+static auto stringWrite = registration::StringWriterRegister < object::Object, label::FailStateLabel > ( );
} /* namespace */
diff --git a/alib2str/src/label/string/FinalStateLabel.cpp b/alib2str/src/label/string/FinalStateLabel.cpp
index 066856dae8..f3234afd86 100644
--- a/alib2str/src/label/string/FinalStateLabel.cpp
+++ b/alib2str/src/label/string/FinalStateLabel.cpp
@@ -9,7 +9,6 @@
#include <label/FinalStateLabel.h>
#include <primitive/string/String.h>
#include <object/Object.h>
-#include <label/Label.h>
#include <registration/StringRegistration.hpp>
@@ -31,7 +30,6 @@ void stringApi < label::FinalStateLabel >::compose ( std::ostream & output, cons
namespace {
-static auto stringWrite = registration::StringWriterRegister < label::Label, label::FinalStateLabel > ( );
-static auto stringWrite2 = registration::StringWriterRegister < object::Object, label::FinalStateLabel > ( );
+static auto stringWrite = registration::StringWriterRegister < object::Object, label::FinalStateLabel > ( );
} /* namespace */
diff --git a/alib2str/src/label/string/InitialStateLabel.cpp b/alib2str/src/label/string/InitialStateLabel.cpp
index 9d1d3e2097..762bd3563c 100644
--- a/alib2str/src/label/string/InitialStateLabel.cpp
+++ b/alib2str/src/label/string/InitialStateLabel.cpp
@@ -9,7 +9,6 @@
#include <label/InitialStateLabel.h>
#include <primitive/string/String.h>
#include <object/Object.h>
-#include <label/Label.h>
#include <registration/StringRegistration.hpp>
@@ -31,7 +30,6 @@ void stringApi < label::InitialStateLabel >::compose ( std::ostream & output, co
namespace {
-static auto stringWrite = registration::StringWriterRegister < label::Label, label::InitialStateLabel > ( );
-static auto stringWrite2 = registration::StringWriterRegister < object::Object, label::InitialStateLabel > ( );
+static auto stringWrite = registration::StringWriterRegister < object::Object, label::InitialStateLabel > ( );
} /* namespace */
diff --git a/alib2str/test-src/object/ObjectTest.cpp b/alib2str/test-src/object/ObjectTest.cpp
index 827f2b1c37..cac78af901 100644
--- a/alib2str/test-src/object/ObjectTest.cpp
+++ b/alib2str/test-src/object/ObjectTest.cpp
@@ -1,6 +1,5 @@
#include "ObjectTest.h"
-#include <label/Label.h>
#include <object/Object.h>
#include <factory/StringDataFactory.hpp>
--
GitLab