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

7 files changed, 13 insertions, 114 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 46e3523..8439403 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -130,26 +130,4 @@ install(
     PATTERN "*.h*"
 )
 
-install (
-    FILES ${CMAKE_SOURCE_DIR}/src/view/RBAAreaSet.hpp
-    ${CMAKE_SOURCE_DIR}/src/core/model/RBAAllocatableSet.hpp
-    ${CMAKE_SOURCE_DIR}/src/core/model/RBARuleObject.hpp
-    ${CMAKE_SOURCE_DIR}/src/core/model/RBANamedElement.hpp
-    ${CMAKE_SOURCE_DIR}/src/public/RBADllExport.hpp
-    ${CMAKE_SOURCE_DIR}/src/core/model/RBAContentSet.hpp
-    ${CMAKE_SOURCE_DIR}/src/core/model/RBAAbstractAllocatable.hpp
-    ${CMAKE_SOURCE_DIR}/src/core/model/RBAConstraint.hpp
-    ${CMAKE_SOURCE_DIR}/src/view/RBAViewContentSet.hpp
-    ${CMAKE_SOURCE_DIR}/src/sound/RBAZoneSet.hpp
-    ${CMAKE_SOURCE_DIR}/src/core/model/RBAModelElement.hpp
-    ${CMAKE_SOURCE_DIR}/src/core/model/RBAAbstractContent.hpp
-    ${CMAKE_SOURCE_DIR}/src/sound/RBASoundContentSet.hpp
-    ${CMAKE_SOURCE_DIR}/src/core/logic/RBARequestQueMember.hpp
-    ${CMAKE_SOURCE_DIR}/src/core/logic/RBAResultSet.hpp
-    ${CMAKE_SOURCE_DIR}/src/core/model/RBAContentStatusType.hpp
-    ${CMAKE_SOURCE_DIR}/src/core/logic/RBAContentStatus.hpp
-    ${CMAKE_SOURCE_DIR}/src/core/logic/RBAResultImpl.hpp
-    DESTINATION include
-)
-
 # end of file
diff --git a/doc/RBA_IF_Specification.md b/doc/RBA_IF_Specification.md
index 6c5aa2c..fbb1351 100644
--- a/doc/RBA_IF_Specification.md
+++ b/doc/RBA_IF_Specification.md
@@ -982,33 +982,6 @@ Returns all the displays.
 @return  

 List of displays.

 

-**virtual const RBAModelElement\* findModelElement(const std::string& elementName) const=0;**  

-@brief  

-Search for Model element with a name.

-

-@param elementName  

-Model element name.

-

-@return  

-Model element.

-

-@details  

-If the Model element name does not exist, returns nullptr.

-

-**virtual const std::list<const RBAAreaSet\*>& getAreaSets() const=0;**  

-@brief  

-Returns all the sets of areas.

-

-@return  

-List of sets of areas.

-

-**virtual const std::list<const RBAViewContentSet\*>& getViewContentSets() const=0;**  

-@brief  

-Returns all the sets of view contents.

-

-@return  

-List of sets of view contents.

-

 **virtual const std::list<const RBAPositionContainer\*>& getPositionContainers() const=0;**  

 @brief  

 Returns all the position containers.

@@ -1016,20 +989,6 @@ Returns all the position containers.
 @return  

 List of sets of position containers.

 

-**virtual std::list<RBAConstraint\*>& getConstraints()=0;**  

-@brief  

-Returns all the constraints.

-

-@return  

-List of constraints.

-

-**virtual std::list<RBAPostConstraint\*>& getPostConstraints()=0;**  

-@brief  

-Returns all the post constraints.

-

-@return  

-List of post constraints.

-

 <div style="page-break-after:always"></div>

 <a id="anchor9"></a>

 

diff --git a/include/rba/RBAJsonParser.hpp b/include/rba/RBAJsonParser.hpp
index 2f9404a..449a24b 100644
--- a/include/rba/RBAJsonParser.hpp
+++ b/include/rba/RBAJsonParser.hpp
@@ -38,10 +38,6 @@ namespace rba
 {
 
 class RBAModel;
-// internal {
-class RBAExpression;
-class RBAModelFactory;
-// }
 
 /**
  * @class RBAJsonParser
@@ -78,9 +74,6 @@ public:
    */
   RBAModel* parse(const std::string& filename);
 
-  // internal {
-  RBAJsonParser(RBAModelFactory* factory);
-  // }
 
 private:
   class Impl;
diff --git a/include/rba/RBAModel.hpp b/include/rba/RBAModel.hpp
index 276201f..eb51338 100644
--- a/include/rba/RBAModel.hpp
+++ b/include/rba/RBAModel.hpp
@@ -33,13 +33,6 @@
 #include "RBADisplay.hpp"
 #include "RBAPositionContainer.hpp"
 #include "RBAJsonParser.hpp"
-// internal {
-#include "RBAAreaSet.hpp"
-#include "RBAViewContentSet.hpp"
-#include "RBAZoneSet.hpp"
-#include "RBASoundContentSet.hpp"
-#include "RBAConstraint.hpp"
-// }
 
 #ifdef _MSC_VER
 #ifdef _WINDLL
@@ -215,38 +208,10 @@ public:
 
   // internal {
   /**
-   * @brief Search for Model element with a name.
-   * @param elementName Model element name.
-   * @return Model element
-   *
-   * If the Model element name does not exist, returns nullptr.
-   */
-  virtual const RBAModelElement* findModelElement(const std::string& elementName) const=0;
-
-  /**
-   * @brief Returns all the sets of areas.
-   * @return List of sets of areas
-   */
-  virtual const std::list<const RBAAreaSet*>& getAreaSets() const=0;
-
-  /**
-   * @brief Returns all the sets of view contents.
-   * @return List of sets of view contents
-   */
-  virtual const std::list<const RBAViewContentSet*>& getViewContentSets() const=0;
-
-  /**
    * @brief Returns all the position containers.
    * @return List of sets of position containers
    */
   virtual const std::list<const RBAPositionContainer*>& getPositionContainers() const=0;
-
-  /**
-   * @brief Returns all the constraints.
-   * @return List of constraints
-   */
-  virtual std::list<RBAConstraint*>& getConstraints()=0;
-
  // }
 
 };
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
 {
 };