Merge branch 'master' of newgeom:newgeom.git into BR_PORTING_CENTOS_6_3

Conflicts:
	CMakeCommon/FindPython.cmake
	CMakeCommon/XMLProcessing.cmake

diff --git a/CMakeCommon/FindPython.cmake b/CMakeCommon/FindPython.cmake
index 364fc028b0920080d2500a38c506d25faa494d9c..0a63c5b9d367161861d0f0da85ae23e04ec53ed9 100644 (file)
--- a/CMakeCommon/FindPython.cmake
+++ b/CMakeCommon/FindPython.cmake
@@ -1,17 +1,18 @@
 
 IF(WIN32)
     IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
-      SET(PYTHON_LIBRARY_DLL "python27_d.lib")
+      SET(PYTHON_LIBRARY_FILE "python27_d.lib")
     ElSE()
-      SET(PYTHON_LIBRARY_DLL "python27.lib")
+      SET(PYTHON_LIBRARY_FILE "python27.lib")
     ENDIF()
 ElSE()
-    SET(PYTHON_LIBRARY_DLL "libpython27.so")
+    SET(PYTHON_LIBRARY_FILE "libpython2.7.so")
 ENDIF()
 
-FILE(TO_CMAKE_PATH "$ENV{PYTHON_LIB_DIR}/${PYTHON_LIBRARY_DLL}" PYTHON_LIBRARY)
+FILE(TO_CMAKE_PATH "$ENV{PYTHON_LIB_DIR}/${PYTHON_LIBRARY_FILE}" PYTHON_LIBRARY)
 FILE(TO_CMAKE_PATH $ENV{PYTHON_INC_DIR} PYTHON_INCLUDE_DIR)
-
 FIND_PACKAGE(PythonLibs)
 
-INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIR})
+MESSAGE(STATUS "PYTHON_LIBRARIES: " ${PYTHON_LIBRARIES})
+MESSAGE(STATUS "PYTHON_INCLUDE_DIR: " ${PYTHON_INCLUDE_DIR})

diff --git a/CMakeCommon/XMLProcessing.cmake b/CMakeCommon/XMLProcessing.cmake
index 5e38c02ec11bba25b3e3a0716796954a36059a00..a1dbefe0ad1534fa369d63680cd0396742b4cecb 100644 (file)
--- a/CMakeCommon/XMLProcessing.cmake
+++ b/CMakeCommon/XMLProcessing.cmake
@@ -1,4 +1,3 @@
-SET(LIBXMLDIR $ENV{LIBXML2_ROOT_DIR})
 
 IF(WIN32)
   INCLUDE_DIRECTORIES(${LIBXMLDIR}/include)
@@ -7,27 +6,22 @@ ELSE()
 ENDIF(WIN32)
 
 LINK_DIRECTORIES (${LIBXMLDIR}/lib)
+
 IF(WIN32)
     SET(LIBXML2_LIBRARIES ${LIBXMLDIR}/lib/libxml2.lib)
+    INCLUDE_DIRECTORIES(${LIBXMLDIR}/include/libxml2)
 ELSE()
     SET(LIBXML2_LIBRARIES ${LIBXMLDIR}/lib/libxml2.so)
+    SET(LIBXML2_INCLUDE_DIR ${LIBXMLDIR}/include/libxml2)
+       FIND_PACKAGE(LibXml2 REQUIRED)
+       if(LIBXML2_FOUND)
+           message(STATUS "Found libxml2 ver. " ${LIBXML2_VERSION_STRING})
+           message(STATUS "LIBXML2_LIBRARIES " ${LIBXML2_LIBRARIES})
+           message(STATUS "LIBXML2_INCLUDE_DIR " ${LIBXML2_INCLUDE_DIR})
+       endif(LIBXML2_FOUND)
+       
+       INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+       ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 ENDIF()
+LINK_DIRECTORIES (${LIBXMLDIR}/lib)
 
