From 26e7a41447b13e21d0471bffb93d3f117b0fd43e Mon Sep 17 00:00:00 2001 From: adam Date: Fri, 15 May 2009 08:30:06 +0000 Subject: [PATCH] windows port : rename export symbol SALOME_PYQT_EXPORT to SALOME_PYQT_LIGHT_EXPORT --- .../SALOME_PYQT_GUILight/SALOME_PYQT_DataModelLight.h | 2 +- .../SALOME_PYQT_GUILight/SALOME_PYQT_DataObjectLight.h | 2 +- .../SALOME_PYQT_GUILight/SALOME_PYQT_GUILight.h | 8 ++++---- .../SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.cxx | 2 +- .../SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.h | 2 +- .../SALOME_PYQT_GUILight/SALOME_PYQT_PyInterp.h | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataModelLight.h b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataModelLight.h index b5beead31..275c084d4 100644 --- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataModelLight.h +++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataModelLight.h @@ -35,7 +35,7 @@ class SALOME_PYQT_RootObjectLight; -class SALOME_PYQT_EXPORT SALOME_PYQT_DataModelLight : public LightApp_DataModel +class SALOME_PYQT_LIGHT_EXPORT SALOME_PYQT_DataModelLight : public LightApp_DataModel { Q_OBJECT diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataObjectLight.h b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataObjectLight.h index 024feebfd..a99e0212a 100644 --- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataObjectLight.h +++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataObjectLight.h @@ -36,7 +36,7 @@ /*! * SALOME_PYQT_DataObjectLight - PYTHON LIGHT module's data object class */ -class SALOME_PYQT_EXPORT SALOME_PYQT_DataObjectLight : public virtual LightApp_DataObject +class SALOME_PYQT_LIGHT_EXPORT SALOME_PYQT_DataObjectLight : public virtual LightApp_DataObject { public: diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_GUILight.h b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_GUILight.h index ada818fd7..12ab128a4 100644 --- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_GUILight.h +++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_GUILight.h @@ -30,15 +30,15 @@ // set dllexport type for Win platform #ifdef WNT -#ifdef SALOME_PYQT_EXPORTS -#define SALOME_PYQT_EXPORT __declspec(dllexport) +#if defined SALOME_PYQT_LIGHT_EXPORTS || defined SalomePyQtGUILight_EXPORTS +#define SALOME_PYQT_LIGHT_EXPORT __declspec(dllexport) #else -#define SALOME_PYQT_EXPORT __declspec(dllimport) +#define SALOME_PYQT_LIGHT_EXPORT __declspec(dllimport) #endif #else // WNT -#define SALOME_PYQT_EXPORT +#define SALOME_PYQT_LIGHT_EXPORT #endif // WNT diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.cxx b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.cxx index 10566bb50..e52a67806 100644 --- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.cxx +++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.cxx @@ -184,7 +184,7 @@ PyMODINIT_FUNC INIT_FUNCTION(); */ extern "C" { - SALOME_PYQT_EXPORT CAM_Module* createModule() { + SALOME_PYQT_LIGHT_EXPORT CAM_Module* createModule() { static bool alreadyInitialized = false; if ( !alreadyInitialized ) { diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.h b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.h index e7e89fa8c..972788f69 100644 --- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.h +++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.h @@ -46,7 +46,7 @@ class QtxActionGroup; class QMenu; -class SALOME_PYQT_EXPORT SALOME_PYQT_ModuleLight: virtual public LightApp_Module +class SALOME_PYQT_LIGHT_EXPORT SALOME_PYQT_ModuleLight: virtual public LightApp_Module { Q_OBJECT; diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyInterp.h b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyInterp.h index e49faabaa..dc99adcda 100644 --- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyInterp.h +++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyInterp.h @@ -31,7 +31,7 @@ #include "PyInterp_Interp.h" // this include must be first !!! -class SALOME_PYQT_EXPORT SALOME_PYQT_PyInterp : public PyInterp_Interp +class SALOME_PYQT_LIGHT_EXPORT SALOME_PYQT_PyInterp : public PyInterp_Interp { public: SALOME_PYQT_PyInterp(); -- 2.39.2