From: spo <sergey.pokhodenko@opencascade.com>
Date: Wed, 25 May 2016 07:47:52 +0000 (+0300)
Subject: Code improvements
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=35811fa801cd2779953bf433624cda121aa427b1;p=modules%2Fshaper.git

Code improvements
---

diff --git a/src/ConstructionAPI/CMakeLists.txt b/src/ConstructionAPI/CMakeLists.txt
index 83dbc2dd2..8faa88b43 100644
--- a/src/ConstructionAPI/CMakeLists.txt
+++ b/src/ConstructionAPI/CMakeLists.txt
@@ -11,16 +11,16 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 SET(PROJECT_HEADERS
     ConstructionAPI.h
     ConstructionAPI_Point.h
-)
+    )
 
 SET(PROJECT_SOURCES
     ConstructionAPI_Point.cpp
-)
+    )
 
 SET(PROJECT_LIBRARIES
     ModelAPI
     ModelHighAPI
-)
+    )
 
 ADD_DEFINITIONS(-DCONSTRUCTIONAPI_EXPORTS ${CAS_DEFINITIONS})
 ADD_LIBRARY(ConstructionAPI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
@@ -31,22 +31,22 @@ SET_SOURCE_FILES_PROPERTIES(ConstructionAPI.i PROPERTIES CPLUSPLUS ON)
 SET_SOURCE_FILES_PROPERTIES(ConstructionAPI.i PROPERTIES SWIG_DEFINITIONS "-shadow")
 
 INCLUDE_DIRECTORIES(
-  ${PROJECT_SOURCE_DIR}/src/ModelAPI
-  ${PROJECT_SOURCE_DIR}/src/ModelHighAPI
-)
+    ${PROJECT_SOURCE_DIR}/src/ModelAPI
+    ${PROJECT_SOURCE_DIR}/src/ModelHighAPI
+    )
 
 TARGET_LINK_LIBRARIES(ConstructionAPI ${PROJECT_LIBRARIES})
 
 SET(SWIG_SCRIPTS
-  ${CMAKE_CURRENT_BINARY_DIR}/ConstructionAPI.py
-)
+    ${CMAKE_CURRENT_BINARY_DIR}/ConstructionAPI.py
+    )
 
 SET(SWIG_LINK_LIBRARIES
-  ConstructionAPI
-  ModelHighAPI
-  ModelAPI
-  ${PYTHON_LIBRARIES}
-)
+    ConstructionAPI
+    ModelHighAPI
+    ModelAPI
+    ${PYTHON_LIBRARIES}
+    )
 
 SET(SWIG_MODULE_ConstructionAPI_EXTRA_DEPS ${SWIG_MODULE_ConstructionAPI_EXTRA_DEPS}
     ${PROJECT_SOURCE_DIR}/src/ModelHighAPI/ModelHighAPI.i
diff --git a/src/ConstructionAPI/ConstructionAPI_swig.h b/src/ConstructionAPI/ConstructionAPI_swig.h
index cade6c2c7..4cdc3fb81 100644
--- a/src/ConstructionAPI/ConstructionAPI_swig.h
+++ b/src/ConstructionAPI/ConstructionAPI_swig.h
@@ -7,9 +7,8 @@
 #ifndef SRC_CONSTRUCTIONAPI_CONSTRUCTIONAPI_SWIG_H_
 #define SRC_CONSTRUCTIONAPI_CONSTRUCTIONAPI_SWIG_H_
 
-  #include "ModelHighAPI_swig.h"
+  #include <ModelHighAPI_swig.h>
 
-  #include "ConstructionAPI.h"
   #include "ConstructionAPI_Point.h"
 
 #endif /* SRC_CONSTRUCTIONAPI_CONSTRUCTIONAPI_SWIG_H_ */
diff --git a/src/ModelHighAPI/ModelHighAPI_swig.h b/src/ModelHighAPI/ModelHighAPI_swig.h
index d4cf88b65..63b3b1b43 100644
--- a/src/ModelHighAPI/ModelHighAPI_swig.h
+++ b/src/ModelHighAPI/ModelHighAPI_swig.h
@@ -9,7 +9,6 @@
 
   #include <ModelAPI.h>
 
-  #include "ModelHighAPI.h"
   #include "ModelHighAPI_Double.h"
   #include "ModelHighAPI_Interface.h"