From: Mikhail PONIKAROV <mpv@phenomex.nnov.opencascade.com>
Date: Mon, 29 Sep 2014 05:46:15 +0000 (+0400)
Subject: Fix of the processEvents call on Linux
X-Git-Tag: V_0.4.4~5
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=50e082b16ea4f2fd6e94ddb6879112036a0610aa;p=modules%2Fshaper.git

Fix of the processEvents call on Linux
---

diff --git a/src/ConstructionPlugin/CMakeLists.txt b/src/ConstructionPlugin/CMakeLists.txt
index 5e27fe1c7..a5866c282 100644
--- 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 fd5db868f..2d853ebd0 100644
--- 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 2a1c85e55..ad3f24fdf 100644
--- 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 b3256862a..3a4abd00b 100644
--- 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 3c1f9a45b..024b9593b 100644
--- 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 7d4e26185..c43cd7a52 100644
--- 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 935bce6b4..d2261b357 100644
--- 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 34637a08c..9ddd9f8e6 100644
--- 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 94def8687..1883fbb61 100644
--- 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 70a10d11a..1ce2ab944 100644
--- 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 119d74843..2988a3b26 100644
--- 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 7f331fd76..0ad4b8b92 100644
--- 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 40749b191..ba178fe65 100644
--- 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()
 {