-
-#set(PROJECT_LIBRARIES ${PROJECT_LIBRARIES} ${LIBXMLDIR}/lib/libxml2.lib)
-
-#FILE(TO_CMAKE_PATH $ENV{PC_LIBXML_INCLUDEDIR} PC_LIBXML_INCLUDEDIR)
-#FILE(TO_CMAKE_PATH $ENV{PC_LIBXML_INCLUDEDIR} PC_LIBXML_INCLUDEDIR)
-#FILE(TO_CMAKE_PATH $ENV{PC_LIBXML_LIBDIR} PC_LIBXML_LIBDIR)
-#message(STATUS "PC_LIBXML_INCLUDEDIR " ${PC_LIBXML_INCLUDEDIR})
-#message(STATUS "PC_LIBXML_LIBDIR " ${PC_LIBXML_LIBDIR})
- 
-#FIND_PACKAGE(LibXml2 REQUIRED)
-#if(LIBXML2_FOUND)
-#    message(STATUS "Found libxml2 ver. " ${LIBXML2_VERSION_STRING})
-#    message(STATUS "LIBXML2_LIBRARIES " ${LIBXML2_LIBRARIES})
-#    message(STATUS "LIBXML2_INCLUDE_DIR " ${LIBXML2_INCLUDE_DIR})
-#endif(LIBXML2_FOUND)
-
-#INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-#ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fcea072deabf04a3ffc92b211dbdaf7dfb0271a0..eeaee08cf380263b3d74689200c95c5a782147ca 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,6 +8,16 @@ INCLUDE(Common)
 INCLUDE(FindQt)
 INCLUDE(FindPython)
 
+IF(UNIX)
+    IF(CMAKE_COMPILER_IS_GNUCC)
+        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+        MESSAGE(STATUS "Setting -std=c++0x flag for the gcc...")
+        MESSAGE(STATUS "Now gcc flags are: " ${CMAKE_CXX_FLAGS})
+        
+    ENDIF(CMAKE_COMPILER_IS_GNUCC)
+ENDIF(UNIX)
+
+
 ADD_SUBDIRECTORY (src/Config)
 ADD_SUBDIRECTORY (src/Event)
 ADD_SUBDIRECTORY (src/Model)

diff --git a/linux_env.sh b/linux_env.sh
index 889f5e402ff8d79bfcfd6b8592ec0e4c1b023ac4..a84ae8b7ca51e6880cee841296366197e483b741 100644 (file)
--- a/linux_env.sh
+++ b/linux_env.sh
@@ -66,6 +66,7 @@ export CAS_ROOT_DIR=${INST_ROOT}/OCCT-6.7.0
 
 export PATH=${CAS_ROOT_DIR}:${CAS_ROOT_DIR}/bin:${PATH}
 export LD_LIBRARY_PATH=${CAS_ROOT_DIR}:${CAS_ROOT_DIR}/lib:${LD_LIBRARY_PATH}
+export CSF_GraphicShr=${CAS_ROOT_DIR}/lib/libTKOpenGl.so
 # Variable for Foundation Classes : 
 export CSF_UnitsLexicon=${CAS_ROOT_DIR}/src/UnitsAPI/Lexi_Expr.dat 
 export CSF_UnitsDefinition=${CAS_ROOT_DIR}/src/UnitsAPI/Units.dat 
@@ -82,4 +83,5 @@ export CASROOT=${CAS_ROOT_DIR}
 ##
 export LIB=${LD_LIBRARY_PATH}
 
-
+export PATH=${INST_ROOT}/../install/bin:${PATH}
+export LD_LIBRARY_PATH=${INST_ROOT}/../install/bin:${INST_ROOT}/../install/swig:${LD_LIBRARY_PATH}

diff --git a/src/Config/Config_FeatureReader.cpp b/src/Config/Config_FeatureReader.cpp
index 204c83487bd2454e4bf0349bff205004eb2ce1f1..ddefe6df2dec201355a7337d6c4d19822e2ed85f 100644 (file)
--- a/src/Config/Config_FeatureReader.cpp
+++ b/src/Config/Config_FeatureReader.cpp
@@ -11,9 +11,9 @@
 #include <Event_Message.h>
 #include <Event_Loop.h>
 
