Removed internal APIs which require to include header files in src dir

Signed-off-by: Anusha Gugale <external.agogale@jp.adit-jv.com>
Change-Id: I06b56a4ab21a41e407e28b3dde23dcc0aae4dcb7

3 files changed, 13 insertions, 9 deletions

diff --git a/src/core/model/RBAModelImpl.cpp b/src/core/model/RBAModelImpl.cpp
index 081607c..09bec90 100644
--- a/src/core/model/RBAModelImpl.cpp
+++ b/src/core/model/RBAModelImpl.cpp
@@ -18,6 +18,10 @@
 
 #include "RBAModelImpl.hpp"
 #include "RBAConstraintImpl.hpp"
+#include "RBAAreaSet.hpp"
+#include "RBAZoneSet.hpp"
+#include "RBAViewContentSet.hpp"
+#include "RBASoundContentSet.hpp"
 
 namespace rba
 {
diff --git a/src/core/model/RBAModelImpl.hpp b/src/core/model/RBAModelImpl.hpp
index 5773506..91904a1 100644
--- a/src/core/model/RBAModelImpl.hpp
+++ b/src/core/model/RBAModelImpl.hpp
@@ -42,6 +42,11 @@
 namespace rba
 {
 
+class RBAAreaSet;
+class RBAZoneSet;
+class RBAViewContentSet;
+class RBASoundContentSet;
+
 class DLL_EXPORT RBAModelImpl : public RBAModel
 {
 public:
@@ -62,7 +67,7 @@ public:
   const RBASoundContentState* findSoundContentState(const std::string& stateName) const override;
   const RBAScene* findScene(const std::string& sceneName) const override;
   const RBADisplay* findDisplay(const std::string& displayName) const override;
-  const RBAModelElement* findModelElement(const std::string& elementName) const override;
+  const RBAModelElement* findModelElement(const std::string& elementName) const;
 
   const std::list<const RBAArea*>& getAreas() const override;
   const std::list<const RBAViewContent*>& getViewContents() const override;
@@ -72,13 +77,13 @@ public:
   const std::list<const RBASoundContent*>& getSoundContents() const override;
   const std::list<const RBASoundContentState*>& getSoundContentStates() const override;
   const std::list<const RBAScene*>& getScenes() const override;
-  const std::list<const RBAAreaSet*>& getAreaSets() const override;
-  const std::list<const RBAViewContentSet*>& getViewContentSets() const override;
+  const std::list<const RBAAreaSet*>& getAreaSets() const;
+  const std::list<const RBAViewContentSet*>& getViewContentSets() const;
   virtual const std::list<const RBAZoneSet*>& getZoneSets() const;
   virtual const std::list<const RBASoundContentSet*>& getSoundContentSets() const;
   const std::list<const RBAPositionContainer*>& getPositionContainers() const override;
   const std::list<const RBADisplay*>& getDisplays() const override;
-  std::list<RBAConstraint*>& getConstraints() override;
+  std::list<RBAConstraint*>& getConstraints();
 
   virtual void clearElementsStatus();
   virtual const RBAContentState* findContentState(const std::string& stateName);
diff --git a/src/factory/RBAJsonParser.cpp b/src/factory/RBAJsonParser.cpp
index e0846a5..8764fff 100644
--- a/src/factory/RBAJsonParser.cpp
+++ b/src/factory/RBAJsonParser.cpp
@@ -30,11 +30,6 @@ RBAJsonParser::RBAJsonParser()
 {
 };
 
-RBAJsonParser::RBAJsonParser(RBAModelFactory* factory)
-  : impl_{std::make_unique<RBAJsonParser::Impl>(factory)}
-{
-};
-
 RBAJsonParser::~RBAJsonParser() noexcept
 {
 };