Fix of the processEvents call on Linux

diff --git a/src/ConstructionPlugin/CMakeLists.txt b/src/ConstructionPlugin/CMakeLists.txt
index 5e27fe1c78fad1b4d6a5a956804eaa16cf9f4916..a5866c2826ce81c2ee2da97fa07a32d9aed81421 100644 (file)
--- a/src/ConstructionPlugin/CMakeLists.txt
+++ b/src/ConstructionPlugin/CMakeLists.txt
@@ -26,7 +26,7 @@ SET(PROJECT_LIBRARIES
 )
 
 ADD_DEFINITIONS(-DCONSTRUCTIONPLUGIN_EXPORTS ${BOOST_DEFINITIONS})
-ADD_LIBRARY(ConstructionPlugin SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES})
+ADD_LIBRARY(ConstructionPlugin MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES})
 TARGET_LINK_LIBRARIES(ConstructionPlugin ${PROJECT_LIBRARIES})
 
 INSTALL(TARGETS ConstructionPlugin DESTINATION plugins)

diff --git a/src/ConstructionPlugin/ConstructionPlugin_Plugin.cpp b/src/ConstructionPlugin/ConstructionPlugin_Plugin.cpp
index fd5db868fc7443bf50cd3b982f2a15c7b5fa291f..2d853ebd0ce1defd27172297efc257dad371eba0 100644 (file)
--- a/src/ConstructionPlugin/ConstructionPlugin_Plugin.cpp
+++ b/src/ConstructionPlugin/ConstructionPlugin_Plugin.cpp
@@ -7,7 +7,7 @@
 using namespace std;
 
 // the only created instance of this plugin
-static ConstructionPlugin_Plugin* MY_INSTANCE = new ConstructionPlugin_Plugin();
+static ConstructionPlugin_Plugin* MY_CONSTRUCTION_INSTANCE = new ConstructionPlugin_Plugin();
 
 ConstructionPlugin_Plugin::ConstructionPlugin_Plugin()
 {

diff --git a/src/ExchangePlugin/CMakeLists.txt b/src/ExchangePlugin/CMakeLists.txt
index 2a1c85e55a07775a8f7b04ba3f4b866ea23011d1..ad3f24fdf9f15be9edb5ddef92e407c031a1a9a7 100644 (file)
--- a/src/ExchangePlugin/CMakeLists.txt
+++ b/src/ExchangePlugin/CMakeLists.txt
@@ -36,7 +36,7 @@ SET(PROJECT_LIBRARIES
 )
 
 ADD_DEFINITIONS(-DEXCHANGEPLUGIN_EXPORTS ${CAS_DEFINITIONS})
-ADD_LIBRARY(ExchangePlugin SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES})
+ADD_LIBRARY(ExchangePlugin MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES})
 
 TARGET_LINK_LIBRARIES(ExchangePlugin ${PROJECT_LIBRARIES})
 

diff --git a/src/ExchangePlugin/ExchangePlugin_Plugin.cpp b/src/ExchangePlugin/ExchangePlugin_Plugin.cpp
index b3256862a1c9e1c726bae79e19fec8e41d6477fc..3a4abd00bed00e7b23cb2079aaa74e37721acb6f 100644 (file)
--- a/src/ExchangePlugin/ExchangePlugin_Plugin.cpp
+++ b/src/ExchangePlugin/ExchangePlugin_Plugin.cpp
@@ -12,7 +12,7 @@
 using namespace std;
 
 // the only created instance of this plugin
