Explorar el Código

Remove base class dependency from IListener interface

Patrick-Christopher Mattulat hace 3 años
padre
commit
49576ecdb1

+ 0 - 1
CMakeLists.txt

@@ -87,7 +87,6 @@ set(SOURCE_FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/xml/XmlReader.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/StandardOutputWriter.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/logic/Narrator.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/logic/IListener.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/io/xml/XmlParser.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/event/Event.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/source/ls_std/event/EventHandler.cpp

+ 4 - 4
include/ls_std/logic/IListener.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-11-14
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
@@ -14,12 +14,12 @@
 
 namespace ls_std
 {
-  class IListener : public ls_std::Class
+  class IListener
   {
     public:
 
-      IListener();
-      ~IListener() override = default;
+      IListener() = default;
+      ~IListener() = default;
 
       virtual void listen(const ls_std::Class &_info) = 0;
   };

+ 0 - 13
source/ls_std/logic/IListener.cpp

@@ -1,13 +0,0 @@
-/*
- * Author:          Patrick-Christopher Mattulat
- * Company:         Lynar Studios
- * E-Mail:          webmaster@lynarstudios.com
- * Created:         2020-11-14
- * Changed:         2020-11-26
- *
- * */
-
-#include "../../../include/ls_std/logic/IListener.hpp"
-
-ls_std::IListener::IListener() : ls_std::Class("IListener")
-{}

+ 4 - 4
test/cases/factory/serialization/json/SerializableFactoryTest.cpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2021-04-24
- * Changed:         2021-05-01
+ * Changed:         2021-05-02
  *
  * */
 
@@ -90,7 +90,7 @@ namespace
   TEST_F(SerializableFactoryTest, build_factoryNotAvailable)
   {
     ls_std::SerializableJsonFactory serializableFactory{};
-    std::shared_ptr<ls_std::Class> serializable = serializableFactory.build(ls_std_test::GossipNewsAgency{}.getClassName());
+    std::shared_ptr<ls_std::Class> serializable = serializableFactory.build(ls_std_test::GossipNewsAgency{}.getName());
 
     ASSERT_FALSE(serializable != nullptr);
   }
@@ -115,7 +115,7 @@ namespace
   TEST_F(SerializableFactoryTest, hasFactory_factoryNotAvailable)
   {
     ls_std::SerializableJsonFactory serializableFactory{};
-    ASSERT_FALSE(serializableFactory.hasFactory(ls_std_test::GossipNewsAgency{}.getClassName()));
+    ASSERT_FALSE(serializableFactory.hasFactory(ls_std_test::GossipNewsAgency{}.getName()));
   }
 
   TEST_F(SerializableFactoryTest, removeFactory)
@@ -127,6 +127,6 @@ namespace
   TEST_F(SerializableFactoryTest, removeFactory_factoryNotAvailable)
   {
     ls_std::SerializableJsonFactory serializableFactory{};
-    ASSERT_FALSE(serializableFactory.removeFactory(ls_std_test::GossipNewsAgency{}.getClassName()));
+    ASSERT_FALSE(serializableFactory.removeFactory(ls_std_test::GossipNewsAgency{}.getName()));
   }
 }

+ 2 - 2
test/classes/event/DailyNewsAgency.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-11-27
- * Changed:         2021-04-23
+ * Changed:         2021-05-02
  *
  * */
 
@@ -23,7 +23,7 @@ namespace ls_std_test
     public:
 
       DailyNewsAgency();
-      ~DailyNewsAgency() override = default;
+      ~DailyNewsAgency() = default;
 
       // implementation
 

+ 2 - 2
test/classes/event/GossipNewsAgency.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-11-27
- * Changed:         2021-04-23
+ * Changed:         2021-05-02
  *
  * */
 
@@ -23,7 +23,7 @@ namespace ls_std_test
     public:
 
       GossipNewsAgency();
-      ~GossipNewsAgency() override = default;
+      ~GossipNewsAgency() = default;
 
       // implementation
 

+ 2 - 2
test/classes/observer/TestDataMercedesCar.cpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-11-14
- * Changed:         2021-04-23
+ * Changed:         2021-05-02
  *
  * */
 
@@ -15,7 +15,7 @@ ls_std_test::TestDataMercedesCar::TestDataMercedesCar() : TestDataCar()
   this->setColor("blue");
 }
 
-void ls_std_test::TestDataMercedesCar::listen(const Class &_info)
+void ls_std_test::TestDataMercedesCar::listen(const ls_std::Class &_info)
 {
   this->setColor(dynamic_cast<const ls_std::String &>(_info));
 }

+ 4 - 3
test/classes/observer/TestDataMercedesCar.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-11-14
- * Changed:         2021-04-23
+ * Changed:         2021-05-02
  *
  * */
 
@@ -12,6 +12,7 @@
 
 #include "TestDataCar.hpp"
 #include <ls_std/logic/IListener.hpp>
+#include <ls_std/base/Class.hpp>
 
 namespace ls_std_test
 {
@@ -20,9 +21,9 @@ namespace ls_std_test
     public:
 
       TestDataMercedesCar();
-      ~TestDataMercedesCar() override = default;
+      ~TestDataMercedesCar() = default;
 
-      void listen(const Class &_info) override;
+      void listen(const ls_std::Class &_info) override;
   };
 }