From 9a848bdf49999dbaba4e98f9dcd6c28b644723df Mon Sep 17 00:00:00 2001 From: abd Date: Mon, 6 Mar 2006 08:34:30 +0000 Subject: [PATCH] Updated environment and import/export directives --- src/Session/InquireServersQThread.h | 12 +++---- src/Session/SALOME_Session.hxx | 47 ++++++++++++++++++++++++++ src/Session/SalomeApp_Engine_i.hxx | 10 ++---- src/Session/Session_ServerLauncher.hxx | 13 +++---- src/Session/Session_ServerThread.hxx | 6 ++-- src/Session/Session_Session_i.hxx | 4 ++- 6 files changed, 65 insertions(+), 27 deletions(-) create mode 100755 src/Session/SALOME_Session.hxx diff --git a/src/Session/InquireServersQThread.h b/src/Session/InquireServersQThread.h index b97bfd012..82d58dc7d 100755 --- a/src/Session/InquireServersQThread.h +++ b/src/Session/InquireServersQThread.h @@ -11,18 +11,14 @@ #include #include -#ifdef WNT -#include -#else -#define SALOME_WNT_EXPORT -#endif +#include /********************************************************** ** Class: InquireEvent ** Descr: Contains QCustomEvents for posting to InquireServersQThread ** Level: Private ***********************************************************/ -class SALOME_WNT_EXPORT InquireEvent : public QCustomEvent +class SESSION_EXPORT InquireEvent : public QCustomEvent { public: @@ -39,7 +35,7 @@ public: class InquireServersGUI; -class SALOME_WNT_EXPORT InquireServersQThread : public QThread +class SESSION_EXPORT InquireServersQThread : public QThread { public: InquireServersQThread( InquireServersGUI* r ); @@ -84,7 +80,7 @@ private: class QLabel; class QFrame; class QProgressBar; -class SALOME_WNT_EXPORT InquireServersGUI : public QVBox +class SESSION_EXPORT InquireServersGUI : public QVBox { Q_OBJECT diff --git a/src/Session/SALOME_Session.hxx b/src/Session/SALOME_Session.hxx new file mode 100755 index 000000000..78c89d6d3 --- /dev/null +++ b/src/Session/SALOME_Session.hxx @@ -0,0 +1,47 @@ +// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// +// +// +// File : SALOME_Session.hxx +// Author : Alexander A. BORODIN +// Module : GUI + +#ifndef _SALOME_Session_HXX_ +#define _SALOME_Session_HXX_ + +#ifdef WNT + #if defined SESSION_EXPORTS + #if defined WIN32 + #define SESSION_EXPORT __declspec( dllexport ) + #else + #define SESSION_EXPORT + #endif + #else + #if defined WIN32 + #define SESSION_EXPORT __declspec( dllimport ) + #else + #define SESSION_EXPORT + #endif + #endif +#else + #define SESSION_EXPORT +#endif + +#endif \ No newline at end of file diff --git a/src/Session/SalomeApp_Engine_i.hxx b/src/Session/SalomeApp_Engine_i.hxx index b3c79a101..67c29f993 100755 --- a/src/Session/SalomeApp_Engine_i.hxx +++ b/src/Session/SalomeApp_Engine_i.hxx @@ -29,6 +29,8 @@ #ifndef _SALOMEAPP_ENGINE_I_HXX_ #define _SALOMEAPP_ENGINE_I_HXX_ +#include + #include "SALOME_Component_i.hxx" #include @@ -37,13 +39,7 @@ #include #include CORBA_SERVER_HEADER(SalomeApp_Engine) -#ifdef WNT -#include -#else -#define SALOME_WNT_EXPORT -#endif - -class SALOME_WNT_EXPORT SalomeApp_Engine_i: public POA_SalomeApp::Engine, +class SESSION_EXPORT SalomeApp_Engine_i: public POA_SalomeApp::Engine, public Engines_Component_i { public: diff --git a/src/Session/Session_ServerLauncher.hxx b/src/Session/Session_ServerLauncher.hxx index 8791b6698..559833919 100755 --- a/src/Session/Session_ServerLauncher.hxx +++ b/src/Session/Session_ServerLauncher.hxx @@ -29,6 +29,8 @@ #ifndef _SESSION_SERVERLAUNCHER_HXX_ #define _SESSION_SERVERLAUNCHER_HXX_ +#include + #include "Session_ServerThread.hxx" #include @@ -38,16 +40,9 @@ #include #include - -#ifdef WNT -#include -#else -#define SALOME_WNT_EXPORT -#endif - using namespace std; -class ServArg +class SESSION_EXPORT ServArg { public: int _servType; @@ -60,7 +55,7 @@ inline ServArg::ServArg(int servType, int firstArg, int lastArg): _servType(servType),_firstArg(firstArg),_lastArg(lastArg) {} -class SALOME_WNT_EXPORT Session_ServerLauncher: public QThread +class SESSION_EXPORT Session_ServerLauncher: public QThread { public: Session_ServerLauncher(); diff --git a/src/Session/Session_ServerThread.hxx b/src/Session/Session_ServerThread.hxx index a10ab0ce6..1041c0f35 100755 --- a/src/Session/Session_ServerThread.hxx +++ b/src/Session/Session_ServerThread.hxx @@ -29,6 +29,8 @@ #ifndef _SESSION_SERVERTHREAD_HXX_ #define _SESSION_SERVERTHREAD_HXX_ +#include + #include #include @@ -40,7 +42,7 @@ using namespace std; void WaitForServerReadiness(string serverName); -class Session_ServerThread +class SESSION_EXPORT Session_ServerThread { public: static const int NB_SRV_TYP; @@ -73,7 +75,7 @@ protected: }; -class Session_SessionThread : public Session_ServerThread +class SESSION_EXPORT Session_SessionThread : public Session_ServerThread { public: Session_SessionThread() {} diff --git a/src/Session/Session_Session_i.hxx b/src/Session/Session_Session_i.hxx index c9815a42d..0da135869 100755 --- a/src/Session/Session_Session_i.hxx +++ b/src/Session/Session_Session_i.hxx @@ -29,6 +29,8 @@ #ifndef _SESSION_SESSION_I_HXX_ #define _SESSION_SESSION_I_HXX_ +#include + #include #include @@ -36,7 +38,7 @@ #include CORBA_SERVER_HEADER(SALOME_Session) class SALOME_NamingService; -class SALOME_Session_i: public virtual POA_SALOME::Session, +class SESSION_EXPORT SALOME_Session_i: public virtual POA_SALOME::Session, public virtual PortableServer::RefCountServantBase { public: -- 2.39.2