-#include <libxml\parser.h>
-#include <libxml\tree.h>
-#include <libxml\xmlstring.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
+#include <libxml/xmlstring.h>
 
 #include <string>
 

diff --git a/src/Config/Config_ModuleReader.cpp b/src/Config/Config_ModuleReader.cpp
index 54c12d1d51e7119136e2452db9d966f274fb72e9..4fbc7d98b7f57ac405b82dfaf54eefdfdc4a13ae 100644 (file)
--- a/src/Config/Config_ModuleReader.cpp
+++ b/src/Config/Config_ModuleReader.cpp
@@ -9,8 +9,8 @@
 #include <Config_ModuleReader.h>
 #include <Config_FeatureReader.h>
 
-#include <libxml\parser.h>
-#include <libxml\tree.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
 
 #ifdef _DEBUG
 #include <iostream>

diff --git a/src/Config/Config_WidgetAPI.cpp b/src/Config/Config_WidgetAPI.cpp
index 65d4b14cad33bd13191fd5730a56ffd6b1405234..80eb568111877703e67921312149ef32a20bc05a 100644 (file)
--- a/src/Config/Config_WidgetAPI.cpp
+++ b/src/Config/Config_WidgetAPI.cpp
@@ -7,8 +7,8 @@
 
 #include <Config_WidgetAPI.h>
 
-#include <libxml\parser.h>
-#include <libxml\tree.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
 
 
 Config_WidgetAPI::Config_WidgetAPI(std::string theRawXml)

diff --git a/src/Config/Config_WidgetReader.cpp b/src/Config/Config_WidgetReader.cpp
index d746eb64eb0b4c8ba6556f394c65cd0b97e0578b..032acb000dba27983941511ed518c3670bd3d68c 100644 (file)
--- a/src/Config/Config_WidgetReader.cpp
+++ b/src/Config/Config_WidgetReader.cpp
@@ -8,10 +8,10 @@
 #include <Config_WidgetReader.h>
 #include <Config_Keywords.h>
 
-#include <libxml\parser.h>
-#include <libxml\tree.h>
-#include <libxml\xpath.h>
-#include <libxml\xmlstring.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
+#include <libxml/xpath.h>
+#include <libxml/xmlstring.h>
 
 #ifdef _DEBUG
 #include <iostream>

diff --git a/src/Config/Config_XMLReader.cpp b/src/Config/Config_XMLReader.cpp
index 0261f2551600b54fd7dec93cd03f81247c6763f6..085871fdd66d6549a75c15f18104596611fb63e5 100644 (file)
--- a/src/Config/Config_XMLReader.cpp
+++ b/src/Config/Config_XMLReader.cpp
@@ -8,8 +8,8 @@
 #include <Config_XMLReader.h>
 
 #include <Event_Loop.h>