-static ExchangePlugin_Plugin* MY_INSTANCE = new ExchangePlugin_Plugin();
+static ExchangePlugin_Plugin* MY_EXCHANGE_INSTANCE = new ExchangePlugin_Plugin();
 
 ExchangePlugin_Plugin::ExchangePlugin_Plugin()
 {

diff --git a/src/FeaturesPlugin/CMakeLists.txt b/src/FeaturesPlugin/CMakeLists.txt
index 3c1f9a45b74a4428c83673a4bcf5de1797acd2ea..024b9593b35bb7cef050fcffa0f06aa6fc417b06 100644 (file)
--- a/src/FeaturesPlugin/CMakeLists.txt
+++ b/src/FeaturesPlugin/CMakeLists.txt
@@ -34,7 +34,7 @@ SET(PROJECT_LIBRARIES
 )
 
 ADD_DEFINITIONS(-DFEATURESPLUGIN_EXPORTS ${BOOST_DEFINITIONS})
-ADD_LIBRARY(FeaturesPlugin SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES})
+ADD_LIBRARY(FeaturesPlugin MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES})
 TARGET_LINK_LIBRARIES(FeaturesPlugin ${PROJECT_LIBRARIES})
 
 INSTALL(TARGETS FeaturesPlugin DESTINATION plugins)

diff --git a/src/FeaturesPlugin/FeaturesPlugin_Plugin.cpp b/src/FeaturesPlugin/FeaturesPlugin_Plugin.cpp
index 7d4e26185482a45c948b9eb8c7433e8856a41378..c43cd7a52691901535b4d528675dbf96e2827bb5 100644 (file)
--- a/src/FeaturesPlugin/FeaturesPlugin_Plugin.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_Plugin.cpp
@@ -8,7 +8,7 @@
 using namespace std;
 
 // the only created instance of this plugin