-#include <libxml\parser.h>
-#include <libxml\tree.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
 
 /*
 #ifdef WIN32

diff --git a/src/Event/Event_Loop.cxx b/src/Event/Event_Loop.cxx
index c5cadce448a9c687508757504dc231ddf97d90ab..c938dbe95cce2dd0dcb83eb7da97bbd39dc0a6d7 100644 (file)
--- a/src/Event/Event_Loop.cxx
+++ b/src/Event/Event_Loop.cxx
@@ -3,7 +3,9 @@
 // Author:     Mikhail PONIKAROV
 
 #include <Event_Loop.h>
+
 #include <string>
+#include <cstring>
 
 using namespace std;
 

diff --git a/src/Model/Model_Document.cxx b/src/Model/Model_Document.cxx
index 9049c299d932dc3884efc17791a19d1752f93c5d..22641f4b3d7665376060fb4f3221448119503efd 100644 (file)
--- a/src/Model/Model_Document.cxx
+++ b/src/Model/Model_Document.cxx
@@ -15,6 +15,8 @@
 #include <TDataStd_Comment.hxx>
 #include <TDF_ChildIDIterator.hxx>
 
+#include <climits>
+
 static const int UNDO_LIMIT = 10; // number of possible undo operations
 
 static const int TAG_GENERAL = 1; // general properties tag
@@ -393,7 +395,7 @@ void Model_Document::synchronizeFeatures()
     TDF_ChildIDIterator aFLabIter(
       aGroupsIter.Value()->Label(), TDataStd_Comment::GetID(), Standard_False);
     while(aFIter != aFeatures.end() || aFLabIter.More()) {
-      static const int INFINITE_TAG = MAXINT; // no label means that it exists somwhere in infinite
+      static const int INFINITE_TAG = INT_MAX; // no label means that it exists somwhere in infinite
       int aFeatureTag = INFINITE_TAG; 
       if (aFIter != aFeatures.end()) { // existing tag for feature
         shared_ptr<Model_Data> aData = dynamic_pointer_cast<Model_Data>((*aFIter)->data());

diff --git a/src/Model/Model_Iterator.cxx b/src/Model/Model_Iterator.cxx
index b8a765d91a577ae16745f99f41b1a10f009794b0..001ebdff8146c3d2bab6e71cc80cbca487696fa2 100644 (file)
--- a/src/Model/Model_Iterator.cxx
+++ b/src/Model/Model_Iterator.cxx
@@ -51,7 +51,7 @@ int Model_Iterator::numIterationsLeft()
   return aResult;
 }
 
-bool Model_Iterator::is(std::shared_ptr<ModelAPI_Feature> theFeature)
+bool Model_Iterator::isEqual(std::shared_ptr<ModelAPI_Feature> theFeature)
 {
   return (myIter.Value()->Label() == 
     dynamic_pointer_cast<Model_Data>(theFeature->data())->label()) == Standard_True;

diff --git a/src/Model/Model_Iterator.h b/src/Model/Model_Iterator.h
index b28423bcf5e23dc2fa14243b37da1504e57032fb..5d8c61baec0c7a8fbb413d1e6a414c04da3d0ecb 100644 (file)
--- a/src/Model/Model_Iterator.h
+++ b/src/Model/Model_Iterator.h
@@ -39,7 +39,7 @@ public:
 
   /// Compares the current feature with the given one
   /// \returns true if given feature equals to the current one
-  MODEL_EXPORT virtual bool is(std::shared_ptr<ModelAPI_Feature> theFeature);
+  MODEL_EXPORT virtual bool isEqual(std::shared_ptr<ModelAPI_Feature> theFeature);
 
 protected:
   /// Creates an empty iterator that alway returns More false

diff --git a/src/ModelAPI/ModelAPI_Iterator.h b/src/ModelAPI/ModelAPI_Iterator.h
index 41032c2fbbf6a86d0399bb0f666a4ac52d059c74..8a128a59db5bc1e19536f06873aef01cd5ffada1 100644 (file)
--- a/src/ModelAPI/ModelAPI_Iterator.h
+++ b/src/ModelAPI/ModelAPI_Iterator.h
@@ -36,7 +36,7 @@ public:
   virtual int numIterationsLeft() = 0;
   /// Compares the current feature with the given one
   /// \returns true if given feature equals to the current one
-  virtual bool is(std::shared_ptr<ModelAPI_Feature> theFeature) = 0;
+  virtual bool isEqual(std::shared_ptr<ModelAPI_Feature> theFeature) = 0;
 
   /// To virtually destroy the fields of successors
   virtual ~ModelAPI_Iterator() {}

diff --git a/src/ModelAPI/ModelAPI_PluginManager.cxx b/src/ModelAPI/ModelAPI_PluginManager.cxx
index 47623f0915fc597532b889467e8b4299be88e808..f3e7e9b9d5f13b377247169f802d41162eed67bb 100644 (file)
--- a/src/ModelAPI/ModelAPI_PluginManager.cxx
+++ b/src/ModelAPI/ModelAPI_PluginManager.cxx
@@ -58,7 +58,7 @@ string library(const string& theLibName)
 #ifndef WIN32
   static string aLibExt( ".so" );
   if (aLibName.size() < 3 || aLibName.substr(0, 3) !="lib")
-    aLibName = ".lib" + aLibName;
+    aLibName = "lib" + aLibName;
 #else
   static string aLibExt( ".dll" );
 #endif

diff --git a/src/ModelAPI/ModelAPI_PluginManager.h b/src/ModelAPI/ModelAPI_PluginManager.h
index 90e1ca81d1bd91a138b987ddde6fe3bc3be451b7..2b2f2fc277f002c79bc46b0d669a8ea86aeb3f41 100644 (file)
--- a/src/ModelAPI/ModelAPI_PluginManager.h
+++ b/src/ModelAPI/ModelAPI_PluginManager.h
@@ -44,7 +44,7 @@ public:
   virtual void setCurrentDocument(std::shared_ptr<ModelAPI_Document> theDoc) = 0;
 
   /// loads the library with specific name, appends "lib*.dll" or "*.so" depending on the platform
-  static void ModelAPI_PluginManager::loadLibrary(const std::string theLibName);
+  static void loadLibrary(const std::string theLibName);
 
   /// Is needed for python wrapping by swig, call Get to get an instance
   ModelAPI_PluginManager();

diff --git a/src/PyConsole/CMakeLists.txt b/src/PyConsole/CMakeLists.txt
index b623b64cfea6fb467aab85ed75c8e94af6f3a039..8cd815158e043db3616e0ac0f5528f839aa20a16 100644 (file)
--- a/src/PyConsole/CMakeLists.txt
+++ b/src/PyConsole/CMakeLists.txt
@@ -37,6 +37,7 @@ SET(PROJECT_SOURCES
 SET(PROJECT_LIBRARIES
        PyInterp
        ${QT_LIBRARIES}
+       ${PYTHON_LIBRARIES}
 )
 
 QT4_ADD_TRANSLATION(QM_RESOURCES ${TEXT_RESOURCES})

diff --git a/src/PyInterp/CMakeLists.txt b/src/PyInterp/CMakeLists.txt
index d7f7a53d6c02ef6447d832582a118431db4a5aed..7684af37fdc49fd74a20114626947bb53d2e7942 100644 (file)
--- a/src/PyInterp/CMakeLists.txt
+++ b/src/PyInterp/CMakeLists.txt
@@ -26,6 +26,7 @@ SET(PROJECT_SOURCES
 SET(PROJECT_LIBRARIES
        PyEvent
        ${QT_LIBRARIES}
+       ${PYTHON_LIBRARIES}
 )
 
 SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC})

diff --git a/src/XGUI/CMakeLists.txt b/src/XGUI/CMakeLists.txt
index 652965fc1c905b20fc5e3029f8bc957dc8d2c66e..bd4e643dd0093a3e97492bb0e5813713241a3b14 100644 (file)
--- a/src/XGUI/CMakeLists.txt
+++ b/src/XGUI/CMakeLists.txt
@@ -58,7 +58,6 @@ SET(PROJECT_RESOURCES
 #)
 
 SET(PROJECT_LIBRARIES
-       opengl32
     Event
     Config
        ${QT_LIBRARIES}
@@ -72,6 +71,12 @@ SET(PROJECT_LIBRARIES
        ModuleBase
 )
 
+IF(WIN32) 
+    SET(PROJECT_LIBRARIES ${PROJECT_LIBRARIES} opengl32)
+ELSE()
+    SET(PROJECT_LIBRARIES ${PROJECT_LIBRARIES} GL)
+ENDIF()
+
 QT4_ADD_RESOURCES(PROJECT_COMPILED_RESOURCES ${PROJECT_RESOURCES})
 #QT5_ADD_TRANSLATION(QM_RESOURCES ${TEXT_RESOURCES})
 

diff --git a/src/XGUI/XGUI_PartDataModel.cpp b/src/XGUI/XGUI_PartDataModel.cpp
index f0e1d9f4b7c0d8fc4d7e0c40f5148be514c0a995..40f4671db277b9c204dc6da0ad184043f3f83b8f 100644 (file)
--- a/src/XGUI/XGUI_PartDataModel.cpp
+++ b/src/XGUI/XGUI_PartDataModel.cpp
@@ -92,16 +92,16 @@ QModelIndex XGUI_TopDataModel::index(int theRow, int theColumn, const QModelInde
   if (!theParent.isValid()) {
     switch (theRow) {
     case 0:
-      return createIndex(theRow, theColumn, (quintptr) ParamsFolder);
+      return createIndex(theRow, theColumn, (qint32) ParamsFolder);
     case 1:
-      return createIndex(theRow, theColumn, (quintptr) ConstructFolder);
+      return createIndex(theRow, theColumn, (qint32) ConstructFolder);
     }
   } else {
     if (theParent.internalId() == ParamsFolder)
-      return createIndex(theRow, theColumn, (quintptr) ParamObject);
+      return createIndex(theRow, theColumn, (qint32) ParamObject);
 
     if (theParent.internalId() == ConstructFolder)
-      return createIndex(theRow, theColumn, (quintptr) ConstructObject);
+      return createIndex(theRow, theColumn, (qint32) ConstructObject);
   }
   return QModelIndex();
 }
@@ -114,9 +114,9 @@ QModelIndex XGUI_TopDataModel::parent(const QModelIndex& theIndex) const
   case ConstructFolder:
     return QModelIndex();
   case ParamObject:
-    return createIndex(0, 0, (quintptr) ParamsFolder);
+    return createIndex(0, 0, (qint32) ParamsFolder);
   case ConstructObject:
-    return createIndex(1, 0, (quintptr) ConstructFolder);
+    return createIndex(1, 0, (qint32) ConstructFolder);
   }
   return QModelIndex();
 }
@@ -131,13 +131,13 @@ FeaturePtr XGUI_TopDataModel::feature(const QModelIndex& theIndex) const
   switch (theIndex.internalId()) {
   case ParamsFolder:
   case ConstructFolder:
-    return 0;
+    return FeaturePtr();
   case ParamObject:
     return myDocument->feature(PARAMETERS_GROUP, theIndex.row());
   case ConstructObject:
     return myDocument->feature(CONSTRUCTIONS_GROUP, theIndex.row());
   }
-  return 0;
+  return FeaturePtr();
 }
 
 
@@ -258,21 +258,21 @@ int XGUI_PartDataModel::columnCount(const QModelIndex &parent) const
 QModelIndex XGUI_PartDataModel::index(int theRow, int theColumn, const QModelIndex &theParent) const
 {
   if (!theParent.isValid())
-    return createIndex(theRow, 0, (quintptr) MyRoot);
+    return createIndex(theRow, 0, (qint32) MyRoot);
 
   int aId = (int)theParent.internalId();
   switch (aId) {
   case MyRoot:
     switch (theRow) {
     case 0:
-      return createIndex(0, 0, (quintptr) ParamsFolder);
+      return createIndex(0, 0, (qint32) ParamsFolder);
     case 1:
-      return createIndex(1, 0, (quintptr) ConstructFolder);
+      return createIndex(1, 0, (qint32) ConstructFolder);
     }
   case ParamsFolder:
-    return createIndex(theRow, 0, (quintptr) ParamObject);
+    return createIndex(theRow, 0, (qint32) ParamObject);
   case ConstructFolder:
-    return createIndex(theRow, 0, (quintptr) ConstructObject);
+    return createIndex(theRow, 0, (qint32) ConstructObject);
   }
   return QModelIndex();
 }
@@ -284,11 +284,11 @@ QModelIndex XGUI_PartDataModel::parent(const QModelIndex& theIndex) const
     return QModelIndex();
   case ParamsFolder:
   case ConstructFolder:
-    return createIndex(0, 0, (quintptr) MyRoot);
+    return createIndex(0, 0, (qint32) MyRoot);
   case ParamObject:
-    return createIndex(0, 0, (quintptr) ParamsFolder);
+    return createIndex(0, 0, (qint32) ParamsFolder);
   case ConstructObject:
-    return createIndex(1, 0, (quintptr) ConstructFolder);
+    return createIndex(1, 0, (qint32) ConstructFolder);
   }
   return QModelIndex();
 }
@@ -312,13 +312,13 @@ FeaturePtr XGUI_PartDataModel::feature(const QModelIndex& theIndex) const
     return myDocument->feature(PARTS_GROUP, myId);
   case ParamsFolder:
   case ConstructFolder:
-    return 0;
+    return FeaturePtr();
   case ParamObject:
     return featureDocument()->feature(PARAMETERS_GROUP, theIndex.row());
   case ConstructObject:
     return featureDocument()->feature(CONSTRUCTIONS_GROUP, theIndex.row());
   }
-  return 0;
+  return FeaturePtr();
 }
 
 bool XGUI_PartDataModel::hasDocument(const std::shared_ptr<ModelAPI_Document>& theDoc) const
@@ -345,4 +345,4 @@ QModelIndex XGUI_PartDataModel::findGroup(const std::string& theGroup) const
   if (theGroup.compare(CONSTRUCTIONS_GROUP) == 0)
     return createIndex(1, 0, (quintptr) ConstructFolder);
   return QModelIndex();
-}
\ No newline at end of file
+}

diff --git a/src/XGUI/XGUI_SelectionMgr.h b/src/XGUI/XGUI_SelectionMgr.h
index 23849befe8930785c3c23d381e1c0990badff671..61fb70aff19e7df51150ba01479cc4b50e879004 100644 (file)
--- a/src/XGUI/XGUI_SelectionMgr.h
+++ b/src/XGUI/XGUI_SelectionMgr.h
@@ -39,4 +39,4 @@ private:
   QFeatureList mySelectedData;
 };
 
-#endif;
\ No newline at end of file
+#endif

diff --git a/src/XGUI/XGUI_ViewPort.cpp b/src/XGUI/XGUI_ViewPort.cpp
index 21552a55dc41197dec1bef8d9072edff1a050cf0..f7edd5d5e297eedfa9f57f9df423408b86c420c4 100644 (file)
--- a/src/XGUI/XGUI_ViewPort.cpp
+++ b/src/XGUI/XGUI_ViewPort.cpp
@@ -1,10 +1,4 @@
-#ifndef WIN32
-# ifndef GLX_GLXEXT_LEGACY
-#  define GLX_GLXEXT_LEGACY
-# endif
-# include <GL/glx.h>
-# include <dlfcn.h>
-#else
+#ifdef WIN32
 # include <windows.h>
 # include <wingdi.h>
 #endif
@@ -21,6 +15,7 @@
 #include <V3d_OrthographicView.hxx>
 #include <V3d_PerspectiveView.hxx>
 #include <Visual3d_View.hxx>
+#include <Graphic3d_GraphicDriver.hxx>
 
 #ifdef WIN32
 #include <WNT_Window.hxx>
@@ -29,6 +24,15 @@
 #endif
 
 #include <GL/gl.h>
+//qmetatype.h must be included before any header file that defines Bool
+//see /QtCore/qmetatype.h:53 for more info
+#ifndef WIN32
+# ifndef GLX_GLXEXT_LEGACY
+#  define GLX_GLXEXT_LEGACY
+# endif
+# include <GL/glx.h>
+# include <dlfcn.h>
+#endif
 
 static double rx = 0.;
 static double ry = 0.;

diff --git a/src/XGUI/XGUI_ViewWindow.cpp b/src/XGUI/XGUI_ViewWindow.cpp
index fd8f1dc9e19149df50af3e01ac84694438a9ca2b..3803cabeaaeb9876d2c1a6e6f6d7aa1833800391 100644 (file)
--- a/src/XGUI/XGUI_ViewWindow.cpp
+++ b/src/XGUI/XGUI_ViewWindow.cpp
@@ -136,7 +136,7 @@ XGUI_ViewWindow::XGUI_ViewWindow(XGUI_Viewer* theViewer, V3d_TypeOfView theType)
     myClosable(true),
     myStartX(0), myStartY(0), myCurrX(0), myCurrY(0), myCurScale(0.0), myCurSketch(0),
     myDrawRect(false), myEnableDrawMode(false), myCursorIsHand(false), myEventStarted(false),
-    myLastState(NormalState), myOperation(NOTHING)
+    myLastState(WindowNormalState), myOperation(NOTHING)
 {
   mySelectedPoint = gp_Pnt(0., 0., 0.);
   setFrameStyle(QFrame::Raised);
@@ -345,7 +345,7 @@ void XGUI_ViewWindow::onMinimize()
     int aNewH = int(aH / aR);
     myPicture->setPixmap(aPMap.scaled(100,  aNewH));
 
-  myLastState = isMaximized() ? MaximizedState : NormalState;
+  myLastState = isMaximized() ? MaximizedState : WindowNormalState;
   showMinimized();
     parentWidget()->setGeometry(parentWidget()->x(), parentWidget()->y(),
                                 100, aNewH);
@@ -964,9 +964,9 @@ void XGUI_ViewWindow::dumpView()
 
     Handle(Visual3d_View) a3dView = myViewPort->getView()->View();
     if (aFmt == "PS")
-      a3dView->Export(_strdup(qPrintable(aFileName)), Graphic3d_EF_PostScript);
+      a3dView->Export(strdup(qPrintable(aFileName)), Graphic3d_EF_PostScript);
     else if (aFmt == "EPS")
-      a3dView->Export(_strdup(qPrintable(aFileName)), Graphic3d_EF_EnhPostScript);
+      a3dView->Export(strdup(qPrintable(aFileName)), Graphic3d_EF_EnhPostScript);
     else
       aPicture.save( aFileName, aFmt.toLatin1() );
     QApplication::restoreOverrideCursor();

diff --git a/src/XGUI/XGUI_ViewWindow.h b/src/XGUI/XGUI_ViewWindow.h
index be28c95a0aba45dd6c337c1349379fa580c8572b..0c3ae8a1766f7a266634ab9cb198f90ad9750d5a 100644 (file)
--- a/src/XGUI/XGUI_ViewWindow.h
+++ b/src/XGUI/XGUI_ViewWindow.h
@@ -196,7 +196,9 @@ private slots:
 private:
   enum WindowState
   {
-    MinimizedState, MaximizedState, NormalState
+    MinimizedState,
+    MaximizedState,
+    WindowNormalState
   };
 
   bool processWindowControls(QObject *theObj, QEvent *theEvent);

diff --git a/src/XGUI/XGUI_Workbench.h b/src/XGUI/XGUI_Workbench.h
index 3c7443b3bf0c2495c1acf06cce7a1dc7918fad4d..d751a06973034edaf0ee2bd5e60a28c2fb541ca7 100644 (file)
--- a/src/XGUI/XGUI_Workbench.h
+++ b/src/XGUI/XGUI_Workbench.h
@@ -50,4 +50,4 @@ private:
   QPushButton* myLeftButton;
 };
 
-#endif;
+#endif

diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp
index 0aac474da326408d2dbfde354e49283c7af0734a..02a02ec868276213c3114f6f0e49207787a96b63 100644 (file)
--- a/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@ -347,7 +347,7 @@ XGUI_Module* XGUI_Workshop::loadModule(const QString& theModule)
   err = QString( "Can not load library %1. %2" ).arg( libName ).arg( dlerror() );
   else
   {
-    crtInst = (CREATE_FUNC)dlsym( modLib, GET_MODULE_NAME );
+    crtInst = (CREATE_FUNC)dlsym( modLib, CREATE_MODULE );
     if ( !crtInst )
     err = QString( "Failed to find function %1. %2" ).arg( CREATE_MODULE ).arg( dlerror() );
   }
@@ -407,4 +407,4 @@ void XGUI_Workshop::updateCommandStatus()
         (*aIt)->disable();
     }
   }
-}
\ No newline at end of file
+}