-static FeaturesPlugin_Plugin* MY_INSTANCE = new FeaturesPlugin_Plugin();
+static FeaturesPlugin_Plugin* MY_FEATURES_INSTANCE = new FeaturesPlugin_Plugin();
 
 FeaturesPlugin_Plugin::FeaturesPlugin_Plugin()
 {

diff --git a/src/GeomValidators/GeomValidators_Positive.cpp b/src/GeomValidators/GeomValidators_Positive.cpp
index 935bce6b4eb52474bf29b01bd1599f760feb621c..d2261b357c0686c12959376d395498d26fc77579 100644 (file)
--- a/src/GeomValidators/GeomValidators_Positive.cpp
+++ b/src/GeomValidators/GeomValidators_Positive.cpp
@@ -8,14 +8,14 @@
 #include <ModelAPI_Validator.h>
 
 /// Global instance for validators factory
-GeomValidators_Positive MY_INSTANCE;
+GeomValidators_Positive MY_POSITIVE_INSTANCE;
 
 GeomValidators_Positive::GeomValidators_Positive()
 {
   // this validator is registered in the factory on this library loading
   SessionPtr aMgr = ModelAPI_Session::get();
   ModelAPI_ValidatorsFactory* aFactory = aMgr->validators();
-  aFactory->registerValidator("GeomValidators_Positive", &MY_INSTANCE);
+  aFactory->registerValidator("GeomValidators_Positive", this);
 }
 
 bool GeomValidators_Positive::isValid(

diff --git a/src/Model/Model_Update.cpp b/src/Model/Model_Update.cpp
index 34637a08cbec2f3b3211c7331991a50bc2ae0572..9ddd9f8e63d8e6847fa8f5ef1d90122bd0fcf325 100644 (file)
--- a/src/Model/Model_Update.cpp
+++ b/src/Model/Model_Update.cpp
@@ -20,7 +20,7 @@
 
 using namespace std;
 
-Model_Update MY_INSTANCE;  /// the only one instance initialized on load of the library
+Model_Update MY_UPDATER_INSTANCE;  /// the only one instance initialized on load of the library
 
 Model_Update::Model_Update()
 {

diff --git a/src/NewGeom/CMakeLists.txt b/src/NewGeom/CMakeLists.txt
index 94def8687ebe25b81576776b94f168e898530447..1883fbb61b86da4da9c4618fa4825ca540bd1486 100644 (file)
--- a/src/NewGeom/CMakeLists.txt
+++ b/src/NewGeom/CMakeLists.txt
@@ -63,4 +63,4 @@ ADD_DEPENDENCIES(NewGeom XGUI)
 TARGET_LINK_LIBRARIES(NewGeom ${PROJECT_LIBRARIES})
 
 INSTALL(TARGETS NewGeom DESTINATION bin)
-INSTALL(FILES ${PROJECT_RESOURCES} DESTINATION share/salome/resources/newgeom )
\ No newline at end of file
+INSTALL(FILES ${PROJECT_RESOURCES} DESTINATION share/salome/resources/newgeom )

diff --git a/src/PartSet/CMakeLists.txt b/src/PartSet/CMakeLists.txt
index 70a10d11a581b38dc4598a4724475ae67edb1e79..1ce2ab944f748f710a1747c6c72673796dcdd296 100644 (file)
--- a/src/PartSet/CMakeLists.txt
+++ b/src/PartSet/CMakeLists.txt
@@ -98,4 +98,4 @@ TARGET_LINK_LIBRARIES(PartSet ${PROJECT_LIBRARIES} XGUI ModelAPI GeomAlgoAPI)
 ADD_DEPENDENCIES(PartSet ModuleBase)
 
 INSTALL(TARGETS PartSet DESTINATION bin)
-#INSTALL(FILES ${QM_RESOURCES} DESTINATION bin)
\ No newline at end of file
+#INSTALL(FILES ${QM_RESOURCES} DESTINATION bin)

diff --git a/src/PartSetPlugin/CMakeLists.txt b/src/PartSetPlugin/CMakeLists.txt
index 119d74843b938d8318c0fd2cb42eee5bcde9a2a8..2988a3b26a5dfab12ae8b9034cfdbd36dbd208da 100644 (file)
--- a/src/PartSetPlugin/CMakeLists.txt
+++ b/src/PartSetPlugin/CMakeLists.txt
@@ -16,7 +16,7 @@ SET(PROJECT_SOURCES
 )
 
 ADD_DEFINITIONS(-DPARTSETPLUGIN_EXPORTS ${BOOST_DEFINITIONS})
-ADD_LIBRARY(PartSetPlugin SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
+ADD_LIBRARY(PartSetPlugin MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS})
 TARGET_LINK_LIBRARIES(PartSetPlugin ${PROJECT_LIBRARIES} ModelAPI)
 
 INCLUDE_DIRECTORIES(

diff --git a/src/PartSetPlugin/PartSetPlugin_Plugin.cpp b/src/PartSetPlugin/PartSetPlugin_Plugin.cpp
index 7f331fd76f14f0a097889940621b5900fb19163b..0ad4b8b928ad69e4ec78822999fedf0fa66e1e3c 100644 (file)
--- a/src/PartSetPlugin/PartSetPlugin_Plugin.cpp
+++ b/src/PartSetPlugin/PartSetPlugin_Plugin.cpp
@@ -8,7 +8,7 @@
 using namespace std;
 
 // the only created instance of this plugin
-static PartSetPlugin_Plugin* MY_INSTANCE = new PartSetPlugin_Plugin();
+static PartSetPlugin_Plugin* MY_PARTSET_INSTANCE = new PartSetPlugin_Plugin();
 
 PartSetPlugin_Plugin::PartSetPlugin_Plugin()
 {

diff --git a/src/SketchPlugin/SketchPlugin_Plugin.cpp b/src/SketchPlugin/SketchPlugin_Plugin.cpp
index 40749b1919a6a57ee935ac70d29391548ebe6ca6..ba178fe6526935a58b93fa4a102ff5afdc7e398e 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_Plugin.cpp
+++ b/src/SketchPlugin/SketchPlugin_Plugin.cpp
@@ -21,7 +21,7 @@
 using namespace std;
 
 // the only created instance of this plugin
-static SketchPlugin_Plugin* MY_INSTANCE = new SketchPlugin_Plugin();
+static SketchPlugin_Plugin* MY_SKETCH_INSTANCE = new SketchPlugin_Plugin();
 
 SketchPlugin_Plugin::SketchPlugin_Plugin()
 {